diff --git a/.devcontainer/.gitignore b/.devcontainer/.gitignore
new file mode 100644
index 0000000000..bddc5a8f6d
--- /dev/null
+++ b/.devcontainer/.gitignore
@@ -0,0 +1,40 @@
+*
+
+!/assets/
+!/assets/cradles/
+!/assets/cradles/cabal/
+!/assets/cradles/stack/
+!/conf/
+!/conf/shell/
+!/conf/shell/var/
+!/conf/shell/var/tmp/
+!/conf/shell/var/tmp/snippets/
+!/conf/stack/
+!/conf/stack/etc/
+!/conf/stack/etc/stack/
+!/ghc-*/
+!/scripts/
+!/scripts/usr/
+!/scripts/usr/local/
+!/scripts/usr/local/bin/
+!/vsix/
+!/vsix/var/
+!/vsix/var/tmp/
+!/vsix/var/tmp/extensions/
+
+!/assets/cradles/cabal/hie.yaml
+!/assets/cradles/stack/hie.yaml
+!/conf/shell/var/tmp/snippets/*.sh
+!/conf/stack/etc/stack/config.yaml
+!/ghc-*/devcontainer.json
+!/scripts/usr/local/bin/*.sh
+!/vsix/var/tmp/extensions/*.vsix
+
+!/devcontainer.json
+!/GHC.Dockerfile
+!/init
+!/init.cmd
+!/LICENSE
+!/README.md
+
+!.gitignore
diff --git a/.devcontainer/GHC.Dockerfile b/.devcontainer/GHC.Dockerfile
new file mode 100644
index 0000000000..bd54903bd5
--- /dev/null
+++ b/.devcontainer/GHC.Dockerfile
@@ -0,0 +1,117 @@
+ARG BUILD_ON_IMAGE=quay.io/benz0li/ghc-musl
+ARG GHC_VERSION=latest
+ARG SUBTAG
+ARG HLS_VERSION
+ARG STACK_VERSION
+
+ARG HLS_GHC_VERSION=${HLS_VERSION:+$GHC_VERSION}
+ARG HLS_IMAGE_TAG=${HLS_VERSION:-none}-ghc${HLS_GHC_VERSION:-all}${SUBTAG:+-}${SUBTAG}
+
+ARG STACK_VERSION_OVERRIDE=${STACK_VERSION}
+
+FROM ${BUILD_ON_IMAGE}:${GHC_VERSION}${SUBTAG:+-}${SUBTAG} AS files
+
+RUN mkdir /files
+
+COPY conf/shell /files
+COPY conf/stack /files
+COPY scripts /files
+COPY vsix /files
+
+## Ensure file modes are correct
+RUN find /files -type d -exec chmod 755 {} \; \
+  && find /files -type f -exec chmod 644 {} \; \
+  && find /files/usr/local/bin -type f -exec chmod 755 {} \;
+
+FROM quay.io/benz0li/hlssi:${HLS_IMAGE_TAG} AS hlssi
+
+FROM quay.io/benz0li/hlsi:latest AS hlsi
+
+FROM ghcr.io/hadolint/hadolint:latest as hsi
+
+FROM docker.io/koalaman/shellcheck:stable AS sci
+
+FROM ${BUILD_ON_IMAGE}:${GHC_VERSION}${SUBTAG:+-}${SUBTAG}
+
+COPY --from=files /files /
+
+RUN sysArch="$(uname -m)" \
+  ## Ensure that common CA certificates
+  ## and OpenSSL libraries are up to date
+  && apk upgrade --no-cache ca-certificates openssl-dev \
+  ## Install pip
+  && apk add --no-cache py3-pip \
+  ## Install terminal multiplexers
+  && apk add --no-cache screen tmux \
+  ## Install yamllint
+  && apk add --no-cache yamllint
+
+## Update environment
+ARG USE_ZSH_FOR_ROOT
+ARG LANG
+ARG TZ
+
+ARG LANG_OVERRIDE=${LANG}
+ARG TZ_OVERRIDE=${TZ}
+
+ENV LANG=${LANG_OVERRIDE:-$LANG} \
+    TZ=${TZ_OVERRIDE:-$TZ}
+
+  ## Change root's shell to ZSH
+RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
+    apk add --no-cache zsh shadow; \
+    fix-chsh.sh; \
+    chsh -s /bin/zsh; \
+  fi \
+  ## Update timezone if requested
+  && if [ "$TZ" != "" ]; then \
+    apk add --no-cache tzdata; \
+  fi \
+  ## Info about timezone
+  && echo "TZ is set to $TZ" \
+  ## Add/Update locale if requested
+  && if [ "$LANG" != "C.UTF-8" ]; then \
+    if [ -n "$LANG" ]; then \
+      apk add --no-cache musl-locales musl-locales-lang; \
+    fi; \
+    sed -i "s/LANG=C.UTF-8/LANG=$LANG/" /etc/profile.d/*locale.sh; \
+    sed -i "s/LANG:-C.UTF-8/LANG:-$LANG/" /etc/profile.d/*locale.sh; \
+    sed -i "s/LC_COLLATE=C/LC_COLLATE=$LANG/" /etc/profile.d/*locale.sh; \
+    sed -i "s/LC_COLLATE:-C/LC_COLLATE:-$LANG/" /etc/profile.d/*locale.sh; \
+  fi \
+  ## Info about locale
+  && echo "LANG is set to $LANG"
+
+## Copy binaries as late as possible to avoid cache busting
+## Install HLS
+COPY --from=hlssi /usr/local /usr/local
+## Install HLint
+COPY --from=hlsi /usr/local /usr/local
+## Install Haskell Dockerfile Linter
+COPY --from=hsi /bin/hadolint /usr/local/bin
+## Install ShellCheck
+COPY --from=sci --chown=root:root /bin/shellcheck /usr/local/bin
+
+ARG HLS_VERSION
+ARG STACK_VERSION
+
+ARG STACK_VERSION_OVERRIDE
+
+ENV HLS_VERSION=${HLS_VERSION} \
+    STACK_VERSION=${STACK_VERSION_OVERRIDE:-$STACK_VERSION}
+
+RUN if [ -n "$STACK_VERSION_OVERRIDE" ]; then \
+    ## Install Stack
+    cd /tmp || exit ;\
+    curl -sSLO https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VERSION"/stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz; \
+    curl -sSLO https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VERSION"/stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz.sha256; \
+    sha256sum -cs stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz.sha256; \
+    tar -xzf stack-"$STACK_VERSION"-linux-"$(uname -m)".tar.gz; \
+    if dpkg --compare-versions "$GHC_VERSION" lt "9.2.8"; then \
+      mv -f stack-"$STACK_VERSION"-linux-"$(uname -m)"/stack /usr/bin/stack; \
+    else \
+      mv -f stack-"$STACK_VERSION"-linux-"$(uname -m)"/stack /usr/local/bin/stack; \
+    fi; \
+    ## Clean up
+    rm -rf /tmp/*; \
+  fi
diff --git a/.devcontainer/LICENSE b/.devcontainer/LICENSE
new file mode 100644
index 0000000000..fb01005636
--- /dev/null
+++ b/.devcontainer/LICENSE
@@ -0,0 +1,42 @@
+Copyright (c) 2023-2024 Olivier Benz
+
+The code in this directory is not part of Stack (the software) and, with the
+exceptions noted below, is distributed under the terms of the MIT License:
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+This directory also contains code with other copyrights. The affected files,
+their copyrights and license statements are listed below.
+
+--------------------------------------------------------------------------------
+scripts/fix-chsh.sh
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the MIT License. See
+https://github.com/devcontainers/features/blob/main/LICENSE for
+license information.
+
+--------------------------------------------------------------------------------
+.devcontainer/init
+Copyright (c) 2025 b-data GmbH
+Copyright (c) 2023 Microsoft Corporation
+
+Distributed under the terms of the MIT License.
+
+--------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
new file mode 100644
index 0000000000..26e6aadf67
--- /dev/null
+++ b/.devcontainer/README.md
@@ -0,0 +1,11 @@
+# Dev Containers
+
+For further information, see
+[haskellstack.org](https://docs.haskellstack.org): Get involved \> Contributors
+\> Dev Containers or [../doc/dev_containers.md](../doc/dev_containers.md).
+
+## License
+
+The code in this directory is not part of Stack (the software) and, with the
+exceptions noted in [LICENSE](LICENSE), is distributed under the terms of the
+MIT License.
diff --git a/.devcontainer/assets/cradles/cabal/hie.yaml b/.devcontainer/assets/cradles/cabal/hie.yaml
new file mode 100644
index 0000000000..cb6b06a9cb
--- /dev/null
+++ b/.devcontainer/assets/cradles/cabal/hie.yaml
@@ -0,0 +1,19 @@
+cradle:
+  multi:
+  - path: "./Setup.hs"
+    config:
+      cradle:
+        direct:
+          arguments: []
+  - path: "./"
+    config:
+      cradle:
+        cabal:
+        - path: "./src"
+          component: "lib:stack"
+        - path: "./app"
+          component: "stack:exe:stack"
+        - path: "./tests/integration"
+          component: "stack:exe:stack-integration-test"
+        - path: "./tests/unit"
+          component: "stack:test:stack-unit-test"
diff --git a/.devcontainer/assets/cradles/stack/hie.yaml b/.devcontainer/assets/cradles/stack/hie.yaml
new file mode 100644
index 0000000000..bcc8ccd9c4
--- /dev/null
+++ b/.devcontainer/assets/cradles/stack/hie.yaml
@@ -0,0 +1,19 @@
+cradle:
+  multi:
+  - path: "./Setup.hs"
+    config:
+      cradle:
+        direct:
+          arguments: []
+  - path: "./"
+    config:
+      cradle:
+        stack:
+        - path: "./src"
+          component: "stack:lib"
+        - path: "./app"
+          component: "stack:exe:stack"
+        - path: "./tests/integration"
+          component: "stack:exe:stack-integration-test"
+        - path: "./tests/unit"
+          component: "stack:test:stack-unit-test"
diff --git a/.devcontainer/conf/shell/var/tmp/snippets/rc.sh b/.devcontainer/conf/shell/var/tmp/snippets/rc.sh
new file mode 100644
index 0000000000..a5b2038353
--- /dev/null
+++ b/.devcontainer/conf/shell/var/tmp/snippets/rc.sh
@@ -0,0 +1,13 @@
+
+# remove potentially present $HOME/.local/bin from PATH
+PATH="${PATH/:$HOME\/.local\/bin/}"
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] && [[ "$PATH" != *"$HOME/bin"* ]] ; then
+    PATH="$HOME/bin:$PATH"
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] && [[ "$PATH" != *"$HOME/.local/bin"* ]] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
diff --git a/.devcontainer/conf/shell/var/tmp/snippets/rc2.sh b/.devcontainer/conf/shell/var/tmp/snippets/rc2.sh
new file mode 100644
index 0000000000..f4c09b882c
--- /dev/null
+++ b/.devcontainer/conf/shell/var/tmp/snippets/rc2.sh
@@ -0,0 +1,5 @@
+
+# set PATH so it includes cabal's bin if it exists
+if [ -d "$HOME/.cabal/bin" ] && [[ "$PATH" != *"$HOME/.cabal/bin"* ]] ; then
+    PATH="$HOME/.cabal/bin:$PATH"
+fi
diff --git a/.devcontainer/conf/stack/etc/stack/config.yaml b/.devcontainer/conf/stack/etc/stack/config.yaml
new file mode 100644
index 0000000000..37c999c3d6
--- /dev/null
+++ b/.devcontainer/conf/stack/etc/stack/config.yaml
@@ -0,0 +1,4 @@
+# Use only the GHC available on the PATH
+system-ghc: true
+# Do not automatically install GHC when necessary
+install-ghc: false
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..f02a53e996
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,57 @@
+{
+  "name": "GHC 9.10.3 (default)",
+  "build": {
+    "dockerfile": "GHC.Dockerfile",
+    "args": {
+      "GHC_VERSION": "9.10.3",
+      // "SUBTAG": "int-native",
+      "HLS_VERSION": "2.14.0.0",
+      "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
+      "LANG": "C.UTF-8",
+      "TZ": ""
+    }
+  },
+
+  "initializeCommand": [".devcontainer/init"],
+  "onCreateCommand": "onCreateCommand.sh",
+  "postCreateCommand": "postCreateCommand.sh",
+
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "configureZshAsDefaultShell": true,
+      "upgradePackages": false,
+      "username": "vscode",
+      "userUid": "automatic",
+      "userGid": "automatic"
+    }
+  },
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "/var/tmp/extensions/eamodio.gitlens-11.7.0.vsix",
+        "exiasr.hadolint",
+        "GitHub.vscode-pull-request-github",
+        "haskell.haskell",
+        "mhutchie.git-graph",
+        "mutantdino.resourcemonitor",
+        "timonwong.shellcheck"
+      ],
+      "settings": {
+        "gitlens.showWelcomeOnInstall": false,
+        "gitlens.showWhatsNewAfterUpgrades": false,
+        "haskell.manageHLS": "PATH",
+        "resmon.show.battery": false,
+        "resmon.show.cpufreq": false
+      }
+    }
+  },
+
+  // Set 'remoteUser' to 'root' to connect as root instead.
+  "remoteUser": "vscode",
+
+  "remoteEnv": {
+    // Pip: Install packages to the user site
+    "PIP_USER": "1"
+  }
+}
diff --git a/.devcontainer/ghc-9.12.4/devcontainer.json b/.devcontainer/ghc-9.12.4/devcontainer.json
new file mode 100644
index 0000000000..67bbf5bc44
--- /dev/null
+++ b/.devcontainer/ghc-9.12.4/devcontainer.json
@@ -0,0 +1,55 @@
+{
+  "name": "GHC 9.12.4 (experimental)",
+  "build": {
+    "dockerfile": "../GHC.Dockerfile",
+    "context": "..",
+    "args": {
+      "GHC_VERSION": "9.12.4",
+      // "SUBTAG": "int-native",
+      "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
+      "LANG": "C.UTF-8",
+      "TZ": ""
+    }
+  },
+
+  "initializeCommand": [".devcontainer/init"],
+  "onCreateCommand": "onCreateCommand.sh",
+  "postCreateCommand": "postCreateCommand.sh",
+
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "configureZshAsDefaultShell": true,
+      "upgradePackages": false,
+      "username": "vscode",
+      "userUid": "automatic",
+      "userGid": "automatic"
+    }
+  },
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "/var/tmp/extensions/eamodio.gitlens-11.7.0.vsix",
+        "exiasr.hadolint",
+        "GitHub.vscode-pull-request-github",
+        "mhutchie.git-graph",
+        "mutantdino.resourcemonitor",
+        "timonwong.shellcheck"
+      ],
+      "settings": {
+        "gitlens.showWelcomeOnInstall": false,
+        "gitlens.showWhatsNewAfterUpgrades": false,
+        "resmon.show.battery": false,
+        "resmon.show.cpufreq": false
+      }
+    }
+  },
+
+  // Set 'remoteUser' to 'root' to connect as root instead.
+  "remoteUser": "vscode",
+
+  "remoteEnv": {
+    // Pip: Install packages to the user site
+    "PIP_USER": "1"
+  }
+}
diff --git a/.devcontainer/ghc-9.14.1/devcontainer.json b/.devcontainer/ghc-9.14.1/devcontainer.json
new file mode 100644
index 0000000000..d5f7b08d58
--- /dev/null
+++ b/.devcontainer/ghc-9.14.1/devcontainer.json
@@ -0,0 +1,55 @@
+{
+  "name": "GHC 9.14.1 (experimental)",
+  "build": {
+    "dockerfile": "../GHC.Dockerfile",
+    "context": "..",
+    "args": {
+      "GHC_VERSION": "9.14.1",
+      // "SUBTAG": "int-native",
+      "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
+      "LANG": "C.UTF-8",
+      "TZ": ""
+    }
+  },
+
+  "initializeCommand": [".devcontainer/init"],
+  "onCreateCommand": "onCreateCommand.sh",
+  "postCreateCommand": "postCreateCommand.sh",
+
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "configureZshAsDefaultShell": true,
+      "upgradePackages": false,
+      "username": "vscode",
+      "userUid": "automatic",
+      "userGid": "automatic"
+    }
+  },
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "/var/tmp/extensions/eamodio.gitlens-11.7.0.vsix",
+        "exiasr.hadolint",
+        "GitHub.vscode-pull-request-github",
+        "mhutchie.git-graph",
+        "mutantdino.resourcemonitor",
+        "timonwong.shellcheck"
+      ],
+      "settings": {
+        "gitlens.showWelcomeOnInstall": false,
+        "gitlens.showWhatsNewAfterUpgrades": false,
+        "resmon.show.battery": false,
+        "resmon.show.cpufreq": false
+      }
+    }
+  },
+
+  // Set 'remoteUser' to 'root' to connect as root instead.
+  "remoteUser": "vscode",
+
+  "remoteEnv": {
+    // Pip: Install packages to the user site
+    "PIP_USER": "1"
+  }
+}
diff --git a/.devcontainer/init b/.devcontainer/init
new file mode 100755
index 0000000000..c61ad81e83
--- /dev/null
+++ b/.devcontainer/init
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Copyright (c) 2025 b-data GmbH
+# Copyright (c) 2023 Microsoft Corporation
+# Distributed under the terms of the MIT License.
+#
+# https://docs.github.com/en/authentication/connecting-to-github-with-ssh/working-with-ssh-key-passphrases?platform=windows
+#
+# Modified by b-data for seamless integration with development containers on Linux/macOS.
+
+set -e
+
+# Do not execute on GitHub Codespaces
+if [ -z "$CODESPACES" ]; then
+  # Check the state of the currently running instance of the agent
+  # 0: running with key(s); 1: running w/o key(s); 2: not running
+  AGENT_RUN_STATE="$(ssh-add -l > /dev/null 2>&1; echo $?)"
+  # Only add key(s) if running w/o key(s)
+  if [ "$AGENT_RUN_STATE" = "1" ]; then
+    ssh-add 2> /dev/null || true
+  fi
+  # Means: Not adding key(s) to a forwarded agent with key(s)
+fi
+
+# https://code.visualstudio.com/remote/advancedcontainers/sharing-git-credentials
+#
+# On Linux: For an X session, the agent is usually started automatically.
+#           For a login session, add the following to your `~/.bash_profile`
+#           or `~/.zprofile`:
+# 
+# if [ -z "$SSH_AUTH_SOCK" ]; then
+#   # Check for a currently running instance of the agent
+#   RUNNING_AGENT="$(pgrep -f 'ssh-agent -s' -u "$USER" | wc -l | tr -d '[:space:]')"
+#   if [ "$RUNNING_AGENT" = "0" ]; then
+#     mkdir -p -m 0700 "$HOME/.ssh"
+#     # Launch a new instance of the agent
+#     ssh-agent -s &> "$HOME/.ssh/ssh-agent"
+#   fi
+#   eval "$(cat "$HOME/.ssh/ssh-agent")" > /dev/null
+# fi
diff --git a/test/integration/tests/3940-base-upgrade-warning/files/src/.gitkeep b/.devcontainer/init.cmd
similarity index 100%
rename from test/integration/tests/3940-base-upgrade-warning/files/src/.gitkeep
rename to .devcontainer/init.cmd
diff --git a/.devcontainer/scripts/usr/local/bin/fix-chsh.sh b/.devcontainer/scripts/usr/local/bin/fix-chsh.sh
new file mode 100755
index 0000000000..84ab89f1cd
--- /dev/null
+++ b/.devcontainer/scripts/usr/local/bin/fix-chsh.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/tree/main/src/common-utils
+# Maintainer: The Dev Container spec maintainers
+
+set -e
+
+# Fixing chsh always asking for a password on alpine linux
+# ref: https://askubuntu.com/questions/812420/chsh-always-asking-a-password-and-get-pam-authentication-failure.
+if [ ! -f "/etc/pam.d/chsh" ] || ! grep -Eq '^auth(.*)pam_rootok\.so$' /etc/pam.d/chsh; then
+  echo "auth sufficient pam_rootok.so" >> /etc/pam.d/chsh
+elif [[ -n "$(awk '/^auth(.*)pam_rootok\.so$/ && !/^auth[[:blank:]]+sufficient[[:blank:]]+pam_rootok\.so$/' /etc/pam.d/chsh)" ]]; then
+  awk '/^auth(.*)pam_rootok\.so$/ { $2 = "sufficient" } { print }' /etc/pam.d/chsh > /tmp/chsh.tmp && mv /tmp/chsh.tmp /etc/pam.d/chsh
+fi
diff --git a/.devcontainer/scripts/usr/local/bin/onCreateCommand.sh b/.devcontainer/scripts/usr/local/bin/onCreateCommand.sh
new file mode 100755
index 0000000000..22b2650489
--- /dev/null
+++ b/.devcontainer/scripts/usr/local/bin/onCreateCommand.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 b-data GmbH.
+# Distributed under the terms of the MIT License.
+
+set -e
+
+if dpkg --compare-versions "${CABAL_VERSION%.*.*}" le-nl "3.8"; then
+  mkdir -p "$HOME/.cabal/bin";
+fi
+mkdir -p "$HOME/.local/bin"
+
+# Copy Zsh-related files and folders from the untouched home directory
+if [ "$(id -un)" == "root" ]; then
+  if [ ! -d /root/.oh-my-zsh ]; then
+    cp -R /home/*/.oh-my-zsh /root;
+  fi
+  if [ ! -f /root/.zshrc ]; then
+    cp /home/*/.zshrc /root;
+  fi
+else
+  if [ ! -d "$HOME/.oh-my-zsh" ]; then
+    sudo cp -R /root/.oh-my-zsh "$HOME";
+    sudo chown -R "$(id -u)":"$(id -g)" "$HOME/.oh-my-zsh";
+  fi
+  if [ ! -f "$HOME/.zshrc" ]; then
+    sudo cp /root/.zshrc "$HOME";
+    sudo chown "$(id -u)":"$(id -g)" "$HOME/.zshrc";
+  fi
+fi
+
+# If existent, prepend the user's private bin to PATH
+if ! grep -q "user's private bin" "$HOME/.bashrc"; then
+  cat "/var/tmp/snippets/rc.sh" >> "$HOME/.bashrc"
+fi
+if ! grep -q "user's private bin" "$HOME/.zshrc"; then
+  cat "/var/tmp/snippets/rc.sh" >> "$HOME/.zshrc"
+fi
+
+# Set PATH so it includes cabal's bin if it exists
+if ! grep -q "cabal's bin" "$HOME/.bashrc"; then
+  cat "/var/tmp/snippets/rc2.sh" >> "$HOME/.bashrc"
+fi
+if ! grep -q "cabal's bin" "$HOME/.zshrc"; then
+  cat "/var/tmp/snippets/rc2.sh" >> "$HOME/.zshrc"
+fi
+
+# Enable Oh My Zsh plugins
+sed -i "s/plugins=(git)/plugins=(cabal git pip screen stack tmux vscode)/g" \
+  "$HOME/.zshrc"
+
+# Remove old .zcompdump files
+rm -f "$HOME"/.zcompdump*
diff --git a/.devcontainer/scripts/usr/local/bin/postCreateCommand.sh b/.devcontainer/scripts/usr/local/bin/postCreateCommand.sh
new file mode 100755
index 0000000000..aa15183142
--- /dev/null
+++ b/.devcontainer/scripts/usr/local/bin/postCreateCommand.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 b-data GmbH.
+# Distributed under the terms of the MIT License.
+
+set -e
+
+# Change ownership of the stack folder
+sudo chown "$(id -u)":"$(id -g)" /workspaces/stack
+
+# Updates list of known packages
+cabal update
diff --git a/.devcontainer/vsix/var/tmp/extensions/eamodio.gitlens-11.7.0.vsix b/.devcontainer/vsix/var/tmp/extensions/eamodio.gitlens-11.7.0.vsix
new file mode 100644
index 0000000000..984e0691b5
Binary files /dev/null and b/.devcontainer/vsix/var/tmp/extensions/eamodio.gitlens-11.7.0.vsix differ
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..0b9805e450
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/stack.cabal linguist-generated=true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 62f7dbb8b4..af96fce828 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,9 +3,9 @@ name: Bug Report
 about: Report a bug in Stack
 ---
 
-Please follow the steps below for reporting a bug:
+Please follow the steps below for reporting a bug in Stack:
 
-Make sure that you are using the latest release (currently Stack 2.9.1). See the
+Make sure that you are using the latest release (currently Stack 3.11.1). See the
 [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade)
 to upgrade.
 
@@ -45,7 +45,7 @@ stack <your command here> <args> --verbose
 
 ~~~text
 stack --version
-Version 2.9.1, Git revision 409d56031b4240221d656db09b2ba476fe6bb5b1 x86_64 hpack-0.35.0
+Version 3.11.1, Git revision 979bf6339fd4d5837c4d2fa8166dc715eef30ee2 x86_64 hpack-0.39.6
 ~~~
 
 ### Method of installation
@@ -55,3 +55,7 @@ Version 2.9.1, Git revision 409d56031b4240221d656db09b2ba476fe6bb5b1 x86_64 hpac
 * Via Cabal (the tool)
 * An unofficial package repository (please specify which)
 * Other (please specify)
+
+### Platform
+
+Your platform (machine architecture and operating system)
diff --git a/.github/ISSUE_TEMPLATE/docs_report.md b/.github/ISSUE_TEMPLATE/docs_report.md
new file mode 100644
index 0000000000..73e16f0cc5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/docs_report.md
@@ -0,0 +1,21 @@
+---
+name: Documentation Report
+about: Report if Stack's documentation appears inaccurate or incomplete
+---
+
+Please report problems with Stack's in-app help and error messages as a Stack
+bug. Please follow the schema below for reporting if Stack's online
+documentation appears inaccurate or incomplete:
+
+### Location of the documentation
+
+Please provide the link to the documentation in question. All headings have
+permanent links associated with them.
+
+### Is it inaccurate?
+
+Why do you think the documentation is wrong?
+
+### Is it incomplete?
+
+What do you think is missing from the documentation?
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 918d1d7258..81c6f24a36 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -3,7 +3,7 @@ name: Feature Request
 about: Request a feature be added to Stack, or discuss such a feature
 ---
 
-Make sure that you are using the latest release (currently Stack 2.9.1). See the
+Make sure that you are using the latest release (currently Stack 3.11.1). See the
 [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade)
 to upgrade.
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index fdff5a652a..68a14bf866 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,12 +1,13 @@
 ---
 name: Question
-about: Ask a question about Stack usage
+about: Ask a question about how to use Stack
 ---
 
-Do you have a question regarding Stack's usage that isn't covered by the online
+Do you have a question about how to use Stack that is not covered by the online
 [documentation](http://haskellstack.org)? In that case please ask your question
-on [Stack Overflow](http://stackoverflow.com) and use
-[the haskell-stack tag](http://stackoverflow.com/questions/tagged/haskell-stack).
+at the [Haskell Community](https://discourse.haskell.org/) forum or on
+[Stack Overflow](http://stackoverflow.com) (use the
+[haskell-stack](http://stackoverflow.com/questions/tagged/haskell-stack) tag).
 This way your question will be more easily discoverable by other people with the
 same question.
 
@@ -15,7 +16,7 @@ the [stack-templates](https://github.com/commercialhaskell/stack-templates)
 repository instead.
 
 If you still want to ask the question here instead, please make sure that you
-are using the latest release (currently Stack 2.9.1). See the
+are using the latest release (currently Stack 3.11.1). See the
 [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade)
 to upgrade.
 
@@ -23,7 +24,7 @@ to upgrade.
 
 ~~~text
 stack --version
-Version 2.9.1, Git revision 409d56031b4240221d656db09b2ba476fe6bb5b1 x86_64 hpack-0.35.0
+Version 3.11.1, Git revision 979bf6339fd4d5837c4d2fa8166dc715eef30ee2 x86_64 hpack-0.39.6
 ~~~
 
 ### Method of installation
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 020a1a9c66..a0613c29cf 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,7 @@
-Note: Fixes for the online documentation of the current Stack release (https://docs.haskellstack.org/en/stable/) should target the 'stable' branch, not the 'master' branch.
+Note: Fixes for the online documentation of the current Stack release
+(https://docs.haskellstack.org/en/stable/) should target the 'stable' branch,
+not the 'master' branch. (The former branch is merged into the latter on
+release, if not before.)
 
 Please include the following checklist in your pull request:
 
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 8e22e7a046..0cdeddb9ed 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -11,9 +11,26 @@ on:
     - '**'
   workflow_dispatch:
 
-# As of 11 August 2022, ubuntu-latest, windows-latest and macos-latest come with
-# Stack 2.7.5. windows-latest comes with NSIS 3.08, for which the default value
-# of the 'Unicode' installer attribute is 'true'.
+# Stack will use the value of the GH_TOKEN environment variable to authenticate
+# its requests of the GitHub REST API, providing a higher request rate limit.
+env:
+  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+# As of 2026-06-28:
+# * ubuntu-latest comes with Stack 3.11.1 and GHC 9.14.1; and
+# * windows-latest comes with Stack 3.11.1 and GHC 9.14.1.
+#
+# However, the following  ubuntu-24.04-arm, macos-15-intel and macos-latest do
+# not come with Haskell tools:
+# * ubuntu-24.04-arm;
+# * macos-15-intel; and
+# * macos-latest
+#
+# windows-latest no longer comes with NSIS 3.10, for which the default value of
+# the 'Unicode' installer attribute is 'true'. However, that is not the
+# 'large strings' build of NSIS and creates installers that corrupt the PATH
+# environment variable if the default string length of 1024 characters is
+# exceeded.
 
 jobs:
   integration-tests:
@@ -25,46 +42,105 @@ jobs:
         include:
         - os: ubuntu-latest
           release-args: "--alpine"
-          cache-bust: ""
+          cache-bust: "2025-11-05"
+        # On public preview since 16 January 2025
+        - os: ubuntu-24.04-arm
+          # Stack's project-level configuration (stack.yaml) specifies the
+          # multi-architecture (including Linux/Aarch64) Docker image published
+          # by Oliver Benz (@benz0li, on GitHub). That image comes with
+          # Stack 3.11.1. (Note that the online documentation for
+          # '--docker-stack-exe image' specifies that the host Stack and image
+          # Stack must have the same version number.)
+          release-args: "--alpine --stack-args --docker-stack-exe=image"
+          cache-bust: "2025-11-05"
         - os: windows-latest
           release-args: ""
-          cache-bust: "13"
+          cache-bust: "2025-11-05"
+        # macos-15-intel will be the last that provides macOS/x86_64
+        - os: macos-15-intel
+          release-args: ""
+          cache-bust: "2025-12-19"
+        # macos-latest provides macOS/AArch64 (M1)
         - os: macos-latest
           release-args: ""
-          cache-bust: "23"
+          cache-bust: "2024-11-05"
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v7
     - name: Cache dependencies on Unix-like OS
       if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
-      uses: actions/cache@v3
+      uses: actions/cache@v6
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ matrix.cache-bust }}
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('stack.yaml') }}-${{ matrix.cache-bust }}
     - name: Cache dependencies on Windows
       if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v3
+      uses: actions/cache@v6
       with:
         path: |
           ~\AppData\Roaming\stack
           ~\AppData\Local\Programs\stack
-        key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ matrix.cache-bust }}
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('stack.yaml') }}-${{ matrix.cache-bust }}
+    # Also upgrades to a 'large strings' build of NSIS 3.12 tool. See
+    # https://nsis.sourceforge.io/Special_Builds.
+    - name: Install and upgrade NSIS 3.12 on Windows
+      if: startsWith(runner.os, 'Windows')
+      uses: repolevedavaj/install-nsis@v1.2.1
+      with:
+        nsis-version: '3.12'
+    - name: Check NSIS 3.12 on Windows
+      if: startsWith(runner.os, 'Windows')
+      shell: bash
+      run: |
+        makensis -VERSION && echo
+        # Should include defined symbol NSIS_MAX_STRLEN=8192
+        makensis -HDRINFO
     - name: Install deps and run checks
       shell: bash
       run: |
         set -ex
 
+        if [[ "${{ matrix.os }}" == "ubuntu-24.04-arm" || "${{ matrix.os }}" == "macos-15-intel" || "${{ matrix.os }}" == "macos-latest" ]]
+        then
+          # As at 2026-06-28:
+          #
+          # * ubuntu-24.04-arm, macos-15-intel and macos-latest do not include
+          #   Haskell tools.
+          curl -sSL https://get.haskellstack.org/ | sh
+        fi
+
         if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]
         then
-          # Retry installing nix due to nondeterministic error
+          # Install a faster linker (lld) than Ubuntu's default.
+          # stack-integration-test will seek to use it as the linker on Linux.
+          sudo apt-get update
+          sudo apt-get install -y lld
+          # Set up Nix for Stack's tests that require it.
+          #
+          # Install Nix via the single-user installation...
+          #
+          # Retry installing Nix due to nondeterministic error:
           #   Fatal error: glibc detected an invalid stdio handle
           # See:
           #   https://github.com/nh2/static-haskell-nix/pull/27#issuecomment-502652181
           #   https://github.com/NixOS/nix/issues/2733
           (for i in {1..5}; do bash <(curl -sSL https://nixos.org/nix/install) --no-daemon && exit 0; done; exit 1)
+          # Enter the Nix environment...
           . ~/.nix-profile/etc/profile.d/nix.sh
-          nix-channel --add https://nixos.org/channels/nixos-22.05 nixpkgs
-          nix-channel --update # Get GHC 8.2.2
+          # Add a channel named 'nixpkgs' to the list of subscribed channels...
+          nix-channel --add https://nixos.org/channels/nixos-26.05 nixpkgs
+          # Download the Nix expressions for all subscribed channels...
+          #
+          # As at 2026-07-07, nixos-26.05 provides GHC 9.10.3.
+          nix-channel --update
+          # The NIX_PATH environment variable sets a list of directories used to
+          # look up the location of Nix expressions using paths enclosed in
+          # angle brackets (e.g. <nixpkgs>). nix.sh no longer sets the NIX_PATH.
+          # If NIX_PATH is not set, Nix will fall back to
+          # $HOME/.nix-defexpr/channels, but only in impure and unrestricted
+          # evaluation mode. See https://github.com/NixOS/nixpkgs/issues/149791.
+          # Set NIX_PATH...
+          export NIX_PATH=${NIX_PATH:+$NIX_PATH:}$HOME/.nix-defexpr/channels
         fi
 
         if [[ "${{ matrix.release-args }}" == "--alpine" ]]
@@ -86,76 +162,32 @@ jobs:
             rm -Rf $(stack path --stack-root)/hooks
         fi
 
-        # Do this in the same step as installing deps to get relevant env var modifications
-        stack etc/scripts/release.hs check ${{ matrix.release-args }}
-
-        set +ex
-
-    - name: Build bindist
-      shell: bash
-      run: stack etc/scripts/release.hs build ${{ matrix.release-args }}
-
-    - name: Upload bindist
-      uses: actions/upload-artifact@v3
-      with:
-        name: ${{ runner.os }}
-        path: _release/stack-*
+        # Report the file system disk space usage before checks, for
+        # information.
+        df -h
 
-  configuration:
-    name: Check for self-hosted runners
-    runs-on: ubuntu-latest
-    env:
-      CAN_SIGN: ${{ secrets.RELEASE_SIGNING_KEY != '' }}
-    outputs:
-      arm64-runner: ${{ steps.runners.outputs.arm64 }}
-      can-sign: ${{ env.CAN_SIGN }}
-      test-arm64: ${{ steps.runners.outputs.test-arm64 }}
-    steps:
-    - name: Check for hosted runners
-      id: runners
-      shell: bash
-      env:
-        SELF_HOSTED_RUNNERS: ${{ secrets.SELF_HOSTED_RUNNERS || (github.repository_owner == 'commercialhaskell' && 'arm64') }}
-      run: |
-        echo "::set-output name=runners::$SELF_HOSTED_RUNNERS"
-        if echo "$SELF_HOSTED_RUNNERS" | grep -q 'arm64'; then
-          echo "::set-output name=arm64::['self-hosted', 'linux', 'ARM64']"
-          echo ::set-output name=test-arm64::true
-        else
-          echo "::set-output name=arm64::'ubuntu-latest'"
-          echo ::set-output name=test-arm64::false
+        # Skip checks for Linux/AArch64, given checks for Linux/x86-64
+        if [[ "${{ matrix.os }}" != "ubuntu-24.04-arm" ]]
+        then
+          # Do this in the same step as installing deps to get relevant env var modifications
+          stack etc/scripts/release.hs check ${{ matrix.release-args }}
         fi
 
-  linux-arm64:
-    name: Linux ARM64
-    runs-on: ${{ fromJSON(needs.configuration.outputs.arm64-runner) }}
-    needs: configuration
-    steps:
-    - name: Skipping ARM64
-      if: needs.configuration.outputs.test-arm64 == 'false'
-      shell: bash
-      run: |
-        echo '::notice title=ARM64 skipped::To build ARM64, a self-hosted runner needs to be configured and the SELF_HOSTED_RUNNERS secret must contain arm64'
+        # Report the file system disk space usage after checks, for information.
+        df -h
 
-    - name: Clone project
-      if: needs.configuration.outputs.test-arm64 == 'true'
-      uses: actions/checkout@v3
+        set +ex
 
     - name: Build bindist
-      if: needs.configuration.outputs.test-arm64 == 'true'
       shell: bash
       run: |
-        set -ex
-        docker build . -f etc/dockerfiles/arm64.Dockerfile -t stack --build-arg USERID=$(id -u) --build-arg GROUPID=$(id -g)
-        rm -rf _release
-        mkdir -p _release
-        docker run --rm -v $(pwd):/src -w /src stack bash -c "/home/stack/release build"
+        git status
+        stack etc/scripts/release.hs build ${{ matrix.release-args }}
 
     - name: Upload bindist
-      if: needs.configuration.outputs.test-arm64 == 'true'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v7
       with:
-        name: Linux-ARM64
+        name: ${{ runner.os }}-${{ runner.arch }}
         path: _release/stack-*
 
   github-release:
@@ -163,35 +195,36 @@ jobs:
     permissions:
       contents: write
     needs:
-    - configuration
     - integration-tests
-    - linux-arm64
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-    - name: Download Linux artifact
-      uses: actions/download-artifact@v3
+    - name: Download Linux/x86_64 artifact
+      uses: actions/download-artifact@v8
+      with:
+        name: Linux-X64
+        path: _release
+    - name: Download macOS/x86_64 artifact
+      uses: actions/download-artifact@v8
       with:
-        name: Linux
+        name: macOS-X64
         path: _release
-    - name: Download macOS artifact
-      uses: actions/download-artifact@v3
+    - name: Download macOS/AArch64 artifact
+      uses: actions/download-artifact@v8
       with:
-        name: macOS
+        name: macOS-ARM64
         path: _release
-    - name: Download Windows artifact
-      uses: actions/download-artifact@v3
+    - name: Download Windows/x86_64 artifact
+      uses: actions/download-artifact@v8
       with:
-        name: Windows
+        name: Windows-X64
         path: _release
-    - name: Download Linux-ARM64 artifact
-      if: needs.configuration.outputs.test-arm64 == 'true'
-      uses: actions/download-artifact@v3
+    - name: Download Linux/AArch64 artifact
+      uses: actions/download-artifact@v8
       with:
         name: Linux-ARM64
         path: _release
     - name: Hash and sign assets
-      if: needs.configuration.outputs.can-sign == 'true'
       shell: bash
       env:
         RELEASE_SIGNING_KEY: ${{ secrets.RELEASE_SIGNING_KEY }}
@@ -206,7 +239,7 @@ jobs:
     - name: Create GitHub release (final)
       id: github_release_final
       if: "!startsWith(github.ref, 'refs/tags/rc/')"
-      uses: ncipollo/release-action@v1.10.0
+      uses: ncipollo/release-action@v1.21.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -225,7 +258,7 @@ jobs:
     - name: Create GitHub release (release candidate)
       id: github_release_rc
       if: "startsWith(github.ref, 'refs/tags/rc/')"
-      uses: ncipollo/release-action@v1.10.0
+      uses: ncipollo/release-action@v1.21.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b7aed9b9e1..7d91598e3b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,18 +14,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v7
     - name: Apply yamllint
       uses: ibiqlik/action-yamllint@v3
       with:
         format: github
     - name: Set up HLint
-      uses: haskell/actions/hlint-setup@v2
+      uses: haskell-actions/hlint-setup@v2
       with:
-        version: "3.4"
+        version: "3.10"
     - name: Apply HLint
       run: |
         set -ex
+        hlint app/
         hlint src/
-        hlint src/ --cpp-define=WINDOWS=1
-        hlint test/ --cpp-simple
+        hlint --hint=.hlint-test.yaml tests/unit
+        hlint --hint=.hlint-test.yaml tests/integration
diff --git a/.github/workflows/stan.yml b/.github/workflows/stan.yml
new file mode 100644
index 0000000000..2e6ebd0822
--- /dev/null
+++ b/.github/workflows/stan.yml
@@ -0,0 +1,39 @@
+name: Apply stan
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Apply stan
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Clone project
+      uses: actions/checkout@v7
+
+    - name: Cache dependencies
+      uses: actions/cache@v6
+      with:
+        path: ~/.stack
+        key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}
+
+    - name: Install stan
+      run: |
+        git clone https://github.com/kowainik/stan.git
+        cd stan
+        stack --local-bin-path ../.bin install
+        cd ..
+
+    - name: Generate .hie for analysis
+      run: stack build stack:lib
+
+    - name: Run stan
+      run: .bin/stan report --cabal-file-path=stack.cabal
+
+    - name: Upload HTML report
+      uses: actions/upload-artifact@v7
+      with:
+        name: Stan_report
+        path: stan.html
diff --git a/.github/workflows/stan.yml.disabled b/.github/workflows/stan.yml.disabled
deleted file mode 100644
index 9acc426841..0000000000
--- a/.github/workflows/stan.yml.disabled
+++ /dev/null
@@ -1,52 +0,0 @@
-# This workflow has been disabled by renaming the file `stan.yml.disabled`
-# because Stan does not yet support GHC >= 9.0.
-# See: https://github.com/kowainik/stan/issues/423.
-#
-name: stan
-
-on:
-  pull_request:
-  push:
-    branches:
-    - master
-    - stable
-    - rc/**
-
-jobs:
-  build:
-    name: ghc ${{ matrix.ghc }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        cabal: ["3.6"]
-        ghc:
-        - "8.10.7"
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - uses: haskell/actions/setup@v1
-      name: Setup GHC and cabal-install
-      with:
-        ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
-
-    - uses: actions/cache@v2
-      name: cache ~/.cabal/store
-      with:
-        path: ~/.cabal/store
-        key: ${{ runner.os }}-${{ matrix.ghc }}-cabal
-
-    - name: update
-      run: cabal update
-
-    - name: install stan
-      run: cabal install stan --installdir=.bin --install-method=copy --overwrite-policy=always
-
-    - name: generate .hie for analysis
-      run: cabal build stack:lib:stack
-
-    - name: stan
-      run: .bin/stan report
diff --git a/.github/workflows/tmate.yml b/.github/workflows/tmate.yml
new file mode 100644
index 0000000000..f5d32c289d
--- /dev/null
+++ b/.github/workflows/tmate.yml
@@ -0,0 +1,30 @@
+# See https://github.com/commercialhaskell/stack/issues/6252#issuecomment-1732106343
+# See https://github.com/mxschmitt/action-tmate
+
+name: tmate
+on:
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        type: boolean
+        description: 'Run with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
+        required: false
+        default: false
+
+jobs:
+  debug:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Sign assets
+      shell: bash
+      env:
+        RELEASE_SIGNING_KEY: ${{ secrets.RELEASE_SIGNING_KEY }}
+      run: |
+        echo "$RELEASE_SIGNING_KEY"|gpg --import
+    # Enable tmate debugging of manually-triggered workflows if the input
+    # option was provided
+    - name: Setup tmate session
+      uses: mxschmitt/action-tmate@v3
+      if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+      with:
+        limit-access-to-actor: true
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 537502cdaf..2e240e356c 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -9,8 +9,10 @@ on:
     - rc/**
   workflow_dispatch:
 
-# As of 11 August 2022, ubuntu-latest, windows-latest and macos-latest come with
-# Stack 2.7.5. ubuntu-latest comes with GHC 9.2.4.
+# As of 2026-06-28:
+# * ubuntu-latest comes with Stack 3.11.1 and GHC 9.14.1; and
+# * windows-latest comes with Stack 3.11.1 and GHC 9.14.1.
+# However, macos-15-intel and macos-latest do not come with Haskell tools.
 
 jobs:
   pedantic:
@@ -18,16 +20,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v7
     - name: Cache dependencies
-      uses: actions/cache@v3
+      uses: actions/cache@v6
       with:
         path: ~/.stack
         key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}
         restore-keys: |
           ${{ runner.os }}-
     - name: Pedantic build
-      run: stack --system-ghc build --pedantic
+      run: |
+        stack build --pedantic
+    - name: disable-git-info build
+      run: |
+        stack build --pedantic --flag stack:disable-git-info
   unit-tests:
     name: Unit tests
     runs-on: ${{ matrix.os }}
@@ -36,43 +42,48 @@ jobs:
       matrix:
         include:
         - os: ubuntu-latest
-          stack-yaml: stack.yaml
           extra-suffix: ""
           stack-args: ""
         - os: ubuntu-latest
-          stack-yaml: stack.yaml
           extra-suffix: "alpine"
           stack-args: "--docker --system-ghc --no-install-ghc --flag stack:static"
         - os: windows-latest
-          stack-yaml: stack.yaml
           extra-suffix: ""
           stack-args: ""
         - os: macos-latest
-          stack-yaml: stack-macos.yaml
           extra-suffix: ""
           stack-args: ""
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v7
     - name: Cache dependencies on Unix-like OS
       if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
-      uses: actions/cache@v3
+      uses: actions/cache@v6
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ hashFiles(matrix.stack-yaml) }}-${{ matrix.extra-suffix }}
+        key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ matrix.extra-suffix }}
     - name: Cache dependencies on Windows
       if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v3
+      uses: actions/cache@v6
       with:
         path: |
           ~\AppData\Roaming\stack
           ~\AppData\Local\Programs\stack
-        key: ${{ runner.os }}-${{ hashFiles(matrix.stack-yaml) }}-${{ matrix.extra-suffix }}
+        key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ matrix.extra-suffix }}
+
     - name: Run tests
       shell: bash
       run: |
         set -ex
 
+        if [[ "${{ matrix.os }}" == "macos-latest" ]]
+        then
+          # As at 2026-06-28:
+          #
+          # * macos-latest does not include Haskell tools.
+          curl -sSL https://get.haskellstack.org/ | sh
+        fi
+
         if [[ "${{ matrix.extra-suffix }}" == "alpine" ]]
         then
             mkdir -p ~/.stack
@@ -86,7 +97,7 @@ jobs:
         EOF
         fi
 
-        stack test ${{ matrix.stack-args }} --stack-yaml ${{ matrix.stack-yaml }} --haddock --no-haddock-deps --ghc-options="-Werror -O0" --copy-bins --local-bin-path bin
+        stack test ${{ matrix.stack-args }} --haddock --no-haddock-deps --ghc-options="-Werror -O0" --copy-bins --local-bin-path bin
 
         # Get output about whether the exe is dynamically linked
         if [[ "${{ matrix.os }}" == "macos-latest" ]]
diff --git a/.gitignore b/.gitignore
index 341ba3c70e..78f71258d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,18 +6,26 @@ dist-newstyle/
 
 # Haskell Tool Stack-related
 .stack-work/
-test/integration/tests/**/*.yaml.lock
+tests/integration/tests/**/*.yaml.lock
+etc/scripts/stack.yaml.lock
 
 # Stack's GitHub workflow-related
 _release/
 
 # MkDocs-related
 _site/
+.python-doc-virtualenv
+
+# Haskell Language Server-related
+hie.yaml
 
 # Stan-related
 .hie
 stan.html
 
+# Cabal (the tool)-related
+cabal.project.local
+
 # Emacs-related
 .dir-locals.el
 *_flymake.hs
@@ -39,6 +47,15 @@ stan.html
 # HSpec-related
 .hspec-failures
 
+# macOS-related
+.DS_Store
+
+# VS Code workspace settings
+.vscode
+
+# VS Code Counter (Visual Studio Code Extension)-related
+.VSCodeCounter
+
 # Unexplained
 *~
 *.imports
diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000000..b9a05e4538
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,5 @@
+ignored:
+- DL3003
+- DL3006
+- DL3007
+- DL3018
diff --git a/.hindent.yaml b/.hindent.yaml
deleted file mode 100644
index bf5f55852e..0000000000
--- a/.hindent.yaml
+++ /dev/null
@@ -1 +0,0 @@
-indent-size: 4
diff --git a/.hlint-test.yaml b/.hlint-test.yaml
new file mode 100644
index 0000000000..b700a8bf94
--- /dev/null
+++ b/.hlint-test.yaml
@@ -0,0 +1,25 @@
+# HLint configuration file for test directory
+# https://github.com/ndmitchell/hlint
+
+# A number of extensions are implied by the use of GHC2024.
+- extensions:
+  - default: false
+  # The following list provides an inventory of extensions used over and above
+  # the GHC2024 set. Other extensions can be added, if need be.
+  - name:
+    - NoImplicitPrelude
+    - CPP
+    - DuplicateRecordFields
+    - NoFieldSelectors
+    - OverloadedLists
+    # Provided from GHC 9.2.1 (base-4.16.0.0):
+    - OverloadedRecordDot
+    - OverloadedStrings
+    - QuasiQuotes
+    - Safe
+    - TemplateHaskell
+    - ViewPatterns
+
+# The filepath-1.5.4.0 package, used in testing, fails Hlint in many ways.
+- ignore:
+    path: "tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/*"
diff --git a/.hlint.yaml b/.hlint.yaml
index e9f8c842f3..e7edb7a40f 100644
--- a/.hlint.yaml
+++ b/.hlint.yaml
@@ -50,51 +50,61 @@
     within:
     - Network.HTTP.StackClient
 
-# Not considered useful hints
-- ignore: {name: "Redundant do"}
-- ignore: {name: "Use section"}
-- ignore: {name: "Use camelCase"}
-- ignore: {name: "Use list comprehension"}
-- ignore: {name: "Redundant if"}
-- ignore: {name: "Avoid lambda"}
-- ignore: {name: "Eta reduce"}
-- ignore: {name: "Use fmap"}  # specific for GHC 7.8 compat
-- ignore: {name: "Parse error"}  # we trust the compiler over HLint
-- ignore: {name: "Use =="}  # Creates infinite loops in `EQ` using expressions
-- ignore: {name: "Evaluate"}
-- ignore: {name: "Use &&&"}
-- ignore: {name: "Redundant compare"}
-- ignore: {name: "Use Just"}
-- ignore: {name: "Avoid lambda using `infix`"}
-
-# Added in hlint-2.0.10, ignoring for now
-- ignore: {name: "Unnecessary hiding"}
-- ignore: {name: "Use lambda-case"}
-
-- ignore:
-    name: "Use fewer imports"
+# A number of extensions are implied by the use of GHC2024.
+- extensions:
+  - default: false
+  # The following list provides an inventory of extensions used over and above
+  # the GHC2024 set. Other extensions can be added, if need be.
+  - name:
+    - NoImplicitPrelude
+    - ApplicativeDo
+    - DefaultSignatures
+    - DuplicateRecordFields
+    - MultiWayIf
+    - NoFieldSelectors
+    - OverloadedLists
+    # Provided from GHC 9.2.1 (base-4.16.0.0):
+    - OverloadedRecordDot
+    - OverloadedStrings
+    - QuasiQuotes
+    - TypeFamilies
+    - UndecidableInstances
+    - ViewPatterns
+  # Stack's code generally avoids the use of C preprocessor (CPP) directives.
+  - name: CPP
+    within:
+    - GHC.Utils.GhcPkg.Main.Compat
+    - Stack.BuildInfo
+    - Stack.Constants
+  - name: ExplicitNamespaces
     within:
-    - System.Process.Read  # Related to 'Hide post-AMP warnings' comment
-    - Stack.Exec  # ifdef for System.Process.Read
+    - Stack.Prelude
+  # The following list provides an inventory of the small number of modules
+  # where Template Haskell is used.
+  - name: TemplateHaskell
+    within:
+    - Stack.Constants
+    - Stack.Constants.Config
+    - Stack.Constants.UsrLibDirs
+    - Stack.Ghci.ScriptSpec
+    - Stack.Storage.Project
+    - Stack.Storage.User
+  # src/setup-shim/StackSetupShim.hs is a resource, not part of Stack's code.
+  - within: StackSetupShim
+    name:
+    - CPP
+    - PackageImports
 
-# Related to 'explicit pattern matching is clearer' comment
+# Not considered useful hints
 - ignore:
-    name: "Use fromMaybe"
+    name: "Use camelCase"
     within:
-    - Stack.Types.Config.explicitSetupDeps
-
-# For clarity (related to do syntax)
+    - System.Terminal
 - ignore:
-    name: "Reduce duplication"
+    name: "Avoid lambda using `infix`"
     within:
-    - Network.HTTP.Download.VerifiedSpec
-    - Stack.PackageDumpSpec
-    - Stack.Types.StackT
-    - Stack.Docker
-
-# Gives an incorrect hint that breaks type checking due to mismatched types
+    - System.Process.Pager.pageWriter
 - ignore:
-    name: "Too strict maybe"
+    name: "Unused LANGUAGE pragma"
     within:
-    - Stack.Config
-    - Stack.Package
+    - StackSetupShim
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index c71ecc757f..481cdfb07a 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -7,9 +7,9 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-20.04
+  os: ubuntu-24.04
   tools:
-    python: "3.9"
+    python: "3.12"
 
 mkdocs:
   configuration: mkdocs.yml
diff --git a/.stan.toml b/.stan.toml
index 7eef7609bb..5e7cfe7665 100644
--- a/.stan.toml
+++ b/.stan.toml
@@ -1,89 +1,329 @@
-# Partial: base/!!
+# Partial: base/head
+# Usage of partial function 'head' for lists
+[[ignore]]
+  id = "OBS-STAN-0001-1XF2BN-73:1"
+# ✦ Category:      #Partial #List
+# ✦ File:          src\Stack\Storage\Project.hs
+#
+#   73 ┃ share [ mkPersist sqlSettings
+
+# Partial: base/head
+# Usage of partial function 'head' for lists
+[[ignore]]
+  id = "OBS-STAN-0001-0pmobG-92:1"
+# ✦ Category:      #Partial #List
+# ✦ File:          src\Stack\Storage\User.hs
+#
+#   92 ┃ share [ mkPersist sqlSettings
+
+# Partial: base/last
+# On Windows
+# To exclude .stack-work\dist\<hash>\build\stack\autogen\Paths_stack.hs
 [[check]]
-  id = "STAN-0005"
-  scope = "all"
+  id = "STAN-0004"
+  directory = ".stack-work\\dist"
+  type = "Exclude"
+
+# Partial: base/last
+# On Unix-like operating systems
+# To exclude .stack-work/dist/<hash>/build/stack/autogen/Paths_stack.hs
+[[check]]
+  id = "STAN-0004"
+  directory = ".stack-work/dist"
   type = "Exclude"
 
-# Partial: base/minimum
+# Partial: ghc-internal/succ
+# Usage of partial function 'succ' for enumerable types
+# Stack uses Enum in many places
 [[check]]
-  id = "STAN-0014"
+  id = "STAN-0010"
   scope = "all"
   type = "Exclude"
 
-# Partial: base/minimumBy
+# Partial: ghc-internal/pred
+# Usage of partial function 'pred' for enumerable types
+# Stack uses Enum in many places
 [[check]]
-  id = "STAN-0016"
+  id = "STAN-0011"
   scope = "all"
   type = "Exclude"
 
-# Partial: base/fromList
+# Partial: ghc-internal/toEnum
+# Usage of partial function 'toEnum' for enumerable types
+# Stack uses Enum in many places
 [[check]]
-  id = "STAN-0020"
+  id = "STAN-0012"
   scope = "all"
   type = "Exclude"
 
 # Infinite: base/reverse
+# Usage of the 'reverse' function that hangs on infinite lists
+# Stack uses Data.List.reverse in many places
 [[check]]
   id = "STAN-0101"
   scope = "all"
   type = "Exclude"
 
 # Infinite: base/isSuffixOf
-[[check]]
-  id = "STAN-0102"
-  scope = "all"
-  type = "Exclude"
+# Usage of the 'isSuffixOf' function that hangs on infinite lists
+[[ignore]]
+  id = "OBS-STAN-0102-luLR/n-540:30"
+# ✦ Category:      #Infinite #List
+# ✦ File:          src\Stack\New.hs
+#
+#  539 ┃
+#  540 ┃   let isPkgSpec f = ".cabal" `L.isSuffixOf` f || "package.yaml" `L.isSuffixOf` f
+#  541 ┃                              ^^^^^^^^^^^^^^
+
+# Infinite: base/isSuffixOf
+# Usage of the 'isSuffixOf' function that hangs on infinite lists
+[[ignore]]
+  id = "OBS-STAN-0102-luLR/n-540:65"
+# ✦ Category:      #Infinite #List
+# ✦ File:          src\Stack\New.hs
+#
+#  539 ┃
+#  540 ┃   let isPkgSpec f = ".cabal" `L.isSuffixOf` f || "package.yaml" `L.isSuffixOf` f
+#  541 ┃                                                                 ^^^^^^^^^^^^^^
+
+# Infinite: ghc-internal/isSuffixOf
+# Usage of the 'isSuffixOf' function that hangs on infinite lists
+[[ignore]]
+  id = "OBS-STAN-0102-8cspI6-404:41"
+# ✦ Category:      #Infinite #List
+# ✦ File:          src\Stack\Coverage.hs
+#
+#  403 ┃
+#  404 ┃                   pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
+#  405 ┃                                         ^^^^^^^^^^^^^^
+
+# Infinite: ghc-internal/isSuffixOf
+# Usage of the 'isSuffixOf' function that hangs on infinite lists
+[[ignore]]
+  id = "OBS-STAN-0102-8cspI6-437:31"
+# ✦ Category:      #Infinite #List
+# ✦ File:          src\Stack\Coverage.hs
+#
+#  436 ┃
+#  437 ┃         pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
+#  438 ┃                               ^^^^^^^^^^^^^^
+
+# Infinite: ghc-internal/isSuffixOf
+# Usage of the 'isSuffixOf' function that hangs on infinite lists
+[[ignore]]
+  id = "OBS-STAN-0102-8cspI6-668:30"
+# ✦ Category:      #Infinite #List
+# ✦ File:          src\Stack\Coverage.hs
+#
+#  667 ┃
+#  668 ┃       pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
+#  669 ┃                             ^^^^^^^^^^^^^^
+
+# Infinite: ghc-internal/isSuffixOf
+# Usage of the 'isSuffixOf' function that hangs on infinite lists
+[[ignore]]
+  id = "OBS-STAN-0102-hTeu0Y-664:23"
+# ✦ Category:      #Infinite #List
+# ✦ File:          src\Stack\Init.hs
+#
+#  663 ┃
+#  664 ┃   isCabal = (".cabal" `isSuffixOf`) . toFilePath
+#  665 ┃                       ^^^^^^^^^^^^
 
 # Infinite: base/length
+# Usage of the 'length' function that hangs on infinite lists
+# Stack uses Data.List.length in many places
 [[check]]
   id = "STAN-0103"
   scope = "all"
   type = "Exclude"
 
-# Anti-pattern: foldl
+# Anti-pattern: Data.ByteString.Char8.pack
+[[ignore]]
+  id = "OBS-STAN-0203-EmXRiW-573:17"
+# ✦ Description:   Usage of 'pack' function that doesn't handle Unicode characters
+# ✦ Category:      #AntiPattern
+# ✦ File:          src/Stack/Build/Backpack.hs
+#
+#   572 ┃
+#   573 ┃         input = S8.pack (L.intercalate "," sorted)
+#   574 ┃                 ^^^^^^^
+
+# Anti-pattern: Data.ByteString.Char8.pack
+[[ignore]]
+  id = "OBS-STAN-0203-erw24B-1150:3"
+# ✦ Description:   Usage of 'pack' function that doesn't handle Unicode characters
+# ✦ Category:      #AntiPattern
+# ✦ File:          src\Stack\Build\ExecuteEnv.hs
+#
+#  1149 ┃
+#  1150 ┃   S8.pack . formatTime defaultTimeLocale "%Y-%m-%dT%H:%M:%S%6Q"
+#  1151 ┃   ^^^^^^^
+
+# Anti-pattern: Data.ByteString.Char8.pack
+[[ignore]]
+  id = "OBS-STAN-0203-tuE+RG-327:24"
+# ✦ Description:   Usage of 'pack' function that doesn't handle Unicode characters
+# ✦ Category:      #AntiPattern
+# ✦ File:          src\Stack\Build\ExecutePackage.hs
+#
+#   326 ┃
+#   327 ┃   newConfigFileRoot <- S8.pack . toFilePath <$> view configFileRootL
+#   328 ┃                        ^^^^^^^
+
+# Anti-pattern: Data.ByteString.Char8.pack
+[[ignore]]
+  id = "OBS-STAN-0203-hTeu0Y-395:17"
+# ✦ Description:   Usage of 'pack' function that doesn't handle Unicode characters
+# ✦ Category:      #AntiPattern
+# ✦ File:          src\Stack\Init.hs
+#
+#  394 ┃
+#  395 ┃   commentHelp = BC.pack .  intercalate "\n" . map commentLine
+#  396 ┃                 ^^^^^^^
+
+# Anti-pattern: Data.ByteString.Char8.pack
+[[ignore]]
+  id = "OBS-STAN-0203-hTeu0Y-412:26"
+# ✦ Description:   Usage of 'pack' function that doesn't handle Unicode characters
+# ✦ Category:      #AntiPattern
+# ✦ File:          src\Stack\Init.hs
+#
+#  411 ┃
+#  412 ┃         <> B.byteString (BC.pack $ concat
+#  413 ┃                          ^^^^^^^
+
+# Anti-pattern: Data.ByteString.Char8.pack
+[[ignore]]
+  id = "OBS-STAN-0203-axv1UG-351:30"
+# ✦ Description:   Usage of 'pack' function that doesn't handle Unicode characters
+# ✦ Category:      #AntiPattern
+# ✦ File:          src\Stack\Docker.hs
+#
+#  350 ┃
+#  351 ┃   hashRepoName = Hash.hash . BS.pack . takeWhile (\c -> c /= ':' && c /= '@')
+#  352 ┃                              ^^^^^^^
+
+# Anti-pattern: Slow 'nub' for lists
+[[ignore]]
+  id = "OBS-STAN-0209-EmXRiW-328:19"
+# ✦ Description:   Usage of 'nub' on lists that runs in quadratic time
+# ✦ Category:      #AntiPattern
+# ✦ File:          src/Stack/Build/Backpack.hs
+#
+#   327 ┃
+#   328 ┃                   L.nub $ collectInheritedSigs sigPkg adrMap' Set.empty
+#   329 ┃                   ^^^^^
+
+# Data types with non-strict fields
+# Defining lazy fields in data types can lead to unexpected space leaks
+# Stack uses lazy fields in many places
 [[check]]
-  id = "STAN-0202"
+  id = "STAN-0206"
   scope = "all"
   type = "Exclude"
 
-# Anti-pattern: Data.ByteString.Char8.pack
+# Anti-pattern: Slow 'length' for Text
+# On Windows
 [[check]]
-  id = "STAN-0203"
-  scope = "all"
+  id = "STAN-0208"
+  file = "src\\Stack\\Build\\ConstructPlan.hs"
   type = "Exclude"
 
-# Data types with non-strict fields
+# Anti-pattern: Slow 'length' for Text
+# On Unix-like operating systems
 [[check]]
-  id = "STAN-0206"
-  scope = "all"
+  id = "STAN-0208"
+  file = "src/Stack/Build/ConstructPlan.hs"
   type = "Exclude"
 
-# Anti-pattern: Foldable methods on possibly error-prone structures
+# Anti-pattern: Slow 'length' for Text
+# On Windows
 [[check]]
-  id = "STAN-0207"
-  scope = "all"
+  id = "STAN-0208"
+  file = "src\\Stack\\Build\\Execute.hs"
   type = "Exclude"
 
 # Anti-pattern: Slow 'length' for Text
+# On Unix-like operating systems
 [[check]]
   id = "STAN-0208"
-  scope = "all"
+  file = "src/Stack/Build/Execute.hs"
   type = "Exclude"
 
-# Anti-pattern: unsafe functions
+# Anti-pattern: Slow 'length' for Text
+# On Windows
 [[check]]
-  id = "STAN-0212"
-  scope = "all"
+  id = "STAN-0208"
+  file = "src\\Stack\\PackageDump.hs"
+  type = "Exclude"
+
+# Anti-pattern: Slow 'length' for Text
+# On Unix-like operating systems
+[[check]]
+  id = "STAN-0208"
+  file = "src/Stack/PackageDump.hs"
   type = "Exclude"
 
+# Anti-pattern: unsafe functions
+[[ignore]]
+  id = "OBS-STAN-0212-5rtOmw-499:33"
+# ✦ Description:   Usage of unsafe functions breaks referential transparency
+# ✦ Category:      #Unsafe #AntiPattern
+# ✦ File:          src\Stack\Constants.hs
+#
+#  498 ┃
+#  499 ┃ setupGhciShimCode = byteString $(do
+#  500 ┃     path <- makeRelativeToProject "src/setup-shim/StackSetupShim.hs"
+#  501 ┃     embedFile path)
+#  502 ┃
+
+# Anti-pattern: unsafe functions
+[[ignore]]
+  id = "OBS-STAN-0212-FNS1cF-68:17"
+# ✦ Description:   Usage of unsafe functions breaks referential transparency
+# ✦ Category:      #Unsafe #AntiPattern
+# ✦ File:          src\Stack\BuildOpts.hs
+#
+#   67 ┃
+#   68 ┃   buildMonoid = undefined :: BuildOptsMonoid
+#   69 ┃                 ^^^^^^^^^
+
+# Anti-pattern: unsafe functions
+[[ignore]]
+  id = "OBS-STAN-0212-FNS1cF-81:14"
+# ✦ Description:   Usage of unsafe functions breaks referential transparency
+# ✦ Category:      #Unsafe #AntiPattern
+# ✦ File:          src\Stack\BuildOpts.hs
+#
+#   79 ┃
+#   80 ┃   toMonoid = undefined :: TestOptsMonoid
+#   81 ┃              ^^^^^^^^^
+
+# Anti-pattern: unsafe functions
+[[ignore]]
+  id = "OBS-STAN-0212-FNS1cF-92:15"
+# ✦ Description:   Usage of unsafe functions breaks referential transparency
+# ✦ Category:      #Unsafe #AntiPattern
+# ✦ File:          src/Stack/BuildOpts.hs
+#
+#   90 ┃
+#   91 ┃   beoMonoid = undefined :: BenchmarkOptsMonoid
+#   92 ┃               ^^^^^^^^^
+
 # Anti-pattern: Pattern matching on '_'
+# Pattern matching on '_' for sum types can create maintainability issues
+# Stack uses pattern matching on '_' in many places.
 [[check]]
   id = "STAN-0213"
   scope = "all"
   type = "Exclude"
 
+# Big tuples
 # Using tuples of big size (>= 4) can decrease code readability
+# In serveral places Stack uses 4-tuples and in one place Stack uses a
+# 5-tuple.
 [[check]]
   id = "STAN-0302"
   scope = "all"
-  type = "Exclude"
\ No newline at end of file
+  type = "Exclude"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9ae65c81ff..dd872e3145 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,8 +39,8 @@ improvements, and feature enhancements.
 Maintainers should be included in discussions of controversial changes and
 tricky code changes.
 
-Our general approach is **"it's easier to ask forgiveness than permission"**. If
-there is ever a bad change, it can always be rolled back.
+Our general approach is **"it is easier to ask forgiveness than permission"**.
+If there is ever a bad change, it can always be rolled back.
 
 ### Stack's maintainers
 
@@ -87,11 +87,18 @@ topics, and that is reflected in the current issue tracker content. Assistance
 in responding to such matters is greatly appreciated.
 
 While support-related matters can be posted here as an 'issue', we encourage the
-use of other forums, in particular
-[Haskell's Discourse](https://discourse.haskell.org/). We also recommend
-Haskell's Discourse for general discussions about Stack's current or desired
-features. Stack is also discussed on Reddit's
-[Haskell community](https://www.reddit.com/r/haskell/).
+use of other forums, in particular the
+[Haskell Community](https://discourse.haskell.org/) forum. See its 'Learn'
+category. We also recommend that forum for general discussions about Stack's
+current or desired features.
+
+Stack is also discussed:
+
+* in the Haskell
+  [Stack and Stackage](https://matrix.to/#/#haskell-stack:matrix.org) room
+  (address `#haskell-stack:matrix.org`) on [Matrix](https://matrix.org/); and
+
+* on Reddit's [Haskell community](https://www.reddit.com/r/haskell/).
 
 We encourage use of those other forums because support-related discussions can
 clog up the issue tracker and make it more difficult to maintain the project.
@@ -115,7 +122,20 @@ confirmation and we will close it.
 
 ## Documentation
 
-The files which make up Stack's documentation are located in the `doc`
+Consistent with its goal of being easy to use, Stack aims to maintain a high
+quality of in-tool and online documentation.
+
+The in-tool documentation includes the output when the `--help` flag is
+specified and the content of Stack's warning and error messages.
+
+When drafting documentation it is helpful to have in mind the intended reader
+and what they are assumed to know, and not know, already. In that regard,
+documentation should aim to meet, at least, the needs of a person who is about
+to begin to study computing as an undergraduate but who has not previously
+coded using Haskell. That person may be familiar with one popular operating
+system but may not be familiar with others.
+
+The files which make up Stack's online documentation are located in the `doc`
 directory of the repository. They are formatted in the
 [Markdown syntax](https://daringfireball.net/projects/markdown/), with some
 extensions.
@@ -135,11 +155,41 @@ documentation, please submit a
 changes/additions based off the
 [stable branch](https://github.com/commercialhaskell/stack/tree/stable).
 
+The Markdown files are organised into the navigation menu (the table of
+contents) in the file `mkdocs.yml`, the configuration file for MkDocs. The
+description of a file in the menu can differ from the file's name. The
+navigation menu allows files to be organised in a hierarchy. Currently, up to
+three levels are used. The top level is:
+
+* **Welcome!:** The introduction to Stack. This page aims to be no longer than
+  necessary but also to not assume much existing knowledge on the part of the
+  reader. It provides a 'quick start' guide to getting and using Stack.
+* **How to get & use Stack:** This includes Stack's user's guide, answers to
+  frequently asked questions, and more thorough explanations of aspects of
+  Stack. The user's guide is divided into two parts. The first part is
+  'introductory', and has the style of a tutorial. The second part is
+  'advanced', and has more of a reference style.
+* **How Stack works (advanced):** Many users will not need to consult this
+  advanced documentation.
+* **Stack's code (advanced):** Other information useful to people contributing
+  to, or maintaining, Stack's code, documentation, and other files.
+* **Signing key:** How Stack's released executables are signed.
+* **Glossary:** A glossary of terms used throughout Stack's in-tool and online
+  documentation. We aim to describe the same things in the same way in different
+  places.
+* **Version history:** The log of changes to Stack between versions.
+
 The specific versions of the online documentation (eg `v: v2.9.1`) are generated
 from the content of files at the point in the repository's history specified by
 the corresponding release tag. Consequently, that content is fixed once
 released.
 
+If the names of Markdown files do not change between versions, then people can
+use the flyout on the online documentation to move between different versions of
+the same page. For that reason, the names of new Markdown files should be chosen
+with care and existing Markdown files should not be deleted or renamed without
+due consideration of the consequences.
+
 The Markdown syntax supported by MkDocs and the Material for MkDocs theme can
 differ from the GitHub Flavored Markdown ([GFM](https://github.github.com/gfm/))
 supported for content on GitHub.com. Please refer to the
@@ -148,8 +198,8 @@ and the
 [Material for MkDocs reference](https://squidfunk.github.io/mkdocs-material/reference/)
 to ensure your pull request will achieve the desired rendering.
 
-The configuration file for MkDocs is `mkdocs.yml`. The extensions to the basic
-Markdown syntax used include:
+The extensions to the basic Markdown syntax used are set out in `mkdocs.yml` and
+include:
 
 * admonitions
 * code blocks, with syntax highlighting provided by
@@ -166,14 +216,113 @@ repository on Windows, then the files will be checked out as small plain files
 that contain the link text  See the
 [Git documentation](https://git-scm.com/docs/git-config#Documentation/git-config.txt-coresymlinks).
 
+The online documentation can be previewed using the `mkdocs` tool, as described
+in [Getting Started with MkDocs](https://www.mkdocs.org/getting-started/). The
+prerequisites are:
+
+*   [Python](https://www.python.org/); and
+*   the required Python packages set out in `doc/requirements.txt`. They can be
+    installed using Python's package manager `pip` with:
+
+    ~~~text
+    pip install --requirement doc/requirements.txt
+    ~~~
+
+Once the required version of `mkdocs` is installed, command `mkdocs serve` in
+the same directory as the `mkdocs.yml` file to start a web server. The command
+will, eventually, output the URL at which the documentation is being served.
+
+Command `mkdocs build` to build the documentation.
+
+=== "Windows"
+
+    With the correct prerequisites (see further below), users of the `make` tool
+    in the Stack-supplied MSYS2 environment can automate some of these steps
+    from Stack's project directory with:
+
+    * preview: `stack exec -- make docs-serve`; and
+    * build: `stack exec -- make _site/index.html`.
+
+    However, Windows and the Stack-supplied MSYS2 environment do not come with
+    Python or `make` by default. Further, Python on Windows does not use the
+    `python3` command (used on Unix-like operating systems) to invoke Python.
+    Further still, in the MSYS2 environment, development versions of packages
+    `libxml2` and `libxslt` are necessary dependencies. Consequently, the
+    automation requires the following command to install requirements into the
+    the MSYS2 environment:
+
+    ~~~text
+    stack exec -- pacman --sync python make libxml2-devel libxslt-devel
+    ~~~
+
+    !!! note
+
+        If the automation fails before the `mkdocs` tool etc is installed, the
+        directory `.python-doc-virtualenv` created by the automation will need
+        to be deleted before the automation will work again.
+
+    For most users, the automation will be less convenient than simply using the
+    `mkdocs serve` command directly.
+
+=== "Unix-like"
+
+    With `python3` and `make` available on the PATH, users of the `make` tool
+    can automate some of these steps from Stack's project directory with:
+
+    * preview: `make docs-serve`; and
+    * build: `make _site/index.html`.
+
+## Error messages
+
+Stack catches exceptions thrown by its dependencies or by Stack itself in
+`Stack.main`. In addition to exceptions that halt Stack's execution, Stack logs
+certain other matters as 'errors'.
+
+To support the Haskell Foundation's
+[Haskell Error Index](https://errors.haskell.org/) initiative, all Stack
+error messages generated by Stack itself should have a unique initial line:
+
+~~~text
+Error: [S-nnnn]
+~~~
+
+where `nnnn` is a four-digit number in the range 1000 to 9999.
+
+If you create a new Stack error, select a number using a random number generator
+(see, for example, [RANDOM.ORG](https://www.random.org/)) and check that number
+is not already in use in Stack's code. If it is, pick another until the number
+is unique.
+
+All exceptions generated by Stack itself are implemented using data constructors
+of closed sum types. Typically, there is one such type for each module that
+exports functions that throw exceptions. This type and the related `instance`
+definitions are usually located at the top of the relevant module.
+
+Stack supports two types of exceptions: 'pretty' exceptions that are instances
+of class `RIO.PrettyPrint.Pretty`, which provides `pretty :: e -> StyleDoc`, and
+thrown as expressions of type `RIO.PrettyPrint.PrettyException.PrettyException`;
+and other 'plain' exceptions that are simply instances of class
+`Control.Exception.Exception` and, hence, instances of class `Show`. These types
+and classes are re-exported by `Stack.Prelude`.
+
+Stack throws exceptions in parts of the code that should, in principle, be
+unreachable. The functions `Stack.Prelude.bugReport` and
+`Stack.Prelude.bugPrettyReport` are used to give the messages a consistent
+format. The names of the data constructors for those exceptions usually end in
+`Bug`.
+
+In a few cases, Stack may throw an exception in 'pure' code. The function
+`RIO.impureThrow :: Exception e => e -> a`, re-exported by `Stack.Prelude`, is
+used for that purpose.
+
 ## Code
 
 If you would like to contribute code to fix a bug, add a new feature, or
-otherwise improve `stack`, pull requests are most welcome. It's a good idea to
+otherwise improve `stack`, pull requests are most welcome. It is a good idea to
 [submit an issue](https://github.com/commercialhaskell/stack/issues/new) to
 discuss the change before plowing into writing code.
 
-If you'd like to help out but aren't sure what to work on, look for issues with
+If you'd like to help out but are not sure what to work on, look for issues with
 the
 [awaiting pull request](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3A%22awaiting+pull+request%22)
 label. Issues that are suitable for newcomers to the codebase have the
@@ -181,22 +330,51 @@ label. Issues that are suitable for newcomers to the codebase have the
 label. Best to post a comment to the issue before you start work, in case anyone
 has already started.
 
-Please include a
-[ChangeLog](https://github.com/commercialhaskell/stack/blob/master/ChangeLog.md)
-entry and
-[documentation](https://github.com/commercialhaskell/stack/tree/master/doc/)
-updates with your pull request.
+Please include with your pull request:
+
+* a
+  [ChangeLog](https://github.com/commercialhaskell/stack/blob/master/ChangeLog.md)
+  entry; and
+
+* [documentation](https://github.com/commercialhaskell/stack/tree/master/doc/)
+  updates.
+
+## Backwards Compatibility
+
+The Stack package provides a library and an executable (`stack`) that depends on
+the library. The library is intended for use only by the executable.
+
+Consequently, the Stack package does not need to, and does not, strive for the
+compatibility with a range of versions of GHC that a library package (such as
+`pantry`) would seek.
 
-## Backwards Compatability
+Stack aims to depend on well-known packages. The specific versions on which it
+depends at any time are specified by `package.yaml` and `stack.yaml`. It does
+not aim to be compatible with more than one version of the `Cabal` package at
+any time. At the time of writing (May 2026) the package versions are
+primarily ones in Stackage snapshot LTS Haskell 24.55 (for GHC 9.10.3),
+`Cabal-3.16.1.0`, `pantry-0.11.2`, `persistent-2.18.1.0` and the latest version
+of packages in the `tls` family (which reduce dependencies on unmaintained
+packages).
 
-The Stack executable does not need to, and does not, strive for the same broad
-compatability with versions of GHC that a library package (such as `pantry`)
-would seek. Instead, Stack aims to define a well-known combination of
-dependencies on which its executable relies. That applies in particular to the
-`Cabal` package, where Stack aims to support one, and only one, version of
-`Cabal` with each release of its executable. At the time of writing (September
-2022) that combination is defined by resolver `nightly-2022-09-05` (for
-GHC 9.2.4, and including `Cabal-3.6.3.0`) - see `stack.yaml`.
+A Stack executable makes use of Cabal (the library) through a small 'Setup'
+executable that it compiles from Haskell source code. The executable compiles
+that code with a dependency on the version of Cabal that ships with the
+specified GHC compiler. Each release of Stack will normally aim to support all
+versions of GHC and the Cabal package in Stackage LTS Haskell snapshots
+published within seven years of the release.
+
+For example, snapshot LTS Haskell 15.0, published on 16 February 2020, was the
+first LTS Haskell snapshot to provide GHC 8.8.2 which comes with `base-4.13.0.0`
+and `Cabal-3.0.1.0`. Normally, until, at least, 16 February 2027, Stack releases
+would aim to support the immediate predecessor, GHC 8.6.5 and `base-4.12.0.0`,
+`Cabal-2.4.0.1` and Haddock 2.22.0.
+
+Stack 3.11.1 in fact supports GHC 8.4.1 and `base-4.11.0.0` and `Cabal-2.2.0.0`.
+
+When a version of the Stack executable actually ceases to support a version of
+GHC and `Cabal`, that should be recorded in Stack's
+[ChangeLog](https://github.com/commercialhaskell/stack/blob/master/ChangeLog.md).
 
 ## Code Quality
 
@@ -243,38 +421,129 @@ Once installed, you can check your changes with command:
 stack exec -- sh ./etc/scripts/hlint.sh
 ~~~
 
+## Code syntax
+
+Stack makes use of GHC's `GHC2024` collection of language extensions. That is
+set using the `language` key in the `package.yaml` file.
+
+The `GHC2024` edition enables the `MonoLocalBinds` language extension. Enabling
+the extension can change how GHC infers the types of local bindings (that is,
+let-bound or where-bound variables). When enabled it means that the types of a
+group of local bindings are not generalised unless:
+
+* any of its binders has a partial type signature; or
+
+* all of its free variables are closed. If a variable is closed then its type
+  definitely has no free type variables. A variable imported from another module
+  is closed. A variable that is let-bound and has an explicit type signature
+  with no free type variables is closed.
+
+Stack makes use of single-constructor types where the constructor has a large
+number of fields. Some of those fields have similar types, and so on. Given
+that, Stack makes use of `OverloadedRecordDot`, introduced in GHC 9.2.1. It also
+makes use of `NoFieldSelectors`, also introduced in GHC 9.2.1, and, where
+necessary, `DuplicateRecordFields`. Together, these language extensions enable
+the removal from the names of fields of the prefixes that were used historically
+to indicate the type and make field names unique. This is because the names of
+fields no longer need to be unique in situations where the intended field is
+unambiguous. This allows for a terser syntax without loss of expressiveness.
+For example:
+
+~~~haskell
+let cliTargets = (boptsCLITargets . bcoBuildOptsCLI) bco
+~~~
+
+can become:
+
+~~~haskell
+let cliTargets = bco.buildOptsCLI.targets
+~~~
+
+The intended field is unambiguous in almost all cases. In the case of a few
+record updates it is ambiguous. The name of the field needs to be qualified in
+those cases. For example:
+
+~~~haskell
+import qualified  Stack.Types.Build as ConfigCache ( ConfigCache (..) )
+...
+let ignoreComponents :: ConfigCache -> ConfigCache
+    ignoreComponents cc = cc { ConfigCache.components = Set.empty }
+~~~
+
+## Code Style
+
+A single code style is not applied consistently to Stack's code and Stack is not
+Procrustean about matters of style. Rules of thumb, however, are:
+
+* keep pull requests that simply reformat code separate from those that make
+  other changes to code; and
+* when making changes to code other than reformatting, follow the existing style
+  of the function(s) or module(s) in question.
+
+That said, the following may help:
+
+* Stack's code generally avoids the use of C preprocessor (CPP) directives.
+  Windows and non-Windows code is separated in separate source code directories
+  and distinguished in Stack's Cabal file. `Stack.Constants.osIsWindows :: Bool`
+  is provided. Multi-line strings are generally formatted on the assumption that
+  GHC's `CPP` language pragma is not being used.
+* Language pragmas usually start with `NoImplictPrelude`, where applicable, and
+  then all others are listed alphabetically. The closing `#-}` are aligned, for
+  purely aesthetic reasons.
+* Stack is compiled with GHC's `-Wall` enabled, which includes `-Wtabs` (no tabs
+  in source code). Most modules are based on two spaces (with one space for a
+  `where`) for indentation but older and larger modules are still based on four
+  spaces.
+* Stack's code and documentation tends to be based on lines of no more than 80
+  characters or, if longer, no longer than necessary.
+* Stack uses export lists.
+* Stack's imports are listed alphabetically, including `Stack.Prelude`, where
+  applicable. The module names are left aligned, with space left for `qualified`
+  where it is absent.
+* Stack's code is sufficiently stable that explicit import lists can sensibly be
+  used. The exception is the import of `Stack.Prelude`. Not all modules have
+  comprehensive explicit import lists.
+* Short explicit import lists follow the module name. Longer lists start on the
+  line below the module name. Spaces are used to separate listed items from
+  their enclosing parentheses.
+* As noted above, the types used to implement Stack's exceptions and the related
+ `instance` definitions are usually located at the top of the relevant module.
+* In function type signatures, the `::` is kept on the same line as the
+  function's name. This format is Haskell syntax highlighter-friendly.
+* If `where` is used, the declarations follow on a separate line.
+
 ## Testing
 
-The Stack code has both unit tests and integration tests. Integration tests can
-be found in the
-[test/integration](https://github.com/commercialhaskell/stack/tree/master/test/integration)
-folder and unit tests, in the
-[src/test](https://github.com/commercialhaskell/stack/tree/master/src/test)
-folder. Tests are written using the [Hspec](https://hspec.github.io/) framework.
-In order to run the full test suite, you can simply command:
+The Stack code has both unit tests and integration tests.
+
+### Working with Unit Tests
+
+Unit tests can be found in the
+[tests/unit](https://github.com/commercialhaskell/stack/tree/master/tests/unit)
+directory. Tests are written using the [Hspec](https://hspec.github.io/)
+framework. In order to run the full test suite, you can simply command:
 
 ~~~text
 stack test
 ~~~
 
 The `--file-watch` is a very useful option to get quick feedback. However,
-running the entire test suite after each file change will slow you down. You'll
-need to specify which test suite (unit test or integration) and pass arguments
-to specify which module you'd specifically like to run to get quick feedback. A
-description of this follows below.
+running the entire test suite after each file change will slow you down. You
+will need to specify which test suite (unit test or integration) and pass
+arguments to specify which module you'd specifically like to run to get quick
+feedback. A description of this follows below.
 
-### Working with Unit Tests
 
 If you would like to run the unit tests on their own, you can command:
 
 ~~~text
-stack test stack:stack-test
+stack test stack:stack-unit-test
 ~~~
 
 Running an individual module works with a command like this:
 
 ~~~text
-stack test stack:stack-test --ta "-m <PATTERN>"
+stack test stack:stack-unit-test --ta "-m <PATTERN>"
 ~~~
 
 Where `<PATTERN>` is the name of the module without `Spec.hs`.
@@ -282,7 +551,7 @@ Where `<PATTERN>` is the name of the module without `Spec.hs`.
 You may also load tests into GHCi and run them with these command:
 
 ~~~text
-stack ghci stack:stack-test --only-main
+stack ghci stack:stack-unit-test --only-main
 # GHCi starting up output ...
 > :main -m "<PATTERN>"
 ~~~
@@ -291,7 +560,11 @@ Where again, `<PATTERN>` is the name of the module without `Spec.hs`.
 
 ### Working with Integration Tests
 
-Running the integration tests is a little involved, you'll need to command:
+Integration tests can be found in the
+[tests/integration](https://github.com/commercialhaskell/stack/tree/master/tests/integration)
+folder.
+
+Running the integration tests is a little involved, you will need to command:
 
 ~~~text
 stack build --flag stack:integration-tests stack --exec stack-integration-test
@@ -319,6 +592,19 @@ Where again, `<PATTERN>` is the name of the folder listed in the
 [test/integration/tests/](https://github.com/commercialhaskell/stack/tree/master/test/integration/tests)
 directory.
 
+You can disable a few integration tests through the -n option :
+
+~~~text
+stack build --flag stack:integration-tests stack --exec "stack-integration-test -n <PATTERN1> -n <PATTERN2>"
+~~~
+
+to disable folders named after `<PATTERN1>` and `<PATTERN2>`. It is especially
+useful when some tests are taking a while to complete.
+
+On Linux, the `stack-integration-test` executable uses the `lld` linker and
+expects it to be on the PATH. The integration tests complete significantly
+quicker with `lld` than with the `ld.bfd` linker.
+
 ## Continuous integration (CI)
 
 We use [GitHub Actions](https://docs.github.com/en/actions) to do CI on Stack.
@@ -328,6 +614,7 @@ The current active workflows are:
 ### Linting - `lint.yml`
 
 This workflow will run if:
+
 * there is a pull request
 * commits are pushed to these branches: `master`, `stable` and `rc/**`
 
@@ -337,6 +624,7 @@ yamllint and Hlint.
 ### Test suite - `unit-tests.yml`
 
 This workflow will run if:
+
 * there is a pull request
 * commits are pushed to these branches: `master`, `stable` and `rc/**`.
 * requested
@@ -347,8 +635,8 @@ The `pedantic` job runs on `ubuntu` only and builds Stack with the
 `--pedantic` flag.
 
 The `unit-tests` job runs on a matrix of operating systems and Stack
-project-level YAML configuration files (`stack.yaml`). It builds and tests Stack
-with the following flags: `--haddock --no-haddock-deps`.
+project-level configuration files (`stack.yaml`, by default). It builds and
+tests Stack with the following flags: `--haddock --no-haddock-deps`.
 
 Its approach to creating a cache depends on the operating system. Its 'Cache
 dependencies on Unix-like OS' step caches the Stack root on Unix-like operating
@@ -359,6 +647,7 @@ of the Stack root.
 ### Integration-based - `integration-tests.yml`
 
 This workflow will run if:
+
 * there is a pull request
 * commits are pushed to these branches: `master`, `stable` and `rc/**`
 * any tag is created
@@ -400,15 +689,188 @@ variable contains the private key for the GPG key with ID 0x575159689BEFB442.
 That key is imported into GPG and then used by GPG to create a detached signature
 for each file.
 
-### Inactive - `stan.yml`
+### Stan tool - `stan.yml`
+
+[Stan](https://hackage.haskell.org/package/stan) is a Haskell static analysis
+tool. As of `stan-0.1.0.1`, it supports GHC >= 9.6.3 and Stack is built with
+GHC 9.10.3. The tool is configured by the contents of the `.stan.toml` file.
+
+This workflow will run if:
+
+* there is a pull request
+* requested
 
-Stan is a Haskell static analysis tool. As of 29 August 2022, it does not
-support GHC >= 9.0.1 and Stack is built with GHC >= 9.2.4. Consequently, this
-workflow does not run. Its intent is to apply Stan to Stack.
+## Change log
+
+Stack seeks to maintain a comprehesive and useful change log, that captures all
+changes that could be relevant to users of Stack. The change log is also
+published at <https://docs.haskellstack.org/> under menu item
+"More/Version history".
+
+The change log for each release or the current, unreleased, version of Stack is
+organised under one or more of the headings "Major changes", "Behavior changes",
+"Other enhancements" and "Bug fixes". Major changes are those anticipated to be
+important to many Stack users. The heading "Release notes" can also be used to
+communicate other important information about a release not categorised under
+those headings.
+
+Change log entries aim to be succinct and clear. The change log is not intended
+to be a substitute for high quality in-tool and online documentation.
+
+If you consider that the existing change log is incomplete, inaccurate or
+ambiguous, please
+[open an issue](https://github.com/commercialhaskell/stack/issues/new) at
+Stack's GitHub repository.
+
+## Haskell Language Server
+
+You may be using [Visual Studio Code](https://code.visualstudio.com/) (VS Code)
+with its
+[Haskell extension](https://marketplace.visualstudio.com/items?itemName=haskell.haskell),
+which is powered by the
+[Haskell Language Server](https://github.com/haskell/haskell-language-server)
+(HLS).
+
+Stack can be built with Stack (which is recommended) or with Cabal (the tool).
+
+=== "Stack"
+
+    If you use Stack to build Stack, command `stack ghci` in the root directory
+    of the Stack project should work as expected, if you have first commanded
+    `stack build` once. `stack build` causes Cabal (the library) to create the
+    automatically generated module `Stack_build`.
+
+    If `ghc` is not on your PATH, then Haskell Language Server may report the
+    following error about `Stack.Constants.ghcShowOptionsOutput`:
+    ~~~text
+    • Exception when trying to run compile-time code:
+        ghc: readCreateProcess: does not exist (No such file or directory)
+      Code: (TH.runIO (readProcess "ghc" ["--show-options"] "")
+               >>= TH.lift . lines)
+    • In the untyped splice:
+        $(TH.runIO (readProcess "ghc" ["--show-options"] "") >>= TH.lift
+            . lines)
+    ~~~
+
+    `ghc` should be on the PATH if you run VS Code itself in the Stack
+    environment:
+    ~~~text
+    stack exec -- code .
+    ~~~
+
+    The following [cradle (`hie.yaml`)](https://github.com/haskell/hie-bios)
+    should suffice to configure Haskell Language Server (HLS) explicitly for
+    `./Setup.hs` and each of the buildable components in Stack's Cabal file:
+    ~~~yaml
+    cradle:
+      multi:
+      - path: "./Setup.hs"
+        config:
+          cradle:
+            direct:
+              arguments: []
+      - path: "./"
+        config:
+          cradle:
+            stack:
+            - path: "./src"
+              component: "stack:lib"
+            - path: "./app"
+              component: "stack:exe:stack"
+            - path: "./tests/integration"
+              component: "stack:exe:stack-integration-test"
+            - path: "./tests/unit"
+              component: "stack:test:stack-unit-test"
+    ~~~
+
+=== "Cabal (the tool)"
+
+    If you use Cabal (the tool) to build Stack, command `cabal repl` in the root
+    directory of the Stack project should work as expected, if you have GHC and
+    (on Windows) MSYS2 on the PATH. Stack's custom `./Setup.hs` causes
+    `cabal repl` to cause Cabal (the library) to create the automatically
+    generated module `Stack_build`.
+
+    If `ghc` is not on your PATH, then Haskell Language Server may report the
+    following error about `Stack.Constants.ghcShowOptionsOutput`:
+    ~~~text
+    • Exception when trying to run compile-time code:
+        ghc: readCreateProcess: does not exist (No such file or directory)
+      Code: (TH.runIO (readProcess "ghc" ["--show-options"] "")
+               >>= TH.lift . lines)
+    • In the untyped splice:
+        $(TH.runIO (readProcess "ghc" ["--show-options"] "") >>= TH.lift
+            . lines)
+    ~~~
+
+    `ghc` and (on Windows) MSYS2 should be on the PATH if you run commands
+    (including `cabal`) in the Stack environment:
+    ~~~text
+    stack exec --no-ghc-package-path -- cabal repl
+    ~~~
+
+    or
+    ~~~text
+    stack exec --no-ghc-package-path -- code .
+    ~~~
+
+    Use of GHC's environment variable `GHC_PACKAGE_PATH` is not compatible with
+    Cabal (the tool). That is why the `--no-ghc-package-path` flag must be
+    specified with `stack exec` when relying on Cabal (the tool).
+
+    The following [cradle (`hie.yaml`)](https://github.com/haskell/hie-bios)
+    should suffice to configure Haskell Language Server (HLS) explicitly for
+    `./Setup.hs` and each of the buildable components in Stack's Cabal file:
+    ~~~yaml
+    cradle:
+      multi:
+      - path: "./Setup.hs"
+        config:
+          cradle:
+            direct:
+              arguments: []
+      - path: "./"
+        config:
+          cradle:
+            cabal:
+            - path: "./src"
+              component: "lib:stack"
+            - path: "./app"
+              component: "exe:stack"
+            - path: "./tests/integration"
+              component: "exe:stack-integration-test"
+            - path: "./tests/unit"
+              component: "test:stack-unit-test"
+    ~~~
+
+A cradle is not committed to Stack's repository because it imposes a choice of
+tool used for building.
+
+## Dev Containers
+
+A [Development Container](https://containers.dev) (or Dev Container for short)
+allows you to use a container as a full‑featured development environment.
+
+You can run Dev Containers locally/remotely (with VS Code), or create a
+[Codespace](https://github.com/features/codespaces) for a branch in a
+repository to develop online.
+
+Stack's default Dev Container is intended for use with its default
+project‑level configuration (`stack.yaml`). But there are also Dev Containers
+for the experimental project‑level configurations.
+
+For further information, see the documentation for
+[Dev Containers](dev_containers.md).
 
 ## Slack channel
 
-If you're making deep changes and real-time communication with the Stack team
+If you are making deep changes and real-time communication with the Stack team
 would be helpful, we have a `#stack-collaborators` Slack channel in the
 Haskell Foundation workspace. To join the workspace, follow this
 [link](https://haskell-foundation.slack.com/join/shared_invite/zt-z45o9x38-8L55P27r12YO0YeEufcO2w#/shared-invite/email).
+
+## Matrix room
+
+There is also a
+[Haskell Stack room](https://matrix.to/#/#haskell-stack:matrix.org)
+at address `#haskell-stack:matrix.org` on [Matrix](https://matrix.org/).
diff --git a/ChangeLog.md b/ChangeLog.md
index c1e4e3ef03..d7d4ab87e5 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,16 +4,778 @@
 
 Release notes:
 
-**Changes since v2.9.1:**
+**Changes since v4.1.1:**
+
+Major changes:
+
+Behavior changes:
+
+Other enhancements:
+
+Bug fixes:
+
+## v4.1.1
+
+Release notes:
+
+* The change in major version from 3.x to 4.1 marks the introduction of Stack's
+  support for GHC's Backpack module system for cross-package use.
+
+**Changes since v3.11.1:**
+
+Major changes:
+
+* Stack now supports GHC's Backpack module system for cross-package use. When a
+  package uses `signatures` and `mixins` to depend on an abstract interface
+  provided by another package, Stack automatically creates the extra
+  instantiation build steps that Cabal requires. This includes support for
+  explicit renaming, multiple instantiations of the same indefinite package,
+  transitive signature chains, sub-library signatures, and indefinite packages
+  from Hackage or snapshots. See the
+  [Backpack topic](https://docs.haskellstack.org/en/stable/topics/backpack/) for
+  details. (Private Backpack, where signatures and implementations live in the
+  same package, has always worked without changes.)
+
+Behavior changes:
+
+* When Stack's Nix integration is enabled and a `shell-file` is not specified,
+  Stack sets `LANG=C.UTF-8` (rather than `en_US.UTF-8`, which may not be
+  available if Stack has been built from source).
+* With Nix integration, Stack uses `nix-instantiate` before `nix-shell`,
+  enabling Stack to catch and report when the Nix expression cannot be
+  evaluated by Nix. The `nix-instantiate-options` option is added, accordingly.
+* Stack's `build` command now warns if `--force-dirty` is specified but no
+  local packages will be built.
+
+Other enhancements:
+
+* Add option `--query ITEM`, which can be specified multiple times, to Stack's
+  `ls dependencies text` command (the default `ls dependencies` command), to
+  cause Stack to filter out from the results all packages other than those
+  queried. Like the existing `--filter ITEM` option, an item is either a
+  package name or `$locals` for all project packages.
+
+Bug fixes:
+
+* `stack test --no-rerun-tests` correctly skips test suites that have
+  previously been built and run successfully, including for non-Backpack
+  packages built by the per-component planner.
+* Stack's per-component build planner correctly handles the cross-package
+  test/library cycle shape from issue #6905: project package A's library
+  depending on project package B's library, with B's test suite depending on A,
+  builds in the right order with the right configure flags.
+* If snapshot locations are cyclic, Stack reports an error rather than going
+  round in circles.
+
+## v3.11.1 - 2026-06-13
+
+**Changes since v3.9.3:**
 
 Major changes:
 
+* On 64-bit Windows, the default `msys-environment` configuration option is now
+  `CLANG64`, rather than `MINGW64` (which remains an option). The MSYS2 project
+  deprecated the latter environment on 15 March 2026. The GHC project has used
+  the former toolchain from GHC 9.4.1. No default is provided for 32-bit
+  Windows, rather than `MINGW32` (which remains an option). The MSYS2 project
+  ceased to actively support it on 17 May 2020. 32-bit Windows is not supported
+  by the GHC project from GHC 9.0.1.
+
+Behavior changes:
+
+* Stack's default Nix integration now includes the `cacert` Nix package, in
+  order to support Stack's use of `crypton-x509-system >= 1.6.8`.
+* Following a change to the Stackage project's server API, the default value of
+  the `urls` key includes
+  `recent-snapshots: https://stackage.org/api/v1/snapshots`.
+* The `--[no-]keep-ghc-rts` flag of Stack's `config env` command is now enabled
+  by default, consistent with Stack's `exec` command.
+* On Windows, in the Stack environment, the MSYS2 `usr/local/bin` directory (if
+  it exists) is now searched before the MSYS2 `usr/bin` directory, rather than
+  after.
+
+Other enhancements:
+
+* Bump to Hpack 0.39.6.
+* Experimental: Add flag `--[no-]semaphore` (default: disabled) to Stack's
+  `build` command, to allow GHC to use a system semaphore to perform compilation
+  in parallel when possible. Supported, by default, by GHC 9.10.1 or later. The
+  option is considered experiemental because, on Linux only, musl and non-musl
+  semaphores are incompatible.
+* Add option `--reach <packages>` to Stack's `dot` and `ls dependencies`
+  commands, to prune packages that cannot reach any of the specified packages in
+  the dependency graph.
+* Add option `--test-suite-timeout-grace=SECONDS` to Stack's `build` command to
+  request termination of a timed-out test suite process and, after the specified
+  grace period, force termination. Used together with the existing
+  `--test-suite-timeout=SECONDS` option.
+* In YAML configuration files, the `recent-snapshots` key is introduced (under
+  the `urls` key), to specify the URL used by Stack's `ls snapshots remote`
+  command.
+* In YAML configuration files (`stack.yaml` and `config.yaml`), an
+  `!include <file path>` directive is now supported. This allows common
+  configuration to be shared across multiple files. For example, a project that
+  maintains multiple project-level configuration files for testing against
+  different snapshots can use `!include` to avoid duplicating shared settings.
+* Stack's `config set` command raises an error if the target configuration file
+  excludes the key being set and includes an `!include` directive.
+* Stack's `config set snapshot` command now works with other snapshot values
+  in addition to snapshot synonymns.
+* Add Stack's `config compiler-tools` command to create (when applicable) the
+  compiler tools directory for the specified compiler version (implies Stack's
+  `config build-files` command).
+
+Bug fixes:
+
+* Stack's `dot` and `ls dependencies` commands no longer prune a package with
+  dependencies only because all its direct dependencies are to be pruned.
+* After March 2026, Hackage requires Stack's user agent to be set when applying
+  digest authentication to a request. Stack's `upload` command now does that,
+  re-establishing authentication by Hackage username and password.
+* Stack 3.9.3 and earlier fail to construct a build plan if project package A
+  depends on project package B and package B's executables (only) depend on
+  package A and the name of A is before that of B, alphabetically. That bug is
+  fixed.
+* Stack's `config set` commands will recreate the `global-project` directory
+  contents, if Stack needs to consult its project-level configuration file and
+  there is no file.
+* The output of Stack's `path --bin-path` command is now consistent with the
+  Stack environment in Stack's `exec` command and includes the `bin` directory
+  of Stack's local install root directory.
+* Stack now builds packages that depend directly on packages with the same name
+  as a sublibrary or foreign library of the package.
+* On Windows, Stack's `build` command now accepts a build directory that is a
+  long path.
+
+## v3.9.3 - 2026-02-19
+
+Release notes:
+
+* This release fixes a potential bug for users of Stack's Docker integration.
+
+**Changes since v3.9.1:**
+
+Other enhancements:
+
+* The `resolver` synonym for `snapshot`, informally deprecated from Stack 3.1.1,
+  is formally deprecated in online and in-app documentation.
+
+Bug fixes:
+
+* Stack's Docker integration supports Docker client versions 29.0.0 and greater.
+
+## v3.9.1 - 2026-01-04
+
+**Changes since v3.7.1:**
+
+Behavior changes:
+
+* Where applicable and Stack supports the GHC version, only the wired-in
+  packages of the actual version of GHC used are treated as wired-in packages.
+* Stack now recognises `ghc-internal` as a GHC wired-in package.
+* The configuration option `package-index` has a new default value: the `keyids`
+  key lists the keys of the Hackage root key holders applicable from 2025-07-24.
+* Stack's `dot` command now treats `--depth` the same way as the
+  `ls dependencies` command, so that the nodes of
+  `stack dot --external --depth 0` are the same as the packages listed by
+  `stack ls dependencies --depth 0`.
+* When building GHC from source, on Windows, the default Hadrian build target is
+  `reloc-binary-dist` and the default path to the GHC built by Hadrian is
+  `_build/reloc-bindist`.
+* Stack's `haddock` command no longer requires a package to have a main library
+  that exposes modules.
+* On Windows, the path segment _platform_\\_hash_\\_ghc version_, under
+  `.stack-work\install` and `.stack-work\hoogle`, is hashed only once, rather
+  than twice.
+
+Other enhancements:
+
+* Bump to Hpack 0.39.1.
+* Consider GHC 9.14 to be a tested compiler and remove warnings.
+* Consider Cabal 3.16 to be a tested library and remove warnings.
+* From GHC 9.12.1, `base` is not a GHC wired-in package. In configuration files,
+  the `notify-if-base-not-boot` key is introduced, to allow the exisitng
+  notification to be muted if unwanted when using such GHC versions.
+* Add flag `--[no-]omit-this` (default: disabled) to Stack's `clean` command to
+  omit directories currently in use from cleaning (when `--full` is not
+  specified).
+* Add option `-w` as synonym for `--stack-yaml`.
+* `stack new` now allows `codeberg:` as a service for template downloads
+* In YAML configuration files, the `compiler-target` and
+  `compiler-bindist-path` keys are introduced to allow, when building GHC from
+  source, the Hadrian build target and Hadrian path to the built GHC to be
+  specified.
+
+Bug fixes:
+
+* `--PROG-option=<argument>` passes `--PROG-option=<argument>` (and not
+  `--PROG-option="<argument>"`) to Cabal (the library).
+* The message S-7151 now presents as an error, with advice, and not as a bug.
+* Stack's `dot` command now uses a box to identify all GHC wired-in packages,
+  not just those with no dependencies (being only `rts`).
+* Stack's `dot` command now gives all nodes with no dependencies in the graph
+  the maximum rank, not just those nodes with no relevant dependencies at all
+  (being only `rts`, when `--external` is specified).
+* Improved error messages for S-4634 and S-8215.
+* Improved in-app help for the `--hpack-force` flag.
+
+## v3.7.1 - 2025-06-28
+
+**Changes since v3.5.1:**
+
+Other enhancements:
+
+* Bump to Hpack 0.38.1.
+* The `--extra-dep` option of Stack's `script` command now accepts a YAML value
+  specifying any immutable extra-dep. Previously only an extra-dep in the
+  package index that could be specified by a YAML string (for example,
+  `acme-missiles-0.3@rev:0`) was accepted.
+
+Bug fixes:
+
+* `stack script --package <pkg-name>` now uses GHC's `-package-id` option to
+  expose the installed package, rather than GHC's `-package` option. For
+  packages with public sub-libraries, `-package <pkg>` can expose an
+  installed package other than one listed by `ghc-pkg list <pkg>`.
+* Work around `ghc-pkg` bug where, on Windows only, it cannot register a package
+  into a package database that is also listed in the `GHC_PACKAGE_PATH`
+  environment variable. In previous versions of Stack, this affected
+  `stack script` when copying a pre-compiled package from another package
+  database.
+* On Windows, when decompressing, and extracting, tools from archive files,
+  Stack uses the system temporary directory, rather than the root of the
+  destination drive, if the former is on the destination drive.
+
+## v3.5.1 - 2025-03-29
+
+**Changes since v3.3.1:**
+
+Behavior changes:
+
+* Stack will also warn (message S-8432) if there is any non-ISO/IEC 8859-1
+  (Latin-1) character in Stack's 'programs' path, as `hsc2hs` does not work if
+  there is such a character in the path to its default template
+  `template-hsc.h`.
+* Stack customizes setup using `Cabal`, so if a `setup-depends` field does not
+  mention it as a dependency, Stack warns and adds the GHC boot package as a
+  dependency. Previously, Stack would not do so but only warn that build errors
+  were likely.
+
+Other enhancements:
+
+* Bump to Hpack 0.38.0.
+* In YAML configuration files, the `install-msys` key is introduced, to enable
+  or disable the download and installation of Stack-supplied MSYS2 when
+  necessary (subject to `skip-msys: false`). The default is the same as the
+  `install-ghc` setting (including if that is set at the command line).
+  Consequently, the default behaviour of Stack is unaffected.
+* Add the `stack config set install-msys` command to configure the
+  `install-msys` option in YAML configuration files.
+* Option `allow-newer-deps` is no longer classified as experimental in
+  documentation.
+* `stack sdist` and `stack upload` report the version of Cabal (the library)
+  being used to check packages.
+* Add Stack's `config build-files` command to generate (when applicable) a
+  Cabal file from a package description in the Hpack format and/or a lock file
+  for Stack's project-level configuration, without taking any other build steps.
+
+## v3.3.1 - 2024-12-28
+
+**Changes since v3.1.1:**
+
+Behavior changes:
+
+* Stack interprets consecutive line ends in the value of the `user-message`
+  project-specific configuration option as a single blank line. Previously all
+  line ends were interpreted as white space.
+* Stack no longer supports Docker versions before Docker 1.9.1 and,
+  consequently, if a Docker container is not being run 'detached', its standard
+  input channel will always be kept open. (Before Docker 1.9.1 the use of an
+  interactive container could hang in certain circumstances.)
+* On Windows, Stack will always warn (message S-8432) if there is a space
+  character in Stack's 'programs' path, as GHC 9.4.1 and later do not work if
+  there is a space in the path to the `ghc` executable. S-8432 now presents as a
+  warning and not an error.
+* Stack respects the `--no-run-tests` and `--no-run-benchmarks` flags when
+  determining build actions. Previously Stack respected the flags when executing
+  the run test suites or run benchmarks actions for each targeted project
+  package.
+
+Other enhancements:
+
+* Consider GHC 9.10 to be a tested compiler and remove warnings.
+* Consider Cabal 3.12 to be a tested library and remove warnings.
+* Add flags `--run-tests` and `--run-benchmarks` (the existing defaults) to
+  Stack's `build` command, which take precedence over the existing
+  `no-run-tests` and `no-run-benchmarks` configuration options, respectively.
+* In configuration files, the `notify-if-no-run-tests` and
+  `notify-if-no-run-benchmarks` keys are introduced, to allow the exisitng
+  notification to be muted if unwanted.
+
+Bug fixes:
+
+* Stack's in-app messages refer to https://haskellstack.org as currently
+  structured. (Most URLs in older Stack versions are redirected.)
+* Stack's `upgrade` command only treats the current running Stack executable
+  as '`stack`' if the executable file is named `stack` or, on Windows,
+  `stack.exe`. Previously only how it was invoked was considered.
+* `stack test --no-run-tests --dry-run` no longer reports that Stack would test
+  project packages with test suites and
+  `stack bench --no-run-benchmarks --dry-run` no longer reports that Stack
+  would benchmark project packages with benchmarks.
+* `StackSetupShim` compiles with `Cabal >= 3.14.0.0`.
+
+## v3.1.1 - 2024-07-28
+
+Release notes:
+
+* The change in major version from 2.x to 3.1 marks the dropping of support for
+  versions of GHC before 8.4, deprecated in Stack 2.15.1.
+
+**Changes since v2.15.7:**
+
 Behavior changes:
 
-* In YAML configuration files, the `hackage-security` key of the
-  `package-indices` item can be omitted, and the Hackage Security configuration
-  for the item will default to that for the official Hackage server.
-  See [#5870](https://github.com/commercialhaskell/stack/issues/5870).
+* Stack uses the version of the Cabal package that comes with the specified
+  version of GHC. Stack no longer supports such Cabal versions before 2.2, which
+  came with versions of GHC before 8.4. Consequently, the `init` command will
+  not try LTS Haskell before 12.0.
+* The `init` command initialises `stack.yaml` with a `snapshot` key rather than
+  a `resolver` key.
+* After installing GHC or another tool, Stack deletes the archive file which
+  provided the tool.
+* Remove hidden flag `--skip-intermediate-deps`, effectively deprecated since
+  Stack 1.3.0, from `ghci` and `repl` commands.
+* The `haddock --haddock-for-hackage` command only seeks to create an archive of
+  the `<package_version>-docs` directory for build targets and if flags
+  excluding the building of project packages are not set.
+* The predecessor of configuration option `package-index`, `package-indices`
+  (deprecated in Stack 2.9.3) has been removed as an alternative option.
+* If a build target is a package identifier, and the package version is not in
+  the snapshot or the package index, Stack will report an error when the target
+  is parsed. Previously, if another version of the package was in the snapshot,
+  Stack would construct the build plan with that other version or, if it was
+  not, Stack would defer an error to the construction of the build plan.
+* The `list` command, with a specified snapshot and package, also reports the
+  version of the package included indirectly in the snapshot (as a boot package
+  of the compiler specified by the snapshot).
+* `stack build --flag *:[-]<flag_name>` now only applies the flag setting to
+  packages for which the Cabal flag is defined, as opposed to all packages.
+* On Unix-like operating systems, drop support for `/etc/stack/config`,
+  deprecated in Stack 0.1.6.0.
+* Drop support for, in the Stack root, directory `global` and file `stack.yaml`,
+  both deprecated in Stack 0.1.6.0.
+
+Other enhancements:
+
+* Bump to Hpack 0.37.0.
+* In YAML configuration files, the `msys-environment` key is introduced to
+  allow, on Windows, the MSYS2 environment to be specified. The default
+  environment is still `MINGW64` on 64-bit Windows and `MINGW32` on 32-bit
+  Windows.
+* In YAML configuration files, the `default-init-snapshot` key is introduced to
+  allow a default snapshot to be specified for use with the `stack init`
+  command, as if it had been specified at the command line.
+* Add flags `--haddock-executables`, `--haddock-tests` and
+  `--haddock-benchmarks` to Stack's `build` command (including the `haddock`
+  synonym for `build --haddock`) to enable also building Haddock
+  documentation for executables, test suites and benchmarks. Due to a bug in
+  Cabal (the library), Stack will ignore the flags with a warning for GHC
+  versions before 9.4.
+* Add flag `--[no-]save-hackage-creds` to Stack's `upload` command, which takes
+  precedence over the existing `save-hackage-creds` configuration option.
+* In YAML configuration files, the `global-hints-location` key is introduced to
+  allow the location of the global hints YAML specification file to be
+  specified.
+* By default, Hpack 0.12.0 or later will decline to overwrite a Cabal file that
+  was created by a more recent version of Hpack and Hpack 0.20.0 or later will
+  decline to overwrite a Cabal file that was modified manually. In YAML
+  configuration files, the `hpack-force` key is introduced to allow Hpack to
+  overwrite such a Cabal file. The corresponding `--hpack-force` flag is also
+  added.
+* Add the `stack config set recommend-stack-upgrade` command to configure
+  whether or not Stack should notify the user if it identifes a new version of
+  Stack is available in YAML configuration files.
+* Add the `ls globals` command to list all global packages for the version of
+  GHC specified by the snapshot.
+* Add `stack -h` (equivalent to `stack --help`).
+* In YAML configuration files, the `file-watch-hook` key is introduced to allow
+  `--file-watch` post-processing to be customised with a executable or `sh`
+  shell script.
+* Add flag `--[no-]allow-newer` to Stack's `build` command, which takes
+  precedence over the existing `allow-newer` configuration option.
+
+Bug fixes:
+
+* The `config set snapshot` and `config set resolver` commands now respect the
+  presence of a synoymous key.
+* The `config set` commands support existing keys only in the form `key: value`
+  on a single line. The commands now recognise that a line `key:` does not have
+  that form.
+* On Unix-like operating systems, the `test --coverage` command now finds
+  package keys even for very long package names.
+* The Error S-6362 message now acknowledges when the wanted compiler has been
+  specified at the command line.
+* Fix a regression, introduced in Stack 2.11.1, that caused the `script` command
+  to parse an (otherwise ignored) project-level configuration file.
+* Stack no longer makes recommendations about a project-level configuration file
+  when only a global configuration file is in use.
+* Fix a regression, introduced in Stack 2.15.7, that caused GHC 8.10.7 or
+  earlier to fail to build a package with a `Custom` build type, if GHC option
+  `-haddock` was specified.
+
+## v2.15.7 - 2024-05-12
+
+Release notes:
+
+* This release fixes potential bugs.
+* The hash that Stack uses to distinguish one build plan from another has
+  changed for plans that set (as opposed to unset) manually Cabal flags for
+  immutable dependencies. This will cause Stack to rebuild dependencies for such
+  plans.
+
+**Changes since v2.15.5:**
+
+Major changes:
+
+* Stack 2.15.5 and earlier cannot build with Cabal (the library) version
+  `3.12.0.0`. Stack can now build with that Cabal version.
+
+Behavior changes:
+
+* Stack's `StackSetupShim` executable, when called with `repl` and
+  `stack-initial-build-steps`, no longer uses Cabal's `replHook` to apply
+  `initialBuildSteps` but takes a more direct approach.
+
+Bug fixes:
+
+* Fix a regression introduced in Stack 2.15.1 that caused a 'no operation'
+  `stack build` to be slower than previously.
+* The hashes that Stack uses to distinguish one build plan from another now
+  include the Cabal flags for immutable dependencies set manually. Previously,
+  in error, only such flags that were unset manually were included.
+
+## v2.15.5 - 2024-03-28
+
+Release notes:
+
+* This release fixes potential bugs.
+
+**Changes since v2.15.3:**
+
+Behavior changes:
+
+* Following the handover of the Stackage project to the Haskell Foundation, the
+  default value of the `urls` key is
+  `latest-snapshot: https://stackage-haddock.haskell.org/snapshots.json`.
+* Stack no longer includes the snapshot package database when compiling the
+  setup executable for a package with `build-type: Configure`.
+
+## v2.15.3 - 2024-03-07
+
+Release notes:
+
+* With one exception, this release fixes bugs.
+
+**Changes since v2.15.1:**
+
+Behavior changes:
+
+* `stack path --global-config`, `--programs`, and `--local-bin` no longer set
+  up Stack's environment.
+
+Bug fixes:
+
+* Due to a bug, Stack 2.15.1 did not support versions of GHC before 8.2. Stack
+  now supports GHC versions from 8.0.
+* `--haddock-for-hackage` does not ignore `--haddock-arguments`.
+* On Windows, package locations that are Git repositories with submodules now
+  work as intended.
+* The `ghc`, `runghc` and `runhaskell` commands accept `--package` values that
+  are a list of package names or package identifiers separated by spaces and, in
+  the case of package identifiers, in the same way as if they were specified as
+  targets to `stack build`.
+
+## v2.15.1 - 2024-02-09
+
+Release notes:
+
+* After an upgrade from an earlier version of Stack, on first use only,
+  Stack 2.15.1 may warn that it had trouble loading the CompilerPaths cache.
+* The hash used as a key for Stack's pre-compiled package cache has changed,
+  following the dropping of support for Cabal versions older than `1.24.0.0`.
+
+**Changes since v2.13.1:**
+
+Behavior changes:
+
+* Stack does not leave `*.hi` or `*.o` files in the `setup-exe-src` directory of
+  the Stack root, and deletes any corresponding to a `setup-<hash>.hs` or
+  `setup-shim-<hash>.hs` file, to avoid GHC issue
+  [#21250](https://gitlab.haskell.org/ghc/ghc/-/issues/21250).
+* If Stack's Nix integration is not enabled, Stack will notify the user if a
+  `nix` executable is on the PATH. This usually indicates the Nix package
+  manager is available. In YAML configuration files, the `notify-if-nix-on-path`
+  key is introduced, to allow the notification to be muted if unwanted.
+* Drop support for Intero (end of life in November 2019).
+* `stack path --stack-root` no longer sets up Stack's environment and does not
+  load Stack's configuration.
+* Stack no longer locks on configuration, so packages (remote and local) can
+  be configured in parallel. This increases the effective concurrency of builds
+  that before would use fewer threads. Reconsider your `--jobs` setting
+  accordingly. See [#84](https://github.com/commercialhaskell/stack/issues/84).
+* Stack warns that its support for Cabal versions before `2.2.0.0` is deprecated
+  and may be removed in the next version of Stack. Removal would mean that
+  projects using snapshots earlier than `lts-12.0` or `nightly-2018-03-18`
+  (GHC 8.4.1) might no longer build. See
+  [#6377](https://github.com/commercialhaskell/stack/issues/6377).
+* If Stack's `--resolver` option is not specified, Stack's `unpack` command with
+  a package name will seek to update the package index before seeking to
+  download the most recent version of the package in the index.
+* If the version of Cabal (the library) provided with the specified GHC can copy
+  specific components, Stack will copy only the components built and will not
+  build all executable components at least once.
+
+Other enhancements:
+
+* Consider GHC 9.8 to be a tested compiler and remove warnings.
+* Stack can build packages with dependencies on public sub-libraries of other
+  packages.
+* Add flag `--no-init` to Stack's `new` command to skip the initialisation of
+  the newly-created project for use with Stack.
+* The HTML file paths produced at the end of `stack haddock` are printed on
+  separate lines and without a trailing dot.
+* Add option of the form `--doctest-option=<argument>` to `stack build`, where
+  `doctest` is a program recognised by versions of the Cabal library from
+  `1.24.0.0`.
+* Experimental: Add flag `--haddock-for-hackage` to Stack's `build` command
+  (including the `haddock` synonym for `build --haddock`) to enable building
+  project packages with flags to generate Haddock documentation, and an archive
+  file, suitable for upload to Hackage. The form of the Haddock documentation
+  generated for other packages is unaffected.
+* Experimental: Add flag `--documentation` (`-d` for short) to Stack's `upload`
+  command to allow uploading of documentation for packages to Hackage.
+* `stack new` no longer rejects project templates that specify a `package.yaml`
+  in a subdirectory of the project directory.
+* Stack will notify the user if Stack has not been tested with the version of
+  GHC that is being user or a version of Cabal (the library) that has been
+  found. In YAML configuration files, the `notify-if-ghc-untested` and
+  `notify-if-cabal-untested` keys are introduced, to allow the notification to
+  be muted if unwanted.
+* The compiler version is included in Stack's build message (e.g.
+  `stack> build (lib + exe + test) with ghc-9.6.4`).
+* Add flag `--candidate` to Stack's `unpack` command, to allow package
+  candidates to be unpacked locally.
+* Stack will notify the user if a specified architecture value is unknown to
+  Cabal (the library). In YAML configuration files, the `notify-if-arch-unknown`
+  key is introduced, to allow the notification to be muted if unwanted.
+* Add option `--filter <item>` to Stack's `ls dependencies text` command to
+  filter out an item from the results, if present. The item can be `$locals` for
+  all project packages.
+* Add option `--snapshot` as synonym for `--resolver`.
+* Add the `config set snapshot` command, corresponding to the
+  `config set resolver` command.
+
+Bug fixes:
+
+* Fix the `Curator` instance of `ToJSON`, as regards `expect-haddock-failure`.
+* Better error message if a `resolver:` or `snapshot:` value is, in error, a
+  YAML number.
+* Stack accepts all package names that are, in fact, acceptable to Cabal.
+* Stack's `sdist` command can check packages with names that include non-ASCII
+  characters.
+
+## v2.13.1 - 2023-09-29
+
+Release notes:
+
+* Further to the release notes for Stack 2.3.1, the `-static` suffix has been
+  removed from the statically-linked Linux/x86_64 executables.
+* The executables for Linux/Aarch64 are now statically-linked.
+* Executables are now provided for macOS/AArch64.
+
+**Changes since v2.11.1:**
+
+Behavior changes:
+
+* Build artefacts are placed in `.stack-work/dist/<platform>/<GHC_version>`
+  (hashed to a shorter path on Windows), rather than
+  `.stack-work/dist/<platform>/<Cabal_version>`. This allows build artifacts to
+  be distinguished by GHC version.
+* By default, the `stack build` progress bar is capped to a length equal to the
+  terminal width.
+* When building GHC from source, Stack no longer uses Hadrian's deprecated
+  `--configure`\\`-c` flag and, instead, seeks to run GHC's Python `boot` and
+  sh `configure` scripts, and ensure that the `happy` and `alex` executables are
+  on the PATH.
+* When auto-detecting `--ghc-build` on Linux, the `musl` GHC build only is
+  considered a possible GHC build if `libc.musl-x86_64.so.1` is found in `\lib`
+  or `\lib64`.
+* No longer supports Cabal versions older than `1.24.0.0`. This means projects
+  using snapshots earlier than `lts-7.0` or `nightly-2016-05-26` (GHC 8.0.1)
+  will no longer build. GHC 8.0.1 comes with Haddock 2.17.2.
+* When unregistering many packages in a single step, Stack can now do that
+  efficiently. Stack no longer uses GHC-supplied `ghc-pkg unregister` (which is,
+  currently, slower).
+* `stack hpc report`, `stack list`, `stack templates` and `stack uninstall`
+  output their information to the standard output stream rather than to the
+  standard error stream. Logging is still to the standard error stream.
+* `stack upgrade` no longer assumes that binary upgrade is not supported on a
+  AArch64 machine architecture.
+
+Other enhancements:
+
+* Consider GHC 9.6 to be a tested compiler and remove warnings.
+* Consider Cabal 3.10 to be a tested library and remove warnings.
+* Bump to Hpack 0.36.0.
+* Depend on `pantry-0.9.2`, for support for long filenames and directory names
+  in archives created by `git archive`.
+* Avoid the duplicate resolving of usage files when parsing `*.hi` files into a
+  set of modules and a collection of resolved usage files. See
+  [#6123](https://github.com/commercialhaskell/stack/pull/6123).
+* Add composable component type flags `--exes`, `--tests` and `--benchmarks` to
+  Stack's `ide targets` command, to list only those components.
+* `stack --verbose` excludes lengthy information about build plan construction
+  in the debug output by default. The new `stack --[no-]plan-in-log` flag
+  enables or disables the inclusion of the information in the debug output.
+* In YAML configuration files, the `casa` key is introduced, which takes
+  precedence over the existing `casa-repo-prefix` key. The latter is deprecated.
+  The new key also allows Stack's use of a Casa (content-addressable storage
+  archive) server to be disabled and the maximum number of keys per request to
+  be configured. The default Casa prefix references https://casa.stackage.org,
+  instead of https://casa.fpcomplete.com.
+* Add option `--progress-bar=<format>` to Stack's `build` command to configure
+  the format of the progress bar, where `<format>` is one of `none`,
+  `count-only` (only the package count), `capped` (capped to a length equal to
+  the terminal width) and `full` (the previous format).
+
+Bug fixes:
+
+* Restore `stack sdist --pvp-bounds lower` (broken with Stack 2.9.1).
+* Restore building of Stack with Cabal flag `disable-git-info` (broken with
+  Stack 2.11.1).
+* With `stack hoogle`, avoid the message
+  `Minimum version is hoogle-5.0. Found acceptable hoogle-<x.y.z> in your index, requiring its installation.`
+  when a `hoogle` executable has already been found on the `PATH`.
+* Stack's sanity check on a selected GHC now passes GHC flag
+  `-hide-all-packages`, stopping GHC from looking for a package environment in
+  default locations.
+* Restore Stack script files without extensions (broken with Stack 2.11.1).
+* Restore message suffix `due to warnings` with `dump-logs: warning` (broken
+  with Stack 2.11.1).
+* On Windows, the `local-programs-path` directory can now be on a different
+  drive to the system temporary directory and MSYS2 will still be installed.
+
+## v2.11.1 - 2023-05-18
+
+**Changes since v2.9.3:**
+
+Behavior changes:
+
+* Add flag `--[no-]-only-local-bin` to Stack's `upgrade` command for a binary
+  upgrade. If the Stack executable is `my-stack`, the default is
+  `my-stack upgrade --only-local-bin` where previously it was, effectively,
+  `my-stack upgrade --no-only-local-bin`. If the Stack executable is `stack`,
+  the default is `stack upgrade --no-only-local-bin`, the same behaviour as
+  previously.
+* Use `$XDG_CACHE_HOME/stack/ghci-script`, rather than
+  `<temp>/haskell-stack-ghci` (where `<temp>` is the directory yielded by the
+  `temporary` package's `System.IO.Temp.getCanonicalTemporaryDirectory`), as the
+  base location for GHCi script files generated by `stack ghci` or `stack repl`.
+  See [#5203](https://github.com/commercialhaskell/stack/issues/5203)
+* Drop support for `Cabal` versions before 1.22 and, consequently, GHC versions
+  before 7.10.
+* `stack ghci` and `stack repl` now take into account the values of
+  `default-language` fields in Cabal files, like they take into account the
+  values of `default-extensions` fields.
+* Removed `--ghc-paths`, `--global-stack-root` and `--local-bin-path` flags for
+  `stack path`, deprecated in Stack 1.1.0 in favour of `--programs`,
+  `--stack-root` and `local-bin` respectively.
+* On Windows, `stack upgrade` always renames the file of the running Stack
+  executable (adding extension `.old`) before attempting to write to the
+  original file name.
+* On Windows, `stack upgrade` does not offer `sudo` command alternatives if
+  attempting to write to the original file name of the running Stack exectuable
+  results in a 'Permission' error.
+* On Linux, Stack's `setup` command now distinguishes GHC build
+  `tinfo6-libc6-pre232` from existing `tinfo6`. The former refers to systems
+  where the version of `libc6` (the GNU C Library) is not compatible with
+  version 2.32. `tinfo6-libc6-pre232` is now a possible value for the
+  `ghc-build` configuration option.
+
+Other enhancements:
+
+* Add options of the form `--PROG-option=<argument>` to `stack build`, where
+  `PROG` is a program recognised by the Cabal library and one of `alex`, `ar`,
+  `c2hs`, `cpphs`, `gcc`, `greencard`, `happy`, `hsc2hs`, `hscolour`, `ld`,
+  `pkg-config`, `strip` and `tar`. If Cabal uses the program during the
+  configuration step, the argument is passed to it.
+* By default all `--PROG-option` options are applied to all project packages.
+  This behaviour can be changed with new configuration option
+  `apply-prog-options`.
+* Add flag `--[no-]use-root` to `stack script` (default disabled). Used with
+  `--compile` or `--optimize`, when enabled all compilation outputs (including
+  the executable) are written to a script-specific location in the `scripts`
+  directory of the Stack root rather than the script's directory, avoiding
+  clutter of the latter directory.
+* Better error message if the value of the `STACK_WORK` environment variable or
+  `--work-dir` option is not a valid relative path.
+* Stack will use the value of the `GH_TOKEN`, or `GITHUB_TOKEN`, environment
+  variable as credentials to authenticate its GitHub REST API requests.
+* `stack uninstall` also shows how to uninstall Stack-supplied tools.
+
+Bug fixes:
+
+* Fix incorrect warning if `allow-newer-deps` are specified but `allow-newer` is
+  `false`. See
+  [#6068](https://github.com/commercialhaskell/stack/issues/6086).
+* `stack build` with `--file-watch` or `--file-watch-poll` outputs 'pretty'
+  error messages, as intended. See
+  [#5978](https://github.com/commercialhaskell/stack/issues/5978).
+* `stack build` unregisters any project packages for the sub libraries of a
+  project package that is to be unregistered. See
+  [#6046](https://github.com/commercialhaskell/stack/issues/6046).
+* The warning that sublibrary dependency is not supported is no longer triggered
+  by internal libraries.
+
+## v2.9.3.1 - 2023-06-22
+
+Hackage-only release of the `stack` package:
+
+* Supports building against snapshot Stackage LTS Haskell 21.0 (GHC 9.4.5),
+  without extra-deps.
+* Supports build with `persistent-2.14.5.0`, using CPP directives.
+* Supports build with `unix-compat-0.7`, by removing reliance on the module
+  `System.PosixCompat.User` removed in that package.
+* Includes `cabal.project` and `cabal.config` files in the package.
+
+## v2.9.3 - 2022-12-16
+
+**Changes since v2.9.1:**
+
+Behavior changes:
+
+* In YAML configuration files, the `package-index` key is introduced which takes
+  precedence over the existing `package-indices` key. The latter is deprecated.
+* In YAML configuration files, the `hackage-security` key of the `package-index`
+  key or the `package-indices` item can be omitted, and the Hackage Security
+  configuration for the item will default to that for the official Hackage
+  server. See [#5870](https://github.com/commercialhaskell/stack/issues/5870).
+* Add the `stack config set package-index download-prefix` command to set the
+  location of Stack's package index in YAML configuration files.
+* `stack setup` with the `--no-install-ghc` flag warns that the flag and the
+  command are inconsistent and now takes no action. Previously the flag was
+  silently ignored.
+* To support the Haskell Foundation's
+  [Haskell Error Index](https://errors.haskell.org/) initiative, all Stack
+  error messages generated by Stack itself begin with an unique code in the
+  form `[S-nnnn]`, where `nnnn` is a four-digit number.
+* Test suite executables that seek input on the standard input stream (`stdin`)
+  will not throw an exception. Previously, they would thow an exception,
+  consistent with Cabal's 'exitcode-stdio-1.0' test suite interface
+  specification. Pass the flag `--no-tests-allow-stdin` to `stack build` to
+  enforce Cabal's specification. See
+  [#5897](https://github.com/commercialhaskell/stack/issues/5897)
 
 Other enhancements:
 
@@ -21,12 +783,28 @@ Other enhancements:
   Stack, only GHCup should be used to upgrade Stack. That is because GHCup uses
   an executable named `stack` to manage versions of Stack, that Stack will
   likely overwrite on upgrade.
+* Add `stack ls dependencies cabal` command, which lists dependencies in the
+  format of exact Cabal constraints.
+* Add `STACK_XDG` environment variable to use the XDG Base Directory
+  Specification for the Stack root and Stack's global YAML configuration file,
+  if the Stack root location is not set on the command line or by using the
+  `STACK_ROOT` environment variable.
+* Add `stack path --global-config`, to yield the full path of Stack's
+  user-specific global YAML configuration file (`config.yaml`).
+* Experimental: Add option `allow-newer-deps`, which allows users to specify a
+  subset of dependencies for which version bounds should be ignored
+  (`allow-newer-deps: ['foo', 'bar']`). This key has no effect unless
+  `allow-newer` is enabled.
 
 Bug fixes:
 
 * Fix ambiguous module name `Distribution.PackageDescription`, if compiling
   `StackSetupShim` with `Cabal-syntax-3.8.1.0` in package database. See
   [#5886](https://github.com/commercialhaskell/stack/pull/5886).
+* In YAML configuration files, if the `package-indices` key (or the
+  `hackage-security` key of its item) is omitted, the expiration of timestamps
+  is now ignored, as intended. See Pantry
+  [#63](https://github.com/commercialhaskell/pantry/pull/63)
 
 ## v2.9.1 - 2022-09-19
 
@@ -36,6 +814,13 @@ Release notes:
 
 * After an upgrade from an earlier version of Stack, on first use only,
   Stack 2.9.1 may warn that it had trouble loading the CompilerPaths cache.
+* The support from the Stack team for executable releases now includes
+  Linux/AArch64 and is limited to:
+
+    * Linux 64-bit/x86_64 (statically-linked)
+    * Linux AArch64 (dynamically-linked)
+    * macOS x86_64
+    * Windows 64-bit/x86_64
 
 Behavior changes:
 
@@ -49,6 +834,8 @@ Behavior changes:
 
 Other enhancements:
 
+* Consider GHC 9.2 and 9.4 to be tested compilers and remove warnings.
+* Consider Cabal 3.6 and 3.8 to be a tested libraries and remove warnings.
 * Bump to Hpack 0.35.0.
 * On Windows, the installer now sets `DisplayVersion` in the registry, enabling
   tools like `winget` to properly read the version number.
@@ -86,7 +873,7 @@ Bug fixes:
   [#5608](https://github.com/commercialhaskell/stack/pull/5608)
 * On Unix-like operating systems, respect the `with-gcc` option when installing
   GHC. See [#5609](https://github.com/commercialhaskell/stack/pull/5609)
-* Fixed logic in `get_isa()` in `get-stack.sh` to exclude systems that don't
+* Fixed logic in `get_isa()` in `get-stack.sh` to exclude systems that do not
   have x86 in their `uname -m` output. See
   [5792](https://github.com/commercialhaskell/stack/issues/5792).
 * Fixed output of `stack ls snapshots local` on Windows, to behave like that on
@@ -101,13 +888,12 @@ Bug fixes:
 
 Behavior changes:
 
-* Cloning git repositories isn't per sub-directory anymore, see
+* Cloning git repositories is not per sub-directory anymore, see
   [#5411](https://github.com/commercialhaskell/stack/issues/5411)
 
 Other enhancements:
 
-* `stack setup` supports installing GHC for macOS aarch64 (M1)
-
+* `stack setup` supports installing GHC for macOS/AArch64 (M1)
 * `stack upload` supports authentication with a Hackage API key (via
   `HACKAGE_KEY` environment variable).
 
@@ -167,7 +953,6 @@ Behavior changes:
   packages. It also sets now proper working directory when invoked with
   one package. See
   [#5421](https://github.com/commercialhaskell/stack/issues/5421)
-
 * `custom-setup` dependencies are now properly initialized for `stack dist`.
   This makes `explicit-setup-deps` no longer required and that option was
   removed. See
@@ -175,25 +960,20 @@ Behavior changes:
 
 Other enhancements:
 
+* Consider GHC 9.0 to be a tested compiler and remove warnings.
+* Consider Cabal 3.6 to be a tested library and remove warnings.
 * Nix integration now passes `ghcVersion` (in addition to existing `ghc`) to
   `shell-file` as an identifier that can be looked up in a compiler attribute
   set.
-
 * Nix integration now allows Nix integration if the user is ready in nix-shell.
   This gets rid of "In Nix shell but reExecL is False" error.
-
 * `stack list` is a new command to list package versions in a snapshot.
   See [#5431](https://github.com/commercialhaskell/stack/pull/5431)
-
-* Consider GHC 9.0 a tested compiler and remove warnings.
-
 * `custom-preprocessor-extensions` is a new configuration option for allowing
   Stack to be aware of any custom preprocessors you have added to `Setup.hs`.
   See [#3491](https://github.com/commercialhaskell/stack/issues/3491)
-
 * Added `--candidate` flag to `upload` command to upload a package candidate
   rather than publishing the package.
-
 * Error output using `--no-interleaved-output` no longer prepends indenting
   whitespace. This allows emacs compilation-mode and vim quickfix to locate
   and track errors. See
@@ -201,17 +981,14 @@ Other enhancements:
 
 Bug fixes:
 
-* `stack new` now supports branches other than `master` as default for
-  GitHub repositories. See
+* `stack new` now supports branches other than `master` as default for GitHub
+  repositories. See
   [#5422](https://github.com/commercialhaskell/stack/issues/5422)
-
 * Ignore all errors from `hi-file-parser`. See
   [#5445](https://github.com/commercialhaskell/stack/issues/5445) and
   [#5486](https://github.com/commercialhaskell/stack/issues/5486).
-
 * Support basic auth in package-indices. See
   [#5509](https://github.com/commercialhaskell/stack/issues/5509).
-
 * Add support for parsing `.hi`. files from GHC 8.10 and 9.0. See
   [hi-file-parser#2](https://github.com/commercialhaskell/hi-file-parser/pull/2).
 
@@ -233,19 +1010,18 @@ Major changes:
   override the default location of snapshot configuration files. This option
   affects how snapshot synonyms (LTS/Nightly) are expanded to URLs by the
   `pantry` library.
-
 * `docker-network` configuration key added to override docker `--net` arg
 
 Behavior changes:
 
-* File watching now takes into account specified targets, old behavior could
-  be restored using the new flag `--watch-all`
+* File watching now takes into account specified targets, old behavior could be
+  restored using the new flag `--watch-all`
   [#5310](https://github.com/commercialhaskell/stack/issues/5310)
 
 Other enhancements:
 
-* `stack ls dependencies json` now includes fields `sha256` and `size` for
-  dependencies of `type` `archive` in `location`.
+* The output of `stack ls dependencies json` now includes keys `sha256` and
+  `size` for dependencies of `type` `archive` in `location`.
   [#5280](https://github.com/commercialhaskell/stack/issues/5280)
 * Build failures now show a hint to scroll up to the corresponding section
   [#5279](https://github.com/commercialhaskell/stack/issues/5279)
@@ -276,8 +1052,8 @@ Other enhancements:
 Bug fixes:
 
 * When using the `STACK_YAML` env var with Docker, make the path absolute.
-* Fix the problem of `stack repl foo:test:bar` failing without a project
-  build before that. See
+* Fix the problem of `stack repl foo:test:bar` failing without a project build
+  before that. See
   [#5213](https://github.com/commercialhaskell/stack/issues/5213)
 * Fix `stack sdist` introducing unnecessary sublibrary syntax when using
   pvp-bounds. See
@@ -287,38 +1063,41 @@ Bug fixes:
 
 Release notes:
 
-* We have reduced the number of platforms that we support with binary releases.
-  The reason behind this is that we've been slowed down in our release process
-  until now with issues trying to build binaries for less common platforms. In
-  order to make sure we can address issues more quickly (like supporting new
-  GHC versions), we're limiting support from the Stack team to:
+* We have reduced the number of platforms that we support with executable
+  releases. The reason behind this is that we have been slowed down in our
+  release process until now with issues trying to build executables for less
+  common platforms. In order to make sure we can address issues more quickly
+  (like supporting new GHC versions), we are limiting support from the Stack
+  team to:
 
-    * Linux 64-bit (static)
-    * macOS
-    * Windows 64-bit
+    * Linux 64-bit/x86_64 (statically-linked)
+    * macOS x86_64
+    * Windows 64-bit/x86_64
 
-  If others want to provide additional binaries, we will definitely be happy
+  If others want to provide additional executables, we will definitely be happy
   for the support. But since our CI system is currently able to produce these
-  three bindists only, that's what we will be providing with the next release.
-
-* Since we no longer have dynamically linked Linux binaries, we are removing
-  removing the `-static` suffix from the static Linux binaries.  If you have
-  scripts to download the latest stable Linux binary, update them to use
-  `linux-x86_64` instead of `linux-x86_64-static` (if you are already using the
-  former, nothing needs to change).  For this release, both are supported, but
-  the next release will no longer have the `-static` variant.
-
-* We are also deprecating the download links at https://stackage.org/stack.
-  See this page for the current installation instructions:
+  three executables only, that's what we will be providing with the next
+  release.
+
+* Since we no longer have dynamically-linked Linux executables, we are removing
+  the `-static` suffix from the static Linux/x86_64 executables. If you have
+  scripts to download the latest stable Linux/x86_64 executable, update them to
+  use `linux-x86_64` instead of `linux-x86_64-static` (if you are already using
+  the former, nothing needs to change). For this release, both are supported,
+  but the next release will no longer have the `-static` variant.
+
+* We are also deprecating the download links at https://stackage.org/stack. See
+  this page for the current installation instructions:
   https://docs.haskellstack.org/en/stable/install_and_upgrade/.
 
-* These are the canonical locations to download the latest stable binaries
-  from, and will continue to be supported going forward:
+* These are the canonical locations to download the latest stable binaries from,
+  and will continue to be supported going forward:
 
-    * Linux 64-bit (static):
+    * Linux 64-bit/x86_64 (static):
       https://get.haskellstack.org/stable/linux-x86_64.tar.gz
-    * macOS: https://get.haskellstack.org/stable/osx-x86_64.tar.gz
-    * Windows 64-bit: https://get.haskellstack.org/stable/windows-x86_64.zip
+    * macOS x86_64: https://get.haskellstack.org/stable/osx-x86_64.tar.gz
+    * Windows 64-bit/x86_64:
+      https://get.haskellstack.org/stable/windows-x86_64.zip
 
   As always, binaries for specific versions are available from the GitHub
   releases: https://github.com/commercialhaskell/stack/releases.
@@ -364,11 +1143,11 @@ Behavior changes:
 
 Other enhancements:
 
-* Add `build-output-timestamps` flag in yaml. Setting it to true
-  prefixes each build log output line with a timestamp.
+* Add `build-output-timestamps` flag in yaml. Setting it to true prefixes each
+  build log output line with a timestamp.
 
-* Show warning about `local-programs-path` with spaces on windows
-  when running scripts. See
+* Show warning about `local-programs-path` with spaces on windows when running
+  scripts. See
   [#5013](https://github.com/commercialhaskell/stack/pull/5013)
 
 * Add `ls dependencies json` which will print dependencies as JSON.
@@ -389,8 +1168,8 @@ Bug fixes:
   Previously, if you SIGTERMed at the wrong time while running a script, you
   could end up with an inconsistent database state.
 
-* `--resolver global` doesn't retrieve snapshots list from the internet because
-  doesn't need it. See
+* `--resolver global` does not retrieve snapshots list from the internet because
+  does not need it. See
   [#5103](https://github.com/commercialhaskell/stack/issues/5103)
 
 * Fix using relative links in haddocks output.  See
@@ -430,8 +1209,8 @@ Hackage-only release:
 
 Behavior changes:
 
-* Disable WAL mode for SQLite3 databases, to improve compatibility with
-  some platforms and filesystems.  See
+* Disable WAL mode for SQLite3 databases, to improve compatibility with some
+  platforms and filesystems. See
   [#4876](https://github.com/commercialhaskell/stack/issues/4876).
 
 * By default, do not perform expiry checks in Hackage Security. See
@@ -439,13 +1218,12 @@ Behavior changes:
 
 Other enhancements:
 
-* Do not rerun expected test failures. This is mostly a change that
-  will only affect the Stackage Curator use case, but there is now an
-  additional message letting the user know when a previously-failed
-  test case is being rerun.
+* Do not rerun expected test failures. This is mostly a change that will only
+  affect the Stackage Curator use case, but there is now an additional message
+  letting the user know when a previously-failed test case is being rerun.
 
-* Move configure information for local packages back to .stack-work to
-  improve caching. See
+* Move configure information for project packages back to .stack-work to improve
+  caching. See
   [#4893](https://github.com/commercialhaskell/stack/issues/4893).
 
 Bug fixes:
@@ -464,12 +1242,12 @@ Bug fixes:
   avoiding a SIGTERM screwing up GHC installation. See
   [#4888](https://github.com/commercialhaskell/stack/issues/4888).
 
-* Use package complete locations from lock files when resolving dependencies
-  in `extra-deps`. See
+* Use package complete locations from lock files when resolving dependencies in
+  `extra-deps`. See
   [#4887](https://github.com/commercialhaskell/stack/issues/4887).
 
-* Set the `HASKELL_DIST_DIR` environment to a proper package dist
-  directory so `doctest` is able to load modules autogenerated by Cabal.
+* Set the `HASKELL_DIST_DIR` environment to a proper package dist directory so
+  `doctest` is able to load modules autogenerated by Cabal.
 
 * Expose package library when running tests.
 
@@ -491,11 +1269,11 @@ Hackage-only release that removes `stack.yaml` from the sdist.  This is because
 basis on individual packages (see
 [#4860](https://github.com/commercialhaskell/stack/issues/4860))
 
-If building a `stack` executable for distribution, please download the
-source code from https://github.com/commercialhaskell/stack/releases/tag/v2.1.1
-and build it using Stack itself in order to ensure identical behaviour
-to official binaries.  This package on Hackage is provided for convenience
-and bootstrapping purposes.
+If building a `stack` executable for distribution, please download the source
+code from https://github.com/commercialhaskell/stack/releases/tag/v2.1.1 and
+build it using Stack itself in order to ensure identical behaviour to official
+binaries. This package on Hackage is provided for convenience and bootstrapping
+purposes.
 
 
 ## v2.1.1 - 2019-06-13
@@ -513,15 +1291,14 @@ features, as listed below.
 
 Major changes:
 
-* Switch over to pantry for managing packages. This is a major change
-  to Stack's internals, and affects user-visible behavior in a few
-  places. Some highlights:
+* Switch over to pantry for managing packages. This is a major change to Stack's
+  internals, and affects user-visible behavior in a few places. Some highlights:
     * Drop support for multiple package indices and legacy
       `00-index.tar` style indices. See
       [#4137](https://github.com/commercialhaskell/stack/issues/4137).
-    * Support for archives and repos in the `packages` section has
-      been removed. Instead, you must use `extra-deps` for such
-      dependencies. `packages` now only supports local filepaths.
+    * Support for archives and repos in values of the `packages` key has been
+      removed. Instead, you must use the `extra-deps` key for such dependencies.
+      `packages` now only supports local filepaths.
     * Add support for Git repositories containing (recursive) submodules.
     * Addition of new configuration options for specifying a "pantry
       tree" key, which provides more reproducibility around builds,
@@ -560,7 +1337,7 @@ Major changes:
 * Remove the `stack image` command. With the advent of Docker multistage
   builds, this functionality is no longer useful. For an example, please see
   [Building Haskell Apps with Docker](https://www.fpcomplete.com/blog/2017/12/building-haskell-apps-with-docker).
-* Support building GHC from source (experimental)
+* Experimental: Support building GHC from source
     * Stack now supports building and installing GHC from source. The built GHC
       is uniquely identified by a commit id and an Hadrian "flavour" (Hadrian is
       the newer GHC build system), hence `compiler` can be set to use a GHC
@@ -584,7 +1361,7 @@ Behavior changes:
 * When using `stack script`, custom snapshot files will be resolved
   relative to the directory containing the script.
 * Remove the deprecated `--upgrade-cabal` flag to `stack setup`.
-* Support the `drop-packages` field in `stack.yaml`
+* Support the `drop-packages` key in `stack.yaml`
 * Remove the GPG signing code during uploads. The GPG signatures have
   never been used yet, and there are no plans to implement signature
   verification.
@@ -631,7 +1408,7 @@ Other enhancements:
 
 * Support MX Linux in get-stack.sh. Fixes
   [#4769](https://github.com/commercialhaskell/stack/issues/4769).
-* Defer loading up of files for local packages. This allows us to get
+* Defer loading up of files for project packages. This allows us to get
   plan construction errors much faster, and avoid some unnecessary
   work when only building a subset of packages. This is especially
   useful for the curator use case.
@@ -658,7 +1435,7 @@ Other enhancements:
   now include package names so they can be more easily copy-pasted.
 * Git repos are shared across multiple projects. See
   [#3551](https://github.com/commercialhaskell/stack/issues/3551)
-* Use en_US.UTF-8 locale by default in pure Nix mode so programs won't
+* Use en_US.UTF-8 locale by default in pure Nix mode so programs will not
   crash because of Unicode in their output
   [#4095](https://github.com/commercialhaskell/stack/issues/4095)
 * Add `--tree` to `ls dependencies` to list dependencies as tree.
@@ -680,7 +1457,7 @@ Other enhancements:
   with packages from Hackage, not Git repos or archives.
 * When using the script interpreter with `--optimize` or `--compile`,
   Stack will perform an optimization of checking whether a newer
-  executable exists, making reruns significantly faster. There's a
+  executable exists, making reruns significantly faster. There is a
   downside to this, however: if you have a multifile script, and
   change one of the dependency modules, Stack will not automatically
   detect and recompile.
@@ -696,13 +1473,11 @@ Other enhancements:
   variables. See [#620](https://github.com/commercialhaskell/stack/issues/620).
 * Less verbose output from `stack setup` on Windows. See
   [#1212](https://github.com/commercialhaskell/stack/issues/1212).
-* Add an optional `ignore-expiry` flag to the `hackage-security`
-  section of the `~/.stack/config.yaml`. It allows to disable timestamp
-  expiration verification just like `cabal --ignore-expiry` does.
-  The flag is not enabled by default so that the default functionality
-  is not changed.
-* Include default values for most command line flags in the `--help`
-  output. See
+* Add an optional `ignore-expiry` key to the `hackage-security` key of
+  `~/.stack/config.yaml`. It allows disabling of timestamp expiration
+  verification just like `cabal --ignore-expiry` does. The flag is not enabled
+  by default so that the default functionality is not changed.
+* Include default values for most command line flags in the `--help` output. See
   [#893](https://github.com/commercialhaskell/stack/issues/893).
 * Set the `GHC_ENVIRONMENT` environment variable to specify dependency
   packages explicitly when running test. This is done to prevent
@@ -760,7 +1535,7 @@ Bug fixes:
 * Fix for git packages to update submodules to the correct state. See
   [#4314](https://github.com/commercialhaskell/stack/pull/4314)
 * Add `--cabal-files` flag to `stack ide targets` command.
-* Don't download ghc when using `stack clean`.
+* Do not download ghc when using `stack clean`.
 * Support loading in GHCi definitions from symlinked C files. Without this
   patch, Stack will try to find object files in the directory pointed to
   by symlinks, while GCC will produce the object files in the original
@@ -783,7 +1558,7 @@ Bug fixes:
 * Help text for the `templates` subcommand now reflects behaviour in Stack 1.9
   — that it downloads and shows a help file, rather than listing available
   templates.
-* Fix detection of aarch64 platform (this broke when we upgraded to a newer
+* Fix detection of AArch64 platform (this broke when we upgraded to a newer
   Cabal version).
 * Docker: fix detecting and pulling missing images with `--docker-auto-pull`.
   See
@@ -799,7 +1574,7 @@ Bug fixes:
   [#4488](https://github.com/commercialhaskell/stack/issues/4488)
 * Docker: fix detection of expected subprocess failures.  This fixes
   downloading a compatible `stack` executable  when the host `stack` is not
-  compatible with the Docker image (on Linux), and doesn't show an unnecessary
+  compatible with the Docker image (on Linux), and does not show an unnecessary
   extra error when the in-container re-exec'ed `stack` exits with failure.
 * The `stack ghci` command's `--ghc-options` flag now parses multiple options.
   See [#3315](https://github.com/commercialhaskell/stack/issues/3315).
@@ -837,7 +1612,7 @@ Hackage-only release with no user facing changes.
 
 Release notes:
 
-* Statically linked Linux bindists are back again, thanks to
+* Statically-linked Linux executables are back again, thanks to
   [@nh2](https://github.com/nh2).
 * We will be deleting the Ubuntu, Debian, CentOS, Fedora, and Arch package repos
   from `download.fpcomplete.com` soon. These have been deprecated for over a
@@ -875,9 +1650,9 @@ Behavior changes:
   [help file](https://github.com/commercialhaskell/stack-templates/blob/master/STACK_HELP.md)
   with more information on how to discover templates. See:
   [#4039](https://github.com/commercialhaskell/stack/issues/4039)
-* Build tools are now handled in a similar way to `cabal-install`. In
-  particular, for legacy `build-tools` fields, we use a hard-coded
-  list of build tools in place of looking up build tool packages in a
+* Tools used during building ('build tools') are now handled in a similar way to
+  `cabal-install`. In particular, for legacy `build-tools` fields, we use a
+  hard-coded list of build tools in place of looking up build tool packages in a
   tool map. This both brings Stack's behavior closer into line with
   `cabal-install`, avoids some bugs, and opens up some possible
   optimizations/laziness. See:
@@ -892,6 +1667,15 @@ Behavior changes:
   download a template, Stack will check whether that template had
   been downloaded before. In that case, the cached version will be
   used. See [#3850](https://github.com/commercialhaskell/stack/issues/3850).
+* In Stack's script interpreter, `-- stack --verbosity=info script` and
+  `-- stack script --verbosity=info` now have the same effect and both override
+  the `--verbosity=error` default in the interpreter. Previously the default
+  meant the former was equivalent to
+  `-- stack --verbosity=info script --verbosity=error` and the latter was
+  equivalent to `-- stack --verbosity=error script --verbosity=info`, with the
+  subcommand's global option having precedence over the Stack command's
+  global option in each case. See
+  [#5326](https://github.com/commercialhaskell/stack/issues/5326).
 
 Other enhancements:
 
@@ -996,10 +1780,10 @@ Bug fixes:
 
 Release notes:
 
-* aarch64 (64-bit ARM) bindists are now available for the first time.
-* Statically linked Linux bindists are no longer available, due to difficulty
+* AArch64 (64-bit ARM) executables are now available for the first time.
+* Statically-linked Linux executables are no longer available, due to difficulty
   with GHC 8.2.2 on Alpine Linux.
-* 32-bit Linux GMP4 bindists for CentOS 6 are no longer available, since
+* 32-bit Linux GMP4 executables for CentOS 6 are no longer available, since
   GHC 8.2.2 is no longer being built for that platform.
 
 Major changes:
@@ -1026,8 +1810,8 @@ Other enhancements:
   for details.
 * Specify User-Agent HTTP request header on every HTTP request.
   See [#3628](https://github.com/commercialhaskell/stack/issues/3628) for details.
-* `stack setup` looks for GHC bindists and installations by any OS key
-  that is compatible (rather than only checking a single one).   This is
+* `stack setup` looks for GHC binary distributions and installations by any OS
+  key that is compatible (rather than only checking a single one). This is
   relevant on Linux where different distributions may have different
   combinations of libtinfo 5/6, ncurses 5/6, and gmp 4/5, and will allow
   simplifying the setup-info metadata YAML for future GHC releases.
@@ -1035,10 +1819,10 @@ Other enhancements:
 * `stack setup --verbose` causes verbose output of GHC configure process.
   See [#3716](https://github.com/commercialhaskell/stack/issues/3716)
 * Improve the error message when an `extra-dep` from a path or git reference
-  can't be found. See
+  cannot be found. See
   [#3808](https://github.com/commercialhaskell/stack/pull/3808)
 * Nix integration is now disabled on windows even if explicitly enabled,
-  since it isn't supported. See
+  since it is not supported. See
   [#3600](https://github.com/commercialhaskell/stack/issues/3600)
 * `stack build` now supports a new flag `--keep-tmp-files` to retain
   intermediate files and directories for the purpose of debugging. It is best
@@ -1059,7 +1843,7 @@ Bug fixes:
   [#3658](https://github.com/commercialhaskell/stack/issues/3658).
   In particular, this makes it possible to pass `-- +RTS ... -RTS` to specify
   RTS arguments used when running the script.
-* Don't ignore the template `year` parameter in config files, and clarify the
+* Do not ignore the template `year` parameter in config files, and clarify the
   surrounding documentation. See
   [#2275](https://github.com/commercialhaskell/stack/issues/2275).
 * Benchmarks used to be run concurrently with other benchmarks
@@ -1087,8 +1871,8 @@ Bug fixes:
 * `stack ghci` now replaces the Stack process with ghci. This improves
   signal handling behavior. In particular, handling of Ctrl-C.  To make
   this possible, the generated files are now left behind after exit.
-  The paths are based on hashing file contents, and it's stored in the
-  system temporary directory, so this shouldn't result in too much
+  The paths are based on hashing file contents, and it is stored in the
+  system temporary directory, so this should not result in too much
   garbage. See
   [#3821](https://github.com/commercialhaskell/stack/issues/3821).
 
@@ -1139,7 +1923,8 @@ Enhancements:
   cases where HTTP servers mistakenly set the transfer encoding to `gzip`. See
   [#3647](https://github.com/commercialhaskell/stack/issues/3647).
 * Links to docs.haskellstack.org ignore Stack version patchlevel.
-* Downloading Docker-compatible `stack` binary ignores Stack version patchlevel.
+* Downloading Docker-compatible `stack` executable ignores Stack version
+  patchlevel.
 
 Bug fixes:
 
@@ -1161,7 +1946,7 @@ newer dependency versions).
 Major changes:
 
 * Complete overhaul of how snapshots are defined, the `packages` and
-  `extra-deps` fields, and a number of related items. For full
+  `extra-deps` keys, and a number of related items. For full
   details, please see the
   [writeup](https://www.fpcomplete.com/blog/2017/07/stacks-new-extensible-snapshots)
   on these changes.
@@ -1217,7 +2002,7 @@ Other enhancements:
 * The `with-hpack` configuration option specifies an Hpack executable to use
   instead of the Hpack bundled with Stack. Please
   see [#3179](https://github.com/commercialhaskell/stack/issues/3179).
-* It's now possible to skip tests and benchmarks using `--skip`
+* It is now possible to skip tests and benchmarks using `--skip`
   flag
 * `GitSHA1` is now `StaticSHA256` and is implemented using the
   `StaticSize 64 ByteString` for improved performance. See
@@ -1247,7 +2032,7 @@ Other enhancements:
   Sometimes GHC's heuristics would work fine even before this change,
   for example in `stack ghci`, but this override's GHC's heuristics
   when they're broken by our collecting and processing GHC's output.
-* Extended the `ghc-options` field to support `$locals`, `$targets`,
+* Extended the `ghc-options` key to support `$locals`, `$targets`,
   and `$everything`. See:
   [#3329](https://github.com/commercialhaskell/stack/issues/3329)
 * Better error message for case that `stack ghci` file targets are
@@ -1259,7 +2044,7 @@ Other enhancements:
 * Better descriptions are now available for `stack upgrade --help`. See:
   [#3070](https://github.com/commercialhaskell/stack/issues/3070)
 * When using Nix, nix-shell now depends always on gcc to prevent build errors
-  when using the FFI. As ghc depends on gcc anyway, this doesn't increase the
+  when using the FFI. As ghc depends on gcc anyway, this does not increase the
   dependency footprint.
 * `--cwd DIR` can now be passed to `stack exec` in order to execute the
   program in a different directory. See:
@@ -1277,7 +2062,7 @@ Other enhancements:
 * Log when each individual test suite finishes. See:
   [#3552](https://github.com/commercialhaskell/stack/issues/3552).
 * Avoid spurious rebuilds when using `--file-watch` by not watching files for
-  executable, test and benchmark components that aren't a target. See:
+  executable, test and benchmark components that are not a target. See:
   [#3483](https://github.com/commercialhaskell/stack/issues/3483).
 * Stack will now try to detect the width of the running terminal
   (only on POSIX for the moment) and use that to better display
@@ -1294,9 +2079,9 @@ Other enhancements:
 * Automatically run `autoreconf -i` as necessary when a `configure`
   script is missing. See
   [#3534](https://github.com/commercialhaskell/stack/issues/3534)
-* GHC bindists can now be identified by their SHA256 checksum in addition to
-  their SHA1 checksum, allowing for more security in download.
-* For filesystem setup-info paths, it's no longer assumed that the
+* GHC binary distributions can now be identified by their SHA256 checksum in
+  addition to their SHA1 checksum, allowing for more security in download.
+* For filesystem setup-info paths, it is no longer assumed that the
   directory is writable, instead a temp dir is used.  See
   [#3188](https://github.com/commercialhaskell/stack/issues/3188).
 
@@ -1309,7 +2094,7 @@ Bug fixes:
 * `stack haddock` now includes package names for all modules in the
    Haddock index page. See:
   [#2886](https://github.com/commercialhaskell/stack/issues/2886)
-* Fixed an issue where Stack wouldn't detect missing Docker images
+* Fixed an issue where Stack would not detect missing Docker images
   properly with newer Docker versions.
   [#3171](https://github.com/commercialhaskell/stack/pull/3171)
 * Previously, Cabal files with just test-suite could cause build to fail
@@ -1330,7 +2115,7 @@ Bug fixes:
 * `stack script` can now handle relative paths to source files.
   See [#3372](https://github.com/commercialhaskell/stack/issues/3372).
 * Fixes explanation of why a target is needed by the build plan, when the
-  target is an extra dependency from the commandline.
+  target is an extra-dep from the commandline.
   See [#3378](https://github.com/commercialhaskell/stack/issues/3378).
 * Previously, if you delete a yaml file from ~/.stack/build-plan, it would
   trust the etag and not re-download.  Fixed in this version.
@@ -1359,7 +2144,7 @@ Bug fixes:
   [#3562](https://github.com/commercialhaskell/stack/issues/3562)
 * Fixes a bug that has existed since 1.5.0, where
   `stack setup --upgrade-cabal` would say that Cabal is already the latest
-  version, when it wasn't.
+  version, when it was not.
 * Ensure that an `extra-dep` from a local directory is not treated as
   a `$locals` for GHC options purposes. See
   [#3574](https://github.com/commercialhaskell/stack/issues/3574).
@@ -1415,7 +2200,7 @@ Other enhancements:
   of sources being included in Haddock output.
   See [#3099](https://github.com/commercialhaskell/stack/issues/3099)
 * `stack ghci` will now skip building all local targets, even if they have
-  downstream deps, as long as it's registered in the DB.
+  downstream deps, as long as it is registered in the DB.
 * The `pvp-bounds` feature now supports adding `-revision` to the end of each
   value, e.g. `pvp-bounds: both-revision`. This means that, when uploading to
   Hackage, Stack will first upload your tarball with an unmodified Cabal file,
@@ -1434,11 +2219,10 @@ Other enhancements:
   [#3126](https://github.com/commercialhaskell/stack/issues/3126)
 * When using Nix, nix-shell now depends always on git to prevent runtime errors
   while fetching metadata
-* The `stack unpack` command now accepts a form where an explicit
-  Hackage revision hash is specified, e.g. `stack unpack
-  foo-1.2.3@gitsha1:deadbeef`. Note that this should be considered
-  _experimental_, Stack will likely move towards a different hash
-  format in the future.
+* Experimental: The `stack unpack` command now accepts a form where an explicit
+  Hackage revision hash is specified, e.g.
+  `stack unpack foo-1.2.3@gitsha1:deadbeef`. Note that Stack will likely move
+  towards a different hash format in the future.
 * Binary "stack upgrade" will now warn if the installed executable is not
   on the PATH or shadowed by another entry.
 * Allow running tests on tarball created by sdist and upload
@@ -1449,7 +2233,7 @@ Bug fixes:
 * Fixes case where `stack build --profile` might not cause executables /
   tests / benchmarks to be rebuilt.
   See [#2984](https://github.com/commercialhaskell/stack/issues/2984)
-* `stack ghci file.hs` now loads the file even if it isn't part of
+* `stack ghci file.hs` now loads the file even if it is not part of
   your project.
 * `stack clean --full` now works when docker is enabled.
   See [#2010](https://github.com/commercialhaskell/stack/issues/2010)
@@ -1465,7 +2249,7 @@ Bug fixes:
   groups on Ubuntu Yakkety (16.10).
   See [#3092](https://github.com/commercialhaskell/stack/issues/3092)
 * Switching a package between extra-dep and local package now forces
-  rebuild (previously it wouldn't if versions were the same).
+  rebuild (previously it would not if versions were the same).
   See [#2147](https://github.com/commercialhaskell/stack/issues/2147)
 * `stack upload` no longer reveals your password when you type it on
   MinTTY-based Windows shells, such as Cygwin and MSYS2.
@@ -1541,7 +2325,7 @@ Other enhancements:
   ([#2384](https://github.com/commercialhaskell/stack/issues/2384))
 * `stack haddock` now shows index.html paths when documentation is already up to
   date. Resolved [#781](https://github.com/commercialhaskell/stack/issues/781)
-* Respects the `custom-setup` field introduced in Cabal 1.24. This supercedes
+* Respects the `custom-setup` stanza introduced in Cabal 1.24. This supercedes
   any `explicit-setup-deps` settings in your `stack.yaml` and trusts the
   package's Cabal file to explicitly state all its dependencies.
 * If system package installation fails, `get-stack.sh` will fail as well. Also
@@ -1598,7 +2382,7 @@ Bug fixes:
 
 * `stack config set` can now be used without a compiler installed
   [#2852](https://github.com/commercialhaskell/stack/issues/2852).
-* `get-stack.sh` now installs correct binary on ARM for generic linux and
+* `get-stack.sh` now installs correct executable on ARM for generic Linux and
   raspbian, closing
   [#2856](https://github.com/commercialhaskell/stack/issues/2856).
 * Correct the testing of whether a package database exists by checking
@@ -1617,17 +2401,15 @@ Bug fixes:
 
 Release notes:
 
-* For the _next_ Stack release after this one, we are planning
-  changes to our Linux releases, including dropping our Ubuntu,
-  Debian, CentOS, and Fedora package repositories and switching to
-  statically linked binaries. See
+* For the _next_ Stack release after this one, we are planning changes to our
+  Linux releases, including dropping our Ubuntu, Debian, CentOS, and Fedora
+  package repositories and switching to statically-linked executables. See
   [#2534](https://github.com/commercialhaskell/stack/issues/2534).
-  Note that upgrading without a package manager has gotten easier
-  with new binary upgrade support in `stack upgrade` (see the Major
-  Changes section below for more information). In addition, the
-  get.haskellstack.org script no longer installs from Ubuntu,
-  Debian, CentOS, or Fedora package repositories. Instead it places
-  a generic binary in /usr/local/bin.
+  Note that upgrading without a package manager has gotten easier with new
+  binary upgrade support in `stack upgrade` (see the Major Changes section below
+  for more information). In addition, the get.haskellstack.org script no longer
+  installs from Ubuntu, Debian, CentOS, or Fedora package repositories. Instead
+  it places a generic executable in /usr/local/bin.
 
 Major changes:
 
@@ -1648,11 +2430,10 @@ Major changes:
   because it should no longer be necessary. See
   [#1364](https://github.com/commercialhaskell/stack/issues/1364)
 
-* Stack is now capable of doing binary upgrades instead of always
-  recompiling a new version from source. Running `stack upgrade` will
-  now default to downloading a binary version of Stack from the most
-  recent release, if one is available. See `stack upgrade --help` for
-  more options.
+* Stack is now capable of doing binary upgrades instead of always recompiling a
+  new version from source. Running `stack upgrade` will now default to
+  downloading a Stack executable from the most recent release, if one is
+  available. See `stack upgrade --help` for more options.
   [#1238](https://github.com/commercialhaskell/stack/issues/1238)
 
 Behavior changes:
@@ -1672,8 +2453,8 @@ Other enhancements:
 
 * `stack haddock` now supports `--haddock-internal`. See
   [#2229](https://github.com/commercialhaskell/stack/issues/2229)
-* Add support for `system-ghc` and `install-ghc` fields to `stack config set`
-  command.
+* Add support for `system-ghc` and `install-ghc` subcommands to
+  `stack config set` command.
 * Add `ghc-build` option to override autodetected GHC build to use (e.g. gmp4,
   tinfo6, nopie) on Linux.
 * `stack setup` detects systems where gcc enables PIE by default (such as Ubuntu
@@ -1691,7 +2472,7 @@ Other enhancements:
 * Add the `--open` option to "stack hpc report" command, causing the report to
   be opened in the browser.
 * The `stack config set` command now accepts a `--global` flag for suitable
-  fields which causes it to modify the global user configuration
+  subcommands which causes it to modify the global user configuration
   (`~/.stack/config.yaml`) instead of the project configuration.
   [#2675](https://github.com/commercialhaskell/stack/pull/2675)
 * Information on the latest available snapshots is now downloaded from S3
@@ -1704,7 +2485,7 @@ Other enhancements:
   [#2647](https://github.com/commercialhaskell/stack/issues/2647).
 * The `--main-is` flag for GHCI now implies the TARGET, fixing
   [#1845](https://github.com/commercialhaskell/stack/issues/1845).
-* `stack ghci` no longer takes all build options, as many weren't useful
+* `stack ghci` no longer takes all build options, as many were not useful
   [#2199](https://github.com/commercialhaskell/stack/issues/2199)
 * `--no-time-in-log` option, to make verbose logs more diffable
   [#2727](https://github.com/commercialhaskell/stack/issues/2727)
@@ -1788,21 +2569,23 @@ Release notes:
   [store#37](https://github.com/fpco/store/issues/37)).  Please stay with
   version 1.1.2 for now on those architectures.  This will be rectified soon!
 
-* We are now releasing a statically linked Stack binary for
+* We are now releasing a statically-linked Stack executable for
   [64-bit Linux](https://get.haskellstack.org/stable/linux-x86_64-static.tar.gz).
   Please try it and let us know if you run into any trouble on your platform.
+  The executable is linked against a version of the GNU Multiple Precision
+  Arithmetic Library (GMP), which is licensed under the GNU Lesser General
+  Public License, Version 3, 29 June 2007 (LGPL).
 
 * We are planning some changes to our Linux releases, including dropping our
   Ubuntu, Debian, CentOS, and Fedora package repositories and switching to
-  statically linked binaries.  We would value your feedback in
+  statically-linked executables. We would value your feedback in
   [#2534](https://github.com/commercialhaskell/stack/issues/2534).
 
 Major changes:
 
 * Add `stack hoogle` command.
   [#55](https://github.com/commercialhaskell/stack/issues/55)
-* Support for absolute file path in `url` field of `setup-info` or
-  `--ghc-bindist`
+* Support for absolute file path in `url` key of `setup-info` or `--ghc-bindist`
 * Add support for rendering GHCi scripts targeting different GHCi like
   applications
   [#2457](https://github.com/commercialhaskell/stack/pull/2457)
@@ -1816,9 +2599,10 @@ Behavior changes:
 * Support -ferror-spans syntax in GHC error messages.
 * Avoid unpacking ghc to `/tmp`
   [#996](https://github.com/commercialhaskell/stack/issues/996)
-* The Linux `gmp4` GHC bindist is no longer considered a full-fledged GHC
-  variant and can no longer be specified using the `ghc-variant` option,
-  and instead is treated more like a slightly different platform.
+* The Linux `gmp4` GHC binary distribution is no longer considered a
+  full-fledged GHC variant and can no longer be specified using the
+  `ghc-variant` option, and instead is treated more like a slightly different
+  platform.
 
 Other enhancements:
 
@@ -1845,9 +2629,11 @@ Other enhancements:
 * `stack setup` no longer unpacks to the system temp dir on posix systems.
   [#996](https://github.com/commercialhaskell/stack/issues/996)
 * `stack setup` detects libtinfo6 and ncurses6 and can download alternate GHC
-  bindists [#257](https://github.com/commercialhaskell/stack/issues/257)
+  binary distributions
+  [#257](https://github.com/commercialhaskell/stack/issues/257)
   [#2302](https://github.com/commercialhaskell/stack/issues/2302).
-* `stack setup` detects Linux ARMv7 downloads appropriate GHC bindist
+* `stack setup` detects Linux ARMv7 downloads appropriate GHC binary
+  distribution
   [#2103](https://github.com/commercialhaskell/stack/issues/2103)
 * Custom `stack` binaries list dependency versions in output for `--version`.
   See [#2222](https://github.com/commercialhaskell/stack/issues/2222)
@@ -1950,8 +2736,8 @@ Behavior changes:
   --compiler-exe`. See
   [#2123](https://github.com/commercialhaskell/stack/issues/2123)
 * For packages specified in terms of a git or hg repo, the hash used in the
-  location has changed.  This means that existing downloads from older stack
-  versions won't be used.  This is a side-effect of the fix to
+  location has changed.  This means that existing downloads from older Stack
+  versions will not be used.  This is a side-effect of the fix to
   [#2133](https://github.com/commercialhaskell/stack/issues/2133)
 * `stack upgrade` no longer pays attention to local `stack.yaml` files, just the
   global config and CLI options.
@@ -2028,7 +2814,7 @@ Behavior changes:
   `sdist`)
 * GPG signing of packages while uploading to Hackage is now the default. Use
   `upload --no-signature` if you would rather not contribute your package
-  signature. If you don't yet have a GPG keyset, read this
+  signature. If you do not yet have a GPG keyset, read this
   [blog post on GPG keys](https://fpcomplete.com/blog/2016/05/stack-security-gnupg-keys).
   We can add a `stack.yaml` config setting to disable signing if some people
   desire it. We hope that people will sign. Later we will be adding GPG
@@ -2037,14 +2823,14 @@ Behavior changes:
   package version - it is treated as an extra-dep. `stack build local-pkg-1.2.3`
   is an error even if the version number matches the local package
   [#2028](https://github.com/commercialhaskell/stack/issues/2028).
-* Having a `nix:` section no longer implies enabling nix build. This allows the
-  user to globally configure whether nix is used (unless the project overrides
-  the default explicitly). See
+* A `nix` key in a Stack YAML configuration file no longer implies enabling a
+  Nix build. This allows the user to globally configure whether Nix is used
+  (unless the project overrides the default explicitly). See
   [#1924](https://github.com/commercialhaskell/stack/issues/1924).
-* Remove deprecated valid-wanted field.
+* Remove deprecated `valid-wanted` key.
 * Docker: mount home directory in container
   [#1949](https://github.com/commercialhaskell/stack/issues/1949).
-* Deprecate `--local-bin-path` instead `--local-bin`.
+* Deprecate `stack path --local-bin-path`; instead use `--local-bin`.
 * `stack image`: allow absolute source paths for `add`.
 
 Other enhancements:
@@ -2053,7 +2839,7 @@ Other enhancements:
 * Fix too much rebuilding when enabling/disabling profiling flags.
 * `stack build pkg-1.0` will now build `pkg-1.0` even if the snapshot specifies
   a different version (it introduces a temporary extra-dep)
-* Experimental support for `--split-objs` added
+* Experimental: Support for `--split-objs` added
   [#1284](https://github.com/commercialhaskell/stack/issues/1284).
 * `git` packages with submodules are supported by passing the `--recursive`
   flag to `git clone`.
@@ -2140,7 +2926,7 @@ Bug fixes:
 
 Bug fixes:
 
-* Don't delete contents of ~/.ssh when using `stack clean --full` with Docker
+* Do not delete contents of ~/.ssh when using `stack clean --full` with Docker
   enabled [#2000](https://github.com/commercialhaskell/stack/issues/2000)
 
 ## 1.0.4.2 - 2016-03-09
@@ -2161,8 +2947,8 @@ Major changes:
     * Overall it should now be able to initialize almost all existing Cabal
       packages out of the box as long as the package itself is consistently
       defined.
-    * Choose the best possible snapshot and add extra dependencies on top
-      of a snapshot resolver rather than a compiler resolver -
+    * Choose the best possible snapshot and add extra-deps on top
+      of a snapshot other than a compiler snapshot -
       [#1583](https://github.com/commercialhaskell/stack/pull/1583)
     * Automatically omit a package (`--omit-packages`) when it is compiler
       incompatible or when there are packages with conflicting dependency
@@ -2219,7 +3005,7 @@ Bug fixes:
 * Add space before auto-generated bench opts (makes profiling options work
   uniformly for applications and benchmark suites)
   [#1771](https://github.com/commercialhaskell/stack/issues/1771).
-* Don't try to find plugin if it resembles flag.
+* Do not try to find plugin if it resembles flag.
 * Setup.hs changes cause package dirtiness
   [#1711](https://github.com/commercialhaskell/stack/issues/1711).
 * Send "stack templates" output to stdout
@@ -2251,7 +3037,7 @@ Other enhancements:
 - Docker: pass supplementary groups and umask into container
 - If git fetch fails wipe the directory and try again from scratch
   [#1418](https://github.com/commercialhaskell/stack/issues/1418)
-- Warn if newly installed executables won't be available on the PATH
+- Warn if newly installed executables will not be available on the PATH
   [#1362](https://github.com/commercialhaskell/stack/issues/1362)
 - `stack.yaml`: for `stack image container`, specify multiple images to
   generate, and which executables should be added to those images
@@ -2264,7 +3050,7 @@ Other enhancements:
 
 Bug fixes:
 
-- Don't share precompiled packages between GHC/platform variants and Docker
+- Do not share precompiled packages between GHC/platform variants and Docker
   [#1551](https://github.com/commercialhaskell/stack/issues/1551)
 - Properly redownload corrupted downloads with the correct file size.
   [Mailing list discussion](https://groups.google.com/d/msg/haskell-stack/iVGDG5OHYxs/FjUrR5JsDQAJ)
@@ -2291,7 +3077,7 @@ Bug fixes:
 
 Release notes:
 
-*  We're calling this version 1.0.0 in preparation for Stackage
+*  We are calling this version 1.0.0 in preparation for Stackage
    LTS 4.  Note, however, that this does not mean the code's API
    will be stable as this is primarily an end-user tool.
 
@@ -2342,7 +3128,7 @@ Bug fixes:
   [#1480](https://github.com/commercialhaskell/stack/issues/1480)
 * Restrict commands allowed in interpreter mode
   [#1504](https://github.com/commercialhaskell/stack/issues/1504)
-* `stack ghci` doesn't see preprocessed files for executables
+* `stack ghci` does not see preprocessed files for executables
   [#1347](https://github.com/commercialhaskell/stack/issues/1347)
 * All test suites run even when only one is requested
   [#1550](https://github.com/commercialhaskell/stack/pull/1550)
@@ -2415,12 +3201,12 @@ Bug fixes:
 * Docker-built binaries and libraries in different path
   [#911](https://github.com/commercialhaskell/stack/issues/911)
   [#1367](https://github.com/commercialhaskell/stack/issues/1367)
-* Docker: `--resolver` argument didn't effect selected image tag
+* Docker: `--resolver` argument did not effect selected image tag
 * GHCi: Spaces in filepaths caused module loading issues
   [#1401](https://github.com/commercialhaskell/stack/issues/1401)
-* GHCi: cpp-options in Cabal files weren't used
+* GHCi: cpp-options in Cabal files were not used
   [#1419](https://github.com/commercialhaskell/stack/issues/1419)
-* Benchmarks couldn't be run independently of each other
+* Benchmarks could not be run independently of each other
   [#1412](https://github.com/commercialhaskell/stack/issues/1412)
 * Send output of building setup to stderr
   [#1410](https://github.com/commercialhaskell/stack/issues/1410)
@@ -2429,7 +3215,7 @@ Bug fixes:
 
 Major changes:
 
-* GHCJS can now be used with stackage snapshots via the new `compiler` field.
+* GHCJS can now be used with stackage snapshots via the new `compiler` key.
 * Windows installers are now available:
   [download them here](http://docs.haskellstack.org/en/stable/install_and_upgrade/#windows)
   [#613](https://github.com/commercialhaskell/stack/issues/613)
@@ -2493,7 +3279,7 @@ Bug fixes:
   [#1105](https://github.com/commercialhaskell/stack/issues/1105)
 * Fix: Global options did not work consistently after subcommand
   [#519](https://github.com/commercialhaskell/stack/issues/519)
-* Fix: 'stack ghci' doesn't notice that a module got deleted
+* Fix: 'stack ghci' does not notice that a module got deleted
   [#1180](https://github.com/commercialhaskell/stack/issues/1180)
 * Rebuild when Cabal file is changed
 * Fix: Paths in GHC warnings not canonicalized, nor those for packages in
@@ -2532,7 +3318,7 @@ Other enhancements:
   [#1070](https://github.com/commercialhaskell/stack/pull/1070)
 * Use Stack-installed GHCs for `stack init --solver`
   [#1072](https://github.com/commercialhaskell/stack/issues/1072)
-* New experimental `stack query` command
+* Experimental: Add `stack query` command
   [#1087](https://github.com/commercialhaskell/stack/issues/1087)
 * By default, Stack no longer rebuilds a package due to GHC options changes.
   This behavior can be tweaked with the `rebuild-ghc-options` setting.
@@ -2542,7 +3328,7 @@ Other enhancements:
   [#1089](https://github.com/commercialhaskell/stack/issues/1089)
 * Docker: download or override location of Stack executable to re-run in
   container [#974](https://github.com/commercialhaskell/stack/issues/974)
-* Docker: when Docker Engine is remote, don't run containerized processes as
+* Docker: when Docker Engine is remote, do not run containerized processes as
   host's UID/GID [#194](https://github.com/commercialhaskell/stack/issues/194)
 * Docker: `set-user` option to enable/disable running containerized processes as
   host's UID/GID [#194](https://github.com/commercialhaskell/stack/issues/194)
@@ -2591,8 +3377,8 @@ Major changes:
     * `setup-info` in `stack.yaml`, to specify where to download custom binary
       distributions (also `--ghc-bindist` command-line option)
     * Note: On systems with libgmp4 (aka `libgmp.so.3`), such as CentOS 6, you
-      may need to re-run `stack setup` due to the centos6 GHC bindist being
-      treated like a variant
+      may need to re-run `stack setup` due to the centos6 GHC binary
+      distribution being treated like a variant
 * A new `--pvp-bounds` flag to the sdist and upload commands allows automatic
   adding of PVP upper and/or lower bounds to your dependencies
 
@@ -2614,7 +3400,7 @@ Other enhancements:
 * Added `--file-watch-poll` flag for polling instead of using filesystem events
   (useful for running tests in a Docker container while modifying code in the
   host environment. When code is injected into the container via a volume, the
-  container won't propagate filesystem events).
+  container will not propagate filesystem events).
 * Give a preemptive error message when `-prof` is given as a GHC option
   [#1015](https://github.com/commercialhaskell/stack/issues/1015)
 * Locking is now optional, and will be turned on by setting the `STACK_LOCK`
@@ -2629,9 +3415,9 @@ Bug fixes:
 
 * Hacky workaround for optparse-applicative issue with `stack exec --help`
   [#806](https://github.com/commercialhaskell/stack/issues/806)
-* Build executables for local extra deps
+* Build executables for local extra-deps
   [#920](https://github.com/commercialhaskell/stack/issues/920)
-* copyFile can't handle directories
+* copyFile cannot handle directories
   [#942](https://github.com/commercialhaskell/stack/pull/942)
 * Support for spaces in Haddock interface files
   [fpco/minghc#85](https://github.com/fpco/minghc/issues/85)
@@ -2674,9 +3460,9 @@ Other enhancements:
   [#824](https://github.com/commercialhaskell/stack/issues/824)
 * By default, `stack upgrade` automatically installs GHC as necessary
   [#797](https://github.com/commercialhaskell/stack/issues/797)
-* Added the `ghc-options` field to `stack.yaml`
+* Added the `ghc-options` key to `stack.yaml`
   [#796](https://github.com/commercialhaskell/stack/issues/796)
-* Added the `extra-path` field to `stack.yaml`
+* Added the `extra-path` key to `stack.yaml`
 * Code page changes on Windows only apply to the build command (and its
   synonyms), and can be controlled via a command line flag (still defaults to
   on) [#757](https://github.com/commercialhaskell/stack/issues/757)
@@ -2704,7 +3490,7 @@ Bug fixes:
 * More intelligent logic for setting UTF-8 locale environment variables
   [#856](https://github.com/commercialhaskell/stack/issues/856)
 * Create missing directories for `stack sdist`
-* Don't ignore Cabal files with extra periods
+* Do not ignore Cabal files with extra periods
   [#895](https://github.com/commercialhaskell/stack/issues/895)
 * Deprecate unused `--optimizations` flag
 * Truncated output on slow terminals
@@ -2743,7 +3529,7 @@ Other enhancements:
 * Track build status of tests and benchmarks
   [#525](https://github.com/commercialhaskell/stack/issues/525)
 * `--no-run-tests` [#517](https://github.com/commercialhaskell/stack/pull/517)
-* Targets outside of root dir don't build
+* Targets outside of root dir do not build
   [#366](https://github.com/commercialhaskell/stack/issues/366)
 * Upper limit on number of flag combinations to test
   [#543](https://github.com/commercialhaskell/stack/issues/543)
@@ -2753,7 +3539,7 @@ Other enhancements:
   `--copy-bins` [#342](https://github.com/commercialhaskell/stack/issues/342)
 * Custom snapshots [#111](https://github.com/commercialhaskell/stack/issues/111)
 * --force-dirty flag: Force treating all local packages as having dirty files
-  (useful for cases where Stack can't detect a file change)
+  (useful for cases where Stack cannot detect a file change)
 * GHC error messages: display file paths as absolute instead of relative for
   better editor integration
 * Add the `--copy-bins` option
@@ -2761,7 +3547,7 @@ Other enhancements:
 * Give warnings on unexpected config keys
   [#48](https://github.com/commercialhaskell/stack/issues/48)
 * Remove Docker `pass-host` option
-* Don't require `cabal-install` to upload
+* Do not require `cabal-install` to upload
   [#313](https://github.com/commercialhaskell/stack/issues/313)
 * Generate indexes for all deps and all installed snapshot packages
   [#143](https://github.com/commercialhaskell/stack/issues/143)
@@ -2784,14 +3570,15 @@ Other enhancements:
 
 Bug fixes:
 
-* Extensions from the `other-extensions` field no longer enabled by default
-  [#449](https://github.com/commercialhaskell/stack/issues/449)
+* Extensions from the Cabal `other-extensions` field no longer enabled by
+  default [#449](https://github.com/commercialhaskell/stack/issues/449)
 * Fix: haddock forces rebuild of empty packages
   [#452](https://github.com/commercialhaskell/stack/issues/452)
-* Don't copy over executables excluded by component selection
+* Do not copy over executables excluded by component selection
   [#605](https://github.com/commercialhaskell/stack/issues/605)
-* Fix: Stack fails on Windows with git package in `stack.yaml` and no git binary
-  on path [#712](https://github.com/commercialhaskell/stack/issues/712)
+* Fix: Stack fails on Windows with git package in `stack.yaml` and no git
+  executable on the PATH
+  [#712](https://github.com/commercialhaskell/stack/issues/712)
 * Fixed GHCi issue: Specifying explicit package versions (#678)
 * Fixed GHCi issue: Specifying -odir and -hidir as .stack-work/odir (#529)
 * Fixed GHCi issue: Specifying A instead of A.ext for modules (#498)
@@ -2809,11 +3596,11 @@ Bug fixes:
 * Add `--force` flag to `init` command
 * exec style commands accept the `--package` option (see
   [Reddit discussion](http://www.reddit.com/r/haskell/comments/3bd66h/stack_runghc_turtle_as_haskell_script_solution/))
-* `stack upload` without arguments doesn't do anything
+* `stack upload` without arguments doe snot do anything
   [#439](https://github.com/commercialhaskell/stack/issues/439)
 * Print latest version of packages on conflicts
   [#450](https://github.com/commercialhaskell/stack/issues/450)
-* Flag to avoid rerunning tests that haven't changed
+* Flag to avoid rerunning tests that have not changed
   [#451](https://github.com/commercialhaskell/stack/issues/451)
 * Stack can act as a script interpreter (see [Script interpreter]
   (https://github.com/commercialhaskell/stack/wiki/Script-interpreter) and
@@ -2853,7 +3640,7 @@ Bug fixes:
 * Give a reason for unregistering packages
   [#389](https://github.com/commercialhaskell/stack/issues/389)
 * `stack exec` accepts the `--no-ghc-package-path` parameter
-* Don't require build plan to upload
+* Do not require build plan to upload
   [#400](https://github.com/commercialhaskell/stack/issues/400)
 * Specifying test components only builds/runs those tests
   [#398](https://github.com/commercialhaskell/stack/issues/398)
@@ -2877,7 +3664,7 @@ Bug fixes:
 
 ## 0.1.0.0 - 2015-06-23
 
-* Fall back to Cabal dependency solver when a snapshot can't be found
+* Fall back to Cabal dependency solver when a snapshot cannot be found
 * Basic implementation of `stack new`
   [#137](https://github.com/commercialhaskell/stack/issues/137)
 * `stack solver` command
@@ -2926,4 +3713,4 @@ Bug fixes:
 
 ## 0.0.1 - 2015-06-09
 
-* First public release, beta quality
+* First public release, as the Haskell Tool Stack (beta quality).
diff --git a/LICENSE b/LICENSE
index 0cd08b7cae..06497eb902 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,24 +1,824 @@
-Copyright (c) 2015-2022, Stack contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Stack nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
+Stack
+=====
+
+Copyright (c) 2015-2026, Stack contributors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1.  Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+
+2.  Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+3.  Neither the name of Stack nor the names of its contributors may be used to
+    endorse or promote products derived from this software without specific
+    prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL STACK CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+DISCLAIMED. IN NO EVENT SHALL STACK CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+
+The GNU Multiple Precision Arithmetic Library (GMP)
+===================================================
+
+Stack executables for Linux distributed under Releases at Stack's GitHub
+repository (https://github.com/commercialhaskell/stack) may be statically-linked
+(as indicted there or in Stack's Change Log) and may be linked against a version
+of GMP, which is licensed under the GNU Lesser General Public License,
+Version 3, 29 June 2007 (LGPL).
+
+In accordance with the LGPL, the full source code of Stack is provided at the
+same GitHub repository, allowing you to modify and relink the GMP portion, if
+desired.
+
+GMP source code is available at: https://gmplib.org/
+
+A copy of the LGPL is reproduced below.
+
+
+
+GNU LESSER GENERAL PUBLIC LICENSE
+=================================
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms and
+conditions of version 3 of the GNU General Public License, supplemented by the
+additional permissions listed below.
+
+## 0. Additional Definitions.
+
+As used herein, "this License" refers to version 3 of the GNU Lesser General
+Public License, and the "GNU GPL" refers to version 3 of the GNU General Public
+License.
+
+"The Library" refers to a covered work governed by this License, other than an
+Application or a Combined Work as defined below.
+
+An "Application" is any work that makes use of an interface provided by the
+Library, but which is not otherwise based on the Library. Defining a subclass of
+a class defined by the Library is deemed a mode of using an interface provided
+by the Library.
+
+A "Combined Work" is a work produced by combining or linking an Application with
+the Library. The particular version of the Library with which the Combined Work
+was made is also called the "Linked Version".
+
+The "Minimal Corresponding Source" for a Combined Work means the Corresponding
+Source for the Combined Work, excluding any source code for portions of the
+Combined Work that, considered in isolation, are based on the Application, and
+not on the Linked Version.
+
+The "Corresponding Application Code" for a Combined Work means the object code
+and/or source code for the Application, including any data and utility programs
+needed for reproducing the Combined Work from the Application, but excluding the
+System Libraries of the Combined Work.
+
+## 1. Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License without
+being bound by section 3 of the GNU GPL.
+
+## 2. Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a facility
+refers to a function or data to be supplied by an Application that uses the
+facility (other than as an argument passed when the facility is invoked), then
+you may convey a copy of the modified version:
+
+-   a) under this License, provided that you make a good faith effort to ensure
+    that, in the event an Application does not supply the function or data, the
+    facility still operates, and performs whatever part of its purpose remains
+    meaningful, or
+-   b) under the GNU GPL, with none of the additional permissions of this
+    License applicable to that copy.
+
+## 3. Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from a header
+file that is part of the Library. You may convey such object code under terms of
+your choice, provided that, if the incorporated material is not limited to
+numerical parameters, data structure layouts and accessors, or small macros,
+inline functions and templates (ten or fewer lines in length), you do both of
+the following:
+
+-   a) Give prominent notice with each copy of the object code that the Library
+    is used in it and that the Library and its use are covered by this License.
+-   b) Accompany the object code with a copy of the GNU GPL and this license
+    document.
+
+## 4. Combined Works.
+
+You may convey a Combined Work under terms of your choice that, taken together,
+effectively do not restrict modification of the portions of the Library
+contained in the Combined Work and reverse engineering for debugging such
+modifications, if you also do each of the following:
+
+-   a) Give prominent notice with each copy of the Combined Work that the
+    Library is used in it and that the Library and its use are covered by this
+    License.
+-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+    document.
+-   c) For a Combined Work that displays copyright notices during execution,
+    include the copyright notice for the Library among these notices, as well as
+    a reference directing the user to the copies of the GNU GPL and this license
+    document.
+-   d) Do one of the following:
+    -   0) Convey the Minimal Corresponding Source under the terms of this
+        License, and the Corresponding Application Code in a form suitable for,
+        and under terms that permit, the user to recombine or relink the
+        Application with a modified version of the Linked Version to produce a
+        modified Combined Work, in the manner specified by section 6 of the GNU
+        GPL for conveying Corresponding Source.
+    -   1) Use a suitable shared library mechanism for linking with the Library.
+        A suitable mechanism is one that (a) uses at run time a copy of the
+        Library already present on the user's computer system, and (b) will
+        operate properly with a modified version of the Library that is
+        interface-compatible with the Linked Version.
+-   e) Provide Installation Information, but only if you would otherwise be
+    required to provide such information under section 6 of the GNU GPL, and
+    only to the extent that such information is necessary to install and execute
+    a modified version of the Combined Work produced by recombining or relinking
+    the Application with a modified version of the Linked Version. (If you use
+    option 4d0, the Installation Information must accompany the Minimal
+    Corresponding Source and Corresponding Application Code. If you use option
+    4d1, you must provide the Installation Information in the manner specified
+    by section 6 of the GNU GPL for conveying Corresponding Source.)
+
+## 5. Combined Libraries.
+
+You may place library facilities that are a work based on the Library side by
+side in a single library together with other library facilities that are not
+Applications and are not covered by this License, and convey such a combined
+library under terms of your choice, if you do both of the following:
+
+-   a) Accompany the combined library with a copy of the same work based on the
+    Library, uncombined with any other library facilities, conveyed under the
+    terms of this License.
+-   b) Give prominent notice with the combined library that part of it is a work
+    based on the Library, and explaining where to find the accompanying
+    uncombined form of the same work.
+
+## 6. Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU
+Lesser General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address
+new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library as you
+received it specifies that a certain numbered version of the GNU Lesser General
+Public License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that published version or of any
+later version published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser General Public
+License, you may choose any version of the GNU Lesser General Public License
+ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether
+future versions of the GNU Lesser General Public License shall apply, that
+proxy's public statement of acceptance of any version is permanent authorization
+for you to choose that version for the Library.
+
+
+
+GNU GENERAL PUBLIC LICENSE
+==========================
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+## Preamble
+
+The GNU General Public License is a free, copyleft license for software and
+other kinds of works.
+
+The licenses for most software and other practical works are designed to take
+away your freedom to share and change the works. By contrast, the GNU General
+Public License is intended to guarantee your freedom to share and change all
+versions of a program--to make sure it remains free software for all its users.
+We, the Free Software Foundation, use the GNU General Public License for most of
+our software; it applies also to any other work released this way by its
+authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for them if you wish), that you
+receive source code or can get it if you want it, that you can change the
+software or use pieces of it in new free programs, and that you know you can do
+these things.
+
+To protect your rights, we need to prevent others from denying you these rights
+or asking you to surrender the rights. Therefore, you have certain
+responsibilities if you distribute copies of the software, or if you modify it:
+responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for a
+fee, you must pass on to the recipients the same freedoms that you received. You
+must make sure that they, too, receive or can get the source code. And you must
+show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert
+copyright on the software, and (2) offer you this License giving you legal
+permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that there
+is no warranty for this free software. For both users' and authors' sake, the
+GPL requires that modified versions be marked as changed, so that their problems
+will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified
+versions of the software inside them, although the manufacturer can do so. This
+is fundamentally incompatible with the aim of protecting users' freedom to
+change the software. The systematic pattern of such abuse occurs in the area of
+products for individuals to use, which is precisely where it is most
+unacceptable. Therefore, we have designed this version of the GPL to prohibit
+the practice for those products. If such problems arise substantially in other
+domains, we stand ready to extend this provision to those domains in future
+versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States
+should not allow patents to restrict development and use of software on
+general-purpose computers, but in those that do, we wish to avoid the special
+danger that patents applied to a free program could make it effectively
+proprietary. To prevent this, the GPL assures that patents cannot be used to
+render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of works,
+such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this License. Each
+licensee is addressed as "you". "Licensees" and "recipients" may be individuals
+or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work in a
+fashion requiring copyright permission, other than the making of an exact copy.
+The resulting work is called a "modified version" of the earlier work or a work
+"based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based on the
+Program.
+
+To "propagate" a work means to do anything with it that, without permission,
+would make you directly or secondarily liable for infringement under applicable
+copyright law, except executing it on a computer or modifying a private copy.
+Propagation includes copying, distribution (with or without modification),
+making available to the public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other parties to
+make or receive copies. Mere interaction with a user through a computer network,
+with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to the extent
+that it includes a convenient and prominently visible feature that (1) displays
+an appropriate copyright notice, and (2) tells the user that there is no
+warranty for the work (except to the extent that warranties are provided), that
+licensees may convey the work under this License, and how to view a copy of this
+License. If the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for making
+modifications to it. "Object code" means any non-source form of a work.
+
+A "Standard Interface" means an interface that either is an official standard
+defined by a recognized standards body, or, in the case of interfaces specified
+for a particular programming language, one that is widely used among developers
+working in that language.
+
+The "System Libraries" of an executable work include anything, other than the
+work as a whole, that (a) is included in the normal form of packaging a Major
+Component, but which is not part of that Major Component, and (b) serves only to
+enable use of the work with that Major Component, or to implement a Standard
+Interface for which an implementation is available to the public in source code
+form. A "Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system (if any) on
+which the executable work runs, or a compiler used to produce the work, or an
+object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all the source
+code needed to generate, install, and (for an executable work) run the object
+code and to modify the work, including scripts to control those activities.
+However, it does not include the work's System Libraries, or general-purpose
+tools or generally available free programs which are used unmodified in
+performing those activities but which are not part of the work. For example,
+Corresponding Source includes interface definition files associated with source
+files for the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require, such as by
+intimate data communication or control flow between those subprograms and other
+parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate
+automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of copyright on
+the Program, and are irrevocable provided the stated conditions are met. This
+License explicitly affirms your unlimited permission to run the unmodified
+Program. The output from running a covered work is covered by this License only
+if the output, given its content, constitutes a covered work. This License
+acknowledges your rights of fair use or other equivalent, as provided by
+copyright law.
+
+You may make, run and propagate covered works that you do not convey, without
+conditions so long as your license otherwise remains in force. You may convey
+covered works to others for the sole purpose of having them make modifications
+exclusively for you, or provide you with facilities for running those works,
+provided that you comply with the terms of this License in conveying all
+material for which you do not control copyright. Those thus making or running
+the covered works for you must do so exclusively on your behalf, under your
+direction and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions
+stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological measure under
+any applicable law fulfilling obligations under article 11 of the WIPO copyright
+treaty adopted on 20 December 1996, or similar laws prohibiting or restricting
+circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention is
+effected by exercising rights under this License with respect to the covered
+work, and you disclaim any intention to limit operation or modification of the
+work as a means of enforcing, against the work's users, your or third parties'
+legal rights to forbid circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you receive it,
+in any medium, provided that you conspicuously and appropriately publish on each
+copy an appropriate copyright notice; keep intact all notices stating that this
+License and any non-permissive terms added in accord with section 7 apply to the
+code; keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may
+offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to produce it
+from the Program, in the form of source code under the terms of section 4,
+provided that you also meet all of these conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent works, which
+are not by their nature extensions of the covered work, and which are not
+combined with it such as to form a larger program, in or on a volume of a
+storage or distribution medium, is called an "aggregate" if the compilation and
+its resulting copyright are not used to limit the access or legal rights of the
+compilation's users beyond what the individual works permit. Inclusion of a
+covered work in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of sections 4
+and 5, provided that you also convey the machine-readable Corresponding Source
+under the terms of this License, in one of these ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from the
+Corresponding Source as a System Library, need not be included in conveying the
+object code work.
+
+A "User Product" is either (1) a "consumer product", which means any tangible
+personal property which is normally used for personal, family, or household
+purposes, or (2) anything designed or sold for incorporation into a dwelling. In
+determining whether a product is a consumer product, doubtful cases shall be
+resolved in favor of coverage. For a particular product received by a particular
+user, "normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way in which
+the particular user actually uses, or expects or is expected to use, the
+product. A product is a consumer product regardless of whether the product has
+substantial commercial, industrial or non-consumer uses, unless such uses
+represent the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods, procedures,
+authorization keys, or other information required to install and execute
+modified versions of a covered work in that User Product from a modified version
+of its Corresponding Source. The information must suffice to ensure that the
+continued functioning of the modified object code is in no case prevented or
+interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as part of a
+transaction in which the right of possession and use of the User Product is
+transferred to the recipient in perpetuity or for a fixed term (regardless of
+how the transaction is characterized), the Corresponding Source conveyed under
+this section must be accompanied by the Installation Information. But this
+requirement does not apply if neither you nor any third party retains the
+ability to install modified object code on the User Product (for example, the
+work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates for a
+work that has been modified or installed by the recipient, or for the User
+Product in which it has been modified or installed. Access to a network may be
+denied when the modification itself materially and adversely affects the
+operation of the network or violates the rules and protocols for communication
+across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord
+with this section must be in a format that is publicly documented (and with an
+implementation available to the public in source code form), and must require no
+special password or key for unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this License by
+making exceptions from one or more of its conditions. Additional permissions
+that are applicable to the entire Program shall be treated as though they were
+included in this License, to the extent that they are valid under applicable
+law. If additional permissions apply only to part of the Program, that part may
+be used separately under those permissions, but the entire Program remains
+governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any
+additional permissions from that copy, or from any part of it. (Additional
+permissions may be written to require their own removal in certain cases when
+you modify the work.) You may place additional permissions on material, added by
+you to a covered work, for which you have or can give appropriate copyright
+permission.
+
+Notwithstanding any other provision of this License, for material you add to a
+covered work, you may (if authorized by the copyright holders of that material)
+supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further restrictions"
+within the meaning of section 10. If the Program as you received it, or any part
+of it, contains a notice stating that it is governed by this License along with
+a term that is a further restriction, you may remove that term. If a license
+document contains a further restriction but permits relicensing or conveying
+under this License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does not survive
+such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place,
+in the relevant source files, a statement of the additional terms that apply to
+those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a
+separately written license, or stated as exceptions; the above requirements
+apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly provided
+under this License. Any attempt otherwise to propagate or modify it is void, and
+will automatically terminate your rights under this License (including any
+patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a
+particular copyright holder is reinstated (a) provisionally, unless and until
+the copyright holder explicitly and finally terminates your license, and (b)
+permanently, if the copyright holder fails to notify you of the violation by
+some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated
+permanently if the copyright holder notifies you of the violation by some
+reasonable means, this is the first time you have received notice of violation
+of this License (for any work) from that copyright holder, and you cure the
+violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of
+parties who have received copies or rights from you under this License. If your
+rights have been terminated and not permanently reinstated, you do not qualify
+to receive new licenses for the same material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run a copy of
+the Program. Ancillary propagation of a covered work occurring solely as a
+consequence of using peer-to-peer transmission to receive a copy likewise does
+not require acceptance. However, nothing other than this License grants you
+permission to propagate or modify any covered work. These actions infringe
+copyright if you do not accept this License. Therefore, by modifying or
+propagating a covered work, you indicate your acceptance of this License to do
+so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically receives a
+license from the original licensors, to run, modify and propagate that work,
+subject to this License. You are not responsible for enforcing compliance by
+third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered work results
+from an entity transaction, each party to that transaction who receives a copy
+of the work also receives whatever licenses to the work the party's predecessor
+in interest had or could give under the previous paragraph, plus a right to
+possession of the Corresponding Source of the work from the predecessor in
+interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights
+granted or affirmed under this License. For example, you may not impose a
+license fee, royalty, or other charge for exercise of rights granted under this
+License, and you may not initiate litigation (including a cross-claim or
+counterclaim in a lawsuit) alleging that any patent claim is infringed by
+making, using, selling, offering for sale, or importing the Program or any
+portion of it.
+
+### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this License of
+the Program or a work on which the Program is based. The work thus licensed is
+called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned or
+controlled by the contributor, whether already acquired or hereafter acquired,
+that would be infringed by some manner, permitted by this License, of making,
+using, or selling its contributor version, but do not include claims that would
+be infringed only as a consequence of further modification of the contributor
+version. For purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent
+license under the contributor's essential patent claims, to make, use, sell,
+offer for sale, import and otherwise run, modify and propagate the contents of
+its contributor version.
+
+In the following three paragraphs, a "patent license" is any express agreement
+or commitment, however denominated, not to enforce a patent (such as an express
+permission to practice a patent or covenant not to sue for patent infringement).
+To "grant" such a patent license to a party means to make such an agreement or
+commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the
+Corresponding Source of the work is not available for anyone to copy, free of
+charge and under the terms of this License, through a publicly available network
+server or other readily accessible means, then you must either (1) cause the
+Corresponding Source to be so available, or (2) arrange to deprive yourself of
+the benefit of the patent license for this particular work, or (3) arrange, in a
+manner consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have actual
+knowledge that, but for the patent license, your conveying the covered work in a
+country, or your recipient's use of the covered work in a country, would
+infringe one or more identifiable patents in that country that you have reason
+to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you
+convey, or propagate by procuring conveyance of, a covered work, and grant a
+patent license to some of the parties receiving the covered work authorizing
+them to use, propagate, modify or convey a specific copy of the covered work,
+then the patent license you grant is automatically extended to all recipients of
+the covered work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the scope of
+its coverage, prohibits the exercise of, or is conditioned on the non-exercise
+of one or more of the rights that are specifically granted under this License.
+You may not convey a covered work if you are a party to an arrangement with a
+third party that is in the business of distributing software, under which you
+make payment to the third party based on the extent of your activity of
+conveying the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by you (or
+copies made from those copies), or (b) primarily for and in connection with
+specific products or compilations that contain the covered work, unless you
+entered into that arrangement, or that patent license was granted, prior to
+28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied
+license or other defenses to infringement that may otherwise be available to you
+under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not excuse
+you from the conditions of this License. If you cannot convey a covered work so
+as to satisfy simultaneously your obligations under this License and any other
+pertinent obligations, then as a consequence you may not convey it at all. For
+example, if you agree to terms that obligate you to collect a royalty for
+further conveying from those to whom you convey the Program, the only way you
+could satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have permission to link
+or combine any covered work with a work licensed under version 3 of the GNU
+Affero General Public License into a single combined work, and to convey the
+resulting work. The terms of this License will continue to apply to the part
+which is the covered work, but the special requirements of the GNU Affero
+General Public License, section 13, concerning interaction through a network
+will apply to the combination as such.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU
+General Public License from time to time. Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+that a certain numbered version of the GNU General Public License "or any later
+version" applies to it, you have the option of following the terms and
+conditions either of that numbered version or of any later version published by
+the Free Software Foundation. If the Program does not specify a version number
+of the GNU General Public License, you may choose any version ever published by
+the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the
+GNU General Public License can be used, that proxy's public statement of
+acceptance of a version permanently authorizes you to choose that version for
+the Program.
+
+Later license versions may give you additional or different permissions.
+However, no additional obligations are imposed on any author or copyright holder
+as a result of your choosing to follow a later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
+PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE
+QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY
+COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS
+PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY
+HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided above cannot
+be given local legal effect according to their terms, reviewing courts shall
+apply local law that most closely approximates an absolute waiver of all civil
+liability in connection with the Program, unless a warranty or assumption of
+liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use
+to the public, the best way to achieve this is to make it free software which
+everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach
+them to the start of each source file to most effectively state the exclusion of
+warranty; and each file should have at least the "copyright" line and a pointer
+to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice like
+this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands \`show w' and \`show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands might be
+different; for a GUI interface, you would use an "about box".
+
+You should also get your employer (if you work as a programmer) or school, if
+any, to sign a "copyright disclaimer" for the program, if necessary. For more
+information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may consider
+it more useful to permit linking proprietary applications with the library. If
+this is what you want to do, use the GNU Lesser General Public License instead
+of this License. But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..fab6bcf8fd
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+# With the other prerequisites, this file allows users of the 'make' tool to
+# automate the use of the 'mkdocs' tool to preview or build Stack's online
+# documentation. See CONTRIBUTING.md for more information.
+
+# Preview Stack's online documentation with `make docs-serve`:
+.PHONY: docs-serve
+docs-serve:
+	$(MAKE) -C doc docs-serve
+
+# Build Stack's online documentation with `make _site/index.html`:
+_site/index.html: doc/*.md
+	$(MAKE) -C doc docs-build
diff --git a/README.md b/README.md
index 525ee5de73..57aa0575b9 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,28 @@
-## The Haskell Tool Stack
+## Stack
 
 [![Unit tests](https://github.com/commercialhaskell/stack/workflows/Unit%20tests/badge.svg)](https://github.com/commercialhaskell/stack/actions/workflows/unit-tests.yml)
 [![Integration tests](https://github.com/commercialhaskell/stack/workflows/Integration%20tests/badge.svg)](https://github.com/commercialhaskell/stack/actions/workflows/integration-tests.yml)
 [![Release](https://img.shields.io/github/release/commercialhaskell/stack.svg)](https://github.com/commercialhaskell/stack/releases)
 
-Stack is a cross-platform program for developing Haskell projects. It is intended for Haskellers both new and experienced.
+Stack is a program for developing Haskell projects. It is aimed at new and
+experienced users of Haskell and seeks to support them fully on Linux, macOS
+and Windows.
 
-See [haskellstack.org](http://haskellstack.org) or the [doc](./doc) directory for more
-information.
+See [haskellstack.org](http://haskellstack.org), or the [doc](./doc) directory
+of this repository, for more information.
+
+### Learning to use Stack
+
+If you are learning to use Stack and have questions, a discussion at the
+[Haskell Community](https://discourse.haskell.org/) forum may help. See its
+'Learn' category.
 
 ### Community
 
 You can participate with the Stack community in the following areas:
 
-* [Haskell Foundation Slack](https://haskell-foundation.slack.com/join/shared_invite/zt-z45o9x38-8L55P27r12YO0YeEufcO2w#/shared-invite/email)
-    * `#stack-users` for general Stack discussion
-    * `#stack-collaborators` for working on the Stack code base
-* [Stack Google Group mailing list](https://groups.google.com/g/haskell-stack)
-* [Haskell Community Discourse](https://discourse.haskell.org/)
+* the [Haskell Community](https://discourse.haskell.org/) forum
+
+* the Haskell
+  [Stack and Stackage](https://matrix.to/#/#haskell-stack:matrix.org)
+  room (address `#haskell-stack:matrix.org`) on [Matrix](https://matrix.org/)
diff --git a/Setup.hs b/Setup.hs
index 9fc5e15a26..f34a82df6b 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,59 +1,93 @@
-{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
+module Main
+  ( main
+  ) where
 
-module Main (main) where
-
-import Data.List ( nub, sortBy )
-import Data.Ord ( comparing )
-import Distribution.Package ( PackageId, UnitId, packageVersion, packageName )
-import Distribution.PackageDescription ( PackageDescription(), Executable(..) )
-import Distribution.InstalledPackageInfo (sourcePackageId, installedUnitId)
-import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
-import Distribution.Simple.Utils ( rewriteFileEx, createDirectoryIfMissingVerbose )
-import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
-import Distribution.Simple.PackageIndex (allPackages, dependencyClosure)
-import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), fromFlag )
-import Distribution.Simple.LocalBuildInfo ( installedPkgs, withLibLBI, withExeLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) )
-import Distribution.Types.PackageName (PackageName, unPackageName)
-import Distribution.Types.UnqualComponentName (unUnqualComponentName)
-import Distribution.Verbosity ( Verbosity, normal )
-import Distribution.Pretty ( prettyShow )
-import System.FilePath ( (</>) )
+import           Data.List ( nub, sortOn )
+import           Distribution.InstalledPackageInfo
+                   ( installedUnitId, sourcePackageId )
+import           Distribution.Package ( UnitId, packageName, packageVersion )
+import           Distribution.PackageDescription
+                   ( Executable (..), PackageDescription )
+import           Distribution.Pretty ( prettyShow )
+import           Distribution.Simple
+                   ( UserHooks(..), defaultMainWithHooks, simpleUserHooks )
+import           Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
+import           Distribution.Simple.LocalBuildInfo
+                   ( ComponentLocalBuildInfo (..), LocalBuildInfo, installedPkgs
+                   , withExeLBI, withLibLBI
+                   )
+import           Distribution.Simple.PackageIndex
+                   ( allPackages, dependencyClosure )
+import           Distribution.Simple.Setup
+                   ( BuildFlags (..), ReplFlags (..), fromFlag )
+import           Distribution.Simple.Utils
+                   ( createDirectoryIfMissingVerbose, rewriteFileEx )
+import           Distribution.Types.PackageName ( unPackageName )
+import           Distribution.Types.UnqualComponentName
+                   ( unUnqualComponentName )
+import           Distribution.Utils.Path ( interpretSymbolicPathCWD )
+import           Distribution.Verbosity ( Verbosity, normal )
+import           System.FilePath ( (</>) )
 
 main :: IO ()
 main = defaultMainWithHooks simpleUserHooks
   { buildHook = \pkg lbi hooks flags -> do
-     generateBuildModule (fromFlag (buildVerbosity flags)) pkg lbi
-     buildHook simpleUserHooks pkg lbi hooks flags
+      generateBuildModule (fromFlag (buildVerbosity flags)) pkg lbi
+      buildHook simpleUserHooks pkg lbi hooks flags
+    -- The 'cabal repl' hook corresponds to the 'cabal build' hook and is added
+    -- because, with a Cabal-based cradle, Haskell Language Server makes use of
+    -- 'cabal repl'.
+  , replHook = \pkg lbi hooks flags args -> do
+      generateBuildModule (fromFlag (replVerbosity flags)) pkg lbi
+      replHook simpleUserHooks pkg lbi hooks flags args
   }
 
-generateBuildModule :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
+generateBuildModule ::
+     Verbosity
+  -> PackageDescription
+  -> LocalBuildInfo
+  -> IO ()
 generateBuildModule verbosity pkg lbi = do
-  let dir = autogenPackageModulesDir lbi
+  let dir = interpretSymbolicPathCWD (autogenPackageModulesDir lbi)
   createDirectoryIfMissingVerbose verbosity True dir
   withLibLBI pkg lbi $ \_ libcfg -> do
-    withExeLBI pkg lbi $ \exe clbi ->
-      rewriteFileEx normal (dir </> "Build_" ++ exeName' exe ++ ".hs") $ unlines
-        [ "module Build_" ++ exeName' exe ++ " where"
+    withExeLBI pkg lbi $ \exe clbi -> do
+      let name = exeName' exe
+      rewriteFileEx normal (dir </> "Build_" ++ name ++ ".hs") $ unlines
+        [ "{-|"
+        , "Module      : Build_" ++ name
+        , "License     : BSD-3-Clause"
+        , "-}"
+        , ""
+        , "module Build_" ++ name
+        , "  ( deps"
+        , "  ) where"
         , ""
+        , "-- | The dependencies against which \\'" ++ name ++ "\\' is built."
         , "deps :: [String]"
-        , "deps = " ++ (show $ formatdeps (transDeps libcfg clbi))
+        , "deps = " ++ show (formatdeps (transDeps libcfg clbi))
         ]
   where
     exeName' = unUnqualComponentName . exeName
-    formatdeps = map formatone . sortBy (comparing unPackageName')
+    formatdeps = map formatone . sortOn unPackageName'
     formatone p = unPackageName' p ++ "-" ++ prettyShow (packageVersion p)
     unPackageName' = unPackageName . packageName
-    transDeps xs ys =
-      either (map sourcePackageId . allPackages) handleDepClosureFailure $ dependencyClosure allInstPkgsIdx availInstPkgIds
-      where
-        allInstPkgsIdx = installedPkgs lbi
-        allInstPkgIds = map installedUnitId $ allPackages allInstPkgsIdx
-        -- instPkgIds includes `stack-X.X.X`, which is not a dependency hence is missing from allInstPkgsIdx. Filter that out.
-        availInstPkgIds = filter (`elem` allInstPkgIds) $ testDeps xs ys
-        handleDepClosureFailure unsatisfied =
-          error $
-            "Computation of transitive dependencies failed." ++
-            if null unsatisfied then "" else " Unresolved dependencies: " ++ show unsatisfied
+    transDeps xs ys = either
+      (map sourcePackageId . allPackages)
+      handleDepClosureFailure $ dependencyClosure allInstPkgsIdx availInstPkgIds
+     where
+      allInstPkgsIdx = installedPkgs lbi
+      allInstPkgIds = map installedUnitId $ allPackages allInstPkgsIdx
+      -- instPkgIds includes `stack-X.X.X`, which is not a dependency hence is
+      -- missing from allInstPkgsIdx. Filter that out.
+      availInstPkgIds = filter (`elem` allInstPkgIds) $ testDeps xs ys
+      handleDepClosureFailure unsatisfied =
+        error $
+             "Computation of transitive dependencies failed."
+          ++ if null unsatisfied
+               then ""
+               else " Unresolved dependencies: " ++ show unsatisfied
 
 testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [UnitId]
-testDeps xs ys = map fst $ nub $ componentPackageDeps xs ++ componentPackageDeps ys
+testDeps xs ys =
+  map fst $ nub $ componentPackageDeps xs ++ componentPackageDeps ys
diff --git a/SetupHooks.hs b/SetupHooks.hs
new file mode 100644
index 0000000000..d9b152deaa
--- /dev/null
+++ b/SetupHooks.hs
@@ -0,0 +1,103 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+-- | See https://github.com/well-typed/hooks-build-type. As part of their work,
+-- Well-Typed reviewed stack-2.13.1 and identified that it used a pre-build hook
+-- to generate, for the stack main library component, a module that lists all
+-- the dependencies of stack (both library and executable), which is used in
+-- `Stack.BuildInfo` to be listed. They also wrote an experimental patch, the
+-- source code of which is below (with some reformatting).
+--
+-- This would be used if Stack's build type was 'Hooks' rather than 'Custom'.
+
+module SetupHooks
+  ( setupHooks
+  ) where
+
+import           Data.List ( nub, sortBy )
+import           Data.Ord ( comparing )
+import           Distribution.InstalledPackageInfo
+                   ( installedUnitId, sourcePackageId )
+import           Distribution.Package
+                   ( PackageId, UnitId, packageName, packageVersion )
+import           Distribution.PackageDescription
+                   ( PackageDescription (..), Executable (..), componentNameRaw
+                   )
+import           Distribution.Pretty ( prettyShow )
+import           Distribution.Simple
+                   ( UserHooks(..), defaultMainWithHooks, simpleUserHooks )
+import           Distribution.Simple.BuildPaths ( autogenComponentModulesDir )
+import           Distribution.Simple.LocalBuildInfo
+import           Distribution.Simple.PackageIndex
+                   ( allPackages, dependencyClosure )
+import           Distribution.Simple.Setup ( BuildFlags (..), fromFlag )
+import           Distribution.Simple.SetupHooks
+import           Distribution.Simple.Utils
+                   ( createDirectoryIfMissingVerbose, rewriteFileEx )
+import           Distribution.Types.PackageName ( PackageName, unPackageName )
+import           Distribution.Types.UnqualComponentName
+                   ( unUnqualComponentName )
+import           Distribution.Verbosity ( Verbosity, normal )
+import           System.FilePath ( (</>) )
+
+setupHooks :: SetupHooks
+setupHooks =
+  noSetupHooks
+    { buildHooks =
+       noBuildHooks
+         { preBuildComponentHook = Just preBuildHook }
+    }
+
+preBuildHook :: BuildingWhat -> LocalBuildInfo -> TargetInfo -> IO ()
+preBuildHook flags lbi tgt
+  | CLibName LMainLibName <- componentName $ targetComponent tgt =
+      generateBuildModule (buildingWhatVerbosity flags) (localPkgDescr lbi)
+        lbi tgt
+  | otherwise = pure ()
+
+generateBuildModule ::
+     Verbosity
+  -> PackageDescription
+  -> LocalBuildInfo
+  -> TargetInfo
+  -> IO ()
+generateBuildModule verbosity pkg lbi mainLibTargetInfo = do
+  -- Generate a module in the stack library component that lists all the
+  -- dependencies of stack (both the library and the executable).
+  createDirectoryIfMissingVerbose verbosity True autogenDir
+  withExeLBI pkg lbi $ \ _ exeCLBI -> do
+    rewriteFileEx normal buildModulePath $ unlines
+      [ "module Build_" ++ pkgNm
+      , "  ( deps"
+      , "  ) where"
+      , ""
+      , "deps :: [String]"
+      , "deps = " ++ (show $ formatdeps (transDeps mainLibCLBI exeCLBI))
+      ]
+  where
+    mainLibCLBI = targetCLBI mainLibTargetInfo
+    autogenDir = autogenComponentModulesDir lbi mainLibCLBI
+    pkgNm :: String
+    pkgNm = unPackageName' $ package pkg
+    buildModulePath = autogenDir </> "Build_" ++ pkgNm ++ ".hs"
+    formatdeps = map formatone . sortBy (comparing unPackageName')
+    formatone p = unPackageName' p ++ "-" ++ prettyShow (packageVersion p)
+    unPackageName' = unPackageName . packageName
+    transDeps xs ys = either
+      (map sourcePackageId . allPackages)
+      handleDepClosureFailure $ dependencyClosure allInstPkgsIdx availInstPkgIds
+     where
+      allInstPkgsIdx = installedPkgs lbi
+      allInstPkgIds = map installedUnitId $ allPackages allInstPkgsIdx
+      -- instPkgIds includes `stack-X.X.X`, which is not a dependency hence is
+      -- missing from allInstPkgsIdx. Filter that out.
+      availInstPkgIds = filter (`elem` allInstPkgIds) $ testDeps xs ys
+      handleDepClosureFailure unsatisfied =
+        error $
+             "Computation of transitive dependencies failed."
+          ++ if null unsatisfied
+               then ""
+               else " Unresolved dependencies: " ++ show unsatisfied
+
+testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [UnitId]
+testDeps xs ys =
+  map fst $ nub $ componentPackageDeps xs ++ componentPackageDeps ys
diff --git a/app/Main.hs b/app/Main.hs
new file mode 100644
index 0000000000..151009bdf6
--- /dev/null
+++ b/app/Main.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+module Main
+  ( main
+  ) where
+
+import           RIO ( IO )
+import qualified Stack
+
+-- | The entry point for the Stack executable.
+main :: IO ()
+main = Stack.main
diff --git a/cabal.config b/cabal.config
new file mode 100644
index 0000000000..acd08ac912
--- /dev/null
+++ b/cabal.config
@@ -0,0 +1,235 @@
+constraints:
+  , Cabal ==3.16.1.0
+  , Cabal-syntax ==3.16.1.0
+  , Glob ==0.10.2
+  , OneTuple ==0.4.3
+  , QuickCheck ==2.15.0.1
+  , StateVar ==1.2.2
+  , Win32 ==2.14.1.0
+  , aeson ==2.2.5.0
+  , aeson-warning-parser ==0.1.1
+  , alex ==3.5.4.2
+  , annotated-wl-pprint ==0.7.0
+  , ansi-terminal ==1.1.5
+  , ansi-terminal-types ==1.1.3
+  , appar ==0.1.8
+  , array ==0.5.8.0
+  , assoc ==1.1.1
+  , async ==2.2.6
+  , atomic-counter ==0.1.2.4
+  , attoparsec ==0.14.4
+  , attoparsec-aeson ==2.2.2.0
+  , auto-update ==0.2.7
+  , base ==4.20.2.0
+  , base-orphans ==0.9.4
+  , base16 ==1.0
+  , base16-bytestring ==1.0.2.0
+  , base64 ==1.0
+  , base64-bytestring ==1.2.1.0
+  , bifunctors ==5.6.3
+  , binary ==0.8.9.3
+  , bitvec ==1.1.6.0
+  , blaze-builder ==0.4.4.1
+  , blaze-html ==0.9.2.0
+  , blaze-markup ==0.8.3.0
+  , byteorder ==1.0.4
+  , bytestring ==0.12.2.0
+  , casa-client ==0.0.4
+  , casa-types ==0.0.3
+  , case-insensitive ==1.2.1.0
+  , cborg ==0.2.10.0
+  , cereal ==0.5.8.3
+  , character-ps ==0.1
+  , clock ==0.8.4
+  , cmdargs ==0.10.22
+  , colour ==2.3.7
+  , comonad ==5.0.10
+  , companion ==0.1.0
+  , conduit ==1.3.6.1
+  , conduit-combinators ==1.3.0
+  , conduit-extra ==1.3.8
+  , containers ==0.7
+  , contravariant ==1.5.6
+  , cookie ==0.5.1
+  , cryptohash-md5 ==0.11.101.0
+  , cryptohash-sha256 ==0.11.102.1
+  , crypton ==1.1.4
+  , crypton-asn1-encoding ==0.10.0
+  , crypton-asn1-parse ==0.10.0
+  , crypton-asn1-types ==0.4.1
+  , crypton-conduit ==0.3.0
+  , crypton-connection ==0.4.6
+  , crypton-pem ==0.3.0
+  , crypton-socks ==0.6.2
+  , crypton-x509 ==1.9.1
+  , crypton-x509-store ==1.9.0
+  , crypton-x509-system ==1.9.0
+  , crypton-x509-validation ==1.9.1
+  , data-default ==0.8.0.2
+  , data-default-class ==0.2.0.0
+  , data-fix ==0.3.4
+  , deepseq ==1.5.0.0
+  , digest ==0.0.2.1
+  , directory ==1.3.8.5
+  , directory-ospath-streaming ==0.2.2
+  , distributive ==0.6.3
+  , dlist ==1.0
+  , easy-file ==0.2.5
+  , ech-config ==0.0.1
+  , echo ==0.1.4
+  , ed25519 ==0.0.5.0
+  , exceptions ==0.10.9
+  , extra ==1.8.1
+  , fast-logger ==3.2.7
+  , file-embed ==0.0.16.0
+  , file-io ==0.1.6
+  , filelock ==0.1.1.9
+  , filepath ==1.5.4.0
+  , fsnotify ==0.4.4.0
+  , generic-deriving ==1.14.7
+  , ghc-bignum ==1.3
+  , ghc-boot ==9.10.3
+  , ghc-boot-th ==9.10.3
+  , ghc-internal ==9.1003.0
+  , ghc-platform ==0.1.0.0
+  , ghc-prim ==0.12.0
+  , githash ==0.1.7.0
+  , hackage-security ==0.6.4.0
+  , half ==0.3.3
+  , happy ==2.1.7
+  , happy-lib ==2.1.7
+  , hashable ==1.5.1.0
+  , haskell-src-exts ==1.23.1
+  , haskell-src-meta ==0.8.16
+  , hi-file-parser ==0.1.9.1
+  , hpack ==0.39.6
+  , hpc ==0.7.0.2
+  , hpke ==0.1.0
+  , http-api-data ==0.6.3
+  , http-client ==0.7.19
+  , http-client-tls ==0.4.0
+  , http-conduit ==2.3.9.1
+  , http-download ==0.2.2.0
+  , http-types ==0.12.6
+  , indexed-traversable ==0.1.5
+  , indexed-traversable-instances ==0.1.2.1
+  , infer-license ==0.2.0
+  , integer-conversion ==0.1.1
+  , integer-gmp ==1.1
+  , integer-logarithms ==1.0.5
+  , iproute ==1.7.15
+  , libyaml ==0.1.4
+  , libyaml-clib ==0.2.5
+  , lift-type ==0.1.2.0
+  , lifted-base ==0.2.3.12
+  , megaparsec ==9.7.0
+  , microlens ==0.4.14.0
+  , microlens-mtl ==0.2.1.0
+  , microlens-th ==0.4.3.17
+  , mime-types ==0.1.2.2
+  , mintty ==0.1.4
+  , mlkem ==0.2.2.0
+  , monad-control ==1.0.3.1
+  , monad-logger ==0.3.42
+  , monad-loops ==0.4.3
+  , mono-traversable ==1.0.21.0
+  , mtl ==2.3.1
+  , mtl-compat ==0.2.2
+  , mustache ==2.4.3.1
+  , neat-interpolation ==0.5.1.4
+  , network ==3.2.8.0
+  , network-byte-order ==0.1.8
+  , network-uri ==2.6.4.2
+  , old-locale ==1.0.0.7
+  , old-time ==1.1.1.0
+  , open-browser ==0.5.1.0
+  , optparse-applicative ==0.18.1.0
+  , optparse-simple ==0.1.1.4
+  , os-string ==2.0.7
+  , pantry ==0.11.4
+  , parsec ==3.1.18.0
+  , parser-combinators ==1.3.1
+  , path ==0.9.6
+  , path-io ==1.8.2
+  , path-pieces ==0.2.1
+  , persistent ==2.18.1.0
+  , persistent-sqlite ==2.13.3.1
+  , persistent-template ==2.12.0.0
+  , pretty ==1.1.3.6
+  , prettyprinter ==1.7.2
+  , prettyprinter-ansi-terminal ==1.1.4
+  , primitive ==0.9.1.0
+  , process ==1.6.26.1
+  , project-template ==0.2.1.0
+  , ram ==0.22.0
+  , random ==1.2.1.3
+  , replace-megaparsec ==1.5.0.1
+  , resource-pool ==0.4.0.0
+  , resourcet ==1.3.0
+  , retry ==0.9.3.1
+  , rio ==0.1.25.0
+  , rio-orphans ==0.1.2.0
+  , rio-prettyprint ==0.1.9.0
+  , rts ==1.0.2
+  , safe ==0.3.21
+  , safe-exceptions ==0.1.7.4
+  , scientific ==0.3.8.1
+  , semaphore-compat ==1.0.0
+  , semialign ==1.3.1.1
+  , semigroupoids ==6.0.2
+  , serialise ==0.2.6.1
+  , silently ==1.2.5.4
+  , split ==0.2.5
+  , splitmix ==0.1.3.2
+  , stack ==4.2.0
+  , static-bytes ==0.2.0
+  , stm ==2.5.3.1
+  , stm-chans ==3.0.0.11
+  , streaming-commons ==0.2.3.1
+  , strict ==0.5.1
+  , string-interpolate ==0.3.4.0
+  , syb ==0.7.2.4
+  , tagged ==0.8.9
+  , tar ==0.6.4.0
+  , tar-conduit ==0.4.1
+  , tasty ==1.5.4
+  , template-haskell ==2.22.0.0
+  , temporary ==1.3
+  , text ==2.1.3
+  , text-conversions ==0.3.1.1
+  , text-iso8601 ==0.1.1.1
+  , text-metrics ==0.3.3
+  , text-short ==0.1.6.1
+  , th-abstraction ==0.7.2.0
+  , th-compat ==0.1.7
+  , th-expand-syns ==0.4.12.0
+  , th-lift ==0.8.7
+  , th-lift-instances ==0.1.20
+  , th-orphans ==0.13.17
+  , th-reify-many ==0.1.10
+  , these ==1.2.1
+  , time ==1.12.2
+  , time-compat ==1.9.9
+  , time-hourglass ==0.3.0
+  , tls ==2.4.3
+  , transformers ==0.6.1.1
+  , transformers-base ==0.4.6.1
+  , transformers-compat ==0.7.2
+  , typed-process ==0.2.13.0
+  , unix ==2.8.6.0
+  , unix-compat ==0.7.4.1
+  , unix-time ==0.4.17
+  , unliftio ==0.2.25.1
+  , unliftio-core ==0.2.1.0
+  , unordered-containers ==0.2.20.1
+  , utf8-string ==1.0.2
+  , uuid-types ==1.0.6.1
+  , vault ==0.3.2.0
+  , vector ==0.13.2.0
+  , vector-algorithms ==0.9.1.0
+  , vector-stream ==0.1.0.1
+  , witherable ==0.5
+  , yaml ==0.11.11.2
+  , zip-archive ==0.4.3.2
+  , zlib ==0.7.1.1
+  , zlib-clib ==1.3.2
diff --git a/cabal.project b/cabal.project
index 4513262467..308292e9d8 100644
--- a/cabal.project
+++ b/cabal.project
@@ -2,17 +2,39 @@
 -- assist some users of that tool to develop Stack. For information about
 -- `cabal.project` files, see:
 -- https://cabal.readthedocs.io/en/stable/cabal-project.html.
-
+--
 -- For information about possible limitations of the `cabal.config` files
 -- corresponding to Stackage package sets that are made available by Stackage
 -- see: https://github.com/fpco/stackage-server/issues/232.
-
+--
 -- `import:` is only available to users of Cabal (the tool) >= 3.8.1.0.
-
-import: https://www.stackage.org/nightly-2022-09-05/cabal.config
-
--- Extra-deps (if any) would be specified by adding:
 --
--- constraints: <package_name> == <version_number>
-
+-- The constraints in file `cabal.config` can be obtained by commanding:
+--
+-- > stack ls dependencies cabal > cabal.config
+--
+-- However, be aware that, in respect of the `unix` package or the `Win32`
+-- package (that may come with GHC, depending on the operating system):
+--
+-- * on Windows, the Stack project does not depend on `unix` but depends on
+--   `Win32`; and
+--
+-- * on non-Windows operating systems, the Stack project does not depend on
+--   `Win32` but depends on `unix`.
+--
+-- The command above will add one of the two packages to `cabal.config` but omit
+-- the other. A comprehensive `cabal.config` will need to be created by editing
+-- the command's output.
+--
+-- Also be aware that there may be other packages required only on non-Windows
+-- systems. For example, the `hinotify` package.
+--
+-- Be sure to set `with-compiler: ghc-x.y.z` below to the version of GHC that is
+-- specified by the snapshot specifed in Stack's project-level YAML
+-- configuration file (`stack.yaml`). The relevant version of GHC can be
+-- confirmed by reviewing the snapshot on Stackage. For example, at:
+-- https://www.stackage.org/lts-24.55/cabal.config.
+--
+with-compiler: ghc-9.10.3
+import: cabal.config
 packages: .
diff --git a/doc/GUIDE.md b/doc/GUIDE.md
deleted file mode 100644
index 7ae8513832..0000000000
--- a/doc/GUIDE.md
+++ /dev/null
@@ -1,1886 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# User guide (introductory)
-
-Stack is a modern, cross-platform build tool for Haskell code.
-
-This introductory guide takes a new Stack user through the typical workflows.
-This guide will not teach Haskell or involve much code, and it requires no prior
-experience with the Haskell packaging system or other build tools. Terms used in
-the guide are defined in the [glossary](glossary.md).
-
-Some of Stack's features will not be needed regularly or by all users. See the
-[advanced user's guide](GUIDE_advanced.md) for information about those features.
-
-## Stack's functions
-
-Stack handles the management of your toolchain (including GHC — the Glasgow
-Haskell Compiler — and, for Windows users, MSYS2), building and registering
-libraries, building build tool dependencies, and more. While it can use existing
-tools on your system, Stack has the capacity to be your one-stop shop for all
-Haskell tooling you need. This guide will follow that Stack-centric approach.
-
-### What makes Stack special?
-
-The primary Stack design point is __reproducible builds__. If you run
-`stack build` today, you should get the same result running `stack build`
-tomorrow. There are some cases that can break that rule (changes in your
-operating system configuration, for example), but, overall, Stack follows this
-design philosophy closely. To make this a simple process, Stack uses curated
-package sets called __snapshots__.
-
-Stack has also been designed from the ground up to be user friendly, with an
-intuitive, discoverable command line interface. For many users, simply
-downloading Stack and reading `stack --help` will be enough to get up and
-running. This guide provides a more gradual tour for users who prefer that
-learning style.
-
-To build your project, Stack uses a project-level configuration file, named
-`stack.yaml`, in the root directory of your project as a sort of blueprint. That
-file contains a reference, called a __resolver__, to the snapshot which your
-package will be built against.
-
-Finally, Stack is __isolated__: it will not make changes outside of specific
-Stack directories. Stack-built files generally go in either the Stack root
-directory (default: `~/.stack` on Unix-like operating systems, or,
-`%LOCALAPPDATA%\Programs\stack` on Windows) or `./.stack-work` directories local
-to each project. The Stack root directory holds packages belonging to snapshots
-and any Stack-installed versions of GHC. Stack will not tamper with any system
-version of GHC or interfere with packages installed by other build tools (such
-as Cabal (the tool)).
-
-## Downloading and Installation
-
-The [documentation dedicated to downloading Stack](install_and_upgrade.md) has
-the most up-to-date information for a variety of operating systems. Instead of
-repeating that content here, please go check out that page and come back here
-when you can successfully run `stack --version`.
-
-We also assume that the directory reported by `stack path --local-bin` has been
-added to the PATH.
-
-## Hello World Example
-
-With Stack installed, let's create a new project from a template and walk
-through the most common Stack commands.
-
-In this guide, an initial `$` represents the command line prompt. The prompt may
-differ in the terminal on your operating system. Unless stated otherwise, the
-working directory is the project's root directory.
-
-### The `stack new` command
-
-We'll start off with the `stack new` command to create a new *project*, that
-will contain a Haskell *package* of the same name. So let's pick a valid
-package name first:
-
-> A package is identified by a globally-unique package name, which consists
-> of one or more alphanumeric words separated by hyphens. To avoid ambiguity,
-> each of these words should contain at least one letter.
-
-(From the
-[Cabal users guide](https://www.haskell.org/cabal/users-guide/developing-packages.html#developing-packages))
-
-We'll call our project `helloworld`, and we'll use the `new-template` project
-template. This template is used by default, but in our example we will refer to
-it expressly. Other templates are available. For further information about
-templates, see the `stack templates` command
-[documentation](GUIDE_advanced.md#the-stack-templates-command).
-
-From the root directory for all our Haskell projects, we command:
-
-~~~text
-stack new helloworld new-template
-~~~
-
-For this first Stack command, there's quite a bit of initial setup it needs to
-do (such as downloading the list of packages available upstream), so you'll see
-a lot of output. Over the course of this guide a lot of the content will begin
-to make more sense.
-
-After creating the project directory, and obtaining and populating the project
-template, Stack will initialise its own project-level configuration. For further
-information about setting paramaters to populate templates, see the YAML
-configuration [documentation](yaml_configuration.md#templates). For further
-information about initialisation, see the `stack init` command
-[documentation](#the-stack-init-command). The `stack new` and `stack init`
-commands have options and flags in common.
-
-!!! info
-
-    Pass the `--bare` flag to cause Stack to create the project in the current
-    working directory rather than in a new project directory.
-
-!!! info
-
-    Parameters to populate project templates can be set at the command line with
-    the `--param <key>:<value>` (or `-p`) option.
-
-We now have a project in the `helloworld` directory! We will change to that
-directory, with command:
-
-~~~text
-cd helloworld
-~~~
-
-### The `stack build` command
-
-Next, we'll run the most important Stack command, `stack build`:
-
-~~~text
-stack build
-# installing ... building ...
-~~~
-
-Stack needs a version of GHC in order to build your project. Stack will discover
-that you are missing it and will install it for you.
-
-You'll get intermediate download percentage statistics while the download is
-occurring. This command may take some time, depending on download speeds.
-
-!!! note
-
-    GHC will be installed to your Stack programs directory, so calling `ghc` on
-    the command line won't work. See the `stack exec`, `stack ghc`, and
-    `stack runghc` commands below for more information.
-
-Once a version of GHC is installed, Stack will then build your project.
-
-### The `stack exec` command
-
-Looking closely at the output of the previous command, you can see that it built
-both a library called `helloworld` and an executable called `helloworld-exe` (on
-Windows, `helloworld-exe.exe`). We'll explain more in the next section, but, for
-now, just notice that the executables are installed in a location in our
-project's `.stack-work` directory.
-
-Now, Let's use the `stack exec` command to run our executable (which just
-outputs "someFunc"):
-
-~~~text
-stack exec helloworld-exe
-someFunc
-~~~
-
-`stack exec` works by providing the same reproducible environment that was used
-to build your project to the command that you are running. Thus, it knew where
-to find `helloworld-exe` even though it is hidden in the `.stack-work`
-directory. Command `stack path --bin-path` to see the PATH in the Stack
-environment.
-
-!!! info
-
-    On Windows, the Stack environment includes the `\mingw64\bin`, `\usr\bin`
-    and `\usr\local\bin` directories of the Stack-supplied MSYS2. If your
-    executable depends on files (for example, dynamic-link libraries) in those
-    directories and you want ro run it outside of the Stack environment, you
-    will need to ensure copies of those files are on the PATH.
-
-### The `stack test` command
-
-Finally, like all good software, `helloworld` actually has a test suite.
-
-Let's run it with the `stack test` command:
-
-~~~text
-stack test
-# build output ...
-~~~
-
-Reading the output, you'll see that Stack first builds the test suite and then
-automatically runs it for us. For both the `build` and `test` command, already
-built components are not built again. You can see this by using the
-`stack build` and `stack test` commands a second time:
-
-~~~text
-stack build
-stack test
-# build output ...
-~~~
-
-## Inner Workings of Stack
-
-In this subsection, we'll dissect the `helloworld` example in more detail.
-
-### Files in helloworld
-
-Before studying Stack more, let's understand our project a bit better. The files
-in the directory include:
-
-~~~text
-app/Main.hs
-src/Lib.hs
-test/Spec.hs
-ChangeLog.md
-README.md
-LICENSE
-Setup.hs
-helloworld.cabal
-package.yaml
-stack.yaml
-.gitignore
-~~~
-
-The `app/Main.hs`, `src/Lib.hs`, and `test/Spec.hs` files are all Haskell
-source files that compose the actual functionality of our project (we won't
-dwell on them here).
-
-The `ChangeLog.md`, `README.md`, `LICENSE` and `.gitignore` files have no effect
-on the build.
-
-The `helloworld.cabal` file is updated automatically as part of the
-`stack build` process and should not be modified.
-
-The files of interest here are `Setup.hs`, `stack.yaml`, and `package.yaml`.
-
-The `Setup.hs` file is a component of the Cabal build system which Stack uses.
-It's technically not needed by Stack, but it is still considered good practice
-in the Haskell world to include it. The file we're using is straight
-boilerplate:
-
-~~~haskell
-import Distribution.Simple
-main = defaultMain
-~~~
-
-Next, let's look at our `stack.yaml` file, which gives our project-level
-settings. Ignoring comments beginning `#`, the contents will look something like
-this:
-
-~~~yaml
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/28.yaml
-packages:
-- .
-~~~
-
-The value of the `resolver` key tells Stack *how* to build your package: which
-GHC version to use, versions of package dependencies, and so on. Our value here
-says to use [LTS Haskell 19.28](https://www.stackage.org/lts-19.28), which
-implies GHC 9.0.2 (which is why `stack build` installs that version of GHC if it
-is not already available to Stack). There are a number of values you can use for
-`resolver`, which we'll cover later.
-
-The value of the `packages` key tells Stack which local packages to build. In
-our simple example, we have only a single package in our project, located in the
-same directory, so '`.`' suffices. However, Stack has powerful support for
-multi-package projects, which we'll elaborate on as this guide progresses.
-
-Another file important to the build is `package.yaml`.
-
-The `package.yaml` file describes the package in the
-[Hpack](https://github.com/sol/hpack) format. Stack has in-built Hpack
-functionality and this is its preferred package format. The default behaviour is
-to generate the Cabal file (here named `helloworld.cabal`) from this
-`package.yaml` file, and accordingly you should **not** modify the Cabal file.
-
-It is also important to remember that Stack is built on top of the Cabal build
-system. Therefore, an understanding of the moving parts in Cabal are necessary.
-In Cabal, we have individual *packages*, each of which contains a single Cabal
-file, named `<package_name>.cabal`. The Cabal file can define one or more
-*components*: a library, executables, test suites, and benchmarks. It also
-specifies additional information such as library dependencies, default
-language pragmas, and so on.
-
-In this guide, we'll discuss the bare minimum necessary to understand how to
-modify a `package.yaml` file. You can see a full list of the available options
-at the [Hpack documentation](https://github.com/sol/hpack#quick-reference). The
-Cabal User Guide the definitive reference for the
-[Cabal file format](https://cabal.readthedocs.io/en/stable/cabal-package.html).
-
-### The location of GHC
-
-As we saw above, the `build` command installed GHC for us. You can use the
-`stack path` command for quite a bit of path information (which we'll play with
-more later). We'll look at where GHC is installed:
-
-=== "Unix-like"
-
-    Command:
-
-    ~~~text
-    stack exec -- which ghc
-    /home/<user_name>/.stack/programs/x86_64-linux/ghc-9.0.2/bin/ghc
-    ~~~
-
-=== "Windows (with PowerShell)"
-
-    Command:
-
-    ~~~text
-    stack exec -- where.exe ghc
-    C:\Users\<user_name>\AppData\Local\Programs\stack\x86_64-windows\ghc-9.0.2\bin\ghc.exe
-    ~~~
-
-As you can see from that path (and as emphasized earlier), the installation is
-placed to not interfere with any other GHC installation, whether system-wide or
-even different GHC versions installed by Stack.
-
-## Cleaning your project
-
-You can clean up build artifacts for your project using the `stack clean` and
-`stack purge` commands.
-
-### The `stack clean` command
-
-`stack clean` deletes the local working directories containing compiler output.
-By default, that means the contents of directories in `.stack-work/dist`, for
-all the `.stack-work` directories within a project.
-
-Use `stack clean <specific-package>` to delete the output for the package
-_specific-package_ only.
-
-### The `stack purge` command
-
-`stack purge` deletes the local stack working directories, including extra-deps,
-git dependencies and the compiler output (including logs). It does not delete
-any snapshot packages, compilers or programs installed using `stack install`.
-This essentially reverts the project to a completely fresh state, as if it had
-never been built. `stack purge` is just a shortcut for `stack clean --full`
-
-### The `stack build` command
-
-The `build` command is the heart and soul of Stack. It is the engine that powers
-building your code, testing it, getting dependencies, and more. Quite a bit of
-the remainder of this guide will cover more advanced `build` functions and
-features, such as building test and Haddocks at the same time, or constantly
-rebuilding blocking on file changes.
-
-!!! note
-
-    Using the `build` command twice with the same options and arguments should
-    generally do nothing (besides things like rerunning test suites), and
-    should, in general, produce a reproducible result between different runs.
-
-## Adding dependencies
-
-Let's say we decide to modify our `helloworld` source a bit to use a new
-library, perhaps the ubiquitous `text` package. In `src/Lib.hs`, we can, for
-example add:
-
-~~~haskell
-{-# LANGUAGE OverloadedStrings #-}
-module Lib
-    ( someFunc
-    ) where
-
-import qualified Data.Text.IO as T
-
-someFunc :: IO ()
-someFunc = T.putStrLn "someFunc"
-~~~
-
-When we try to build this, things don't go as expected:
-
-~~~text
-stack build
-# build failure output (abridged for clarity) ...
-src\Lib.hs:6:1: error:
-    Could not load module ‘Data.Text.IO’
-    It is a member of the hidden package ‘text-1.2.5.0’.
-    Perhaps you need to add ‘text’ to the build-depends in your .cabal file.
-    Use -v (or `:set -v` in ghci) to see a list of the files searched for.
-  |
-6 | import qualified Data.Text.IO as T
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-~~~
-
-This means that the package containing the module in question is not available.
-To tell Stack to use [text](https://hackage.haskell.org/package/text), you need
-to add it to your `package.yaml` file — specifically in your `dependencies`
-section, like this:
-
-~~~yaml
-dependencies:
-- base >= 4.7 && < 5
-- text # added here
-~~~
-
-Now if we rerun `stack build`, we should get a successful result. Command:
-
-~~~text
-stack build
-# build output ...
-~~~
-
-This output means that the `text` package was downloaded, configured, built, and
-locally installed. Once that was done, we moved on to building our local package
-(`helloworld`). At no point did we need to ask Stack to build dependencies — it
-does so automatically.
-
-### Listing Dependencies
-
-Let's have Stack add a few more dependencies to our project. First, we'll
-include two new packages in the `dependencies` section for our library in our
-`package.yaml`:
-
-~~~yaml
-dependencies:
-- base >= 4.7 && < 5
-- text
-- filepath
-- containers
-~~~
-
-After adding these two dependencies, we can again run `stack build` to have them
-installed. Command:
-
-~~~text
-stack build
-# build output ...
-~~~
-
-Finally, to find out which versions of these libraries Stack installed, we can
-ask Stack to `ls dependencies`. Command:
-
-~~~text
-stack ls dependencies
-# dependency output ...
-~~~
-
-### extra-deps
-
-Let's try a more off-the-beaten-track package: the joke
-[acme-missiles](http://www.stackage.org/package/acme-missiles) package. Our
-source code is simple:
-
-~~~haskell
-module Lib
-    ( someFunc
-    ) where
-
-import Acme.Missiles
-
-someFunc :: IO ()
-someFunc = launchMissiles
-~~~
-
-Again, we add this new dependency to the `package.yaml` file like this:
-
-~~~yaml
-dependencies:
-- base >= 4.7 && < 5
-- text
-- filepath
-- containers
-- acme-missiles # added
-~~~
-
-However, rerunning `stack build` shows us the following error message. Command:
-
-~~~text
-stack build
-# build failure output ...
-~~~
-
-It says that it was unable to construct the build plan.
-
-This brings us to the next major topic in using Stack.
-
-## Curated package sets
-
-Remember above when `stack new` selected some
-[LTS resolver](https://github.com/commercialhaskell/lts-haskell#readme) for us?
-That defined our build plan and available packages. When we tried using the
-`text` package, it just worked, because it was part of the LTS *package set*.
-
-We've specified the `acme-missiles` package in the `package.yaml` file (see
-above), but `acme-missiles` is not part of that LTS package set, so building
-failed.
-
-To add `acme-missiles` to the available packages, we'll use the `extra-deps` key
-in the `stack.yaml` file. That key defines extra packages, not present in the
-resolver, that will be needed as dependencies. You can add this like so:
-
-~~~yaml
-extra-deps:
-- acme-missiles-0.3 # not in the LTS resolver
-~~~
-
-Now `stack build` will succeed.
-
-With that out of the way, let's dig a little bit more into these package sets,
-also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite
-a bit of information about it at
-[https://www.stackage.org/lts](https://www.stackage.org/lts), including:
-
-* The appropriate resolver value (`resolver: lts-19.17`, as is currently the
-  latest LTS)
-* The GHC version used
-* A full list of all packages available in this snapshot
-* The ability to perform a Hoogle search on the packages in this snapshot
-* A [list of all modules](https://www.stackage.org/lts/docs) in a snapshot,
-  which can be useful when trying to determine which package to add to your
-  `package.yaml` file.
-
-You can also see a
-[list of all available snapshots](https://www.stackage.org/snapshots). You'll
-notice two flavors: LTS (for "Long Term Support") and Nightly. You can read more
-about them on the
-[LTS Haskell GitHub page](https://github.com/commercialhaskell/lts-haskell#readme).
-If you're not sure which to use, start with LTS Haskell (which Stack will lean
-towards by default as well).
-
-## Resolvers and changing your compiler version
-
-Let's explore package sets a bit further. Instead of lts-19.17, let's change our
-`stack.yaml` file to use the [latest nightly](https://www.stackage.org/nightly).
-Right now, this is currently 2022-07-31 - please see the resolve from the link
-above to get the latest.
-
-Then, commanding `stack build` again will produce:
-
-~~~text
-stack build
-# Downloaded nightly-2020-07-31 build plan.
-# build output ...
-~~~
-
-We can also change resolvers on the command line, which can be useful in a
-Continuous Integration (CI) setting, like on Travis. For example, command:
-
-~~~text
-stack --resolver lts-18.28 build
-# Downloaded lts-18.28 build plan.
-# build output ...
-~~~
-
-When passed on the command line, you also get some additional "short-cut"
-versions of resolvers: `--resolver nightly` will use the newest Nightly resolver
-available, `--resolver lts` will use the newest LTS, and `--resolver lts-19`
-will use the newest LTS in the 19.x series. The reason these are only available
-on the command line and not in your `stack.yaml` file is that using them:
-
-1. Will slow down your build (since Stack then needs to download information on
-   the latest available LTS each time it builds)
-2. Produces unreliable results (since a build run today may proceed differently
-   tomorrow because of changes outside of your control)
-
-### Changing GHC versions
-
-Finally, let's try using an older LTS snapshot. We'll use the newest 18.x
-snapshot with the command:
-
-~~~text
-stack --resolver lts-18 build
-# build output ...
-~~~
-
-This succeeds, automatically installing the necessary GHC along the way. So, we
-see that different LTS versions use different GHC versions and Stack can handle
-that.
-
-### Other resolver values
-
-We've mentioned `nightly-YYYY-MM-DD` and `lts-X.Y` values for the resolver.
-There are actually other options available, and the list will grow over time.
-At the time of writing:
-
-* `ghc-X.Y.Z`, for requiring a specific GHC version but no additional packages
-* Experimental custom snapshot support
-
-The most up-to-date information can always be found in the
-[stack.yaml documentation](yaml_configuration.md#resolver).
-
-## Existing projects
-
-Alright, enough playing around with simple projects. Let's take an open source
-package and try to build it. We'll be ambitious and use
-[yackage](https://hackage.haskell.org/package/yackage), a local package server
-using [Yesod](http://www.yesodweb.com/). To get the code, we'll use the
-`stack unpack` command from the root directory for all our Haskell projects:
-
-~~~text
-stack unpack yackage
-Unpacked yackage-0.8.1 to <root_directory>/yackage-0.8.1/
-~~~
-
-You can also unpack to the directory of your liking instead of the current one
-by issuing the command:
-
-~~~text
-stack unpack yackage --to <desired_directory>
-~~~
-
-This will create a `yackage-0.8.1` directory inside `<desired_directory>`.
-
-We will change to that directory, with the command:
-
-~~~text
-cd yackage-0.8.1
-~~~
-
-### The `stack init` command
-
-This new directory does not have a `stack.yaml` file, so we need to make one
-first. We could do it by hand, but let's be lazy instead with the `stack init`
-command:
-
-~~~text
-stack init
-# init output ...
-~~~
-
-`stack init` does quite a few things for you behind the scenes:
-
-* Finds all of the Cabal files in your current directory and subdirectories
-  (unless you use `--ignore-subdirs`) and determines the packages and versions
-  they require
-* Finds the best combination of snapshot and package flags that allows
-  everything to compile with minimum external dependencies
-* It tries to look for the best matching snapshot from latest LTS, latest
-  nightly, other LTS versions in that order
-
-Assuming it finds a match, it will write your `stack.yaml` file, and everything
-will work.
-
-!!! note
-
-    The `yackage` package does not currently support Hpack, but you can also use
-    `hpack-convert` should you need to generate a `package.yaml` file.
-
-#### Excluded Packages
-
-Sometimes multiple packages in your project may have conflicting requirements.
-In that case `stack init` will fail, so what do you do?
-
-You could manually create `stack.yaml` by omitting some packages to resolve the
-conflict. Alternatively you can ask `stack init` to do that for you by
-specifying `--omit-packages` flag on the command line. Let's see how that
-works.
-
-To simulate a conflict we will use `acme-missiles-0.3` in `yackage` and we will
-also copy `yackage.cabal` to another directory and change the name of the file
-and package to `yackage-test`. In this new package we will use
-`acme-missiles-0.2` instead. Let's see what happens when we command `stack init`
-again:
-
-~~~text
-stack init --force --omit-packages
-# init failure output ...
-~~~
-
-Looking at `stack.yaml`, you will see that the excluded packages have been
-commented out under the `packages` field. In case wrong packages are excluded
-you can uncomment the right one and comment the other one.
-
-Packages may get excluded due to conflicting requirements among user packages or
-due to conflicting requirements between a user package and the resolver
-compiler. If all of the packages have a conflict with the compiler then all of
-them may get commented out.
-
-When packages are commented out you will see a warning every time you run a
-command which needs the configuration file. The warning can be disabled by
-editing the configuration file and removing it.
-
-#### Using a specific resolver
-
-Sometimes you may want to use a specific resolver for your project instead of
-`stack init` picking one for you. You can do that by using
-`stack init --resolver <resolver>`.
-
-You can also init with a compiler resolver if you do not want to use a snapshot.
-That will result in all of your project's dependencies being put under the
-`extra-deps` section.
-
-#### Installing the compiler
-
-Stack will automatically install the compiler when you run `stack build` but you
-can manually specify the compiler by running `stack setup <GHC-VERSION>`.
-
-#### Miscellaneous and diagnostics
-
-_Add selected packages_: If you want to use only selected packages from your
-project directory you can do so by explicitly specifying the package directories
-on the command line.
-
-_Duplicate package names_: If multiple packages under the directory tree have
-same name, `stack init` will report those and automatically ignore one of them.
-
-_Ignore subdirectories_: By default `stack init` searches all the subdirectories
-for Cabal files. If you do not want that then you can use `--ignore-subdirs`
-command line switch.
-
-_Cabal warnings_: `stack init` will show warnings if there were issues in
-reading a Cabal file. You may want to pay attention to the warnings as sometimes
-they may result in incomprehensible errors later on during dependency solving.
-
-_Package naming_: If the `Name` field defined in a Cabal file does not match
-with the Cabal file name then `stack init` will refuse to continue.
-
-_User warnings_: When packages are excluded or external dependencies added Stack
-will show warnings every time the configuration file is loaded. You can suppress
-the warnings by editing the configuration file and removing the warnings from
-it. You may see something like this:
-
-~~~text
-stack build
-Warning: Some packages were found to be incompatible with the resolver and have been left commented out in the packages section.
-Warning: Specified resolver could not satisfy all dependencies. Some external packages have been added as dependencies.
-You can suppress this message by removing it from stack.yaml
-~~~
-
-## Different databases
-
-Time to take a short break from hands-on examples and discuss a little
-architecture. Stack has the concept of multiple *databases*.
-
-A database consists of a GHC package database (which contains the compiled
-version of a library), executables, and a few other things as well. To give you
-an idea, the contents of the parent directory of the `stack path --local-pkg-db`
-directory are the directories:
-
-~~~text
-bin
-doc
-lib
-pkgdb
-~~~
-
-Databases in Stack are *layered*. For example, the database listing we just gave
-is called a *local* database (also known as a *mutable* database). That is
-layered on top of a *snapshot* database (also known as a *write-only* database).
-The snapshot database contains the libraries and executables that are considered
-to be *immutable*. Finally, GHC itself ships with a number of libraries and
-executables, also considered to be immutable, which forms the *global* database.
-
-To get a quick idea of this, we can look at the output of the
-`stack exec -- ghc-pkg list` command in our `helloworld` project:
-
-~~~text
-<stack path --global-pkg-db directory>
-    Cabal-3.6.3.0
-    Win32-2.12.0.1
-    array-0.5.4.0
-    base-4.16.2.0
-    binary-0.8.9.0
-    bytestring-0.11.3.1
-    containers-0.6.5.1
-    deepseq-1.4.6.1
-    directory-1.3.6.2
-    exceptions-0.10.4
-    filepath-1.4.2.2
-    (ghc-9.2.3)
-    ghc-bignum-1.2
-    ghc-boot-9.2.3
-    ghc-boot-th-9.2.3
-    ghc-compact-0.1.0.0
-    ghc-heap-9.2.3
-    ghc-prim-0.8.0
-    ghci-9.2.3
-    haskeline-0.8.2
-    hpc-0.6.1.0
-    integer-gmp-1.1
-    libiserv-9.2.3
-    mtl-2.2.2
-    parsec-3.1.15.0
-    pretty-1.1.3.6
-    process-1.6.13.2
-    rts-1.0.2
-    stm-2.5.0.2
-    template-haskell-2.18.0.0
-    text-1.2.5.0
-    time-1.11.1.1
-    transformers-0.5.6.2
-    xhtml-3000.2.2.1
-
-<stack path --snapshot-pkg-db directory>
-    acme-missiles-0.3
-
-<stack path --local-pkg-db directory>
-    helloworld-0.1.0.0
-~~~
-
-where `<stack path --global-pkg-db directory>` refers to the directory output by
-the command `stack path --global-pkg-db`, and so on.
-
-Notice that `acme-missiles` ends up in the *snapshot* database. Any package
-which comes from Hackage, an archive, or a repository is considered to be an
-*immutable* package.
-
-Anything which is considered *mutable*, or depends on something mutable, ends up
-in the *local* database. This includes your own code and any other packages
-located on a local file path.
-
-The reason we have this structure is that:
-
-* it lets multiple projects reuse the same binary builds of immutable packages,
-* but doesn't allow different projects to "contaminate" each other by putting
-  non-standard content into the shared snapshot database.
-
-As you probably guessed, there can be multiple snapshot databases available. See
-the contents of the `snapshots` directory in the Stack root.
-
-* On Unix-like operating systems, each snapshot is in the last of a sequence of
-  three subdirectories named after the platform, a 256-bit hash of the source
-  map (how the package should be built -- including the compiler, options, and
-  immutable dependencies), and the GHC version.
-
-* On Windows, each snapshot is in a subdirectory that is a shorter hash (eight
-  characters) of the sequence of three directories used on Unix-like operating
-  systems. This is done to avoid problems created by default limits on file
-  path lengths on Windows systems.
-
-These snapshot databases don't get layered on top of each other; they are each
-used separately.
-
-In reality, you'll rarely — if ever — interact directly with these databases,
-but it's good to have a basic understanding of how they work so you can
-understand why rebuilding may occur at different points.
-
-## The build synonyms
-
-Let's look at a subset of the `stack --help` output:
-
-~~~text
-build    Build the package(s) in this directory/configuration
-install  Shortcut for 'build --copy-bins'
-test     Shortcut for 'build --test'
-bench    Shortcut for 'build --bench'
-haddock  Shortcut for 'build --haddock'
-~~~
-
-Four of these commands are just synonyms for the `build` command. They are
-provided for convenience for common cases (e.g., `stack test` instead of
-`stack build --test`) and so that commonly expected commands just work.
-
-What's so special about these commands being synonyms? It allows us to make
-much more composable command lines. For example, we can have a command that
-builds executables, generates Haddock documentation (Haskell API-level docs),
-and builds and runs your test suites, with:
-
-~~~text
-stack build --haddock --test
-~~~
-
-You can even get more inventive as you learn about other flags. For example,
-take the following command:
-
-~~~text
-stack build --pedantic --haddock --test --exec "echo Yay, it succeeded" --file-watch
-~~~
-
-This command will:
-
-* turn on all warnings and errors (the `--pedantic` flag)
-* build your library and executables
-* generate Haddocks (the `--haddock` flag)
-* build and run your test suite (the `--test` flag)
-* run the command `echo Yay, it succeeded` when that completes (the `--exec`
-  option)
-* after building, watch for changes in the files used to build the project, and
-  kick off a new build when done (the `--file-watch` flag)
-
-### The `stack install` command and `copy-bins` option
-
-It's worth calling out the behavior of the `install` command and `--copy-bins`
-option, since this has confused a number of users (especially when compared to
-behavior of other tools like Cabal (the tool)). The `install` command does
-precisely one thing in addition to the build command: it copies any generated
-executables to the local binary directory. You may recognize the default value
-for that path:
-
-On Unix-like operating systems, command:
-
-~~~text
-stack path --local-bin
-/home/<user_name>/.local/bin
-~~~
-
-On Windows, command:
-
-~~~text
-stack path --local-bin
-C:\Users\<user_name>\AppData\Roaming\local\bin
-~~~
-
-That's why the download page recommends adding that directory to your PATH. This
-feature is convenient, because now you can simply run `executable-name` in your
-shell instead of having to run `stack exec executable-name` from inside your
-project directory.
-
-Since it's such a point of confusion, let me list a number of things Stack does
-*not* do specially for the `install` command:
-
-* Stack will always build any necessary dependencies for your code. The install
-  command is not necessary to trigger this behavior. If you just want to build a
-  project, run `stack build`.
-* Stack will *not* track which files it's copied to your local binary directory
-  nor provide a way to automatically delete them. There are many great tools out
-  there for managing installation of binaries, and Stack does not attempt to
-  replace those.
-* Stack will not necessarily be creating a relocatable executable. If your
-  executables hard-codes paths, copying the executable will not change those
-  hard-coded paths.
-
-  * At the time of writing, there's no way to change those kinds of paths with
-    Stack, but see
-    [issue #848 about --prefix](https://github.com/commercialhaskell/stack/issues/848)
-    for future plans.
-
-That's really all there is to the `install` command: for the simplicity of what
-it does, it occupies a much larger mental space than is warranted.
-
-## Targets, locals, and extra-deps
-
-We haven't discussed this too much yet, but, in addition to having a number of
-synonyms *and* taking a number of options on the command line, the `build`
-command *also* takes many arguments. These are parsed in different ways, and can
-be used to achieve a high level of flexibility in telling Stack exactly what you
-want to build.
-
-We're not going to cover the full generality of these arguments here; instead,
-there's documentation covering the full
-[build command syntax](build_command.md). Here, we'll just point out a few
-different types of arguments:
-
-* You can specify a *package name*, e.g. `stack build vector`.
-    * This will attempt to build the `vector` package, whether it's a local
-      package, in your extra-deps, in your snapshot, or just available upstream.
-      If it's just available upstream but not included in your locals,
-      extra-deps, or snapshot, the newest version is automatically promoted to
-      an extra-dep.
-* You can also give a *package identifier*, which is a package name plus
-  version, e.g. `stack build yesod-bin-1.4.14`.
-    * This is almost identical to specifying a package name, except it will (1)
-      choose the given version instead of latest, and (2) error out if the given
-      version conflicts with the version of a local package.
-* The most flexibility comes from specifying individual *components*, e.g.
-  `stack build helloworld:test:helloworld-test` says "build the test suite
-  component named helloworld-test from the helloworld package."
-    * In addition to this long form, you can also shorten it by skipping what
-      type of component it is, e.g. `stack build helloworld:helloworld-test`, or
-      even skip the package name entirely, e.g. `stack build :helloworld-test`.
-* Finally, you can specify individual *directories* to build to trigger building
-  of any local packages included in those directories or subdirectories.
-
-When you give no specific arguments on the command line (e.g., `stack build`),
-it's the same as specifying the names of all of your local packages. If you
-just want to build the package for the directory you're currently in, you can
-use `stack build .`.
-
-### Components, --test, and --bench
-
-Here's one final important yet subtle point. Consider our `helloworld` package:
-it has a library component, an executable `helloworld-exe`, and a test suite
-`helloworld-test`. When you run `stack build helloworld`, how does it know which
-ones to build? By default, it will build the library (if any) and all of the
-executables but ignore the test suites and benchmarks.
-
-This is where the `--test` and `--bench` flags come into play. If you use them,
-those components will also be included. So `stack build --test helloworld` will
-end up including the helloworld-test component as well.
-
-You can bypass this implicit adding of components by being much more explicit,
-and stating the components directly. For example, the following will not build
-the `helloworld-exe` executable once all executables have been successfully
-built:
-
-~~~text
-stack clean
-stack build :helloworld-test
-Building all executables for `helloworld' once. After a successful build of all of them, only specified executables will be rebuilt.
-helloworld> configure (lib + exe + test)
-Configuring helloworld-0.1.0.0...
-helloworld> build (lib + exe + test)
-Preprocessing library for helloworld-0.1.0.0..
-Building library for helloworld-0.1.0.0..
-[1 of 2] Compiling Lib
-[2 of 2] Compiling Paths_helloworld
-Preprocessing executable 'helloworld-exe' for helloworld-0.1.0.0..
-Building executable 'helloworld-exe' for helloworld-0.1.0.0..
-[1 of 2] Compiling Main
-[2 of 2] Compiling Paths_helloworld
-Linking .stack-work\dist\<hash>\build\helloworld-exe\helloworld-exe.exe ...
-Preprocessing test suite 'helloworld-test' for helloworld-0.1.0.0..
-Building test suite 'helloworld-test' for helloworld-0.1.0.0..
-[1 of 2] Compiling Main
-[2 of 2] Compiling Paths_helloworld
-Linking .stack-work\dist\<hash>\build\helloworld-test\helloworld-test.exe ...
-helloworld> copy/register
-Installing library in ...\helloworld\.stack-work\install\...
-Installing executable helloworld-exe in ...\helloworld\.stack-work\install\...\bin
-Registering library for helloworld-0.1.0.0..
-helloworld> test (suite: helloworld-test)
-
-Test suite not yet implemented
-
-helloworld> Test suite helloworld-test passed
-Completed 2 action(s).
-~~~
-
-We first cleaned our project to clear old results so we know exactly what Stack
-is trying to do. Note that it says it is building all executables for
-`helloworld` once, and that after a successful build of all of them, only
-specified executables will be rebuilt. If we change the source code of
-`test/Spec.hs`, say to:
-
-~~~haskell
-main :: IO ()
-main = putStrLn "Test suite still not yet implemented"
-~~~
-
-and command again:
-
-~~~text
-stack build :helloworld-test
-helloworld-0.1.0.0: unregistering (local file changes: test\Spec.hs)
-helloworld> build (lib + test)
-Preprocessing library for helloworld-0.1.0.0..
-Building library for helloworld-0.1.0.0..
-Preprocessing test suite 'helloworld-test' for helloworld-0.1.0.0..
-Building test suite 'helloworld-test' for helloworld-0.1.0.0..
-[2 of 2] Compiling Main
-Linking .stack-work\dist\<hash>\build\helloworld-test\helloworld-test.exe ...
-helloworld> copy/register
-Installing library in ...\helloworld\.stack-work\install\...
-Installing executable helloworld-exe in ...\helloworld\.stack-work\install\...\bin
-Registering library for helloworld-0.1.0.0..
-helloworld> blocking for directory lock on ...\helloworld\.stack-work\dist\<hash>\build-lock
-helloworld> test (suite: helloworld-test)
-
-Test suite still not yet implemented
-
-helloworld> Test suite helloworld-test passed
-Completed 2 action(s).
-~~~
-
-Notice that this time it builds the `helloworld-test` test suite, and the
-`helloworld` library (since it's used by the test suite), but it does not build
-the `helloworld-exe` executable.
-
-And now the final point: in both cases, the last line shows that our command
-also *runs* the test suite it just built. This may surprise some people who
-would expect tests to only be run when using `stack test`, but this design
-decision is what allows the `stack build` command to be as composable as it is
-(as described previously). The same rule applies to benchmarks. To spell it out
-completely:
-
-* The `--test` and `--bench` flags simply state which components of a package
-  should be built, if no explicit set of components is given
-* The default behavior for any test suite or benchmark component which has been
-  built is to also run it
-
-You can use the `--no-run-tests` and `--no-run-benchmarks` flags to disable
-running of these components. You can also use `--no-rerun-tests` to prevent
-running a test suite which has already passed and has not changed.
-
-!!! note
-
-    Stack doesn't build or run test suites and benchmarks for non-local
-    packages. This is done so that a command like `stack test` doesn't need to
-    run 200 test suites!
-
-## Multi-package projects
-
-Until now, everything we've done with Stack has used a single-package project.
-However, Stack's power truly shines when you're working on multi-package
-projects. All the functionality you'd expect to work just does: dependencies
-between packages are detected and respected, dependencies of all packages are
-just as one cohesive whole, and if anything fails to build, the build commands
-exits appropriately.
-
-Let's demonstrate this with the `wai-app-static` and `yackage` packages,
-starting in the root directory for all our Haskell projects. Command:
-
-~~~text
-mkdir multi
-cd multi
-stack unpack wai-app-static yackage
-Unpacked wai-app-static (from Hackage) to .../multi/wai-app-static-3.1.7.4/
-Unpacked yackage (from Hackage) to .../multi/yackage-0.8.1/
-stack init
-Looking for .cabal or package.yaml files to use to init the project.
-Using cabal packages:
-- wai-app-static-3.1.7.4/
-- yackage-0.8.1/
-
-Cabal file warning in .../multi/yackage-0.8.1/yackage.cabal@47:40: version operators used. To use version operators the package needs to specify at least 'cabal-version: >= 1.8'.
-Cabal file warning in .../multi/yackage-0.8.1/yackage.cabal@21:36: version operators used. To use version operators the package needs to specify at least 'cabal-version: >= 1.8'.
-Selecting the best among 18 snapshots...
-
-* Matches ...
-
-Selected resolver: ...
-Initialising configuration using resolver: ...
-Total number of user packages considered: 2
-Writing configuration to file: stack.yaml
-stack build --haddock --test
-# Goes off to build a whole bunch of packages
-~~~
-
-If you look at the `stack.yaml` file, you'll see exactly what you'd expect:
-
-~~~yaml
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/17.yaml
-packages:
-- wai-app-static-3.1.7.4
-- yackage-0.8.1
-~~~
-
-Notice that multiple directories are listed in the `packages` key.
-
-In addition to local directories, you can also refer to packages available in a
-Git repository or in a tarball over HTTP/HTTPS. This can be useful for using a
-modified version of a dependency that hasn't yet been released upstream.
-
-!!! note
-
-    When adding upstream packages directly to your project it is important to
-    distinguish _local packages_ from the upstream _dependency packages_.
-    Otherwise you may have trouble running `stack ghci`. See
-    [stack.yaml documentation](yaml_configuration.md#packages) for more details.
-
-## Flags and GHC options
-
-There are two common ways to alter how a package will install: with Cabal flags
-and with GHC options.
-
-### Cabal flag management
-
-To change a Cabal flag setting, we can use the command line `--flag` option. The
-`yackage` package has an `upload` flag that is enabled by default. We can
-command:
-
-~~~text
-stack build --flag yackage:-upload
-~~~
-
-This means: when compiling the `yackage` package, turn off the `upload` flag
-(thus the `-` in `-upload`). Unlike other tools, Stack is explicit about which
-package's flag you want to change. It does this for two reasons:
-
-1. There's no global meaning for Cabal flags, and therefore two packages can
-   use the same flag name for completely different things.
-2. By following this approach, we can avoid unnecessarily recompiling snapshot
-   packages that happen to use a flag that we're using.
-
-You can also change flag values on the command line for extra-dep and snapshot
-packages. If you do this, that package will automatically be promoted to an
-extra-dep, since the build plan is different than what the plan snapshot
-definition would entail.
-
-### GHC options
-
-GHC options follow a similar logic as in managing Cabal flags, with a few
-nuances to adjust for common use cases. Let's consider the command:
-
-~~~text
-stack build --ghc-options="-Wall -Werror"
-~~~
-
-This will set the `-Wall -Werror` options for all *local targets*. Note that
-this will not affect extra-dep and snapshot packages at all. This design
-provides us with reproducible and fast builds.
-
-(By the way: the above GHC options have a special convenience flag:
-`--pedantic`.)
-
-There's one extra nuance about command line GHC options: Since they only apply
-to local targets, if you change your local targets, they will no longer apply
-to other packages. Let's play around with an example from the `wai` repository,
-which includes the `wai` and `warp` packages, the latter depending on the
-former. If we command again:
-
-~~~text
-stack build --ghc-options=-O0 wai
-~~~
-
-It will build all of the dependencies of `wai`, and then build `wai` with all
-optimizations disabled. Now let's add in `warp` as well. Command:
-
-~~~text
-stack build --ghc-options=-O0 wai warp
-~~~
-
-This builds the additional dependencies for `warp`, and then builds `warp` with
-optimizations disabled. Importantly: it does not rebuild `wai`, since `wai`'s
-configuration has not been altered. Now the surprising case. Command:
-
-~~~text
-stack build --ghc-options=-O0 warp
-wai-3.0.3.0-5a49351d03cba6cbaf906972d788e65d: unregistering (flags changed from ["--ghc-options","-O0"] to [])
-warp-3.1.3-a91c7c3108f63376877cb3cd5dbe8a7a: unregistering (missing dependencies: wai)
-wai-3.0.3.0: configure
-~~~
-
-You may expect this to be a no-op: neither `wai` nor `warp` has changed.
-However, Stack will instead recompile `wai` with optimizations enabled again,
-and then rebuild `warp` (with optimizations disabled) against this newly built
-`wai`. The reason: reproducible builds. If we'd never built `wai` or `warp`
-before, trying to build `warp` would necessitate building all of its
-dependencies, and it would do so with default GHC options (optimizations
-enabled). This dependency would include `wai`. So when we command:
-
-~~~text
-stack build --ghc-options=-O0 warp
-~~~
-
-We want its behavior to be unaffected by any previous build steps we took.
-While this specific corner case does catch people by surprise, the overall goal
-of reproducible builds is - in the Stack maintainers' views - worth the
-confusion.
-
-Final point: if you have GHC options that you'll be regularly passing to your
-packages, you can add them to your `stack.yaml` file. See the
-[documentation section on ghc-options](yaml_configuration.md#ghc-options)
-for more information.
-
-!!! note
-
-    That's it, the heavy content of this guide is done! Everything from here on
-    out is simple explanations of commands. Congratulations!
-
-## The `stack path` command
-
-Generally, you don't need to worry about where Stack stores various files. But
-some people like to know this stuff. That's when the `stack path` command is
-useful. For example, command:
-
-~~~text
-stack path
-snapshot-doc-root: ...
-local-doc-root: ...
-local-hoogle-root: ...
-stack-root: ...
-project-root: ...
-config-location: ...
-bin-path: ...
-programs: ...
-compiler-exe: ...
-compiler-bin: ...
-compiler-tools-bin: ...
-local-bin: ...
-extra-include-dirs: ...
-extra-library-dirs: ...
-snapshot-pkg-db: ...
-local-pkg-db: ...
-global-pkg-db: ...
-ghc-package-path: ...
-snapshot-install-root: ...
-local-install-root: ...
-dist-dir: ...
-local-hpc-root: ...
-local-bin-path: ...
-ghc-paths: ...
-~~~
-
-In addition, `stack path` accepts command line arguments to state which of
-these keys you're interested in, which can be convenient for scripting. As a
-simple example, let's find out the sandboxed versions of GHC that Stack
-installed:
-
-On Unix-like operating systems, command:
-
-~~~text
-ls $(stack path --programs)/*.installed
-/home/<user_name>/.stack/programs/x86_64-linux/ghc-9.0.2.installed
-~~~
-
-On Windows (with PowerShell), command:
-
-~~~text
-dir "$(stack path --programs)/*.installed"
-
-Directory: C:\Users\mikep\AppData\Local\Programs\stack\x86_64-windows
-
-Mode                 LastWriteTime         Length Name
-----                 -------------         ------ ----
--a---          27/07/2022  5:40 PM              9 ghc-9.0.2.installed
--a---          25/02/2022 11:39 PM              9 msys2-20210604.installed
-~~~
-
-While we're talking about paths, to wipe our Stack install completely, here's
-what typically needs to be removed:
-
-1. the Stack root folder (see `stack path --stack-root`, before you uninstall);
-2. on Windows, the folder containing Stack's tools (see `stack path --programs`,
-   before you uninstall), which is located outside of the Stack root folder; and
-3. the `stack` executable file (see `which stack`, on Unix-like operating
-   systems, or `where.exe stack`, on Windows).
-
-You may also want to delete `.stack-work` folders in any Haskell projects that
-you have built using Stack. The `stack uninstall` command provides information
-about how to uninstall Stack.
-
-## The `stack exec` command
-
-We've already used `stack exec` multiple times in this guide. As you've likely
-already guessed, it allows you to run executables, but with a slightly modified
-environment. In particular: `stack exec` looks for executables on Stack's bin
-paths, and sets a few additional environment variables (like adding those paths
-to the PATH, and setting `GHC_PACKAGE_PATH`, which tells GHC which package
-databases to use).
-
-If you want to see exactly what the modified environment looks like, try
-command:
-
-~~~text
-stack exec env
-~~~
-
-The only issue is how to distinguish flags to be passed to Stack versus those
-for the underlying program. Thanks to the `optparse-applicative` library, Stack
-follows the Unix convention of `--` to separate these. For example, command:
-
-~~~text
-stack exec --package stm -- echo I installed the stm package via --package stm
-~~~
-
-yields output like:
-
-~~~text
-Run from outside a project, using implicit global project config
-Using latest snapshot resolver: lts-18.3
-Writing global (non-project-specific) config file to: /home/michael/.stack/global/stack.yaml
-Note: You can change the snapshot via the resolver field there.
-I installed the stm package via --package stm
-~~~
-
-Flags worth mentioning:
-
-* `--package foo` can be used to force a package to be installed before running
-  the given command.
-* `--no-ghc-package-path` can be used to stop the `GHC_PACKAGE_PATH` environment
-  variable from being set. Some tools — notably Cabal (the tool) — do not behave
-  well with that variable set.
-
-You may also find it convenient to use `stack exec` to launch a subshell
-(substitute `bash` with your preferred shell) where your compiled executable is
-available at the front of your PATH. Command:
-
-~~~text
-stack exec bash
-~~~
-
-## The `stack ghci` or `stack repl` command
-
-GHCi is the interactive GHC environment, a.k.a. the REPL. You *could* access it
-with command:
-
-~~~text
-stack exec ghci
-~~~
-
-But that won't load up locally written modules for access. For that, use the
-`stack ghci` or `stack repl` commands, which are equivalent. To then load
-modules from your project in GHCi, use the `:module` command (`:m` for short)
-followed by the module name.
-
-!!! note
-
-    If you have added packages to your project please make sure to mark them as
-    extra deps for faster and reliable usage of `stack ghci`. Otherwise GHCi may
-    have trouble due to conflicts of compilation flags or having to
-    unnecessarily interpret too many modules. See Stack's project-level
-    [configuration](yaml_configuration.md#extra-deps) to learn how to
-    configure a package as an extra-dep.
-
-For further information, see the [REPL environment](ghci.md) documentation.
-
-## The `stack ghc` and `stack runghc` commands
-
-You'll sometimes want to just compile (or run) a single Haskell source file,
-instead of creating an entire Cabal package for it. You can use `stack exec ghc`
-or `stack exec runghc` for that. As simple helpers, we also provide the
-`stack ghc` and `stack runghc` commands, for these common cases.
-
-## The `stack script` command
-
-The `stack script` command also either runs a specified Haskell source file
-(using GHC's `runghc`) or, optionally, compiles a specified Haskell source file
-(using GHC) and, by default, runs it.
-
-However, unlike `stack ghc` and `stack runghc`, the command ignores all Stack
-YAML configuration files. A snapshot must be specified on the command line (with
-the `--resolver` option). For example:
-
-~~~text
-stack --resolver lts-19.28 MyScript.hs
-~~~
-
-or, equivalently:
-
-~~~text
-stack script --resolver lts-19.28 MyScript.hs
-~~~
-
-Everything after `--` on the command line is interpreted as a command line
-argument to be passed to what is run.
-
-A package can be added to the snapshot on the command line with the
-`--extra-dep` option (which can be specified multiple times).
-
-Each required package can be specified by name on the command line with the
-`--package` option (which can be specified multiple times). A single `--package`
-option can also refer to a list of package names, separated by a space or comma
-character. If the package is not in the snapshot, the most recent version on
-Hackage will be obtained. If no packages are specified in that way, all the
-required packages that are in the snapshot will be deduced by reference to the
-`import` statements in the source file. The `base` package associated with the
-version of GHC specified by the snapshot is always available.
-
-The source file can be compiled by passing either the `--compile` flag (no
-optimization) or the `--optimize` flag (compilation with optimization). If the
-file is compiled, passing the `--no-run` flag will mean the compiled code is not
-run.
-
-Additional options can be passed to GHC using the `--ghc-options` option.
-
-For example, `MyScript.hs`:
-
-~~~haskell
-module Main (main) where
-
-import Data.List (intercalate)
-import System.Environment (getArgs)
-
-import Acme.Missiles (launchMissiles)
-
-main :: IO ()
-main = do
-  advices <- getArgs
-  launchMissiles
-  putStrLn $ intercalate "\n" advices
-~~~
-
-can be compiled and run, with arguments, with:
-
-~~~text
-stack --resolver lts-19.28 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!"
-~~~
-
-## Stack's script interpreter
-
-Stack also offers a very useful feature for running files: a script interpreter.
-For too long have Haskellers felt shackled to bash or Python because it's just
-too hard to create reusable source-only Haskell scripts. Stack attempts to solve
-that.
-
-You can use `stack <file_name>` to execute a Haskell source file. Usually, the
-Stack command to be applied is specified using a special Haskell comment (the
-Stack interpreter options comment) at the start of the source file. That command
-is most often `stack script` but it can be, for example, `stack runghc`. If
-there is no Stack interpreter options comment, Stack will warn that one was
-expected.
-
-An example will be easiest to understand. Consider the Haskell source file
-`turtle-example.hs` with contents:
-
-~~~haskell
-#!/usr/bin/env stack
--- stack script --resolver lts-19.28 --package turtle
-{-# LANGUAGE OverloadedStrings #-}
-import Turtle (echo)
-main = echo "Hello World!"
-~~~
-
-=== "Unix-like"
-
-    The first line beginning with the 'shebang' (`#!`) tells Unix to use Stack
-    as a script interpreter, if the file's permissions mark it as executable. A
-    shebang line is limited to a single argument, here `stack`.
-
-    The file's permissions can be set with command `chmod` and then it can be
-    run:
-
-    ~~~text
-    chmod +x turtle-example.hs
-    ./turtle-example.hs
-    ~~~
-
-    !!! note
-
-        On macOS:
-
-        - Avoid `{-# LANGUAGE CPP #-}` in Stack scripts; it breaks the shebang
-          line ([GHC #6132](https://gitlab.haskell.org/ghc/ghc/issues/6132))
-
-        - Use a compiled executable, not another script, in the shebang line.
-          Eg `#!/usr/bin/env runhaskell` will work but
-          `#!/usr/local/bin/runhaskell` would not.
-
-    Alternatively, the script can be run with command:
-
-    ~~~text
-    stack turtle-example.hs
-    ~~~
-
-=== "Windows (with PowerShell)"
-
-    The first line beginning with the 'shebang' (`#!`) has a meaning on
-    Unix-like operating systems but will be ignored by PowerShell. It can be
-    omitted on Windows. The script can be run with command:
-
-    ~~~text
-    stack turtle-example.hs
-    ~~~
-
-In both cases, the command yields:
-
-~~~text
-Hello World!
-~~~
-
-the first time after a little delay (as GHC is downloaded, if necessary, and
-dependencies are built) and subsequent times more promptly (as the runs are
-able to reuse everything already built).
-
-The second line of the source code is the Stack interpreter options comment. In
-this example, it specifies the `stack script` command with the options of a
-LTS Haskell 19.28 snapshot (`--resolver lts-19.28`) and ensuring the
-[`turtle` package](https://hackage.haskell.org/package/turtle) is available
-(`--package turtle`). The version of the package will be that in the specified
-snapshot (`lts-19.28` provides `turtle-1.5.25`).
-
-### Arguments and interpreter options and arguments
-
-Arguments for the script can be specified on the command line after the file
-name: `stack <file_name> <arg1> <arg2> ...`.
-
-The Stack interpreter options comment must specify what would be a single valid
-Stack command at the command line if the file name were included as an argument,
-starting with `stack`. It can include `--` followed by arguments. In particular,
-the Stack command `stack <arg1> MyScript.hs <arg4>` with
-Stack interpreter options comment:
-
-~~~haskell
--- stack <arg2> <command> <arg3> -- <arg5>
-~~~
-
-is equivalent to the following command at the command line:
-
-~~~text
-stack <arg1> <arg2> <command> <arg3> -- MyScript.hs <arg4> <arg5>
-~~~
-
-The Stack interpreter options comment must be the first line of the file, unless
-a shebang line is the first line, when the comment must be the second line. The
-comment must start in the first column of the line.
-
-When many options are needed, a block style comment that splits the command over
-more than one line may be more convenient and easier to read.
-
-For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`:
-
-~~~haskell
-#!/usr/bin/env stack
-{- stack script
-   --resolver lts-19.28
-   --
-   +RTS -s -RTS
--}
-import Data.List (intercalate)
-import System.Environment (getArgs)
-import Turtle (echo, fromString)
-
-main = do
-  args <- getArgs
-  echo $ fromString $ intercalate ", " args
-~~~
-
-is equivalent to the following command at the command line:
-
-~~~text
-stack script --resolver lts-19.28 -- MyScript.hs arg1 arg2 +RTS -s -RTS
-~~~
-
-where `+RTS -s -RTS` are some of GHC's
-[runtime system (RTS) options](https://downloads.haskell.org/~ghc/latest/docs/users_guide/runtime_control.html).
-
-### Just-in-time compilation
-
-As with using `stack script` at the command line, you can pass the `--compile`
-flag to make Stack compile the script, and then run the compiled executable.
-Compilation is done quickly, without optimization. To compile with optimization,
-pass the `--optimize` flag instead. Compilation is done only if needed; if the
-executable already exists, and is newer than the script, Stack just runs the
-executable directly.
-
-This feature can be good for speed (your script runs faster) and also for
-durability (the executable remains runnable even if the script is disturbed, eg
-due to changes in your installed GHC/snapshots, changes to source files during
-git bisect, etc.)
-
-### Using multiple packages
-
-As with using `stack script` at the command line, you can also specify multiple
-packages, either with multiple `--package` options, or by providing a comma or
-space separated list. For example:
-
-~~~haskell
-#!/usr/bin/env stack
-{- stack script
-   --resolver lts-19.28
-   --package turtle
-   --package "stm async"
-   --package http-client,http-conduit
--}
-~~~
-
-### Stack configuration for scripts
-
-With the `stack script` command, all Stack YAML configuration files are ignored.
-
-With the `stack runghc` command, if the current working directory is inside a
-project then that project's Stack project-level YAML configuration is effective
-when running the script. Otherwise the script uses the global project
-configuration specified in `<Stack root>/global-project/stack.yaml`.
-
-### Testing scripts
-
-You can use the flag `--script-no-run-compile` on the command line to enable (it
-is disabled by default) the use of the `--no-run` option with `stack script`
-(and forcing the `--compile` option). The flag may help test that scripts
-compile in CI (continuous integration).
-
-For example, consider the following simple script, in a file named `Script.hs`,
-which makes use of the joke package
-[`acme-missiles`](https://hackage.haskell.org/package/acme-missiles):
-
-~~~haskell
-{- stack script
-   --resolver lts-19.28
-   --package acme-missiles
--}
-import Acme.Missiles (launchMissiles)
-
-main :: IO ()
-main = launchMissiles
-~~~
-
-The command `stack --script-no-run-compile Script.hs` then behaves as if the
-command
-`stack script --resolver lts-19.28 --package acme-missiles --no-run --compile -- Script.hs`
-had been given. `Script.hs` is compiled (without optimisation) and the resulting
-executable is not run: no missiles are launched in the process!
-
-### Writing independent and reliable scripts
-
-The `stack script` command will automatically:
-
-* Install GHC and libraries if missing
-* Require that all packages used be explicitly stated on the command line
-
-This ensures that your scripts are _independent_ of any prior deployment
-specific configuration, and are _reliable_ by using exactly the same version of
-all packages every time it runs so that the script does not break by
-accidentally using incompatible package versions.
-
-In earlier versions of Stack, the `runghc` command was used for scripts and can
-still be used in that way. In order to achieve the same effect with the `runghc`
-command, you can do the following:
-
-1. Use the `--install-ghc` option to install the compiler automatically
-2. Explicitly specify all packages required by the script using the `--package`
-   option. Use `-hide-all-packages` GHC option to force explicit specification
-   of all packages.
-3. Use the `--resolver` Stack option to ensure a specific GHC version and
-   package set is used.
-
-It is possible for configuration files to affect `stack runghc`. For that
-reason, `stack script` is strongly recommended. For those curious, here is an
-example with `runghc`:
-
-~~~haskell
-#!/usr/bin/env stack
-{- stack
-  runghc
-  --install-ghc
-  --resolver lts-19.17
-  --package base
-  --package turtle
-  --
-  -hide-all-packages
-  -}
-~~~
-
-The `runghc` command is still very useful, especially when you're working on a
-project and want to access the package databases and configurations used by that
-project. See the next section for more information on configuration files.
-
-### Loading scripts in GHCi
-
-Sometimes you want to load your script in GHCi to play around with your program.
-In those cases, you can use `exec ghci` option in the script to achieve
-it. Here is an example:
-
-~~~haskell
-#!/usr/bin/env stack
-{- stack
-   exec ghci
-   --install-ghc
-   --resolver lts-19.28
-   --package turtle
--}
-~~~
-
-## Finding project configs, and the implicit global project
-
-Whenever you run something with Stack, it needs a project-level configuration
-file. The algorithm Stack uses to find such a file is:
-
-1. Check for a `--stack-yaml` option on the command line
-2. Check for a `STACK_YAML` environment variable
-3. Check the current directory and all ancestor directories for a `stack.yaml`
-   file
-
-The first two provide a convenient method for using an alternate configuration.
-For example: `stack build --stack-yaml stack-ghc-9.2.3.yaml` can be used by your
-CI system to check your code against GHC 9.2.3. Setting the `STACK_YAML`
-environment variable can be convenient if you're going to be running commands
-like `stack ghc` in other directories, but you want to use the configuration you
-defined in a specific project.
-
-If Stack does not find a project level configuration file in any of the three
-specified locations, the *implicit global* logic kicks in. You've probably
-noticed that phrase a few times in the output from commands above. Implicit
-global is essentially a hack to allow Stack to be useful in a non-project
-setting. When no implicit global configuration file exists, Stack creates one
-for you with the latest LTS snapshot as the resolver. This allows you to do
-things like:
-
-* compile individual files easily with `stack ghc`
-* build executables without starting a project, e.g. `stack install pandoc`
-
-Keep in mind that there's nothing magical about this implicit global
-configuration. It has no effect on projects at all. Every package you install
-with it is put into isolated databases just like everywhere else. The only magic
-is that it's the catch-all project whenever you're running Stack somewhere else.
-
-## Setting the Stack root location
-
-The Stack root is a directory where Stack stores snapshot packages. On Unix-like
-operating systems, it is also where Stack stores tools such as GHC, in a
-`programs` directory. On Windows, the default location for such tools is outside
-the Stack root, in `%LOCALAPPDATA%\Programs\stack`. The location of the Stack
-root is reported by command:
-
-~~~text
-stack path --stack-root
-~~~
-
-The location of the Stack root can be configured by setting the `STACK_ROOT`
-environment variable or using Stack's `--stack-root` option on the command line.
-
-On Windows, the length of filepaths may be limited (to
-[MAX_PATH](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd)),
-and things can break when this limit is exceeded. Setting a Stack root with a
-short path to its location (for example, `C:\sr`) can help.
-
-## `stack.yaml` versus Cabal files
-
-Now that we've covered a lot of Stack use cases, this quick summary of
-`stack.yaml` versus Cabal files will hopefully make sense and be a good reminder
-for future uses of Stack:
-
-* A project can have multiple packages.
-* Each project has a `stack.yaml`.
-* Each package has a Cabal file, named `<package_name>.cabal`.
-* The Cabal file specifies which packages are dependencies.
-* The `stack.yaml` file specifies which packages are available to be used.
-* The Cabal file specifies the components, modules, and build flags provided by
-  a package
-* `stack.yaml` can override the flag settings for individual packages
-* `stack.yaml` specifies which packages to include
-
-## Comparison to other tools
-
-Stack is not the only tool available for building Haskell code. Stack came into
-existence due to limitations at that time with some of the existing tools. If
-you are happily building Haskell code with other tools, you may not need Stack.
-If you're experiencing problems with other tools, give Stack a try instead.
-
-If you're a new user who has no experience with other tools, we recommend Stack.
-The defaults match modern best practices in Haskell development, and there are
-fewer corner cases you need to be aware of. You *can* develop Haskell code with
-other tools, but you probably want to spend your time writing code, not
-convincing a tool to do what you want.
-
-### Underlying package format
-
-Before turning to differences, we clarify an important similarity: Stack, Cabal
-(the tool), and presumably all other tools share the same underlying package
-format of Cabal (the library). This is a Good Thing: we can share the same set
-of upstream libraries, and collaboratively work on the same project with Stack,
-Cabal (the tool), and NixOS. In that sense, we're sharing the same ecosystem.
-
-### Curation vs dependency solving
-
-* Stack uses 'curation' (snapshots and Stack's project-level configuration file
-  (`stack.yaml`) define precisely the set of packages available for a project).
-  The Stack team firmly believes that the majority of users want to simply
-  ignore dependency resolution nightmares and get a valid build plan from day
-  one. That's why we've made 'curation' the focus of Stack.
-
-* Cabal (the tool) can use 'curation' too but its origins are in dependency
-  solving.
-
-### Emphasis on reproducibility
-
-* Stack goes to great lengths to ensure that `stack build` today does the
-  same thing tomorrow. With Stack, changing the build plan is always an explicit
-  decision.
-
-* Cabal (the tool) does not go to the same lengths: build plans can be affected
-  by the presence of pre-installed packages, and running `cabal update` can
-  cause a previously successful build to fail.
-
-### Automatic building of dependencies
-
-*   Stack's automatically builds dependencies. So for example, in Stack,
-    `stack test` does the same job as:
-
-    ~~~text
-    cabal install --enable-tests --only-dependencies
-    cabal configure --enable-tests
-    cabal build
-    cabal test
-    ~~~
-
-    (newer versions of Cabal (the tool) may make this command sequence shorter).
-
-*   With Cabal (the tool), you need to use `cabal install` to trigger dependency
-    building. This is somewhat necessary as building dependencies can, in some
-    cases, break existing installed packages.
-
-### Isolation
-
-* Stack is isolated - provides 'sandboxed' behaviour - by default, via its
-  databases. In other words: when you use Stack, there's
-  __no need for sandboxes__, everything is (essentially) sandboxed by default.
-
-* With Cabal (the tool), the default behavior is a non-isolated build where
-  working on two projects can cause the user package database to become
-  corrupted. The Cabal solution to this is sandboxes.
-
-### Tools other than Stack and Cabal (the tool)
-
-* [cabal-meta](https://hackage.haskell.org/package/cabal-meta) inspired a lot of
-  the multi-package functionality of Stack. Still relevant for Cabal (the
-  tool).
-* [cabal-src](https://hackage.haskell.org/package/cabal-src). Deprecated in
-  favor of Stack in 2016.
-* [stackage-cli](https://hackage.haskell.org/package/stackage-cli).Deprecated
-  in favor of Stack in 2015.
-* [cabal-dev](https://hackage.haskell.org/package/cabal-dev). Deprecated in
-  favor of Cabal (the tool) in 2013.
-
-## More resources
-
-There are lots of resources available for learning more about Stack:
-
-* `stack` or `stack --help` — lists Stack's commands, and flags and options
-  common to those commands
-* `stack <command> --help` — provides help on the particular Stack command,
-  including flags and options specific to the command
-* `stack --version` — identify the version and Git hash of the Stack executable
-* `--verbose` (or `-v`) — much more info about internal operations (useful for
-  bug reports)
-* The [home page](http://haskellstack.org)
-* The [Stack mailing list](https://groups.google.com/d/forum/haskell-stack)
-* The [FAQ](faq.md)
-* The [haskell-stack tag on Stack Overflow](http://stackoverflow.com/questions/tagged/haskell-stack)
-* [Another getting started with Stack tutorial](http://seanhess.github.io/2015/08/04/practical-haskell-getting-started.html)
-* [Why is Stack not Cabal?](https://www.fpcomplete.com/blog/2015/06/why-is-stack-not-cabal)
diff --git a/doc/GUIDE_advanced.md b/doc/GUIDE_advanced.md
deleted file mode 100644
index 0a2a5af0bd..0000000000
--- a/doc/GUIDE_advanced.md
+++ /dev/null
@@ -1,750 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# User guide (advanced)
-
-Some of Stack's features will not be needed regularly or by all users. This part
-of the guide provides information about those features. Some of the features are
-complex and separate pages are dedicated to them.
-
-## The `stack --hpack-numeric-version` flag
-
-Stack will report the numeric version of its built-in Hpack library to standard
-output (e.g. `0.35.0`) and quit.
-
-## The `stack --numeric-version` flag
-
-Stack will report its numeric version to standard output (e.g. `2.9.1`) and
-quit.
-
-## The `stack --[no-]rsl-in-log` flag
-
-[:octicons-tag-24: 2.9.1](https://github.com/commercialhaskell/stack/releases/tag/v2.9.1)
-
-Default: Disabled
-
-Enables/disables the logging of the raw snapshot layer (rsl) in debug output.
-Information about the raw snapshot layer can be lengthy. If you do not need it,
-it is best omitted from the debug output.
-
-## The `stack --silent` flag
-
-Equivalent to the `stack --verbosity silent` option.
-
-## The `stack --stack-root` option
-
-`stack --stack-root <absolute_path_to_the_Stack_root>` specifies the path to the
-Stack root directory. The path must be an absolute one. The option will override
-the contents of any `STACK_ROOT` environment variable.
-
-## The `stack --[no-]time-in-logs` flag
-
-Default: Enabled
-
-Enables/disables the inclusion of time stamps against logging entries when the
-verbosity level is 'debug'.
-
-## The `stack -v, --verbose` flags
-
-Equivalent to the `stack --verbosity debug` option.
-
-## The `stack --verbosity` option
-
-Default: info
-
-`stack --verbosity <log_level>` will set the level for logging. Possible levels
-are `silent`, `error`, `warn`, `info` and `debug`, in order of increasing
-amounts of information provided by logging.
-
-## The `stack --version` flag
-
-Stack will report its version to standard output and quit. For versions that are
-release candidates, the report will list the dependencies that Stack has been
-compiled with.
-
-## The `stack --work-dir` option
-
-Default: `.stack-work`
-
-`stack --work-dir <relative_path_to_the_Stack_root>` specifies the path to
-Stack's work directory for the project. The path must be a relative one,
-relative to the project's root directory. The option will override the contents
-of any `STACK_WORK` environment variable.
-
-## The `stack build` command
-
-The `stack build` command is introduced in the first part of Stack's
-[user's guide](GUIDE.md#the-stack-build-command). For further information about
-the command, see the [build command](build_command.md) documentation.
-
-## The `stack config` commands
-
-The `stack config` commands provide assistance with accessing or modifying
-Stack's configuration. See `stack config` for the available commands.
-
-## The `stack config env` command
-
-`stack config env` outputs a script that sets or unsets environment variables
-for a Stack environment. Flags modify the script that is output:
-
-* `--[no-]locals` (enabled by default) include/exclude local package information
-* `--[no-]ghc-package-path` (enabled by default) set `GHC_PACKAGE_PATH`
-  environment variable or not
-* `--[no-]stack-exe` (enabled by default) set `STACK_EXE` environment variable
-  or not
-* `--[no-]locale-utf8` (disabled by default) set the `GHC_CHARENC`
-  environment variable to `UTF-8` or not
-* `--[no-]keep-ghc-rts` (disabled by default) keep/discard any `GHCRTS`
-  environment variable
-
-## The `stack config set` commands
-
-The `stack config set` commands allow the values of keys in YAML configuration
-files to be set. See `stack config set` for the available keys.
-
-## The `stack config set install-ghc` command
-
-`stack config set install-ghc true` or `false` sets the `install-ghc` key in a
-YAML configuration file, accordingly. By default, the project-level
-configuration file (`stack.yaml`) is altered. The `--global` flag specifies the
-user-specific global configuration file (`config.yaml`).
-
-## The `stack config set resolver` command
-
-`stack config set resolver <snapshot>` sets the `resolver` key in the
-project-level configuration file (`stack.yaml`).
-
-A snapshot of `lts` or `nightly` will be translated into the most recent
-available. A snapshot of `lts-19` will be translated into the most recent
-available in the `lts-19` sequence.
-
-Known bug:
-
-* The command does not respect the presence of a `snapshot` key.
-
-## The `stack config set system-ghc` command
-
-`stack config set system-ghc true` or `false` sets the `system-ghc` key in a
-YAML configuration file, accordingly. By default, the project-level
-configuration file (`stack.yaml`) is altered. The `--global` flag specifies the
-user-specific global configuration file (`config.yaml`).
-
-## The `stack dot` command
-
-If you'd like to get some insight into the dependency tree of your packages, you
-can use the `stack dot` command and Graphviz. More information is available in
-the [Dependency visualization](dependency_visualization.md) documentation.
-
-## The `stack ide` commands
-
-The `stack ide` commands provide information that may be of use in an
-integrated development environment (IDE). See `stack ide` for the available
-commands.
-
-## The `stack ide packages` command
-
-`stack ide packages` lists all available local packages that are loadable. By
-default, its output is sent to the standard error channel. This can be changed
-to the standard output channel with the `--stdout` flag.
-
-By default, the output is the package name (without its version). This can be
-changed to the full path to the package's Cabal file with the `--cabal-files`
-flag.
-
-## The `stack ide targets` command
-
-`stack ide targets` lists all available Stack targets. By default, its output is
-sent to the standard error channel. This can be changed to the standard output
-channel with the `--stdout` flag.
-
-For example, for the Stack project itself, command:
-
-~~~text
-cd stack
-stack ide targets
-~~~
-
-and the output from the second command is:
-
-~~~text
-stack:lib
-stack:exe:stack
-stack:exe:stack-integration-test
-stack:test:stack-test
-~~~
-
-## The `stack list` command
-
-[:octicons-tag-24: 2.7.1](https://github.com/commercialhaskell/stack/releases/tag/v2.7.1)
-
-`stack list <package_name>` will list the latest version of the package from
-Hackage. If the package name cannot be found on Hackage, even after updating the
-package index, suggestions (not necessarily good ones) will be made about the
-intended package name.
-
-`stack --resolver <snapshot> <package_name>` will list the version of the
-package in the specified snapshot, unless the package comes with GHC on
-Unix-like operating systems. If the package name cannot be found in the
-snapshot, the command will fail, identifying only the package(s) that did not
-appear in the snapshot.
-
-More than one package name can be specified.
-
-`stack --resolver <snapshot>` will list all the packages in the specified
-snapshot, except those which come with GHC on Unix-like operating systems.
-
-For example:
-
-~~~text
-stack list base unix Win32 acme-missiles pantry
-base-4.17.0.0
-unix-2.8.0.0
-Win32-2.13.3.0
-acme-missiles-0.3
-pantry-0.5.7
-
-stack list paltry
-Could not find package paltry, updating
-...
-Package index cache populated
-- Could not find package paltry on Hackage. Perhaps you meant: pretty, pasty, xattr, alloy, para, pappy, alure, polar, factory, pastis
-
-stack --resolver lts-19.25 base unix Win32 acme-missiles pantry
-- Package does not appear in snapshot: base
-- Package does not appear in snapshot: unix
-- Package does not appear in snapshot: acme-missiles
-
-stack --resolver lts-19.25 Win32 pantry
-Win32-2.12.0.1
-pantry-0.5.7
-
-stack --resolver lts-19.25
-AC-Angle-1.0
-ALUT-2.4.0.3
-...
-zstd-0.1.3.0
-ztail-1.2.0.3
-~~~
-
-## The `stack ls` commands
-
-The `stack ls` commands list different types of information. See `stack ls` for
-the available commands.
-
-## The `stack ls dependencies` command
-
-`stack ls dependencies` lists all of the packages and versions used for a
-project.
-
-## The `stack ls snapshots` command
-
-`stack ls snapshots` will list all the local snapshots by default. You can also
-view the remote snapshots using `stack ls snapshots remote`. It also supports
-options for viewing only lts (`-l`) and nightly (`-n`) snapshots.
-
-## The `stack ls stack-colors` command
-
-The British English spelling is also accepted (`stack ls stack-colours`).
-
-`stack ls stack-colors` will list all of Stack's output styles. A number of
-different formats for the output are available, see
-`stack ls stack-colors --help`.
-
-The default is a full report, with the equivalent SGR instructions and an
-example of the applied style. The latter can be disabled with flags `--no-sgr`
-and `--no-example`.
-
-The flag `--basic` specifies a more basic report, in the format that is accepted
-by Stack's command line option `--stack-colors` and the YAML configuration key
-`stack-colors`.
-
-## The `stack ls tools` command
-
-`stack ls tools` will list Stack's installed tools. On Unix-like operating
-systems, they will be one or more versions of GHC. On Windows, they will include
-MSYS2. For example, on Windows the command:
-
-~~~text
-stack ls tools
-~~~
-
-yields output like:
-
-~~~text
-ghc-9.4.1
-ghc-9.2.4
-ghc-9.0.2
-msys2-20210604
-~~~
-
-The `--filter <tool_name>` option will filter the output by a tool name (e.g.
-'ghc', 'ghc-git' or 'msys2'). The tool name is case sensitive. For example the
-command:
-
-~~~text
-stack ls tools --filter ghc
-~~~
-
-yields output like:
-
-~~~text
-ghc-9.4.1
-ghc-9.2.4
-ghc-9.0.2
-~~~
-
-## The `stack query` command
-
-[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
-
-`stack query` outputs certain build information. For example, for a
-multi-package project `multi` specifying snapshot `lts-19.25` (GHC 9.0.2) and
-with two local packages, `my-package-A` (version 0.1.0.0) and `my-package-B`
-(version 0.2.0.0), command `stack query` outputs:
-
-~~~text
-compiler:
-  actual: ghc-9.0.2
-  wanted: ghc-9.0.2
-locals:
-  my-package-A:
-    path: <absolute_path_to>\multi\my-package-A\
-    version: 0.1.0.0
-  my-package-B:
-    path: <absolute_path_to>\multi\my-package-B\
-    version: 0.2.0.0
-~~~
-
-The component parts of the information can be specified using 'selectors' with
-the command. In the example above the selectors include `compiler`,
-`compiler actual`, `locals`, `locals my-package-A`, and
-`locals my-package-A version`. For example, commanding:
-
-~~~text
-stack query locals my-package-B path
-~~~
-
-results in output:
-
-~~~text
-<absolute_path_to>\multi\my-package-B\
-~~~
-
-## The `stack run` command
-
-`stack run` builds a project executable and runs it. If the command has a first
-argument and it is recognised as an executable target then that is built.
-Otherwise, the project's first executable is built. If the project has no
-executables Stack reports no executables found as an error.
-
-Everything after `--` on the command line is interpreted as a command line
-argument to be passed to what is run, other than a first argument recognised as
-an executable target.
-
-By default, the `GHC_PACKAGE_PATH` environment variable is set for the
-subprocess. Pass the `--no-ghc-package-path` flag to not set the variable.
-
-By default, the `STACK_EXE` environment variable is set with the path to Stack.
-Pass the `--no-stack-exe` flag to not set the variable.
-
-The `--cwd` option can be used to set the working directory before the
-executable is run.
-
-The `--rts-options` option (which can be specified multiple times) can be used
-to pass a list of GHC's
-[runtime system (RTS) options](https://downloads.haskell.org/~ghc/latest/docs/users_guide/runtime_control.html#)
-to the executable when it is run. (The `+RTS` and `-RTS` must not be included.)
-
-The `--package` option (which can be specified multiple times) can be used to
-add a package name to build targets.
-
-## The `stack sdist` command
-
-Hackage only accepts packages for uploading in a standard form, a compressed
-archive ('tarball') in the format produced by Cabal's `sdist` action.
-
-`stack sdist` generates a file for your package, in the format accepted by
-Hackage for uploads. The command will report the location of the generated file.
-
-### The `stack sdist --ignore-check` flag
-
-Pass the flag to disable checks of the package for common mistakes. By default,
-the command will check the package for common mistakes.
-
-### The `stack sdist --pvp-bounds` option
-
-The `--pvp-bounds <pvp_bounds_mode>` option determines whether and, if so, how
-PVP version bounds should be added to the Cabal file of the package. The
-available modes for basic use are: `none`, `lower`, `upper`, and `both`. The
-available modes for use with Cabal file revisions are `lower-revision`,
-`upper-revision` and `both-revision`.
-
-For futher information, see the
-[YAML configuration](yaml_configuration.md#pvp-bounds) documentation.
-
-### The `stack sdist --tar-dir` option
-
-The `--tar-dir <path_to_directory>` option determines whether the package
-archive should be copied to the specified directory.
-
-### The `stack sdist --[no-]test-tarball` flag
-
-Default: Disabled
-
-Set the flag to cause Stack to test the resulting package archive, by attempting
-to build it.
-
-## The `stack setup` command
-
-`stack setup` attempts to install a version of GHC - by default, the version
-required by the project and only if it is not already available to Stack. For
-example:
-
-~~~text
-stack setup
-stack will use a sandboxed GHC it installed
-For more information on paths, see 'stack path' and 'stack exec env'
-To use this GHC and packages outside of a project, consider using:
-stack ghc, stack ghci, stack runghc, or stack exec
-~~~
-
-Alternatively, the version of GHC to be installed can be specified as an
-argument. For example `stack setup 9.0.2`.
-
-Set the `--reinstall` flag (disabled by default) to attempt to install the
-version of GHC regardless of whether it is already available to Stack.
-
-The `--ghc-bindist <url>` option can be used to specify the URL of the GHC to be
-downloaded and installed. This option requires the use of the `--ghc-variant`
-option specifying a custom GHC variant.
-
-If Stack is configured not to install GHC (`install-ghc: false` or passing the
-`--no-install-ghc` flag) then `stack setup` will silently ignore the flag.
-
-## The `stack templates` command
-
-`stack templates` provides information about how to find templates available for
-`stack new`.
-
-Stack provides multiple templates to start a new project from. You can specify
-one of these templates following your project name in the `stack new` command:
-
-~~~text
-stack new my-rio-project rio
-Downloading template "rio" to create project "my-rio-project" in my-rio-project/ ...
-Looking for .cabal or package.yaml files to use to init the project.
-Using cabal packages:
-- my-rio-project/
-
-Selecting the best among 18 snapshots...
-
-* Matches ...
-
-Selected resolver: ...
-Initialising configuration using resolver: ...
-Total number of user packages considered: 1
-Writing configuration to file: my-rio-project/stack.yaml
-All done.
-<Stack root>\templates\rio.hsfiles:   10.10 KiB downloaded...
-~~~
-
-The default templates repository is
-https://github.com/commercialhaskell/stack-templates. You can download templates
-from a different GitHub user by prefixing the username and a slash. Command:
-
-~~~text
-stack new my-yesod-project yesodweb/simple
-~~~
-
-Then template file `simple.hsfiles` would be downloaded from GitHub repository
-`yesodweb/stack-templates`.
-
-You can even download templates from a service other that GitHub, such as
-[GitLab](https://gitlab.com) or [Bitbucket](https://bitbucket.com). For example,
-command:
-
-~~~text
-stack new my-project gitlab:user29/foo
-~~~
-
-Template file `foo.hsfiles` would be downloaded from GitLab, user account
-`user29`, repository `stack-templates`.
-
-If you need more flexibility, you can specify the full URL of the template.
-Command:
-
-~~~text
-stack new my-project https://my-site.com/content/template9.hsfiles
-~~~
-
-(The `.hsfiles` extension is optional; it will be added if it's not specified.)
-
-Alternatively you can use a local template by specifying the path. Command:
-
-~~~text
-stack new project <path_to_template>/template.hsfiles
-~~~
-
-As a starting point for creating your own templates, you can use the
-["simple" template](https://github.com/commercialhaskell/stack-templates/blob/master/simple.hsfiles).
-The
-[stack-templates repository](https://github.com/commercialhaskell/stack-templates#readme)
-provides an introduction into creating templates.
-
-## The `stack update` command
-
-`stack update` will download the most recent set of packages from your package
-indices (e.g. Hackage). Generally, Stack runs this for you automatically when
-necessary, but it can be useful to do this manually sometimes.
-
-## The `stack upgrade` command
-
-`stack upgrade` will build a new version of Stack from source.
-  * `--git` is a convenient way to get the most recent version from the `master`
-     branch, for those testing and living on the bleeding edge.
-
-## The `stack unpack` command
-
-`stack unpack` does what you'd expect: downloads a tarball and unpacks it. It
-accepts an optional `--to` argument to specify the destination directory.
-
-## The `stack upload` command
-
-Hackage accepts packages for uploading in a standard form, a compressed archive
-('tarball') in the format produced by Cabal's `sdist` action.
-
-`stack upload` generates a file for your package, in the format accepted by
-Hackage for uploads, and uploads the package to Hackage. For example, if the
-current working directory is the root directory of your project:
-
-~~~text
-stack upload .
-~~~
-
-### The `HACKAGE_USERNAME` and `HACKAGE_PASSWORD` environment variables
-
-[:octicons-tag-24: 2.3.1](https://github.com/commercialhaskell/stack/releases/tag/v2.3.1)
-
-`stack upload` will request a Hackage username and password to authenticate.
-This can be avoided by setting the `HACKAGE_USERNAME` and `HACKAGE_PASSWORD`
-environment variables. For
-example:
-
-=== "Unix-like"
-
-    ~~~text
-    export $HACKAGE_USERNAME="<username>"
-    export $HACKAGE_PASSWORD="<password>"
-    stack upload .
-    ~~~
-
-=== "Windows (with PowerShell)"
-
-    ~~~text
-    $Env:HACKAGE_USERNAME='<username>'
-    $Env:HACKAGE_PASSWORD='<password>'
-    stack upload .
-    ~~~
-
-### The `HACKAGE_KEY` environment variable
-
-[:octicons-tag-24: 2.7.5](https://github.com/commercialhaskell/stack/releases/tag/v2.7.5)
-
-Hackage allows its members to register an API authentification token and to
-authenticate using the token.
-
-A Hackage API authentification token can be used with `stack upload` instead of
-username and password, by setting the `HACKAGE_KEY` environment variable. For
-example:
-
-=== "Unix-like"
-
-     ~~~text
-     HACKAGE_KEY=<api_authentification_token>
-     stack upload .
-     ~~~
-
-=== "Windows (with PowerShell)"
-
-     ~~~text
-     $Env:HACKAGE_KEY=<api_authentification_token>
-     stack upload .
-     ~~~
-
-### The `stack upload --candidate` flag
-
-Pass the flag to upload a
-[package candidate](http://hackage.haskell.org/upload#candidates).
-
-### The `stack upload --ignore-check` flag
-
-Pass the flag to disable checks of the package for common mistakes. By default,
-the command will check the package for common mistakes.
-
-### The `stack upload --pvp-bounds` option
-
-The `--pvp-bounds <pvp_bounds_mode>` option determines whether and, if so, how
-PVP version bounds should be added to the Cabal file of the package. The
-available modes for basic use are: `none`, `lower`, `upper`, and `both`. The
-available modes for use with Cabal file revisions are `lower-revision`,
-`upper-revision` and `both-revision`.
-
-For futher information, see the
-[YAML configuration](yaml_configuration.md#pvp-bounds) documentation.
-
-### The `stack upload --tar-dir` option
-
-The `--tar-dir <path_to_directory>` option determines whether the package
-archive should be copied to the specified directory.
-
-### The `stack upload --[no-]test-tarball` flag
-
-Default: Disabled
-
-Set the flag to cause Stack to test the resulting package archive, by attempting
-to build it.
-
-## Docker integration
-
-Stack is able to build your code inside a Docker image, which means even more
-reproducibility to your builds, since you and the rest of your team will always
-have the same system libraries.
-
-For further information, see the [Docker integration](docker_integration.md)
-documentation.
-
-## Nix integration
-
-Stack provides an integration with [Nix](http://nixos.org/nix), providing you
-with the same two benefits as the first Docker integration discussed above:
-
-* more reproducible builds, since fixed versions of any system libraries and
-  commands required to build the project are automatically built using Nix and
-  managed locally per-project. These system packages never conflict with any
-  existing versions of these libraries on your system. That they are managed
-  locally to the project means that you don't need to alter your system in any
-  way to build any odd project pulled from the Internet.
-* implicit sharing of system packages between projects, so you don't have more
-  copies on-disk than you need to.
-
-When using the Nix integration, Stack downloads and builds Haskell dependencies
-as usual, but resorts on Nix to provide non-Haskell dependencies that exist in
-the Nixpkgs.
-
-Both Docker and Nix are methods to *isolate* builds and thereby make them more
-reproducible. They just differ in the means of achieving this isolation. Nix
-provides slightly weaker isolation guarantees than Docker, but is more
-lightweight and more portable (Linux and macOS mainly, but also Windows). For
-more on Nix, its command-line interface and its package description language,
-read the [Nix manual](http://nixos.org/nix/manual). But keep in mind that the
-point of Stack's support is to obviate the need to write any Nix code in the
-common case or even to learn how to use the Nix tools (they're called under the
-hood).
-
-For more information, see the [Nix-integration](nix_integration.md)
-documentation.
-
-## Continuous integration (CI)
-
-### GitHub Actions
-
-The Stack repository uses GitHub Actions for its own CI. For further
-information, see the guide to
-[contributing](CONTRIBUTING.md#continuous-integration-ci).
-
-### Azure
-
-For further information, see the [Azure CI](azure_ci.md) documentation.
-
-### Travis
-
-For further information, see the [Travis CI](travis_ci.md) documentation.
-
-## Editor integration
-
-### The `intero` project
-
-For editor integration, Stack has a related project called
-[intero](https://github.com/commercialhaskell/intero). It is particularly well
-supported by Emacs, but some other editors have integration for it as well.
-
-### Shell auto-completion
-
-Love tab-completion of commands? You're not alone. If you're on bash, just run
-the following command (or add it to `.bashrc`):
-
-~~~text
-eval "$(stack --bash-completion-script stack)"
-~~~
-
-For more information and other shells, see the
-[Shell auto-completion wiki page](https://docs.haskellstack.org/en/stable/shell_autocompletion)
-
-## Debugging
-
-To profile a component of the current project, simply pass the `--profile`
-flag to `stack`. The `--profile` flag turns on the `--enable-library-profiling`
-and `--enable-executable-profiling` Cabal options _and_ passes the `+RTS -p`
-runtime options to any testsuites and benchmarks.
-
-For example the following command will build the `my-tests` testsuite with
-profiling options and create a `my-tests.prof` file in the current directory
-as a result of the test run.
-
-~~~text
-stack test --profile my-tests
-~~~
-
-The `my-tests.prof` file now contains time and allocation info for the test run.
-
-To create a profiling report for an executable, e.g. `my-exe`, you can command:
-
-~~~text
-stack exec --profile -- my-exe +RTS -p
-~~~
-
-For more fine-grained control of compilation options there are the
-`--library-profiling` and `--executable-profiling` flags which will turn on the
-`--enable-library-profiling` and `--enable-executable-profiling` Cabal
-options respectively. Custom GHC options can be passed in with
-`--ghc-options "more options here"`.
-
-To enable compilation with profiling options by default you can add the
-following snippet to your `stack.yaml` or `~/.stack/config.yaml`:
-
-~~~yaml
-build:
-  library-profiling: true
-  executable-profiling: true
-~~~
-
-### Further reading
-
-For more commands and uses, see the
-[official GHC chapter on profiling](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/profiling.html),
-the [Haskell wiki](https://wiki.haskell.org/How_to_profile_a_Haskell_program),
-and the
-[chapter on profiling in Real World Haskell](http://book.realworldhaskell.org/read/profiling-and-optimization.html).
-
-### Tracing
-
-To generate a backtrace in case of exceptions during a test or benchmarks run,
-use the `--trace` flag. Like `--profile` this compiles with profiling options,
-but adds the `+RTS -xc` runtime option.
-
-### Debugging symbols
-
-Building with debugging symbols in the
-[DWARF information](https://ghc.haskell.org/trac/ghc/wiki/DWARF) is supported by
-Stack. This can be done by passing the flag `--ghc-options="-g"` and also to
-override the default behaviour of stripping executables of debugging symbols by
-passing either one of the following flags: `--no-strip`,
-`--no-library-stripping` or `--no-executable-stripping`.
-
-In Windows, GDB can be installed to debug an executable with
-`stack exec -- pacman -S gdb`. Windows' Visual Studio compiler's debugging
-format PDB is not supported at the moment. This might be possible by
-[separating](https://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target)
-debugging symbols and
-[converting](https://github.com/rainers/cv2pdb) their format. Or as an option
-when
-[using the LLVM backend](http://blog.llvm.org/2017/08/llvm-on-windows-now-supports-pdb-debug.html).
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000000..5cc272536a
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,22 @@
+# With the necessary prerequisites, this file allows users of the 'make' tool to
+# automate the use of the 'mkdocs' tool to preview or build Stack's online
+# documentation. See CONTRIBUTING.md and the file 'Makefile' in Stack's project
+# directory for more information.
+
+PYTHON_VIRTUALENV:=.python-doc-virtualenv
+MK_DOCS_CMD:=$(PYTHON_VIRTUALENV)/bin/mkdocs
+
+../$(PYTHON_VIRTUALENV)/bin/activate:
+
+# Note, the python3 command is not used with Python on Windows
+	python3 -m venv ../$(PYTHON_VIRTUALENV)
+
+# Note, in the MSYS2 environment, the development versions of the libxml2 and
+# libxslt packages are also required but not installed by pip
+	(. ../$(PYTHON_VIRTUALENV)/bin/activate && pip install -r requirements.txt)
+
+docs-serve: ../$(PYTHON_VIRTUALENV)/bin/activate
+	cd .. && $(MK_DOCS_CMD) serve
+
+docs-build: ../$(PYTHON_VIRTUALENV)/bin/activate
+	cd .. && $(MK_DOCS_CMD) build
diff --git a/doc/README.md b/doc/README.md
index 38ad53a1b9..515208c81b 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,120 +1,259 @@
 <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
-# The Haskell Tool Stack
+# Welcome to Stack
 
-Welcome to the [Haskell](https://www.haskell.org/) programming language and the
-Haskell Tool Stack (Stack)! Stack is a program for developing Haskell projects.
-It is aimed at Haskellers both new and experienced. It is cross-platform and
-aims to support fully users on Linux, macOS and Windows.
+Welcome to the [Haskell](https://www.haskell.org/) programming language and
+Stack! Stack is an established program for developing Haskell projects.[^1] It
+is aimed at new and experienced users of Haskell and seeks to support them fully
+on Linux, macOS and Windows.
 
-<img src="https://i.imgur.com/WW69oTj.gif" width="50%" align="right">
+[^1]:
+    The project's first public commit was on 29 April 2015. It changed its name
+    to the Haskell Tool Stack on 18 May 2015. It is now widely known simply as
+    Stack.
 
-Stack features:
+Haskell code is compiled by the
+[Glasgow Haskell Compiler](https://www.haskell.org/ghc/) (GHC), which can also
+be used interactively.
 
-* Installing the [Glasgow Haskell Compiler (GHC)](https://www.haskell.org/ghc/)
-  automatically, in an isolated location.
+<img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/stack-welcome.gif" width="50%" align="right">
+
+Stack features include:
+
+* Installing GHC automatically.
 * Installing packages needed for your project.
 * Building your project.
 * Testing your project.
 * Benchmarking your project.
+* Using GHC interactively.
+
+Stack is used at the command line. You will need terminal software for your
+system (which will likely come with its operating system) and a program to edit
+code files. There are a number of freely-available and popular code editors that
+have Haskell extensions.
 
 ## How to install Stack
 
 Stack can be installed on most Unix-like operating systems (including macOS) and
-Windows.
+Windows. It will require at least about 5 GB of disk space, for use with one
+version of GHC.
 
-!!! info
+Stack can be installed directly or by using the GHCup tool.
 
-    In addition to the methods described below, Stack can also be installed
-    using the separate [GHCup](https://www.haskell.org/ghcup/) installer for
-    Haskell-related tools. GHCup provides Stack for some combinations of machine
-    architecture and operating system not provided elsewhere. By default, the
-    script to install GHCup (which can be run more than once) also configures
-    Stack so that if Stack needs a version of GHC, GHCup takes over obtaining
-    and installing that version.
+=== "Directly"
 
-=== "Unix-like"
+    Stack can be installed directly on various operating systems.
 
-    For most Unix-like operating systems, the easiest way to install Stack
-    directly is to command:
+    === "Linux"
 
-    ~~~text
-    curl -sSL https://get.haskellstack.org/ | sh
-    ~~~
+        For most Linux distributions, on x86_64 or AArch64 machine
+        architectures, the easiest way to install Stack is to command either:
 
-    or:
+        ~~~text
+        curl -sSL https://get.haskellstack.org/ | sh
+        ~~~
 
-    ~~~text
-    wget -qO- https://get.haskellstack.org/ | sh
-    ~~~
+        or:
 
-    !!! note
+        ~~~text
+        wget -qO- https://get.haskellstack.org/ | sh
+        ~~~
 
-        The script at [get.haskellstack.org](https://get.haskellstack.org/) will
-        ask for root access using `sudo`. It needs such access in order to use
-        your platform's package manager to install dependencies and to install
-        to `/usr/local/bin`. If you prefer more control, follow the manual
-        installation instructions in the
-        [install and upgrade guide](install_and_upgrade.md).
+        These commands download a script file and run it using `sh`.
 
-=== "Windows"
+        ??? question "Will the installation script need root access?"
 
-    On 64-bit Windows, the easiest way to install Stack directly is to download
-    and install the
-    [Windows installer](https://get.haskellstack.org/stable/windows-x86_64-installer.exe).
+            The script at [get.haskellstack.org](https://get.haskellstack.org/)
+            will ask for root access using `sudo`. It needs such access in order
+            to use your platform's package manager to install dependencies and
+            to install to `/usr/local/bin`. If you prefer more control, follow
+            the manual installation instructions in the guide to
+            [setting up](install_and_upgrade.md).
 
-    !!! note
+    === "macOS"
 
-        Systems with antivirus software may need to add Stack to the list of
-        'trusted' applications.
+        From late 2020, Apple began a transition from Mac computers with Intel
+        processors (Intel-based Mac) to
+        [Mac computers with Apple silicon](https://support.apple.com/en-gb/HT211814).
 
-=== "Other/direct downloads"
+        === "Intel-based"
 
-    For other operating systems and direct downloads, see the
-    [install and upgrade guide](install_and_upgrade.md).
+            For most Intel-based Mac computers, the easiest way to install Stack
+            is to command either:
 
-## How to upgrade Stack
+            ~~~text
+            curl -sSL https://get.haskellstack.org/ | sh
+            ~~~
 
-If Stack is already installed, you can upgrade it to the latest version by the
-command:
+            or:
 
-~~~text
-stack upgrade
-~~~
+            ~~~text
+            wget -qO- https://get.haskellstack.org/ | sh
+            ~~~
+
+            These commands download a script file and run it using `sh`.
+
+            ??? question "Will the installation script need root access?"
+
+                The script at
+                [get.haskellstack.org](https://get.haskellstack.org/) will ask
+                for root access using `sudo`. It needs such access in order
+                to use your platform's package manager to install dependencies
+                and to install to `/usr/local/bin`. If you prefer more control,
+                follow the manual installation instructions in the guide to
+                [setting up](install_and_upgrade.md).
+
+        === "Apple silicon"
+
+            Mac computers with Apple silicon have an M series chip. These chips
+            use an architecture known as ARM64 or AArch64.
+
+            For Mac computers with Apple silicon, the easiest way to install
+            Stack is to command either:
+
+            ~~~text
+            curl -sSL https://get.haskellstack.org/ | sh
+            ~~~
+
+            or:
+
+            ~~~text
+            wget -qO- https://get.haskellstack.org/ | sh
+            ~~~
+
+            These commands download a script file and run it using `sh`.
+
+            ??? question "Will the installation script need root access?"
+
+                The script at
+                [get.haskellstack.org](https://get.haskellstack.org/) will ask
+                for root access using `sudo`. It needs such access in order
+                to use your platform's package manager to install dependencies
+                and to install to `/usr/local/bin`. If you prefer more control,
+                follow the manual installation instructions in the guide to
+                [setting up](install_and_upgrade.md).
+
+    === "Windows"
+
+        Most machines using the Windows operating system have a x86_64
+        architecture. More recently, Microsoft has provided Windows on Arm that
+        runs on other processors.
+
+        === "x86_64"
+
+            On 64-bit Windows, the easiest way to install Stack is to download
+            and install the
+            [Windows installer](https://get.haskellstack.org/stable/windows-x86_64-installer.exe).
+
+            !!! info
+
+                By default, the Windows installer will set the
+                [Stack root](topics/stack_root.md) to `C:\sr`.
+
+            !!! note
+
+                Systems with antivirus software may need to add Stack to the
+                list of 'trusted' applications.
+
+            ??? warning "I have a Windows username with a space in it"
+
+                GHC 9.4.1 and later have a bug which means they do not work if
+                the path to the `ghc` executable has a space character in it.
+                The default location for Stack's 'programs' directory will have
+                a space in the path if the value of the `USERNAME` environment
+                variable includes a space.
+
+                A solution is to configure Stack to use a different location for
+                its 'programs' directory. For further information, see the
+                [`local-programs-path`](configure/yaml/non-project.md#local-programs-path)
+                non-project specific configuration option documentation.
+
+        === "Windows on Arm"
+
+            The GHC project does not yet provide a version of GHC that runs on
+            Windows on Arm.
+
+    === "Other/direct downloads"
+
+        For other operating systems and direct downloads see the guide to
+        [setting up](install_and_upgrade.md).
+
+=== "GHCup"
+
+    The separate [GHCup](https://www.haskell.org/ghcup/) project provides a tool
+    that can be used to install Stack and other Haskell-related tools, including
+    GHC and
+    [Haskell Language Server](https://github.com/haskell/haskell-language-server)
+    (HLS). HLS is a program that is used by Haskell extensions for popular code
+    editors.
+
+    GHCup provides Stack for some combinations of machine architecture and
+    operating system not provided elsewhere.
 
-!!! note
+    By default, the script to install GHCup (which can be run more than once)
+    also configures Stack so that if Stack needs a version of GHC, GHCup takes
+    over obtaining and installing that version.
 
-    If you used [GHCup](https://www.haskell.org/ghcup/) to install Stack, you
-    should also use GHCup, and not Stack, to upgrade Stack.
+??? question "How do I upgrade Stack?"
+
+    Follow the advice under [setting up](install_and_upgrade.md#upgrade-stack).
+
+??? question "How do I remove Stack?"
+
+    For information about how to uninstall Stack, command:
+
+    ~~~text
+    stack uninstall
+    ~~~
+
+    To uninstall Stack, it should be sufficient to delete:
+
+    1.  the Stack root directory (see `stack path --stack-root`, before you
+        uninstall);
+    2.  if different, the directory containing Stack's global configuration file
+        (see `stack path --global-config`, before you uninstall);
+    3.  on Windows, the directory containing Stack's tools (see
+        `stack path --programs`, before you uninstall), which is usually located
+        outside of the Stack root directory; and
+    4.  the `stack` executable file (see `which stack`, on Unix-like operating
+        systems, or `where.exe stack`, on Windows).
+
+    You may also want to delete ``.stack-work`` directories in any Haskell
+    projects that you have built using Stack.
 
 ## Quick Start guide
 
-For an immediate experience of using Stack to build an executable with Haskell,
-first you need to follow the [guide to install Stack](#how-to-install-Stack).
+Once Stack is installed, you can get an immediate experience of using it to
+build an executable with Haskell.
 
 ### Step 1: Start your new project
 
-To start a new project named `my-project`, issue these four commands in a
-terminal:
+A complex project can have more than one package and each package can have more
+than one executable (program). However, to start a new single-package project
+named `my-project`, issue these four commands in a terminal (click
+:material-plus-circle: to learn more about each command):
 
-~~~text
-stack new my-project
-cd my-project
-stack build
-stack exec my-project-exe
+~~~shell
+stack new my-project # (1)!
+cd my-project # (2)!
+stack build # (3)!
+stack exec my-project-exe # (4)!
 ~~~
 
-- The `stack new my-project` command will create a new directory, named
-  `my-project`. It contains all the files needed to start a project correctly,
-  using a default template.
-- The `cd my-project` command will change the current working directory to that
-  directory.
-- The `stack build` command will build the template project and create an
-  executable named `my-project-exe` (on Windows, `my-project-exe.exe`). First,
-  if necessary, Stack will download a version of GHC in an isolated location.
-  That won't interfere with other GHC installations on your system.
-- The `stack exec my-project-exe` command will run (execute) the built
-  executable, in Stack's environment.
+1.  Create a new directory named `my-project`. It contains all the files needed
+    to start a project correctly, using a default template.
+
+2.  Change the current working directory to `my-project`.
+
+3.  Build the template project and create an executable named `my-project-exe`.
+
+    First, if necessary, Stack will download a version of GHC in an isolated
+    location. That will not interfere with other GHC installations on your
+    system. (On Windows, if necessary, Stack will also download
+    [MSYS2](https://www.msys2.org/). MSYS2 is a project that provides popular
+    tools for developers on Windows.)
+
+4.  Run (execute) the built executable, in Stack's environment.
 
 For a complete list of Stack's commands, and flags and options common to those
 commands, simply command:
@@ -132,13 +271,11 @@ stack build --help
 
 If you want to launch a run-eval-print loop (REPL) environment, then command:
 
-~~~text
-stack repl
+~~~shell
+stack repl # (1)!
 ~~~
 
-!!! info
-
-    `stack ghci` can be used instead of `stack repl`. GHCi is GHC's REPL tool.
+1.  `stack ghci` can be used instead of `stack repl`. GHCi is GHC's REPL tool.
 
 People organise Haskell code into packages. If you want to use Stack to install
 an executable provided by a Haskell package, then all you have to do is command:
@@ -150,181 +287,145 @@ stack install <package-name>
 ### Step 2: Next steps
 
 The `stack new my-project` command in step one should have created the following
-files and directories (among others):
+files and directories, among others. Click :material-plus-circle: to learn more
+about each file:
 
-~~~text
+~~~shell
 .
 ├── app
-│   └── Main.hs
+│   └── Main.hs # (1)!
 ├── src
-│   └── Lib.hs
+│   └── Lib.hs # (2)!
 ├── test
-│   └── Spec.hs
-├── my-project.cabal
-├── package.yaml
-└── stack.yaml
+│   └── Spec.hs # (3)!
+├── my-project.cabal # (4)!
+├── package.yaml # (5)!
+└── stack.yaml # (6)!
 ~~~
 
-The Haskell source code for the executable (application) is in file `Main.hs`.
+1.  The Haskell source code for the executable (application).
+
+    As your project develops you can add further source code files to the `app`
+    directory.
 
-The executable uses a library. Its source code is in file `Lib.hs`.
+2.  The executable uses a library. The Haskell source code for the library.
 
-The contents of `my-project.cabal` describes the project's package. That file is
-generated by the contents of `package.yaml`.
+    As your project develops you can add further source code files to the `src`
+    directory.
 
-!!! info
+3.  The package has a test suite executable. The Haskell source code for the
+    test suite.
 
-    If you want, you can delete the `package.yaml` file and update the
-    `my-project.cabal` file directly. Stack will then use that file.
+    As your project develops you can add further source code files to the `test`
+    directory.
 
-The contents of `stack.yaml` describe Stack's own project-level configuration.
+4.  A file describing the package in the Cabal format, including other packages
+    on which depends. Stack generates it from the contents of the `package.yaml`
+    file.
 
-You can edit the source files in the `src` directory (used for the library) or
-the `app` directory (used for the executable (application)).
+    If the `package.yaml` file is deleted, Stack will use the Cabal file.
 
-As your project develops, you may need to depend on a library provided by
-another Haskell package. If you do, then add the name of that new package to the
-file `package.yaml`, in its `dependencies:` section.
+5.  A file describing the package in the Hpack format. Stack generates the
+    `my-project.cabal` file from its contents.
 
-!!! info
+    If you want, you can delete the file and update the Cabal file directly.
 
-    When you use `stack build` again, Stack will use `package.yaml` to create an
-    updated `my-project.cabal` for you.
+    As your project develops, you may need to depend on a library provided by
+    another Haskell package. If you do, add the name of that new package to
+    the `dependencies:` section.
 
-If Stack reports that the Stack configuration has no specified version for the
-new package, then follow Stack's likely recommended action to add a specific
-version of that package your project's `stack.yaml` file, in its `extra-deps:`
-section.
+6.  Stack's project-level configuration. This specifies a snapshot that, in
+    turn, specifies a version of GHC and a set of package versions chosen to
+    work well together. It also identifies the local packages in the project.
+
+    If you add a new package as a dependency in the package description, and
+    Stack reports that the Stack configuration has no specified version for it,
+    then follow Stack's likely recommended action to add a specific version to
+    the `extra-deps:` section.
 
 That was a really fast introduction on how to start to code in Haskell using
-Stack. If you want to go further, we highly recommend you read Stack's
-introductory [user's guide](GUIDE.md).
+Stack. If you want to go further, we recommend you read Stack's guide to
+[getting started](tutorial/index.md).
 
 ## Complete guide to Stack
 
-A complete [user's guide](GUIDE.md) to Stack is available, covering all of
-the most common ways to use Stack. Terms used in Stack's documentation are also
-explained in the [glossary](glossary.md).
+A complete guide to Stack is available, covering the most common ways to
+[use Stack](tutorial/index.md), its [commands](commands/index.md), its
+[configuration](configure/index.md), specific [topics](topics/index.md), and
+[frequently asked questions](faq.md). Terms used in Stack's documentation are
+also explained in the [glossary](glossary.md).
 
 ## Why Stack?
 
-Stack is a build tool for Haskell designed to answer the needs of Haskell users,
-both new and experienced. It has a strong focus on reproducible build plans,
-multi-package projects, and a consistent, easy-to-learn set of Stack commands.
-It also aims to provide the customizability and power that experienced
-developers need.
+Stack has a strong focus on plans for building that are reproducible; projects
+that have more than one package; and a consistent, easy-to-learn set of
+Stack commands. It also aims to provide the ability to customise and power that
+experienced developers need.
 
 Stack does not stand alone. It is built on the great work provided by:
 
-* The __Glasgow Haskell Compiler__ ([GHC](https://www.haskell.org/ghc/)), the
-  premier Haskell compiler. Stack will manage your GHC installations and
-  automatically select the appropriate version of GHC for your project.
-* The __Cabal build system__. Cabal is a specification for defining Haskell
-  packages and a [library](https://hackage.haskell.org/package/Cabal) for
-  performing builds.
+<div class="grid cards" markdown>
 
-    !!! info
+-   :fontawesome-solid-gears:{ .lg .middle } __Glasgow Haskell Compiler__
 
-        Cabal is also the name of another build tool, provided by the
-        `cabal-install` package. This guide distinguishes between them by Cabal
-        (the library) and Cabal (the tool).
+    The premier Haskell compiler. Stack will manage your GHC
+    installations and automatically select the appropriate version of GHC for
+    your project.
 
-* The __Hackage Haskell Package Repository__, a
-  [repository](https://hackage.haskell.org/) of Haskell packages providing
-  thousands of open source libraries and applications to help you get your work
-  done.
-* The __Stackage package collection__, sets of packages from Hackage that are
-  [curated](https://www.stackage.org/). That is, they are regularly tested for
-  compatibility. Stack defaults to using Stackage package sets to avoid
-  problems with incompatible dependencies.
+    ---
 
-Stack is provided by a team of volunteers and companies under the auspices of
-the [Commercial Haskell](http://commercialhaskell.com/) group. The project was
-spearheaded by [FP Complete](https://www.fpcomplete.com/) to answer the needs of
-commercial Haskell users. It has since become a thriving open source project
-meeting the needs of Haskell users of all stripes.
+    [:octicons-arrow-right-24: Learn more](https://www.haskell.org/ghc/)
 
-If you'd like to get involved with Stack, check out the
-[newcomer friendly](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3a%22newcomer+friendly%22)
-label on the GitHub issue tracker.
+-   :fontawesome-solid-trowel-bricks:{ .lg .middle } __Cabal build system__
 
-## Questions, feedback, and discussion
+    A specification for defining Haskell packages and a library for performing
+    builds.[^2]
 
-* For answers to frequently asked questions about Stack, please see the
-  [FAQ](faq.md).
-* For general questions, comments, feedback and support, please post to the
-  [Haskell Community](https://discourse.haskell.org/about).
-* For bugs, issues, or requests, please
-  [open an issue](https://github.com/commercialhaskell/stack/issues/new).
-* When using Stack Overflow, please use the
-  [haskell-stack](http://stackoverflow.com/questions/tagged/haskell-stack) tag.
+    [^2]:
+        Cabal is also the name of a tool used for building Haskell code,
+        provided by the `cabal-install` package. This guide distinguishes
+        between them by Cabal (the library) and Cabal (the tool).
 
-## How to contribute to the maintenance or development of Stack
+    ---
 
-The following assumes that you already have installed a version of Stack and the
-[Git application](https://git-scm.com/).
+    [:octicons-arrow-right-24: Learn more](https://hackage.haskell.org/package/Cabal)
 
-1.  Clone the `stack` repository from GitHub with the command:
+-   :octicons-database-24:{ .lg .middle } __Hackage__
 
-    ~~~text
-    git clone https://github.com/commercialhaskell/stack.git`
-    ~~~
+    A repository of Haskell packages providing thousands of open source
+    libraries and applications to help you get your work done.
 
-2.  Change the current working directory to the cloned `stack` directory with the
-    command:
-
-    ~~~text
-    cd stack
-    ~~~
+    ---
 
-3.  Build the `stack` executable using a preexisting installation of Stack with
-    the command:
+    [:octicons-arrow-right-24: Learn more](https://hackage.haskell.org/)
 
-    ~~~text
-    stack build
-    ~~~
+-   :fontawesome-solid-cubes-stacked:{ .lg .middle } __Stackage__
 
-4.  Once the `stack` executable has been built, check its version with the
-    command:
+    Sets of packages from Hackage that are chosen to work well together and
+    with a specific version of GHC.
 
-    ~~~text
-    stack exec -- stack --version
-    ~~~
+    ---
 
-    Make sure the version is the latest one.
+    [:octicons-arrow-right-24: Learn more](https://www.stackage.org/)
 
-5.  In the GitHub repository's issue tracker, look for issues tagged with
-    [newcomer friendly](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3a%22newcomer+friendly%22)
-    and
-    [awaiting pull request](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3A%22awaiting+pull+request%22)
-    labels.
+</div>
 
-If you need to check your changes quickly command:
-
-~~~text
-stack repl
-~~~
-
-and then, at the REPL's prompt, command:
-
-~~~text
-:main --stack-root=<path_to_root> --stack-yaml=<path_to_stack.yaml> <COMMAND>
-~~~
+Stack is provided by a team of volunteers and companies under the auspices of
+the [Commercial Haskell](http://commercialhaskell.com/) group. The project was
+originally spearheaded by [FP Complete](https://www.fpcomplete.com/) to answer
+the needs of commercial Haskell users. It has since become a thriving open
+source project meeting the needs of Haskell users of all types.
 
-This allows you to set a special Stack root (instead of the default Stack root)
-and to target your commands at a particular `stack.yaml` file instead of the one
-found in the current directory.
+## Questions?
 
-## How to uninstall
+For answers to frequently asked questions about Stack, please see the
+[FAQ](faq.md).
 
-To uninstall Stack, it should be sufficient to delete:
+For general questions please post to the
+[Haskell Community](https://discourse.haskell.org/about) forum.
 
-1. the Stack root folder (see `stack path --stack-root`, before you uninstall);
-2. on Windows, the folder containing Stack's tools (see `stack path --programs`,
-   before you uninstall), which is located outside of the Stack root folder; and
-3. the `stack` executable file (see `which stack`, on Unix-like operating
-   systems, or `where.exe stack`, on Windows).
+## Get involved!
 
-You may also want to delete ``.stack-work`` folders in any Haskell projects that
-you have built using Stack. The `stack uninstall` command provides information
-about how to uninstall Stack.
+Follow the advice under [get involved](community/index.md) for feedback and
+discussion about Stack, or if you want to know how to contribute to its
+maintenance or development.
diff --git a/doc/Stack_and_VS_Code.md b/doc/Stack_and_VS_Code.md
deleted file mode 100644
index 0743f490de..0000000000
--- a/doc/Stack_and_VS_Code.md
+++ /dev/null
@@ -1,133 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# Stack and Visual Studio Code
-
-[Visual Studio Code](https://code.visualstudio.com/) (VS Code) is a popular
-source code editor, and
-['Haskell'](https://marketplace.visualstudio.com/items?itemName=haskell.haskell)
-is an extension for VS Code that is popular with Haskell coders.
-
-The 'Haskell' extension can be used with Stack but there are some things to be
-aware of, set out below.
-
-## Haskell Language Server
-
-The VS Code extension makes use of the Haskell Language Server (HLS). To work,
-HLS has to be built with the same version of GHC that it will support. That is,
-a version of HLS is required for each version of GHC in use. It is possible that
-the most recent versions of GHC are not supported by HLS.
-
-By default, the VS Code extension uses tools that are in the PATH. However, the
-extension's settings (under 'Haskell: Manage HLS') allow a user to specify
-that the extension should use a separate application,
-[GHCup](https://www.haskell.org/ghcup/), to download and install the versions of
-HLS that it needs. GHCup can download and install things other than HLS,
-including GHC, MSYS2 (on Windows), Cabal (a build tool), and Stack itself. GHCup
-can also update itself. On Windows, GHCup has the capability of using the
-Stack-supplied MSYS2 rather than installing a duplicate copy. Cabal (the build
-tool), like Stack, depends on the Cabal (the library). Cabal (the tool), unlike
-Stack, does not have the capability to automatically install necessary versions
-of GHC, and (as well as supporting the extension) GHCup fills a important gap
-for users of the Cabal tool.
-
-If the VS Code extension is set not to use GHCup, its user needs to ensure that
-each version of HLS that the extension needs is on the PATH.
-
-For the most part, the versions of HLS provided by GHCup are built with the same
-versions of GHC that Stack downloads from its default `setup-info` dictionary
-(see [YAML configuration: setup-info](yaml_configuration.md)). Stack's default
-is to mirror the 'official' binary distributions published by GHC. However, in
-some cases, it is possible that a GHCup-supplied and GHCup-selected HLS has been
-built with a different binary distribution of GHC than the one which Stack has
-installed.
-
-One example of that occurred with the release of GHC 9.0.2. For some Linux users
-(Debian 9 and Fedora 27), the version of GHC 9.0.2 linked on GHC’s download
-[web page](https://www.haskell.org/ghc/download_ghc_9_0_2.html) was broken. The
-GHC developers made alternative ‘9.0.2a’ versions available. For a while, Stack
-referred to the versions published by GHC on its download web page while the
-GHCup-supplied versions of HLS were built using alternative versions. This
-incompatibility led to problems. It was resolved by Stack's default also being
-changed to refer to the '9.0.2a' versions. (Where Stack has already installed
-GHC 9.0.2, it is necessary to delete GHC 9.0.2 from the `stack path --programs`
-directory. This will cause Stack to reinstall the alternative version, when it
-first needs GHC 9.0.2. Stack should distinguish what it builds with the
-alternative from what it has built, and cached, with the original GHC 9.0.2.)
-
-### GHCup and Stack >= 2.9.1
-
-From Stack 2.9.1, GHCup can configure Stack so that if Stack needs a version of
-GHC, GHCup takes over obtaining and installing that version. By default, the
-script to install GHCup (which can be run more than once) configures Stack in
-that way. For further information about how GHCup configures Stack, see the GHC
-installation customisation
-[documentation](yaml_configuration.md#ghc-installation-customisation).
-
-### Workaround #1
-
-If GHCup does not configure Stack in the way described above, one workaround is
-to allow GHCup to install versions of GHC on the PATH and to cause Stack to use
-those versions of GHC, by making use of Stack's `install-ghc` option (which
-needs to be disabled) and Stack's `system-ghc` option (which needs to be
-enabled). For further information about these options, see the `install-ghc`
-[documentation](yaml_configuration.md#install-ghc) and the `system-ghc`
-[documentation](yaml_configuration.md#system-ghc).
-
-For this workaround to work, each time that a resolver is used that references a
-different version of GHC, then GHCup must be used to install it (if GHCup has
-not already installed that version). For example, to use `resolver: lts-19.16`
-(GHC 9.0.2), the command `ghcup install ghc 9.0.2` must have been used to
-install GHC 9.0.2. That may be a minor inconvenience for some people, as one the
-primary benefits of Stack over other Haskell build tools has been that Stack
-automatically ensures that the necessary version of GHC is available.
-
-### Workaround #2
-
-If GHCup does not configure Stack, another partial workaround is to install
-GHCup so that it is 'empty' except for the current version of HLS, allow the
-VS Code extension to use GHCup to manage HLS requirements only, and to ignore
-any messages (if any) from the extension on start-up that installation of GHC,
-Cabal (the tool) and/or Stack are also necessary (they are not, if only Stack is
-being used).
-
-For this workaround to work, however, there can be no differences between the
-version of GHC that the GHCup-supplied HLS was built with and the version that
-Stack has installed. A slight inconvenience here is also the possibility of
-false messages from the start-up that need to be ignored. In principle, those
-messages can be disabled by
-[setting the following](https://github.com/haskell/vscode-haskell#setting-a-specific-toolchain)
-for the VS Code extension:
-
-~~~yaml
-"haskell.toolchain": {
-  "ghc": null,
-  "cabal": null,
-  "stack": null
-}
-~~~
-
-To install a version of GHCup that is 'empty' is a little more complicated than
-a default installation of GHCup.
-
-On Unix-like operating systems, the following environment variable must be set
-before GHCup's installation `sh` script is run: `BOOTSTRAP_HASKELL_MINIMAL`.
-
-On Windows, the second argument to the PowerShell script must be set to
-`$false`, namely:
-
-    Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true,$false
-
-### Cradle
-
-HLS may need a 'cradle' - an
-[`hie.yaml` file](https://hackage.haskell.org/package/hie-bios#stack) - in the
-project's root directory in order to work well.
-
-The [`gen-hie` tool](https://hackage.haskell.org/package/implicit-hie) can help
-generate such a cradle.
-
-### Tips
-
-It has been suggested that a project must have been successfully built before
-the VS code extension (and HLS) is first activated on the project, for HLS to
-work reliably.
diff --git a/doc/build_command.md b/doc/build_command.md
deleted file mode 100644
index 2b5be01710..0000000000
--- a/doc/build_command.md
+++ /dev/null
@@ -1,354 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# Build command
-
-## Overview
-
-Stack's primary command is `build`. This page describes its interface. The goal
-of the interface is to do the right thing for simple input, and allow
-flexibility for more complicated goals.
-
-See the introductory part of Stack's
-[user's guide](GUIDE.md#the-stack-build-command) for an introduction to the
-command.
-
-## Synonyms
-
-The synonym commands for `build` are:
-
-|Synonym command|Equivalent `build` command flag|
-|---------------|-------------------------------|
-|`stack test`   |`stack build --test`           |
-|`stack bench`  |`stack build --bench`          |
-|`stack haddock`|`stack build --haddock`        |
-|`stack install`|`stack build --copy-bins`      |
-
-The advantage of the synonym commands is that they are convenient and short. The
-advantage of the flags is that they compose. For example,
-`stack build --test --copy-bins` will build libraries, executables, and test
-suites, run the test suites, and then copy the executables to your local bin
-path (more on this below).
-
-## Components
-
-Every Cabal package is made up of one or more components. It can have an
-optional library component, one or more optional executable components, one or
-more optional test suite components, and one or more optional benchmark
-components.
-
-Stack allows you to identify a specific component to be built. For example,
-`stack build mypackage:test:mytests` will build (and run - see further below)
-the `mytests` component of the `mypackage` package. `mytests` must be a test
-suite component.
-
-By default, if a test suite component is targeted, the component is built and
-run. The running behaviour can be disabled with the `--no-run-tests` flag.
-Similarly, if a benchmark component is targeted, it is built and run unless the
-running behaviour is disabled with the `--no-run-benchmarks` flag.
-
-This ability to specify a component applies only to a local package. With
-dependencies, Stack will *always* build the library (if present) and all
-executables (if any), and ignore test suites and benchmarks. If you want more
-control over a package, you must add it to your `packages` setting in your
-project-level configuration file (`stack.yaml`).
-
-## Target syntax
-
-`stack build` takes a list of one or more optional *targets* to be built. The
-supported syntaxes for targets are:
-
-*   *package*, e.g. `stack build foobar`, is the most commonly used target. It
-    will try to find the package in the following locations: local packages,
-    extra deps, snapshots, and package index (e.g. Hackage). If it's found in
-    the package index, then the latest version of that package from the index is
-    implicitly added to your extra dependencies.
-
-    If the package is a local package, the library and executable components are
-    selected to be built. If the `--test` and `--bench` flags are set, then all
-    of the test suite and benchmark components, respectively, are selected to be
-    built.
-
-*   *package identifier*, e.g. `stack build foobar-1.2.3`, is usually used to
-    include specific package versions from the package index. If the version
-    selected conflicts with an existing local package or extra dep, then Stack
-    fails with an error. Otherwise, this is the same as using
-    `stack build foobar`, except instead of using the latest version from the
-    package index, the version specified is used.
-
-*   *component*. Instead of referring to an entire package and letting Stack
-    decide which components to build, you select individual components from
-    inside a package. This can be done for more fine-grained control over which
-    test suites to run, or to have a faster compilation cycle. There are
-    multiple ways to refer to a specific component (provided for convenience):
-
-    *   `packagename:comptype:compname` is the most explicit. The available
-        comptypes are `exe`, `test`, and `bench`.
-
-        !!! note
-
-            When any `exe` component is specified, all of the package's
-            executable components will be built. This is due to limitations in
-            all currently released versions of Cabal. See
-            [issue#1046](https://github.com/commercialhaskell/stack/issues/1406)
-
-    *   `packagename:compname` allows you to leave out the component type, as
-         that will (almost?) always be redundant with the component name. For
-         example, `stack build mypackage:mytestsuite`.
-
-    *   `:compname` is a useful shortcut, saying "find the component in all of
-        the local packages." This will result in an error if multiple packages
-        have a component with the same name. To continue the above example,
-        `stack build :mytestsuite`.
-
-*   *directory*, e.g. `stack build foo/bar`, will find all local packages that
-    exist in the given directory hierarchy and then follow the same procedure as
-    passing in package names as mentioned above. There's an important caveat
-    here: if your directory name is parsed as one of the above target types, it
-    will be treated as that. Explicitly starting your target with `./` can be a
-    good way to avoid that, e.g. `stack build ./foo`.
-
-    !!! note
-
-        `stack build .` will target local packages in the current working
-        directory or its subdirectories.
-
-`stack build` with no targets specified will build all local packages.
-
-Command `stack ide targets` to get a list of the available targets in your
-project.
-
-## Controlling what gets built
-
-Stack will automatically build the necessary dependencies. See the introductory
-part of Stack's [user's guide](GUIDE.md#the-stack-build-command) for information
-about how these dependencies get specified.
-
-In addition to specifying targets, you can also control what gets built, or
-retained, with the following flags:
-
-### The `stack build --bench` flag
-
-Pass the flag to add benchmark components to the targets, if specific components
-are not identified.
-
-### The `stack build --dependencies-only` flag
-
-Pass the flag to skip building the targets. The flag `--only-dependencies` has
-the same effect.
-
-### The `stack build --[no-]dry-run` flag
-
-Default: Disabled
-
-Set the flag to build nothing and output information about the build plan.
-
-### The `stack build --flag` option
-
-`stack build --flag <package_name>:[-]<flag_name>` sets (or unsets) the
-specified Cabal flag for the specified package.
-
-This option can be specified multiple times to set (or unset) multiple Cabal
-flags.
-
-The same Cabal flag name can be set (or unset) for multiple packages (at the
-command line only) with:
-
-~~~text
-stack build --flag *:[-]<flag)name>
-~~~
-
-!!! note
-
-    Currently you needs to list all of your modules that interpret flags in the
-    `other-modules` section of a Cabal file. Cabal (the tool) has a different
-    behavior currently and doesn't require that the modules be listed. This may
-    change in a future release.
-
-### The `stack build --[no-]force-dirty` flag
-
-Default: Disabled
-
-Set the flag to force rebuild of packages even when it doesn't seem necessary
-based on file dirtiness.
-
-### The `stack build --[no-]haddock` flag
-
-Default: Disabled
-
-Set the flag to build Haddock documentation. This may cause a lot of packages to
-get re-built, so that the documentation links work.
-
-### The `stack build --[no-]keep-going` flag
-
-Default (`stack build`): Disabled
-
-Default (`stack test` or `stack bench`): Enabled
-
-Set the flag to continue building packages even after some build step fails.
-The packages which depend upon the failed build won't get built.
-
-### The `stack build --[no-]keep-tmp-files` flag
-
-Default: Disabled
-
-Set the flag to keep intermediate files and build directories that would
-otherwise be considered temporary and deleted. It may be useful to inspect
-these, if a build fails. By default, they are not kept.
-
-### The `stack build --only-configure` flag
-
-[:octicons-tag-24: 0.1.4.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.4.0)
-
-Pass the flag to perform only the configure step, not any builds. This is
-intended for tool usage. It may break when used on multiple packages at once.
-
-!!! note
-
-    If there are downstream actions that require a package to be built then a
-    full build will occur, even if the flag is passed.
-
-### The `stack build --only-dependencies` flag
-
-Pass the flag to skip building the targets. The flag `--dependencies-only` has
-the same effect.
-
-### The `stack build --only-snapshot` flag
-
-Pass the flag to build only snapshot dependencies, which are cached and shared
-with other projects.
-
-### The `stack build --[no-]reconfigure` flag
-
-Default: Disabled
-
-Set the flag to force reconfiguration even when it doesn't seem necessary based
-on file dirtiness. This is sometimes useful with custom `Setup.hs` files, in
-particular when they depend on external data files.
-
-### The `stack build --skip` option
-
-`stack build --skip <component>` skips building the specified components of a
-local package. It allows you to skip test suites and benchmark without
-specifying other components (e.g. `stack test --skip long-test-suite` will run
-the tests without the `long-test-suite` test suite). Be aware that skipping
-executables won't work the first time the package is built due to an issue in
-[Cabal](https://github.com/commercialhaskell/stack/issues/3229).
-
-This option can be specified multiple times to skip multiple components.
-
-### The `stack build --test` flag
-
-Pass the flag to add test suite components to the targets, if specific
-components are not identified.
-
-## Other flags and options
-
-There are a number of other flags accepted by `stack build`. Instead of listing
-all of them, please use `stack build --help`. Some particularly convenient ones
-worth mentioning here since they compose well with the rest of the build system
-as described:
-
-### The `stack build --coverage` flag
-
-Pass the flag to generate a code coverage report. For further information, see
-the [code coverage](coverage.md) documentation.
-
-### The `stack build --exec` option
-
-`stack build --exec "<command> [<arguments>]"` will run a command after a
-successful build.
-
-### The `stack build --file-watch` flag
-
-Pass the flag to rebuild your project every time a file changes. By default it
-will take into account all files belonging to the targets you specify. See also
-the `--watch-all` flag.
-
-### The `stack build --[no-]interleaved-output` flag
-
-[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
-
-Default: Enabled
-
-Set the flag for interleaved output. With interleaved output, each line of
-output from each package being built (targets and dependencies) is sent to the
-console as it happens and output relating to different packages can be
-interleaved. Each line will be prefixed with the name of the relevant package.
-The spacing between the prefix and the output will be set based on the longest
-relevant package name, so that the start of the output itself aligns. For
-example (extract):
-
-~~~text
-hpack            > build
-mustache         > configure
-hpack            > Preprocessing library for hpack-0.35.0..
-hpack            > Building library for hpack-0.35.0..
-mustache         > Configuring mustache-2.4.1...
-hpack            > [ 1 of 29] Compiling Data.Aeson.Config.Key
-hpack            > [ 2 of 29] Compiling Data.Aeson.Config.KeyMap
-mustache         > build
-hpack            > [ 3 of 29] Compiling Data.Aeson.Config.Util
-mustache         > Preprocessing library for mustache-2.4.1..
-mustache         > Building library for mustache-2.4.1..
-hpack            > [ 4 of 29] Compiling Hpack.Haskell
-hpack            > [ 5 of 29] Compiling Hpack.Utf8
-mustache         > [1 of 8] Compiling Paths_mustache
-hpack            > [ 6 of 29] Compiling Imports
-hpack            > [ 7 of 29] Compiling Hpack.Util
-mustache         > [2 of 8] Compiling Text.Mustache.Internal
-~~~
-
-Unset the flag for non-interleaved output. With non-interleaved output, the
-build output from GHC (as opposed to from Stack) in respect of dependencies is
-ignored. The behaviour then depends whether there is one target package or more
-than one. There can be one target if the project has a single package or if one
-package is targetted in a multi-package project (for example, using
-`stack build <package_name>`).
-
-* **One target package:** The build output for the target package is sent to the
-  console as it happens.
-
-* **More than one target package:** The build output from GHC (as opposed to
-  from Stack) for each target package is sent to a log file for that package,
-  unless an error occurs. At the end of the build, the location of the directory
-  containing the log files is reported. To also output the contents of the log
-  files to the console at the end of the build, use Stack's `dump-logs` option.
-  For further information about that option, see the
-  [YAML configuration](yaml_configuration.md#dump-logs) documentation. The
-  default `dump-logs` mode is to output the contents of the log files that are
-  warnings.
-
-### The `stack build --pedantic` flag
-
-Pass the flag to build your project with the GHC options `-Wall` and `-Werror`.
-`-Wall` turns on all warning options that indicate potentially suspicious code.
-`-Werror` makes any warning into a fatal error.
-
-### The `stack build --watch-all` flag
-
-Pass the flag to rebuild your project every time any local file changes (from
-project packages or from local dependencies). See also the `--file-watch` flag.
-
-## Composition
-
-To come back to the composable approach described above, consider this example
-(which uses the `wai` [repository](https://github.com/yesodweb/wai/)). The
-command:
-
-~~~text
-stack build --file-watch --test --copy-bins --haddock wai-extra :warp warp:doctest --exec 'echo Yay, it worked!'
-~~~
-
-will start Stack up in file watch mode, waiting for files in your project to
-change. When first starting, and each time a file changes, it will do all of the
-following.
-
-* Build the wai-extra package and its test suites
-* Build the `warp` executable
-* Build the warp package's doctest component (which, as you may guess, is a
-  test site)
-* Run all of the wai-extra package's test suite components and the doctest test
-  suite component
-* If all of that succeeds:
-    * Copy generated executables to the local bin path
-    * Run the command `echo Yay, it worked!`
diff --git a/doc/build_overview.md b/doc/build_overview.md
index 4582d62ab4..0795f4f9f6 100644
--- a/doc/build_overview.md
+++ b/doc/build_overview.md
@@ -52,19 +52,19 @@ Given these inputs, Stack attempts the following process when performing a build
 
 ## Find the `stack.yaml` file
 
-* Check for a `--stack-yaml` CLI arg, and use that
-* Check for a `STACK_YAML` env var
+* Check for a `--stack-yaml` or `-w` command line argument, and use that
+* Check for a `STACK_YAML` environment variable
 * Look for a `stack.yaml` in this directory or ancestor directories
 * Fall back to the default global project
 
 This file is parsed to provide the following config values:
 
-* `resolver` (required field)
-* `compiler` (optional field)
-* `packages` (optional field, defaults to `["."]`)
-* `extra-deps` (optional field, defaults to `[]`)
-* `flags` (optional field, defaults to `{}`)
-* `ghc-options` (optional field, defaults to `{}`)
+* `snapshot` (or, alternatively, `resolver` (deprecated)) (required key)
+* `compiler` (optional key)
+* `packages` (optional key, value defaults to `["."]`)
+* `extra-deps` (optional key, value defaults to `[]`)
+* `flags` (optional key, value defaults to `{}`)
+* `ghc-options` (optional key, value defaults to `{}`)
 
 `flags` and `ghc-options` break down into both _by name_ (applied to a
 specific package) and _general_ (general option `*` for flags is only available
@@ -72,16 +72,16 @@ in CLI).
 
 ## Wanted compiler, dependencies, and project packages
 
-* If the `--resolver` CLI is present, ignore the `resolver` and
-  `compiler` config values
-* Load up the snapshot indicated by the `resolver` (either config
-  value or CLI arg). This will provide:
+* If the `--snapshot` CLI is present, ignore the `snapshot` (or `resolver`
+  (deprecated)) and `compiler` config values
+* Load up the indicated snapshot (either config value or CLI arg). This will
+  provide:
     * A map from package name to package location, flags, GHC options,
       and if a package should be hidden. All package locations here
       are immutable.
     * A wanted compiler version, e.g. `ghc-8.6.5`
 * If the `--compiler` CLI arg is set, or the `compiler` config value
-  is set (and `--resolver` CLI arg is not set), ignore the wanted
+  is set (and `--snapshot` CLI arg is not set), ignore the wanted
   compiler from the snapshot and use the specified wanted compiler
 * Parse `extra-deps` into a `Map PackageName PackageLocation`,
   containing both mutable and immutable package locations. Parse
@@ -94,8 +94,8 @@ in CLI).
   snapshot packages that have been replaced.
 * Apply the `flags` and `ghc-options` by name to these packages overwriting
   any previous values coming from a snapshot. If any values are specified
-  but no matching package is found, it's an error. If a flag is not defined
-  in the corresponding package cabal file, it's an error.
+  but no matching package is found, it is an error. If a flag is not defined
+  in the corresponding package cabal file, it is an error.
 * We are now left with the following:
     * A wanted compiler version
     * A map from package name to immutable packages with package config (flags,
@@ -160,13 +160,13 @@ specific components).
 
 Named CLI flags are applied to specific packages by updating the
 config in one of the four maps. If a flag is specified and no package
-is found, it's an error. Note that flag settings are added _on top of_
+is found, it is an error. Note that flag settings are added _on top of_
 previous settings in this case, and does not replace them. That is, if
 previously we have `singleton (FlagName "foo") True` and now add
 `singleton (FlagName "bar") True`, both `foo` and `bar` will now be
 true. If any flags are specified but no matching package is found,
-it's an error. If a flag is not defined in the corresponding package
-cabal file, it's an error.
+it is an error. If a flag is not defined in the corresponding package
+Cabal file, it is an error.
 
 ## Apply CLI GHC options
 
@@ -182,7 +182,7 @@ project package which uses that flag name.
 
 General options are divided into the following categories:
 
-* `$locals` is deprecated, it's now a synonym for `$project`
+* `$locals` is deprecated, it is now a synonym for `$project`
 * `$project` applies to all project packages, not to any dependencies
 * `$targets` applies to all project packages that are targets, not to any
   dependencies or non-target project packages. This is the default option
@@ -199,9 +199,8 @@ they get prepended otherwise they get used as is.
 Use some deterministic binary serialization and SHA256 thereof to get
 a hash of the following information:
 
-* Actual compiler (GHC version, path, *FIXME* probably some other
-  unique info from GHC, I've heard that `ghc --info` gives you
-  something)
+* Actual compiler (GHC version, path, *FIXME* probably some other unique info
+  from GHC, I have heard that `ghc --info` gives you something)
 * Global database map
 * Immutable dependency map
 
@@ -230,12 +229,13 @@ installed in this database will never need to be rebuilt.
 * Apply flags, platform, and actual GHC version to resolve
   dependencies in any package analyzed
 * Include all library dependencies for all enabled components
-* Include all build tool dependencies for all enabled components
-  (using the fun backwards compat logic for `build-tools`)
+* Include all dependencies for tools used during building ('build tools') for
+  all enabled components (using the fun backwards compat logic for
+  `build-tools`)
 * Apply the logic recursively to come up with a full build plan
-* If a task depends exclusively on immutable packages, mark it as
-  immutable. Otherwise, it's mutable. The former go into the snapshot
-  database, the latter into the local database.
+* If a task depends exclusively on immutable packages, mark it as immutable.
+  Otherwise, it is mutable. The former go into the snapshot database, the latter
+  into the local database.
 
 We now have a set of tasks of packages/components to build, with full
 config information for each package, and dependencies that must be
@@ -243,9 +243,9 @@ built first.
 
 !!! bug "To do"
 
-    There's some logic to deal with cyclic dependencies between test suites and
+    There is some logic to deal with cyclic dependencies between test suites and
     benchmarks, where a task can be broken up into individual components versus
-    be kept as a single task. Need to document this better. Currently it's the
+    be kept as a single task. Need to document this better. Currently it is the
     "all in one" logic.
 
 ## Unregister local modified packages
@@ -268,7 +268,7 @@ built first.
 * If all good: do nothing
 * Otherwise, for immutable tasks: check the precompiled cache for an
   identical package installation (same GHC, dependencies, etc). If
-  present: copy that over, and we're done.
+  present: copy that over, and we are done.
 * Otherwise, perform the build, register, write to the Stack specific
   "is installed" stuff, and (for immutable tasks) register to the
   precompiled cache
diff --git a/doc/commands/bench_command.md b/doc/commands/bench_command.md
new file mode 100644
index 0000000000..e4b014b39e
--- /dev/null
+++ b/doc/commands/bench_command.md
@@ -0,0 +1,29 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack bench` command
+
+~~~text
+stack bench [TARGET] [--dry-run] [--pedantic] [--fast] [--ghc-options OPTIONS]
+            [--flag PACKAGE:[-]FLAG] [--dependencies-only | --only-snapshot |
+              --only-dependencies | --only-locals] [--file-watch |
+              --file-watch-poll] [--watch-all] [--exec COMMAND [ARGUMENT(S)]]
+            [--only-configure] [--trace] [--profile] [--no-strip]
+            [--[no-]library-profiling] [--[no-]executable-profiling]
+            [--[no-]library-stripping] [--[no-]executable-stripping]
+            [--[no-]haddock] [--haddock-arguments HADDOCK_ARGS]
+            [--[no-]open] [--[no-]haddock-deps] [--[no-]haddock-internal]
+            [--[no-]haddock-hyperlink-source] [--[no-]haddock-for-hackage]
+            [--[no-]copy-bins] [--[no-]copy-compiler-tool] [--[no-]prefetch]
+            [--[no-]keep-going] [--[no-]keep-tmp-files] [--[no-]force-dirty]
+            [--[no-]test] [--[no-]rerun-tests] [--ta|--test-arguments TEST_ARGS]
+            [--coverage] [--[no-]run-tests] [--test-suite-timeout SECONDS]
+            [--test-suite-timeout-grace SECONDS] [--[no-]tests-allow-stdin]
+            [--[no-]bench] [--ba|--benchmark-arguments BENCH_ARGS]
+            [--[no-]run-benchmarks] [--[no-]reconfigure]
+            [--cabal-verbosity VERBOSITY | --[no-]cabal-verbose]
+            [--[no-]split-objs] [--skip ARG] [--[no-]interleaved-output]
+            [--ddump-dir ARG]
+~~~
+
+`stack bench` is a synonym for `stack build --bench`. For further information,
+see the documentation for the [`stack build`](build_command.md) command.
diff --git a/doc/commands/build_command.md b/doc/commands/build_command.md
new file mode 100644
index 0000000000..54efdafe5e
--- /dev/null
+++ b/doc/commands/build_command.md
@@ -0,0 +1,1301 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack build` command and its synonyms
+
+~~~text
+stack build [TARGET] [--dry-run] [--pedantic] [--fast] [--ghc-options OPTIONS]
+            [--flag PACKAGE:[-]FLAG] [--dependencies-only | --only-snapshot |
+              --only-dependencies | --only-locals] [--file-watch |
+              --file-watch-poll] [--watch-all] [--exec COMMAND [ARGUMENT(S)]]
+            [--only-configure] [--[no-]semaphore] [--trace] [--profile]
+            [--no-strip] [--[no-]library-profiling]
+            [--[no-]executable-profiling] [--[no-]library-stripping]
+            [--[no-]executable-stripping] [--[no-]haddock]
+            [--haddock-arguments HADDOCK_ARGS] [--[no-]open]
+            [--[no-]haddock-deps] [--[no-]haddock-internal]
+            [--[no-]haddock-hyperlink-source] [--[no-]haddock-for-hackage]
+            [--[no-]copy-bins] [--[no-]copy-compiler-tool] [--[no-]prefetch]
+            [--[no-]keep-going] [--[no-]keep-tmp-files] [--[no-]force-dirty]
+            [--[no-]test] [--[no-]rerun-tests] [--ta|--test-arguments TEST_ARGS]
+            [--coverage] [--[no-]run-tests] [--test-suite-timeout SECONDS]
+            [--test-suite-timeout-grace SECONDS] [--[no-]tests-allow-stdin]
+            [--[no-]bench] [--ba|--benchmark-arguments BENCH_ARGS]
+            [--[no-]run-benchmarks] [--[no-]reconfigure]
+            [--cabal-verbosity VERBOSITY | --[no-]cabal-verbose]
+            [--[no-]split-objs] [--skip ARG] [--[no-]interleaved-output]
+            [--ddump-dir ARG]
+~~~
+
+`stack build` and its synonyms (`stack test`, `stack bench`, `stack haddock` and
+`stack install`) are Stack's primany command. The command provides a simple
+interface for simple tasks and flexibility for more complicated goals.
+
+See the introductory part of Stack's
+[user's guide](../tutorial/hello_world_example.md#the-stack-build-command) for
+an introduction to the command.
+
+## Synonyms
+
+The synonym commands for `stack build` are:
+
+|Synonym command|Equivalent `stack build` command flag|
+|---------------|-------------------------------------|
+|`stack test`   |`stack build --test`                 |
+|`stack bench`  |`stack build --bench`                |
+|`stack haddock`|`stack build --haddock`              |
+|`stack install`|`stack build --copy-bins`            |
+
+The advantage of the synonym commands is that they are convenient and short. The
+advantage of the flags is that they compose. See the examples below.
+
+## Components
+
+Every Cabal package is made up of one or more components. It can have an
+optional public library component, one or more optional executable components,
+one or more optional test suite components, and one or more optional benchmark
+components.
+
+Stack allows you to identify a specific component to be built. For example,
+`stack build mypackage:test:mytests` will build (and run - see further below)
+the `mytests` component of the `mypackage` package. `mytests` must be a test
+suite component.
+
+By default, if a test suite component is targeted, the component is built and
+run. The running behaviour can be disabled with the `--no-run-tests` flag.
+Similarly, if a benchmark component is targeted, it is built and run unless the
+running behaviour is disabled with the `--no-run-benchmarks` flag.
+
+This ability to specify a component applies only to a project package. With
+dependencies, Stack will *always* build the library (if present) and all
+executables (if any), and ignore test suites and benchmarks. If you want more
+control over a package, you must add it to your `packages` setting in your
+project-level configuration file (`stack.yaml`, by default).
+
+## Target syntax
+
+`stack build` takes a list of one or more optional *targets* to be built. The
+supported syntaxes for targets are as follows:
+
+* no targets specified
+* *package*
+* *package identifier*
+* project package *component*
+* *local directory*
+
+### No targets specified
+
+Example: `stack build`
+
+`stack build` with no targets specified will build all project packages.
+
+### Target: *package*
+
+Example: `stack build foobar`
+
+Stack will try to find the package in the following locations:
+
+* project packages,
+* extra-deps,
+* the snapshot, and
+* the package index (e.g. Hackage).
+
+If the package is found in the package index, then the latest version of that
+package from the index is implicitly added as an extra-dep.
+
+If the package is a project package, the library and executable components are
+selected to be built. If the `--test` and `--bench` flags are set, then all of
+the test suite and benchmark components, respectively, are selected to be built.
+
+If *package* is a GHC boot package (packages that come with GHC and are included
+in GHC's global package database), the behaviour can be complex:
+
+* If the boot package has not been 'replaced', then `stack build` will,
+  effectively, do nothing.
+
+* If the boot package has been 'replaced' then `stack build` will specify the
+  latest version of that package in the package index, which may differ from the
+  version provided by the version of GHC specified by the snapshot.
+
+A boot package will be treated as 'replaced' if the package is included directly
+in the Stackage snapshot or it depends on a package included directly in the
+snapshot.
+
+!!! note
+
+    Stackage snapshots are not expected to include directly any boot packages
+    but some such snapshots may include directly some boot packages. In
+    particular, some snapshots include directly `Win32` (which is a boot package
+    on Windows) while most do not.
+
+    For example, if `Cabal` (a boot package) is not a project package or an
+    extra-dep, then `stack build Cabal` with Stackage snapshot LTS Haskell 20.25
+    will:
+
+    *   on Windows, try to build the latest version of `Cabal` in the package
+        index (because that snapshot includes `Win32` directly, and `Cabal`
+        depends on `Win32` and so is treated as 'replaced'); and
+    *   on non-Windows, effectively, do nothing (because `Cabal` is not
+        'replaced').
+
+### Target: *package identifier*
+
+Example: `stack build foobar-1.2.3`
+
+If the package name is that of a project package, then Stack fails with an
+error.
+
+If the package version is an extra-dep or in the snapshot, then Stack will use
+that version.
+
+If the package version is in the package index (e.g. Hackage) then Stack will
+use the latest revision of that version from the package index.
+
+Otherwise, Stack will fail with an error.
+
+### Target: project package *component*
+
+Examples:
+
+* `stack build my-package:lib`
+* `stack build my-package:exe:my-executable`
+* `stack build my-package:test:my-test-suite`
+* `stack build my-package:bench:my-benchmark`
+* `stack build my-package:my-test-suite`
+* `stack build :my-test-suite`
+
+You can select individual components from inside a project package to be built.
+This can be done for more fine-grained control over which test suites to run, or
+to have a faster compilation cycle.
+
+There are multiple ways to refer to a specific component:
+
+*   `<package-name>:lib` or `<package-name>:<comp-type>:<comp-name>` (where the
+    component type, `<comp-type>`, is one of `exe`, `test`, or `bench`) is the
+    most explicit. The library component type (`lib`) does not have an
+    associated component name, `<comp-name>`.
+
+*   `<package-name>:<comp-name>` allows you to leave out the component type, as
+    that will often be unique for a given component name.
+
+*   `:<comp-name>` is a useful shortcut, saying "find the component`<comp-name>`
+    in all of the project packages". This will result in an error if more than
+    one package has a component with the specified name.
+
+For further information about available targets, see the
+[`stack ide targets` command](ide_command.md).
+
+### Target: *local directory*
+
+Examples:
+
+* `stack build foo/bar`
+* `stack build ./foo`
+* `stack build .`
+
+Stack will find all project packages that exist in the given directory hierarchy
+and then follow the same procedure as passing in package names as mentioned
+above.
+
+`stack build .` will target project packages in the current working directory or
+its subdirectories.
+
+!!! note
+
+    If the directory name is parsed as one of the other target types, it will
+    be treated as that. Explicitly starting the target with `./` can avoid that.
+    For example, `stack build ./foo`.
+
+## Controlling what gets built
+
+Stack will rebuild a targeted project package if it considers one or more of
+its files to be dirty.
+
+Stack will consider a package to be dirty if a file is added to the
+`extra-source-files` field of its Cabal file or the contents of an existing file
+listed in the `extra-source-files` field is changed.
+
+??? note "GHC's recompilation checker and Template Haskell"
+
+    GHC's recompilation checker (which is on by default) stops compilation early
+    if GHC can determine that a module does not need to be recompiled.
+
+    For modules that use Template Haskell, when the module is compiled, GHC can
+    determine dependencies, or be told about dependent files, of the code
+    inserted by the splice. (Instances of the `Quasi` class promise to provide
+    `qAddDependentFile`; see package `template-haskell`.)
+
+    However, GHC cannot be told of as yet *unknown* dependent files when a
+    module using Template Haskell is compiled. For example, this can affect the
+    `embedDir` function provided by package `file-embed`, when files are added
+    to the directory in question after the module is compiled. The resolution is
+    either to specify GHC's `-fforce-recomp` option (to turn off the
+    recompilation checker for the package) or to do a clean build.
+
+Stack will automatically build the necessary dependencies. See the introductory
+part of Stack's
+[user's guide](../tutorial/building_your_project.md#adding-dependencies) for
+information about how these dependencies get specified.
+
+If a package description specifies a custom build type, it must also specify a
+custom setup. That should list the dependencies needed to compile `Setup.hs`.
+Stack further customises the setup, using the `Cabal` package. If that package
+is not listed, Stack will warn and add the GHC boot package as a dependency.
+
+In addition to specifying targets, you can also control what gets built, or
+retained, with the flags and options listed below. You can also affect what gets
+built by specifying Cabal (the library) options for the configure step
+of the Cabal build process (for further information, see the documentation for
+the [configure-options](../configure/yaml/non-project.md#configure-options)
+configuration option).
+
+### `--[no-]allow-newer` flag
+
+[:octicons-tag-24: 3.1.1](https://github.com/commercialhaskell/stack/releases/tag/v3.1.1)
+
+Overrides: [`allow-newer`](../configure/yaml/non-project.md#allow-newer)
+non-project specific configuration option
+
+Pass the flag to enable or disable the ignoring of lower and upper version
+bounds in Cabal files.
+
+!!! warning
+
+    This command line flag is misnamed. It causes Stack to ignore all the
+    bounds in the relevant Cabal file(s), not only upper bounds. The name was
+    chosen to match the `--allow-newer` option introduced in `Cabal-1.20.0.0`.
+
+### `--bench` flag
+
+Pass the flag to add benchmark components to the targets, if specific components
+are not identified. The `stack bench` synonym sets this flag.
+
+### `--dependencies-only` flag
+
+Pass the flag to skip building the targets. The flag `--only-dependencies` has
+the same effect.
+
+### `--[no-]dry-run` flag
+
+Default: Disabled
+
+Set the flag to build nothing and output information about the build plan.
+
+### `--flag` option
+
+The option can be specified multiple times. It has two forms:
+
+* `--flag <package_name>:[-]<flag_name>`; and
+
+* `--flag *:[-]<flag_name>`.
+
+`stack build --flag <package_name>:[-]<flag_name>` sets (or unsets) the
+specified Cabal flag for the specified package. Stack will report an error if:
+
+* a package of that name is not known to Stack; or
+
+* a flag of that name is not a flag of that package.
+
+This overrides:
+
+* any Cabal flag specifications for the package in the snapshot;
+
+* any Cabal flag specifications for the package in Stack's project-level
+  configuration file (`stack.yaml`); and
+
+* any use of `--flag *` (see below).
+
+`stack build --flag *:[-]<flag_name>` sets (or unsets) the specified Cabal flag
+for all packages (project packages and dependencies) for which the flag is
+defined.
+
+This overrides:
+
+* any Cabal flag specifications for the relevant packages in the snapshot; and
+
+* any Cabal flag specifications for the relevant packages in Stack's
+  project-level configuration file (`stack.yaml`).
+
+!!! info
+
+    `flag *:[-]<flag_name> inspects the Cabal file of each package in the
+    snapshot. Consequently, its use will add a few seconds to the duration of
+    a build.
+
+!!! note
+
+    For a package included directly in the snapshot, if the Cabal flag
+    specifications differ from the Cabal flag specifications (if any) in the
+    snapshot, then the package will automatically be promoted to be an
+    [extra-dep](../configure/yaml/project.md#extra-deps).
+
+!!! note
+
+    In order to set a Cabal flag for a GHC boot package, the package must be
+    specified as an [extra-dep](../configure/yaml/project.md#extra-deps).
+
+### `--[no-]force-dirty` flag
+
+Default: Disabled
+
+A package that is unchanged from when it was last built by Stack is said to be
+_clean_ and _dirty_ means the opposite. Set the flag to force the rebuild of
+local packages ([project packages](../configure/yaml/project.md#packages) or
+local file path [extra-deps](../configure/yaml/project.md#extra-deps)) even when
+it does not seem necessary based on file cleanliness.
+
+!!! note
+
+    The flag `--force-dirty` has no effect if no local packages would be built.
+    Packages that Stack deems immutable (unchanging) cannot, in principle, be
+    dirty.
+
+    There may be circumstances in which you wish Stack to rebuild an installed
+    Haskell package (one registered in the relevant package database) that is
+    deemed immutable. For example, if it has a dependency on a C library that
+    has, in fact, changed since the package was registered. To cause Stack to
+    try to rebuild such a package, first unregister it from the package database
+    by commanding:
+
+    ~~~text
+    stack exec -- ghc-pkg unregister --force <package>
+    ~~~
+
+### `--[no-]haddock` flag
+
+Default: Disabled
+
+The [`stack haddock`](haddock_command.md) synonym sets this flag.
+
+Set the flag to build Haddock documentation. This may cause a lot of packages to
+get re-built, so that the documentation links work.
+
+Stack applies Haddock's `--gen-contents` and `--gen-index` flags to generate a
+single HTML contents and index for multiple sets of Haddock documentation.
+
+!!! warning
+
+    On Windows, the values for the `haddock-interfaces` and `haddock-html` keys
+    in the `*.conf` files for boot packages provided with certain versions of
+    GHC (in its `lib\package.conf.d` directory) can be corrupt and refer to
+    non-existent files and directories. For example, in the case of GHC 9.0.1
+    to GHC 9.8.1 the references are to
+    `${pkgroot}/../../docs/html/libraries/...` or
+    `${pkgroot}/../../doc/html/libraries/...` instead of
+    `${pkgroot}/../docs/html/libraries/...` or
+    `${pkgroot}/../doc/html/libraries/...`. Until those values are corrected,
+    Haddock documentation will be missing links to what those packages expose.
+
+### `--haddock-arguments` option
+
+When building Haddock documentation (see the
+[`--[no-]haddock`](#-no-haddock-flag) flag),
+`--haddock-arguments <haddock_argument(s)>` passes the specified arguments to
+the Haddock tool.
+
+Specified arguments are separated by spaces. Arguments can be unquoted (if they
+do not contain space or `"` characters) or quoted (`""`). Quoted arguments can
+include 'escaped' characters, escaped with an initial `\` character.
+
+!!! note
+
+    Haddock's `--latex` flag is incompatible with the Haddock flags used by
+    Stack to generate a single HTML contents and index.
+
+### `--[no-]haddock-deps` flag
+
+Default: Enabled (if building Haddock documentation)
+
+When building Haddock documentation (see the
+[`--[no-]haddock`](#-no-haddock-flag) flag), unset the flag to disable building
+documentation for dependencies.
+
+### `--[no-]haddock-for-hackage` flag
+
+:octicons-beaker-24: Experimental
+
+[:octicons-tag-24: 2.15.1](https://github.com/commercialhaskell/stack/releases/tag/v2.15.1)
+
+Default: Disabled
+
+When building Haddock documentation (see the
+[`--[no-]haddock`](#-no-haddock-flag) flag), set the flag to build project
+packages with flags to generate documentation suitable for upload to Hackage.
+The form of the documentation generated for other packages is unaffected.
+
+For each project package, the generated Haddock documentation files are in
+directory `doc\html\<package_version>-docs\`, relative to Stack's dist work
+directory (see [`stack path --dist-dir`](path_command.md)).
+
+Unless flags are set to exclude the building of project packages, for each
+targeted project package with generated documentation, an archive of the
+`<package_version>-docs` directory and its contents is in Stack's dist work
+directory. (The flags that exclude project packages are
+[`--only-dependencies`](#-only-dependencies-flag),
+[`--dependencies-only`](#-dependencies-only-flag), or
+[`--only-snapshot`](#-only-snapshot-flag).)
+
+If the flag is set:
+
+* the [`--[no-]haddock-hyperlink-source`](#-no-haddock-hyperlink-source-flag)
+  flag is ignored and `--haddock-hyperlink-source` is implied;
+* the [`--[no-]haddock-deps`](#-no-haddock-deps-flag) flag is ignored and the
+  default value for the flag is implied;
+* the [`--[no-]haddock-internal`](#-no-haddock-internal-flag) flag is
+  ignored and `--no-haddock-internal` is implied;
+* the [`--[no-]open`](#-no-open-flag) flag is ignored and `--no-open` is
+  implied; and
+* the [`--[no-]force-dirty`](#-no-force-dirty-flag) flag is ignored and
+  `--force-dirty` is implied.
+
+!!! info
+
+    Stack does not distinguish the building of Haddock documentation for Hackage
+    from the building of Haddock documentation generally, which is why the
+    `--force-dirty` flag is implied.
+
+!!! note
+
+    If set, Haddock will warn that `-source-*` options are ignored when
+    `--hyperlinked-source` is enabled. That is due to a known bug in Cabal
+    (the libiary).
+
+!!! note
+
+    If set, Cabal (the library) will report that documentation has been created
+    in `index.html` and `<package_name>.txt` files. Those files do not exist.
+    That false report is due to a known bug in Cabal (the library).
+
+### `--[no-]haddock-hyperlink-source` flag
+
+Default: Enabled (if building Haddock documentation)
+
+When building Haddock documentation (see the
+[`--[no-]haddock`](#-no-haddock-flag) flag), unset the flag to disable building
+documentation with hyperlinked sources.
+
+If the [`--haddock-for-hackage`](#-no-haddock-for-hackage-flag) flag is passed,
+this flag is ignored.
+
+### `--[no-]haddock-benchmarks` flag
+
+Default: Disabled
+
+When building Haddock documentation (see the
+[`--[no-]haddock`](#-no-haddock-flag) flag), set the flag to enable building
+documentation for benchmark components of packages.
+
+If the [`--haddock-for-hackage`](#-no-haddock-for-hackage-flag) flag is passed,
+this flag is ignored.
+
+!!! note
+
+    This feature is not supported by versions of Cabal (the library) provided
+    with GHC 9.2.8 and earlier.
+
+!!! warning
+
+    Due to a bug in versions of Cabal (the library) provided with GHC 9.8.2 and
+    earlier, if there is more than one executable (including test suites and
+    benchmarks) in a project package or more than one project package with an
+    executable, the Haddock documentation for the `Main` module of one
+    executable will overwrite the Haddock documentation for others.
+
+### `--[no-]haddock-executables` flag
+
+Default: Disabled
+
+When building Haddock documentation (see the
+[`--[no-]haddock`](#-no-haddock-flag) flag), set the flag to enable building
+documentation for executable components of packages.
+
+If the [`--haddock-for-hackage`](#-no-haddock-for-hackage-flag) flag is passed,
+this flag is ignored.
+
+!!! note
+
+    This feature is not supported by versions of Cabal (the library) provided
+    with GHC 9.2.8 and earlier.
+
+!!! warning
+
+    Due to a bug in versions of Cabal (the library) provided with GHC 9.8.2 and
+    earlier, if there is more than one executable (including test suites and
+    benchmarks) in a project package or more than one project package with an
+    executable, the Haddock documentation for the `Main` module of one
+    executable will overwrite the Haddock documentation for others.
+
+### `--[no-]haddock-internal` flag
+
+Default: Disabled
+
+When building Haddock documentation (see the
+[`--[no-]haddock`](#-no-haddock-flag) flag), set the flag to enable building
+documentation for internal modules.
+
+If the [`--haddock-for-hackage`](#-no-haddock-for-hackage-flag) flag is passed,
+this flag is ignored.
+
+### `--[no-]haddock-tests` flag
+
+Default: Disabled
+
+When building Haddock documentation (see the
+[`--[no-]haddock`](#-no-haddock-flag) flag), set the flag to enable building
+documentation for test suite components of packages.
+
+If the [`--haddock-for-hackage`](#-no-haddock-for-hackage-flag) flag is passed,
+this flag is ignored.
+
+!!! note
+
+    This feature is not supported by versions of Cabal (the library) provided
+    with GHC 9.2.8 and earlier.
+
+!!! warning
+
+    Due to a bug in versions of Cabal (the library) provided with GHC 9.8.2 and
+    earlier, if there is more than one executable (including test suites and
+    benchmarks) in a project package or more than one project package with an
+    executable, the Haddock documentation for the `Main` module of one
+    executable will overwrite the Haddock documentation for others.
+
+### `--[no-]keep-going` flag
+
+Default (`stack build`): Disabled
+
+Default (`stack test` or `stack bench`): Enabled
+
+Set the flag to continue building packages even after some build step fails.
+The packages which depend upon the failed build will not get built.
+
+### `--[no-]keep-tmp-files` flag
+
+Default: Disabled
+
+Set the flag to keep intermediate files and build directories that would
+otherwise be considered temporary and deleted. It may be useful to inspect
+these, if a build fails. By default, they are not kept.
+
+### `--only-configure` flag
+
+[:octicons-tag-24: 0.1.4.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.4.0)
+
+Pass the flag to perform only the configure step, not any builds. This is
+intended for tool usage. It may break when used on multiple packages at once.
+
+!!! note
+
+    If there are downstream actions that require a package to be built then a
+    full build will occur, even if the flag is passed.
+
+### `--only-dependencies` flag
+
+Pass the flag to skip building the targets. The flag `--dependencies-only` has
+the same effect.
+
+### `--only-locals` flag
+
+Pass the flag to build only packages in the local database. Fails if the build
+plan includes packages in the snapshot database.
+
+### `--only-snapshot` flag
+
+Pass the flag to build only snapshot dependencies, which are cached and shared
+with other projects.
+
+### `--[no-]reconfigure` flag
+
+Default: Disabled
+
+Set the flag to force reconfiguration even when it does not seem necessary based
+on file dirtiness. This is sometimes useful with custom `Setup.hs` files, in
+particular when they depend on external data files.
+
+### `--skip` option
+
+`stack build --skip <component>` skips building the specified components of a
+project package. It allows you to skip test suites and benchmark without
+specifying other components (e.g. `stack test --skip long-test-suite` will run
+the tests without the `long-test-suite` test suite). Be aware that skipping
+executables will not work the first time the package is built due to an issue in
+[Cabal](https://github.com/commercialhaskell/stack/issues/3229).
+
+This option can be specified multiple times to skip multiple components.
+
+### `--test` flag
+
+Pass the flag to add test suite components to the targets, if specific
+components are not identified. The `stack test` synonym sets this flag.
+
+## Controlling when building occurs
+
+### `--file-watch` flag
+
+Pass the flag to rebuild your project every time a file changes. By default it
+will take into account all files belonging to the targets you specify. See also
+the `--watch-all` flag.
+
+### `--file-watch-poll` flag
+
+Like the `--file-watch` flag, but based on polling the file system instead of
+using events to determine if a file has changed.
+
+### `--watch-all` flag
+
+[:octicons-tag-24: 2.5.1](https://github.com/commercialhaskell/stack/releases/tag/v2.5.1)
+
+Pass the flag to rebuild your project every time any local file changes (from
+project packages or from dependencies located locally). See also the
+`--file-watch` flag.
+
+## Controlling what happens after building
+
+### `--benchmark-arguments`, `--ba` option
+
+`stack build --bench --benchmark-arguments=<argument(s)>` will pass the
+specified argument, or arguments, to each benchmark when it is run.
+
+Specified arguments are separated by spaces. Arguments can be unquoted (if they
+do not contain space or `"` characters) or quoted (`""`). Quoted arguments can
+include 'escaped' characters, escaped with an initial `\` character.
+
+Account may need to be taken of the shell's approach to the processing of
+command line arguments:
+
+=== "Unix-like (Bash or Zsh)"
+
+    For example, to pass `word` and `words with spaces` in Bash, or Zsh:
+
+    `stack test --benchmark-arguments 'word "words with spaces"'`
+
+    The content of single quotes is taken literally, but cannot contain a single
+    quote.
+
+    For example, to pass `'a single quoted string'`:
+
+    In Bash, or Zsh (if `RC_QUOTES` option not set):
+
+    `stack bench --benchmark-arguments \"\''a single quoted string'\'\"`
+
+    Outside of single quotes, `\"` escapes a double quote and `\'` escapes a
+    single quote. The content of single quotes is taken literally, but cannot
+    contain a single quote.
+
+    In Zsh (if `RC_QUOTES` option set):
+
+    `stack bench --benchmark-arguments '"''a single quoted string''"'`
+
+    The content of single quotes is taken literally. Within single quotes, `''`
+    escapes a single quote.
+
+=== "Windows"
+
+    For example, to pass `word` and `words with spaces` in PowerShell:
+
+    `stack test --benchmark-arguments 'word "words with spaces"'`
+
+    The content of single quotes is taken literally.
+
+    For example, to pass `'a single quoted string'` in PowerShell:
+
+    `stack bench --benchmark-arguments '"''a single quoted string''"'`
+
+    The content of single quotes is taken literally. Within single quotes, `''`
+    escapes a single quote.
+
+!!! note "Runtime system (RTS) options"
+
+    RTS options must be quoted to prevent the RTS extracting them as its own
+    when the Stack executable is run.
+
+### `--exec` option
+
+`stack build --exec '<command> [<argument(s)>]'` will run the specified command
+after a successful build.
+
+Specified arguments are separated by spaces. Arguments can be unquoted (if they
+do not contain space or `"` characters) or quoted (`""`). Quoted arguments can
+include 'escaped' characters, escaped with an initial `\` character.
+
+Account may need to be taken of the shell's approach to the processing of
+command line arguments:
+
+=== "Unix-like (Bash or Zsh)"
+
+    For example, to pass `word` and `words with spaces` in Bash, or Zsh:
+
+    `stack build --exec '<command> word "words with spaces"'`
+
+    The content of single quotes is taken literally, but cannot contain a single
+    quote.
+
+    For example, to pass `'a single quoted string'`:
+
+    In Bash, or Zsh (if `RC_QUOTES` option not set):
+
+    `stack build --exec '<command> '\"\''a single quoted string'\'\"`
+
+    Outside of single quotes, `\"` escapes a double quote and `\'` escapes a
+    single quote. The content of single quotes is taken literally, but cannot
+    contain a single quote.
+
+    In Zsh (if `RC_QUOTES` option set):
+
+    `stack build --exec '<command> "''a single quoted string''"'`
+
+    The content of single quotes is taken literally. Within single quotes, `''`
+    escapes a single quote.
+
+=== "Windows"
+
+    For example, to pass `word` and `words with spaces` in PowerShell:
+
+    `stack build --exec '<command> word "words with spaces"'`
+
+    The content of single quotes is taken literally.
+
+    For example, to pass `'a single quoted string'` in PowerShell:
+
+    `stack build --exec '<command> "''a single quoted string''"'`
+
+    The content of single quotes is taken literally. Within single quotes, `''`
+    escapes a single quote.
+
+### `--[no-]rerun-tests` flag
+
+Default: Enabled
+
+Unset the flag to disable the automatic running of targeted test-suites that
+have already been successful.
+
+### `--[no-]run-benchmarks` flag
+
+Default: Enabled
+
+Unset the flag to disable the automatic running of targeted benchmarks.
+
+### `--[no-]run-tests` flag
+
+Default: Enabled
+
+Unset the flag to disable the automatic running of targeted test suites.
+
+### `--test-arguments`, `--ta` option
+
+`stack build --test --test-arguments=<argument(s)>` will pass the specified
+argument, or arguments, to each test when it is run. This option can be
+specified multiple times.
+
+Specified arguments are separated by spaces. Arguments can be unquoted (if they
+do not contain space or `"` characters) or quoted (`""`). Quoted arguments can
+include 'escaped' characters, escaped with an initial `\` character.
+
+Account may need to be taken of the shell's approach to the processing of
+command line arguments:
+
+=== "Unix-like (Bash or Zsh)"
+
+    For example, to pass `word` and `words with spaces` in Bash, or Zsh:
+
+    `stack test --test-arguments 'word "words with spaces"'`
+
+    The content of single quotes is taken literally, but cannot contain a single
+    quote.
+
+    For example, to pass `'a single quoted string'`:
+
+    In Bash, or Zsh (if `RC_QUOTES` option not set):
+
+    `stack test --test-arguments \"\''a single quoted string'\'\"`
+
+    Outside of single quotes, `\"` escapes a double quote and `\'` escapes a
+    single quote. The content of single quotes is taken literally, but cannot
+    contain a single quote.
+
+    In Zsh (if `RC_QUOTES` option set):
+
+    `stack bench --benchmark-arguments '"''a single quoted string''"'`
+
+    The content of single quotes is taken literally. Within single quotes, `''`
+    escapes a single quote.
+
+=== "Windows"
+
+    For example, to pass `word` and `words with spaces` in PowerShell:
+
+    `stack test --test-arguments 'word "words with spaces"'`
+
+    The content of single quotes is taken literally.
+
+    For example, to pass `'a single quoted string'` in PowerShell:
+
+    `stack test --test-arguments '"''a single quoted string''"'`
+
+    The content of single quotes is taken literally. Within single quotes, `''`
+    escapes a single quote.
+
+!!! note "Runtime system (RTS) options"
+
+    RTS options must be quoted to prevent the RTS extracting them as its own
+    when the Stack executable is run.
+
+### `--test-suite-timeout` option
+
+Default: None
+
+`stack build --test --test-suite-timeout=<seconds>` wraps each running test
+suite in a timeout so that the test suite fails if no result is available within
+the specified number of seconds. The option is ignored if the number of seconds
+is not positive.
+
+!!! note
+
+    The `--test-suite-timeout` option, in isolation, is not guaranteed to
+    terminate a timed-out test suite process. In that regard, see the
+    [`--test-suite-timeout-grace`](#-test-suite-timeout-option).
+
+### `--test-suite-timeout-grace` option
+
+Default: None
+
+`stack build --test --test-suite-timeout=<seconds> --test-suite-timeout-grace=<seconds>`
+uses staged timeout termination for each running test suite: if
+[`--test-suite-timeout`](#-test-suite-timeout-option) causes the test suite to
+fail, Stack requests the termination of the test suite process and waits the
+specified number of seconds as a grace period before termination of the
+process is forced. The option is ignored if the number of seconds is not
+positive.
+
+## Flags affecting GHC's behaviour
+
+### `--[no-]executable-profiling` flag
+
+Default: Disabled
+
+Set the flag to enable executable profiling for TARGETs and all its
+dependencies.
+
+The flag affects the location of the local project installation directory. See
+the [`stack path --local-install-root`](path_command.md) command.
+
+### `--[no-]executable-stripping` flag
+
+Default: Enabled
+
+Unset the flag to disable executable stripping for TARGETs and all its
+dependencies.
+
+The flag may affect the location of the local project installation directory.
+See the [`stack path --local-install-root`](path_command.md) command.
+
+### `--fast` flag
+
+GHC has many flags that specify individual optimisations of the compiler. GHC
+also uses its `-O*` flags to specify convenient 'packages' of GHC optimisation
+flags. GHC's flags are evaluated from left to right and later flags can override
+the effect of earlier ones.
+
+If no GHC `-O*` type flag is specified, GHC takes that to mean "Please
+compile quickly; I'm not over-bothered about compiled-code quality." GHC's `-O0`
+flag reverts to the same settings as if no `-O*` flags had been specified.
+
+Pass Stack's `--fast` flag to add `-O0` to the flags and options passed to GHC.
+The effect of `--fast` can be overriden with Stack's
+[`--ghc-options`](#-ghc-options-option) command line options.
+
+!!! note
+
+    With one exception, GHC's `-O` flag is always passed to GHC first (being
+    Cabal's default behaviour). The exception is if Cabal's
+    `--disable-optimization` flag or `--enable-optimization[=n]`, `-O[n]`
+    options are used during the configure step of the Cabal build process; see
+    Stack's
+    [`configure-options`](../configure/yaml/non-project.md#configure-options)
+    non-project specific configuration option.
+
+### `--ghc-options` option
+
+GHC command line options can be specified for a package in its Cabal file
+(including one created from a `package.yaml` file). This option augments and, if
+applicable (see below), overrides any such GHC command line options and those
+specified in Stack's configuration files - see the
+[`ghc-options`](../configure/yaml/non-project.md#ghc-options) non-project
+specific configuration option.
+
+`stack build --ghc-options <ghc_options>` passes the specified command line
+options to GHC, depending on Stack's
+[`apply-ghc-options`](../configure/yaml/non-project.md#apply-ghc-options)
+non-project specific configuration option. This option can be specified multiple
+times.
+
+GHC's command line options are _order-dependent_ and evaluated from left to
+right. Later options can override the effect of earlier ones. Any GHC command
+line options for a package specified at Stack's command line are applied after
+those specified in Stack's configuration files.
+
+### `--[no-]library-profiling` flag
+
+Default: Disabled
+
+Set the flag to enable library profiling for TARGETs and all its dependencies.
+
+The flag affects the location of the local project installation directory. See
+the [`stack path --local-install-root`](path_command.md) command.
+
+### `--[no-]library-stripping` flag
+
+Default: Enabled
+
+Unset the flag to disable library stripping for TARGETs and all its
+dependencies.
+
+The flag may affect the location of the local project installation directory.
+See the [`stack path --local-install-root`](path_command.md) command.
+
+### `--pedantic` flag
+
+Pass the flag to build your project with the GHC options `-Wall` and `-Werror`.
+`-Wall` turns on all warning options that indicate potentially suspicious code.
+`-Werror` makes any warning into a fatal error.
+
+### `--profile` flag
+
+Pass the flag to enable profiling in libraries, executables, etc. for all
+expressions, and generate a profiling report in tests or benchmarks.
+
+The flag affects the location of the local project installation directory. See
+the [`stack path --local-install-root`](path_command.md) command.
+
+### `--[no]-semaphore` flag
+
+:octicons-beaker-24: Experimental
+
+[:octicons-tag-24: 3.11.1](https://github.com/commercialhaskell/stack/releases/tag/v3.11.1)
+
+Default: Disabled
+
+This flag allows GHC to use a system semaphore to perform compilation in
+parallel when possible.
+
+!!! info
+
+    GHC 9.8.1 and later can act as a jobserver client, which enables two or more
+    GHC processes running at once to share system resources with each other,
+    communicating via a system semaphore. This GHC feature is supported by
+    Cabal 3.12.0.0 (a boot package of GHC 9.10.1) and later. The flag is ignored
+    with a warning when the feature is unsupported.
+
+!!! warning
+
+    On Linux, musl and non-musl system semaphores are incompatible. That means
+    that a Stack executable built on Alpine Linux (such as the official Stack
+    for Linux) creates system semaphores that cannot be used by a GHC executable
+    built on non-musl Linux distributions.
+
+### `--[no-]split-objs` flag
+
+:octicons-beaker-24: Experimental
+
+Default: Disabled
+
+Set the flag to enable the GHC option `-split-objs`. This will reduce output
+size (at the cost of build time).
+
+!!! note
+
+    The behaviour of this feature may be changed and improved. You will need to
+    clean your project's Stack working directory before use. If you want to
+    compile all dependencies with split-objs, you will need to delete the
+    snapshot (and all snapshots that could reference that snapshot).
+
+!!! note
+
+    GHC's `-split-objs` flag was deprecated in favour of `-split-sections` in
+    GHC 8.2.1 and was not supported by GHC on any platform from GHC 8.10.1.
+
+### `--no-strip` flag
+
+Pass the flag to disable DWARF debugging symbol stripping in libraries,
+executables, etc. for all expressions, producing larger executables but allowing
+the use of standard debuggers/profiling tools/other utilities that use debugging
+symbols.
+
+The flag affects the location of the local project installation directory. See
+the [`stack path --local-install-root`](path_command.md) command.
+
+### `--trace` flag
+
+Pass the flag to enable profiling in libraries, executables, etc. for all
+expressions, and generate a backtrace on exception.
+
+The flag affects the location of the local project installation directory. See
+the [`stack path --local-install-root`](path_command.md) command.
+
+## Flags affecting other tools' behaviour
+
+### `--PROG-option` options
+
+[:octicons-tag-24: 2.11.1](https://github.com/commercialhaskell/stack/releases/tag/v2.11.1)
+
+`PROG` is a program recognised by Cabal (the library) and one of `alex`, `ar`,
+`c2hs`, `cpphs`, `gcc`, `greencard`, `happy`, `hsc2hs`, `hscolour`, `ld`,
+`pkg-config`, `strip` and `tar`.
+
+`stack build --PROG-option <PROG_argument>` passes the specified command line
+argument to `PROG`, if it used by Cabal during the configuration step. This
+option can be specified multiple times. For example, if the program `happy` is
+used by Cabal during the configuration step, you could command
+`stack build --happy-option=--ghc` or `stack build --happy-option --ghc` to pass
+to `happy` its `--ghc` flag.
+
+By default, all and any `--PROG-option` options on Stack's command line are
+applied to all project packages (targets or otherwise). This behaviour can be
+changed. See the
+[`apply-prog-options`](../configure/yaml/non-project.md#apply-prog-options)
+configuration option.
+
+Stack can also be configured to pass Cabal's `--PROG-option`, `--PROG-options`
+or other options to Cabal during the configuration step. For further
+information, see the documentation for the
+[configure-options](../configure/yaml/non-project.md#configure-options)
+configuration option.
+
+## Flags relating to build outputs
+
+### `--[no]-cabal-verbose` flag
+
+Default: Disabled
+
+Set the flag to enable verbose output from Cabal (the library). This flag is an
+alternative to the `--cabal-verbosity` option.
+
+### `--[no]-cabal-verbosity` option
+
+`stack build --cabal-verbosity <verbosity_level>` sets the specified verbosity
+level for output from Cabal (the library). It accepts Cabal's numerical and
+extended syntax. This option is an alternative to setting the `--cabal-verbose`
+flag.
+
+### `--[no-]copy-bins` flag
+
+[:octicons-tag-24: 0.1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.3.0)
+
+Default: Disabled
+
+Set the flag to enable copying of built executable files (binaries) of targets
+to Stack's local binary directory (see `stack path --local-bin`). The
+`stack install` synonym sets this flag.
+
+### `--[no-]copy-compiler-tool` flag
+
+[:octicons-tag-24: 1.6.1](https://github.com/commercialhaskell/stack/releases/tag/v1.6.1)
+
+Default: Disabled
+
+Set the flag to enable copying of built executable files (binaries) of targets
+to Stack's
+[compiler tools directory](../topics/stack_root.md#compiler-tools-directory-optional)
+for the specified compiler version (see Stack's
+[`path --compiler-tools-bin` command](path_command.md)).
+
+### `--coverage` flag
+
+Pass the flag to generate a code coverage report. For further information, see
+the [code coverage](hpc_command.md) documentation.
+
+### `--ddump-dir` option
+
+GHC has a number of `ddump-*` flags and options to allow dumping out of
+intermediate structures produced by the compiler. They include the
+`-ddump-to-file` flag that causes the output from other flags to be dumped to a
+file or files.
+
+`stack build --ddump_dir <relative_directory>` causes Stack to copy `*.dump-*`
+files to subdirectories of the specified directory, which is relative to Stack's
+working directory for the project.
+
+For example:
+
+~~~text
+stack build --ghc-options "-ddump-to-file -ddump-timings" --ddump-dir my-ddump-dir
+~~~
+
+### `--[no-]interleaved-output` flag
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+Default: Enabled
+
+Set the flag for interleaved output. With interleaved output, each line of
+output from each package being built (targets and dependencies) is sent to the
+console as it happens and output relating to different packages can be
+interleaved. Each line will be prefixed with the name of the relevant package.
+The spacing between the prefix and the output will be set based on the longest
+relevant package name, so that the start of the output itself aligns. For
+example (extract):
+
+~~~text
+hpack            > build
+mustache         > configure
+hpack            > Preprocessing library for hpack-0.35.0..
+hpack            > Building library for hpack-0.35.0..
+mustache         > Configuring mustache-2.4.1...
+hpack            > [ 1 of 29] Compiling Data.Aeson.Config.Key
+hpack            > [ 2 of 29] Compiling Data.Aeson.Config.KeyMap
+mustache         > build
+hpack            > [ 3 of 29] Compiling Data.Aeson.Config.Util
+mustache         > Preprocessing library for mustache-2.4.1..
+mustache         > Building library for mustache-2.4.1..
+hpack            > [ 4 of 29] Compiling Hpack.Haskell
+hpack            > [ 5 of 29] Compiling Hpack.Utf8
+mustache         > [1 of 8] Compiling Paths_mustache
+hpack            > [ 6 of 29] Compiling Imports
+hpack            > [ 7 of 29] Compiling Hpack.Util
+mustache         > [2 of 8] Compiling Text.Mustache.Internal
+~~~
+
+Unset the flag for non-interleaved output. With non-interleaved output, the
+build output from GHC (as opposed to from Stack) in respect of dependencies is
+ignored. The behaviour then depends whether there is one target package or more
+than one. There can be one target if the project has a single package or if one
+package is targeted in a multi-package project (for example, using
+`stack build <package_name>`).
+
+* **One target package:** The build output for the target package is sent to the
+  standard error stream of the console as it happens.
+
+* **More than one target package:** The build output from GHC (as opposed to
+  from Stack) for each target package is sent to a log file for that package,
+  unless an error occurs that prevents that. If color in output is in use, there
+  will be two files, one with extension `.log` without color codes and one with
+  extension `.log-color` with color codes. At the end of the build, the location
+  of the directory containing the log files is reported. To also output the
+  contents of the log files to the standard error output stream of the console
+  at the end of the build, use Stack's `dump-logs` option. For further
+  information about that option, see the
+  [`dump-logs](../configure/yaml/non-project.md#dump-logs) non-project
+  specific configuration option documentation. The default `dump-logs` mode is
+  to output the contents of any log files that include GHC warnings.
+
+### `--[no]-open` flag
+
+Default: Disabled
+
+Set the flag to enable opening the local Haddock documentation in the browser.
+
+## Other flags and options
+
+### `--[no]-prefetch` flag
+
+Default: Disabled
+
+Set the flag to enable fetching packages necessary for the build immediately.
+This can be useful with `stack build --dry-run`.
+
+### `--progress-bar` option
+
+[:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
+
+Default: `capped`
+
+`stack build --progress-bar <format>` sets the format of the progress bar, where
+`<format>` is one of `none` (no bar), `count-only` (only the package count is
+displayed), `capped` (the bar showing package builds in progress is capped to a
+length equal to the terminal width), and `full` (the bar is uncapped). On
+terminals where 'backspace' has no effect if the cursor is in the first column,
+bars longer than the terminal width will not be 'sticky' at the bottom of the
+screen.
+
+### `--tests-allow-stdin` flag
+
+[:octicons-tag-24: 2.9.3](https://github.com/commercialhaskell/stack/releases/tag/v2.9.3)
+
+Default: Enabled
+
+Cabal defines a test suite interface
+['exitcode-stdio-1.0'](https://hackage.haskell.org/package/Cabal-syntax-3.8.1.0/docs/Distribution-Types-TestSuiteInterface.html#v:TestSuiteExeV1.0)
+where the test suite takes the form of an executable and the executable takes
+nothing on the standard input stream (`stdin`). Pass this flag to override that
+specification and allow the executable to receive input on that stream. If you
+pass `--no-tests-allow-stdin` and the executable seeks input on the standard
+input stream, an exception will be thrown.
+
+## Examples
+
+All the following examples assume that:
+
+*   if `stack build` is commanded outside of a project directory, there is no
+    `stack.yaml` file in the current directory or ancestor directory and,
+    consequently, the project-level configuration will be determined by a
+    `stack.yaml` file in the `global-project` directory in the
+    [Stack root](../topics/stack_root.md) (for further information, see the
+    [configuration](../configure/yaml/index.md) documentation); and
+
+*   if `stack build` is commanded in a project directory, there is a
+    `stack.yaml` file in that directory.
+
+Examples:
+
+*   In the project directory, `stack build --test --copy-bins` or, equivalently,
+    `stack test --copy-bins` or `stack install --test`, will build libraries,
+    executables, and test suites, run the test suites, and then copy the
+    executables to Stack's local binary directory (see
+    `stack path --local-bin`). This is an example of the flags composing.
+
+*   The following example uses a clone of the
+    `wai` [repository](https://github.com/yesodweb/wai/). The `wai` project
+    comprises a number of packages, including `wai-extra` and `warp`. In the
+    `wai` project directory, the command:
+
+    ~~~text
+    stack build --file-watch --test --copy-bins --haddock wai-extra :warp warp:doctest --exec 'echo Yay, it worked!'
+    ~~~
+
+    will start Stack up in file watch mode, waiting for files in your project to
+    change. When first starting, and each time a file changes, it will do all of
+    the following.
+
+    *   Build the `wai-extra` package and its test suites
+    *   Build the `warp` executable
+    *   Build the `warp` package's `doctest` component (which is a test site)
+    *   Run all of the `wai-extra` package's test suite components and the
+        `doctest` test suite component
+    *   If all of that succeeds:
+          * Copy generated executables to Stack's local binary directory (see
+            `stack path --local-bin`)
+          * Run the command `echo Yay, it worked!`
+
+*   The following example uses the `Adga` package and assumes that `Adga-2.6.3`
+    is the latest version in the package index (e.g. Hackage) and is not a
+    version in the snapshot specified by the `stack.yaml` in the
+    `global-project` directory in the Stack root.
+
+    Outside a project directory, `stack build Adga-2.6.3 --copy-bins` or,
+    equivalently, `stack install Agda-2.6.3`, will attempt to build the
+    libraries and executables of the identified version of the package in the
+    package index (using the `stack.yaml` file in the `global-project`
+    directory in the Stack root), and then copy the executables to Stack's local
+    binary directory (see `stack path --local-bin`).
+
+    If a different snapshot is required to build the identified version of the
+    package, then that can be specified at the command line. For example, to use
+    the most recent Stackage Nightly snapshot:
+
+    ~~~text
+    stack --snapshot nightly install Agda-2.8.0
+    ~~~
+
+    Alternatively, Stack can be used to unpack the package from the package
+    index into a local project directory named after the package identifier (for
+    further infomation, see the [`stack unpack` command](unpack_command.md)
+    documentation) and, if the package does not provide its own Stack
+    configuration file (`stack.yaml`, by default), to attempt to initialise that
+    configuration (for further information, see the
+    [`stack init` command](init_command.md) documentation). For example:
+
+    ~~~text
+    stack unpack Agda-2.6.3
+    cd Agda-2.6.3  # Change to the project directory
+    stack init     # Attempt to create a project stack.yaml file
+    stack install  # Equivalent to stack build --copy-bins
+    ~~~
diff --git a/doc/commands/clean_command.md b/doc/commands/clean_command.md
new file mode 100644
index 0000000000..f3f053c6a8
--- /dev/null
+++ b/doc/commands/clean_command.md
@@ -0,0 +1,30 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack clean` command
+
+Either
+
+~~~text
+stack clean [PACKAGE] [--[no-]omit-this]
+~~~
+
+or
+
+~~~text
+stack clean --full
+~~~
+
+`stack clean` deletes build artefacts for one or more project packages.
+
+By default:
+
+* all project packages are cleaned. Pass one or more project package names to
+  specify individual project packages; and
+
+* the `dist` directory and all of its subdirectories in the Stack work directory
+  for each relevant project package are deleted. Pass the flag `--omit-this` to
+  omit, from cleaning, the `dist` work directory (see `stack path --dist-dir`)
+  and its subdirectories currently in use.
+
+`stack clean --full` deletes the Stack work directories of the project and its
+project packages.
diff --git a/doc/commands/config_command.md b/doc/commands/config_command.md
new file mode 100644
index 0000000000..e181ded38d
--- /dev/null
+++ b/doc/commands/config_command.md
@@ -0,0 +1,216 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack config` commands
+
+~~~text
+stack config COMMAND
+
+Available commands:
+  build-files              Generate (when applicable) a Cabal file from a
+                           package description in the Hpack format and/or a lock
+                           file for Stack's project-level configuration.
+  compiler-tools-bin       Create (when applicable) the compiler tools
+                           directory for the specified compiler version (implies
+                           'config build-files').
+  env                      Print environment variables for use in a shell.
+  set                      Set a key in a configuration file to value.
+~~~
+
+The `stack config` commands provide assistance with accessing or modifying
+Stack's configuration. See `stack config` for the available commands.
+
+## The `stack config build-files` command
+
+~~~text
+stack config build-files
+~~~
+
+`stack config build-files` generates (when applicable):
+
+* a Cabal file from a package description in the Hpack format (`package.yaml`);
+  and/or
+
+* a [lock file](../topics/lock_files.md) for Stack's project-level
+  configuration (by default, `stack.yaml`);
+
+without taking any other build steps.
+
+## The `stack config compiler-tools` command
+
+[:octicons-tag-24: 3.11.1](https://github.com/commercialhaskell/stack/releases/tag/v3.11.1)
+
+~~~text
+stack config compiler-tools
+~~~
+
+`stack config compiler-tools` creates (when applicable) the
+[compiler tools directory](../topics/stack_root.md#compiler-tools-directory-optional)
+for the specified compiler version. Implies Stack's
+[`config build-files` command](#the-stack-config-build-files-command).
+
+## The `stack config env` command
+
+~~~text
+stack config env [--[no-]locals] [--[no-]ghc-package-path] [--[no-]stack-exe]
+                 [--[no-]locale-utf8] [--[no-]keep-ghc-rts]
+~~~
+
+`stack config env` outputs a script that sets or unsets environment variables
+for a [Stack environment](../topics/stack_environment.md). Flags modify the
+script that is output:
+
+* `--[no-]locals` (enabled by default) include/exclude project package
+  information
+* `--[no-]ghc-package-path` (enabled by default) set `GHC_PACKAGE_PATH`
+  environment variable or not
+* `--[no-]stack-exe` (enabled by default) set `STACK_EXE` environment variable
+  or not
+* `--[no-]locale-utf8` (disabled by default) set the `GHC_CHARENC`
+  environment variable to `UTF-8` or not
+* `--[no-]keep-ghc-rts` (enabled by default) keep/discard any `GHCRTS`
+  environment variable
+
+The command also accepts flags and options of the
+[`stack build`](build_command.md#flags-affecting-ghcs-behaviour) command that
+affect the location of the local project installation directory, such as
+`--profile` and `--no-strip`. For further information, see the documentation of
+the [project Stack work directory](../topics/stack_work.md).
+
+## The `stack config set` commands
+
+~~~text
+stack config set COMMAND
+
+Available commands:
+  install-ghc              Configure whether or not Stack should automatically
+                           install GHC when necessary.
+  install-msys             Configure whether or not Stack should automatically
+                           install MSYS2 when necessary.
+  package-index            Configure Stack's package index
+  recommend-stack-upgrade  Configure whether or not Stack should notify the user
+                           if it identifes a new version of Stack is available.
+  resolver                 Change the snapshot of the current project, using the
+                           (deprecated) resolver key.
+  snapshot                 Change the snapshot of the current project.
+  system-ghc               Configure whether or not Stack should use a system
+                           GHC installation.
+~~~
+
+The `stack config set` commands allow the values of keys in configuration files
+to be set. See `stack config set` for the available keys.
+
+!!! note
+
+    The `config set` commands support an existing key only in the form
+    `key: value` on a single line.
+
+!!! warning
+
+    The `config set` commands cannot add a new key to a configuration file that
+    uses [`!include`](../configure/yaml/include.md) directives. Stack will report
+    an error if it detects `!include` directives in the target configuration file
+    and the key being set is not already present. Existing keys can be modified
+    even in files that use `!include`.
+
+## The `stack config set install-ghc` command
+
+~~~text
+stack config set install-ghc [--global] true|false
+~~~
+
+`stack config set install-ghc true` or `false` sets the
+[`install-ghc`](../configure/yaml/non-project.md#install-ghc) non-project
+specific configuration option in a configuration file, accordingly. By default,
+the project-level configuration file (`stack.yaml`, by default) is altered. The
+`--global` flag specifies the user-specific global configuration file
+(`config.yaml`).
+
+## The `stack config set install-msys` command
+
+[:octicons-tag-24: 3.5.1](https://github.com/commercialhaskell/stack/releases/tag/v3.5.1)
+
+~~~text
+stack config set install-msys [--global] true|false
+~~~
+
+`stack config set install-msys true` or `false` sets the
+[`install-msys`](../configure/yaml/non-project.md#install-msys) non-project
+specific configuration option in a configuration file, accordingly. By default,
+the project-level configuration file (`stack.yaml`, by default) is altered. The
+`--global` flag specifies the user-specific global configuration file
+(`config.yaml`).
+
+## The `stack config set package-index download-prefix` command
+
+[:octicons-tag-24: 2.9.3](https://github.com/commercialhaskell/stack/releases/tag/v2.9.3)
+
+~~~text
+stack config set package-index download-prefix [--global] [URL]
+~~~
+
+`stack config set package-index download-prefix <url>` sets the
+`download-prefix` key of the
+[`package-index`](../configure/yaml/non-project.md#package-index) non-project
+specific configuration option in a configuration file, accordingly. By default,
+the project-level configuration file (`stack.yaml`, by default) is  altered. The
+`--global` flag specifies the user-specific global configuration  file
+(`config.yaml`).
+
+## The `stack config set recommend-stack-upgrade` command
+
+~~~text
+stack config set recommend-stack-upgrade [--project] true|false
+~~~
+
+`stack config set recommend-stack-upgrade true` or `false` sets the
+[`recommend-stack-upgrade`](../configure/yaml/non-project.md#recommend-stack-upgrade)
+non-project specific configuration option in a configuration file, accordingly.
+By default, the user-specific global configuration file (`config.yaml`) is
+altered. The `--project` flag specifies the project-level configuration file
+(`stack.yaml`, by default).
+
+## The `stack config set resolver` command
+
+~~~text
+stack config set resolver SNAPSHOT
+~~~
+
+A command corresponding to the
+[`stack config set snapshot` command](#the-stack-config-set-snapshot-command)
+but using the (deprecated) `resolver` key instead of the `snapshot` key.
+
+## The `stack config set snapshot` command
+
+[:octicons-tag-24: 2.15.1](https://github.com/commercialhaskell/stack/releases/tag/v2.15.1)
+
+~~~text
+stack config set snapshot SNAPSHOT
+~~~
+
+`stack config set snapshot <snapshot>` sets the
+[`snapshot`](../configure/yaml/project.md#snapshot) project-specific
+configuration option in the project-level configuration file (`stack.yaml`, by
+default) to the specified snapshot.
+
+A snapshot of `lts` or `nightly` will be translated into the most recent
+available. A snapshot of `lts-22` will be translated into the most recent
+available in the `lts-22` sequence.
+
+Snapshot values that are compiler versions, a URL or a local file path are also
+accepted.
+
+If a (deprecated) `resolver` key is present, it will be replaced by a `snapshot`
+key.
+
+## The `stack config set system-ghc` command
+
+~~~text
+stack config set system-ghc [--global] true|false
+~~~
+
+`stack config set system-ghc true` or `false` sets the
+[`system-ghc`](../configure/yaml/non-project.md#system-ghc) non-project
+specific configuration option in a configuration file, accordingly. By default,
+the project-level configuration file (`stack.yaml`, by default) is altered. The
+`--global` flag specifies the user-specific global configuration file
+(`config.yaml`).
diff --git a/doc/commands/docker_command.md b/doc/commands/docker_command.md
new file mode 100644
index 0000000000..9af4f4c8a8
--- /dev/null
+++ b/doc/commands/docker_command.md
@@ -0,0 +1,37 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack docker` commands
+
+~~~text
+stack docker COMMAND
+
+Available commands:
+  pull                     Pull latest version of Docker image from registry
+  reset                    Reset the Docker sandbox
+~~~
+
+Stack is able to build your code inside a Docker image, which means even more
+reproducibility to your builds, since you and the rest of your team will always
+have the same system libraries.
+
+For further information, see the
+[Docker integration](../topics/docker_integration.md) documentation.
+
+## The `stack docker pull` command
+
+~~~text
+stack docker pull
+~~~
+
+`stack docker pull` pulls the latest version of the Docker image from the
+registry.
+
+## The `stack docker reset` command
+
+~~~text
+stack docker reset [--keep-home]
+~~~
+
+`stack docker reset` resets the Docker sandbox.
+
+Pass the flag `--keep-home` to preserve the sandbox's home directory.
diff --git a/doc/commands/dot_command.md b/doc/commands/dot_command.md
new file mode 100644
index 0000000000..83975ff71a
--- /dev/null
+++ b/doc/commands/dot_command.md
@@ -0,0 +1,126 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack dot` command
+
+~~~text
+stack dot [--[no-]external] [--[no-]include-base] [--depth DEPTH]
+          [--prune PACKAGES] [--reach PACKAGES] [TARGET]
+          [--flag PACKAGE:[-]FLAG] [--test] [--bench] [--global-hints]
+~~~
+
+A package and its dependencies and the direct dependency relationships between
+them form a directed graph. [Graphviz](https://www.graphviz.org/) is open source
+software that visualises graphs. It provides the DOT language for defining
+graphs and the `dot` executable for drawing directed graphs. Graphviz is
+available to [download](https://www.graphviz.org/download/) for Linux, Windows,
+macOS and FreeBSD.
+
+`stack dot` produces output, to the standard output stream, in the DOT language
+to represent the relationships between your packages and their dependencies.
+
+By default:
+
+*   external dependencies are excluded from the output. Pass the flag
+    `--external` to include external dependencies;
+*   the `base` package and its dependencies are included in the output. Pass the
+    flag `--no-include-base` to exclude `base` and its dependencies;
+*   there is no limit to the depth of the resolution of dependencies. Pass the
+    `--depth <depth>` option to limit the depth;
+*   all relevant packages are included in the output. Pass the
+    `--prune <packages>` option to exclude the specified packages (including
+    project packages). Pass the `--reach <packages>` option to exclude packages
+    (including project packages) that cannot reach any of the specified packages
+    in the dependency graph. In both cases, `<packages>` is a list of package
+    names separated by commas;
+*   for all relevant project packages, relevant dependencies are included in the
+    output. However, each project package for which dependencies are included
+    can be specified as a target argument. The argument uses the same format as
+    the [`stack build` command](build_command.md) but components of project
+    packages are ignored. Non-project packages are also ignored;
+*   Cabal flags are as specified by the package description files and the
+    project-level configuration file (`stack.yaml`, by default). Pass the
+    option `--flag <package_name>:<flag_name>` or
+    `--flag <package_name>:-<flag_name>` to set or unset a Cabal flag. This
+    option can be specified multiple times;
+*   test components of project packages are excluded from the output. Pass the
+    flag `--test` to include test components;
+*   benchmark components of project packages are excluded from the output. Pass
+    the flag `--bench` to include benchmark components; and
+*   global packages for the specified version of GHC are those specified by the
+    global package database of an installed GHC. Pass the flag `--global-hints`
+    to use a hint file for global packages. If a hint file is used, GHC does not
+    need to be installed.
+
+All GHC wired-in packages are identified by a rectangular box.
+
+Nodes with no dependencies in the graph are given the maximum rank in the DOT
+language (that is, the `dot` executable will place those nodes on the bottom row
+of the diagram).
+
+## Examples
+
+The following examples are based on the package
+[`wreq-0.5.4.3`](https://hackage.haskell.org/package/wreq-0.5.4.3) and the boot
+packages of GHC 9.10.3. In each case, the output from `stack dot` is piped as an
+input into Graphviz's `dot` or `twopi` executables, and the executable produces
+output in the form of a SVG file named `wreq-example*.svg`.
+
+*   A simple example:
+
+    ~~~text
+    stack dot | dot -Tsvg -o wreq-example1.svg
+    ~~~
+
+    [![wreq-example1.svg](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example1.svg)](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example1.svg)
+
+*   Include external dependencies:
+
+    ~~~text
+    stack dot --external | dot -Tsvg -o wreq-example2.svg
+    ~~~
+
+    [![wreq-example2.svg](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example2.svg)](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example2.svg)
+
+*   Include external dependencies, limit the depth and save the output from
+    `stack dot` as an intermediate file (`wreq-example3.dot`).
+
+    ~~~text
+    stack dot --external --depth 2 > wreq-example3.dot
+    dot -Tsvg -o wreq-example3.svg wreq-example3.dot
+    ~~~
+
+*   Include external dependencies, exclude `base` and limit the depth:
+
+    ~~~text
+    stack dot --no-include-base --external --depth 2 | dot -Tsvg -o wreq-example4.svg
+    ~~~
+
+    [![wreq-example4.svg](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example4.svg)](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example4.svg)
+
+*   Include external dependencies and prune `base` and other packages:
+
+    ~~~text
+    stack dot --external --prune base,lens,wreq-examples,http-client,aeson,tls,http-client-tls,exceptions | dot -Tsvg -o wreq-example5.svg
+    ~~~
+
+    [![wreq-example5.svg](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example5.svg)](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example5.svg)
+
+*   Include external dependencies, prune `base` and other packages, and use a
+    different Graphviz executable to draw the graph:
+
+    Graphviz's `twopi` executable draws graphs in a radial layout.
+
+    ~~~text
+    stack dot --external --prune base,lens,wreq-examples,http-client,aeson,tls,http-client-tls,exceptions | twopi -Groot=wreq -Goverlap=false -Tsvg -o wreq-example6.svg
+    ~~~
+
+    [![wreq-example6.svg](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example6.svg)](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example6.svg)
+
+*   Include external dependencies and prune packages that cannot reach any of
+    `memory` and `basement` in the dependency graph:
+
+    ~~~text
+    stack dot --external --reach memory,basement | dot -Tsvg -o wreq-example7.svg
+    ~~~
+
+    [![wreq-example7.svg](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example7.svg)](https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/dot_command/wreq-example7.svg)
diff --git a/doc/commands/eval_command.md b/doc/commands/eval_command.md
new file mode 100644
index 0000000000..08a0ca09ca
--- /dev/null
+++ b/doc/commands/eval_command.md
@@ -0,0 +1,20 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack eval` command
+
+~~~text
+stack eval CODE [--[no-]ghc-package-path] [--[no-]stack-exe]
+           [--package PACKAGE] [--rts-options RTSFLAG] [--cwd DIR]
+~~~
+
+GHC has an
+[expression-evaluation mode](https://downloads.haskell.org/ghc/latest/docs/users_guide/using.html#eval-mode),
+set by passing the GHC option
+`-e <expression>`. Commanding `stack eval <code>` is equivalent to commanding:
+
+~~~text
+stack exec ghc -- -e <code>
+~~~
+
+For further information, see the [`stack exec` command](exec_command.md)
+documentation.
diff --git a/doc/commands/exec_command.md b/doc/commands/exec_command.md
new file mode 100644
index 0000000000..89931e2542
--- /dev/null
+++ b/doc/commands/exec_command.md
@@ -0,0 +1,77 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack exec` command
+
+~~~text
+stack exec COMMAND
+           [-- ARGUMENT(S) (e.g. stack exec ghc-pkg -- describe base)]
+           [--[no-]ghc-package-path] [--[no-]stack-exe] [--package PACKAGE]
+           [--rts-options RTSFLAG] [--cwd DIR]
+~~~
+
+`stack exec` executes the specified executable as a command in the
+[Stack environment](../topics/stack_environment.md). If an executable is not
+specified, the first argument after `--` is taken to be the executable.
+Otherwise, all arguments after `--` are taken to be command line arguments for
+the specified executable.
+
+By default:
+
+* the `GHC_PACKAGE_PATH` environment variable is set for the command's process.
+  Pass the flag `--no-ghc-package-path` to not set the environment variable;
+
+* if the operating system provides a reliable way to determine it and where a
+  result was available, the `STACK_EXE` environment variable is set to the path
+  to the current Stack executable for the command's process. Pass the flag
+  `--no-stack-exe` to not set the environment variable; and
+
+* the specified executable is executed in the current directory. Pass the option
+  `--cwd <directory>` to execute the executable in the specified directory.
+
+The option `--package <package>` has no effect for the `stack exec` command. For
+further information about its use, see the [`stack ghc` command](ghc_command.md)
+documentation or the [`stack runghc` command](runghc_command.md) documentation.
+
+Pass the option `--rts-option <rts_flag(s)>` to specify a GHC RTS flag or option.
+The option can be specified multiple times. All specified GHC RTS flags and
+options are added to the arguments for the specified executable between
+arguments `+RTS` and `-RTS`.
+
+Specified GHC RTS flags and options are separated by spaces. Items can be
+unquoted (if they do not contain space or `"` characters) or quoted (`""`).
+Quoted items can include 'escaped' characters, escaped with an initial `\`
+character.
+
+Account may need to be taken of the shell's approach to the processing of
+command line arguments. For example, to pass `'a single quoted string'`:
+
+=== "Unix-like (Bash or Zsh)"
+
+    In Bash, or Zsh (if `RC_QUOTES` option not set):
+
+    `stack exec <command> -- \''a single quoted string'\'`
+
+    Outside of single quotes, `\'` escapes a single quote. The content of single
+    quotes is taken literally, but cannot contain a single quote.
+
+    In Zsh (if `RC_QUOTES` option set):
+
+    `stack exec <command> -- '''a single quoted string'''`
+
+    The content of single quotes is taken literally. Within single quotes, `''`
+    escapes a single quote.
+
+=== "Windows"
+
+    In PowerShell:
+
+    `stack exec <command> -- '''a single quoted string'''`
+
+    The content of single quotes is taken literally. Within single quotes, `''`
+    escapes a single quote.
+
+The command also accepts flags and options of the
+[`stack build`](build_command.md#flags-affecting-ghcs-behaviour) command that
+affect the location of the local project installation directory, such as
+`--profile` and `--no-strip`. For further information, see the documentation of
+the [project Stack work directory](../topics/stack_work.md).
diff --git a/doc/commands/ghc_command.md b/doc/commands/ghc_command.md
new file mode 100644
index 0000000000..9ede8d4c8b
--- /dev/null
+++ b/doc/commands/ghc_command.md
@@ -0,0 +1,21 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack ghc` command
+
+~~~text
+stack ghc [-- ARGUMENT(S) (e.g. stack ghc -- X.hs -o x)]
+          [--[no-]ghc-package-path] [--[no-]stack-exe] [--package PACKAGE]
+          [--rts-options RTSFLAG] [--cwd DIR]
+~~~
+
+`stack ghc` has the same effect as, and is provided as a shorthand for,
+[`stack exec ghc`](exec_command.md), with the exception of the `--package`
+option.
+
+Pass the option `--package <package(s)>` to add the initial GHC argument
+`-package-id=<unit_id>`, where `<unit_id>` is the unit ID of the specified
+package in the installed package database. The option can be a list of package
+names or package identifiers separated by spaces. The option can also be
+specified multiple times. The approach taken to these packages is the same as if
+they were specified as targets to
+[`stack build`](build_command.md#target-syntax).
diff --git a/doc/commands/ghci_command.md b/doc/commands/ghci_command.md
new file mode 100644
index 0000000000..38dfb00c0c
--- /dev/null
+++ b/doc/commands/ghci_command.md
@@ -0,0 +1,165 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack ghci` and `stack repl` commands
+
+~~~text
+stack ghci [TARGET/FILE] [--pedantic] [--ghci-options OPTIONS]
+           [--ghc-options OPTIONS] [--flag PACKAGE:[-]FLAG] [--with-ghc GHC]
+           [--[no-]load] [--package PACKAGE] [--main-is TARGET]
+           [--load-local-deps] [--[no-]package-hiding] [--only-main] [--trace]
+           [--profile] [--no-strip] [--[no-]test] [--[no-]bench]
+~~~
+
+A read–evaluate–print loop (REPL) environment takes single user inputs, executes
+them, and returns the result to the user. GHCi is GHC's interactive environment.
+The `stack ghci` or `stack repl` commands, which are equivalent, allow you to
+load components and files of your project into GHCi.
+
+The command accepts the same TARGET syntax as
+[`stack build`](build_command.md#target-syntax). By default:
+
+* Stack loads up GHCi with all the library and executable components of all the
+  packages in the project. Pass the flag `--test` to include test suite
+  components (unlike `stack build`, test suites will not be run). Pass the flag
+  `--bench` to include benchmark components (unlike `stack build`, benchmarks
+  will not be run).
+
+It is also possible to specify a module source code file. For example:
+
+~~~text
+stack ghci src/MyFile.hs
+~~~
+
+Stack will identify which component the file is associated with, and use the
+options from that component.
+
+Pass the `--package` option to load GHCi with an additional package that is not
+a direct dependency of your components. This option can be specified multiple
+times.
+
+Pass the option `--flag <package_name>:<flag_name>` or
+`--flag <package_name:-<flag_name>` to set or unset a Cabal flag. This option
+can be specified multiple times. The same Cabal flag name can be set (or unset)
+for multiple packages with:
+
+~~~text
+--flag *:[-]<flag_name>
+~~~
+
+!!! note
+
+    In order to set a Cabal flag for a GHC boot package, the package must either
+    be an extra-dep or the package version must be specified with the
+    `--package` option.
+
+By default:
+
+*   Stack uses the GHC specified in Stack's configuration. Pass the `--with-ghc`
+    option with a file path to the executable to specify a different GHC
+    executable;
+
+*   Stack performs an inital build step. Pass the `--no-build` flag to skip the
+    step. Pass the `--ghc-options` option to pass flags or options to GHC. Pass
+    the `--profile`, `--no-strip`, `--trace` flags for the same behaviour as in
+    the case of the `stack build` command.
+
+    !!! info
+
+        Not performing the initial build step speeds up the startup of GHCi. It
+        only works if the dependencies of the loaded packages have already been
+        built.
+
+*   Stack runs GHCi via `ghc --interactive`. Pass the `--ghc-options` option to
+    pass flags or options to GHC (during the initial build step) and to GHCi.
+    Pass the `--pedantic` flag to pass the GHC options `-Wall` and `-Werror` to
+    GHCi (only). Pass the `--ghci-options` option to pass flags or options to
+    GHCi (only).
+
+*   Stack configures GHCi to hide unnecessary packages, unless no packages are
+    targeted and no additional packages are specified. Pass the
+    `--package-hiding` flag to hide unnecessary packages or
+    `--no-package-hiding` flag not to hide unnecessary packages.
+
+*   Stack loads and imports all of the modules for each target. Pass the
+    `--no-load` flag to skip the loading of modules. Pass the `--only-main` flag
+    to skip the loading of modules other than the main module. Pass the
+    `--load-local-deps` flag to include all local dependencies of targets.
+
+    !!! info
+
+        Not loading modules speeds up the startup of GHCi. Once in GHCi, you can
+        use `:load myModule` to load a specific module in your project.
+
+    !!! info
+
+        The `--only-main` flag can be useful if:
+
+        1.  You are loading the project in order to run it in GHCi (e.g. via
+            `main`), and you intend to reload while developing. Without flag,
+            you will need to quit and restart GHCi whenever a module gets
+            deleted. With the flag, reloading should work fine in this case.
+
+        2.  If many of your modules have exports named the same thing, then you 
+            will need to refer to them using qualified names. To avoid this,
+            use the `--only-main` flag to start with a blank slate and just
+            import the modules you are interested in.
+
+*   If there are multiple definitions for the `Main` module, Stack will ask you
+    to select one from a list of options. Pass the `--main-is <target>` option
+    to specify which `Main` module to load.
+
+Stack combines all of the GHC options of components.
+
+!!! note
+
+    Combining GHC options should work out when packages share similar
+    conventions. However, conflicts may arise, such as when one component
+    defines default extensions which are not assumed by another. For example,
+    specifying `NoImplicitPrelude` in one component but not another is likely to
+    cause failures. GHCi will be run with `-XNoImplicitPrelude`, but it is
+    likely that modules in the other component assume that the `Prelude` is
+    implicitly imported.
+
+`stack ghci` configures GHCi by using a GHCi script file. Such files are located
+in subdirectories of `<XDG_CACHE_HOME>/stack/ghci-script`, where
+`<XDG_CACHE_HOME>` refers to the
+[XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html)
+for user-specific non-essential (cached) data.
+
+=== "Unix-like"
+
+    The default for `<XDG_CACHE_HOME>` is `$HOME/.cache`.
+
+=== "Windows"
+
+     On Windows, the default for `<XDG_CACHE_HOME>` is `$Env:LOCALAPPDATA`.
+
+=== "Windows (Command Prompt)"
+
+     On Windows, the default for `<XDG_CACHE_HOME>` is `%LOCALAPPDATA%`.
+
+## Running plain GHCi
+
+`stack ghci` always runs GHCi configured to load code from packages in your
+project. In particular, this means it passes in flags like `-hide-all-packages`
+and `-package-id=` in order to configure which packages are visible to GHCi.
+
+For doing experiments which just involve packages installed in your databases,
+it may be useful to run GHCi plainly like:
+
+~~~text
+stack exec ghci
+~~~
+
+This will run a plain GHCi in an environment which includes `GHC_PACKAGE_PATH`,
+and so will have access to your databases.
+
+!!! note
+
+    Running `stack ghci` on a pristine copy of the code does not currently build
+    libraries
+    (issue [#2790](https://github.com/commercialhaskell/stack/issues/2790)) or
+    internal libraries
+    (issue [#4148](https://github.com/commercialhaskell/stack/issues/4148)). It
+    is recommended to always use `stack build` before using `stack ghci`, until
+    these two issues are closed.
diff --git a/doc/commands/haddock_command.md b/doc/commands/haddock_command.md
new file mode 100644
index 0000000000..519fa5a933
--- /dev/null
+++ b/doc/commands/haddock_command.md
@@ -0,0 +1,31 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack haddock` command
+
+~~~text
+stack haddock [TARGET] [--dry-run] [--pedantic] [--fast] [--ghc-options OPTIONS]
+              [--flag PACKAGE:[-]FLAG] [--dependencies-only | --only-snapshot |
+                --only-dependencies | --only-locals] [--file-watch |
+                --file-watch-poll] [--watch-all] [--exec COMMAND [ARGUMENT(S)]]
+              [--only-configure] [--trace] [--profile] [--no-strip]
+              [--[no-]library-profiling] [--[no-]executable-profiling]
+              [--[no-]library-stripping] [--[no-]executable-stripping]
+              [--[no-]haddock] [--haddock-arguments HADDOCK_ARGS]
+              [--[no-]open] [--[no-]haddock-deps] [--[no-]haddock-internal]
+              [--[no-]haddock-hyperlink-source] [--[no-]haddock-for-hackage]
+              [--[no-]copy-bins] [--[no-]copy-compiler-tool] [--[no-]prefetch]
+              [--[no-]keep-going] [--[no-]keep-tmp-files] [--[no-]force-dirty]
+              [--[no-]test] [--[no-]rerun-tests]
+              [--ta|--test-arguments TEST_ARGS] [--coverage] [--[no-]run-tests]
+              [--test-suite-timeout SECONDS]
+              [--test-suite-timeout-grace SECONDS] [--[no-]tests-allow-stdin]
+              [--[no-]bench] [--ba|--benchmark-arguments BENCH_ARGS]
+              [--[no-]run-benchmarks] [--[no-]reconfigure]
+              [--cabal-verbosity VERBOSITY | --[no-]cabal-verbose]
+              [--[no-]split-objs] [--skip ARG] [--[no-]interleaved-output]
+              [--ddump-dir ARG]
+~~~
+
+`stack haddock` is a synonym for `stack build --haddock`. For further
+information, see the documentation for the
+[`stack build`](build_command.md#-no-haddock-flag) command.
diff --git a/doc/commands/hoogle_command.md b/doc/commands/hoogle_command.md
new file mode 100644
index 0000000000..ff67e52232
--- /dev/null
+++ b/doc/commands/hoogle_command.md
@@ -0,0 +1,33 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack hoogle` command
+
+~~~text
+stack hoogle [-- ARGUMENT(S) (e.g. 'stack hoogle -- server --local')]
+             [--[no-]setup] [--rebuild] [--server]
+~~~
+
+Hoogle is a Haskell API search engine. `stack hoogle` runs Hoogle. Stack needs
+Hoogle version 5 or greater.
+
+Stack will use a Hoogle database (`database.hoo`) specific to the project's
+source map and the version of GHC, located in a subdirectory of subdirectory
+`hoogle` of Stack's work directory for the project.
+
+By default:
+
+*   if a `hoogle` executable is found on the `PATH`, Stack will try to use it.
+    Otherwise, Stack will try to identify an executable as a build target. If
+    the Hoogle database does not exist, Stack will generate it with
+    `hoogle generate --local`. `hoogle generate --local` queries `ghc-pkg` and
+    generates links for all packages which have documentation and Hoogle input
+    files (`*.txt`) generated. Pass the flag `--no-setup` to skip such setup;
+
+*   the existing Hoogle database is used. Pass the flag `--rebuild` to trigger
+    the generation of a new Hoogle database (generated as above); and
+
+*   `hoogle` is passed the specified arguments (if any). The arguments are
+    usually the subject of the search. Pass the flag `--server` to first pass
+    `server --local --port 8080` before those arguments.
+    `hoogle server --local --port 8080` starts a local Hoogle web server, using
+    port 8080, that allows the following of `file://` links.
diff --git a/doc/commands/hpc_command.md b/doc/commands/hpc_command.md
new file mode 100644
index 0000000000..a4948c083e
--- /dev/null
+++ b/doc/commands/hpc_command.md
@@ -0,0 +1,167 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack hpc` commands
+
+~~~text
+stack hpc COMMAND
+
+Available commands:
+  report                   Generate unified HPC coverage report from tix files
+                           and project targets
+~~~
+
+Code coverage is a measure of the degree to which the source code of a program
+is executed when a test suite is run.
+[Haskell Program Coverage (HPC)](https://ku-fpg.github.io/software/hpc/) is a
+code coverage tool for Haskell that is provided with GHC. Code coverage is
+enabled by passing the flag `--coverage` to `stack build`.
+
+`stack hpc` provides commands specific to HPC. Command `stack hpc` for the
+available commands.
+
+The following refers to the local HPC root directory. Its location can be
+obtained by command:
+
+~~~text
+stack path --local-hpc-root
+~~~
+
+## The `stack hpc report` command
+
+~~~text
+stack hpc report [TARGET_OR_TIX] [--all] [--destdir DIR] [--open]
+~~~
+
+The `stack hpc report` command generates a report for a selection of targets and
+`.tix` files.
+
+Pass the flag `--all` for a report that uses all stored results.
+
+Pass the flag `--open` to open the HTML report in your browser.
+
+## The `extra-tix-files` directory
+
+During the execution of the build, you can place additional tix files in the
+`extra-tix-files` subdirectory in the local HPC root directory, in order for
+them to be included in the unified report. A couple caveats:
+
+1.  These tix files must be generated by executables that are built against the
+    exact same library versions. Also note that, on subsequent builds with
+    coverage, the local HPC root directory will be recursively deleted. It
+    just stores the most recent coverage data.
+
+2.  These tix files will not be considered by `stack hpc report` unless listed
+    explicitly by file name.
+
+## Examples
+
+If we have three different packages with test suites, packages `A`, `B`, and
+`C`, the default unified report will have coverage from all three. If we want a
+unified report with just two, we can instead command:
+
+~~~text
+stack hpc report A B
+~~~
+
+This will output to the standard output stream a summary report for the combined
+coverage from `A` and `B`'s test suites. It will also log the path to the HTML
+for the corresponding full report.
+
+This command also supports taking extra `.tix` files.  If you have also built an
+executable, against exactly the same library versions of `A`, `B`, and `C`, then
+you could command the following:
+
+~~~text
+stack exec -- an-exe
+stack hpc report A B C an-exe.tix
+~~~
+
+or, equivalently:
+
+~~~text
+stack exec -- an-exe
+stack hpc report --all an-exe.tix
+~~~
+
+This report will consider all test results as well as the newly generated
+`an-exe.tix` file.
+
+## Usage
+
+`stack test --coverage` is quite streamlined for the following use-case:
+
+1.  You have test suites which exercise your project packages.
+
+2.  These test suites link against your library, rather than building the
+    library directly. Coverage information is only given for libraries, ignoring
+    the modules which get compiled directly into your executable. A common case
+    where this does not happen is when your test suite and library both have
+    something like `hs-source-dirs: src/`. In this case, when building your test
+    suite you may also be compiling your library, instead of just linking
+    against it.
+
+When your project has these properties, you will get the following:
+
+1.  Summary coverage reports, sent to the standard output stream in the build
+    output, and a log of the paths to the HTML for the corresponding full
+    reports.
+
+2.  A summary unified report, sent to the standard output stream, and a log of
+    the path to the HTML for the corresponding full report. These reports
+    consider the coverage on all local libraries, based on all of the tests that
+    were run.
+
+3.  An index of all generated HTML reports, in `index.html` in the local
+    HPC root directory, and a log of the path to the HTML for that index.
+
+## Implementation details
+
+Most users can get away with just understanding the above documentation.
+However, advanced users may want to understand exactly how `--coverage` works:
+
+1. The GHC option `-fhpc` gets passed to all project packages. This tells GHC to
+   output executables that track coverage information and output them to `.tix`
+   files. `the-exe-name.tix` files will get written to the working directory of
+   the executable.
+
+   When switching on this flag, it will usually cause all project packages to be
+   rebuilt (see issue
+   [#1940](https://github.com/commercialhaskell/stack/issues/1940)).
+
+2. Before the build runs with `--coverage`, the contents of the local HPC root
+   directory gets deleted. This prevents old reports from getting mixed
+   with new reports. If you want to preserve report information from multiple
+   runs, copy the contents of this path to a new directory.
+
+3. Before a test run, if a `test-name.tix` file exists in the package directory,
+   it will be deleted.
+
+4. After a test run, it will expect a `test-name.tix` file to exist. This file
+   will then get loaded, modified, and outputted to
+   `pkg-name/test-name/test-name.tix` in the local HPC root directory.
+
+   The `.tix` file gets modified to remove coverage file that is not associated
+   with a library. So, this means that you will not get coverage information for
+   the modules compiled in the `executable` or `test-suite` stanza of your Cabal
+   file. This makes it possible to directly union multiple `*.tix` files from
+   different executables (assuming they are using the exact same versions of the
+   project packages).
+
+   If there is enough popular demand, it may be possible in the future to give
+   coverage information for modules that are compiled directly into the
+   executable. See issue
+   [#1359](https://github.com/commercialhaskell/stack/issues/1359).
+
+5. Once we have a `.tix` file for a test, we also generate a summary report and
+   a corresponding full report using HTML. The summary report is sent to the
+   standard output stream. The index of the test-specific HTML report is
+   available at `pkg-name/test-name/index.html` in the local HPC root directory.
+
+6. After the build completes, if there are multiple output `*.tix` files, they
+   get combined into a unified report. The index of this report will be
+   available at `combined/all/index.html` in the local HPC root directory.
+
+7. Finally, an index of the resulting coverage reports is generated. It links to
+   the individual coverage reports (one for each test-suite), as well as the
+   unified report. This index is available at `index.html` in the local HPC root
+   directory.
diff --git a/doc/commands/ide_command.md b/doc/commands/ide_command.md
new file mode 100644
index 0000000000..3554b19704
--- /dev/null
+++ b/doc/commands/ide_command.md
@@ -0,0 +1,72 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack ide` commands
+
+~~~text
+stack ide COMMAND
+
+Available commands:
+  packages                 List all available local loadable packages
+  targets                  List all available Stack targets
+~~~
+
+The `stack ide` commands provide information that may be of use in an
+integrated development environment (IDE). See `stack ide` for the available
+commands.
+
+## The `stack ide packages` command
+
+~~~text
+stack ide packages [--stdout] [--cabal-files]
+~~~
+
+`stack ide packages` lists all available project packages that are loadable.
+
+By default:
+
+* its output is sent to the standard error stream. Pass the flag `--stdout` to
+  change to the standard output stream; and
+* the output is the package name (without its version). Pass the flag
+  `--cabal-files` to change to the full path to the package's Cabal file.
+
+## The `stack ide targets` command
+
+~~~text
+stack ide targets [--exes] [--tests] [--benchmarks] [--stdout]
+~~~
+
+`stack ide targets` lists all available Stack targets. Alternatively, pass one
+or more of the flags `--exes`, `--tests` and `--benchmarks` to list only targets
+of those component types.
+
+By default, its output is sent to the standard error stream. Pass the flag
+`--stdout` to change to the standard output stream.
+
+For example, for the Stack project itself, command:
+
+~~~text
+cd stack
+stack ide targets
+~~~
+
+and the output from the second command is:
+
+~~~text
+stack:lib
+stack:exe:stack
+stack:exe:stack-integration-test
+stack:test:stack-unit-test
+~~~
+
+or command:
+
+~~~text
+stack ide targets --exes
+~~~
+
+and the output is:
+
+~~~text
+stack:exe:stack
+stack:exe:stack-integration-test
+~~~
diff --git a/doc/commands/index.md b/doc/commands/index.md
new file mode 100644
index 0000000000..7963c83e7a
--- /dev/null
+++ b/doc/commands/index.md
@@ -0,0 +1,168 @@
+---
+title: Commands
+---
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Commands (advanced)
+
+Some of Stack's features will not be needed regularly or by all users. This part
+of the guide and the part on [configuration](../configure/index.md) provide
+information about some of those features, organised as a reference guide. Some
+of the features are complex and separate pages are dedicated to them.
+
+## stack command
+
+Stack is usually used with one of its commands (see further below). However:
+
+* `stack`, `stack --help` (or `-h`) lists Stack's commands, and flags and
+  options common to those commands;
+
+* `stack <command> --help` (or `-h`) — provides help on the particular Stack
+  command, including flags and options specific to the command; and
+
+* `stack --version` identifies the version and Git hash of the Stack executable.
+
+!!! info "Runtime system (RTS) options"
+
+    The Stack executable is built by GHC with the `-rtsopts=some` option. This
+    means that the RTS extracts command-line arguments bracketed between `+RTS`
+    and `-RTS` as its own when Stack is run. Only the following RTS
+    options are available:
+
+    *   `-?` (e.g. `stack +RTS -?`) causes the RTS to output information about
+        RTS options; and
+
+    *   `--info` (e.g. `stack +RTS --info`) causes the RTS to output information
+        about the RTS.
+
+    To avoid the RTS extracting such command-line arguments as its own when
+    using Stack commands such as [`exec`](exec_command.md),
+    [`test`](test_command.md) or [`bench`](bench_command.md), see the
+    documentation for those commands.
+
+## Stack commands (thematic)
+
+### Setting up
+
+* [`setup`](setup_command.md) - get GHC for a Stack project (usually not needed)
+* [`update`](update_command.md) - update the package index (usually not needed)
+* [`new`](new_command.md) - create a new project with Stack
+* [`init`](init_command.md) - initialise Stack's project-level YAML
+  configuration file for an existing project
+
+### Building
+
+* [`build`](build_command.md) - build packages
+* [`test`](build_command.md) - a synonym for `stack build --test`
+* [`bench`](build_command.md) - a synonym for `stack build --bench`
+* [`haddock`](build_command.md) - a synonym for `stack build --haddock`
+* [`install`](build_command.md) - a synonym for `stack build --copy-bins`
+* [`run`](run_command.md) - build and run an executable
+
+### Docker-related
+
+* [`docker`](docker_command.md) - use Stack with Docker
+
+### Executing in the Stack environment
+
+* [`exec`](exec_command.md) - executate a command in the
+  [Stack environment](../topics/stack_environment.md)
+* [`ghc`](ghc_command.md) - run `ghc`
+* [`eval`](eval_command.md) - evaluate some Haskell code inline
+* [`runghc`](runghc_command.md) - run `runghc`
+* [`runhaskell`](runghc_command.md) - a synonym for `stack runghc`
+
+### Using GHC interactively
+
+* [`ghci`](ghci_command.md) - run GHCi, a REPL environment
+* [`repl`](ghci_command.md) - a synonym for `stack ghci`
+
+### Down/up loading local packages from/to Hackage
+
+* [`unpack`](unpack_command.md) - unpack one or more packages locally
+* [`sdist`](sdist_command.md) - create an archive file for a package, in a form
+  accepted by Hackage
+* [`upload`](upload_command.md) - upload a package to Hackage
+
+### Cleaning-up
+
+* [`clean`](clean_command.md) - delete build artefacts for the project packages
+* [`purge`](purge_command.md) - delete the Stack working directories
+
+### Amending Stack's configuration files
+
+* [`config set`](config_command.md) - modify Stack's configuration
+
+### Using Haskell code as a script
+* [`script`](script_command.md) - run a Haskell source file as a script
+
+### Getting information
+
+* [`path`](path_command.md) - information about locations used by Stack
+* [`ls`](ls_command.md) - list information about Stack
+* [`list`](list_command.md) - list packages on Hackage or in a snapshot
+* [`ide`](ide_command.md) - information for an integrated development
+  environment (IDE)
+* [`query`](query_command.md) - information about the build
+* [`config env`](config_command.md) - modify Stack's configuration
+* [`templates`](templates_command.md) - information about templates for use with
+  `stack new`
+* [`uninstall`](uninstall_command.md) - information about how to uninstall Stack
+
+### Using tools in Stack's environment
+
+* [`hoogle`](hoogle_command.md) - run `hoogle`
+* [`dot`](dot_command.md) - dependency visualization
+* [`hpc`](hpc_command.md) - generate Haskell Program Coverage (HPC) code
+  coverage reports
+
+### Managing Stack versions
+
+* [`upgrade`](upgrade_command.md) - upgrade Stack
+
+## Stack commands (alphabetical)
+
+Stack's commands are listed below, in alphabetical order.
+
+* [`bench`](build_command.md) - a synonym for `stack build --bench`
+* [`build`](build_command.md) - build packages
+* [`clean`](clean_command.md) - delete build artefacts for the project packages
+* [`config`](config_command.md) - access and modify Stack's configuration
+* [`docker`](docker_command.md) - use Stack with Docker
+* [`dot`](dot_command.md) - dependency visualization
+* [`eval`](eval_command.md) - evaluate some Haskell code inline
+* [`exec`](exec_command.md) - executate a command in the
+  [Stack environment](../topics/stack_environment.md)
+* [`haddock`](build_command.md) - a synonym for `stack build --haddock`
+* [`hoogle`](hoogle_command.md) - run `hoogle`
+* [`hpc`](hpc_command.md) - generate Haskell Program Coverage (HPC) code
+  coverage reports
+* [`ghc`](ghc_command.md) - run `ghc`
+* [`ghci`](ghci_command.md) - run GHCi, a REPL environment
+* [`ide`](ide_command.md) - information for an integrated development
+  environment (IDE)
+* [`init`](init_command.md) - initialise Stack's project-level YAML
+  configuration file for an existing project
+* [`install`](build_command.md) - a synonym for `stack build --copy-bins`
+* [`list`](list_command.md) - list packages on Hackage or in a snapshot
+* [`ls`](ls_command.md) - list information about Stack
+* [`new`](new_command.md) - create a new project with Stack
+* [`path`](path_command.md) - information about locations used by Stack
+* [`purge`](purge_command.md) - delete the Stack working directories
+* [`query`](query_command.md) - information about the build
+* [`repl`](ghci_command.md) - a synonym for `stack ghci`
+* [`run`](run_command.md) - build and run an executable
+* [`runghc`](runghc_command.md) - run `runghc`
+* [`runhaskell`](runghc_command.md) - a synonym for `stack runghc`
+* [`script`](script_command.md) - run a Haskell source file as a script
+* [`sdist`](sdist_command.md) - create an archive file for a package, in a form
+  accepted by Hackage
+* [`setup`](setup_command.md) - get GHC for a Stack project
+* [`templates`](templates_command.md) - information about templates for use with
+  `stack new`
+* [`test`](build_command.md) - a synonym for `stack build --test`
+* [`uninstall`](uninstall_command.md) - information about how to uninstall Stack
+* [`unpack`](unpack_command.md) - unpack one or more packages locally
+* [`update`](update_command.md) - update the package index
+* [`upgrade`](upgrade_command.md) - upgrade Stack
+* [`upload`](upload_command.md) - upload a package to Hackage
diff --git a/doc/commands/init_command.md b/doc/commands/init_command.md
new file mode 100644
index 0000000000..cc5384be06
--- /dev/null
+++ b/doc/commands/init_command.md
@@ -0,0 +1,41 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack init` command
+
+~~~text
+stack init [DIR(S)] [--omit-packages] [--force] [--ignore-subdirs]
+~~~
+
+`stack init` initialises Stack's default project-level configuration file
+(`stack.yaml`) for an existing project, based on the Cabal file or
+`package.yaml` file for each of its packages.
+
+By default:
+
+* Stack searches for Cabal and `package.yaml` files in the current directory.
+  Specify one or more directories as arguments to cause Stack to search them;
+
+* Stack also searches for Cabal and `package.yaml` files in subdirectories. Pass
+  the flag `--ignore-subdirs` to ignore subdirectories;
+
+* Stack will not overwrite an existing `stack.yaml` file. Pass the flag
+  `--force` to allow overwriting; and
+
+* Stack will not initialise if there are conflicting or incompatable user
+  packages. Pass the flag `--omit-packages` to cause Stack to ignore such
+  matters while initialising.
+
+If a snapshot is specified at the command line, `stack init` will try to use it.
+For further information, see the documentation for the
+[`--snapshot`](../configure/global_flags.md#-snapshot-option) option.
+
+Otherwise, `stack init` will try to use the following Stackage snapshots in
+order of preference, using the first that is compatable: the most recent LTS
+Haskell, the most recent Stackage Nightly, and other LTS Haskell (most recent
+first).
+
+!!! note
+
+    If Cabal (the tool) has been used in the directory, consider commanding
+    `cabal clean` before applying `stack init`, in case Cabal has created any
+    unintended Cabal files.
diff --git a/doc/commands/install_command.md b/doc/commands/install_command.md
new file mode 100644
index 0000000000..6e73f574ae
--- /dev/null
+++ b/doc/commands/install_command.md
@@ -0,0 +1,31 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack install` command
+
+~~~text
+stack install [TARGET] [--dry-run] [--pedantic] [--fast] [--ghc-options OPTIONS]
+              [--flag PACKAGE:[-]FLAG] [--dependencies-only | --only-snapshot |
+                --only-dependencies | --only-locals] [--file-watch |
+                --file-watch-poll] [--watch-all] [--exec COMMAND [ARGUMENT(S)]]
+              [--only-configure] [--trace] [--profile] [--no-strip]
+              [--[no-]library-profiling] [--[no-]executable-profiling]
+              [--[no-]library-stripping] [--[no-]executable-stripping]
+              [--[no-]haddock] [--haddock-arguments HADDOCK_ARGS]
+              [--[no-]open] [--[no-]haddock-deps] [--[no-]haddock-internal]
+              [--[no-]haddock-hyperlink-source] [--[no-]haddock-for-hackage]
+              [--[no-]copy-bins] [--[no-]copy-compiler-tool] [--[no-]prefetch]
+              [--[no-]keep-going] [--[no-]keep-tmp-files] [--[no-]force-dirty]
+              [--[no-]test] [--[no-]rerun-tests]
+              [--ta|--test-arguments TEST_ARGS] [--coverage] [--[no-]run-tests]
+              [--test-suite-timeout SECONDS]
+              [--test-suite-timeout-grace SECONDS] [--[no-]tests-allow-stdin]
+              [--[no-]bench] [--ba|--benchmark-arguments BENCH_ARGS]
+              [--[no-]run-benchmarks] [--[no-]reconfigure]
+              [--cabal-verbosity VERBOSITY | --[no-]cabal-verbose]
+              [--[no-]split-objs] [--skip ARG] [--[no-]interleaved-output]
+              [--ddump-dir ARG]
+~~~
+
+`stack install` is a synonym for `stack build --copybins`. For further
+information, see the documentation for the [`stack build`](build_command.md)
+command.
diff --git a/doc/commands/list_command.md b/doc/commands/list_command.md
new file mode 100644
index 0000000000..aa1a2ca2a2
--- /dev/null
+++ b/doc/commands/list_command.md
@@ -0,0 +1,64 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack list` command
+
+[:octicons-tag-24: 2.7.1](https://github.com/commercialhaskell/stack/releases/tag/v2.7.1)
+
+~~~text
+stack list [PACKAGE]
+~~~
+
+`stack list <package_name>` will send to the standard output stream the latest
+version of the package from Hackage. If the package name cannot be found on
+Hackage, even after updating the package index, suggestions (not  necessarily
+good ones) will be made about the intended package name.
+
+`stack --snapshot <snapshot> list <package_name>` will send to the standard
+output stream the version of the package included in the specified snapshot
+(either directly or indirectly, if a boot package of the compiler specified by
+the snapshot). If the package name cannot be found in the snapshot, the command
+will fail, identifying only the package(s) that did not appear in the snapshot.
+
+More than one package name can be specified.
+
+`stack --snapshot <snapshot> list` will send to the standard output stream a
+list of all the packages included directly in the specified snapshot (that is,
+excluding those included only indirectly as a boot package of the compiler
+specified by the snapshot).
+
+For example:
+
+~~~text
+stack list base unix Win32 acme-missiles pantry
+base-4.21.0.0
+unix-2.8.6.0
+Win32-2.14.1.0
+acme-missiles-0.3
+pantry-0.10.1
+
+stack list paltry
+Could not find package paltry, updating
+...
+Package index cache populated
+Error: [S-4926]
+       * Could not find package paltry on Hackage. Perhaps you meant one of:
+         tasty, retry, path, pretty, pasty, xattr, alloy, para, pappy and
+         alure.
+
+stack --snapshot lts-24.55 list base unix Win32 acme-missiles pantry
+Error: [S-4926]
+       * Package does not appear in snapshot (directly or indirectly): acme-missiles.
+
+stack --snapshot lts-24.55 list base unix Win32 pantry
+base-4.20.2.0
+unix-2.8.7.0
+Win32-2.14.1.0
+pantry-0.10.1
+
+stack --snapshot lts-24.55 list
+AC-Angle-1.0
+ALUT-2.4.0.3
+...
+zot-0.0.3
+zstd-0.1.3.0
+~~~
diff --git a/doc/commands/ls_command.md b/doc/commands/ls_command.md
new file mode 100644
index 0000000000..b07a42e413
--- /dev/null
+++ b/doc/commands/ls_command.md
@@ -0,0 +1,284 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack ls` commands
+
+~~~text
+stack ls COMMAND
+
+Available commands:
+  dependencies             View the dependencies
+  globals                  View global packages
+  snapshots                View snapshots (local by default)
+  stack-colors             View Stack's output styles
+  stack-colours            View Stack's output styles (alias for 'stack-colors')
+  tools                    View Stack's installed tools
+~~~
+
+The `stack ls` commands list different types of information. Command `stack ls`
+for the available commands.
+
+## The `stack ls dependencies` command
+
+Either
+
+~~~text
+stack ls dependencies COMMAND
+
+Available commands:
+  cabal                    Print dependencies as exact Cabal constraints
+  json                     Print dependencies as JSON
+  text                     Print dependencies as text (default)
+  tree                     Print dependencies as tree
+~~~
+
+or
+
+~~~text
+stack ls dependencies [--[no-]license] [--separator SEP] [--query ITEM]
+                      [--filter ITEM] [--[no-]external] [--[no-]include-base]
+                      [--depth DEPTH] [--prune PACKAGES] [TARGET]
+                      [--flag PACKAGE:[-]FLAG] [--test] [--bench]
+                      [--global-hints]
+~~~
+
+`stack ls dependencies` lists package versions used for a project.
+
+By default:
+
+*   with the `text` or `tree` subcommand (see below), the package name is
+    followed by its version. Pass the `--license` flag to follow the package
+    name with its licence. (Consistent with the Cabal package description format
+    specification, only the American English spelling (license) is accepted.)
+*   With the `text` or `tree` subcommand, the separator between the package name
+    and what follows is a space character. Pass the `--separator` option to
+    specify a different separator;
+*   with the `text` command, all relevant package names are included. Pass the
+    `--query` option to specify an item to be retained in the results, if
+    present. Pass the `--filter` option to specify an item to be filtered out
+    from the results, if present. In both cases, an item is either a package
+    name or `$locals` for all project packages. In both cases, the option can be
+    specified multiple times. If the `--query` option is used, all non-retained
+    items are filtered out from the results;
+
+    !!! note
+
+        The special value `$locals` will need to be enclosed with single quotes
+        to distinguish it from a shell variable.
+
+*   external dependencies are excluded from the output. Pass the flag
+    `--external` to include external dependencies;
+*   the `base` package and its dependencies are included in the output. Pass the
+    flag `--no-include-base` to exclude `base` and its dependencies;
+*   there is no limit to the depth of the resolution of dependencies. Pass the
+    `--depth <depth>` option to limit the depth;
+*   all relevant packages are included in the output. Pass the
+    `--prune <packages>` option to exclude the specified packages (including
+    project packages). Pass the `--reach <packages>` option to exclude packages
+    (including project packages) that cannot reach any of the specified packages
+    in the dependency graph. In both cases, `<packages>` is a list of package
+    names separated by commas;
+*   for all relevant project packages, relevant dependencies are included in the
+    output. However, each project package for which dependencies are included
+    can be specified as a target argument. The argument uses the same format as
+    the [`stack build` command](build_command.md) but components of project
+    packages are ignored. Non-project packages are also ignored;
+
+    !!! note
+
+        If the first target is one of `cabal`, `json`, `text` and `tree`, then a
+        subcommand must be specified.
+
+*   test components of project packages are excluded from the output. Pass the
+    flag `--test` to include test components;
+*   benchmark components of project packages are excluded from the output. Pass
+    the flag `--bench` to include benchmark components; and
+*   global packages for the specified version of GHC are those specified by the
+    global package database of an installed GHC. Pass the flag `--global-hints`
+    to use a hint file for global packages. If a hint file is used, GHC does not
+    need to be installed.
+
+Subcommands specify the format of the output, as follows:
+
+*   `cabal` lists the packages in the format of exact Cabal constraints.
+
+    ~~~text
+    stack ls dependencies cabal [--[no-]external] [--[no-]include-base]
+                                [--depth DEPTH] [--prune PACKAGES] [TARGET]
+                                [--flag PACKAGE:[-]FLAG] [--test] [--bench]
+                                [--global-hints]
+    ~~~
+
+    For example (extract):
+
+    ~~~text
+    constraints:
+    , Cabal ==3.6.3.0
+    , Cabal-syntax ==3.6.0.0
+    , Glob ==0.10.2
+    ~~~
+
+*   `json` lists dependencies in JSON format (an array of objects).
+
+    ~~~text
+    stack ls dependencies json [--[no-]external] [--[no-]include-base]
+                               [--depth DEPTH] [--prune PACKAGES] [TARGET]
+                               [--flag PACKAGE:[-]FLAG] [--test] [--bench]
+                               [--global-hints]
+    ~~~
+
+    For example (extract):
+
+    ~~~text
+    [{"dependencies":["base","bytestring"],"license":"BSD3","location":{"type":"hackage","url":"https://hackage.haskell.org/package/zlib-0.6.3.0"},"name":"zlib","version":"0.6.3.0"},
+    ~~~
+
+    Each object has the following keys:
+
+    ~~~json
+    name: zlib
+    version: 0.6.3.0
+    location:
+      type: hackage
+      url: https://hackage.haskell.org/package/zlib-0.6.3.0
+    licence: BSD3
+    dependencies:
+    - base
+    - bytestring
+    ~~~
+
+*   `text` (the default) lists the packages, each on a separate line.
+
+    ~~~text
+    stack ls dependencies text [--[no-]license] [--separator SEP]
+                               [--filter ITEM] [--[no-]external]
+                               [--[no-]include-base] [--depth DEPTH]
+                               [--prune PACKAGES] [TARGET]
+                               [--flag PACKAGE:[-]FLAG] [--test] [--bench]
+                               [--global-hints]
+    ~~~
+
+    For example (extract):
+
+    ~~~text
+    Cabal 3.6.3.0
+    Cabal-syntax 3.6.0.0
+    Glob 0.10.2
+    ~~~
+
+*   `tree` lists dependencies in the format of a tree.
+
+    ~~~text
+    stack ls dependencies tree [--[no-]license] [--separator SEP]
+                               [--[no-]external] [--[no-]include-base]
+                               [--depth DEPTH] [--prune PACKAGES] [TARGET]
+                               [--flag PACKAGE:[-]FLAG] [--test] [--bench]
+                               [--global-hints]
+    ~~~
+
+    For example (extract):
+
+    ~~~text
+    Packages
+    └─┬ stack 2.10.0
+      ├─┬ Cabal 3.6.3.0
+      │ ├─┬ Win32 2.12.0.1
+      │ │ ├─┬ base 4.16.3.0
+      │ │ │ ├─┬ ghc-bignum 1.2
+      │ │ │ │ └─┬ ghc-prim 0.8.0
+      │ │ │ │   └── rts 1.0.2
+      │ │ │ ├─┬ ghc-prim 0.8.0
+    ~~~
+
+## The `stack ls globals` command
+
+~~~text
+stack ls globals [--[no-]global-hints]
+~~~
+
+`stack ls globals` will list all the global packages in alphabetical order.
+
+By default:
+
+* the global packages are those for the version of GHC specified by the snapshot
+  according to a hints file. Pass the flag `--no-global-hints` to use the global
+  package database of an installed GHC.
+
+!!! note
+
+    For example, on Windows, `stack ls globals` will include a version of the
+    `Win32` and `unix` packages but `stack ls globals --no-global-hints` will
+    exclude the `unix` package - and vice versa on Unix-like operating systems.
+
+## The `stack ls snapshots` command
+
+~~~text
+stack ls snapshots [COMMAND] [-l|--lts] [-n|--nightly]
+
+Available commands:
+  local                    View local snapshots
+  remote                   View remote snapshots
+~~~
+
+`stack ls snapshots` will list all the local snapshots by default. You can also
+view the remote snapshots using `stack ls snapshots remote`. It also supports
+options for viewing only lts (`-l`) and nightly (`-n`) snapshots.
+
+## The `stack ls stack-colors` command
+
+~~~text
+stack ls stack-colors [--[no-]basic] [--[no-]sgr] [--[no-]example]
+~~~
+
+The British English spelling is also accepted (`stack ls stack-colours`).
+
+`stack ls stack-colors` will list all of Stack's output styles. A number of
+different formats for the output are available, see
+`stack ls stack-colors --help`.
+
+The default is a full report, with the equivalent SGR instructions and an
+example of the applied style. The latter can be disabled with flags `--no-sgr`
+and `--no-example`.
+
+The flag `--basic` specifies a more basic report, in the format that is accepted
+by Stack's command line option `--stack-colors` and the
+[`stack-colors`](../configure/yaml/non-project.md#stack-colors) non-project
+specific configuration option.
+
+## The `stack ls tools` command
+
+~~~text
+stack ls tools [--filter TOOL_NAME]
+~~~
+
+`stack ls tools` will list Stack's installed tools. On Unix-like operating
+systems, they will be one or more versions of GHC. On Windows, they will include
+MSYS2. For example, on Windows the command:
+
+~~~text
+stack ls tools
+~~~
+
+yields output like:
+
+~~~text
+ghc-9.4.1
+ghc-9.2.4
+ghc-9.0.2
+msys2-20210604
+~~~
+
+The `--filter <tool_name>` option will filter the output by a tool name (e.g.
+'ghc', 'ghc-git' or 'msys2'). The tool name is case sensitive. For example the
+command:
+
+~~~text
+stack ls tools --filter ghc
+~~~
+
+yields output like:
+
+~~~text
+ghc-9.4.1
+ghc-9.2.4
+ghc-9.0.2
+~~~
diff --git a/doc/commands/new_command.md b/doc/commands/new_command.md
new file mode 100644
index 0000000000..e9eb3ff117
--- /dev/null
+++ b/doc/commands/new_command.md
@@ -0,0 +1,147 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack new` command
+
+~~~text
+stack new PACKAGE_NAME [--bare] [--[no-]init] [TEMPLATE_NAME]
+          [-p|--param KEY:VALUE] [DIR(S)] [--omit-packages] [--force]
+          [--ignore-subdirs]
+~~~
+
+`stack new` creates a new project using a project template.
+
+By default:
+
+* the project is created in a new directory named after the package. Pass the
+  `--bare` flag to create the project in the current directory;
+
+* the project is initialised for use with Stack. Pass the `--no-init` flag to
+  skip such initialisation; and
+
+* the project template is the one specified by the
+[default-template](../configure/yaml/non-project.md#default-template) option.
+
+A package name acceptable to Cabal comprises an alphanumeric 'word'; or two or
+more such words, with the words separated by a hyphen/minus character (`-`). A
+word cannot be comprised only of the characters `0` to `9`.
+
+An alphanumeric character is one in one of the Unicode Letter categories
+(Lu (uppercase), Ll (lowercase), Lt (titlecase), Lm (modifier), or Lo (other))
+or Number categories (Nd (decimal), Nl (letter), or No (other)).
+
+!!! note
+
+    `stack new` will decline to accept a package name that is a GHC wired-in
+    package for a version of GHC that is supported by Stack.
+
+    Stack treats the following as the names of 'wired-in' packages: `base`,
+    `ghc-bignum`, `ghc-prim`, `ghc`, `ghc-internal`, `integer-gmp`,
+    `integer-simple`, `interactive`, `rts` and `template-haskell`.
+
+!!! note
+
+    In the case of Hackage and acceptable package names, an alphanumeric
+    character is limited to one of `A` to `Z`, `a` to `z`, and `0` to `9`.
+
+!!! note
+
+    The name of a project is not constrained to be an acceptable package name. A
+    single-package project can be renamed to differ from the name of its
+    package.
+
+The `--param <key>:<value>` option specifies a key-value pair to populate a key
+in a template. The option can be specified multiple times.
+
+The arguments specifying directories and the `--ignore-subdirs`, `--force` and
+`--omit-packages` flags are as for the [`stack init` command](init_command.md).
+These arguments are ignored if the `--no-init` flag is passed.
+
+If a snapshot is specified at the command line and the project is initialised
+for use with Stack, `stack new` will try to use it. For further information, see
+the documentation for the
+[`--snapshot`](../configure/global_flags.md#-snapshot-option) option.
+
+## Project templates
+
+A project template file can be located in a repository named `stack-templates`
+on GitHub, GitLab, Bitbucket or Codeberg; at a URL; or on the local file system.
+
+Project template file names have the extension `.hsfiles`. The extension does
+not need to be specified with `stack new`.
+
+A project template file `my-template.hsfiles` in a repository
+`username/stack-templates` on GitHub, GitLab, Bitbucket or Codeberg can be
+specified with `stack new` as:
+
+~~~test
+<service>:username/my-template
+~~~
+
+where `<service>` is one of `github` for [GitHub](https://github.com/),
+`gitlab` for [GitLab](https://gitlab.com), `bitbucket` for
+[Bitbucket](https://bitbucket.com), or `codeberg:` for
+[Codeberg](https://codeberg.org).
+
+The default service is GitHub, the default username is `commercialhaskell` and
+the default project template name is `new-template`.
+
+## Examples
+
+Create a project for package `my-project` in new directory `my-project` with the
+default project template file and initialise it for use with Stack:
+
+~~~text
+stack new my-project
+~~~
+
+Create a project for package `my-package` in the current directory with the
+default project template file and initialise it for use with Stack:
+
+~~~text
+stack new my-package --bare
+~~~
+
+Create a project with the `rio` project template at the default repository and
+initialise it for use with Stack:
+
+~~~text
+stack new my-project rio
+~~~
+
+Create a project with the `mysql` project template provided by the
+`yesodweb/stack-templates` repository on GitHub and initialise it for use with
+Stack:
+
+~~~text
+stack new my-project yesodweb/mysql
+~~~
+
+Create a project with the `my-template` project template provided by the
+`username/stack-templates` repository on Bitbucket and initialise it for use
+with Stack:
+
+~~~text
+stack new my-project bitbucket:username/my-template
+~~~
+
+Create a project with the `my-template.hsfiles` project template file at
+`https://example.com` and initialise it for use with Stack:
+
+~~~text
+stack new my-project https://example.com/my-template
+~~~
+
+Create a project with the local project template file
+`<path_to_template>/my-template.hsfiles` and initialise it for use with Stack:
+
+~~~text
+stack new my-project <path_to_template_file>/my-template
+~~~
+
+Create a project with the `simple` project template file at the default
+repository (which does not use Hpack and a `package.yaml` file) and do not
+initialise it for use with Stack (`stack init` could be used subsequently):
+
+~~~text
+stack new my-project --no-init simple
+~~~
diff --git a/doc/commands/path_command.md b/doc/commands/path_command.md
new file mode 100644
index 0000000000..22a930b5e6
--- /dev/null
+++ b/doc/commands/path_command.md
@@ -0,0 +1,49 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack path` command
+
+~~~text
+stack path [--stack-root] [--global-config] [--programs] [--local-bin]
+           [--project-root] [--config-location] [--bin-path] [--compiler-exe]
+           [--compiler-bin] [--compiler-tools-bin] [--extra-include-dirs]
+           [--extra-library-dirs] [--snapshot-pkg-db] [--local-pkg-db]
+           [--global-pkg-db] [--ghc-package-path] [--snapshot-install-root]
+           [--local-install-root] [--snapshot-doc-root] [--local-doc-root]
+           [--local-hoogle-root] [--dist-dir] [--local-hpc-root]
+~~~
+
+`stack path` provides information about files and locations used by Stack.
+
+Pass the following flags for information about specific files or locations:
+
+|Flag                   |File or location                                      |
+|-----------------------|------------------------------------------------------|
+|--bin-path             |The PATH in the [Stack environment](../topics/stack_environment.md).|
+|--compiler-bin         |The directory containing the GHC executable.          |
+|--compiler-exe         |The GHC executable.                                   |
+|--compiler-tools-bin   |The [compiler tools directory](../topics/stack_root.md#compiler-tools-directory-optional) for the specified compiler version.|
+|--config-location      |Stack's project-level configuration file (`stack.yaml`, by default).|
+|--dist-dir             |The dist work directory, relative to the package directory.|
+|--extra-include-dirs   |Extra include directories.                            |
+|--extra-library-dirs   |Extra library directories.                            |
+|--ghc-package-path     |The `GHC_PACKAGE_PATH` environment variable.          |
+|--global-config        |Stack's user-specific global configuration file (`config.yaml`).|
+|--global-pkg-db        |The global package database.                          |
+|--local-bin            |The directory in which Stack installs executables.    |
+|--local-doc-root       |The root directory for local project documentation.   |
+|--local-hoogle-root    |The root directory for local project documentation.   |
+|--local-hpc-root       |The root directory for .tix files and HPC reports.    |
+|--local-install-root   |The root directory for local project installation.    |
+|--local-pkg-db         |The local package database.                           |
+|--programs             |The root directory for GHC and other Stack-supplied tools.|
+|--project-root         |The project root directory.                           |
+|--snapshot-doc-root    |The root directory for snapshot documentation.        |
+|--snapshot-install-root|The root directory for snapshot installation.         |
+|--snapshot-pkg-db      |The snapshot package database.                        |
+|--stack-root           |The [Stack root](../topics/stack_root.md).            |
+
+The command also accepts flags and options of the
+[`stack build`](build_command.md#flags-affecting-ghcs-behaviour) command that
+affect the location of the local project installation directory, such as
+`--profile` and `--no-strip`. For further information, see the documentation of
+the [project Stack work directory](../topics/stack_work.md).
diff --git a/doc/commands/purge_command.md b/doc/commands/purge_command.md
new file mode 100644
index 0000000000..440c21d5d7
--- /dev/null
+++ b/doc/commands/purge_command.md
@@ -0,0 +1,10 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack purge` command
+
+~~~text
+stack purge
+~~~
+
+`stack purge` has the same effect as, and is provided as a shorthand for,
+[`stack clean --full`](clean_command.md).
diff --git a/doc/commands/query_command.md b/doc/commands/query_command.md
new file mode 100644
index 0000000000..ef64349232
--- /dev/null
+++ b/doc/commands/query_command.md
@@ -0,0 +1,44 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack query` command
+
+:octicons-beaker-24: Experimental
+
+[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
+
+~~~text
+stack query [SELECTOR...]
+~~~
+
+`stack query` outputs certain build information. For example, for a
+multi-package project `multi` specifying snapshot `lts-19.25` (GHC 9.0.2) and
+with two project packages, `my-package-A` (version 0.1.0.0) and `my-package-B`
+(version 0.2.0.0), command `stack query` outputs:
+
+~~~text
+compiler:
+  actual: ghc-9.0.2
+  wanted: ghc-9.0.2
+locals:
+  my-package-A:
+    path: <absolute_path_to>\multi\my-package-A\
+    version: 0.1.0.0
+  my-package-B:
+    path: <absolute_path_to>\multi\my-package-B\
+    version: 0.2.0.0
+~~~
+
+The component parts of the information can be specified using 'selectors' with
+the command. In the example above the selectors include `compiler`,
+`compiler actual`, `locals`, `locals my-package-A`, and
+`locals my-package-A version`. For example, commanding:
+
+~~~text
+stack query locals my-package-B path
+~~~
+
+results in output:
+
+~~~text
+<absolute_path_to>\multi\my-package-B\
+~~~
diff --git a/doc/commands/repl_command.md b/doc/commands/repl_command.md
new file mode 100644
index 0000000000..1af632c6d2
--- /dev/null
+++ b/doc/commands/repl_command.md
@@ -0,0 +1,14 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack repl` command
+
+~~~text
+stack repl [TARGET/FILE] [--pedantic] [--ghci-options OPTIONS]
+           [--ghc-options OPTIONS] [--flag PACKAGE:[-]FLAG] [--with-ghc GHC]
+           [--[no-]load] [--package PACKAGE] [--main-is TARGET]
+           [--load-local-deps] [--[no-]package-hiding] [--only-main] [--trace]
+           [--profile] [--no-strip] [--[no-]test] [--[no-]bench]
+~~~
+
+The `stack repl` command is equivalent to the `stack ghci` command. For further
+information, see the [`stack ghci`](ghci_command.md) documentation.
diff --git a/doc/commands/run_command.md b/doc/commands/run_command.md
new file mode 100644
index 0000000000..f0aaeda298
--- /dev/null
+++ b/doc/commands/run_command.md
@@ -0,0 +1,46 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack run` command
+
+~~~text
+stack run [-- ARGUMENT(S) (e.g. stack run -- file.txt)]
+          [--[no-]ghc-package-path] [--[no-]stack-exe]
+          [--package PACKAGE] [--rts-options RTSFLAG] [--cwd DIR]
+~~~
+
+`stack run` builds a project executable and runs it. If the command has a first
+argument and it is recognised as the name of an executable component of a
+project package then that is built. Otherwise, the project's first executable is
+built. If the project has no executables Stack reports no executables found as
+an error.
+
+!!! note
+
+    To identify a project's first executable, and search for the name of an
+    executable component, Stack lists the executable components, in order, for
+    each package, listed in order. For example:
+
+    `packageA:a-exe` < `packageA:b-exe` < `packageB:a-exe` < `packageB:b-exe`
+
+Everything after `--` on the command line is interpreted as a command line
+argument to be passed to what is run, other than a first argument recognised as
+the name of an executable component of a project package.
+
+By default:
+
+*   the `GHC_PACKAGE_PATH` environment variable is set for the subprocess. Pass
+    the `--no-ghc-package-path` flag to not set the variable; and
+
+*   the `STACK_EXE` environment variable is set with the path to Stack. Pass the
+    `--no-stack-exe` flag to not set the variable.
+
+The `--cwd` option can be used to set the working directory before the
+executable is run.
+
+The `--package` option (which can be specified multiple times) can be used to
+add a package name to build targets.
+
+The `--rts-options` option (which can be specified multiple times) can be used
+to pass a list of GHC's
+[runtime system (RTS) options](https://downloads.haskell.org/~ghc/latest/docs/users_guide/runtime_control.html#)
+to the executable when it is run. (The `+RTS` and `-RTS` must not be included.)
diff --git a/doc/commands/runghc_command.md b/doc/commands/runghc_command.md
new file mode 100644
index 0000000000..55023f070e
--- /dev/null
+++ b/doc/commands/runghc_command.md
@@ -0,0 +1,22 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack runghc` and `stack runhaskell` commands
+
+~~~text
+stack runghc [-- ARGUMENT(S) (e.g. stack runghc -- X.hs)]
+             [--[no-]ghc-package-path] [--[no-]stack-exe] [--package PACKAGE]
+             [--rts-options RTSFLAG] [--cwd DIR]
+~~~
+
+`stack runhaskell` has the same effect as `stack runghc`. `stack runghc` has the
+same effect as, and is provided as a shorthand for,
+[`stack exec runghc`](exec_command.md), with the exception of the `--package`
+option.
+
+Pass the option `--package <package(s)>` to add the initial GHC argument
+`-package-id=<unit_id>`, where `<unit_id>` is the unit ID of the specified
+package in the installed package database. The option can be a list of package
+names or package identifiers separated by spaces. The option can also be
+specified multiple times. The approach taken to these packages is the same as if
+they were specified as targets to
+[`stack build`](build_command.md#target-syntax).
diff --git a/doc/commands/runhaskell_command.md b/doc/commands/runhaskell_command.md
new file mode 100644
index 0000000000..cf55c070b6
--- /dev/null
+++ b/doc/commands/runhaskell_command.md
@@ -0,0 +1,12 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack runhaskell` command
+
+~~~text
+stack runhaskell [-- ARGUMENT(S) (e.g. stack runghc -- X.hs)]
+                 [--[no-]ghc-package-path] [--[no-]stack-exe]
+                 [--package PACKAGE] [--rts-options RTSFLAG] [--cwd DIR]
+~~~
+
+The `stack runhaskell` command is equivalent to the `stack runghc` command. For
+further information, see the [`stack runghc`](runghc_command.md) documentation.
diff --git a/doc/commands/script_command.md b/doc/commands/script_command.md
new file mode 100644
index 0000000000..05ba190058
--- /dev/null
+++ b/doc/commands/script_command.md
@@ -0,0 +1,384 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack script` command
+
+~~~text
+stack script [--package PACKAGE] FILE
+             [-- ARGUMENT(S) (e.g. stack script X.hs -- argument(s) to program).]
+             [--compile | --optimize] [--[no-]use-root] [--ghc-options OPTIONS]
+             [--extra-dep EXTRA-DEP] [--no-run]
+~~~
+
+The `stack script` command either runs a specified Haskell source file (using
+GHC's `runghc`) or, optionally, compiles such a file (using GHC) and, by
+default, runs it.
+
+## Global configuration files
+
+Non-project level configuration options in global configuration files
+(`config.yaml`) are not ignored by the `stack script` command.
+
+!!! info
+
+    Non-project level configuration options may be useful if
+    [`allow-newer`](../configure/yaml/non-project.md#allow-newer) and/or
+    [`allow-newer-deps`](../configure/yaml/non-project.md#allow-newer-deps) are
+    required.
+
+## Project-level configuration file
+
+The `stack script` command ignores any project-level configuration file
+(`stack.yaml`, by default), including in the `global-project` directory in the
+Stack root.
+
+!!! info
+
+    The `stack script` command can be contrasted with the
+    [`stack ghc`](ghc_command.md) and [`stack runghc`](runghc_command.md)
+    commands, which do not ignore any project-level configuration file.
+
+## GHC
+
+The `stack script` command behaves as if the
+[`--install-ghc`](../configure/global_flags.md#-no-install-ghc-flag) flag had
+been passed at the command line.
+
+## Snapshot and extra-deps
+
+A snapshot must be specified on the command line, using the `--snapshot` option.
+For example:
+
+~~~text
+stack script --snapshot lts-24.55 MyScript.hs
+~~~
+
+An immutable extra-dep can be added to the snapshot on the command line with the
+`--extra-dep` option (which can be specified multiple times).
+
+An extra-dep is specified using a valid YAML value. For further information, see
+the [package location](../topics/package_location.md) documentation. Examples
+are:
+
+~~~text
+--extra-dep acme-missiles-0.3@rev:0
+--extra-dep '{git: git@github.com:yesodweb/wai, commit: '2f8a8e1b771829f4a8a77c0111352ce45a14c30f', subdirs: [auto-update, wai]}
+--extra-dep acme-missiles-0.3.tar.gz
+~~~
+
+Relative paths to local archive files are assumed to be relative to the
+directory in which the script file is located.
+
+GHC boot packages that have been 'replaced' (see further below) can be specified
+as an `--extra-dep`.
+
+## Required packages
+
+The names of required packages can be either deduced or specified.
+
+The `base` package associated with the version of GHC specified by the snapshot
+is always available.
+
+If no packages are specified, all the required packages that are in the snapshot
+or are a GHC boot package (packages that come with GHC and are included in GHC's
+global package database), will be deduced by reference to the `import`
+statements in the source file. In that regard, Stack assumes that:
+
+* a line that begins `import` is an `import` statement;
+* `import` may be followed by `qualified` on the same line;
+* consistent with GHC's
+  [`PackageImports`](https://downloads.haskell.org/ghc/latest/docs/users_guide/exts/package_qualified_imports.html)
+  language extension, that if `import` or `import qualified` is followed by
+  `"<name>"` on the same line, that `<name>` is the name of a required package;
+* otherwise, `import` or `import qualified` is followed by the module name on
+  the same line. Stack will not deduce the names of hidden packages from
+  module names or the names of blacklisted packages.
+
+!!! note
+
+    The first time that Stack deduces package names from module names can take
+    some time. Use the `--verbose` option to understand Stack's progress.
+
+!!! note
+
+    The installed packages of modules exposed by public sub-libraries will not
+    be deduced, because those installed packages are hidden.
+
+!!! info
+
+    Certain packages are blacklisted because they expose one or more modules
+    with names that are the same as modules exposed by more popular packages.
+    The blacklisted packages are `Glob`, `HTF`, `async-dejafu`,
+    `binary-ieee754`, `cipher-aes`, `cipher-blowfish`, `cipher-camellia`,
+    `cipher-des`, `cipher-rc4`, `control-monad-free`, `courier`, `crypto-api`,
+    `crypto-cipher-types`, `crypto-numbers`, `crypto-pubkey`, `crypto-random`,
+    `cryptohash`, `cryptohash-conduit`, `cryptohash-md5`, `cryptohash-sha1`,
+    `cryptohash-sha256`, `fay-base`, `gl`, `gtk3`, `hashmap`, `hledger-web`,
+    `hxt-unicode`, `kawhi`, `language-c`, `log`, `monad-extras`, `monads-tf`,
+    `nanospec`, `newtype-generics`, `objective`, `plot-gtk3`, `prompt`,
+    `regex-compat-tdfa`, `regex-pcre-builtin`, `rerebase`, `svg-tree` and `zip`.
+
+Alternatively, each required package can be specified by name on the command
+line with the `--package` option (which can be specified multiple times). A
+single `--package` option can also refer to a list of package names, separated
+by a space or comma character. If the package is not in the snapshot, the most
+recent version in the package index (e.g. Hackage) will be obtained.
+
+In the case of a named public sub-library of a Cabal package, the required
+installed package is specified by the 'munged' package name. For example, for
+public sub-library `my-library` of Cabal package `my-package` the munged name of
+the installed package is `z-my-library-z-my-package`.
+
+If a required package is a GHC boot package, the behaviour can be complex. If
+the boot package has not been 'replaced', then it will be used in Stack's build
+plan. However, if the boot package has been 'replaced', the latest version of
+that package in the package index will be used in Stack's build plan, which may
+differ from the version provided by the version of GHC specified by the
+snapshot. A boot package will be treated as 'replaced' if the package is
+included directly in the Stackage snapshot or it depends on a package included
+directly in the snapshot. Stackage snapshots do not include directly most boot
+packages but some snapshots may include directly some boot packages. In
+particular, some snapshots include directly `Win32` (which is a boot package on
+Windows) while others do not.
+
+!!! info
+
+    GHC has the concept of 'installed packages' (which differ from 'Cabal
+    packages') in package databases. An installed package has a name. An
+    installed package corresponding to the main (unnamed) library of a Cabal
+    package has the same name as the Cabal package. An installed package
+    corresponding to a sub-library of a Cabal package has a 'munged' name that
+    reflects the name of the Cabal package and the name of the sub-library. An
+    installed package corresponding to a sub-library also has a `package-name`,
+    which is the name of the Cabal package.
+
+    The `--package` option of `stack script` makes use of GHC's `-package-id`
+    option to expose an installed package, rather than its `-package` option.
+    The latter option treats `package-name` (if it exists) as if it were also
+    the name of the installed package. That means, for a Cabal package with one
+    or more sub-libraries, the GHC option `-package=<name>` cannot distinguish
+    between (a) the installed package `<name>` corresponding to the main library
+    of Cabal package `<name>` and (b) an installed package corresponding to a
+    sub-library of that Cabal package. The installed package that GHC picks to
+    expose is indeterminate. This can cause GHC to pick the wrong installed
+    package and to report that it cannot load a module because it is a member of
+    a hidden package.
+
+## Compilation
+
+The source file can be compiled by passing either the `--compile` flag (no
+optimization) or the `--optimize` flag (compilation with optimization). If the
+file is compiled, passing the `--no-run` flag will mean the compiled code is not
+run.
+
+By default, all the compilation outputs (including the executable) are written
+to the directory of the source file. Pass the `--use-root` flag to write such
+outputs to a script-specific location in the `scripts` directory of the Stack
+root. The location reflects the absolute path to the source file, but ignoring
+the drive. This can avoid clutter in the source file directory.
+
+## GHC options
+
+Additional options can be passed to GHC using the `--ghc-options` option.
+
+## Script arguments
+
+Everything after `--` on the command line is interpreted as a command line
+argument to be passed to what is run.
+
+## Examples
+
+### Example 1
+
+A Haskell source file `MyScript.hs` at location
+`<drive>Users/jane/my-project` (where `<drive>` could be `/` on Unix-like
+operating systems or `C:/` or similar on Windows):
+
+~~~haskell
+module Main (main) where
+
+import Data.List (intercalate)
+import System.Environment (getArgs)
+
+import Acme.Missiles (launchMissiles)
+
+main :: IO ()
+main = do
+  advices <- getArgs
+  launchMissiles
+  putStrLn $ intercalate "\n" advices
+~~~
+
+can be compiled and run, with arguments, with:
+
+~~~text
+stack --snapshot lts-24.55 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!"
+~~~
+
+`acme-missiles-0.3` (the most recent version in the package index) will be used.
+
+All the compilation outputs (like `Main.hi`, `Main.o`, and the executable
+`MyScript`) will be written to the `my-project` directory.
+
+If compiled and run with the additional flag `--use-root`, all the compilation
+outputs will be written to a directory named `MyScript.hs` at
+`Users/jane/my-project/` in the `scripts` directory of the Stack root.
+
+### Example 2
+
+As for Example 1, but `acme-missiles-0.2` is specified by adding it to the
+snapshot as an extra-dep. The `stack script` command is specified using Stack's
+[script interpreter](../topics/scripts.md).
+
+~~~haskell
+{- stack script
+   -- snapshot lts-24.55
+   -- extra-dep acme-missiles-0.2
+   -- package acme-missiles
+-}
+module Main (main) where
+
+import Data.List (intercalate)
+import System.Environment (getArgs)
+
+import Acme.Missiles (launchMissiles)
+
+main :: IO ()
+main = do
+  advices <- getArgs
+  launchMissiles
+  putStrLn $ intercalate "\n" advices
+~~~
+
+~~~text
+stack MyScript.hs "Don't panic!" "Duck and cover!"
+~~~
+
+### Example 3
+
+Stackage snapshot LTS Haskell 20.25 includes GHC boot package `Win32` directly.
+On Windows only, GHC boot packages `Cabal`, `directory`, `process` and `time`
+all depend on `Win32` and, consequently, are all treated as 'replaced'.
+Consequently, for example, Stack will:
+
+* on Windows, try to construct a build plan based on the latest version of
+  `Cabal` in the package index; and
+* on non-Windows, use the boot package in the build plan (because `Cabal` is not
+  'replaced').
+
+Consider also the following script extract, based on snapshot Stackage
+ LTS Haskell 20.25, where considerations on Windows differ from non-Windows. The
+`stack script` command is specified using Stack's
+[script interpreter](../topics/scripts.md).
+
+=== "Windows"
+
+    ~~~haskell
+    {- stack script
+       --snapshot lts-20.25
+       --extra-dep acme-missiles-0.3
+       --extra-dep directory-1.3.6.2
+       --extra-dep process-1.6.16.0
+       --extra-dep time-1.11.1.1
+    -}
+
+    import Acme.Missiles -- from acme-missiles
+    import Data.Time.Clock.System -- from time
+    import System.Time.Extra -- from extra
+
+    ...
+    ~~~
+
+    `acme-missiles` is not in the snapshot and so needs to be specified as an
+    extra-dep.
+
+    Stack can deduce that the module imports imply that the required packages
+    are `acme-missiles`, `time` and `extra` (which is in the snapshot).
+
+    `extra` depends on `directory` and `process`. If `directory` and `process`
+    are not specified as extra-deps, Stack will complain that they have been
+    'pruned'.
+
+    `directory-1.3.6.2` depends on `time < 1.12`. If `time` is not specified as
+    an extra-dep, Stack will try to construct a build plan based on the latest
+    version in the package index (which will fail, as the latest version is
+    `>= 1.12`)
+
+=== "Unix-like"
+
+    ~~~haskell
+    {- stack script
+       --snapshot lts-20.25
+       --extra-dep acme-missiles-0.3
+    -}
+
+    import Acme.Missiles -- from acme-missiles
+    import Data.Time.Clock.System -- from time
+    import System.Time.Extra -- from extra
+
+    ...
+    ~~~
+
+    `acme-missiles` is not in the snapshot and so needs to be specified as an
+    extra-dep.
+
+    Stack can deduce that the module imports imply that the required packages
+    are `acme-missiles`, `time` and `extra` (which is in the snapshot).
+
+    All the other dependencies required are either GHC boot packages (which have
+    not been 'replaced') or in the snapshot.
+
+### Example 4
+
+A Haskell source file `MyScript.hs`, as follows:
+
+~~~haskell
+{- stack script
+   --snapshot lts-24.55
+-}
+
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE PackageImports    #-}
+
+module Main (main) where
+
+import "text" Data.Text (Text (..), unpack)
+
+main :: IO ()
+main = putStrLn $ unpack "This is text."
+~~~
+
+As module `Data.Text` is exposed by a number of packages that are included,
+directly or indirectly, in the specified snapshot (`incipit-base`,
+`incipit-core`, `relude` and `text`), `PackageImports` and `"text"` are required
+to specify which module is being imported.
+
+### Example 5
+
+Stackage snapshot LTS Haskell 23.18 specifies Cabal package `vector-0.13.2.0`
+which includes public sub-library `benchmarks-O2`. The sub-library exposes
+module `Bench.Vector.TestData.ParenTree` which exports `parenTree`. The
+following is a valid script:
+
+~~~haskell
+{- stack script
+   --snapshot lts-23.18
+   --package z-vector-z-benchmarks-O2
+-}
+{-# LANGUAGE LambdaCase #-}
+
+import Bench.Vector.TestData.ParenTree ( parenTree )
+import System.Environment ( getArgs )
+
+main :: IO ()
+main = getArgs >>= \case
+  [] -> putStrLn "An initial argument is required."
+  (arg:_) -> do
+    let n = read arg
+    if n >= 0 && even n
+      then do
+        putStrLn "A balanced binary tree structure"
+        putStrLn $ "with " <> show n <> " parentheses positions:"
+        print $ parenTree n
+      else
+        putStrLn "A positive even integer argument is required."
+~~~
diff --git a/doc/commands/sdist_command.md b/doc/commands/sdist_command.md
new file mode 100644
index 0000000000..e0ad8c6898
--- /dev/null
+++ b/doc/commands/sdist_command.md
@@ -0,0 +1,47 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack sdist` command
+
+~~~text
+stack sdist [DIR] [--pvp-bounds PVP-BOUNDS] [--ignore-check]
+            [--[no-]test-tarball] [--tar-dir ARG]
+~~~
+
+Hackage only accepts packages for uploading in a standard form, a compressed
+archive ('tarball') in the format produced by Cabal's `sdist` action.
+
+`stack sdist` generates a file for your package, in the format accepted by
+Hackage for uploads. The command will report the location of the generated file.
+
+By default:
+
+*   a file is generated for each project package. In the alternative, one or
+    more project package directories can be specified;
+
+*   the command will check the package for common mistakes. Pass the flag
+    `--ignore-check` to disable the checks;
+
+*   Stack will not test the generated file by attempting to build it. Pass the
+    flag `--test-tarball` to cause Stack to test the generated file;
+
+*   the generated file will be created in the `dist` directory of the project
+    package directory. For information about the directory's location, command
+    [`stack path --dist-dir`](path_command.md). Pass the option
+    ``--tar-dir <path_to_directory>` to also copy the file to the specified
+    directory; and
+
+*   no PVP version bounds are added to the Cabal file of the package. Pass the
+    option `--pvp-bounds <pvp_bounds_mode>` to determine whether and, if so,
+    how bounds should be added. The available modes for basic use are: `none`,
+    `lower`, `upper`, and `both`. The available modes for use with Cabal file
+    revisions are `lower-revision`, `upper-revision` and `both-revision`.
+
+    For futher information, see the
+    [`pvp-bounds`](../configure/yaml/non-project.md#pvp-bounds) non-project
+    specific configuration option documentation.
+
+!!! note
+
+    Stack checks a package for common mistakes using checks provided by Cabal
+    (the library). The version of Cabal used by Stack to check may be
+    older than the version used by Stack to build.
diff --git a/doc/commands/setup_command.md b/doc/commands/setup_command.md
new file mode 100644
index 0000000000..fccb980c3c
--- /dev/null
+++ b/doc/commands/setup_command.md
@@ -0,0 +1,115 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack setup` command
+
+~~~text
+stack setup [GHC_VERSION] [--[no-]reinstall] [--ghc-bindist URL]
+            [--ghcjs-boot-options GHCJS_BOOT] [--[no-]ghcjs-boot-clean]
+~~~
+
+`stack setup` attempts to install a version of GHC and, on Windows, MSYS2.
+
+By default:
+
+* the version of GHC is the one required by the project. Specify the version of
+  GHC as an argument to attempt to install a different version of GHC. For
+  example `stack setup 9.10.3` will attempt to install GHC 9.10.3; and
+
+* an attempt to install is made only if the version of GHC is not already
+  available to Stack. Pass the flag `--reinstall` (disabled by default) to
+  attempt to install the version of GHC regardless of whether it is already
+  available to Stack.
+
+Pass the option `--ghc-bindist <url>` to specify the URL of the GHC to be
+downloaded and installed. This option requires the use of the `--ghc-variant`
+option specifying a custom GHC variant. For further information about the
+`--ghc-variant` option, see the
+[`ghc-variant`](../configure/yaml/non-project.md#ghc-variant) non-project
+specific configuration option documentation.
+
+If Stack is configured not to install GHC (`install-ghc: false` or passing the
+`--no-install-ghc` flag) or not to install MSYS2 (`install-msys: false` or
+passing the `--no-install-msys` flag) then `stack setup` will warn that the flag
+and the command are inconsistent and take no action.
+
+=== "Linux"
+
+    A particular binary distribution of GHC will depend on certain libraries,
+    which need to be available.
+
+    There are many different Linux distributions and different versions of a
+    particular Linux distribution. One Linux distribution/version may make
+    available different libraries to another Linux distribution/version.
+
+    In attempting to identify the particular binary distribution of GHC that is
+    required on Linux, Stack will refer to the presence or absence of certain
+    libraries or the versions of those libraries.
+
+    For example, Stack 3.1.1 considers:
+
+    *   If `libc.musl-x86_64.so.1` is present. This file is provided by the
+        [musl libc](https://musl.libc.org/).
+
+        [:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
+
+    *   The version of `libc6` (if musl libc is not applicable), the
+        [GNU C Library](https://www.gnu.org/software/libc/) (glibc), that is
+        present. The GNU C Library is designed to be backwards compatible.
+
+        [:octicons-tag-24: 2.11.1](https://github.com/commercialhaskell/stack/releases/tag/v2.11.1)
+
+    *   If `libgmp.so.3` or `libgmp.so.10` is present. These files are provided
+        by different versions of the
+        [GNU Multiple Precision Arithmetic Library](https://gmplib.org/).
+
+    *   If `libncursesw.so.6` is present. This file is provided by a shared
+        library for terminal handling with wide character support.
+
+    *   If `libtinfo.so.5` or `libtinfo.so.6` is present. These files are
+        provided by different versions of a shared low-level terminfo library
+        for terminal handling.
+
+    Stack 3.1.1 uses `ghc-build`:
+
+    * `musl` to indicate `libc.musl-x86_64.so.1` is present and Stack should use
+       the GHC binary distribution for Alpine Linux.
+    * `tinfo6` to indicate `libgmp.so.10` and `libtinfo.so.6` are present and
+      `libc6` is compatible with `libc6` 2.32.
+    * `tinfo6-libc6-pre232` to indicate `libgmp.so.10` and `libtinfo.so.6` are
+       present and `libc6` is not compatible with `libc6` 2.32.
+    * `ncurses6` to indicate `libgmp.so.10` and `libncursesw.so.6` are present
+    * `gmp4` to indicate `libgmp.so.3` is present
+
+    By default, Stack associates:
+
+    * the `tinfo6` build with the 'Fedora 33' binary distribution of GHC 9.4.1
+      to 9.4.3 and 9.6.1 and later. Those binary distributions require versions
+      of `libc6` that are compatible with `libc6` 2.32;
+
+    * the `tinfo6-libc6-pre232` build with the 'Debian 10' binary distribution
+      of GHC 9.4.1 to 9.4.3 and the 'Rocky 8' binary distribution of GHC 9.6.1
+      and later. Those binary distributions require versions of `libc6` that are
+      compatible with `libc6` 2.28; and
+
+    * the `tinfo6` and `tinfo6-libc6-pre232` builds with the 'Fedora 27' binary
+      distribution of GHC 9.4.4 to 9.4.8. Those binary distributions require
+      versions of `libc6` that are compatible with `libc6` 2.26.
+
+=== "Windows"
+
+    Since Windows 10 version 1607, Windows has been 'long file paths' capable
+    but that capability is not enabled by default. Consequently, Stack does not
+    assume that it is being used on a system that is 'long file paths' enabled.
+
+    Stack uses the 7-Zip tool to decompress, and extract tools from, downloaded
+    archive files. Aiming to avoid long file paths, Stack does so in a temporary
+    directory (named `stack-tmp-<hash>`) on the drive of the final destination
+    (either in the system temporary directory, where applicable, or the root of
+    the drive). Consequently, Stack needs permission to create a directory in
+    that location.
+
+    A Windows user account will usually have permission to create a directory in
+    the system temporary directory. A Windows user account of type Administrator
+    will have permission to create a directory in the root of the system drive
+    (`C:\`, by convention) but a Standard user account may well not have
+    permission.
diff --git a/doc/commands/templates_command.md b/doc/commands/templates_command.md
new file mode 100644
index 0000000000..5eabfb59e1
--- /dev/null
+++ b/doc/commands/templates_command.md
@@ -0,0 +1,35 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack templates` command
+
+~~~text
+stack templates
+~~~
+
+`stack templates` provides information to the standard output stream about
+project templates used with the [`stack new` command](new_command.md).
+
+Project templates are specified in `.hsfiles` files. The format of those files
+is documented at the
+[`commercialhaskell/stack-templates`](https://github.com/commercialhaskell/stack-templates#project-template-format)
+repository on GitHub.
+
+Any GitHub, GitLab, Bitbucket or Codeberg repository named `stack-templates`
+can provide project template files. For example, a template file
+`username/stack-templates/my-template.hsfiles` on GitHub can be identified as
+`username/my-template` when using `stack new`. The relevant service can be
+specified by a prefix: `github:` for [GitHub](https://github.com/) (the default
+service), `gitlab:` for [GitLab](https://gitlab.com), `bitbucket:` for
+[Bitbucket](https://bitbucket.com), or `codeberg:` for
+[Codeberg](https://codeberg.org).
+
+[`commercialhaskell/stack-templates`](https://github.com/commercialhaskell/stack-templates#project-template-format)
+on GitHub is the default repository for project templates. Its username
+(`commercialhaskell`) does not need to be specified when using `stack new`.
+
+The project template that `stack new` uses by default is named `new-template`
+and provided at the default repository.
+
+The default repository provides 24 other project templates. Its Wiki provides
+a description of some of those templates and information about the location of
+other templates.
diff --git a/doc/commands/test_command.md b/doc/commands/test_command.md
new file mode 100644
index 0000000000..12f37f5544
--- /dev/null
+++ b/doc/commands/test_command.md
@@ -0,0 +1,29 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack test` command
+
+~~~text
+stack test [TARGET] [--dry-run] [--pedantic] [--fast] [--ghc-options OPTIONS]
+            [--flag PACKAGE:[-]FLAG] [--dependencies-only | --only-snapshot |
+              --only-dependencies | --only-locals] [--file-watch |
+              --file-watch-poll] [--watch-all] [--exec COMMAND [ARGUMENT(S)]]
+            [--only-configure] [--trace] [--profile] [--no-strip]
+            [--[no-]library-profiling] [--[no-]executable-profiling]
+            [--[no-]library-stripping] [--[no-]executable-stripping]
+            [--[no-]haddock] [--haddock-arguments HADDOCK_ARGS]
+            [--[no-]open] [--[no-]haddock-deps] [--[no-]haddock-internal]
+            [--[no-]haddock-hyperlink-source] [--[no-]haddock-for-hackage]
+            [--[no-]copy-bins] [--[no-]copy-compiler-tool] [--[no-]prefetch]
+            [--[no-]keep-going] [--[no-]keep-tmp-files] [--[no-]force-dirty]
+            [--[no-]test] [--[no-]rerun-tests] [--ta|--test-arguments TEST_ARGS]
+            [--coverage] [--[no-]run-tests] [--test-suite-timeout SECONDS]
+            [--test-suite-timeout-grace SECONDS] [--[no-]tests-allow-stdin]
+            [--[no-]bench] [--ba|--benchmark-arguments BENCH_ARGS]
+            [--[no-]run-benchmarks] [--[no-]reconfigure]
+            [--cabal-verbosity VERBOSITY | --[no-]cabal-verbose]
+            [--[no-]split-objs] [--skip ARG] [--[no-]interleaved-output]
+            [--ddump-dir ARG]
+~~~
+
+`stack test` is a synonym for `stack build --test`. For further information,
+see the documentation for the [`stack build`](build_command.md) command.
diff --git a/doc/commands/uninstall_command.md b/doc/commands/uninstall_command.md
new file mode 100644
index 0000000000..411c879fb7
--- /dev/null
+++ b/doc/commands/uninstall_command.md
@@ -0,0 +1,11 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack uninstall` command
+
+~~~text
+stack uninstall
+~~~
+
+`stack uninstall` provides information to the standard output stream about how
+to uninstall Stack or a Stack-supplied tool (such as GHC or, on Windows, MSYS2).
+It does not itself uninstall Stack or a Stack-supplied tool.
diff --git a/doc/commands/unpack_command.md b/doc/commands/unpack_command.md
new file mode 100644
index 0000000000..b339cfc3fe
--- /dev/null
+++ b/doc/commands/unpack_command.md
@@ -0,0 +1,51 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack unpack` command
+
+~~~text
+stack unpack TARGET [--candidate] [--to DIR]
+~~~
+
+`stack unpack` downloads an archive file for one or more specified target
+packages from the package index (e.g. Hackage), or one or more specified target
+package candidates, and unpacks each archive into a subdirectory named after the
+package version.
+
+In the case of packages from the package index, a target can be a package
+name only. In that case, by default:
+
+*   if Stack's `--snapshot` option is not specified, the download is for the
+    most recent version of the package in the package index. Stack will first
+    seek to update the index; and
+
+*   if Stack's `--snapshot` option is specified, the download is for the version
+    of the package included directly in the specified snapshot.
+
+!!! note
+
+    Stackage snapshots are not expected to include directly GHC boot packages
+    (packages that come with GHC and are included in GHC's global package
+    database) but some such snapshots may include directly some boot packages.
+    In particular, some snapshots include directly `Win32` (which is a boot
+    package on Windows) while most do not.
+
+Otherwise, a target should specify a package name and version (for example,
+`acme-missiles-0.3`). In the case of package versions from the package index,
+optionally, a revision in the package index can be specified by appending
+`@rev:<number>` or `@sha256:<sha>` (for example, `acme-missiles-0.3@rev:0`).
+
+By default:
+
+*   the download is from the package index. Pass the flag `--candidate` to
+    specify package candidates; and
+
+    !!! note
+
+        Stack assumes that a package candidate archive is a `.tar.gz` file named
+        after the package version and located at endpoint
+        `package\<package_version>\candidate\`. This is true of Hackage.
+
+*   the target is unpacked into a subdirectory of the current directory. Pass
+    the option `--to <directory>` to specify an alternative destination
+    directory to the current directory. The destination directory can be an
+    absolute one or relative to the current directory.
diff --git a/doc/commands/update_command.md b/doc/commands/update_command.md
new file mode 100644
index 0000000000..b5099c65cf
--- /dev/null
+++ b/doc/commands/update_command.md
@@ -0,0 +1,12 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack update` command
+
+~~~text
+stack update
+~~~
+
+Generally, Stack automatically updates the package index when necessary.
+
+`stack update` will download the most recent set of packages from your package
+indices (e.g. Hackage).
diff --git a/doc/commands/upgrade_command.md b/doc/commands/upgrade_command.md
new file mode 100644
index 0000000000..59a08dadd6
--- /dev/null
+++ b/doc/commands/upgrade_command.md
@@ -0,0 +1,105 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack upgrade` command
+
+Either:
+
+~~~text
+stack upgrade [--binary-only] [--binary-platform ARG] [--force-download]
+              [--[no-]only-local-bin] [--binary-version ARG] [--github-org ARG]
+              [--github-repo ARG]
+~~~
+
+or:
+
+~~~text
+stack upgrade [--source-only] [--git] [--git-repo ARG] [--git-branch ARG]
+~~~
+
+`stack upgrade` will get a new version of Stack. It can also get a version
+before the current version (downgrade).
+
+!!! warning
+
+    If you use GHCup to install Stack, use only GHCup to upgrade Stack.
+
+By default:
+
+* the new version will be from an existing binary distribution. Pass the
+  `--source-only` flag to specify compiling from source code. The
+  `--binary-only` and `--source-only` flags are alternatives;
+
+* the new version will not overwrite the existing version unless it is newer.
+  Pass the `--force-download` flag to force a download;
+
+* when an existing binary distribution is applicable, it will be put in Stack's
+  local binary directory (see `stack path --local-bin`) and named `stack`
+  (replacing any existing executable named `stack` there);
+
+* if the current running Stack executable is '`stack`' (that is, it was invoked
+  as `stack` or, on Windows, `stack.exe` - this is case insensitive - and the
+  Stack executable file is named `stack` or, on Windows, `stack.exe` - this is
+  case sensitive), an existing binary distribution will replace it. If the
+  executable is located outside of Stack's local binary directory, pass the
+  `--only-local-bin` flag to skip that step;
+
+* if the current running Stack executable is not '`stack`' (as described above),
+  an existing binary distribution will only be put in Stack's local binary
+  directory and named `stack`. Pass the `--no-only-local-bin` flag to replace
+  also the current running executable;
+
+* the new version will be the latest available. Pass the
+  `--binary-version <version>` option to specify the version (this implies
+  `--force-download`);
+
+* the binary distribution will be sought from the GitHub organisation/user
+  `commercialhaskell`. Pass the `--github-org <user>` option to specify a
+  different GitHub user;
+
+* the binary distribution will be sought from the GitHub repository `stack`.
+  Pass the `--github-repo <repository>` option to specify a different
+  repository; and
+
+* the binary distribution will be sought for the current platform. Pass the
+  `--binary-platform <platform>` option to specify a different platform
+  (`<operating_system>-<architecture>-<suffix>`).
+
+When compiling from source code, by default:
+
+*   Stack will obtain the source code for the most recent version in the package
+    index (eg Hackage). Pass the flag `--git` to specify the most recent version
+    from the `master` branch of Stack's repository (pass the option
+    `--git-branch <branch>` to specify a different branch and the option
+    `--git-repo <repo_url>` to specify a different repository).
+
+!!! note
+
+    An earlier version of Stack could be inconsistent with some of the current
+    contents of the Stack root. For further information about the contents of
+    the Stack root and configuring its location, see the documentation about the
+    [Stack root](../topics/stack_root.md).
+
+## Examples
+
+* `stack upgrade` seeks an upgrade to the latest version of Stack available as a
+  binary distribution for the platform, if newer.
+
+* `stack upgrade --force-download` seeks an upgrade to the latest version of
+  Stack available as a binary distribution for the platform, even if not newer.
+
+* If the Stack executable is invoked as `my-stack`, `my-stack upgrade` seeks
+  only to put the latest version of Stack available as a binary distribution for
+  the platform, if newer, in Stack's local binary directory and name it `stack`.
+  `my-stack upgrade --no-only-local-bin` seeks also to upgrade `my-stack` to the
+  latest version of Stack available.
+
+* `stack upgrade --binary-version 2.15.1` seeks an upgrade to Stack 2.15.1 if
+  available as a binary distribution for the platform, even if not newer.
+
+* `stack upgrade --source-only` seeks an upgrade by building Stack with
+  Stack from the latest version of the source code in the package index
+  (i.e. Hackage).
+
+* `stack upgrade --source-only --git` seeks an upgrade by building Stack with
+  Stack from the latest version of the source code in the `master` branch of
+  Stack's repository.
diff --git a/doc/commands/upload_command.md b/doc/commands/upload_command.md
new file mode 100644
index 0000000000..f9ab6d2a40
--- /dev/null
+++ b/doc/commands/upload_command.md
@@ -0,0 +1,151 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `stack upload` command
+
+~~~text
+stack upload [ITEM] [-d|--documentation] [--pvp-bounds PVP-BOUNDS]
+             [--ignore-check] [--[no-]test-tarball] [--tar-dir ARG]
+             [--candidate] [--[no-]save-hackage-creds] [--setup-info-yaml URL]
+             [--snapshot-location-base URL]
+~~~
+
+By default:
+
+* the command uploads one or more packages. Pass the flag `--documentation`
+  (`-d` for short) to upload documentation for one or more packages;
+
+* the upload is a package to be published or documentation for a published
+  package. Pass the flag `--candidate` to upload a
+  [package candidate](http://hackage.haskell.org/upload#candidates) or
+  documentation for a package candidate; and
+
+* the command prompts to save the user's Hackage username and password in a
+  local file. Pass the flag `--no-save-hackage-creds` to avoid the prompt.
+
+At least one `ITEM` must be specified. For example, if the current working
+directory is a package directory:
+
+~~~text
+stack upload .
+~~~
+
+## Upload one or more packages
+
+Hackage accepts packages for uploading in a standard form, a compressed archive
+('tarball') in the format produced by Cabal's `sdist` action.
+
+If `ITEM` is a relative path to an sdist tarball, `stack upload` uploads the
+package to Hackage.
+
+If `ITEM` is a relative path to a package directory, `stack upload` generates a
+file for your package, in the format accepted by Hackage for uploads, and
+uploads the package to Hackage.
+
+By default:
+
+* the command will check each package for common mistakes. For further
+  information, see the [`stack sdist` command](sdist_command.md) documentation.
+  Pass the flag `--ignore-check` to disable such checks; and
+
+* Stack will not test the resulting package archive. Pass the flag
+  `--test-tarball` to cause Stack to test each resulting package archive, by
+  attempting to build it.
+
+The `--pvp-bounds <pvp_bounds_mode>` option determines whether and, if so, how
+PVP version bounds should be added to the Cabal file of the package. The
+available modes for basic use are: `none`, `lower`, `upper`, and `both`. The
+available modes for use with Cabal file revisions are `lower-revision`,
+`upper-revision` and `both-revision`.
+
+For futher information, see the
+[`pvp-bounds`](../configure/yaml/non-project.md#pvp-bounds) non-project
+specific configuration option documentation.
+
+The `--tar-dir <path_to_directory>` option determines whether the package
+archive should be copied to the specified directory.
+
+## Upload documentation for a package
+
+:octicons-beaker-24: Experimental
+
+[:octicons-tag-24: 2.15.1](https://github.com/commercialhaskell/stack/releases/tag/v2.15.1)
+
+Hackage accepts documentation for a package for uploading in a standard form and
+in a compressed archive ('tarball') in the `.tar.gz` format.
+
+For further information about how to create such an archive file, see the
+documentation for the
+[`stack haddock --haddock-for-hackage`](build_command.md#-no-haddock-for-hackage-flag)
+command.
+
+If `ITEM` is a relative path to a package directory,
+`stack upload <package_directory> --documentation` uploads an existing archive
+file of documentation for the specified package to Hackage.
+
+If the `--documentation` flag is passed then flags specific to package upload
+are ignored.
+
+## The `HACKAGE_USERNAME` and `HACKAGE_PASSWORD` environment variables
+
+[:octicons-tag-24: 2.3.1](https://github.com/commercialhaskell/stack/releases/tag/v2.3.1)
+
+`stack upload` will request a Hackage username and password to authenticate.
+This can be avoided by setting the `HACKAGE_USERNAME` and `HACKAGE_PASSWORD`
+environment variables. For
+example:
+
+=== "Unix-like"
+
+    ~~~text
+    export $HACKAGE_USERNAME="<username>"
+    export $HACKAGE_PASSWORD="<password>"
+    stack upload .
+    ~~~
+
+=== "Windows"
+
+    ~~~text
+    $Env:HACKAGE_USERNAME='<username>'
+    $Env:HACKAGE_PASSWORD='<password>'
+    stack upload .
+    ~~~
+
+=== "Windows (Command Prompt)"
+
+    ~~~text
+    set HACKAGE_USERNAME=<username>
+    set HACKAGE_PASSWORD=<password>
+    stack upload .
+    ~~~
+
+## The `HACKAGE_KEY` environment variable
+
+[:octicons-tag-24: 2.7.5](https://github.com/commercialhaskell/stack/releases/tag/v2.7.5)
+
+Hackage allows its members to register an API authentification token and to
+authenticate using the token.
+
+A Hackage API authentification token can be used with `stack upload` instead of
+username and password, by setting the `HACKAGE_KEY` environment variable. For
+example:
+
+=== "Unix-like"
+
+     ~~~text
+     HACKAGE_KEY=<api_authentification_token>
+     stack upload .
+     ~~~
+
+=== "Windows"
+
+     ~~~text
+     $Env:HACKAGE_KEY=<api_authentification_token>
+     stack upload .
+     ~~~
+
+=== "Windows (Command Prompt)"
+
+     ~~~text
+     set HACKAGE_KEY=<api_authentification_token>
+     stack upload .
+     ~~~
diff --git a/doc/community/index.md b/doc/community/index.md
new file mode 100644
index 0000000000..72efd2361f
--- /dev/null
+++ b/doc/community/index.md
@@ -0,0 +1,75 @@
+---
+title: Get involved
+---
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Get involved
+
+## Feedback and discussion
+
+* For general comments, feedback and support, please post to the
+  [Haskell Community](https://discourse.haskell.org/about) forum.
+* For bugs, issues, or requests, please
+  [open an issue](https://github.com/commercialhaskell/stack/issues/new).
+* When using Stack Overflow, please use the
+  [haskell-stack](http://stackoverflow.com/questions/tagged/haskell-stack) tag.
+
+## How to contribute to the maintenance or development of Stack
+
+A [guide](../CONTRIBUTING.md) is provided to help potential contributors to the
+Stack project.
+
+If you have already installed a version of Stack and the
+[Git application](https://git-scm.com/) the followings steps should get you
+started with building Stack from source with Stack:
+
+1.  Clone the `stack` repository from GitHub with the command:
+
+    ~~~text
+    git clone https://github.com/commercialhaskell/stack.git
+    ~~~
+
+2.  Change the current working directory to the cloned `stack` directory with
+    the command:
+
+    ~~~text
+    cd stack
+    ~~~
+
+3.  Build the `stack` executable using a preexisting installation of Stack with
+    the command:
+
+    ~~~text
+    stack build
+    ~~~
+
+4.  Once the `stack` executable has been built, check its version with the
+    command:
+
+    ~~~text
+    stack exec -- stack --version
+    ~~~
+
+    Make sure the version is the latest one.
+
+5.  In the GitHub repository's issue tracker, look for issues tagged with
+    [newcomer friendly](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3a%22newcomer+friendly%22)
+    and
+    [awaiting pull request](https://github.com/commercialhaskell/stack/issues?q=is%3Aopen+is%3Aissue+label%3A%22awaiting+pull+request%22)
+    labels.
+
+If you need to check your changes quickly command:
+
+~~~text
+stack repl
+~~~
+
+and then, at the REPL's prompt, command:
+
+~~~text
+:main --stack-root=<path_to_root> --stack-yaml=<path_to_stack.yaml> <COMMAND>
+~~~
+
+This allows you to set a special Stack root (instead of the default Stack root)
+and to target your commands at a particular `stack.yaml` file instead of the one
+found in the current directory.
diff --git a/doc/configure/customisation_scripts.md b/doc/configure/customisation_scripts.md
new file mode 100644
index 0000000000..52258ec145
--- /dev/null
+++ b/doc/configure/customisation_scripts.md
@@ -0,0 +1,142 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Customisation scripts
+
+## GHC installation customisation
+
+[:octicons-tag-24: 2.9.1](https://github.com/commercialhaskell/stack/releases/tag/v2.9.1)
+
+On Unix-like operating systems and Windows, Stack's installation procedure can
+be fully customised by placing a `sh` shell script (a 'hook') in the
+[Stack root](../topics/stack_root.md) directory at `hooks/ghc-install.sh`. On
+Unix-like operating systems, the script file must be made executable. The script
+is run by the `sh` application (which is provided by MSYS2 on Windows).
+
+The script **must** return an exit code of `0` and the standard output **must**
+be the absolute path to the GHC binary that was installed. Otherwise Stack will
+ignore the script and possibly fall back to its own installation procedure.
+
+When `system-ghc: true`, the script is not run. That is because the two
+mechanisms reflect distinct concepts, namely:
+
+* `system-ghc: true` causes Stack to search the PATH for a version of GHC; and
+
+* `hooks/ghc-install.sh` causes Stack to execute a script that is intended to
+  send to standard output a path to a version of GHC. The path in question may
+  or may not be in the PATH. The script may also do other things, including
+  installation.
+
+When `install-ghc: false`, the script is still run. That allows you to ensure
+that only your script will install GHC and Stack will not default to its own
+installation logic, even when the script fails.
+
+The following environment variables are always available to the script:
+
+* `HOOK_GHC_TYPE = "bindist" | "git" | "ghcjs"`
+
+For "bindist", additional variables are:
+
+* `HOOK_GHC_VERSION = <ver>`
+
+For "git", additional variables are:
+
+* `HOOK_GHC_COMMIT = <commit>`
+* `HOOK_GHC_FLAVOR = <flavor>`
+
+For "ghcjs", additional variables are:
+
+* `HOOK_GHC_VERSION = <ver>`
+* `HOOK_GHCJS_VERSION = <ver>`
+
+An example script is:
+
+~~~sh
+#!/bin/sh
+
+set -eu
+
+case $HOOK_GHC_TYPE in
+	bindist)
+		# install GHC here, not printing to stdout, e.g.:
+		#   command install $HOOK_GHC_VERSION >/dev/null
+		;;
+	git)
+		>&2 echo "Hook does not support installing from source"
+		exit 1
+		;;
+	*)
+		>&2 echo "Unsupported GHC installation type: $HOOK_GHC_TYPE"
+		exit 2
+		;;
+esac
+
+echo "location/to/ghc/executable"
+~~~
+
+If the following script is installed by GHCup, GHCup makes use of it, so that if
+Stack needs a version of GHC, GHCup takes over obtaining and installing that
+version:
+
+~~~sh
+#!/bin/sh
+
+set -eu
+
+case $HOOK_GHC_TYPE in
+  bindist)
+    ghc_path=$(
+      ghcup whereis ghc "$HOOK_GHC_VERSION" ||
+      {
+        ghcup install ghc "$HOOK_GHC_VERSION" >/dev/null &&
+        ghcup whereis ghc "$HOOK_GHC_VERSION"
+      }
+    ) || {
+      >&2 echo "Installing $HOOK_GHC_VERSION via ghcup failed"
+      exit 3
+    }
+    printf "%s" "${ghc_path}"
+    ;;
+  git)
+    # TODO: should be somewhat possible
+    >&2 echo "Hook doesn't support installing from source"
+    exit 1
+    ;;
+  *)
+    >&2 echo "Unsupported GHC installation type: $HOOK_GHC_TYPE"
+    exit 2
+    ;;
+esac
+~~~
+
+## `--file-watch` post-processing
+
+[:octicons-tag-24: 3.1.1](https://github.com/commercialhaskell/stack/releases/tag/v3.1.1)
+
+On Unix-like operating systems and Windows, Stack's `build --file-watch`
+post-processing can be fully customised by specifying an executable or a `sh`
+shell script (a 'hook') using the
+[`file-watch-hook`](yaml/non-project.md#file-watch-hook)
+non-project specific configuration option. On Unix-like operating systems, the
+script file must be made executable. A script is run by the `sh` application
+(which is provided by MSYS2 on Windows).
+
+The following environment variables are always available to the executable or
+script:
+
+* `HOOK_FW_RESULT` (Equal to `""` if the build did not fail. Equal to the result
+  of `displayException e`, if exception `e` thown during the build.)
+
+An example script is:
+
+~~~sh
+#!/bin/sh
+
+set -eu
+
+if [ -z "$HOOK_FW_RESULT" ]; then
+  echo "Success! Waiting for next file change."
+else
+  echo "Build failed with exception:"
+  echo $HOOK_FW_RESULT
+fi
+~~~
diff --git a/doc/configure/environment_variables.md b/doc/configure/environment_variables.md
new file mode 100644
index 0000000000..069fe01b4c
--- /dev/null
+++ b/doc/configure/environment_variables.md
@@ -0,0 +1,173 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Stack's environment variables
+
+The environment variables listed in alphabetal order below can affect how Stack
+behaves.
+
+If using Stack's
+[Nix integration](../topics/nix_integration.md#pure-and-impure-nix-shells) and a
+*pure* Nix build environment (or *shell*), by default, these environment
+variables will not be forwarded from your user session to the Nix shell.
+However, the Nix shell can be configured to keep specific environment variables.
+
+## `GH_TOKEN` or `GITHUB_TOKEN`
+
+[:octicons-tag-24: 2.11.1](https://github.com/commercialhaskell/stack/releases/tag/v2.11.1)
+
+Stack will use the value of the `GH_TOKEN` or, in the alternative,
+`GITHUB_TOKEN` environment variable (if not an empty string) as credentials to
+authenticate its requests of the GitHub REST API, using HTTP 'Basic'
+authentication.
+
+GitHub limits the rate of unauthenticated requests to its API, although most
+users of Stack will not experience that limit from the use of Stack alone. The
+limit for authenticated requests is significantly higher.
+
+For more information about authentication of requests of the GitHub REST API,
+see GitHub's REST API documentation.
+
+## `HACKAGE_KEY`
+
+[:octicons-tag-24: 2.7.5](https://github.com/commercialhaskell/stack/releases/tag/v2.7.5)
+
+Related command: [`stack upload`](../commands/upload_command.md)
+
+Hackage allows its members to register an API authentification token and to
+authenticate using the token.
+
+A Hackage API authentification token can be used with `stack upload` instead of
+username and password, by setting the `HACKAGE_KEY` environment variable. For
+example:
+
+=== "Unix-like"
+
+     ~~~text
+     HACKAGE_KEY=<api_authentification_token>
+     stack upload .
+     ~~~
+
+=== "Windows"
+
+     ~~~text
+     $Env:HACKAGE_KEY=<api_authentification_token>
+     stack upload .
+     ~~~
+
+=== "Windows (Command Prompt)"
+
+     ~~~text
+     set HACKAGE_KEY=<api_authentification_token>
+     stack upload .
+     ~~~
+
+## `HACKAGE_USERNAME` and `HACKAGE_PASSWORD`
+
+[:octicons-tag-24: 2.3.1](https://github.com/commercialhaskell/stack/releases/tag/v2.3.1)
+
+Related command: [`stack upload`](../commands/upload_command.md)
+
+`stack upload` will request a Hackage username and password to authenticate.
+This can be avoided by setting the `HACKAGE_USERNAME` and `HACKAGE_PASSWORD`
+environment variables. For
+example:
+
+=== "Unix-like"
+
+    ~~~text
+    export $HACKAGE_USERNAME="<username>"
+    export $HACKAGE_PASSWORD="<password>"
+    stack upload .
+    ~~~
+
+=== "Windows"
+
+    ~~~text
+    $Env:HACKAGE_USERNAME='<username>'
+    $Env:HACKAGE_PASSWORD='<password>'
+    stack upload .
+    ~~~
+
+=== "Windows (Command Prompt)"
+
+    ~~~text
+    set HACKAGE_USERNAME=<username>
+    set HACKAGE_PASSWORD=<password>
+    stack upload .
+    ~~~
+
+## `NO_COLOR`
+
+Related command: all commands that can produce colored output using control
+character sequences.
+
+Stack follows the standard at http://no-color.org/. Stack checks for a
+`NO_COLOR` environment variable. When it is present and not an empty string
+(regardless of its value), Stack prevents the addition of control character
+sequences for color to its output.
+
+## `STACK_CONFIG`
+
+Related command: all commands that make use of Stack's
+[global configuration](yaml/index.md) files (`config.yaml`).
+
+The environment variable `STACK_CONFIG` can be used to specify an absolute path
+to the user-specific global configuration file, overriding the default.
+
+## `STACK_GLOBAL_CONFIG`
+
+Related command: all commands that make use of Stack's
+[global configuration](yaml/index.md) files (`config.yaml`).
+
+The environment variable `STACK_GLOBAL_CONFIG` can be used to specify an
+absolute path to the system-wide global configuration file, overriding the
+default.
+
+## `STACK_ROOT`
+
+Related command: all commands that make use of Stack's
+[user-specific global configuration](yaml/index.md) file (`config.yaml`).
+
+Overridden by: Stack's global
+[`--stack-root`](global_flags.md#-stack-root-option) option.
+
+The environment variable `STACK_ROOT` can be used to specify the
+[Stack root](../topics/stack_root.md) directory.
+
+## `STACK_WORK`
+
+Related command: all commands that make use of Stack's work directories.
+
+Overridden by: Stack's [`work-dir`](yaml/non-project.md#work-dir) non-project
+specific configuration option, or global
+[`--work-dir`](global_flags.md#-work-dir-option) option.
+
+The environment variable `STACK_WORK` can be used to specify the path of Stack's
+work directory, within a local project or package directory, and override
+Stack's default of `.stack-work`. The path must be a relative one, relative to
+the root directory of the project or package. The relative path cannot include a
+`..` (parent directory) component.
+
+## `STACK_XDG`
+
+Related command: all commands that make use of Stack's
+[user-specific global configuration](yaml/index.md) file (`config.yaml`).
+
+Overridden by: the use of Stack's `STACK_ROOT` environment variable, or the use
+of Stack's global
+[`--stack-root`](global_flags.md#-stack-root-option) option.
+
+On Unix-like operating systems and Windows, Stack can be configured to follow
+the XDG Base Directory Specification if the environment variable `STACK_XDG` is
+set to any non-empty value.
+
+## `STACK_YAML`
+
+Related command: all commands that make use of Stack's
+[project-level configuration](yaml/index.md).
+
+Overridden by: Stack's global
+[`--stack-yaml`](global_flags.md#-stack-yaml-or-w-option) option.
+
+The environment variable `STACK_YAML` can be used to specify Stack's
+project-level configuration file.
diff --git a/doc/configure/global_flags.md b/doc/configure/global_flags.md
new file mode 100644
index 0000000000..f870890cd6
--- /dev/null
+++ b/doc/configure/global_flags.md
@@ -0,0 +1,444 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Stack's global flags and options
+
+Stack can also be configured by flags and options on the command line. Global
+flags and options apply to all of Stack's commands. In addition, all of Stack's
+commands accept the `--setup-info-yaml` and `--snapshot-location-base` options
+and the `--help` flag.
+
+## `--allow-different-user` flag
+
+Restrictions: POSIX systems only
+
+Default: True, if inside Docker; false otherwise
+
+Enable/disable permitting users other than the owner of the
+[Stack root](../topics/stack_root.md) directory to use a Stack installation. For
+further information, see the documentation for the corresponding non-project
+specific configuration [option](yaml/non-project.md#allow-different-user).
+
+## `--arch` option
+
+Pass the option `--arch <architecture>` to specify the relevant machine
+architecture. For further information, see the documentation for the
+corresponding non-project specific configuration
+[option](yaml/non-project.md#arch).
+
+## `--bash-completion-index` option
+
+Visibility: Hidden
+
+See the [shell auto-completion](../topics/shell_autocompletion.md)
+documentation.
+
+## `--bash-completion-script` option
+
+Visibility: Hidden
+
+See the [shell auto-completion](../topics/shell_autocompletion.md)
+documentation.
+
+## `--bash-completion-index` option
+
+Visibility: Hidden
+
+See the [shell auto-completion](../topics/shell_autocompletion.md)
+documentation.
+
+## `--color` or `-colour` options
+
+Pass the option `stack --color <when>` to specify when to use color in output.
+For further information, see the documentation for the corresponding non-project
+specific configuration [option](yaml/non-project.md#color).
+
+## `--compiler` option
+
+Pass the option `--compiler <compiler>` to specify the compiler (and,
+implicitly, its boot packages). For further information, see the
+[`compiler`](yaml/non-project.md#compiler) non-project specific configuration
+option documentation.
+
+## `--custom-preprocessor-extensions` option
+
+Pass the option `--custom-preprocessor-extensions <extension>` to specify an
+extension used for a custom preprocessor. For further information, see the
+documentation for the corresponding project specific configuration
+[option](yaml/project.md#custom-preprocessor-extensions).
+
+## `--docker*` flags and options
+
+Stack supports automatically performing builds inside a Docker container. For
+further information see `stack --docker-help` or the
+[Docker integration](../topics/docker_integration.md) documentation.
+
+## `--[no-]dump-logs` flag
+
+Default: Dump warning logs
+
+Enables/disables the dumping of the build output logs for project packages to
+the console. For further information, see the documentation for the
+corresponding non-project specific configuration
+[option](yaml/non-project.md#dump-logs).
+
+## `--extra-include-dirs` option
+
+Pass the option `--extra-include-dirs <director>` to specify an extra directory
+to check for C header files. The option can be specified multiple times. For
+further information, see the documentation for the corresponding non-project
+specific configuration [option](yaml/non-project.md#extra-include-dirs).
+
+## `--extra-lib-dirs` option
+
+Pass the option `--extra-lib-dirs <director>` to specify an extra directory
+to check for libraries. The option can be specified multiple times. For further
+information, see the documentation for the corresponding non-project specific
+configuration [option](yaml/non-project.md#extra-lib-dirs).
+
+## `--fish-completion-script` option
+
+Visibility: Hidden
+
+See the [shell auto-completion](../topics/shell_autocompletion.md)
+documentation.
+
+## `--ghc-build` option
+
+Pass the option `--ghc-build <build>` to specify the relevant specialised GHC
+build. For further information, see the documentation for the corresponding
+non-project specific configuration [option](yaml/non-project.md#ghc-build).
+
+## `--ghc-variant` option
+
+Pass the option `--ghc-variant <variant>` to specify the relevant GHC variant.
+For further information, see the documentation for the corresponding non-project
+specific configuration [option](yaml/non-project.md#ghc-variant).
+
+## `--help` or `-h` flags
+
+Pass the `--help` (or `-h`) flag to cause Stack to list its commands and flags
+and options common to those commands. Alternatively, command
+
+~~~text
+stack
+~~~
+
+for the same information.
+
+## `--[no-]hpack-force` flag
+
+[:octicons-tag-24: 3.1.1](https://github.com/commercialhaskell/stack/releases/tag/v3.1.1)
+
+Default: Disabled
+
+By default, Hpack 0.12.0 or later will decline to overwrite a Cabal file that
+was created by a more recent version of Hpack and Hpack 0.20.0 or later will
+decline to overwrite a Cabal file that has been modified manually. Pass the flag
+`--hpack-force` to allow Hpack to overwrite such a Cabal file.
+
+## `--hpack-numeric-version` flag
+
+Pass the flag `--hpack-numeric-version` to cause Stack to report the numeric
+version of its built-in Hpack library to the standard output stream (e.g.
+`0.35.0`) and quit.
+
+## `--[no-]install-ghc` flag
+
+Default: Enabled
+([:octicons-tag-24: 1.6.1](https://github.com/commercialhaskell/stack/releases/tag/v1.6.1))
+
+If the specified GHC version is not available, enables/disables Stack seeking to
+download and install that version if it is needed. On Windows,
+`--no-install-ghc` also disables the download and installation of the
+Stack-supplied MSYS2 when it is needed. For further information, see the
+documentation for the corresponding non-project specific configuration
+[option](yaml/non-project.md#install-ghc).
+
+!!! note
+
+    The `--[no-]install-ghc` flag does not specify whether Stack checks the
+    availability of either a 'system' GHC executable on the PATH or a
+    Stack-supplied GHC executable. In that regard, see the
+    [`system-ghc`](yaml/non-project.md#system-ghc) option.
+
+## `--[no-]install-msys` flag
+
+[:octicons-tag-24: 3.5.1](https://github.com/commercialhaskell/stack/releases/tag/v3.5.1)
+
+Restrictions: Windows systems only
+
+Default: Same as the [`install-ghc`](yaml/non-project.md#install-ghc) setting
+(including if that is set on the command line)
+
+If Stack is checking for the Stack-supplied MSYS2 when Stack is setting up the
+environment, enables/disables the download and installation of MSYS2 when
+necessary. For further information, see the documentation for the corresponding
+non-project specific configuration [option](yaml/non-project.md#install-msys).
+
+To skip entirely checking for the Stack-supplied MSYS2, see the documentation
+for the [`skip-msys`](yaml/non-project.md#skip-msys) configuration option.
+
+## `--jobs` or `-j` option
+
+Pass the option `--jobs <number_of_jobs>` to specify the number of concurrent
+jobs (Stack actions during building) to run.
+
+When [building GHC from source](../topics/GHC_from_source.md), specifies the
+`-j[<n>]` flag of GHC's Hadrian build system.
+
+By default, Stack specifies a number of concurrent jobs equal to the number of
+CPUs (cores) that the machine has. In some circumstances, that default can cause
+some machines to run out of memory during building. If those circumstances
+arise, specify `--jobs 1`.
+
+This configuration option is distinct from GHC's own `-j[<n>]` flag, which
+relates to parallel compilation of modules within a package.
+
+For further information, see the documentation for the corresponding non-project
+specific configuration option: [`jobs`](yaml/non-project.md#jobs).
+
+## `--local-bin-path` option
+
+Pass the option `--local-bin-path <directory>` to set the target directory for
+[`stack build --copy-bins`](../commands/build_command.md#-no-copy-bins-flag) and
+`stack install`. An absolute or relative path can be specified. A relative path
+at the command line is always assumed to be relative to the current directory.
+
+For further information, see the documentation for the corresponding non-project
+specific configuration [option](yaml/non-project.md#local-bin-path).
+
+## `--lock-file` option
+
+Default: `read-write`, if snapshot specified in the project-level configuration
+file; `read-only`, if a different snapshot is specified on the command line.
+
+Pass the option `--lock-file <mode>` to specify how Stack interacts with lock
+files. Valid modes are:
+
+* `error-on-write`: Stack reports an error, rather than write a lock file;
+* `ignore`: Stack ignores lock files;
+* `read-only`: Stack only reads lock files; and
+* `read-write`: Stack reads and writes lock files.
+
+## `--[no-]modify-code-page` flag
+
+Restrictions: Windows systems only
+
+Default: Enabled
+
+Enables/disables setting the codepage to support UTF-8. For further information,
+see the documentation for the corresponding non-project specific configuration
+[option](yaml/non-project.md#modify-code-page).
+
+## `--nix*` flags and options
+
+Stack can be configured to integrate with Nix. For further information, see
+`stack --nix-help` or the [Nix integration](../topics/nix_integration.md)
+documentation.
+
+## `--numeric-version` flag
+
+Pass the flag `--numeric-version` to cause Stack to report its numeric version
+to the standard output stream (e.g. `2.9.1`) and quit.
+
+## `--[no-]plan-in-log` flag
+
+[:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
+
+Default: Disabled
+
+Enables/disables the logging of build plan construction in debug output.
+Information about the build plan construction can be lengthy. If you do not need
+it, it is best omitted from the debug output.
+
+## `--resolver` option
+
+[:octicons-thumbsdown-24: 3.9.3](https://github.com/commercialhaskell/stack/releases/tag/v3.9.3)
+
+The `--resolver` option (deprecated) and the [`--snapshot`](#-snapshot-option)
+option are synonyms.
+
+More than one of these options is prohibited.
+
+## `--[no-]rsl-in-log` flag
+
+[:octicons-tag-24: 2.9.1](https://github.com/commercialhaskell/stack/releases/tag/v2.9.1)
+
+Default: Disabled
+
+Enables/disables the logging of the raw snapshot layer (rsl) in debug output.
+Information about the raw snapshot layer can be lengthy. If you do not need it,
+it is best omitted from the debug output.
+
+## `--[no-]script-no-run-compile` flag
+
+Default: Disabled
+
+Enables/disables the use of options `--no-run --compile` with the
+[`stack script` command](../commands/script_command.md).
+
+## `--silent` flag
+
+Equivalent to the `--verbosity silent` option.
+
+## `--[no-]skip-ghc-check` option
+
+Default: Disabled
+
+Enables/disables the skipping of checking the GHC version and architecture. For
+further information, see the documentation for the corresponding non-project
+specific configuration [option](yaml/non-project.md#skip-ghc-check).
+
+## `--[no-]skip-msys` option
+
+Restrictions: Windows systems only
+
+Default: Disabled
+
+Enables/disables the skipping of checking for the Stack-supplied MSYS2 (and
+installing that MSYS2, if it is not installed) when Stack is setting up the
+environment. For further information, see the documentation for the
+corresponding non-project specific configuration
+[option](yaml/non-project.md#skip-msys).
+
+To prevent installation of MSYS2, if it is not installed, see the documentation
+for the [`install-msys`](yaml/non-project.md#install-msys) configuration option.
+
+## `--snapshot` option
+
+[:octicons-tag-24: 2.15.1](https://github.com/commercialhaskell/stack/releases/tag/v2.15.1)
+
+Pass the option `--snapshot <snapshot>` to specify the snapshot. For further
+information, see the [`snapshot`](yaml/project.md#snapshot) project-specific
+configuration option documentation.
+
+## `--stack-colors` or `--stack-colours` options
+
+Pass the option `--stack-colors <styles>` to specify Stack's output styles. For
+further information, see the documentation for the corresponding non-project
+specific configuration [option](yaml/non-project.md#stack-colors).
+
+## `--stack-root` option
+
+Overrides: `STACK_ROOT` environment variable
+
+Pass the option `--stack-root <absolute_path_to_the_Stack_root>` to specify the
+path to the [Stack root](../topics/stack_root.md) directory. The path must be an
+absolute one.
+
+## `--stack-yaml` or `-w` option
+
+Default: `stack.yaml`
+
+Overrides: `STACK_YAML` enviroment variable
+
+Pass the option `--stack-yaml <file>` to specify Stack's project-level YAML
+configuration file.
+
+## `--[no-]system-ghc` flag
+
+Default: Disabled
+([:octicons-tag-24: 1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v1.3.0))
+
+Enables/disables Stack seeking to use a 'system' GHC executable (that is, one on
+the PATH) rather than a Stack-supplied GHC executable (or vice versa, if
+disabled). For further information, see the documentation for the corresponding
+non-project specific configuration [option](yaml/non-project.md#system-ghc).
+
+!!! note
+
+    The `--[no-]system-ghc` flag does not specify Stack's behaviour if the
+    specified GHC version is not already available. In that regard, see the
+    [`install-ghc`](yaml/non-project.md#install-ghc) option.
+
+## `--[no-]terminal` flag
+
+Default: Stack is running in a terminal (as detected)
+
+Enables/disables whether Stack is running in a terminal.
+
+## `--terminal-width` option
+
+Default: the terminal width (if detected); otherwise `100`
+
+Pass the option `--terminal-width <width>` to specify the width of the terminal,
+used by Stack's pretty printed messages.
+
+## `--[no-]time-in-logs` flag
+
+Default: Enabled
+
+Enables/disables the inclusion of time stamps against logging entries when the
+verbosity level is 'debug'.
+
+## `--verbose` or `-v` flags
+
+Equivalent to the `--verbosity debug` option.
+
+## `--verbosity` option
+
+Default: `info`
+
+Pass the option `--verbosity <log_level>` to specify the level for logging.
+Possible levels are `silent`, `error`, `warn`, `info` and `debug`, in order of
+increasing amounts of information provided by logging.
+
+## `--version` flag
+
+Pass the flag `--version` to cause Stack to report its version to standard
+output and quit. For versions that are release candidates, the report will list
+the dependencies that Stack has been compiled with.
+
+## `--with-gcc` option
+
+Pass the option `--with-gcc <path_to_gcc>` to specify use of a GCC executable.
+For further information, see the documentation for the corresponding non-project
+specific configuration [option](yaml/non-project.md#with-gcc).
+
+## `--with-hpack` option
+
+Pass the option `--with-hpack <hpack>` to specify use of an Hpack executable.
+For further information, see the documentation for the corresponding
+non-project specific configuration [option](yaml/non-project.md#with-hpack).
+
+## `--work-dir` option
+
+Default: `.stack-work`
+
+Overrides: [`STACK_WORK`](environment_variables.md#stack_work) environment
+variable, and [`work-dir`](yaml/non-project.md#work-dir) non-project specific
+configuration option.
+
+Pass the option `--work-dir <relative_path_to_the_Stack_root>` to specify the
+path to Stack's work directory, within a local project or package directory. The
+path must be a relative one, relative to the the root directory of the project
+or package. The relative path cannot include a `..` (parent directory)
+component.
+
+## `--zsh-completion-script` option
+
+Visibility: Hidden
+
+See the [shell auto-completion](../topics/shell_autocompletion.md)
+documentation.
+
+## `--setup-info-yaml` command option
+
+Default: `https://raw.githubusercontent.com/commercialhaskell/stackage-content/master/stack/stack-setup-2.yaml`
+
+The `--setup-info-yaml <url>` command option specifies the location of a
+`setup-info` dictionary. The option can be specified multiple times.
+
+## `--snapshot-location-base` command option
+
+Default: `https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master`
+
+The `--snapshot-location-base <url>` command option specifies the base location
+of snapshots. For further information, see the documentation for the
+corresponding non-project specific configuration
+[option](yaml/non-project.md#snapshot-location-base).
+
+## `--help` or `-h` command flags
+
+If Stack is passed the `--help` (or `-h`) command flag, it will output help for
+the command.
diff --git a/doc/configure/index.md b/doc/configure/index.md
new file mode 100644
index 0000000000..c278424650
--- /dev/null
+++ b/doc/configure/index.md
@@ -0,0 +1,41 @@
+---
+title: Configure
+---
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Configuration (advanced)
+
+Some of Stack's features will not be needed regularly or by all users. This part
+of the guide and the part on Stack's [commands](../commands/index.md) provide
+information about those features, organised as a reference guide. Some of the
+features are complex and separate pages are dedicated to them.
+
+The behaviour of Stack is configurable using environment variables, YAML
+configuration files, global flags and options on the command line and
+customisation scripts.
+
+## Environment variables
+
+The existence or content of certain environment variables can affect how Stack
+behaves. For further information, see the
+[environment variables](environment_variables.md) documentation.
+
+## Configuration files
+
+Stack is configured by the content of files in the YAML formal. A global
+configuration file contains non-project specific options. A project-level
+configuration file contains project-specific options and may contain non-project
+specific options. For further information, see the
+[configuration](yaml/index.md) documentation.
+
+## Global flags and options
+
+Stack can also be configured by flags and options on the command line. Global
+flags and options apply to all of Stack's commands. For further information, see
+the [global flags and options](global_flags.md) documentation.
+
+## Customisation scripts
+
+Stack's behaviour can also be affected by customisation scripts. For further
+information, see the [customisation scripts](customisation_scripts.md)
+documentation.
diff --git a/doc/configure/yaml/include.md b/doc/configure/yaml/include.md
new file mode 100644
index 0000000000..2688afe1d4
--- /dev/null
+++ b/doc/configure/yaml/include.md
@@ -0,0 +1,117 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# The `!include` directive
+
+Stack's configuration files are in the [YAML](https://yaml.org/) format. Stack
+also supports the use of an `!include` local tag together with scalar content
+that represents an absolute or relative path to another file. This provides a
+directive that allows the content of one YAML file to be included in another.
+
+The directive can be used in both
+[project-level and global](index.md#project-level-and-global-configuration-files)
+configuration files.
+
+!!! note
+
+    An included relative file path is relative to the directory containing the
+    file with the `!include` directive.
+
+!!! warning
+
+    The [`stack config set`](../../commands/config_command.md#the-stack-config-set-commands)
+    commands cannot modify a configuration file that excludes the relevant key
+    and uses `!include` directives.
+
+## Including a value
+
+A value for a key can be provided by an included file. For example, given a file
+`snapshot.yaml` in the project directory with the content:
+
+~~~yaml
+lts-24.55
+~~~
+
+the following project-level configuration file would use `lts-24.55` as the
+snapshot:
+
+~~~yaml
+snapshot: !include snapshot.yaml
+~~~
+
+The included file replaces the `!include` directive with its content, so this is
+equivalent to:
+
+~~~yaml
+snapshot: lts-24.55
+~~~
+
+## Including a sequence
+
+The value provided by an included file is not limited to scalar content. It can
+be a YAML sequence. For example, given a file `extra-deps.yaml` in the project
+directory with the content:
+
+~~~yaml
+- acme-missiles-0.3
+- text-short-0.1.6
+~~~
+
+the following project-level configuration file would use those as extra-deps:
+
+~~~yaml
+snapshot: lts-24.55
+extra-deps: !include extra-deps.yaml
+~~~
+
+## Merging mappings
+
+YAML's merge key (`<<`) is used to indicate that all of the keys of one or more
+specified mappings should be inserted into the current mapping.
+
+YAML's merge key can be combined with an `!include` directive to merge the
+content of an included file into the current mapping. For example, given a file
+`shared-config.yaml` in the project directory with the content:
+
+~~~yaml
+ghc-options:
+  "$everything": -Wall
+flags:
+  my-package:
+    my-flag: true
+~~~
+
+the following project-level configuration file would merge those options:
+
+~~~yaml
+snapshot: lts-24.55
+<<: !include shared-config.yaml
+~~~
+
+This is equivalent to:
+
+~~~yaml
+snapshot: lts-24.55
+ghc-options:
+  "$everything": -Wall
+flags:
+  my-package:
+    my-flag: true
+~~~
+
+The `!include` directive can also be placed on the line after the merge key:
+
+~~~yaml
+snapshot: lts-24.55
+<<:
+  !include shared-config.yaml
+~~~
+
+## Nested includes
+
+Included files can themselves contain `!include` directives, allowing for nested
+composition of configuration.
+
+!!! note
+
+    A file cannot include itself or a file that has already included the file.
+    Stack detects and raises an error for cyclic includes.
diff --git a/doc/configure/yaml/index.md b/doc/configure/yaml/index.md
new file mode 100644
index 0000000000..0f9fae07b0
--- /dev/null
+++ b/doc/configure/yaml/index.md
@@ -0,0 +1,129 @@
+---
+title: Configuration files
+---
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Configuration files
+
+Stack is configured by the content of files in the [YAML](https://yaml.org/)
+format. Stack also supports an [`!include` directive](include.md) that allows a
+configuration file to include the contents of another file.
+
+## Project-specific and non-project specific options
+
+Stack's configuration options are each of one of two types:
+
+<div class="grid cards" markdown>
+
+-   :material-account:{ .lg .middle } __Project-specific__
+
+    Configured only at the project level
+
+    ---
+
+    [:octicons-arrow-right-24: Learn more](project.md)
+
+-   :material-account-multiple:{ .lg .middle } __Non-project specific__
+
+    Configured globally or at the project level.
+
+    ---
+
+    [:octicons-arrow-right-24: Learn more](non-project.md)
+
+</div>
+
+Most of Stack's configuration options are non-project specific.
+
+## Project-level and global configuration files
+
+Stack's configuration files are each of one of two types:
+
+<div class="grid cards" markdown>
+
+-   :material-language-haskell:{ .lg .middle } __Project-level__
+
+    Named `stack.yaml` by default.
+
+    ---
+
+    Contains [project-specific](project.md) options and may contain
+    [non-project-specific](non-project.md) options.
+
+    Non-project-specific options in the project-level configuration file in the
+    `global-project` directory (see below) are ignored by Stack.
+
+-   :octicons-globe-24:{ .lg .middle } __Global__
+
+    Named `config.yaml`.
+
+    There is a user-specific file and there may be a system-wide one. If a
+    user-specific file does not exist, then Stack will create one.
+
+    ---
+
+    Contains [non-project-specific](non-project.md) options.
+
+    An option set in the user-specific file will override a corresponding option
+    set in the system-wide file (if it exists).
+
+</div>
+
+## Location of project-level configuration
+
+Stack obtains project-level configuration from one of the following (in order of
+preference):
+
+1. A file specified by the `--stack-yaml` or `-w` command line option.
+2. A file specified by the `STACK_YAML` environment variable.
+3. A file named `stack.yaml` in the current directory or an ancestor directory.
+4. A file name `stack.yaml` in the `global-project` directory in the
+   [Stack root](../../topics/stack_root.md).
+
+## Location of global configuration
+
+The default location of global configuration files depends on the operating
+system and, in the case of the user-specific file, whether Stack is configured
+to use the XDG Base Directory Specification.
+
+An absolute path to these files can be specified by the
+[`STACK_CONFIG`](../environment_variables.md#stack_config) and
+[`STACK_GLOBAL_CONFIG`](../environment_variables.md#stack_config) environment
+variables, respectively.
+
+=== "Unix-like"
+
+    The default locations are:
+
+    * system-wide: `/etc/stack/config.yaml`; and
+    * user-specific: `config.yaml` in the
+      [Stack root](../../topics/stack_root.md).
+
+    !!! note
+
+        For compatibility with Stack 0.1.5.0 and earlier, if deprecated file
+        `/etc/stack/config` exists, then Stack will use it instead of
+        `/etc/stack/config.yaml`.
+
+=== "Windows"
+
+    The default locations are:
+
+    * system-wide: none; and
+    * user-specific: `config.yaml` in the
+      [Stack root](../../topics/stack_root.md).
+
+=== "XDG Base Directory Specification"
+
+    On Unix-like operating systems and Windows, Stack can be configured to
+    follow the XDG Base Directory Specification if the environment variable
+    `STACK_XDG` is set to any non-empty value. However, Stack will ignore that
+    configuration if the [Stack root](../../topics/stack_root.md) location has
+    been set on the command line or the `STACK_ROOT` environment variable
+    exists.
+
+    If Stack is following the XDG Base Directory Specification, the location of
+    `config.yaml` (for user-specific options) is `<XDG_CONFIG_HOME>/stack`. If
+    the `XDG_CONFIG_HOME` environment variable does not exist, the default is
+    `~/.config/stack` on Unix-like operating systems and `%APPDATA%\stack` on
+    Windows.
diff --git a/doc/configure/yaml/non-project.md b/doc/configure/yaml/non-project.md
new file mode 100644
index 0000000000..ddc40e49ea
--- /dev/null
+++ b/doc/configure/yaml/non-project.md
@@ -0,0 +1,1660 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Non-project-specific configuration
+
+Non-project configuration options can be included in:
+
+* a [project-level configuration file](../yaml/index.md#project-level-and-global-configuration-files)
+  (`stack.yaml`, by default), like [project-specific](project.md) ones; or
+
+* [global configuration files](../yaml/index.md#project-level-and-global-configuration-files)
+  (`config.yaml`).
+
+However, non-project-specific options in the project-level configuration file in
+the `global-project` directory are ignored by Stack.
+
+The options below are listed in alphabetic order.
+
+## allow-different-user
+
+[:octicons-tag-24: 1.0.1.0](https://github.com/commercialhaskell/stack/releases/tag/v1.0.1.0)
+
+Restrictions: POSIX systems only.
+
+Default: `false`
+
+Command line equivalent (takes precedence): `--[no-]allow-different-user` flag
+
+Allow users other than the owner of the [Stack root](../../topics/stack_root.md)
+to use the Stack installation.
+
+~~~yaml
+allow-different-user: true
+~~~
+
+The intention of this option is to prevent file permission problems, for example
+as the result of a Stack command executed under `sudo`.
+
+The option is automatically enabled when Stack is re-spawned in a Docker
+process.
+
+## allow-newer
+
+[:octicons-tag-24: 0.1.8.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.8.0)
+
+Default: `false`
+
+Command line equivalent (takes precedence):
+[`stack build --[no-]allow-newer`](../../commands/build_command.md#-no-allow-newer-flag)
+flag
+
+!!! warning
+
+    This configuration option is misnamed. It causes Stack to ignore all the
+    bounds in the relevant Cabal file(s), not only upper bounds. The name was
+    chosen to match the `--allow-newer` option introduced in `Cabal-1.20.0.0`.
+
+Whether to ignore all version bounds (upper and lower) in Cabal files. See the
+[`allow-newer-deps`](#allow-newer-deps) configuration option to specify the
+scope of application when `allow-newer` is `true`.
+
+~~~yaml
+allow-newer: true
+~~~
+
+## allow-newer-deps
+
+[:octicons-tag-24: 2.9.3](https://github.com/commercialhaskell/stack/releases/tag/v2.9.3)
+
+Default: all packages (if `allow-newer` is `true`)
+
+See the [`allow-newer`](#allow-newer) configuration option.
+
+When `allow-newer` is `false`, this option has no effect (but warns).
+
+When `allow-newer` is `true`, this option specifies the scope of application
+for `allow-newer`. That is, the set of packages for which all version bounds
+(upper and lower) should be ignored in the packages' Cabal files.
+
+~~~yaml
+allow-newer-deps:
+- myPackageA
+- myPackageB
+~~~
+
+## apply-ghc-options
+
+[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
+
+Default: `locals`
+
+Related command line:
+[`stack build --ghc-options`](../../commands/build_command.md#-ghc-options-option)
+option
+
+Determines to which packages any GHC command line options specified on the
+command line are applied. Possible values are: `everything` (all packages,
+project packages or otherwise), `locals` (all project packages, targets or
+otherwise), and `targets` (all project packages that are targets).
+
+!!! note
+
+    The use of `everything` can break invariants about your snapshot database.
+
+!!! info
+
+    Before Stack 0.1.6.0, the default value was `targets`.
+
+## apply-prog-options
+
+[:octicons-tag-24: 2.11.1](https://github.com/commercialhaskell/stack/releases/tag/v2.11.1)
+
+Default: `locals`
+
+Related command line:
+[`stack build --PROG-option`](../../commands/build_command.md#-prog-option-options)
+options
+
+Determines to which packages all and any `--PROG-option` command line options
+specified on the command line are applied. Possible values are: `everything`
+(all packages, project packages or otherwise), `locals` (all project packages,
+targets or otherwise), and `targets` (all project packages that are targets).
+
+!!! note
+
+    The use of `everything` can break invariants about your snapshot database.
+
+## arch
+
+Default: The machine architecture on which Stack is running.
+
+Command line equivalent (takes precedence):
+[`--arch`](../global_flags.md#-arch-option) option
+
+Stack identifies different GHC executables by platform (operating system and
+machine architecture), (optional) GHC variant and (optional) GHC build.
+See [`setup-info`](#setup-info).
+
+`arch` sets the machine architecture. Values can be those recognized by Cabal
+(the library) (which are case-insensitive and include `i386`, `x86_64`, and
+`aarch64` / `arm64`), or other values (which are case-sensitive and treated as
+an unknown 'other' architecture of the specified name).
+
+By default, Stack will warn the user if the specified machine architecture is an
+unknown 'other' architecture. The warning can be muted; see
+[`notify-if-arch-unknown`](#notify-if-arch-unknown)
+
+!!! note
+
+    The machine architecture on which Stack is running is as classified by
+    Cabal (the library). Cabal does not distinguish between certain
+    architectures. Examples are `ppc64`/`powerpc64`/`powerpc64le` (classified as
+    `ppc64`) and `arm`/`armel`/`armeb` (classified as `arm`).
+
+!!! note
+
+    As Cabal (the library) does not distinguish between machine architectures
+    `powerpc64` and `powerpc64le`, the latter can be specified in Stack's
+    configuration as an 'other' architecture, such as `arch: ppc64le`.
+
+## build
+
+[:octicons-tag-24: 1.1.0](https://github.com/commercialhaskell/stack/releases/tag/v1.1.0)
+
+Default:
+
+~~~yaml
+build:
+  # Experimental. Since Stack 3.11.1. Supported by GHC 9.8.1 or later with
+  # Cabal 3.12.0.0 (a boot package of GHC 9.10.1) or later. Ignored with a
+  # warning when unsupported.
+  semaphore: false
+
+  library-profiling: false
+  executable-profiling: false
+  library-stripping: true
+  executable-stripping: true
+
+  # NOTE: global usage of haddock can cause build failures when documentation is
+  # incorrectly formatted. This could also affect scripts which use Stack.
+  haddock: false
+  haddock-arguments:
+
+    # Additional arguments passed to haddock. The corresponding command line
+    # option is --haddock-arguments. Example of use:
+    #
+    # haddock-args:
+    # - "--css=/home/user/my-css"
+    haddock-args: []
+
+  # The corresponding command line flag is --[no-]open.
+  open-haddocks: false
+
+  # If Stack is configured to build Haddock documentation, defaults to true.
+  haddock-deps: false
+
+  # The configuration is ignored, if haddock-for-hackage: true.
+  haddock-internal: false
+
+  # The configuration is ignored, if haddock-for-hackage: true.
+  haddock-hyperlink-source: true
+
+  # If specified, implies haddock-internal: false and
+  # haddock-hyperlink-source: true. Since Stack 2.15.1.
+  haddock-for-hackage: false
+  copy-bins: false
+  copy-compiler-tool: false
+  prefetch: false
+  keep-going: false
+  keep-tmp-files: false
+
+  # These are inadvisable to use in your global configuration, as they make the
+  # Stack build command line behave quite differently.
+  force-dirty: false
+  test: false
+  test-arguments:
+    rerun-tests: true   # Rerun successful tests
+
+    # The corresponding command line option is --test-arguments. Example of use:
+    #
+    # additional-args:
+    # - "--fail-fast"
+    additional-args: []
+    coverage: false
+    no-run-tests: false
+    # The option is ignored if the specified number of seconds is not positive:
+    test-suite-timeout: 0
+    # The option is ignored if the specified number of seconds is not positive:
+    test-suite-timeout-grace: 0
+  bench: false
+  benchmark-opts:
+
+    # Example of use:
+    #
+    # benchmark-arguments: "--csv bench.csv"
+    benchmark-arguments: ""
+    no-run-benchmarks: false
+  reconfigure: false
+  cabal-verbosity: normal
+  cabal-verbose: false
+  split-objs: false
+  skip-components: [] # --skip
+
+  # Since Stack 1.8. Starting with Stack 2.0, the default is true
+  interleaved-output: true
+
+  # Since Stack 2.13.1. Available options are none, count-only, capped and full.
+  progress-bar: capped
+
+  # Since Stack 1.10.
+  ddump-dir: ""
+~~~
+
+Command line equivalents (take precedence): Yes, see below.
+
+Allows setting build options which are usually specified on the command line.
+
+The meanings of these settings correspond directly with the command line flags
+of the same name. For further information, see the
+[`stack build`](../../commands/build_command.md) command documentation.
+
+## casa
+
+[:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
+
+Default:
+
+~~~yaml
+casa:
+  enable: true # Use a Casa server?
+  repo-prefix: https://casa.stackage.org # Unless casa-repo-prefix is set.
+  max-keys-per-request: 1280 # Maximum number of keys per request.
+~~~
+
+This option specifies whether or not Stack should use a Casa
+(content-addressable storage archive) server to cache Cabal files and all other
+files in packages; and, if so, the prefix for the URL used to pull information
+from the server and the maximum number of keys per request. For further
+information, see this blog post about
+[Casa and Stack](https://www.fpcomplete.com/blog/casa-and-stack/).
+
+`repo-prefix` replaces [`casa-repo-prefix`](#casa-repo-prefix) (which is
+deprecated) and has precedence if both keys are set.
+
+## casa-repo-prefix
+
+[:octicons-tag-24: 2.3.1](https://github.com/commercialhaskell/stack/releases/tag/v2.3.1)
+
+Deprecated in favour of [`casa`](#casa), which takes precedence if present.
+
+Default: `https://casa.stackage.org`
+
+This option specifies the prefix for the URL used to pull information from the
+Casa server.
+
+## color
+
+Command line equivalent (takes precedence): `--color` option
+
+This option specifies when to use color in output. The option is used as
+`color: <WHEN>`, where `<WHEN>` is 'always', 'never', or 'auto'. On Windows
+versions before Windows 10, for terminals that do not support color codes, the
+default is 'never'; color may work on terminals that support color codes.
+
+(The British English spelling (colour) is also accepted. In configuration files,
+the American spelling is the alternative that has priority.)
+
+## compiler
+
+[:octicons-tag-24: 0.1.8.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.8.0)
+
+Command line equivalent (takes precedence): `--compiler` option
+
+Overrides the version of the compiler (and, implicitly, its boot packages) in
+the snapshot. Note that the `compiler-check` flag also applies to the version
+numbers. This uses the same syntax as compiler snapshots like `ghc-9.10.3`. This
+can be used to override the compiler (and, implicitly, its boot packages) for a
+Stackage snapshot, like this:
+
+~~~yaml
+snapshot: lts-24.55
+compiler: ghc-9.10.2
+compiler-check: match-exact
+~~~
+
+:octicons-beaker-24: Experimental
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+Stack also supports building the GHC compiler from source. For further
+information, see the [building GHC from source](../../topics/GHC_from_source.md)
+documentation.
+
+## compiler-check
+
+[:octicons-tag-24: 0.1.4.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.4.0)
+
+Default: `match-minor`
+
+Specifies how the compiler version in the snapshot is matched against concrete
+versions. Valid values:
+
+* `match-minor`: make sure that the first three components match, but allow
+  patch-level differences. For example< 7.8.4.1 and 7.8.4.2 would both match
+  7.8.4. This is useful to allow for custom patch levels of a compiler.
+* `match-exact`: the entire version number must match precisely
+* `newer-minor`: the third component can be increased, e.g. if your snapshot is
+  `ghc-7.10.1`, then 7.10.2 will also be allowed. This was the default up
+  through Stack 0.1.3
+
+## concurrent-tests
+
+[:octicons-tag-24: 0.1.2.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.2.0)
+
+Default: `true`
+
+This option specifies whether test suites should be executed concurrently with
+each other. The default is `true` since this is usually fine and it often means
+that tests can complete earlier. However, if some test suites require exclusive
+access to some resource, or require a great deal of CPU or memory resources,
+then it makes sense to set this to `false`.
+
+~~~yaml
+concurrent-tests: false
+~~~
+
+## configure-options
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+Related command line (takes precedence):
+[`stack build --PROG-option`](../../commands/build_command.md#-prog-option-options)
+options
+
+`configure-options` can specify Cabal (the library) options (including
+`--PROG-option` or `--PROG-options` options) for the configure step of the Cabal
+build process for a named package, all project packages that are targets (using
+the `$targets` key), all project packages (targets or otherwise) (using the
+`$locals` key), or all packages (project packages or otherwise) (using the
+`$everything` key).
+
+~~~yaml
+configure-options:
+  $everything:
+  - --with-gcc
+  - /some/path
+  $locals:
+  - --happy-option=--ghc
+  $targets:
+  # Only works on platforms where GHC supports linking against shared Haskell
+  # libraries:
+  - --enable-executable-dynamic
+  my-package:
+  - --another-flag
+~~~
+
+On platforms where GHC supports linking against shared Haskell libraries (that
+currently excludes Windows), Cabal's `--enable-executable-dynamic` flag (which
+implies `--enable-shared`, unless `--disable-shared` is specified) links
+dependent Haskell libraries into executables dynamically.
+
+## connection-count
+
+Default: `8`
+
+Integer indicating how many simultaneous downloads are allowed to happen.
+
+### default-init-snapshot
+
+[:octicons-tag-24: 3.1.1](https://github.com/commercialhaskell/stack/releases/tag/v3.1.1)
+
+Default: As for the [`stack init`](../../commands/init_command.md) command when
+no snapshot is specified at the command line.
+
+Command line equivalent (takes precedence):
+[`--snapshot`](../global_flags.md#-snapshot-option) or
+[`--resolver`](../global_flags.md#-resolver-option) (deprecated) option
+
+This option specifies which snapshot to use with `stack init`, when none is
+specified at the command line.
+
+`default-init-snapshot: global` specifies the snapshot specified by the
+project-level configuration file in the `global-project` directory in the
+[Stack root](../../topics/stack_root.md#global-project-directory).
+
+## default-template
+
+Default: `new-template` in the
+[stack-templates](https://github.com/commercialhaskell/stack-templates/)
+repository.
+
+This option specifies which template to use with `stack new`, when none is
+specified. Other templates are listed in the
+[stack-templates](https://github.com/commercialhaskell/stack-templates/)
+repository. See the output of `stack templates`.
+
+## docker
+
+Command line equivalents: `--docker-*` flags and options (see
+`stack --docker-help` for details).
+
+For further information, see the
+[Docker integration](../../topics/docker_integration.md#configuration)
+documentation.
+
+## dump-logs
+
+[:octicons-tag-24: 1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v1.3.0)
+
+Default: `warning`
+
+Command line equivalent (takes precedence): `--[no-]dump-logs` flag
+
+In the case of *non-interleaved* output and *more than one* target package,
+Stack sends the build output from GHC for each target package to a log file,
+unless an error occurs that prevents that. For further information, see the
+[`stack build --[no-]interleaved-output` flag](../../commands/build_command.md#-no-interleaved-output-flag)
+documentation.
+
+The value of the `dump-logs` key controls what, if any, log file content is sent
+('dumped') to the standard error stream of the console at the end of the build.
+Possible values are:
+
+~~~yaml
+dump-logs: none    # do not dump the content of any log files
+dump-logs: warning # dump the content of any log files that include GHC warnings
+dump-logs: all     # dump the content of all log files
+~~~
+
+At the command line, `--no-dump-logs` is equivalent to `dump-logs: none` and
+`--dump-logs` is equivalent to `dump-logs: all`.
+
+If GHC reports an error during the build and a log file is created, that build
+output will be included in the log file. Stack will also report errors during
+building to the standard error stream. That stream can be piped to a file. For
+example, for a file named `stderr.log`:
+
+~~~text
+stack --no-dump-logs --color always build --no-interleaved-output 2> stderr.log
+~~~
+
+## extra-include-dirs
+
+Default: `[]`
+
+Command line equivalent: `--extra-include-dirs` option (repeat for each
+directory)
+
+A list of extra paths to be searched for header files. Paths should be absolute
+
+~~~yaml
+extra-include-dirs:
+- /opt/foo/include
+~~~
+
+Since these are system-dependent absolute paths, it is recommended that you
+specify these in your `config.yaml` file. If you control the build environment
+in your project's ``stack.yaml``, perhaps through docker or other means, then it
+may well make sense to include these there as well.
+
+## extra-lib-dirs
+
+Default: `[]`
+
+Command line equivalent: `--extra-lib-dirs` option (repeat for each directory)
+
+A list of extra paths to be searched for libraries. Paths should be absolute
+
+~~~yaml
+extra-lib-dirs:
+- /opt/foo/lib
+~~~
+
+Since these are system-dependent absolute paths, it is recommended that you
+specify these in your `config.yaml` file. If you control the build environment
+in your project's ``stack.yaml``, perhaps through Docker or other means, then it
+may well make sense to include these there as well.
+
+## extra-path
+
+[:octicons-tag-24: 0.1.4.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.4.0)
+
+This option specifies additional directories to prepend to the PATH. These will
+be used when resolving the location of executables, and will also be visible in
+the PATH of processes run by Stack.
+
+For example, to prepend `/path-to-some-dep/bin` to your PATH:
+
+~~~yaml
+extra-path:
+- /path-to-some-dep/bin
+~~~
+
+Other paths added by Stack - things like the project's binary directory and the
+compiler's binary directory - will take precedence over those specified here
+(the automatic paths get prepended).
+
+## file-watch-hook
+
+[:octicons-tag-24: 3.1.1](https://github.com/commercialhaskell/stack/releases/tag/v3.1.1)
+
+Specifies the location of an executable or `sh` shell script to be run after
+each attempted build with
+[`build --file-watch`](../../commands/build_command.md#-file-watch-flag). An
+absolute or relative path can be specified. Changes to the configuration after
+the initial `build --file-watch` command are ignored.
+
+If the project-level configuration is provided in the `global-project` directory
+in the [Stack root](../../topics/stack_root.md), a relative path is assumed to
+be relative to the current directory. Otherwise, it is assumed to be relative to
+the directory of the project-level configuration file.
+
+## ghc-build
+
+[:octicons-tag-24: 1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v1.3.0)
+
+Default: `standard`
+
+Command line equivalent (takes precedence): `--ghc-build` option
+
+Stack identifies different GHC executables by platform (operating system and
+machine architecture), (optional) GHC variant and (optional) GHC build.
+See [`setup-info`](#setup-info).
+
+`ghc-build` specifies a specialized architecture for the GHC executable.
+Normally this is determined automatically, but it can be overridden. Possible
+arguments include `standard`, `gmp4`, `nopie`, `tinfo6`, `tinfo6-libc6-pre232`,
+`tinfo6-nopie`, `ncurses6`, `int-native` and `integersimple`.
+
+## ghc-options
+
+[:octicons-tag-24: 0.1.4.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.4.0)
+
+Default: `{}`
+
+Related command line (takes precedence):
+[`stack build --ghc-options`](../../commands/build_command.md#-ghc-options-option)
+option
+
+GHC command line options can be specified for a package in its Cabal file
+(including one created from a `package.yaml` file). This option augments and, if
+applicable (see below), overrides any such GHC command line options.
+
+`ghc-options` can specify GHC command line options for a named package, all
+project packages that are targets (using the `$targets` key), all project
+packages (targets or otherwise) (using the `$locals` key), or all packages
+(project packages or otherwise) (using the `$everything` key).
+
+~~~yaml
+ghc-options:
+  "$everything": -O2
+  "$locals": -Wall
+  "$targets": -Werror
+  some-package: -DSOME_CPP_FLAG
+~~~
+
+GHC's command line options are _order-dependent_ and evaluated from left to
+right. Later options can override the effect of earlier ones. Stack applies
+options (as applicable) in the order of `$everything`, `$locals`, `$targets`,
+and then those for the named package. Any GHC command line options for a package
+specified at Stack's command line are applied after those specified in Stack's
+configuration files.
+
+Since Stack 1.6.1, setting a GHC options for a specific package will
+automatically promote it to a project package (much like setting a custom
+package flag). However, setting options via `$everything` on all flags will not
+do so (see
+[GitHub discussion](https://github.com/commercialhaskell/stack/issues/849#issuecomment-320892095)
+for reasoning). This can lead to unpredictable behavior by affecting your
+snapshot packages.
+
+!!! info
+
+    Before Stack 1.6.1, the key `*` (then deprecated) had the same function as
+    the key `$everything`.
+
+## ghc-variant
+
+[:octicons-tag-24: 0.1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.5.0)
+
+Default: `standard`
+
+Command line equivalent (takes precedence): `--ghc-variant` option
+
+Stack identifies different GHC executables by platform (operating system and
+machine architecture), (optional) GHC variant and (optional) GHC build.
+See [`setup-info`](#setup-info).
+
+`ghc-variant` specifies a variant of the GHC executable. Known values are:
+
+* `standard`: Use the standard GHC binary distribution
+* `int-native`: From GHC 9.4.1, use a GHC bindist that uses the Haskell-native
+   big-integer
+  [backend](https://downloads.haskell.org/~ghc/9.0.2/docs/html/users_guide/9.0.1-notes.html#highlights).
+  For further information, see this [article](https://iohk.io/en/blog/posts/2020/07/28/improving-haskells-big-numbers-support/).
+* `integersimple`: Use a GHC bindist that uses
+  [integer-simple instead of GMP](https://ghc.haskell.org/trac/ghc/wiki/ReplacingGMPNotes)
+* any other value: Use a custom GHC bindist. You should specify
+  [setup-info](#setup-info) or [setup-info-locations](#setup-info-locations)
+  so `stack setup` knows where to download it,
+  or pass the `stack setup --ghc-bindist` argument on the command-line
+
+This option is incompatible with [`system-ghc: true`](#system-ghc).
+
+## global-hints-location
+
+[:octicons-tag-24: 3.1.1](https://github.com/commercialhaskell/stack/releases/tag/v3.1.1)
+
+Default:
+
+~~~yaml
+global-hints-location:
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-content/master/stack/global-hints.yaml
+~~~
+
+(as set in the `pantry` library)
+
+Sets the location of the global hints YAML file. The location can be either a
+filepath of a local file or a URL. The filepath can be absolute or relative to
+the Stack root.
+
+For example:
+
+~~~yaml
+global-hints-location:
+  filepath: \pantry\global-hints.yaml
+~~~
+
+or:
+
+~~~yaml
+global-hints-location:
+  url: https://example.com/global-hints/location/global-hints.yaml
+~~~
+
+## hackage-base-url
+
+[:octicons-tag-24: 1.9.1](https://github.com/commercialhaskell/stack/releases/tag/v1.9.1)
+
+Default: `https://hackage.haskell.org/`
+
+Sets the address of the Hackage server to upload the package to.
+
+~~~yaml
+hackage-base-url: https://hackage.example.com/
+~~~
+
+## hide-source-paths
+
+Default: `true`
+([:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1))
+
+Whether to use the `-fhide-source-paths` option by default for GHC >= 8.2:
+
+~~~yaml
+hide-source-paths: false
+~~~
+
+Build output when enabled:
+
+~~~text
+...
+[1 of 2] Compiling Lib
+[2 of 2] Compiling Paths_test_pr
+...
+~~~
+
+Build output when disabled:
+
+~~~text
+...
+[1 of 2] Compiling Lib              ( src/Lib.hs, .stack-work/dist/x86_64-linux-tinfo6/Cabal-2.4.0.1/build/Lib.o )
+...
+~~~
+
+## hide-th-loading
+
+Default: `true`
+
+Strip out the "Loading ..." lines from GHC build output, produced when using
+Template Haskell.
+
+## hpack-force
+
+[:octicons-tag-24: 3.1.1](https://github.com/commercialhaskell/stack/releases/tag/v3.1.1)
+
+Default: `false`
+
+Command line equivalent (takes precedence):
+[`--hpack-force` option](../global_flags.md#-no-hpack-force-flag)
+
+Whether or not to allow Hpack to overwrite a Cabal file that was created by a
+more recent version of Hpack or has been modified manually. By default,
+Hpack 0.12.0 or later will decline to overwrite a Cabal file that was created by
+a more recent version of Hpack and Hpack 0.20.0 or later will decline to
+overwrite a Cabal file that has been modified manually.
+
+## ignore-revision-mismatch
+
+(Removed 1.11)
+
+This flag was introduced in Stack 1.6, and removed on the move to Pantry. You
+will receive a warning if this configuration value is set.
+
+## install-ghc
+
+Default: `true`
+([:octicons-tag-24: 1.6.1](https://github.com/commercialhaskell/stack/releases/tag/v1.6.1))
+
+Command line equivalent (takes precedence):
+[`--[no-]install-ghc`](../global_flags.md#-no-install-ghc-flag) flag
+
+If the specified GHC version is not available, (if `true`) should Stack seek to
+download and install that version when it is needed or (if `false`) fail
+(reporting that the specified compiler is not available)?
+
+~~~yaml
+# Even if needed, do not seek to download and install a Stack-supplied GHC:
+install-ghc: false
+~~~
+
+On Windows, `install-ghc: false` also disables the download and installation of
+the Stack-supplied MSYS2 when it is needed.
+
+!!! note
+
+    The `install-ghc` option does not specify whether Stack checks the
+    availability of either a 'system' GHC executable on the PATH or a
+    Stack-supplied GHC executable. In that regard, see the
+    [`system-ghc`](#system-ghc) option.
+
+## install-msys
+
+[:octicons-tag-24: 3.5.1](https://github.com/commercialhaskell/stack/releases/tag/v3.5.1)
+
+Restrictions: Windows systems only
+
+Default: same as the [`install-ghc`](#install-ghc) setting (including if that is
+set on the command line)
+
+Command line equivalent (takes precedence):
+[`--[no-]install-msys`](../global_flags.md#-no-install-msys-flag) flag
+
+If Stack is checking for the Stack-supplied MSYS2 when Stack is setting up the
+environment, whether or not to download and install MSYS2 when it is needed.
+
+To skip entirely checking for the Stack-supplied MSYS2, see the documentation
+for the [`skip-msys`](#skip-msys) configuration option.
+
+## jobs
+
+Default: the number of CPUs (cores) that the machine has.
+
+Command line equivalent (takes precedence):
+[`-j`, `--jobs` option](../global_flags.md#-jobs-or-j-option)
+
+Specifies the number of concurrent jobs (principally, Stack actions during
+building - see further below) to run.
+
+When [building GHC from source](../../topics/GHC_from_source.md), specifies the
+`-j[<n>]` flag of GHC's Hadrian build system.
+
+In some circumstances, the default can cause some machines to run out of memory
+during building. If those circumstances arise, specify `jobs: 1`.
+
+This configuration option is distinct from GHC's own `-j[<n>]` flag, which
+relates to parallel compilation of modules within a package.
+
+## local-bin-path
+
+Default (on Unix-like operating systems): `~/.local/bin`
+
+Default (on Windows): `%APPDATA%\local\bin`
+
+Command line equivalent (takes precedence): `--local-bin-path` option
+
+Specifies the target directory for
+[`stack build --copy-bins`](../../commands/build_command.md#-no-copy-bins-flag)
+and `stack install`. An absolute or relative path can be specified.
+
+If the project-level configuration is provided in the `global-project` directory
+in the [Stack root](../../topics/stack_root.md), a relative path is assumed to
+be relative to the current directory. Otherwise, it is assumed to be relative to
+the directory of the project-level configuration file.
+
+## local-programs-path
+
+[:octicons-tag-24: 1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v1.3.0)
+
+This overrides the location of the Stack 'programs' directory, where tools like
+GHC get installed. The path must be an absolute one.
+
+Stack's defaults differ between Unix-like operating systems and Windows.
+
+=== "Unix-like"
+
+    Default: `programs` directory in the
+    [Stack root](../../topics/stack_root.md).
+
+=== "Windows"
+
+    Default: `$Env:LOCALAPPDATA\Programs\stack`, if the `LOCALAPPDATA`
+    environment variable exists. Otherwise, the `programs` directory in the
+    [Stack root](../../topics/stack_root.md).
+
+    The MSYS2 tool is also installed in the Stack 'programs' directory.
+
+    !!! warning "Space character in the path to Stack's 'programs' directory"
+
+        If there is a space character in the path to Stack's 'programs'
+        directory this may cause problems:
+
+        *   with building packages that make use of the GNU project's `autoconf`
+            package and `configure` shell script files. That may be the case
+            particularly if there is no corresponding short name ('8 dot 3'
+            name) for the directory in the path with the space (which may be the
+            case if '8 dot 3' names have been stripped or their creation not
+            enabled by default). Examples of packages on Hackage that make use
+            of `configure` are `network` and `process`; and
+
+        *   building with GHC 9.4.1 and later. These versions of GHC have a bug
+            which means they do not work if the path to the `ghc` executable has
+            a space in it.
+
+        The default location for Stack's 'programs' directory will have a space
+        in the path if the value of the `USERNAME` environment variable includes
+        a space.
+
+        If there are problems building, it will be necessary to specify an
+        alternative path that does not contain spaces. For example, the
+        `programs` directory in the [Stack root](../../topics/stack_root.md)
+        (assuming that path is space-free). For example, if the relevant
+        directory is `C:\sr\programs`, add:
+        ~~~yaml
+        local-programs-path: C:\sr\programs
+        ~~~
+
+        to Stack's [global configuration](https://docs.haskellstack.org/en/stable/configure/yaml/#location-of-global-configuration)
+        file (`config.yaml`).
+
+        If that global configuration file does not yet exist, command:
+        ~~~text
+        stack --no-install-ghc setup
+        ~~~
+
+        to cause Stack to create it (without also installing GHC).
+
+=== "Windows (Command Prompt)"
+
+    Default: `%LOCALAPPDATA%\Programs\stack`, if the `LOCALAPPDATA`
+    environment variable exists. Otherwise, the `programs` directory in the
+    [Stack root](../../topics/stack_root.md).
+
+    The MSYS2 tool is also installed in the Stack 'programs' directory.
+
+    !!! warning "Space character in the path to Stack's 'programs' directory"
+
+        If there is a space character in the path to Stack's 'programs'
+        directory this may cause problems:
+
+        *   with building packages that make use of the GNU project's `autoconf`
+            package and `configure` shell script files. That may be the case
+            particularly if there is no corresponding short name ('8 dot 3'
+            name) for the directory in the path with the space (which may be the
+            case if '8 dot 3' names have been stripped or their creation not
+            enabled by default). Examples of packages on Hackage that make use
+            of `configure` are `network` and `process`; and
+
+        *   building with GHC 9.4.1 and later. These versions of GHC have a bug
+            which means they do not work if the path to the `ghc` executable has
+            a space in it.
+
+        The default location for Stack's 'programs' directory will have a space
+        in the path if the value of the `USERNAME` environment variable includes
+        a space.
+
+        If there are problems building, it will be necessary to specify an
+        alternative path that does not contain spaces. For example, the
+        `programs` directory in the [Stack root](../../topics/stack_root.md)
+        (assuming that path is space-free). For example, if the relevant
+        directory is `C:\sr\programs`, add:
+        ~~~yaml
+        local-programs-path: C:\sr\programs
+        ~~~
+
+        to Stack's [global configuration](https://docs.haskellstack.org/en/stable/configure/yaml/#location-of-global-configuration)
+        file (`config.yaml`).
+
+        If that global configuration file does not yet exist, command:
+        ~~~text
+        stack --no-install-ghc setup
+        ~~~
+
+        to cause Stack to create it (without also installing GHC).
+
+## modify-code-page
+
+[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
+
+Restrictions: Windows systems only.
+
+Default: `true`
+
+Command line equivalent (takes precedence): `--[no-]modify-code-page` flag
+
+Whether to modify the code page for UTF-8 output.
+
+~~~yaml
+modify-code-page: false
+~~~
+
+## msys-environment
+
+[:octicons-tag-24: 3.1.1](https://github.com/commercialhaskell/stack/releases/tag/v3.1.1)
+
+Restrictions: Windows systems only.
+
+Default:
+([:octicons-tag-24: 3.11.1](https://github.com/commercialhaskell/stack/releases/tag/v3.11.1))
+`CLANG64` (64-bit Windows)
+
+The name of the MSYS2 environment (case-sensitive) used in the Stack
+environment. Valid environments are `CLANG32`, `CLANG64`, `CLANGARM64`,
+`MINGW32`, `MINGW64`, and `UCRT64`.
+
+## nix
+
+[:octicons-tag-24: 0.1.10.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.10.0)
+
+Default:
+
+~~~yaml
+nix:
+  enable: false # Except on NixOS, where `enable: true`
+  pure: true
+  packages: []
+  shell-file:
+  nix-shell-options: []
+  path: []
+  add-gc-roots: false
+~~~
+
+Command line equivalents: `--nix-*` flags and options (see `stack --nix-help`
+for details).
+
+For further information, see the
+[Nix integration](../../topics/nix_integration.md#non-project-specific-configuration) documentation.
+
+## notify-if-arch-unknown
+
+[:octicons-tag-24: 2.15.1](https://github.com/commercialhaskell/stack/releases/tag/v2.15.1)
+
+Default: `true`
+
+If the specified machine architecture value is unknown to Cabal (the library),
+should Stack notify the user of that?
+
+## notify-if-base-not-boot
+
+[:octicons-tag-24: 3.9.1](https://github.com/commercialhaskell/stack/releases/tag/v3.9.1)
+
+Default: `true`
+
+From GHC 9.12.1, `base` is not a GHC wired-in package. When using such GHC
+versions, if the specified `base` package is other than the GHC boot package,
+should Stack notify the user of that?
+
+When using GHC versions where `base` is a GHC wired-in package, Stack will
+always notify the user if the specified `base` package is other than the GHC
+boot package.
+
+## notify-if-cabal-untested
+
+[:octicons-tag-24: 2.15.1](https://github.com/commercialhaskell/stack/releases/tag/v2.15.1)
+
+Default: `true`
+
+If Stack has not been tested with the version of Cabal (the library) that has
+been found, should Stack notify the user of that?
+
+## notify-if-ghc-untested
+
+[:octicons-tag-24: 2.15.1](https://github.com/commercialhaskell/stack/releases/tag/v2.15.1)
+
+Default: `true`
+
+If Stack has not been tested with the version of GHC that is being used, should
+Stack notify the user of that?
+
+## notify-if-nix-on-path
+
+[:octicons-tag-24: 2.15.1](https://github.com/commercialhaskell/stack/releases/tag/v2.15.1)
+
+Default: `true`
+
+If Stack's integration with the Nix package manager is not enabled, should Stack
+notify the user if a `nix` executable is on the PATH?
+
+## notify-if-no-run-benchmarks
+
+[:octicons-tag-24: 3.3.1](https://github.com/commercialhaskell/stack/releases/tag/v3.3.1)
+
+Default: `true`
+
+Should Stack notify the user if the automatic running of a benchmark is
+prevented by the `--no-run-benchmarks` flag?
+
+## notify-if-no-run-tests
+
+[:octicons-tag-24: 3.3.1](https://github.com/commercialhaskell/stack/releases/tag/v3.3.1)
+
+Default: `true`
+
+Should Stack notify the user if the automatic running of a test suite is
+prevented by the `--no-run-tests` flag?
+
+## package-index
+
+[:octicons-tag-24: 2.9.3](https://github.com/commercialhaskell/stack/releases/tag/v2.9.3)
+
+Default:
+
+~~~yaml
+package-index:
+  download-prefix: https://hackage.haskell.org/
+  hackage-security:
+    keyids:
+    - 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d
+    - 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42
+    - 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921
+    - c7de58fc6a224b92b5b513f26fbb8b370f2d97c7cfe0075a951314a55734be93
+    - fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0
+    key-threshold: 3
+    ignore-expiry: true
+~~~
+
+Specify the package index. The index must use the
+[Hackage Security](https://hackage.haskell.org/package/hackage-security) format.
+This setting is most useful for providing a mirror of the official Hackage
+server for
+
+* bypassing a firewall; or
+* faster downloads.
+
+If the setting specifies an index that does not mirror Hackage, it is likely
+that will result in significant breakage, including most snapshots failing to
+work.
+
+In the case of Hackage, the keys of its root key holders are contained in the
+`haskell-infra/hackage-root-keys`
+[repository](https://github.com/haskell-infra/hackage-root-keys). The Hackage
+package index is signed. A signature is valid when three key holders have
+signed. The Hackage timestamp is also signed. A signature is valid when one key
+holder has signed.
+
+If the `hackage-security` key is absent, the Hackage Security configuration will
+default to that applicable to the official Hackage server since 2025-07-24.
+
+`key-threshold` specifies the minimum number of keyholders that must have signed
+the package index for it to be considered valid.
+
+`ignore-expiry` specifies whether or not the expiration of timestamps should be
+ignored.
+
+!!! info
+
+    In the case of Stack 3.7.1 and before, if the `hackage-security` key is
+    absent, the Hackage Security configuration will default to that applicable
+    to the official Hackage server before 2025-07-24.
+
+    Before Stack 2.1.3, the default for `ignore-expiry` was `false`. For more
+    information, see
+    [issue #4928](https://github.com/commercialhaskell/stack/issues/4928).
+
+## pvp-bounds
+
+[:octicons-tag-24: 0.1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.5.0)
+
+Default: `none`
+
+Command line equivalent (takes precedence):
+[`stack sdist --pvp-bounds`](../../commands/sdist_command.md) option or
+[`stack upload --pvp-bounds`](../../commands/upload_command.md) option
+
+!!! warning
+
+    As of Stack 1.6.0, this feature does not reliably work, due to issues with
+    the Cabal library's printer. Stack will generate a warning when a lossy
+    conversion occurs, in which case you may need to disable this setting. For
+    further information, see issue
+    [#3550](https://github.com/commercialhaskell/stack/issues/3550).
+
+When using the `sdist` and `upload` commands, this setting determines whether
+the Cabal file's dependencies should be modified to reflect PVP lower and upper
+bounds.
+
+### Basic use
+
+Values are `none` (unchanged), `upper` (add upper bounds), `lower` (add
+lower bounds), and both (and upper and lower bounds). The algorithm Stack
+follows is:
+
+* If an upper or lower bound (other than `>= 0` - 'any version') already exists
+  on a dependency, it is left alone
+* When adding a lower bound, Stack looks at the current version specified by
+  `stack.yaml`, and sets it as the lower bound (e.g., `foo >= 1.2.3`)
+* When adding an upper bound, Stack sets it as less than the next major version
+  (e.g., `foo < 1.3`)
+
+~~~yaml
+pvp-bounds: none
+~~~
+
+For further information, see the announcement
+[blog post](https://www.fpcomplete.com/blog/2015/09/stack-pvp).
+
+### Use with Cabal file revisions
+
+[:octicons-tag-24: 1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v1.5.0)
+
+Each of the values listed above supports adding `-revision` to the end of the
+value, e.g. `pvp-bounds: both-revision`. This means that, when uploading to
+Hackage, Stack will first upload your tarball with an unmodified Cabal file, and
+then upload a Cabal file revision with the PVP bounds added.
+
+This can be useful - especially combined with the
+[Stackage no-revisions feature](http://www.snoyman.com/blog/2017/04/stackages-no-revisions-field) -
+as a method to ensure PVP compliance without having to proactively fix bounds
+issues for Stackage maintenance.
+
+## recommend-stack-upgrade
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+Default: `true`
+
+When Stack notices that a new version of Stack is available, should it notify
+the user?
+
+## rebuild-ghc-options
+
+[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
+
+Default: `false`
+
+Should Stack rebuild a package when its GHC options change?
+
+The default value reflects that, in most cases, GHC options are used to affect
+optimization levels and warning behavior, for which GHC does not recompile the
+modules.
+
+!!! info
+
+    Before Stack 0.1.6.0, Stack rebuilt a package when its GHC options changed.
+
+## require-stack-version
+
+Default: `"-any"`
+
+Require a version of Stack within the specified range
+([cabal-style](https://www.haskell.org/cabal/users-guide/developing-packages.html#build-information))
+to be used for this project. Example: `require-stack-version: "== 0.1.*"`
+
+## save-hackage-creds
+
+[:octicons-tag-24: 1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v1.5.0)
+
+Default: `true`
+
+Command line equivalent (takes precedence):
+[`stack upload --[no]-save-hackage-creds`](../../commands/upload_command.md)
+option
+
+Controls whether, when using `stack upload`, the user's Hackage username and
+password are stored in a local file.
+
+~~~yaml
+save-hackage-creds: true
+~~~
+
+## setup-info
+
+[:octicons-tag-24: 0.1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.5.0)
+
+The `setup-info` dictionary specifies download locations for tools to be
+installed during set-up, such as GHC or, on Windows, 7z and MSYS2. The
+dictionary maps `('Tool', 'Platform', 'Version')` to the location where it can
+be obtained. For example, mapping `(GHC, 64-bit Windows, 9.2.3)` to the URL
+hosting the archive file for GHC's installation.
+
+Possible usages of this configuration option are:
+
+1. Using Stack offline or behind a firewall.
+2. Extending the tools known to Stack, such as cutting-edge versions of GHC or
+   builds for custom Linux distributions (for use with the
+   [ghc-variant](#ghc-variant) option).
+
+By default, Stack obtains the dictionary from
+[stack-setup-2.yaml](https://github.com/commercialhaskell/stackage-content/raw/master/stack/stack-setup-2.yaml).
+
+The `setup-info` dictionary is constructed in the following order:
+
+1. `setup-info` in the configuration - inline configuration
+2. `--setup-info-yaml` command line arguments - URLs or paths. Multiple
+   locations may be specified.
+3. `setup-info-locations` in the configuration - URLs or paths. See further
+   below.
+
+The format of this key is the same as in the default
+[stack-setup-2.yaml](https://github.com/commercialhaskell/stackage-content/raw/master/stack/stack-setup-2.yaml).
+For example, GHC 9.2.3 of custom variant `myvariant` (see further below) on
+64-bit Windows:
+
+~~~yaml
+setup-info:
+  ghc:
+    windows64-custom-myvariant:
+      9.2.3:
+        url: "https://example.com/ghc-9.2.3-x86_64-unknown-mingw32-myvariant.tar.xz"
+~~~
+
+'Platforms' are pairs of an operating system and a machine architecture (for
+example, 32-bit i386 or 64-bit x86-64) (represented by the
+`Cabal.Distribution.Systems.Platform` type). Stack currently (version 2.15.1)
+supports the following pairs in the format of the `setup-info` key:
+
+|Operating system|I386 arch|X86_64 arch|Other machine architectures                                 |
+|----------------|---------|-----------|------------------------------------------------------------|
+|Linux           |linux32  |linux64    |AArch64: linux-aarch64, Arm: linux-armv7, Sparc: linux-sparc|
+|OSX             |macosx   |macosx     |                                                            |
+|Windows         |windows32|windows64  |                                                            |
+|FreeBSD         |freebsd32|freebsd64  |AArch64: freebsd-aarch64                                    |
+|OpenBSD         |openbsd32|openbsd64  |                                                            |
+
+For GHC, the distinguishing 'Version' in the key format includes a 'tag' for
+any (optional) GHC variant (see [ghc-variant](#ghc-variant)) and a further 'tag'
+for any (optional) specialised GHC build (see [ghc-build](#ghc-build)).
+
+The optional variant 'tag' is either `-integersimple` or
+`-custom-<custom_variant_name>`.
+
+For example, for GHC 9.0.2 of specialised GHC build `tinfo6` on x86_64 Linux:
+~~~yaml
+setup-info:
+  ghc:
+    linux64-tinfo6:
+      9.0.2:
+        url: "http://downloads.haskell.org/~ghc/9.0.2/ghc-9.0.2a-x86_64-fedora27-linux.tar.xz"
+        content-length: 237286244
+        sha1: affc2aaa3e6a1c446698a884f56a0a13e57f00b4
+        sha256: b2670e9f278e10355b0475c2cc3b8842490f1bca3c70c306f104aa60caff37b0
+~~~
+
+On Windows, the required 7z executable and DLL tools are represented in the
+format of the `setup-info` key simply by `sevenzexe-info` and `sevenzdll-info`.
+
+This configuration **adds** the specified setup information metadata to the
+default. Specifying this configuration **does not** prevent the default
+[stack-setup-2.yaml](https://github.com/commercialhaskell/stackage-content/raw/master/stack/stack-setup-2.yaml)
+from being consulted as a fallback. If, however, you need to **replace** the
+default `setup-info` dictionary, use the following:
+
+~~~yaml
+setup-info-locations: []
+~~~
+
+## setup-info-locations
+
+[:octicons-tag-24: 2.3.1](https://github.com/commercialhaskell/stack/releases/tag/v2.3.1)
+
+Command line equivalent (takes precedence): `--setup-info-yaml` option
+
+By way of introduction, see the [`setup-info`](#setup-info) option. This option
+specifies the location(s) of `setup-info` dictionaries.
+
+The first location which provides a dictionary that specifies the location of a
+tool - `('Tool', 'Platform', 'Version')` - takes precedence. For example, you
+can extend the default tools, with a fallback to the default `setup-info`
+location, as follows:
+
+~~~yaml
+setup-info-locations:
+- C:/stack-offline/my-stack-setup.yaml
+- relative/inside/my/project/setup-info.yaml
+- \\smbShare\stack\my-stack-setup.yaml
+- http://stack-mirror.com/stack-setup.yaml
+# Fallback to the default location
+- https://github.com/commercialhaskell/stackage-content/raw/master/stack/stack-setup-2.yaml
+~~~
+
+Stack only refers to the default `setup-info` location if no locations are
+specified in the `setup-info-locations` configuration or on the command line
+using the `--setup-info-yaml` option.
+
+For example, both of the following will cause `stack setup` not to consult the
+default `setup-info` location:
+
+~~~yaml
+setup-info-locations:
+- C:/stack-offline/my-stack-setup.yaml
+~~~
+
+and
+
+~~~yaml
+setup-info-locations: []
+~~~
+
+Relative paths are resolved relative to the `stack.yaml` file (either the one in
+the local project or the global `stack.yaml`).
+
+Relative paths may also be used for the installation paths to tools (such as GHC
+or 7z). This allows vendoring the tools inside a monorepo (a single repository
+storing many projects). For example:
+
+Directory structure:
+
+~~~text
+- src/
+- installs/
+  - my-stack-setup.yaml
+  - 7z.exe
+  - 7z.dll
+  - ghc-9.2.3.tar.xz
+- stack.yaml
+~~~
+
+In the project's `stack.yaml`:
+
+~~~yaml
+setup-info-locations:
+- installs/my-stack-setup.yaml
+~~~
+
+In `installs/my-stack-setup.yaml`:
+
+~~~yaml
+sevenzexe-info:
+  url: "installs/7z.exe"
+
+sevenzdll-info:
+  url: "installs/7z.dll"
+
+ghc:
+  windows64:
+    9.2.3:
+      url: "installs/ghc-9.2.3.tar.xz"
+~~~
+
+## skip-ghc-check
+
+Default: `false`
+
+Command line equivalent (takes precedence): `--[no-]skip-ghc-check` flag
+
+Should we skip the check to confirm that your system GHC version (on the PATH)
+matches what your project expects?
+
+## skip-msys
+
+[:octicons-tag-24: 0.1.2.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.2.0)
+
+Restrictions: Windows systems only
+
+Default: `false`
+
+Command line equivalent (takes precedence):
+[`--[no-]skip-msys`](../global_flags.md#-no-skip-msys-option) flag
+
+Skips checking for the Stack-supplied MSYS2 (and installing that MSYS2, if it is
+not installed) when Stack is setting up the environment.
+
+To prevent installation of MSYS2, if it is not installed, see the documentation
+for the [`install-msys`](#install-msys) configuration option.
+
+~~~yaml
+skip-msys: true
+~~~
+
+!!! note
+
+    Usually, the use of this option does not make sense in project-level
+    configuration and it is used only in global configuration.
+
+## snapshot-location-base
+
+[:octicons-tag-24: 2.5.1](https://github.com/commercialhaskell/stack/releases/tag/v2.5.1)
+
+Default: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/
+(as set in the `pantry` library)
+
+Command line equivalent (takes precedence):
+[`--snapshot-location-base`](../global_flags.md#-snapshot-location-base-command-option)
+option
+
+Sets the base location of the LTS Haskell or Stackage Nightly snapshots.
+
+For example:
+
+~~~yaml
+snapshot-location-base: https://example.com/snapshots/location/
+~~~
+
+has the following effect:
+
+* `lts-X.Y` expands to `https://example.com/snapshots/location/lts/X/Y.yaml`
+* `nightly-YYYY-MM-DD` expands to
+  `https://example.com/snapshots/location/nightly/YYYY/M/D.yaml`
+
+This key is convenient in setups that restrict access to GitHub, for instance
+closed corporate setups. In this setting, it is common for the development
+environment to have general access to the internet, but not for testing/building
+environments. To avoid the firewall, one can run a local snapshots mirror and
+then use a custom `snapshot-location-base` in the closed environments only.
+
+## stack-colors
+
+Command line equivalent (takes precedence): `--stack-colors` option
+
+Stack uses styles to format some of its output. The default styles do not work
+well with every terminal theme. This option specifies Stack's output styles,
+allowing new styles to replace the defaults. The option is used as
+`stack-colors: <STYLES>`, where `<STYLES>` is a colon-delimited sequence of
+key=value, 'key' is a style name and 'value' is a semicolon-delimited list of
+'ANSI' SGR (Select Graphic Rendition) control codes (in decimal). Use the
+command `stack ls stack-colors --basic` to see the current sequence.
+
+The 'ANSI' standards refer to (1) standard ECMA-48 'Control Functions for Coded
+Character Sets' (5th edition, 1991); (2) extensions in ITU-T Recommendation
+(previously CCITT Recommendation) T.416 (03/93) 'Information Technology – Open
+Document Architecture (ODA) and Interchange Format: Character Content
+Architectures' (also published as ISO/IEC International Standard 8613-6); and
+(3) further extensions used by 'XTerm', a terminal emulator for the X Window
+System. The 'ANSI' SGR codes are described in a
+[Wikipedia article](http://en.wikipedia.org/wiki/ANSI_escape_code)
+and those codes supported on current versions of Windows in
+[Microsoft's documentation](https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences).
+
+For example, users of the popular
+[Solarized Dark](https://ethanschoonover.com/solarized/)
+terminal theme might wish to set the styles as follows:
+
+~~~yaml
+stack-colors: error=31:good=32:shell=35:dir=34:recommendation=32:target=95:module=35:package-component=95:secondary=92:highlight=32
+~~~
+In respect of styles used in verbose output, some of that output occurs before
+the configuration file is processed.
+
+(The British English spelling (colour) is also accepted. In configuration files,
+the American spelling is the alternative that has priority.)
+
+## stack-developer-mode
+
+[:octicons-tag-24: 2.3.3](https://github.com/commercialhaskell/stack/releases/tag/v2.3.3)
+
+Default (official distributed binaries): `false`
+
+Default (built from source): `true`
+
+Turns on a mode where some messages are printed at WARN level instead of DEBUG
+level, especially useful for developers of Stack itself.
+
+~~~yaml
+stack-developer-mode: false
+~~~
+
+## system-ghc
+
+Default: `false`
+([:octicons-tag-24: 1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v1.3.0)),
+unless the [Docker](../../topics/docker_integration.md) or
+[Nix](../../topics/nix_integration.md) integration is enabled.
+
+Command line equivalent (takes precedence): `--[no-]system-ghc` flag
+
+Should Stack seek to use (if `true`) a 'system' GHC executable (that is, one on
+the PATH) or (if `false`) a Stack-supplied GHC executable?
+
+~~~yaml
+# Seek to use a 'system' GHC on the PATH rather than a Stack-supplied GHC:
+system-ghc: true
+~~~
+
+Stack's [Nix integration](../../topics/nix_integration.md), when enabled, is
+incompatible with `system-ghc: false`.
+
+!!! note
+
+    The `system-ghc` option does not specify Stack's behaviour if the specified
+    GHC version is not already available. In that regard, see the
+    [`install-ghc`](#install-ghc) option.
+
+## templates
+
+Command line equivalent (takes precedence): `stack new --param <key>:<value>`
+(or `-p`) option
+
+Templates used with `stack new` have a number of parameters that affect the
+generated code. These can be set for all new projects you create. The result of
+them can be observed in the generated LICENSE and Cabal files. The value for all
+of these parameters must be strings.
+
+The parameters are: `author-email`, `author-name`, `category`, `copyright`,
+`year` and `github-username`.
+
+* _author-email_ - sets the `maintainer` property in Cabal
+* _author-name_ - sets the `author` property in Cabal and the name used in
+  LICENSE
+* _category_ - sets the `category` property in Cabal. This is used in Hackage.
+  For examples of categories see
+  [Packages by category](https://hackage.haskell.org/packages/). It makes sense
+  for `category` to be set on a per project basis because it is uncommon for all
+  projects a user creates to belong to the same category. The category can be
+  set per project by passing `-p "category:value"` to the `stack new` command.
+* _copyright_ - sets the `copyright` property in Cabal. It is typically the
+  name of the holder of the copyright on the package and the year(s) from which
+  copyright is claimed. For example: `Copyright (c) 2023-2025 Joe Bloggs`
+* _year_ - if `copyright` is not specified, `year` and `author-name` are used
+  to generate the copyright property in Cabal. If `year` is not specified, it
+  defaults to the current year.
+* _github-username_ - used to generate `homepage` and `source-repository` in
+  Cabal. For instance `github-username: myusername` and
+  `stack new my-project new-template` would result:
+
+~~~yaml
+homepage: http://github.com/myusername/my-project#readme
+
+source-repository head
+  type: git
+  location: https://github.com/myusername/my-project
+~~~
+
+These properties can be set in `config.yaml` as follows:
+~~~yaml
+templates:
+  params:
+    author-name: Your Name
+    author-email: youremail@example.com
+    category: Your Projects Category
+    copyright: 'Copyright (c) 2025 Your Name'
+    github-username: yourusername
+~~~
+
+Additionally, `stack new` can automatically initialize source control
+repositories in the directories it creates.  Source control tools can be
+specified with the `scm-init` option. At the moment, only `git` is supported.
+
+~~~yaml
+templates:
+  scm-init: git
+~~~
+
+## urls
+
+Default:
+
+~~~yaml
+urls:
+  latest-snapshot: https://stackage-haddock.haskell.org/snapshots.json
+  recent-snapshots: https://www.stackage.org/api/v1/snapshots
+~~~
+
+Customize the URLs where Stack looks for information about available snapshots,
+either
+([:octicons-tag-24: 1.1.0](https://github.com/commercialhaskell/stack/releases/tag/v1.1.0))
+the latest LTS and Nightly snapshots (`latest-snapshots`) or
+([:octicons-tag-24: 3.11.1](https://github.com/commercialhaskell/stack/releases/tag/v3.11.1))
+recently-published snapshots (`recent-snapshots`).
+
+!!! note
+
+    The default for `latest-snapshots` for Stack 1.3.0 to 2.15.3 was
+    https://s3.amazonaws.com/haddock.stackage.org/snapshots.json. Following the
+    handover of the Stackage project to the Haskell Foundation in
+    early 2024, the file at that URL may not be up to date. Users of those
+    versions of Stack should configure the URL to be the default above.
+
+!!! note
+
+    The default for `recent-snapshots` for Stack 1.7.1 to 3.9.3 was
+    https://www.stackage.org/snapshots. The Stackage server API may cease to use
+    that end point in the future.
+
+## with-gcc
+
+Command line equivalent (takes precedence): `--with-gcc` option
+
+Specify a path to GCC explicitly, rather than relying on the normal path
+resolution.
+
+~~~yaml
+with-gcc: /usr/local/bin/gcc-5
+~~~
+
+## with-hpack
+
+Command line equivalent (takes precedence): `--with-hpack` option
+
+Use an [Hpack](https://github.com/sol/hpack) executable, rather than Stack's
+in-built version of the Hpack functionality.
+
+~~~yaml
+with-hpack: /usr/local/bin/hpack
+~~~
+
+## work-dir
+
+[:octicons-tag-24: 0.1.10.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.10.0)
+
+Default: `.stack-work`
+
+Command line equivalent (takes precedence):
+[`--work-dir`](../global_flags.md#-work-dir-option) option
+
+Environment variable alternative (lowest precedence):
+[`STACK_WORK`](../environment_variables.md#stack_work)
+
+`work-dir` specifies the path of Stack's work directory, within a local project
+or package directory. The path must be a relative one, relative to the
+root directory of the project or package. The relative path cannot include a
+`..` (parent directory) component.
diff --git a/doc/configure/yaml/project.md b/doc/configure/yaml/project.md
new file mode 100644
index 0000000000..88821ac35d
--- /dev/null
+++ b/doc/configure/yaml/project.md
@@ -0,0 +1,465 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Project-specific configuration
+
+Project-specific configuration options are valid only in a project-level
+configuration file (`stack.yaml`, by default). Most of Stack's configuration
+options are [non-project specific](non-project.md).
+
+Each of the Haskell packages to which a Stack project relates is either a
+**project package** that is part of the project and located locally or a package
+on which one or more of the project packages depends (directly or indirectly).
+The latter is referred to as a **dependency** and it may be located locally or
+elsewhere.
+
+!!! info
+
+    Project packages are built by default. Dependencies are only built when
+    needed. Building can target individual components of a project package. The
+    individual components of dependencies cannot be targeted. Test suite and
+    benchmark components of a project package can be built and run. The library
+    and executable components of a dependency, and only those components, are
+    built when the dependency is needed.
+
+In your project-specific options, you specify both **which project packages** to
+build and **which dependencies to use** when building these packages.
+
+A dependency specified as an [extra-dep](#extra-deps) will shadow a package of
+the same name specified in a [snapshot](#snapshot). A project package will
+shadow a dependency of the same name.
+
+## snapshot
+
+Command line equivalent (takes precedence):
+[`--snapshot`](../global_flags.md#-snapshot-option) or
+[`--resolver`](../global_flags.md#-resolver-option) (deprecated) option
+
+The `snapshot` key specifies which snapshot is to be used for this project. A
+snapshot defines a GHC version, the package version of packages available for
+installation, and various settings like build flags. For example:
+
+~~~yaml
+snapshot: lts-24.55 # A Stackage LTS Haskell snapshot
+~~~
+
+or
+
+~~~yaml
+snapshot: nightly-2026-08-20 # A Stackage Nightly snapshot
+~~~
+
+For further information about how to specify the location of a snapshot, see the
+[snapshot location](../../topics/snapshot_location.md) documentation.
+
+The choice of snapshot determines what constraints are placed on the compiler
+version. For further information about additional control over the compiler
+version, see the [compiler-check](non-project.md#compiler-check) option
+documentation.
+
+A package version specified in a snapshot can be shadowed by an
+[extra-dep](#extra-deps) of the same name or a [project package](#packages) of
+the same name.
+
+A snapshot was formerly called a resolver since it states how dependencies are
+resolved.
+
+## packages
+
+Default:
+
+~~~yaml
+packages:
+- .
+~~~
+
+The `packages` key specifies a list of the project packages that are part of
+your project. These are specified via paths to local directories. A path is
+considered relative to the directory containing the project-level configuration
+file (`stack.yaml`, by default). For example, if the `stack.yaml` file is
+located at `/dir1/dir2/stack.yaml`, and has:
+
+~~~yaml
+packages:
+- my-package
+- dir3/my-other-package
+~~~
+
+the configuration means "project packages in directories `/dir1/dir2/my-package`
+and `/dir1/dir2/dir3/my-other-package`".
+
+The `packages` key is optional. The default value, '`.`', means that the
+project has a single project package located in the current directory.
+
+A project package will shadow a dependency of the same name.
+
+A package version specified in a snapshot can be shadowed by an
+[extra-dep](#extra-deps) of the same name or a [project package](#packages) of
+the same name.
+
+Each specified project package directory must have a valid Cabal file or Hpack
+`package.yaml` file present. Any subdirectories of the directory are not
+searched for Cabal files. A subdirectory has to be specified as an independent
+item in the list of project packages.
+
+A project package is different from a dependency (located locally or elsewhere)
+specified as an [extra-dep](#extra-deps) or via a [snapshot](#snapshot). For
+example:
+
+* a project package will be built by default by commanding
+  [`stack build`](../../commands/build_command.md) without specific targets. A
+  dependency will only be built if it is needed; and
+* test suites and benchmarks may be built and run for a project package. They
+  are never run for a dependency.
+
+## extra-deps
+
+Default: `[]`
+
+The `extra-deps` key specifies a list of extra dependencies on top of what is
+defined in the [snapshot](#snapshot). A dependency may come from either a Pantry
+package location or a local file path.
+
+A Pantry package location is one or three different kinds of sources:
+
+* the package index (Hackage);
+* an archive (a tarball or zip file, either local or over HTTP or HTTPS); or
+* a Git or Mercurial repository.
+
+For further information on the format for specifying a Pantry package location,
+see the [package location](../../topics/package_location.md) documentation. For
+example:
+
+~~~yaml
+extra-deps:
+# The latest revision of a package in the package index (Hackage):
+- acme-missiles-0.3
+# A specific revision of a package in the package index (Hackage):
+- acme-missiles-0.3@rev:0
+# An *.tar.gz archive file over HTTPS:
+- url: https://github.com/example-user/my-repo/archive/08c9b4cdf977d5bcd1baba046a007940c1940758.tar.gz
+  subdirs:
+  - my-package
+# A Git repository at a specific commit:
+- git: https://github.com/example-user/my-repo.git
+  commit: '08c9b4cdf977d5bcd1baba046a007940c1940758'
+# An archive of files at a point in the history of a GitHub repository
+# (identified by a specific commit):
+- github: example-user/my-repo
+  commit: '08c9b4cdf977d5bcd1baba046a007940c1940758'
+  subdirs:
+  - my-package
+~~~
+
+!!! note
+
+    GHC boot packages are special. An extra-dep with the same package name and
+    version as a GHC boot package will be ignored.
+
+!!! note
+
+    The `commit:` key expects a YAML string. A commit hash, or partial hash,
+    comprised only of digits represents a YAML number, unless it is enclosed in
+    quotation marks.
+
+For a local file path source, the path is considered relative to the directory
+containing the `stack.yaml` file. For example, if the `stack.yaml` is located
+at `/dir1/dir2/stack.yaml`, and has:
+
+~~~yaml
+extra-deps:
+- my-package
+- dir3/my-other-package
+~~~
+
+the configuration means "extra-deps packages in directories
+`/dir1/dir2/my-package` and `/dir1/dir2/dir3/my-other-package`".
+
+!!! note
+
+    A local file path that has the format of a package identifier will be
+    interpreted as a reference to a package on Hackage. Prefix it with `./` to
+    avoid that confusion.
+
+!!! note
+
+    A specified extra-dep that does not have the format of a valid Pantry
+    package location (for example, a reference to a package on Hackage that
+    omits the package's version) will be interpreted as a local file path.
+
+An extra-dep will shadow a dependency specified in a [snapshot](#snapshot) of
+the same name. An extra-dep can be shadowed by a [project package](#packages) of
+the same name.
+
+!!! info "GHC wired-in packages"
+
+    Some Haskell packages published on Hackage, for example `base < 4.21.0.0`
+    and `ghc`, are referred to as 'wired-in' to one or more versions of GHC or
+    as 'magic'. They can be distinguished from normal packages by the contents
+    of their Cabal files: GHC's `-this-unit-id` option is set as the name of the
+    package without a version. For example, the `base.cabal` for `base-4.20.1.0`
+    includes:
+
+    ~~~yaml
+    -- We need to set the unit id to base (without a version number)
+    -- as it's magic.
+    ghc-options: -this-unit-id base
+    ~~~
+
+    The GHC boot packages that are 'wired-in' cannot be shaddowed with different
+    versions of the same package. Given their dependencies, the use of these
+    boot packages in a build plan may limit what can be specified as an
+    extra-dep.
+
+    For example, GHC boot package `ghc-9.10.3` has a dependency on `process`. Its
+    `*.conf` file identifies the dependency as `process-1.6.26.1-10ef`. If
+    package `ghc-9.10.3` is part of a build plan and a different version of
+    `process` is specified as an extra-dep, during a build, Stack will identify
+    that the build plan refers to two versions of `process` and warn that the
+    build is likely to fail.
+
+## flags
+
+Default: `{}`
+
+Command line equivalent (takes precedence):
+[`stack build --flag`](../../commands/build_command.md#-flag-option) option
+
+Cabal flags can be set for each package separately. For example:
+
+~~~yaml
+flags:
+  package-name:
+    flag-name: true
+~~~
+
+This overrides all Cabal flag specifications (if any) for the specified packages
+in the snapshot.
+
+!!! note
+
+    For a package included directly in the snapshot, if the Cabal flag
+    specifications differ from the Cabal flag specifications (if any) in the
+    snapshot, then the package will automatically be promoted to be an
+    [extra-dep](#extra-deps).
+
+!!! note
+
+    In order to set a Cabal flag for a GHC boot package, the package must be
+    specified as an [extra-dep](#extra-deps).
+
+## drop-packages
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+Default: `[]`
+
+Packages which, when present in the snapshot specified in the
+[`snapshot`](#snapshot) or (deprecated) [`resolver`](#resolver) key, should not
+be included in our project. This can be used for a few different purposes, e.g.:
+
+* Ensure that packages you do not want used in your project cannot be used in a
+  `package.yaml` file (e.g., for license reasons)
+* When using a custom GHC build, avoid incompatible packages (see this
+  [comment](https://github.com/commercialhaskell/stack/pull/4655#issuecomment-477954429)).
+
+~~~yaml
+drop-packages:
+- buggy-package
+- package-with-unacceptable-license
+~~~
+
+!!! info
+
+    Stackage snapshots LTS Haskell 14.27 (GHC 8.6.5) and earlier, and Nightly
+    2022-02-08 (GHC 8.8.2) and earlier, included directly the `Cabal` package.
+    Later snapshots do not include directly that package (which is a GHC boot
+    package).
+
+    For the older Stackage snapshots, it could be handy to drop the
+    snapshot-specified `Cabal` package, to avoid building that version of the
+    package. For the later snapshots, there is no package version to drop.
+
+## user-message
+
+If present, specifies a message to be displayed every time the configuration is
+loaded by Stack. It can serve as a reminder for the user to review the
+configuration and make any changes if needed. The user can delete this message
+if the generated configuration is acceptable.
+
+Consecutive line ends in the message are interpreted as a single blank line.
+
+For example, a user-message is inserted by `stack init` when it omits packages
+or adds external dependencies, namely:
+
+~~~yaml
+user-message: |
+  Warning (added by new or init): Some packages were found to be incompatible
+  with the snapshot and have been left commented out in the packages section.
+
+  Warning (added by new or init): Specified snapshot could not satisfy all
+  dependencies. Some external packages have been added as dependencies.
+
+  You can omit this message by removing it from the project-level configuration
+  file.
+~~~
+
+## custom-preprocessor-extensions
+
+Default: `[]`
+
+Command line equivalent: `--customer-preprocessor-extensions` option
+
+In order for Stack to be aware of any custom preprocessors you are using, add
+their extensions here
+
+~~~yaml
+custom-preprocessor-extensions:
+- erb
+~~~
+
+??? example "Use of a custom preprocessor"
+
+    The [Ruby](https://www.ruby-lang.org/en/) programming language provides
+    [`erb`](https://docs.ruby-lang.org/en/master/ERB.html) at the command line.
+    `erb` provides a templating system for Ruby. The following example uses
+    `erb` as a custom preprocessor.
+
+    The example is a single-package project with a customised `Setup.hs`, which
+    Stack will use to build:
+    ~~~haskell
+    {-# LANGUAGE CPP #-}
+
+    module Main
+      ( main
+      ) where
+
+    import           Distribution.Simple ( defaultMainWithHooks, simpleUserHooks )
+    import           Distribution.Simple.PreProcess
+                       ( PreProcessor (..), mkSimplePreProcessor, unsorted )
+    import           Distribution.Simple.UserHooks ( UserHooks (..) )
+    import           Distribution.Types.BuildInfo ( BuildInfo )
+    import           Distribution.Types.ComponentLocalBuildInfo
+                       ( ComponentLocalBuildInfo )
+    import           Distribution.Types.LocalBuildInfo ( LocalBuildInfo )
+    import           System.Process ( readCreateProcess, proc, shell )
+
+    main :: IO ()
+    main = defaultMainWithHooks simpleUserHooks
+      { hookedPreProcessors = [("erb", runRuby)]
+      }
+
+    runRuby ::
+         BuildInfo
+      -> LocalBuildInfo
+      -> ComponentLocalBuildInfo
+      -> PreProcessor
+    runRuby _ _ _ = PreProcessor
+      { platformIndependent = True
+      , ppOrdering = unsorted
+      , runPreProcessor = mkSimplePreProcessor $ \erbFile fout verbosity ->
+          readCreateProcess (erbProcess erbFile) "" >>= writeFile fout
+      }
+     where
+       erbProcess erbFile =
+    #if defined(mingw32_HOST_OS)
+         shell $ "erb " <> erbFile
+    #else
+         proc "erb" [erbFile]
+    #endif
+    ~~~
+
+    The example has a package description file (`package.yaml`) that specifies a
+    `Custom` build type:
+    ~~~yaml
+    spec-version: 0.36.0
+    name: my-package
+    version: 0.1.0.0
+    build-type: Custom
+
+    dependencies: base
+
+    custom-setup:
+      dependencies:
+      - base
+      - Cabal
+      - process
+
+    library:
+      source-dirs: src
+      generated-exposed-modules: MyModule
+    ~~~
+
+    The example has a `src/MyModule.erb` file that will be preprocessed to
+    create Haskell source code:
+    ~~~text
+    module MyModule where
+
+    <% (1..5).each do |i| %>
+    test<%= i %> :: Int
+    test<%= i %> = <%= i %>
+    <% end %>
+    ~~~
+
+    The example has a project-level configuration file (`stack.yaml`):
+    ~~~yaml
+    snapshot: lts-22.30
+    custom-preprocessor-extensions:
+    - erb
+    ~~~
+
+## extra-package-dbs
+
+[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
+
+Default: `[]`
+
+A list of relative or absolute paths to package databases. These databases will
+be added on top of GHC's global package database before the addition of other
+package databases.
+
+!!! warning
+
+    Use of this feature may result in builds that are not reproducible, as Stack
+    has no control over the contents of the extra package databases.
+
+## resolver
+
+[:octicons-thumbsdown-24: 3.9.3](https://github.com/commercialhaskell/stack/releases/tag/v3.9.3)
+
+`resolver` (deprecated) and [`snapshot`](#snapshot) are synonyms.
+
+One of these keys is required. More than one is prohibited.
+
+## curator
+
+:octicons-beaker-24: Experimental
+
+[:octicons-tag-24: 2.1.0.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.0.1)
+
+Default: `{}`
+
+Configuration intended for use only by the
+[`curator` tool](https://github.com/commercialhaskell/curator), which uses Stack
+to build packages. For given package names (which need not exist in the
+project), Stack can be configured to ignore (skip) silently building test
+suites, building benchmarks and/or creating Haddock documentation or to expect
+that building test suites, building benchmarks and/or creating Haddock
+documentation will fail.
+
+For example:
+
+~~~yaml
+curator:
+  skip-test:
+  - my-package1
+  expect-test-failure:
+  - my-package2
+  skip-bench:
+  - my-package3
+  expect-benchmark-failure:
+  - my-package4
+  skip-haddock:
+  - my-package5
+  expect-haddock-failure:
+  - my-package6
+~~~
diff --git a/doc/coverage.md b/doc/coverage.md
deleted file mode 100644
index 9d67589968..0000000000
--- a/doc/coverage.md
+++ /dev/null
@@ -1,135 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# Code coverage
-
-Code coverage is a measure of the degree to which the source code of a program
-is executed when a test suite is run.
-[Haskell Program Coverage (HPC)](https://ku-fpg.github.io/software/hpc/) is a
-code coverage tool for Haskell that is provided with GHC. Code coverage is
-enabled by passing the `--coverage` flag to `stack build`.
-
-The following refers to the local HPC root directory. Its location can be
-obtained by command:
-
-~~~text
-stack path --local-hpc-root
-~~~
-
-## Usage
-
-`stack test --coverage` is quite streamlined for the following use-case:
-
-1.  You have test suites which exercise your local packages.
-
-2.  These test suites link against your library, rather than building the
-    library directly. Coverage information is only given for libraries, ignoring
-    the modules which get compiled directly into your executable. A common case
-    where this doesn't happen is when your test suite and library both have
-    something like `hs-source-dirs: src/`. In this case, when building your test
-    suite you may also be compiling your library, instead of just linking
-    against it.
-
-When your project has these properties, you will get the following:
-
-1.  Textual coverage reports in the build output.
-
-2.  A unified textual and HTML report, considering the coverage on all local
-    libraries, based on all of the tests that were run.
-
-3.  An index of all generated HTML reports, in `index.html` in the local
-    HPC root directory.
-
-## The `stack hpc report` command
-
-The `stack hpc report` command generates a report for a selection of targets and
-`.tix` files. For example, if we have three different packages with test suites,
-packages `A`, `B`, and `C`, the default unified report will have coverage from
-all three. If we want a unified report with just two, we can instead command:
-
-~~~text
-stack hpc report A B
-~~~
-
-This will output a textual report for the combined coverage from `A` and `B`'s
-test suites, along with a path to the HTML for the report.  To further
-streamline this process, you can pass the `--open` option, to open the report in
-your browser.
-
-This command also supports taking extra `.tix` files.  If you've also built an
-executable, against exactly the same library versions of `A`, `B`, and `C`, then
-you could command the following:
-
-~~~text
-stack exec -- an-exe
-stack hpc report A B C an-exe.tix
-~~~
-
-This report will consider all test results as well as the newly generated
-`an-exe.tix` file.  Since this is a common use-case, there is a convenient flag
-to use all stored results - `stack hpc report --all an-exe.tix`.
-
-## The `extra-tix-files` directory
-
-During the execution of the build, you can place additional tix files in the
-`extra-tix-files` subdirectory in the local HPC root directory, in order for
-them to be included in the unified report. A couple caveats:
-
-1.  These tix files must be generated by executables that are built against the
-    exact same library versions. Also note that, on subsequent builds with
-    coverage, the local HPC root directory will be recursively deleted. It
-    just stores the most recent coverage data.
-
-2.  These tix files will not be considered by `stack hpc report` unless listed
-    explicitly by file name.
-
-## Implementation details
-
-Most users can get away with just understanding the above documentation.
-However, advanced users may want to understand exactly how `--coverage` works:
-
-1. The GHC option `-fhpc` gets passed to all local packages.  This tells GHC to
-   output executables that track coverage information and output them to `.tix`
-   files. `the-exe-name.tix` files will get written to the working directory of
-   the executable.
-
-   When switching on this flag, it will usually cause all local packages to be
-   rebuilt (see issue
-   [#1940](https://github.com/commercialhaskell/stack/issues/1940)).
-
-2. Before the build runs with `--coverage`, the contents of the local HPC root
-   directory gets deleted. This prevents old reports from getting mixed
-   with new reports. If you want to preserve report information from multiple
-   runs, copy the contents of this path to a new directory.
-
-3. Before a test run, if a `test-name.tix` file exists in the package directory,
-   it will be deleted.
-
-4. After a test run, it will expect a `test-name.tix` file to exist. This file
-   will then get loaded, modified, and outputted to
-   `pkg-name/test-name/test-name.tix` in the local HPC root directory.
-
-   The `.tix` file gets modified to remove coverage file that isn't associated
-   with a library. So, this means that you won't get coverage information for
-   the modules compiled in the `executable` or `test-suite` stanza of your Cabal
-   file. This makes it possible to directly union multiple `*.tix` files from
-   different executables (assuming they are using the exact same versions of the
-   local packages).
-
-   If there is enough popular demand, it may be possible in the future to give
-   coverage information for modules that are compiled directly into the
-   executable. See issue
-   [#1359](https://github.com/commercialhaskell/stack/issues/1359).
-
-5. Once we have a `.tix` file for a test, we also generate a textual and HTML
-   report for it. The textual report is sent to the terminal. The index of the
-   test-specific HTML report is available `pkg-name/test-name/index.html` in the
-   local HPC root directory.
-
-6. After the build completes, if there are multiple output `*.tix` files, they
-   get combined into a unified report. The index of this report will be
-   available at `combined/all/index.html` in the local HPC root directory.
-
-7. Finally, an index of the resulting coverage reports is generated. It links to
-   the individual coverage reports (one for each test-suite), as well as the
-   unified report. This index is available at `index.html` in the local HPC root
-   directory.
diff --git a/doc/custom_snapshot.md b/doc/custom_snapshot.md
deleted file mode 100644
index ace5b13a81..0000000000
--- a/doc/custom_snapshot.md
+++ /dev/null
@@ -1,135 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-## Snapshot specification
-
-[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
-
-Snapshots provide a list of packages to use, along with flags, GHC options, and
-a few other settings. Snapshots may extend any other snapshot that can be
-specified in a `resolver` or `snapshot` key. The packages specified follow the
-same syntax for dependencies in Stack's project-level configuration files.
-Unlike the `extra-deps` key, however, no support for local directories is
-available in snapshots to ensure reproducibility.
-
-!!! info
-
-    Stack uses the [Pantry](https://hackage.haskell.org/package/pantry) for
-    snapshot specification.
-
-~~~yaml
-resolver: lts-8.21 # Inherits GHC version and package set
-compiler: ghc-8.0.1 # Overwrites GHC version in the resolver, optional
-
-# Additional packages, follows extra-deps syntax
-packages:
-- unordered-containers-0.2.7.1
-- hashable-1.2.4.0
-- text-1.2.2.1
-
-# Packages from the parent snapshot to ignore
-drop-packages:
-- wai-extra
-
-# Packages which should be hidden
-hidden:
-  wai: true
-  warp: false
-
-# Set GHC options for specific packages
-ghc-options:
-  warp:
-  - -O2
-
-# Override flags, can also override flags in the parent snapshot
-flags:
-  unordered-containers:
-    debug: true
-~~~
-
-If you put this in a `snapshot.yaml` file in the same directory as your project,
-you can now use the snapshot like this:
-
-~~~yaml
-resolver: snapshot.yaml
-~~~
-
-This is an example of a custom snapshot stored in the filesystem. They are
-assumed to be mutable, so you are free to modify it. We detect that the snapshot
-has changed by hashing the contents of the involved files, and using it to
-identify the snapshot internally. It is often reasonably efficient to modify a
-custom snapshot, due to Stack sharing snapshot packages whenever possible.
-
-### Overriding the compiler
-
-The following snapshot specification will be identical to `lts-7.1`, but instead
-use `ghc-7.10.3` instead of `ghc-8.0.1`:
-
-~~~yaml
-resolver: lts-7.1
-compiler: ghc-7.10.3
-~~~
-
-### Dropping packages
-
-The following snapshot specification will be identical to `lts-7.1`, but without
-the `text` package in our snapshot. Removing this package will cause all the
-packages that depend on `text` to be unbuildable, but they will still be present
-in the snapshot.
-
-~~~yaml
-resolver: lts-7.1
-drop-packages:
-  - text
-~~~
-
-### Hiding packages
-
-The following snapshot specification will be identical to `lts-7.1`, but the
-`text` package will be hidden when registering. This will affect, for example,
-the import parser in the script command.
-
-~~~yaml
-resolver: lts-7.1
-hidden:
-  - text
-~~~
-
-### Specifying GHC options
-
-In order to specify GHC options for a package, you use the same syntax as the
-[ghc-options](yaml_configuration.md#ghc-options) key for build configuration.
-
-The following snapshot specification will be identical to `lts-7.1`, but
-provides `-O1` as a ghc-option for `text`:
-
-~~~yaml
-resolver: lts-7.1
-packages:
-  - text-1.2.2.1
-ghc-options:
-  text: -O1
-~~~
-
-This works somewhat differently than the stack.yaml `ghc-options` field, in that
-options can only be specified for packages that are mentioned in the custom
-snapshot's `packages` list. It sets the ghc-options, rather than extending those
-specified in the snapshot being extended.
-
-Another difference is that the `*` entry for `ghc-options` applies to all
-packages in the `packages` list, rather than all packages in the snapshot.
-
-### Specifying Cabal flags
-
-In order to specify Cabal flags for a package, you use the same syntax as the
-[flags](yaml_configuration.md#flags) key for build configuration. The
-following snapshot specification will be identical to `lts-7.1`, but
-it enables the `developer` Cabal flag:
-
-~~~yaml
-resolver: lts-7.1
-packages:
-  - text-1.2.2.1
-flags:
-  text:
-    developer: true
-~~~
diff --git a/doc/dependency_visualization.md b/doc/dependency_visualization.md
deleted file mode 100644
index 9ccfd9b588..0000000000
--- a/doc/dependency_visualization.md
+++ /dev/null
@@ -1,67 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# Dependency visualization
-
-You can use stack to visualize the dependencies between your packages and
-optionally also external dependencies.
-
-First, you need [Graphviz](https://www.graphviz.org/). You can [get it here](https://www.graphviz.org/download/).
-
-As an example, let's look at `wreq`. Command:
-
-~~~text
-stack dot | dot -Tpng -o wreq.png
-~~~
-
-[![wreq](https://cloud.githubusercontent.com/assets/591567/8478591/ae10a418-20d2-11e5-8945-55246dcfac62.png)](https://cloud.githubusercontent.com/assets/591567/8478591/ae10a418-20d2-11e5-8945-55246dcfac62.png)
-
-Okay that is a little boring, let's also look at external dependencies. Command:
-
-~~~text
-stack dot --external | dot -Tpng -o wreq.png
-~~~
-
-[![wreq_ext](https://cloud.githubusercontent.com/assets/591567/8478621/d247247e-20d2-11e5-993d-79096e382abd.png)](https://cloud.githubusercontent.com/assets/591567/8478621/d247247e-20d2-11e5-993d-79096e382abd.png)
-
-Well that is certainly a lot. As a start we can exclude `base` and then
-depending on our needs we can either limit the depth. Command:
-
-~~~text
-stack dot --no-include-base --external --depth 1 | dot -Tpng -o wreq.png
-~~~
-
-[![wreq_depth](https://cloud.githubusercontent.com/assets/591567/8484310/45b399a0-20f7-11e5-8068-031c2b352961.png)](https://cloud.githubusercontent.com/assets/591567/8484310/45b399a0-20f7-11e5-8068-031c2b352961.png)
-
-or prune packages explicitly. Command:
-
-~~~text
-stack dot --external --prune base,lens,wreq-examples,http-client,aeson,tls,http-client-tls,exceptions | dot -Tpng -o wreq_pruned.png
-~~~
-
-[![wreq_pruned](https://cloud.githubusercontent.com/assets/591567/8478768/adbad280-20d3-11e5-9992-914dc24fe569.png)](https://cloud.githubusercontent.com/assets/591567/8478768/adbad280-20d3-11e5-9992-914dc24fe569.png)
-
-Keep in mind that you can also save the dot file. Command:
-
-~~~text
-stack dot --external --depth 1 > wreq.dot
-dot -Tpng -o wreq.png wreq.dot
-~~~
-
-and pass in options to `dot` or use another graph layout engine like `twopi`.
-Command:
-
-~~~text
-stack dot --external --prune base,lens,wreq-examples,http-client,aeson,tls,http-client-tls,exceptions | twopi -Groot=wreq -Goverlap=false -Tpng -o wreq_pruned.png
-~~~
-
-[![wreq_pruned](https://cloud.githubusercontent.com/assets/591567/8495538/9fae1184-216e-11e5-9931-99e6147f8aed.png)](https://cloud.githubusercontent.com/assets/591567/8495538/9fae1184-216e-11e5-9931-99e6147f8aed.png)
-
-## Specifying local targets and flags
-
-The `dot` and `list-dependencies` commands both also accept the following
-options which affect how local packages are considered:
-
-* `TARGET`, same as the targets passed to `build`
-* `--test`, specifying that test components should be considered
-* `--bench`, specifying that benchmark components should be considered
-* `--flag`, specifying flags which may affect cabal file `build-depends`
diff --git a/doc/dev_containers.md b/doc/dev_containers.md
new file mode 100644
index 0000000000..603d4d3870
--- /dev/null
+++ b/doc/dev_containers.md
@@ -0,0 +1,166 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Dev Containers
+
+A *container* is an isolated area of memory where application software and some
+drivers execute. A [Development Container](https://containers.dev) (or Dev
+Container for short) allows a container to be used as a full‑featured
+development environment.
+
+Stack provides the following Dev Containers:
+
+* a default one, intended for use with Stack's default project‑level
+  configuration file (`stack.yaml`); and
+* alternative ones, intended for use with Stack's experimental project‑level
+  configuration files (in anticipation of building Stack with more recent
+  versions of GHC).
+
+Stack's Dev Containers provide the following tools:
+
+1. The
+   [Haskell Toolchain](https://www.haskell.org/ghcup/install/#supported-tools)
+   ([GHC](https://www.haskell.org/ghc), Stack,
+   [Cabal (the tool)](https://cabal.readthedocs.io) and (in the default Dev
+   Container only) [HLS](https://haskell-language-server.readthedocs.io))
+2. [Git](https://git-scm.com)
+3. [HLint](https://hackage.haskell.org/package/hlint)
+4. [yamllint](https://yamllint.readthedocs.io)
+5. [ShellCheck](https://www.shellcheck.net)
+6. [hadolint](https://github.com/hadolint/hadolint)
+
+The tools in the Haskell Toolchain are installed at `/usr/local/bin`.
+
+!!! info
+
+    The PATH is
+    `$HOME/.cabal/bin:$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`.
+    Consequently, executables installed with Cabal (the tool) (at
+    `$HOME/.cabal/bin` or `$HOME/.local/bin`) or Stack or Pip (at
+    `$HOME/.local/bin`) take precedence over the same executable installed at
+    `/usr/local/sbin`, `/usr/local/bin`, etc.
+
+[Visual Studio Code](https://code.visualstudio.com) (VS Code) is used as IDE,
+with the following extensions pre‑installed:
+
+*   [Haskell](https://marketplace.visualstudio.com/items?itemName=haskell.haskell)
+    (Default Dev Container only)
+*   [GitHub Pull Requests and Issues](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github)
+*   [GitLens — Git supercharged](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
+    *   Pinned to version 11.7.0 due to unsolicited AI content in subsequent
+        versions
+*   [Git Graph](https://marketplace.visualstudio.com/items?itemName=mhutchie.git-graph)
+*   [ShellCheck](https://marketplace.visualstudio.com/items?itemName=timonwong.shellcheck)
+*   [hadolint](https://marketplace.visualstudio.com/items?itemName=exiasr.hadolint)
+*   [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor)
+
+## Parent images
+
+Stack's Dev Containers are derived from Docker images that are used to build
+the *statically linked* Linux/x86_64 and Linux/AArch64 binary distributions of
+Stack. The repository providing those images is identified in Stack's
+project-level configuration files under the
+[`docker` key](topics/docker_integration.md#configuration). For example:
+
+~~~yaml
+docker:
+  enable: false
+  repo: quay.io/benz0li/ghc-musl:9.10.3
+~~~
+
+These Docker images are multi‑architecture (`linux/amd64`, `linux/arm64/v8`)
+<nobr>*GHC musl*</nobr> images. They are based on Alpine Linux (that is
+[musl libc](https://musl.libc.org) and [BusyBox](https://www.busybox.net)).
+
+The images contain *unofficial* and *untested* binary distributions of GHC (that
+is, ones not released by the GHC developers). That is because the official GHC
+binary distributions for Alpine Linux/x86_64 have known bugs
+([GHC issue 23043](https://gitlab.haskell.org/ghc/ghc/-/issues/23043) and
+[GHC issue 25093](https://gitlab.haskell.org/ghc/ghc/-/issues/25093)).
+
+Stack's global configuration (`/etc/stack/config.yaml`) sets
+<nobr>`system-ghc: true`</nobr> and <nobr>`install-ghc: false`</nobr>. That
+ensures that only the GHC available in the Dev Containers is used.
+
+## Usage
+
+You can run Dev Containers locally/remotely with VS Code, or create a
+[GitHub Codespace](https://github.com/features/codespaces) for a branch in a
+repository to develop online.
+
+=== "VS Code"
+
+    Follow the instructions at
+    [Developing inside a Container](https://code.visualstudio.com/docs/devcontainers/containers).
+
+=== "GitHub Codespaces"
+
+    For use with GitHub Codespaces, follow the instructions at
+    [Creating a codespace for a repository](https://docs.github.com/en/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository).
+
+## Build Stack
+
+Stack can be built with Stack (which is recommended) or with Cabal (the tool).
+
+=== "Stack"
+
+    Command <nobr>`stack build`</nobr> to build the `stack` executable.
+
+    Append <nobr>`--flag=stack:static`</nobr> to build a *statically linked*
+    `stack` executable that can run on any Linux machine of the same
+    architecture.
+
+    Append <nobr>`--stack-yaml stack-ghc-$GHC_VERSION.yaml`</nobr> if you want
+    to use an experimental project‑level configuration with the appropriate Dev
+    Container.
+
+=== "Cabal (the tool)"
+
+    !!! info
+
+        Default Dev Container only.
+
+    Command <nobr>`cabal build`</nobr> to build the `stack` executable.
+
+    Append <nobr>`--flag=static`</nobr> to build a *statically linked* `stack`
+    executable that can run on any Linux machine of the same architecture.
+
+## Haskell Language Server (HLS)
+
+The
+[Haskell Language Server](https://github.com/haskell/haskell-language-server)
+and the
+[Haskell extension](https://marketplace.visualstudio.com/items?itemName=haskell.haskell)
+are only available in the default Dev Container. In order to use the Haskell
+extension, you must first configure the project for the tool used for building
+of your choice.
+
+<!--
+**Stack**
+
+Place the cradle ([hie.yaml](assets/cradles/stack/hie.yaml)) for Stack in the
+root of the workspace: `cp -f .devcontainer/assets/cradles/stack/hie.yaml .`
+
+**Cabal**
+
+Place the cradle ([hie.yaml](assets/cradles/cabal/hie.yaml)) for Cabal in the
+root of the workspace: `cp -f .devcontainer/assets/cradles/cabal/hie.yaml .`
+-->
+
+See the documentation at
+[Contributing: Haskell Language Server](CONTRIBUTING.md#haskell-language-server)
+for cradles (`hie.yaml` files) that should suffice to configure the HLS
+explicitly for `./Setup.hs` and each of the buildable components in Stack's
+Cabal file.
+
+### Haskell extension
+
+Choose `Manually via PATH` when asked the following question:
+
+<img width="520" alt="Manage HLS" src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack@master/doc/img/manageHLS.png">
+
+## Issues
+
+If there is a problem with a Dev Container, please
+[open an issue](https://github.com/benz0li/ghc-musl/issues/new) at its
+[parent images](#parent-images)' repository at
+[https://github.com/benz0li/ghc-musl](https://github.com/benz0li/ghc-musl).
diff --git a/doc/developing_on_windows.md b/doc/developing_on_windows.md
deleted file mode 100644
index 71f6b4dffa..0000000000
--- a/doc/developing_on_windows.md
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# Developing on Windows #
-
-On Windows, Stack comes with an installation of [MSYS2](https://www.msys2.org/).
-MSYS2 will be used by Stack to provide a Unix-like shell and environment for
-Stack. This may be necessary for installing some Haskell packages, such as those
-which use `configure` scripts, or if your project needs some additional tools
-during the build phase.
-
-No matter which terminal software you choose (Windows Terminal, Console Windows
-Host, Command Prompt, PowerShell, Git bash or any other) you can use this
-environment too by executing all programs through
-`stack exec -- <program_name>`.
-
-Executables and libraries can be installed with the MSYS2 package manager
-`pacman`. All tools can be found in the
-[package list](https://github.com/msys2/msys2/wiki/Packages). A [list of
-commands](https://github.com/msys2/msys2/wiki/Using-packages) that work with
-`pacman` is also available. Just remember that `pacman` &mdash; like all other
-tools &mdash; should be started with `stack exec -- pacman`.
-
-Command `stack path --bin-path` to see the PATH in the Stack environment. On
-Windows, it includes the `\mingw64\bin`, `\usr\bin` and `\usr\local\bin`
-directories of the Stack-supplied MSYS2. If your executable depends on files
-(for example, dynamic-link libraries) in those directories and you want ro run
-it outside of the Stack environment, you will need to ensure copies of those
-files are on the PATH.
-
-The Stack-supplied MSYS2 can itself be updated with the Stack-supplied `pacman`.
-See the MSYS2 guide
-['III. Updating packages'](https://www.msys2.org/wiki/MSYS2-installation/). If
-the Stack-supplied `pacman` has a version that is 5.0.1.6403 or greater (see
-`stack exec -- pacman --version`) then the command to update is simply:
-
-    stack exec -- pacman -Syuu
-
-This command may need to be run more than once, until everything is reported by
-`pacman` as 'up to date' and 'nothing to do'.
-
-## Setup.hs ##
-
-`Setup.hs` is automatically run inside the Stack environment. So when you need
-to launch another tool you don't need to prefix the command with `stack exec --`
-within the custom `Setup.hs` file.
-
-## Pacman packages to install for common Haskell packages ##
-
-The following lists MSYS2 packages known to allow the installation of some
-common Haskell packages on Windows. Feel free to submit additional entries via a
-pull request.
-
-* For [text-icu](https://github.com/bos/text-icu) install
-  `mingw64/mingw-w64-x86_64-icu`
-
-## CMake ##
-
-CMake has trouble finding other tools even if they are available on the PATH.
-Likely this is not a CMake problem but one of the environment not fully
-integrating. For example GHC comes with a copy of GCC which is not installed by
-MSYS2 itself. If you want to use this GCC you can provide a full path to it, or
-find it first with `System.Directory.findExecutable` if you want to launch GCC
-from a Haskell file such as `Setup.hs`.
-
-Experience tells that the `mingw-w64` versions of Make and CMake are most
-likely to work. Though there are other versions available through `pacman`, so
-have a look to see what works for you. Both tools can be installed with the
-commands:
-
-    stack exec -- pacman -S mingw-w64-x86_64-make
-    stack exec -- pacman -S mingw-w64-x86_64-cmake
-
-Even though Make and CMake are then both installed into the same environment,
-CMake still seems to have trouble to find Make. To help CMake find GCC and Make
-supply the following flags:
-
-    -DCMAKE_C_COMPILER=path
-    -DCMAKE_MAKE_PROGRAM=path
diff --git a/doc/faq.md b/doc/faq.md
index aabfd32cc4..9f6e2714d9 100644
--- a/doc/faq.md
+++ b/doc/faq.md
@@ -1,666 +1,669 @@
 <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
-# FAQ
-
-So that this doesn't become repetitive: for the reasons behind the answers
-below, see the [Build overview](build_overview.md) page. The goal of the answers
-here is to be as helpful and concise as possible.
-
-## What version of GHC is used when I run something like `stack ghci`?
-
-The version of GHC, as well as which packages can be installed, are specified by
-the _resolver_. This may be something like `lts-19.19`, which is from
-[Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses
-the resolver in more detail.
-
-The resolver is determined by finding the relevant project-level configuration
-file (`stack.yaml`) for the directory you're running the command from. This
-essentially works by:
-
-1. Check for a `STACK_YAML` environment variable or the `--stack-yaml`
-   command line argument
-2. If none present, check for a `stack.yaml` file in the current
-   directory or any parents
-3. If no `stack.yaml` file was found, use the _implicit global_
-
-The implicit global is a shared project used whenever you're outside
-of another project. It's a sort of "mutable shared state" that you
-should be aware of when working with Stack.
-
-A frequent request when working with the implicit global is how to move to a
-more recent LTS snapshot. You can do this using the following command from
-outside of a project:
-
-~~~text
-stack config set resolver lts
-~~~
-
-## Where is Stack installed and will it interfere with the GHC (etc) I already have installed?
-
-Stack itself is installed in normal system locations based on the mechanism you
-used (see the [Install and upgrade](install_and_upgrade.md) page). Stack
-installs files in the Stack root and other files in a `.stack-work` directory
-within each project's directory. None of this should affect any existing Haskell
-tools at all.
-
-## What is the relationship between Stack and Cabal (the tool)?
-
-* 'Cabal' can refer to Cabal (the library) or to Cabal (the tool). Cabal (the
-  library) is used by Stack to build your Haskell code. Cabal (the tool) is
-  provided by the `cabal-install` package.
-* A Cabal file is provided for each package, named `<package_name>.cabal`. It
-  defines all package-level metadata, just like it does in the world of Cabal
-  (the tool): modules, executables, test suites, etc. No change at all on this
-  front.
-* A `stack.yaml` file references one or more packages, and provides information
-  on where dependencies come from.
-* The `stack init` command initializes a `stack.yaml` file from an existing
-  Cabal file.
-* Stack uses Cabal (the library) via an executable. For `build-type: Simple`
-  (the most common case), Stack builds that executable using the version of
-  Cabal which came with the compiler. Stack caches such executables, in the
-  Stack root under directory `setup-exe-cache`.
-* In rare or complex cases, a different version of Cabal to the one that came
-  with the compiler may be needed. `build-type: Custom` and a `setup-custom`
-  stanza in the Cabal file, and a `Setup.hs` file in the package directory, can
-  be specified. The `stack.yaml` file can then specify the version of Cabal
-  that Stack will use to build the executable (named `setup`) from `Setup.hs`.
-  Stack will use Cabal via `setup`.
-
-For detail on the differences between a `stack.yaml` file and a Cabal file, see
-[stack.yaml vs a Cabal file](stack_yaml_vs_cabal_package_file.md).
-
-## I need to use a different version of a package than what is provided by the LTS Haskell snapshot I'm using, what should I do?
-
-You can make tweaks to a snapshot by modifying the `extra-deps` configuration
-value in your `stack.yaml` file, e.g.:
-
-~~~yaml
-resolver: lts-19.19
-packages:
-- '.'
-extra-deps:
-- text-2.0.1
-~~~
-
-## I need to use a package (or version of a package) that is not available on Hackage, what should I do?
-
-Add it to the
-[`extra-deps`](yaml_configuration.md#extra-deps) list in your project's
-`stack.yaml` file, specifying the package's source code location relative to the
-directory where your `stack.yaml` file lives, e.g.
-
-~~~yaml
-resolver: lts-19.19
-packages:
-- '.'
-extra-deps:
-- third-party/proprietary-dep
-- github-version-of/conduit
-- patched/diagrams
-~~~
-
-The above example specifies that the `proprietary-dep` package is found in the
-project's `third-party` directory, that the `conduit` package is found in the
-project's `github-version-of` directory, and that the `diagrams` package is
-found in the project's `patched` directory. This autodetects changes and
-reinstalls the package.
-
-To install packages directly from a Git repository, use e.g.:
-
-~~~yaml
-extra-deps:
-  - git: https://github.com/githubuser/reponame.git
-    commit: somecommitID
-~~~
-
-## What is the meaning of the arguments given to `stack build`, `test`, etc?
-
-Those are the targets of the build, and can have one of three formats:
-
-* A package name (e.g., `my-package`) will mean that the `my-package` package
-  must be built
-* A package identifier (e.g., `my-package-1.2.3`), which includes a specific
-  version. This is useful for passing to `stack install` for getting a specific
-  version from upstream
-* A directory (e.g., `./my-package`) for including a local directory's package,
-  including any packages in subdirectories
-
-## I need to modify an upstream package, how should I do it?
-
-Typically, you will want to get the source for the package and then add it to
-your `packages` list in the `stack.yaml` file. (See the previous question.)
-`stack unpack` is one approach for getting the source. Another would be to add
-the upstream package as a submodule to your project.
-
-## How do I use this with sandboxes?
-
-Explicit sandboxing on the part of the user is not required by Stack. All
-builds are automatically isolated into separate package databases without any
-user interaction. This ensures that you won't accidentally corrupt your
-installed packages with actions taken in other projects.
-
-## Can I run `cabal` commands inside `stack exec`?
-
-With a recent enough version of Cabal (the tool) (1.22 or later), you can. For
-earlier versions this does not work, due to Cabal issue
-[#1800](https://github.com/haskell/cabal/issues/1800). Note that
-even with recent versions, for some commands you may need the following extra
-level of indirection. Command:
-
-~~~text
-stack exec -- cabal exec -- cabal <command>
-~~~
+# Frequently asked questions
 
-However, virtually all `cabal` commands have an equivalent in Stack, so this
-should not be necessary. In particular, users of Cabal (the tool) may be
-accustomed to the `cabal run` command. With Stack, command:
+## Stack and Cabal
 
-~~~text
-stack build
-stack exec <program-name>
-~~~
+??? question "What is the relationship between Stack and Cabal?"
 
-Or, if you want to install the binaries in a shared location, command:
+    'Cabal' can refer to Cabal (the library) or to Cabal (the tool).
 
-~~~text
-stack install <program-name>
-~~~
+    === "Cabal (the library)"
 
-assuming your PATH has been set appropriately.
+         Cabal (the library) is used by Stack to build your Haskell code.
 
-## Using custom preprocessors
+         A Haskell package is described by a Cabal file, which file is part of
+         the package. The file is named `<package_name>.cabal`.
 
-If you have a custom preprocessor, for example, Ruby, you may have a file like:
+         Stack requires a project-level configuration file (`stack.yaml`, by
+         default).
 
-***B.erb***
+         For further information about the difference between a Cabal file and
+         a project-level configuration file, see the
+         [stack.yaml vs a Cabal file](topics/stack_yaml_vs_cabal_package_file.md)
+         documentation.
 
-~~~haskell
-module B where
+         The [`stack init`](commands/init_command.md) command initializes a
+         project-level configuration file from package description files.
 
-<% (1..5).each do |i| %>
-test<%= i %> :: Int
-test<%= i %> = <%= i %>
-<% end %>
-~~~
+         Stack uses Cabal (the library) via an executable. For
+         `build-type: Simple` (the most common case), Stack builds that
+         executable using the version of Cabal which came with GHC. Stack caches
+         such executables, in the [Stack root](topics/stack_root.md) under
+         directory `setup-exe-cache`.
 
-To ensure that Stack picks up changes to this file for rebuilds, add the
-following lines to your `stack.yaml` file:
+         In rare or complex cases, a different version of Cabal to the one that
+         came with GHC may be needed. `build-type: Custom` and a `setup-custom`
+         stanza in the Cabal file, and a `Setup.hs` file in the package
+         directory, can be specified. Stack's project-level configuration file
+         can then specify the version of Cabal that Stack will use to build the
+         executable (named `setup`) from `Setup.hs`. Stack will use Cabal via
+         `setup`.
 
-~~~yaml
-custom-preprocessor-extensions:
-- erb
+    === "Cabal (the tool)"
 
-require-stack-version: ">= 2.6.0"
-~~~
+        Cabal (the tool) is a tool provided by the
+        [`cabal-install`](https://hackage.haskell.org/package/cabal-install)
+        Haskell package. It aims to simplify the process of managing Haskell
+        software by automating the fetching, configuration, compilation and
+        installation of Haskell libraries and programs. These are goals that
+        Stack shares. Stack can be used independently of Cabal (the tool) but
+        users can also use both, if they wish.
 
-And for backwards compatability with older versions of Stack, also add the
-following line to your Cabal file:
+??? question "How do I use Stack with sandboxes?"
 
-    extra-source-files:   B.erb
+    A 'sandbox' is a development environment that is isolated from other parts
+    of the system. The concept of sandboxing is built into Stack. All builds are
+    automatically isolated into separate package databases.
 
-You could also use the
-[`--custom-preprocessor-extensions`](yaml_configuration.md#custom-preprocessor-extensions)
-flag.
+??? question "Can I run `cabal` commands inside `stack exec`?"
 
-## I already have GHC installed, can I still use Stack?
+    Yes. Some `cabal` commands are inconsistent with the `GHC_PACKAGE_PATH`
+    environment variable in the
+    [Stack environment](topics/stack_environment.md). Command, for example:
 
-Yes. In its default configuration, Stack will simply ignore any system GHC
-installation and use a sandboxed GHC that it has installed itself. You can find
-these sandboxed GHC installations in the `ghc-*` directories in the
-`stack path --programs` directory.
+    ~~~text
+    stack exec --no-ghc-package-path -- cabal build
+    ~~~
 
-If you would like Stack to use your system GHC installation, use the
-[`--system-ghc`](yaml_configuration.md#system-ghc) flag or run
-`stack config set system-ghc --global true` to make Stack check your PATH for a
-suitable GHC by default.
+## GHC or GHCi-related
 
-Stack can only use a system GHC installation if its version is compatible with
-the configuration of the current project, particularly the
-[`resolver` or `snapshot`](yaml_configuration.md#resolver-or-snapshot) setting.
+??? question "Will Stack interfere with the GHC I already have installed?"
 
-GHC installation doesn't work for all operating systems, so in some cases you
-will need to use `system-ghc` and install GHC yourself.
+    No.
 
-## How does Stack determine what GHC to use?
+??? question "I already have GHC installed. Can I still use Stack?"
 
-In its default configuration, Stack determines from the current project which
-GHC version, architecture etc it needs. It then looks in the `ghc-<version>`
-subdirectory of the `stack path --programs` directory for a compatible GHC,
-requesting to install one via `stack setup` if none is found.
+    Yes. In its default configuration, Stack will simply ignore any system GHC
+    installation and use a sandboxed GHC that it has installed itself. You can
+    find these sandboxed GHC installations in the `ghc-*` directories in the
+    `stack path --programs` directory.
 
-If you are using the [`--system-ghc`](yaml_configuration.md/#system-ghc) flag or
-have configured `system-ghc: true` either in the project `stack.yaml` or the
-global `config.yaml`, Stack will use the first GHC that it finds on your PATH,
-falling back on its sandboxed installations only if the found GHC doesn't comply
-with the various requirements (version, architecture) that your project needs.
+    If you would like Stack to use your system GHC installation, use the
+    [`--system-ghc`](configure/yaml/non-project.md#system-ghc) flag or run
+    `stack config set system-ghc --global true` to make Stack check your PATH
+    for a suitable GHC by default.
 
-See issue [#420](https://github.com/commercialhaskell/stack/issues/420) for a
-detailed discussion of Stack's behavior when `system-ghc` is enabled.
+    Stack can only use a system GHC installation if its version is compatible
+    with the configuration of the current project, particularly the snapshot
+    specified by the [`snapshot`](configure/yaml/project.md#snapshot) key.
 
-## How do I upgrade to GHC 7.10.2 with stack?
+    GHC installation does not work for all operating systems, so in some cases
+    you will need to use `system-ghc` and install GHC yourself.
 
-If you already have a prior version of GHC use
-`stack --resolver ghc-7.10 setup --reinstall`.
-If you don't have any GHC installed, you can skip the `--reinstall`.
+??? question "When I command `stack ghci` what version of GHC is used?"
 
-## How do I get extra build tools?
+    The version of GHC is specified by the snapshot in the relevant Stack
+    project-level configuration file. This may be the file in the
+    `global-project` directory in the [Stack root](topics/stack_root.md).
 
-Stack will automatically install build tools required by your packages or their
-dependencies, in particular [Alex](https://hackage.haskell.org/package/alex) and
-[Happy](https://hackage.haskell.org/package/happy).
+    For further information, see the [configuration](configure/yaml/index.md)
+    documentation.
 
-!!! note
+??? question "How does Stack determine what GHC to use?"
 
-    This works when using LTS or nightly resolvers, not with GHC or custom
-    resolvers. You can manually install build tools by running, e.g.,
-    `stack build alex happy`.
+    In its default configuration, Stack determines from the current project which
+    GHC version, architecture etc it needs. It then looks in the `ghc-<version>`
+    subdirectory of the `stack path --programs` directory for a compatible GHC,
+    requesting to install one via `stack setup` if none is found.
 
-## How does Stack choose which snapshot to use when creating a new configuration file?
+    If you are using the
+    [`--system-ghc`](configure/yaml/non-project.md#system-ghc) flag or have
+    configured `system-ghc: true` either in the project `stack.yaml` or the
+    global `config.yaml`, Stack will use the first GHC that it finds on your
+    PATH, falling back on its sandboxed installations only if the found GHC does
+    not comply with the various requirements (version, architecture) that your
+    project needs.
 
-It checks the two most recent LTS Haskell major versions and the most recent
-Stackage Nightly for a snapshot that is compatible with all of the version
-bounds in your Cabal file, favoring the most recent LTS. For more information,
-see the snapshot auto-detection section in the architecture document.
+    See issue [#420](https://github.com/commercialhaskell/stack/issues/420) for
+    a detailed discussion of Stack's behavior when `system-ghc` is enabled.
 
-## I'd like to use my installed packages in a different directory. How do I tell Stack where to find my packages?
+??? question "How can I test that different GHC versions can build my project?"
 
-Set the `STACK_YAML` environment variable to point to the `stack.yaml`
-configuration file for your project. Then you can run `stack exec`, `stack ghc`,
-etc., from any directory and still use your packages.
+    You can create multiple project-level configuration files for your project,
+    one for each build plan. For example, you might set up your project
+    directory like so:
 
-## My tests are failing. What should I do?
+    ~~~text
+    myproject/
+      stack-ghc-9.10.3.yaml
+      stack-ghc-9.8.4.yaml
+      stack.yaml --> symlink to stack-ghc-9.10.3.yaml
+      myproject.cabal
+      src/
+        ...
+    ~~~
 
-Like all other targets, `stack test` runs test suites in parallel by default.
-This can cause problems with test suites that depend on global resources such
-as a database or binding to a fixed port number. A quick hack is to force stack
-to run all test suites in sequence, using `stack test --jobs=1`. For test
-suites to run in parallel developers should ensure that their test suites do
-not depend on global resources (e.g. by asking the operating system for a random
-port to bind to) and where unavoidable, add a lock in order to serialize access
-to shared resources.
+    When you run `stack build`, you can set the `STACK_YAML` environment
+    variable to indicate which build plan to use. Command:
 
-## Can I get bash autocompletion?
+    === "Unix-like"
 
-Yes, see the [shell-autocompletion](shell_autocompletion.md) documentation.
+        ~~~text
+        STACK_YAML=stack-ghc-9.10.3.yaml
+        stack build
+        ~~~
 
-## How do I update my package index?
+    === "Windows"
 
-Users of Cabal (the tool) are used to running `cabal update` regularly. You can
-do the same with Stack by running `stack update`. But generally, it's not
-necessary: if the package index is missing, or if a snapshot refers to
-package/version that isn't available, Stack will automatically update and then
-try again. If you run into a situation where Stack doesn't automatically do the
-update for you, please report it as a bug.
+        ~~~text
+        $Env:STACK_YAML='stack-ghc-9.10.3.yaml'
+        stack build
+        ~~~
 
-## Isn't it dangerous to automatically update the index? Can't that corrupt build plans?
+    === "Windows (Command Prompt)"
 
-No, Stack is very explicit about which packages it's going to build for you.
-There are three sources of information to tell it which packages to install:
-the selected snapshot, the `extra-deps` configuration value, and your local
-packages. The only way to get Stack to change its build plan is to modify one
-of those three. Updating the index will have no impact on Stack's behavior.
+        ~~~text
+        set STACK_YAML=stack-ghc-9.10.3.yaml
+        stack build
+        ~~~
 
-## I have a custom package index I'd like to use, how do I do so?
+## Setup-related
 
-You can configure this in your project-level configuration file (`stack.yaml`).
-See [YAML configuration](yaml_configuration.md).
+??? question "Where is Stack installed?"
 
-## How can I make sure my project builds against multiple GHC versions?
+    Command:
 
-You can create multiple YAML configuration files for your project, one for each
-build plan. For example, you might set up your project directory like so:
+    ~~~text
+    stack uninstall
+    ~~~
 
-~~~text
-myproject/
-  stack-ghc-9.0.2.yaml
-  stack-ghc-9.2.4.yaml
-  stack.yaml --> symlink to stack-ghc-9.2.4.yaml
-  myproject.cabal
-  src/
-    ...
-~~~
+    for information about where Stack is installed.
 
-When you run `stack build`, you can set the `STACK_YAML` environment variable to
-indicate which build plan to use. On Unix-like operating systems command:
+??? question "Can I change Stack's default temporary directory?"
 
-~~~bash
-stack build  # builds using the default stack.yaml
-STACK_YAML=stack-ghc-7.10.yaml
-stack build  # builds using the given yaml file
-~~~
+    Stack downloads and extracts files to `$STACK_ROOT/programs` on most platforms,
+    which defaults to `~/.stack/programs`. On Windows `$LOCALAPPDATA\Programs\stack`
+    is used. If there is not enough free space in this directory, Stack may fail.
+    For instance, `stack setup` with a GHC installation requires roughly 1GB free.
+    If this is an issue, you can set `local-programs-path` in your
+    `~/.stack/config.yaml` to a directory on a file system with more free space.
 
-On Windows (with PowerShell) command:
+    If you use Stack with Nix integration, be aware that Nix uses a `TMPDIR`
+    variable, and if it is not set Nix sets it to some subdirectory of `/run`,
+    which on most Linuxes is a Ramdir. Nix will run the builds in `TMPDIR`,
+    therefore if you do not have enough RAM you will get errors about disk
+    space. If this happens to you, please _manually_ set `TMPDIR` before
+    launching Stack to some directory on the disk.
 
-~~~ps
-$Env:STACK_YAML='stack-ghc-9.0.2.yaml'
-stack build
-~~~
+??? question "On Windows, `stack setup` tells me to add certain paths to the PATH instead of doing it?"
 
-## I heard you can use this with Docker?
+    In PowerShell, it is easy to automate even that step. Command:
 
-Yes, Stack supports using Docker with images that contain preinstalled Stackage
-packages and the tools. See [Docker integration](docker_integration.md) for
-details.
+    ~~~text
+    $Env:Path = ( stack setup | %{ $_ -replace '[^ ]+ ', ''} ), $Env:Path -join ";"
+    ~~~
 
-## How do I use this with Travis CI?
+??? question "Does Stack install the system/C libraries that some Cabal packages depend on?"
 
-See the [Travis CI instructions](travis_ci.md)
+    No. This is currently out of the scope of Stack's target set of features.
+    Instead of attempting to automate the installation of 3rd party dependencies, we
+    have the following approaches for handling system dependencies:
 
-## How do I use this with Azure CI?
+    * Nix and docker help make your build and execution environment deterministic
+      and predictable. This way, you can install system dependencies into a
+      container, and share this container with all developers.
 
-See the [Azure CI instructions](azure_ci.md)
+    * If you have installed some libraries into a non-standard location, use the
+      [`extra-lib-dirs`](configure/yaml/non-project.md#extra-lib-dirs) option or the
+      [`extra-include-dirs`](configure/yaml/non-project.md#extra-include-dirs)
+      option to specify it.
 
-## What is licensing restrictions on Windows?
+    In the future, Stack might give operating system-specific suggestions for how to
+    install system libraries.
 
-Currently, on Windows, GHC produces binaries linked statically with
-[GNU Multiple Precision Arithmetic Library](https://gmplib.org/) (GMP), which is
-used by [integer-gmp](https://hackage.haskell.org/package/integer-gmp) library
-to provide big integer implementation for Haskell. Contrary to the majority of
-Haskell code licensed under permissive BSD3 license, GMP library is licensed
-under LGPL, which means resulting binaries
-[have to be provided with source code or object files](http://www.gnu.org/licenses/gpl-faq.html#LGPLStaticVsDynamic).
-That may or may not be acceptable for your situation. Current workaround is to
-use GHC built with alternative big integer implementation called
-`integer-simple`, which is free from LGPL limitations as it's pure Haskell and
-does not use GMP.  Unfortunately it has yet to be available out of the box with
-Stack. See issue [#399](https://github.com/commercialhaskell/stack/issues/399)
-for the ongoing effort and information on workarounds.
+??? question "How can I make Stack aware of my custom SSL certificates?"
 
-## How to get a working executable on Windows?
+    === "Linux"
 
-When executing a binary after building with `stack build` (e.g. for target
-"foo"), the command `foo.exe` might complain about missing runtime libraries
-(whereas `stack exec foo` works).
+        Use the `SYSTEM_CERTIFICATE_PATH` environment variable to point at the directory
+        where you keep your SSL certificates.
 
-Windows is not able to find the necessary C++ libraries from the standard
-prompt because they're not in the PATH environment variable. `stack exec` works
-because it's modifying PATH to include extra things.
 
-Those libraries are shipped with GHC (and, theoretically in some cases, MSYS).
-The easiest way to find them is `stack exec which`. For example, command:
+    === "macOS"
 
-~~~text
-stack exec -- which libstdc++-6.dll
-/c/Users/Michael/AppData/Local/Programs/stack/i386-windows/ghc-7.8.4/mingw/bin/libstdc++-6.dll
-~~~
+        In principle, you can use the following command to add a certificate to your
+        system certificate keychain:
 
-A quick workaround is adding this path to the PATH environment variable or
-copying the files somewhere Windows finds them (see
-https://msdn.microsoft.com/de-de/library/7d83bc18.aspx).
+        ~~~bash
+        sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain <certificate>
+        ~~~
 
-See issue [#425](https://github.com/commercialhaskell/stack/issues/425).
+        Some users have reported issues with this approach, see issue
+        [#907](https://github.com/commercialhaskell/stack/issues/907) for more
+        information.
 
-Another issue that may arise with building on Windows is as follows. The default
-location of Stack's programs folder is `%LOCALAPPDATA\Programs\stack`. If there
-is a space character in the `%LOCALAPPDATA%` path this may, in some
-circumstances, cause problems with building packages that make use of the GNU
-project's `autoconf` package and `configure` shell script files. It may be
-necessary to override the default location of Stack's programs folder. See the
-[local-programs-path](yaml_configuration.md#local-programs-path) option for more
-information.
+## Package description format-related
 
-See issue [#4726](https://github.com/commercialhaskell/stack/issues/4726).
+??? question "How does Stack support the Hpack specification?"
 
-## Can I change Stack's default temporary directory?
+    The [Hpack](https://github.com/sol/hpack) package description format is an
+    alternative to that used in a Cabal file.
 
-Stack downloads and extracts files to `$STACK_ROOT/programs` on most platforms,
-which defaults to `~/.stack/programs`. On Windows `$LOCALAPPDATA\Programs\stack`
-is used. If there is not enough free space in this directory, Stack may fail.
-For instance, `stack setup` with a GHC installation requires roughly 1GB free.
-If this is an issue, you can set `local-programs-path` in your
-`~/.stack/config.yaml` to a directory on a file system with more free space.
+    If a package directory contains an package description file in the Hpack
+    format (`package.yaml`), Stack will use that file to create the
+    corresponding Cabal file.
 
-If you use Stack with Nix integration, be aware that Nix uses a `TMPDIR`
-variable, and if it is not set Nix sets it to some subdirectory of `/run`, which
-on most Linuxes is a Ramdir. Nix will run the builds in `TMPDIR`, therefore if
-you don't have enough RAM you will get errors about disk space. If this happens
-to you, please _manually_ set `TMPDIR` before launching Stack to some directory
-on the disk.
+    [`stack init`](commands/init_command.md) will use Hpack format package
+    description files, if they are present.
 
-## Why doesn't Stack rebuild my project when I specify `--ghc-options` on the command line?
+    The [`with-hpack`](configure/yaml/non-project.md#with-hpack) non-project
+    specific configuration option or the
+    [`--with-hpack`](configure/global_flags.md#-with-hpack-option) global flag
+    can be used to specify an Hpack executable to use instead of Stack's
+    built-in Hpack functionality.
 
-Because GHC options often only affect optimization levels and warning behavior,
-Stack doesn't recompile when it detects an option change by default. This
-behavior can be changed though by setting the
-[`rebuild-ghc-options` option](yaml_configuration.md#rebuild-ghc-options) to
-`true`.
+## Package index-related
 
-To force recompilation manually, use the `--force-dirty` flag. If this still
-doesn't lead to a rebuild, add the `-fforce-recomp` flag to your
-`--ghc-options`.
+??? question "How do I update my package index?"
 
-## Why doesn't Stack apply my `--ghc-options` to my dependencies?
-
-By default, Stack applies command line GHC options only to local packages (these
-are all the packages that are specified in the `packages` section of your
-`stack.yaml` file). For an explanation of this choice see this discussion on
-issue
-[#827](https://github.com/commercialhaskell/stack/issues/827#issuecomment-133263678).
-
-If you still want to set specific GHC options for a dependency, use the
-[`ghc-options`](yaml_configuration.md#ghc-options) option in your
-YAML configuration file.
-
-To change the set of packages that command line GHC options apply to, use the [`apply-ghc-options`](yaml_configuration.md#apply-ghc-options) option.
-
-## `stack setup` on a Windows system only tells me to add certain paths to the PATH variable instead of doing it
-
-With PowerShell, it is easy to automate even that step. Command:
-
-~~~ps
-$Env:Path = ( stack setup | %{ $_ -replace '[^ ]+ ', ''} ), $Env:Path -join ";"
-~~~
-
-## How do I reset/remove Stack (such as to do a completely fresh build)?
-
-The first thing to remove is project-specific `.stack-work` directory within
-the project's directory. Next, remove the Stack root directory overall. You may
-have errors if you remove the latter but leave the former. Removing Stack
-itself will relate to how it was installed, and if you used GHC installed
-outside of Stack, that would need to be removed separately.
-
-## How does Stack handle parallel builds? What exactly does it run in parallel?
-
-See issue [#644](https://github.com/commercialhaskell/stack/issues/644) for more
-details.
+    Command:
 
-## I get strange `ld` errors about recompiling with "-fPIC"
+    ~~~text
+    stack update
+    ~~~
 
-(Updated in January 2019)
-
-This is related to more recent versions of Linux distributions that have GCC
-with PIE enabled by default. The continuously-updated distros like Arch, in
-particular, had been in flux with this change and the upgrading
-libtinfo6/ncurses6, and there were some workarounds attempted in Stack that
-ended up causing trouble as these distros evolved.
+    However, generally, it is not necessary with Stack: if the package index is
+    missing, or if a snapshot refers to package version that is not available,
+    Stack will automatically update the package index and then try again.
 
-GHC added official support for this setup in 8.0.2, so if you are using an
-older version your best bet is to upgrade. You may be able to work around it
-for older versions by editing `~/.stack/programs/x86_64-osx/ghc-VER/lib/ghc-
-VER/settings` (replace `VER` with the GHC version) and adding `-no-pie` (or
-`--no-pie` in the case of Gentoo, at least as of December 2017) to the __C
-compiler link flags__.
+    If you run into a situation where Stack does not automatically update the
+    package index, please report it as a bug.
 
-If `stack setup` complains that there is no `linuxNN-*-nopie` bindist available,
-try adding `ghc-build: *` (replacing the `*` with the actual value that
-precedes `-nopie`, which may be empty) to your `~/.stack/config.yaml` (this
-will no longer be necessary for stack >= 1.7).
+??? question "Is it dangerous to update the package index automatically? Can that corrupt build plans?"
 
-If you are experiencing this with GHC >= 8.0.2, try running
-`stack setup --reinstall` if you've upgraded your Linux distribution or you set
-up GHC before late December 2017.
+    No. Stack is explicit about which packages it is going to build. There are
+    three sources of information to tell Stack which packages to install: the
+    selected snapshot, the `extra-deps` configuration value, and your project
+    packages. The only way to get Stack to change its build plan is to modify
+    one of those three. Updating the index will have no effect on Stack's
+    behavior.
 
-If GHC doesn't recognize your C compiler as being able to use `-no-pie`, this
-can happen even with GCC and Clang, it might be necessary to enable this feature
-manually. To do this, just change
-`("C compiler supports -no-pie", "NO"),` to
-`("C compiler supports -no-pie", "YES"),`
-in the file `~/.stack/programs/x86_64-osx/ghc-VER/lib/ghc-VER/settings`.
+??? question "How do I use a custom package index?"
 
-If you are still having trouble after trying the above, check the following for
-more possible workarounds:
+    See the [`package-index`](configure/yaml/non-project.md#package-index)
+    non-project specific configuration option documentation.
 
-  * Previous version of this [FAQ entry](https://docs.haskellstack.org/en/v1.6.3/faq/#i-get-strange-ld-errors-about-recompiling-with-fpic)
-  * Related issues:
-    [#3518](https://github.com/commercialhaskell/stack/issues/3518),
-    [#2712](https://github.com/commercialhaskell/stack/issues/2712),
-    [#3630](https://github.com/commercialhaskell/stack/issues/3630),
-    [#3648](https://github.com/commercialhaskell/stack/issues/3648)
+## Package-related
 
-## Where does the output from `--ghc-options=-ddump-splices` (and other `-ddump*` options) go?
+??? question "How do I use a package version on Hackage not in a snapshot?"
 
-These are written to `*.dump-*` files inside the package's `.stack-work`
-directory. Specifically, they will be available at
-`PKG-DIR/$(stack path --dist-dir)/build/SOURCE-PATH`, where `SOURCE-PATH` is the
-path to the source file, relative to the location of the Cabal file. When
-building named components such as test-suites, `SOURCE-PATH` will also include
-`COMPONENT/COMPONENT-tmp`, where `COMPONENT` is the name of the component.
+    Add the package version to the [`extra-deps`](configure/yaml/project.md)
+    project-specific configuration option in the
+    [project-level configuration file](configure/yaml/index.md).
 
-## <a name="dyld-library-path-ignored"></a>Why is DYLD_LIBRARY_PATH ignored?
+??? question "How do I use a package version not on Hackage?"
 
-If you are on Mac OS X 10.11 ("El Capitan") or later, there is a GHC issue
-[#11617](https://ghc.haskell.org/trac/ghc/ticket/11617) which prevents the
-`DYLD_LIBRARY_PATH` environment variable from being passed to GHC (see issue
-[#1161](https://github.com/commercialhaskell/stack/issues/1161)) when System
-Integrity Protection (a.k.a. "rootless") is enabled. There are two known
-workarounds:
+    Add the location of the package version to the
+    [`extra-deps`](configure/yaml/project.md) project-specific configuration
+    option in the [project-level configuration file](configure/yaml/index.md).
 
- 1. Known to work in all cases:
-    [disable System Integrity Protection](http://osxdaily.com/2015/10/05/disable-rootless-system-integrity-protection-mac-os-x/).
-    **WARNING: Disabling SIP will severely reduce the security of your system, so only do this if absolutely necessary!**
- 2. Experimental: modify GHC's shell script wrappers to use a shell outside the
-    protected directories (see issue
-    [#1161](https://github.com/commercialhaskell/stack/issues/1161#issuecomment-186690904)).
+    For further information, see the
+    [package location](topics/package_location.md) documentation.
 
-## <a name="usr-bin-ar-permission-denied"></a>Why do I get a `/usr/bin/ar: permission denied` error?
+??? question "How do I use a modified version of a package?"
 
-If you are on OS X 10.11 ("El Capitan") or later, GHC 7.8.4 is incompatible with
-System Integrity Protection (a.k.a. "rootless") (see issue
-[#563](https://github.com/commercialhaskell/stack/issues/563)). GHC 7.10.2
-includes a fix, so this only affects users of GHC 7.8.4. If you cannot upgrade
-to GHC 7.10.2, you can work around it by
-[disabling System Integrity Protection](http://osxdaily.com/2015/10/05/disable-rootless-system-integrity-protection-mac-os-x/).
-**WARNING: Disabling SIP will severely reduce the security of your system, so only do this if absolutely necessary!**
+    Typically, a modified version of a package is used as a project package.
+    Add the location of the package to the
+    [`packages`](configure/yaml/project.md#packages) project-specific
+    configuration option in the
+    [project-level configuration file](configure/yaml/index.md).
 
-## Why is the `--` argument separator ignored in Windows PowerShell
+    One way to get the source code for the unmodified package version is to use
+    the [`stack unpack`](commands/unpack_command.md).
 
-Some versions of Windows PowerShell don't pass the `--` to programs (see issue
-[#813](https://github.com/commercialhaskell/stack/issues/813)). The workaround
-is to quote the `"--"`. For example, command:
+??? question "I'd like to use my installed packages in a different directory. How do I tell Stack where to find my packages?"
 
-~~~ps
-stack exec "--" cabal --version
-~~~
+    Set the `STACK_YAML` environment variable to point to the `stack.yaml`
+    configuration file for your project. Then you can run `stack exec`, `stack ghc`,
+    etc., from any directory and still use your packages.
 
-This is known to be a problem on Windows 7, but seems to be fixed on Windows 10.
+## `stack build`-related
 
-## Does Stack also install the system/C libraries that some Cabal packages depend on?
+??? question "Why does `stack build` fail with GHC 9.8.1 and 9.8.2 only?"
 
-No, this is currently out of the scope of Stack's target set of features.
-Instead of attempting to automate the installation of 3rd party dependencies, we
-have the following approaches for handling system dependencies:
+    If the Cabal file of the relevant package makes use of a `c-sources` field,
+    the failure may be due to `Cabal-3.10.2.0` enforcing that the field can
+    specify only `*.c` files. Earlier and later versions of Cabal (the library)
+    tolerate other files.
 
-* Nix and docker help make your build and execution environment deterministic
-  and predictable. This way, you can install system dependencies into a
-  container, and share this container with all developers.
+    When the Cabal build type is not `Custom`, Stack builds with the `Cabal`
+    boot package of the specified version of GHC. The boot package of GHC 9.8.1
+    and 9.8.2 is `Cabal-3.10.2.0`.
 
-* If you have installed some libraries into a non-standard location, use the
-  [`extra-lib-dirs`](yaml_configuration.md#extra-lib-dirs) option or the
-  [`extra-include-dirs`](yaml_configuration.md#extra-include-dirs) option to
-  specify it.
+??? question "What causes dependency on multiple versions of the same package?"
 
-In the future, Stack might give operating system-specific suggestions for how to
-install system libraries.
+    When building a package, during its configuration, Stack may warn:
 
-## How can I make Stack aware of my custom SSL certificates?
+    ~~~text
+    This package indirectly depends on multiple versions of the same package.
+    This is very likely to cause a compile failure.
+    ~~~
 
-### macOS
+    and the build subsequently fails.
 
-In principle, you can use the following command to add a certificate to your
-system certificate keychain:
+    Often the cause is that: (1) the package depends, directly or indirectly, on
+    a GHC wired-in package (for example, the `ghc` package); and (2) a direct or
+    indirect dependency of that wired-in package is also specified as an
+    extra-dep but the versions differ.
 
-~~~bash
-sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain <certificate>
-~~~
+??? question "Why does `stack test` trigger a rebuild of other components?"
 
-Some users have reported issues with this approach, see issue
-[#907](https://github.com/commercialhaskell/stack/issues/907) for more
-information.
+    If the set of dependencies of a project package to be built are not a
+    subset of the set of dependencies when it was last built, then that will
+    trigger a rebuild of components that were previously built.
 
-### Other *NIX OSs
+    The command:
 
-Use the `SYSTEM_CERTIFICATE_PATH` environment variable to point at the directory
-where you keep your SSL certificates.
+    ~~~text
+    stack build
+    ~~~
 
-## How do I get `verbose` output from GHC when I build?
+    will build the library and executable components of project packages and the
+    build will take into account the dependencies of those components.
 
-Add `ghc-options: -vN` to the Cabal file or pass it via
-`stack build --ghc-options="-v"`.
+    If you then command:
 
-## Does Stack support the Hpack specification?
+    ~~~text
+    stack test
+    ~~~
 
-Yes:
+    or, equivalently:
 
-* If a package directory contains an [Hpack](https://github.com/sol/hpack)
-  `package.yaml` file, then Stack will use it to generate a Cabal file when
-  building the package.
-* You can run `stack init` to initialize a `stack.yaml` file regardless of
-  whether your packages are declared with Cabal files or with Hpack
-  `package.yaml` files.
-* You can use the `with-hpack` YAML configuration or command line option to
-  specify an Hpack executable to use instead of Stack's in-built Hpack
-  functionality.
+    ~~~text
+    stack build --test
+    ~~~
 
-## How do I resolve linker errors when running `stack setup` or `stack build` on macOS?
+    the test suite components of project packages are added to the build
+    targets.
 
-This is likely to be caused by having both a LLVM installation and default Apple
-Clang compiler on the PATH. The symptom of this issue is a linker error "bad
-relocation (Invalid pointer diff)". The compiler picks up inconsistent versions
-of binaries and the mysterious error occurs.
+    That can add dependencies to a project package, if its test suite
+    components have dependencies that are not dependencies of its library
+    and executable components.
 
-The workaround is to remove LLVM binaries from the PATH.
+    What is true of test suite components applies equally to benchmark
+    components.
 
-## How do I suppress `'-nopie'` warnings with `stack build` on macOS?
+    If that behaviour is undesirable, a way to avoid it is to change the
+    description of each project package so that adding its test suite (or
+    benchmark) components does not add dependencies to the package. That is,
+    to specify, in the package description, the dependencies as common to all
+    the components that you are switching between from one build to another.
 
-~~~bash
-clang: warning: argument unused during compilation: '-nopie'
- [-Wunused-command-line-argument]
-~~~
+    For example, if you are using `package.yaml`, add the dependencies to its
+    top-level `dependencies` key.
 
-This warning is shown when compiler support of `-no-pie` is expected but
-unavailable. It's possible to bypass the warning for a specific version of GHC
-by modifying a global setting:
+    Alternatively, build all components of project packages without running
+    tests or benchmarks once built. Add the following to a configuration file:
 
-~~~bash
-# ~/.stack/programs/x86_64-osx/ghc-8.2.2/lib/ghc-8.2.2/settings
--- ("C compiler supports -no-pie", "YES"),
-++ ("C compiler supports -no-pie", "NO"),
-~~~
+    ~~~yaml
+    build:
+      test: true
+      test-arguments:
+        no-run-tests: true
+      bench: true
+      benchmark-opts:
+        no-run-benchmarks: true
+    ~~~
 
-**Note that we're fixing `ghc-8.2.2` in this case; repeat for other versions as necessary.**
-You should apply this fix for the version of GHC that matches your resolver.
+    or command:
 
-Issue [#4009](https://github.com/commercialhaskell/stack/issues/4009) goes into
-further detail.
+    ~~~text
+    stack build --test --no-run-tests --bench --no-run-benchmarks
+    ~~~
 
-## How do I install GHC in Stack when it fails with the error: Missing ghc bindist for "linux64-ncurses6"?
+??? question "How do I use a custom preprocessor?"
 
-Example Error:
+    See the
+    [`customer-prepocessor-extensions`](configure/yaml/project.md#custom-preprocessor-extensions)
+    project-specific configuration option documentation.
 
-~~~text
-No setup information found for ghc-8.6.4 on your platform.
-This probably means a GHC bindist has not yet been added for OS key 'linux64-ncurses6'.
-Supported versions: ghc-7.10.3, ghc-8.0.1, ghc-8.0.2, ghc-8.2.1, ghc-8.2.2
-~~~
+??? question "How do I get extra tools used during building?"
 
-Most Linux distributions have standardized on providing libtinfo.so.6 (either
-directly or as a symlink to libncursesw.so.6). As such, there aren't GHC 8.6.*
-bindists that link to libncursesw.so.6 available.
+    Stack will automatically install tools used during building required by your
+    packages or their dependencies, in particular
+    [Alex](https://hackage.haskell.org/package/alex) and
+    [Happy](https://hackage.haskell.org/package/happy).
 
-So creating a symlink to libncursesw.so.6 as libtinfo.so.6 can prevent this
-error (root privileges might be required). Command:
+    !!! note
 
-~~~bash
-ln -s /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.6
-~~~
+        This works when using LTS or nightly snapshots, not with GHC or custom
+        snapshots. You can manually install tools used during building by running,
+        e.g., `stack build alex happy`.
+
+??? question "My tests are failing. What should I do?"
+
+    Like all other targets, `stack test` runs test suites in parallel by default.
+    This can cause problems with test suites that depend on global resources such
+    as a database or binding to a fixed port number. A quick hack is to force stack
+    to run all test suites in sequence, using `stack test --jobs=1`. For test
+    suites to run in parallel developers should ensure that their test suites do
+    not depend on global resources (e.g. by asking the operating system for a random
+    port to bind to) and where unavoidable, add a lock in order to serialize access
+    to shared resources.
+
+??? question "How do I use Stack with Docker?"
+
+    See the [Docker integration](topics/docker_integration.md) documentation.
+
+??? question "How do I build a statically-linked executable on Linux?"
+
+    The way that Stack itself builds statically-linked Stack executables for Linux
+    is as follows:
+
+    * In the Cabal file, the following
+      [`ld-options`](https://cabal.readthedocs.io/en/stable/cabal-package-description-file.html#pkg-field-ld-options)
+      are set: `-static` and `-pthread`.
+
+    * The Stack command is run in a Docker container based on Alpine Linux. The
+      relevant Docker image repository is set out in Stack's `stack.yaml` file. See
+      also Olivier Benz's [GHC musl project](https://gitlab.com/benz0li/ghc-musl).
+
+    * Stack's configuration includes:
+
+        ~~~yaml
+        extra-include-dirs:
+        - /usr/include
+        extra-lib-dirs:
+        - /lib
+        - /usr/lib
+        ~~~
+
+    * The build command is `stack build --docker --system-ghc --no-install-ghc` (on
+      x86_64) or
+      `stack build --docker --docker-stack-exe=image --system-ghc --no-install-ghc`
+      (on AArch64; the host Stack and the image Stack must have the same version
+      number).
+
+??? question "Why does Stack not rebuild my project when I specify `--ghc-options` on the command line?"
+
+    Because GHC options often only affect optimization levels and warning
+    behavior, Stack does not recompile when it detects an option change by
+    default. This behavior can be changed though by setting the
+    [`rebuild-ghc-options` option](configure/yaml/non-project.md#rebuild-ghc-options)
+    to `true`.
+
+    To force recompilation manually, use the `--force-dirty` flag. If this still
+    does not lead to a rebuild, add the `-fforce-recomp` flag to your
+    `--ghc-options`.
+
+??? question "Why does Stack not apply my `--ghc-options` to my dependencies?"
+
+    By default, Stack applies command line GHC options only to
+    [project packages](configure/yaml/project.md#packages). For an explanation of
+    this choice see this discussion on issue
+    [#827](https://github.com/commercialhaskell/stack/issues/827#issuecomment-133263678).
+
+    If you still want to set specific GHC options for a dependency, use the
+    [`ghc-options`](configure/yaml/non-project.md#ghc-options) option in your YAML
+    configuration file.
+
+    To change the set of packages that command line GHC options apply to, use the [`apply-ghc-options`](configure/yaml/non-project.md#apply-ghc-options) option.
+
+??? question "How does Stack handle parallel builds?"
+
+    See issue [#644](https://github.com/commercialhaskell/stack/issues/644) for more
+    details.
+
+??? question "Where does the output from `--ghc-options=-ddump-splices` (and other `-ddump*` options) go?"
+
+    These are written to `*.dump-*` files inside the package's `.stack-work`
+    directory. Specifically, they will be available at
+    `PKG-DIR/$(stack path --dist-dir)/build/SOURCE-PATH`, where `SOURCE-PATH` is the
+    path to the source file, relative to the location of the Cabal file. When
+    building named components such as test-suites, `SOURCE-PATH` will also include
+    `COMPONENT/COMPONENT-tmp`, where `COMPONENT` is the name of the component.
+
+??? question "Why is DYLD_LIBRARY_PATH ignored?"
+
+    If you are on Mac OS X 10.11 ("El Capitan") or later, there is a GHC issue
+    [#11617](https://ghc.haskell.org/trac/ghc/ticket/11617) which prevents the
+    `DYLD_LIBRARY_PATH` environment variable from being passed to GHC (see issue
+    [#1161](https://github.com/commercialhaskell/stack/issues/1161)) when System
+    Integrity Protection (a.k.a. "rootless") is enabled. There are two known
+    workarounds:
+
+     1. Known to work in all cases:
+        [disable System Integrity Protection](http://osxdaily.com/2015/10/05/disable-rootless-system-integrity-protection-mac-os-x/).
+        **WARNING: Disabling SIP will severely reduce the security of your system, so only do this if absolutely necessary!**
+     2. Experimental: modify GHC's shell script wrappers to use a shell outside the
+        protected directories (see issue
+        [#1161](https://github.com/commercialhaskell/stack/issues/1161#issuecomment-186690904)).
+
+??? question "How do I get `verbose` output from GHC when I build?"
+
+    Set the [`--ghc-options`](commands/build_command.md#-ghc-options-option)
+    option of `stack build` to `-v`.
+
+## Snapshot-related
+
+??? question "How does Stack choose which snapshot to use when creating a project-level configuration file?"
+
+    See the [`stack init`](commands/init_command.md) command documentation.
+
+## CI-related
+
+??? question "How do I use Stack with Travis CI?"
+
+    See the [Travis CI](topics/travis_ci.md) documentation.
+
+??? question "How do I use Stack with Azure CI?"
+
+    See the [Azure CI](topics/azure_ci.md) documentation.
+
+## Linux-related
+
+??? question "How do fix error [S-9443] for 'linux64-ncurses6'?"
+
+    Most Linux distributions have standardized on providing `libtinfo.so.6`,
+    either directly or as a symbolic link to `libncursesw.so.6`. As such, there
+    are no GHC binary distributions that link to `libncursesw.so.6` after
+    GHC 8.2.2.
+
+    This error can be prevented by creating a symbolic link to
+    `libncursesw.so.6` using name `libtinfo.so.6`. Command:
+
+    ~~~bash
+    ln -s /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.6
+    ~~~
+
+    Root privileges may be required.
+
+## macOS-related
+
+??? question "On macOS, why do I see `ld: warning: -U option is redundant ...`?"
+
+    On macOS, the following may be reported during builds:
+
+    ~~~text
+    ld: warning: -U option is redundant when using -undefined dynamic_lookup
+    ~~~
+
+    The warning can be ignored. It arises because `process >= 1.6.30.0` passes
+    the option `-U _posix_spawn_file_actions_addchdir` to the linker (`ld`),
+    which means that the symbol `_posix_spawn_file_actions_addchdir` may be
+    undefined during linking. Separately, GHC also passes
+    `-undefined dynamic_lookup` when compiling dynamic libraries, which means
+    that all symbols may be undefined during linking, making the former
+    redundant.
+
+??? question "On macOS, how do I resolve linker errors when running `stack setup` or `stack build`?"
+
+    This is likely to be caused by having both a LLVM installation and default
+    Apple Clang compiler on the PATH. The symptom of this issue is a linker
+    error "bad relocation (Invalid pointer diff)". The compiler picks up
+    inconsistent versions of binaries and the mysterious error occurs.
+
+    The workaround is to remove LLVM binaries from the PATH.
+
+??? question "On macOS, how do I suppress `'-nopie'` warnings with `stack build`?"
+
+    ~~~bash
+    clang: warning: argument unused during compilation: '-nopie'
+     [-Wunused-command-line-argument]
+    ~~~
+
+    This warning is shown when compiler support of `-no-pie` is expected but
+    unavailable. It is possible to bypass the warning for a specific version of
+    GHC by modifying a global setting:
+
+    ~~~bash
+    # ~/.stack/programs/x86_64-osx/ghc-8.2.2/lib/ghc-8.2.2/settings
+    -- ("C compiler supports -no-pie", "YES"),
+    ++ ("C compiler supports -no-pie", "NO"),
+    ~~~
+
+    **Note that we are fixing `ghc-8.2.2` in this case; repeat for other
+    versions as necessary.**
+    You should apply this fix for the version of GHC that matches your snapshot.
+
+    Issue [#4009](https://github.com/commercialhaskell/stack/issues/4009) goes into
+    further detail.
+
+## Windows-related
+
+??? question "What is licensing restrictions on Windows?"
+
+    Currently, on Windows, GHC produces binaries linked statically with
+    [GNU Multiple Precision Arithmetic Library](https://gmplib.org/) (GMP), which is
+    used by [integer-gmp](https://hackage.haskell.org/package/integer-gmp) library
+    to provide big integer implementation for Haskell. Contrary to the majority of
+    Haskell code licensed under permissive BSD3 license, GMP library is licensed
+    under LGPL, which means resulting binaries
+    [have to be provided with source code or object files](http://www.gnu.org/licenses/gpl-faq.html#LGPLStaticVsDynamic).
+    That may or may not be acceptable for your situation. The current workaround
+    is to use GHC built with alternative big integer implementation called
+    `integer-simple`, which is free from LGPL limitations as it is pure Haskell
+    and does not use GMP. Unfortunately it has yet to be available out of the
+    box with Stack. See issue
+    [#399](https://github.com/commercialhaskell/stack/issues/399)
+    for the ongoing effort and information on workarounds.
+
+??? question "I have a Windows username with a space in it and problems building"
+
+    See the [`local-programs-path`](configure/yaml/non-project.md#local-programs-path)
+    non-project specific configuration option documentation for advice.
+
+??? question "How to get a working executable on Windows?"
+
+    When executing a binary after building with `stack build` (e.g. for target
+    "foo"), the command `foo.exe` might complain about missing runtime libraries
+    (whereas `stack exec foo` works).
+
+    Windows is not able to find the necessary C++ libraries from the standard
+    prompt because they're not in the PATH environment variable. `stack exec` works
+    because it is modifying PATH to include extra things.
+
+    Those libraries are shipped with GHC (and, theoretically in some cases, MSYS2).
+    The easiest way to find them is `stack exec which`. For example, command:
+
+    ~~~text
+    stack exec -- which libstdc++-6.dll
+    /c/Users/Michael/AppData/Local/Programs/stack/i386-windows/ghc-7.8.4/mingw/bin/libstdc++-6.dll
+    ~~~
+
+    A quick workaround is adding this path to the PATH environment variable or
+    copying the files somewhere Windows finds them (see
+    https://msdn.microsoft.com/de-de/library/7d83bc18.aspx).
+
+    See issue [#425](https://github.com/commercialhaskell/stack/issues/425).
diff --git a/doc/ghci.md b/doc/ghci.md
deleted file mode 100644
index 8c18c384de..0000000000
--- a/doc/ghci.md
+++ /dev/null
@@ -1,108 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# REPL environment
-
-A read–evaluate–print loop (REPL) environment takes single user inputs, executes
-them, and returns the result to the user. GHCi is GHC's interactive environment.
-The `stack ghci` or `stack repl` commands, which are equivalent, allow you to
-load components and files of your project into GHCi.
-
-The command uses the same TARGET syntax as `stack build`. It can also take flags
-like `--test` and `--bench` and options like `--flag`. Similarly to
-`stack build`, the default is to load up GHCi with all libraries and executables
-in the project.
-
-In order to load multiple components, `stack ghci` combines all of the GHC
-options together. This doesn't work in the general case, but when the packages
-being loaded share similar conventions, it should work out. A common source of
-issues is when one component defines default extensions which aren't assumed by
-another component. For example, specifying `NoImplicitPrelude` in one component
-but not another is quite likely to cause failures. GHCi will be run with
-`-XNoImplicitPrelude`, but it is likely that modules in the other component
-assume that the `Prelude` is implicitly imported.
-
-## Selecting Main module
-
-When loading multiple packages, there may be multiple definitions for the `Main`
-module. You can specify which `Main` module to load with the
-`--main-is <target>` option. If no selection is made and there are multiple
-`Main` modules, you will be asked to select from a list of options.
-
-## Speeding up initial load
-
-There are two ways to speed up the initial startup of GHCi:
-
-1.  Pass the `--no-build` flag, to skip an initial build step. This works only
-    if the dependencies have already been built.
-
-2.  Pass the `--no-load` flag, to skip loading all defined modules into GHCi.
-    You can then directly use `:load MyModule` in GHCi to load a specific module
-    in your project.
-
-## Loading just the main module
-
-By default, `stack ghci` loads and imports all of the modules in the package.
-This allows you to easily use anything exported by your package. This is usually
-quite convenient, but in some cases it makes sense to only load one module, or
-no modules at all. The `--only-main` flag allows this. It specifies that only
-the main module will be loaded, if any. This is particularly useful in the
-following circumstances:
-
-1. You're loading the project in order to run it in GHCi (e.g. via `main`), and
-   you intend to reload while developing. Without the `--only-main` flag, you
-   will need to quit and restart GHCi whenever a module gets deleted. With the
-   flag, reloading should work fine in this case.
-
-2. If many of your modules have exports named the same thing, then you'll need
-   to refer to them using qualified names. To avoid this, it may be easier to
-   use the `--only-main` flag to start with a blank slate and just import the
-   modules you are interested in.
-
-## Loading a filepath directly
-
-Instead of the `TARGET` syntax, it is also possible to command directly, for
-example:
-
-~~~text
-stack ghci src/MyFile.hs
-~~~
-
-This will figure out which component the file is associated with, and use the
-options from that component.
-
-## Specifying extra packages to build or depend on
-
-Sometimes you want to load GHCi with an additional package, that isn't a direct
-dependency of your components. This can be achieved by using the `--package`
-option. For example, if I want to experiment with the `lens` library, I can
-command:
-
-~~~text
-stack ghci --package lens
-~~~
-
-## Running plain GHCi
-
-`stack ghci` always runs GHCi configured to load code from packages in your
-project. In particular, this means it passes in flags like `-hide-all-packages`
-and `-package-id=` in order to configure which packages are visible to GHCi.
-
-For doing experiments which just involve packages installed in your databases,
-it may be useful to run GHCi plainly like:
-
-~~~text
-stack exec ghci
-~~~
-
-This will run a plain GHCi in an environment which includes `GHC_PACKAGE_PATH`,
-and so will have access to your databases.
-
-!!! note
-
-    Running `stack ghci` on a pristine copy of the code doesn't currently build
-    libraries
-    (issue [#2790](https://github.com/commercialhaskell/stack/issues/2790)) or
-    internal libraries
-    (issue [#4148](https://github.com/commercialhaskell/stack/issues/4148)). It
-    is recommended to always use `stack build` before using `stack ghci`, until
-    these two issues are closed.
diff --git a/doc/glossary.md b/doc/glossary.md
index 6b0021aab1..8c0874d514 100644
--- a/doc/glossary.md
+++ b/doc/glossary.md
@@ -4,51 +4,60 @@
 
 The following terms are used in Stack's documentation.
 
-|Term               |Meaning                                                   |
-|-------------------|----------------------------------------------------------|
-|Cabal              |The Haskell Common Architecture for Building Applications and Libraries, provided by the [`Cabal` package](https://hackage.haskell.org/package/Cabal). Also referred to as Cabal (the library) to distinguish it from Cabal (the tool).|
-|Cabal file|A file containing a [package description](https://cabal.readthedocs.io/en/stable/cabal-package.html) used by Cabal, named `<package_name>.cabal`.|
-|Cabal (the tool)|The Haskell build tool provided by the [`cabal-install` package](https://hackage.haskell.org/package/cabal-install).|
-|CI                 |Continuous integration.                                   |
-|CMake              |A [system](https://cmake.org/) for managing build processes.|
-|`config.yaml`      |A global and non-project-specific configuration file used by Stack.|
-|Docker             |A [platform](https://www.docker.com/) for developing,  shipping, and running applications. It can package and run an application in a loosely isolated environment called a _container_.|
-|Emacs              |[GNU Emacs](https://www.gnu.org/software/emacs/), an extensible, customisable text editor.|
-|extra-deps         |Packages in addition to those in a snapshot, named after a key used in `stack.yaml` files.|
-|FreeBSD            |A Unix-like operating system.                             |
-|GCC                |The [GNU Compiler Collection](https://gcc.gnu.org/) or its executable `gcc`.|
-|GHC                |The [Glasgow Haskell Compiler](https://www.haskell.org/ghc/).|
-|GHCi               |GHC's [interactive environment](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/ghci.html).|
-|GHCJS              |A Haskell to JavaScript [compiler](https://github.com/ghcjs/ghcjs).|
-|GHCup              |An [installer](https://www.haskell.org/ghcup/) for Haskell.
-|Git                |A [distributed version control system](https://git-scm.com/).|
-|GPG                |The [GNU Privacy Guard](https://gnupg.org/) or GnuPG, software that allows you to encrypt or sign your data and communications.|
-|Hackage            |The [Haskell Package Repository](https://hackage.haskell.org/).
-|Haddock            |The [document generation tool](https://hackage.haskell.org/package/haddock) for Haskell libraries.|
-|'Haskell' extension|The ['Haskell' extension]() for VS Code.                  |
-|HLS                |[Haskell Language Server](https://haskell-language-server.readthedocs.io/en/latest/), an implementation of the Language Server Protocol for Haskell.|
-|Homebrew           |A [package manager](https://brew.sh/) for macOS or Linux, or its executable `brew`.|
-|Hoogle             |A Haskell API [search engine](https://hoogle.haskell.org/).|
-|Hpack              |A [format](https://github.com/sol/hpack) for Haskell packages or the executable `hpack` that produces a Cabal file from `package.yaml`.|
-|Linux              |A family of operating systems based on the Linux kernel.  |
-|macOS              |The primary operating system for Apple's Mac computers. Previously known as Mac OS X or OS X.|
-|Make               |A [build automation tool](https://www.gnu.org/software/make/).|
-|MSYS2              |The [MSYS2](https://www.msys2.org/) software distribution and building platform for Windows.|
-|Nix                |A purely functional [package manager](https://nixos.org/), available for Linux and macOS.|
-|`package.yaml`     |A file that describes a package in the Hpack format.      |
-|Pantry             |A library for content-addressable Haskell package management, provided by the [`pantry` package](https://hackage.haskell.org/package/pantry). A dependency of Stack.|
-|PATH               |The `PATH` environment variable, specifying a list of directories searched for executable files.|
-|PVP                |The Haskell [Package Versioning Policy](https://pvp.haskell.org/), which tells developers of libraries how to set their version numbers.|
-|REPL               |An interactive (run-eval-print loop) programming environment.|
-|resolver           |A synonym for snapshot.                                   |
-|`Setup.hs`         |A project-specific file used by Cabal to perform setup tasks.|
-|snapshot           |A snapshot defines a GHC version, a set of packages, and build flags or other settings.|
-|Stack              |The Haskell Tool Stack project or its executable `stack`. |
-|`stack.yaml`       |A project-level configuration file used by Stack, which may also contain non-project-specific options.|
-|Stackage           |A [distribution](https://www.stackage.org/) of compatible Haskell packages.|
-|Stack root         |A directory in which Stack stores important files. See `stack path --stack-root`. On Windows, Stack also stores important files outside of the Stack root.|
+|Term                |Meaning                                                  |
+|--------------------|---------------------------------------------------------|
+|Cabal               |The Haskell Common Architecture for Building Applications and Libraries, provided by the [`Cabal` package](https://hackage.haskell.org/package/Cabal). Also referred to as Cabal (the library) to distinguish it from Cabal (the tool).|
+|Cabal file          |A file containing a [package description](https://cabal.readthedocs.io/en/stable/cabal-package-description-file.html) used by Cabal, named `<package_name>.cabal`. A Cabal file specifies properties in the form of field/value pairs.|
+|Cabal (the tool)    |The Haskell tool used for building provided by the [`cabal-install` package](https://hackage.haskell.org/package/cabal-install).|
+|CI                  |Continuous integration.                                  |
+|CMake               |A [system](https://cmake.org/) for managing build processes.|
+|`config.yaml`       |A global and non-project-specific configuration file used by Stack.|
+|dependency          |A Haskell package other than a project package and on which a project package depends (directly or indirectly), located locally or elsewhere.|
+|Docker              |A [platform](https://www.docker.com/) for developing,  shipping, and running applications. It can package and run an application in a loosely isolated environment called a _container_.|
+|Emacs               |[GNU Emacs](https://www.gnu.org/software/emacs/), an extensible, customisable text editor.|
+|extra-deps          |Extra dependencies (one version of each) that add to, or shadow, those specified in a snapshot.|
+|FreeBSD             |A Unix-like operating system.                            |
+|GCC                 |The [GNU Compiler Collection](https://gcc.gnu.org/) or its executable `gcc`.|
+|GHC                 |The [Glasgow Haskell Compiler](https://www.haskell.org/ghc/).|
+|GHC boot package    |A package that comes with GHC, is included in GHC's global package database, and is not specified directly in a Stackage snapshot. See the output of command `stack exec -- ghc-pkg list --global`.|
+|GHC wired-in package|A GHC boot package that cannot be shaddowed with different versions of the same package. Also referred to as 'magic'.|
+|GHCi                |GHC's [interactive environment](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/ghci.html).|
+|GHCJS               |A Haskell to JavaScript [compiler](https://github.com/ghcjs/ghcjs).|
+|GHCup               |An [installer](https://www.haskell.org/ghcup/) for Haskell.
+|Git                 |A [distributed version control system](https://git-scm.com/).|
+|GPG                 |The [GNU Privacy Guard](https://gnupg.org/) or GnuPG, software that allows you to encrypt or sign your data and communications.|
+|Hackage             |The [Haskell Package Repository](https://hackage.haskell.org/).
+|Haddock             |The [document generation tool](https://hackage.haskell.org/package/haddock) for Haskell libraries.|
+|'Haskell' extension |The ['Haskell' extension]() for VS Code.                  |
+|HLS                 |[Haskell Language Server](https://haskell-language-server.readthedocs.io/en/latest/), an implementation of the Language Server Protocol for Haskell.|
+|Homebrew            |A [package manager](https://brew.sh/) for macOS or Linux, or its executable `brew`.|
+|Hoogle              |A Haskell API [search engine](https://hoogle.haskell.org/).|
+|Hpack               |A [format](https://github.com/sol/hpack) for Haskell packages or the executable `hpack` that produces a Cabal file from `package.yaml`.|
+|Linux               |A family of operating systems based on the Linux kernel. |
+|macOS               |The primary operating system for Apple's Mac computers. Previously known as Mac OS X or OS X.|
+|Make                |A [build automation tool](https://www.gnu.org/software/make/).|
+|Markdown            |A plain text [formatting syntax](https://daringfireball.net/projects/markdown/) or software used to convert files in that format to HTML.|
+|MSYS2               |The [MSYS2](https://www.msys2.org/) software distribution and building platform for Windows.|
+|Nix                 |A purely functional [package manager](https://nixos.org/), available for Linux and macOS.|
+|package             |A Haskell package is an organised collection of Haskell code and related files. It is described by a Cabal file or a `package.yaml` file, which is itself part of the package.|
+|`package.yaml`      |A file that describes a package in the Hpack format.      |
+|Pantry              |A library for content-addressable Haskell package management, provided by the [`pantry` package](https://hackage.haskell.org/package/pantry). A dependency of Stack.|
+|PATH                |The `PATH` environment variable, specifying a list of directories searched for executable files.|
+|project             |A Stack project is a local directory that contains a project-level configuration file (`stack.yaml`, by default). A project may relate to more than one project package.|
+|project package     |A Haskell package that is part of a project and located locally. Distinct from a dependency located locally.|
+|PVP                 |The Haskell [Package Versioning Policy](https://pvp.haskell.org/), which tells developers of libraries how to set their version numbers.|
+|REPL                |An interactive (run-eval-print loop) programming environment.|
+|resolver            |A synonym for snapshot, now deprecated.                  |
+|`Setup.hs`          |A project-specific file used by Cabal to perform setup tasks.|
+|snapshot            |A snapshot defines a version of GHC (and, implicitly, its boot packages), a set of packages (one version of each), Cabal flags and GHC options.|
+|Stack               |The Stack project or its executable `stack`.|
+|`stack.yaml`        |A project-level configuration file used by Stack, which may also contain non-project-specific options.|
+|Stackage            |A [distribution](https://www.stackage.org/) of compatible Haskell packages.|
+|Stack root          |A directory in which Stack stores important files. See `stack path --stack-root`. On Windows, or if Stack is configured to use the XDG Base Directory Specification, Stack also stores important files outside of the Stack root.|
+|Stack work directory|A directory within a local project or package directory in which Stack stores files created during the build process. Named `.stack-work`, by default.|
 |Unix-like operating systems|Linux, FreeBSD and macOS.                         |
-|VS Code            |[Visual Studio Code](https://code.visualstudio.com/), a source code editor.|
-|Windows            |A group of operating systems developed by Microsoft.      |
-|WSL                |[Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/). Provides a Linux environment on Windows.|
-|YAML               |A human-friendly [data serialization language](https://yaml.org/).|
+|VS Code             |[Visual Studio Code](https://code.visualstudio.com/), a source code editor.|
+|Windows             |A group of operating systems developed by Microsoft.     |
+|WSL                 |[Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/). Provides a Linux environment on Windows.|
+|XDG Base Directory Specification|A [specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html) of directories relative to which files should be located.|
+|YAML                |A human-friendly [data serialization language](https://yaml.org/). The YAML syntax allows for key/value pairs.|
diff --git a/doc/img/dot_command/wreq-example1.svg b/doc/img/dot_command/wreq-example1.svg
new file mode 100644
index 0000000000..15996e6a98
--- /dev/null
+++ b/doc/img/dot_command/wreq-example1.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 12.0.0 (20240704.0754)
+ -->
+<!-- Title: deps Pages: 1 -->
+<svg width="141pt" height="116pt"
+ viewBox="0.00 0.00 141.07 116.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 112)">
+<title>deps</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-112 137.07,-112 137.07,4 -4,4"/>
+<!-- wreq -->
+<g id="node1" class="node">
+<title>wreq</title>
+<ellipse fill="none" stroke="black" cx="66.53" cy="-18" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="66.53" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">wreq</text>
+</g>
+<!-- wreq&#45;examples -->
+<g id="node2" class="node">
+<title>wreq&#45;examples</title>
+<ellipse fill="none" stroke="black" cx="66.53" cy="-90" rx="66.53" ry="18"/>
+<text text-anchor="middle" x="66.53" y="-84.58" font-family="Times New Roman,serif" font-size="14.00">wreq&#45;examples</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;wreq -->
+<g id="edge1" class="edge">
+<title>wreq&#45;examples&#45;&gt;wreq</title>
+<path fill="none" stroke="black" d="M66.53,-71.7C66.53,-64.41 66.53,-55.73 66.53,-47.54"/>
+<polygon fill="black" stroke="black" points="70.03,-47.62 66.53,-37.62 63.03,-47.62 70.03,-47.62"/>
+</g>
+</g>
+</svg>
diff --git a/doc/img/dot_command/wreq-example2.svg b/doc/img/dot_command/wreq-example2.svg
new file mode 100644
index 0000000000..a0d8853137
--- /dev/null
+++ b/doc/img/dot_command/wreq-example2.svg
@@ -0,0 +1,6145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 12.0.0 (20240704.0754)
+ -->
+<!-- Title: deps Pages: 1 -->
+<svg width="16402pt" height="1844pt"
+ viewBox="0.00 0.00 16402.00 1844.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1840)">
+<title>deps</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-1840 16398,-1840 16398,4 -4,4"/>
+<!-- wreq -->
+<g id="node1" class="node">
+<title>wreq</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="7318" cy="-1746" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="7318" y="-1740.58" font-family="Times New Roman,serif" font-size="14.00">wreq</text>
+</g>
+<!-- base -->
+<g id="node3" class="node">
+<title>base</title>
+<polygon fill="none" stroke="black" points="8657,-324 8603,-324 8603,-288 8657,-288 8657,-324"/>
+<text text-anchor="middle" x="8630" y="-300.57" font-family="Times New Roman,serif" font-size="14.00">base</text>
+</g>
+<!-- wreq&#45;&gt;base -->
+<g id="edge837" class="edge">
+<title>wreq&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M7347.44,-1744.66C7519.48,-1742.52 8396.35,-1729.9 8663,-1692 8825.75,-1668.87 9022,-1767.39 9022,-1603 9022,-1603 9022,-1603 9022,-1457 9022,-999.69 9063.92,-869.87 8932,-432 8921.79,-398.12 8926.37,-381.15 8898,-360 8815.92,-298.82 8766.29,-353.24 8668.23,-325.62"/>
+<polygon fill="black" stroke="black" points="8669.35,-322.3 8658.76,-322.71 8667.29,-328.99 8669.35,-322.3"/>
+</g>
+<!-- ghc&#45;prim -->
+<g id="node6" class="node">
+<title>ghc&#45;prim</title>
+<polygon fill="none" stroke="black" points="15247.12,-108 15180.88,-108 15180.88,-72 15247.12,-72 15247.12,-108"/>
+<text text-anchor="middle" x="15214" y="-84.58" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;prim</text>
+</g>
+<!-- wreq&#45;&gt;ghc&#45;prim -->
+<g id="edge845" class="edge">
+<title>wreq&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M7347.23,-1744.88C7908.22,-1742.45 16356,-1701.84 16356,-1459 16356,-1459 16356,-1459 16356,-233 16356,-208.4 16442.56,-213.77 16207,-144 16025.75,-90.32 15427.93,-89.69 15258.89,-90.64"/>
+<polygon fill="black" stroke="black" points="15258.96,-87.14 15248.98,-90.7 15259,-94.14 15258.96,-87.14"/>
+</g>
+<!-- template&#45;haskell -->
+<g id="node8" class="node">
+<title>template&#45;haskell</title>
+<polygon fill="none" stroke="black" points="10888.25,-612 10783.75,-612 10783.75,-576 10888.25,-576 10888.25,-612"/>
+<text text-anchor="middle" x="10836" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">template&#45;haskell</text>
+</g>
+<!-- wreq&#45;&gt;template&#45;haskell -->
+<g id="edge855" class="edge">
+<title>wreq&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7347.27,-1744.69C7696.66,-1740.86 11056,-1701.5 11056,-1603 11056,-1603 11056,-1603 11056,-1457 11056,-1387.22 11115.04,-1391.8 11151,-1332 11285.71,-1108 11484.03,-1033.49 11384,-792 11366.68,-750.19 11350.29,-744.13 11312,-720 11291.66,-707.18 11131.19,-654.32 11108,-648 11037.65,-628.84 10955.26,-613.79 10899.75,-604.7"/>
+<polygon fill="black" stroke="black" points="10900.59,-601.29 10890.16,-603.15 10899.48,-608.2 10900.59,-601.29"/>
+</g>
+<!-- Cabal -->
+<g id="node10" class="node">
+<title>Cabal</title>
+<ellipse fill="none" stroke="black" cx="5810" cy="-1170" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="5810" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">Cabal</text>
+</g>
+<!-- wreq&#45;&gt;Cabal -->
+<g id="edge833" class="edge">
+<title>wreq&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M7288.65,-1744.24C7246.09,-1741.73 7166.61,-1731.63 7114,-1692 6977.69,-1589.34 7043.19,-1472.12 6908,-1368 6637.43,-1159.61 6097.15,-1220.67 5896,-1188 5881.18,-1185.59 5865.02,-1182.52 5850.74,-1179.65"/>
+<polygon fill="black" stroke="black" points="5851.74,-1176.28 5841.24,-1177.71 5850.34,-1183.14 5851.74,-1176.28"/>
+</g>
+<!-- bytestring -->
+<g id="node14" class="node">
+<title>bytestring</title>
+<ellipse fill="none" stroke="black" cx="3240" cy="-666" rx="47.07" ry="18"/>
+<text text-anchor="middle" x="3240" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">bytestring</text>
+</g>
+<!-- wreq&#45;&gt;bytestring -->
+<g id="edge839" class="edge">
+<title>wreq&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M7288.55,-1745C6870.31,-1744.89 2138,-1740.58 2138,-1603 2138,-1603 2138,-1603 2138,-1529 2138,-1265.39 2041.7,-1176.34 2150,-936 2190.4,-846.34 2228.98,-833.8 2318,-792 2387.91,-759.17 2419.62,-791.91 2488,-756 2508.6,-745.18 2504.72,-729.41 2526,-720 2642.89,-668.33 3032.72,-665.47 3181.56,-666.35"/>
+<polygon fill="black" stroke="black" points="3181.15,-669.84 3191.17,-666.41 3181.2,-662.84 3181.15,-669.84"/>
+</g>
+<!-- containers -->
+<g id="node15" class="node">
+<title>containers</title>
+<ellipse fill="none" stroke="black" cx="9463" cy="-666" rx="48.57" ry="18"/>
+<text text-anchor="middle" x="9463" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">containers</text>
+</g>
+<!-- wreq&#45;&gt;containers -->
+<g id="edge842" class="edge">
+<title>wreq&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M7347.57,-1745.19C7564.14,-1746.45 8908.49,-1751.76 9311,-1692 9430.45,-1674.27 9463.81,-1671.59 9573,-1620 9924.19,-1454.05 10108.3,-1460.88 10287,-1116 10326.49,-1039.79 10291.31,-978.96 10217,-936 10122.48,-881.36 10080.23,-925.21 9974,-900 9924.36,-888.22 9914.29,-877.16 9865,-864 9788.28,-843.51 9763.88,-857.11 9690,-828 9632.84,-805.48 9619.45,-795.03 9572,-756 9555.24,-742.21 9555.33,-734.29 9539,-720 9525.95,-708.58 9510.41,-697.37 9496.79,-688.23"/>
+<polygon fill="black" stroke="black" points="9498.82,-685.38 9488.54,-682.8 9494.97,-691.22 9498.82,-685.38"/>
+</g>
+<!-- time -->
+<g id="node23" class="node">
+<title>time</title>
+<ellipse fill="none" stroke="black" cx="5473" cy="-954" rx="27" ry="18"/>
+<text text-anchor="middle" x="5473" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">time</text>
+</g>
+<!-- wreq&#45;&gt;time -->
+<g id="edge857" class="edge">
+<title>wreq&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M7289.01,-1742.88C7235.61,-1738.29 7118.69,-1725.07 7026,-1692 7002.67,-1683.68 6853.66,-1594.01 6831,-1584 6739.59,-1543.63 6713.85,-1540.26 6618,-1512 6492.69,-1475.05 6459.8,-1471.46 6333,-1440 6250.97,-1419.65 5657.76,-1315.47 5594,-1260 5550.21,-1221.9 5499.47,-1051.22 5480.59,-983.15"/>
+<polygon fill="black" stroke="black" points="5483.96,-982.23 5477.94,-973.51 5477.21,-984.08 5483.96,-982.23"/>
+</g>
+<!-- text -->
+<g id="node26" class="node">
+<title>text</title>
+<ellipse fill="none" stroke="black" cx="8511" cy="-810" rx="27" ry="18"/>
+<text text-anchor="middle" x="8511" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">text</text>
+</g>
+<!-- wreq&#45;&gt;text -->
+<g id="edge856" class="edge">
+<title>wreq&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M7347.48,-1744.87C7528.29,-1743.94 8483.54,-1736.91 8605,-1692 8664.96,-1669.83 8718,-1666.93 8718,-1603 8718,-1603 8718,-1603 8718,-1385 8718,-1183.43 8913.4,-1088.86 8782,-936 8712.55,-855.2 8627.96,-966.85 8545,-900 8526.78,-885.32 8518.32,-859.69 8514.39,-839.7"/>
+<polygon fill="black" stroke="black" points="8517.85,-839.2 8512.77,-829.9 8510.95,-840.34 8517.85,-839.2"/>
+</g>
+<!-- aeson -->
+<g id="node49" class="node">
+<title>aeson</title>
+<ellipse fill="none" stroke="black" cx="10558" cy="-1530" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="10558" y="-1524.58" font-family="Times New Roman,serif" font-size="14.00">aeson</text>
+</g>
+<!-- wreq&#45;&gt;aeson -->
+<g id="edge834" class="edge">
+<title>wreq&#45;&gt;aeson</title>
+<path fill="none" stroke="black" d="M7347.22,-1744.82C7574.88,-1743.31 9067.68,-1731.99 9517,-1692 9909,-1657.11 10377.58,-1567.11 10516.97,-1539.31"/>
+<polygon fill="black" stroke="black" points="10517.34,-1542.8 10526.46,-1537.41 10515.97,-1535.94 10517.34,-1542.8"/>
+</g>
+<!-- exceptions -->
+<g id="node53" class="node">
+<title>exceptions</title>
+<ellipse fill="none" stroke="black" cx="7101" cy="-666" rx="50.56" ry="18"/>
+<text text-anchor="middle" x="7101" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">exceptions</text>
+</g>
+<!-- wreq&#45;&gt;exceptions -->
+<g id="edge844" class="edge">
+<title>wreq&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M7338.12,-1732.67C7370.85,-1710.9 7432,-1662.28 7432,-1603 7432,-1603 7432,-1603 7432,-1313 7432,-1035.53 7291.21,-994.86 7150,-756 7137.83,-735.41 7124.8,-711.66 7115.24,-693.87"/>
+<polygon fill="black" stroke="black" points="7118.42,-692.41 7110.62,-685.24 7112.25,-695.71 7118.42,-692.41"/>
+</g>
+<!-- hashable -->
+<g id="node55" class="node">
+<title>hashable</title>
+<ellipse fill="none" stroke="black" cx="8043" cy="-882" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="8043" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">hashable</text>
+</g>
+<!-- wreq&#45;&gt;hashable -->
+<g id="edge846" class="edge">
+<title>wreq&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M7346.95,-1743.24C7494.83,-1733.89 8159,-1687.22 8159,-1603 8159,-1603 8159,-1603 8159,-1529 8159,-1417.29 8386.28,-1474.32 8352,-1368 8285.46,-1161.62 8160.07,-1167.85 8067,-972 8057.86,-952.77 8051.74,-929.48 8047.96,-911.55"/>
+<polygon fill="black" stroke="black" points="8051.42,-911 8046.06,-901.86 8044.55,-912.35 8051.42,-911"/>
+</g>
+<!-- unordered&#45;containers -->
+<g id="node69" class="node">
+<title>unordered&#45;containers</title>
+<ellipse fill="none" stroke="black" cx="9514" cy="-954" rx="89.49" ry="18"/>
+<text text-anchor="middle" x="9514" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">unordered&#45;containers</text>
+</g>
+<!-- wreq&#45;&gt;unordered&#45;containers -->
+<g id="edge859" class="edge">
+<title>wreq&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M7347.36,-1744.86C7560.43,-1743.76 8866.12,-1735.29 9036,-1692 9120.94,-1670.36 9212,-1690.65 9212,-1603 9212,-1603 9212,-1603 9212,-1457 9212,-1241.67 9244.1,-1162.59 9394,-1008 9409.25,-992.27 9429.99,-980.88 9449.93,-972.78"/>
+<polygon fill="black" stroke="black" points="9451.06,-976.1 9459.16,-969.27 9448.57,-969.56 9451.06,-976.1"/>
+</g>
+<!-- memory -->
+<g id="node83" class="node">
+<title>memory</title>
+<ellipse fill="none" stroke="black" cx="551" cy="-1026" rx="41.08" ry="18"/>
+<text text-anchor="middle" x="551" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">memory</text>
+</g>
+<!-- wreq&#45;&gt;memory -->
+<g id="edge852" class="edge">
+<title>wreq&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M7288.68,-1744.97C6794.67,-1744.52 223.44,-1737.59 139,-1692 39.69,-1638.38 38,-1571.87 38,-1459 38,-1459 38,-1459 38,-1169 38,-1074.03 368.72,-1040.02 499.08,-1030.31"/>
+<polygon fill="black" stroke="black" points="499.09,-1033.81 508.81,-1029.6 498.58,-1026.83 499.09,-1033.81"/>
+</g>
+<!-- attoparsec -->
+<g id="node86" class="node">
+<title>attoparsec</title>
+<ellipse fill="none" stroke="black" cx="8674" cy="-1026" rx="49.07" ry="18"/>
+<text text-anchor="middle" x="8674" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">attoparsec</text>
+</g>
+<!-- wreq&#45;&gt;attoparsec -->
+<g id="edge835" class="edge">
+<title>wreq&#45;&gt;attoparsec</title>
+<path fill="none" stroke="black" d="M7347.29,-1744.74C7532.07,-1743 8530.29,-1731.77 8580,-1692 8611.99,-1666.41 8604,-1643.97 8604,-1603 8604,-1603 8604,-1603 8604,-1169 8604,-1124.5 8632,-1079.49 8652.58,-1052.41"/>
+<polygon fill="black" stroke="black" points="8655.14,-1054.83 8658.56,-1044.8 8649.63,-1050.5 8655.14,-1054.83"/>
+</g>
+<!-- authenticate&#45;oauth -->
+<g id="node87" class="node">
+<title>authenticate&#45;oauth</title>
+<ellipse fill="none" stroke="black" cx="3436" cy="-1458" rx="77.51" ry="18"/>
+<text text-anchor="middle" x="3436" y="-1452.58" font-family="Times New Roman,serif" font-size="14.00">authenticate&#45;oauth</text>
+</g>
+<!-- wreq&#45;&gt;authenticate&#45;oauth -->
+<g id="edge836" class="edge">
+<title>wreq&#45;&gt;authenticate&#45;oauth</title>
+<path fill="none" stroke="black" d="M7288.51,-1744.95C6962.81,-1744.32 4045.06,-1737.45 3870,-1692 3705.17,-1649.2 3534.17,-1532 3466.33,-1482.05"/>
+<polygon fill="black" stroke="black" points="3468.79,-1479.51 3458.67,-1476.36 3464.61,-1485.13 3468.79,-1479.51"/>
+</g>
+<!-- http&#45;client -->
+<g id="node91" class="node">
+<title>http&#45;client</title>
+<ellipse fill="none" stroke="black" cx="5266" cy="-1314" rx="47.57" ry="18"/>
+<text text-anchor="middle" x="5266" y="-1308.58" font-family="Times New Roman,serif" font-size="14.00">http&#45;client</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;client -->
+<g id="edge847" class="edge">
+<title>wreq&#45;&gt;http&#45;client</title>
+<path fill="none" stroke="black" d="M7288.81,-1743.72C7229.39,-1740.41 7090.7,-1729.03 6981,-1692 6885.29,-1659.69 6876.39,-1617.25 6781,-1584 6235.08,-1393.69 5529.42,-1332.9 5324.29,-1318.65"/>
+<polygon fill="black" stroke="black" points="5324.64,-1315.17 5314.42,-1317.98 5324.16,-1322.15 5324.64,-1315.17"/>
+</g>
+<!-- http&#45;types -->
+<g id="node92" class="node">
+<title>http&#45;types</title>
+<ellipse fill="none" stroke="black" cx="3710" cy="-1026" rx="48.07" ry="18"/>
+<text text-anchor="middle" x="3710" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">http&#45;types</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;types -->
+<g id="edge849" class="edge">
+<title>wreq&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M7288.94,-1743.38C7193.7,-1737.94 6882.42,-1719.15 6626,-1692 5616.73,-1585.14 5359.11,-1563.69 4371,-1332 4104.42,-1269.49 3977.93,-1368.45 3772,-1188 3732.84,-1153.68 3718.27,-1091.73 3712.96,-1055.5"/>
+<polygon fill="black" stroke="black" points="3716.45,-1055.23 3711.68,-1045.77 3709.51,-1056.14 3716.45,-1055.23"/>
+</g>
+<!-- base16&#45;bytestring -->
+<g id="node94" class="node">
+<title>base16&#45;bytestring</title>
+<ellipse fill="none" stroke="black" cx="256" cy="-1386" rx="76.01" ry="18"/>
+<text text-anchor="middle" x="256" y="-1380.58" font-family="Times New Roman,serif" font-size="14.00">base16&#45;bytestring</text>
+</g>
+<!-- wreq&#45;&gt;base16&#45;bytestring -->
+<g id="edge838" class="edge">
+<title>wreq&#45;&gt;base16&#45;bytestring</title>
+<path fill="none" stroke="black" d="M7288.49,-1745C6978.99,-1744.96 4295.57,-1743.1 2124,-1692 1904.17,-1686.83 147,-1822.89 147,-1603 147,-1603 147,-1603 147,-1529 147,-1478.93 190.16,-1435.65 222.17,-1410.43"/>
+<polygon fill="black" stroke="black" points="224.23,-1413.27 230.06,-1404.42 219.99,-1407.7 224.23,-1413.27"/>
+</g>
+<!-- cabal&#45;doctest -->
+<g id="node98" class="node">
+<title>cabal&#45;doctest</title>
+<ellipse fill="none" stroke="black" cx="5697" cy="-1242" rx="60.54" ry="18"/>
+<text text-anchor="middle" x="5697" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">cabal&#45;doctest</text>
+</g>
+<!-- wreq&#45;&gt;cabal&#45;doctest -->
+<g id="edge840" class="edge">
+<title>wreq&#45;&gt;cabal&#45;doctest</title>
+<path fill="none" stroke="black" d="M7289.38,-1742.48C7229.31,-1736.69 7092.7,-1720.66 7057,-1692 7016.04,-1659.12 7033.49,-1630.47 7009,-1584 6956.43,-1484.27 6963.94,-1438.54 6876,-1368 6837.85,-1337.39 6817.69,-1349.45 6772,-1332 6733.29,-1317.22 6726.39,-1305.24 6686,-1296 6511.39,-1256.04 5965.91,-1246.02 5768.89,-1243.67"/>
+<polygon fill="black" stroke="black" points="5769.09,-1240.17 5759.05,-1243.56 5769.01,-1247.17 5769.09,-1240.17"/>
+</g>
+<!-- case&#45;insensitive -->
+<g id="node100" class="node">
+<title>case&#45;insensitive</title>
+<ellipse fill="none" stroke="black" cx="5890" cy="-954" rx="68.03" ry="18"/>
+<text text-anchor="middle" x="5890" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">case&#45;insensitive</text>
+</g>
+<!-- wreq&#45;&gt;case&#45;insensitive -->
+<g id="edge841" class="edge">
+<title>wreq&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M7291.18,-1738.45C7238.81,-1723.87 7128,-1683.51 7128,-1603 7128,-1603 7128,-1603 7128,-1529 7128,-1281.59 6721.4,-1323.17 6223,-1116 6114.54,-1070.91 5991.06,-1008.06 5929.4,-975.85"/>
+<polygon fill="black" stroke="black" points="5931.16,-972.82 5920.68,-971.28 5927.91,-979.02 5931.16,-972.82"/>
+</g>
+<!-- crypton -->
+<g id="node107" class="node">
+<title>crypton</title>
+<ellipse fill="none" stroke="black" cx="350" cy="-1098" rx="39.59" ry="18"/>
+<text text-anchor="middle" x="350" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">crypton</text>
+</g>
+<!-- wreq&#45;&gt;crypton -->
+<g id="edge843" class="edge">
+<title>wreq&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M7288.52,-1744.97C6795.33,-1744.43 277.21,-1736.44 193,-1692 61.92,-1622.82 68.83,-1509.17 114,-1368 149.93,-1255.71 182.75,-1233.45 268,-1152 281.87,-1138.74 299.51,-1126.85 314.87,-1117.7"/>
+<polygon fill="black" stroke="black" points="316.35,-1120.89 323.26,-1112.86 312.85,-1114.83 316.35,-1120.89"/>
+</g>
+<!-- mime&#45;types -->
+<g id="node121" class="node">
+<title>mime&#45;types</title>
+<ellipse fill="none" stroke="black" cx="6902" cy="-882" rx="53.56" ry="18"/>
+<text text-anchor="middle" x="6902" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">mime&#45;types</text>
+</g>
+<!-- wreq&#45;&gt;mime&#45;types -->
+<g id="edge853" class="edge">
+<title>wreq&#45;&gt;mime&#45;types</title>
+<path fill="none" stroke="black" d="M7297.88,-1732.67C7265.15,-1710.9 7204,-1662.28 7204,-1603 7204,-1603 7204,-1603 7204,-1313 7204,-1243.84 7176.87,-1067.73 7142,-1008 7103.4,-941.87 7016.66,-909.28 6958.73,-894.32"/>
+<polygon fill="black" stroke="black" points="6959.92,-891.01 6949.38,-892.01 6958.24,-897.81 6959.92,-891.01"/>
+</g>
+<!-- http&#45;client&#45;tls -->
+<g id="node124" class="node">
+<title>http&#45;client&#45;tls</title>
+<ellipse fill="none" stroke="black" cx="3938" cy="-1674" rx="59.05" ry="18"/>
+<text text-anchor="middle" x="3938" y="-1668.58" font-family="Times New Roman,serif" font-size="14.00">http&#45;client&#45;tls</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;client&#45;tls -->
+<g id="edge848" class="edge">
+<title>wreq&#45;&gt;http&#45;client&#45;tls</title>
+<path fill="none" stroke="black" d="M7288.59,-1744.49C7072.92,-1740.74 5712.98,-1716.86 4607,-1692 4388.42,-1687.09 4129.7,-1680.21 4007.96,-1676.91"/>
+<polygon fill="black" stroke="black" points="4008.22,-1673.42 3998.12,-1676.65 4008.03,-1680.42 4008.22,-1673.42"/>
+</g>
+<!-- lens -->
+<g id="node128" class="node">
+<title>lens</title>
+<ellipse fill="none" stroke="black" cx="12374" cy="-1458" rx="27" ry="18"/>
+<text text-anchor="middle" x="12374" y="-1452.58" font-family="Times New Roman,serif" font-size="14.00">lens</text>
+</g>
+<!-- wreq&#45;&gt;lens -->
+<g id="edge850" class="edge">
+<title>wreq&#45;&gt;lens</title>
+<path fill="none" stroke="black" d="M7347.43,-1744.88C7677.34,-1743.46 10677.87,-1729.55 11070,-1692 11578.14,-1643.34 12185.44,-1503.89 12337.93,-1467.68"/>
+<polygon fill="black" stroke="black" points="12338.53,-1471.14 12347.44,-1465.41 12336.9,-1464.33 12338.53,-1471.14"/>
+</g>
+<!-- lens&#45;aeson -->
+<g id="node131" class="node">
+<title>lens&#45;aeson</title>
+<ellipse fill="none" stroke="black" cx="9514" cy="-1602" rx="49.57" ry="18"/>
+<text text-anchor="middle" x="9514" y="-1596.58" font-family="Times New Roman,serif" font-size="14.00">lens&#45;aeson</text>
+</g>
+<!-- wreq&#45;&gt;lens&#45;aeson -->
+<g id="edge851" class="edge">
+<title>wreq&#45;&gt;lens&#45;aeson</title>
+<path fill="none" stroke="black" d="M7347.23,-1744.67C7572.79,-1742.04 9033,-1723.89 9226,-1692 9315.55,-1677.2 9415.95,-1641.61 9471.4,-1620.18"/>
+<polygon fill="black" stroke="black" points="9472.42,-1623.54 9480.46,-1616.65 9469.87,-1617.02 9472.42,-1623.54"/>
+</g>
+<!-- psqueues -->
+<g id="node139" class="node">
+<title>psqueues</title>
+<ellipse fill="none" stroke="black" cx="8601" cy="-954" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="8601" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">psqueues</text>
+</g>
+<!-- wreq&#45;&gt;psqueues -->
+<g id="edge854" class="edge">
+<title>wreq&#45;&gt;psqueues</title>
+<path fill="none" stroke="black" d="M7347.31,-1744.84C7535.5,-1743.41 8566,-1729.82 8566,-1603 8566,-1603 8566,-1603 8566,-1313 8566,-1177.23 8557.15,-1141.28 8583,-1008 8584.63,-999.57 8587.29,-990.65 8590.06,-982.57"/>
+<polygon fill="black" stroke="black" points="8593.3,-983.88 8593.44,-973.29 8586.73,-981.48 8593.3,-983.88"/>
+</g>
+<!-- time&#45;locale&#45;compat -->
+<g id="node144" class="node">
+<title>time&#45;locale&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="4670" cy="-1026" rx="81.5" ry="18"/>
+<text text-anchor="middle" x="4670" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">time&#45;locale&#45;compat</text>
+</g>
+<!-- wreq&#45;&gt;time&#45;locale&#45;compat -->
+<g id="edge858" class="edge">
+<title>wreq&#45;&gt;time&#45;locale&#45;compat</title>
+<path fill="none" stroke="black" d="M7289.56,-1741.52C6988.29,-1704.5 4392.84,-1382.41 4289,-1260 4242.51,-1205.19 4252.57,-1159.83 4359,-1080 4393.3,-1054.27 4501.95,-1040.19 4581.19,-1033.13"/>
+<polygon fill="black" stroke="black" points="4581.49,-1036.62 4591.15,-1032.27 4580.89,-1029.65 4581.49,-1036.62"/>
+</g>
+<!-- wreq&#45;examples -->
+<g id="node2" class="node">
+<title>wreq&#45;examples</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="11151" cy="-1818" rx="66.53" ry="18"/>
+<text text-anchor="middle" x="11151" y="-1812.58" font-family="Times New Roman,serif" font-size="14.00">wreq&#45;examples</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;wreq -->
+<g id="edge873" class="edge">
+<title>wreq&#45;examples&#45;&gt;wreq</title>
+<path fill="none" stroke="black" d="M11084.47,-1815.79C10609.11,-1807.1 7736.32,-1754.64 7358.9,-1747.75"/>
+<polygon fill="black" stroke="black" points="7359.07,-1744.25 7349.01,-1747.57 7358.94,-1751.25 7359.07,-1744.25"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;base -->
+<g id="edge862" class="edge">
+<title>wreq&#45;examples&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M11217.72,-1816.87C11751.28,-1815.74 15316.99,-1806.64 15792,-1764 16028.15,-1742.8 16318,-1912.1 16318,-1675 16318,-1675 16318,-1675 16318,-1169 16318,-1032.16 16204,-1019.84 16204,-883 16204,-883 16204,-883 16204,-809 16204,-567.84 15454.71,-394.29 15216,-360 14870.59,-310.39 9194.09,-307.2 8668.87,-307.01"/>
+<polygon fill="black" stroke="black" points="8668.94,-303.51 8658.94,-307.01 8668.94,-310.51 8668.94,-303.51"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;ghc&#45;prim -->
+<g id="edge866" class="edge">
+<title>wreq&#45;examples&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M11217.62,-1816.76C11786.48,-1814.67 15812.75,-1798.66 16064,-1764 16214.48,-1743.24 16394,-1826.91 16394,-1675 16394,-1675 16394,-1675 16394,-233 16394,-166.24 16335.89,-166.39 16273,-144 16176.6,-109.67 15448.72,-94.99 15259.07,-91.73"/>
+<polygon fill="black" stroke="black" points="15259.19,-88.23 15249.13,-91.56 15259.07,-95.23 15259.19,-88.23"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;bytestring -->
+<g id="edge863" class="edge">
+<title>wreq&#45;examples&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M11084.56,-1816.27C10688.08,-1811.92 8593.95,-1788.61 6885,-1764 6356.92,-1756.4 2568.79,-1919.8 2134,-1620 1834.19,-1413.27 1575.8,-1135.95 1818,-864 1824.28,-856.95 2116.83,-722.27 2126,-720 2328.83,-669.84 2981.45,-666.59 3181.29,-666.8"/>
+<polygon fill="black" stroke="black" points="3181.17,-670.3 3191.17,-666.81 3181.18,-663.3 3181.17,-670.3"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;containers -->
+<g id="edge864" class="edge">
+<title>wreq&#45;examples&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M11217.21,-1815.82C11461.47,-1810.59 12298,-1784.67 12298,-1675 12298,-1675 12298,-1675 12298,-1601 12298,-1357.41 11437.01,-1561.71 11209,-1476 10786.54,-1317.19 10782.31,-1062.25 10349,-936 10268.58,-912.57 10244.82,-922 10164,-900 10117.61,-887.37 10108.59,-875.86 10062,-864 9964.28,-839.12 9933.98,-858.9 9838,-828 9803.94,-817.03 9799.23,-805.27 9766,-792 9715.08,-771.67 9695.38,-783.59 9648,-756 9627.89,-744.29 9629.81,-732.2 9610,-720 9601,-714.46 9548.48,-696.02 9508.76,-682.44"/>
+<polygon fill="black" stroke="black" points="9509.97,-679.16 9499.38,-679.25 9507.71,-685.78 9509.97,-679.16"/>
+</g>
+<!-- filepath -->
+<g id="node18" class="node">
+<title>filepath</title>
+<ellipse fill="none" stroke="black" cx="5544" cy="-810" rx="37.59" ry="18"/>
+<text text-anchor="middle" x="5544" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">filepath</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;filepath -->
+<g id="edge865" class="edge">
+<title>wreq&#45;examples&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M11084.28,-1816.91C10603.18,-1816.19 7671.98,-1809.9 7280,-1764 7099.54,-1742.87 6881,-1856.69 6881,-1675 6881,-1675 6881,-1675 6881,-1601 6881,-1230.67 6439.03,-1462.66 6081,-1368 6068.47,-1364.69 5635.93,-1269.4 5627,-1260 5568.84,-1198.81 5550,-928.66 5545.32,-839.59"/>
+<polygon fill="black" stroke="black" points="5548.82,-839.59 5544.82,-829.78 5541.83,-839.94 5548.82,-839.59"/>
+</g>
+<!-- mtl -->
+<g id="node19" class="node">
+<title>mtl</title>
+<ellipse fill="none" stroke="black" cx="6832" cy="-594" rx="27" ry="18"/>
+<text text-anchor="middle" x="6832" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">mtl</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;mtl -->
+<g id="edge869" class="edge">
+<title>wreq&#45;examples&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M11084.54,-1815.7C10652.12,-1806.33 8236.04,-1739.39 7595,-1404 7493.3,-1350.79 6972.89,-728.43 6891,-648 6880.03,-637.22 6867.39,-625.76 6856.64,-616.26"/>
+<polygon fill="black" stroke="black" points="6859.09,-613.75 6849.27,-609.8 6854.48,-619.02 6859.09,-613.75"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;text -->
+<g id="edge872" class="edge">
+<title>wreq&#45;examples&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M11086.39,-1813.16C10965.04,-1805.68 10694.81,-1787.79 10468,-1764 10015.73,-1716.56 9897.93,-1723 9455,-1620 9351.08,-1595.84 9309.24,-1614.73 9226,-1548 8980.83,-1351.46 9132.6,-1111.57 8872,-936 8778.9,-873.28 8722.72,-949.57 8622,-900 8601.41,-889.87 8602.6,-878.72 8585,-864 8570.42,-851.81 8553.21,-839.38 8539.06,-829.62"/>
+<polygon fill="black" stroke="black" points="8541.31,-826.91 8531.07,-824.18 8537.37,-832.7 8541.31,-826.91"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;aeson -->
+<g id="edge860" class="edge">
+<title>wreq&#45;examples&#45;&gt;aeson</title>
+<path fill="none" stroke="black" d="M11154.71,-1799.54C11163.26,-1753.9 11178.55,-1631.3 11108,-1584 11066.22,-1555.99 10723.73,-1538.3 10601.3,-1532.82"/>
+<polygon fill="black" stroke="black" points="10601.82,-1529.34 10591.67,-1532.4 10601.51,-1536.34 10601.82,-1529.34"/>
+</g>
+<!-- ansi&#45;wl&#45;pprint -->
+<g id="node76" class="node">
+<title>ansi&#45;wl&#45;pprint</title>
+<ellipse fill="none" stroke="black" cx="16076" cy="-1098" rx="61.54" ry="18"/>
+<text text-anchor="middle" x="16076" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">ansi&#45;wl&#45;pprint</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;ansi&#45;wl&#45;pprint -->
+<g id="edge861" class="edge">
+<title>wreq&#45;examples&#45;&gt;ansi&#45;wl&#45;pprint</title>
+<path fill="none" stroke="black" d="M11217.64,-1817.03C11688.42,-1817.13 14519.26,-1815.53 15378,-1764 15562.29,-1752.94 16204,-1859.62 16204,-1675 16204,-1675 16204,-1675 16204,-1241 16204,-1186.92 16152.15,-1144.16 16114.45,-1120.21"/>
+<polygon fill="black" stroke="black" points="16116.37,-1117.29 16106.02,-1115.04 16112.71,-1123.25 16116.37,-1117.29"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;lens -->
+<g id="edge867" class="edge">
+<title>wreq&#45;examples&#45;&gt;lens</title>
+<path fill="none" stroke="black" d="M11217.75,-1817.37C11450.36,-1818.18 12216.26,-1816.8 12312,-1764 12354.21,-1740.72 12374,-1723.21 12374,-1675 12374,-1675 12374,-1675 12374,-1601 12374,-1561.74 12374,-1516.38 12374,-1487.69"/>
+<polygon fill="black" stroke="black" points="12377.5,-1488 12374,-1478 12370.5,-1488 12377.5,-1488"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;lens&#45;aeson -->
+<g id="edge868" class="edge">
+<title>wreq&#45;examples&#45;&gt;lens&#45;aeson</title>
+<path fill="none" stroke="black" d="M11092.26,-1809.32C10836.77,-1775.92 9823.86,-1643.51 9571.29,-1610.49"/>
+<polygon fill="black" stroke="black" points="9572.05,-1607.06 9561.69,-1609.23 9571.15,-1614 9572.05,-1607.06"/>
+</g>
+<!-- optparse&#45;applicative -->
+<g id="node136" class="node">
+<title>optparse&#45;applicative</title>
+<ellipse fill="none" stroke="black" cx="13045" cy="-1170" rx="85.49" ry="18"/>
+<text text-anchor="middle" x="13045" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">optparse&#45;applicative</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;optparse&#45;applicative -->
+<g id="edge870" class="edge">
+<title>wreq&#45;examples&#45;&gt;optparse&#45;applicative</title>
+<path fill="none" stroke="black" d="M11217.62,-1816.85C11799.31,-1815.36 15994,-1800.25 15994,-1675 15994,-1675 15994,-1675 15994,-1529 15994,-1384.04 14129.69,-1282.38 13901,-1260 13619.02,-1232.4 13285.1,-1196.86 13130.91,-1180.28"/>
+<polygon fill="black" stroke="black" points="13131.5,-1176.82 13121.19,-1179.23 13130.75,-1183.78 13131.5,-1176.82"/>
+</g>
+<!-- tagsoup -->
+<g id="node142" class="node">
+<title>tagsoup</title>
+<ellipse fill="none" stroke="black" cx="9816" cy="-882" rx="40.09" ry="18"/>
+<text text-anchor="middle" x="9816" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">tagsoup</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;tagsoup -->
+<g id="edge871" class="edge">
+<title>wreq&#45;examples&#45;&gt;tagsoup</title>
+<path fill="none" stroke="black" d="M11087.34,-1812.39C10923.91,-1796.98 10486.91,-1732.58 10266,-1476 10130.25,-1318.33 10333.95,-1200.5 10255,-1008 10250.74,-997.6 10194.03,-941.07 10184,-936 10176.93,-932.43 9963.96,-903.12 9865.29,-889.69"/>
+<polygon fill="black" stroke="black" points="9866.01,-886.25 9855.63,-888.37 9865.07,-893.19 9866.01,-886.25"/>
+</g>
+<!-- ghc&#45;internal -->
+<g id="node5" class="node">
+<title>ghc&#45;internal</title>
+<polygon fill="none" stroke="black" points="480.25,-252 399.75,-252 399.75,-216 480.25,-216 480.25,-252"/>
+<text text-anchor="middle" x="440" y="-228.57" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;internal</text>
+</g>
+<!-- base&#45;&gt;ghc&#45;internal -->
+<g id="edge154" class="edge">
+<title>base&#45;&gt;ghc&#45;internal</title>
+<path fill="none" stroke="black" d="M8602.74,-304.77C8112.34,-300.58 1162.59,-241.18 491.93,-235.44"/>
+<polygon fill="black" stroke="black" points="492.27,-231.95 482.24,-235.36 492.21,-238.95 492.27,-231.95"/>
+</g>
+<!-- base&#45;&gt;ghc&#45;prim -->
+<g id="edge155" class="edge">
+<title>base&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M8657.46,-301.96C8829.94,-283.03 9781.83,-180.87 10561,-144 11526.38,-98.32 14751.69,-91.73 15169.31,-91.06"/>
+<polygon fill="black" stroke="black" points="15169.06,-94.56 15179.06,-91.05 15169.05,-87.56 15169.06,-94.56"/>
+</g>
+<!-- ghc&#45;bignum -->
+<g id="node4" class="node">
+<title>ghc&#45;bignum</title>
+<polygon fill="none" stroke="black" points="619,-180 537,-180 537,-144 619,-144 619,-180"/>
+<text text-anchor="middle" x="578" y="-156.57" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;bignum</text>
+</g>
+<!-- ghc&#45;bignum&#45;&gt;ghc&#45;prim -->
+<g id="edge365" class="edge">
+<title>ghc&#45;bignum&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M619.43,-151.89C635.73,-148.73 654.66,-145.59 672,-144 1061.06,-108.39 14300.46,-92.08 15169.27,-91.05"/>
+<polygon fill="black" stroke="black" points="15169.1,-94.55 15179.1,-91.04 15169.09,-87.55 15169.1,-94.55"/>
+</g>
+<!-- ghc&#45;internal&#45;&gt;ghc&#45;bignum -->
+<g id="edge367" class="edge">
+<title>ghc&#45;internal&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M474.47,-215.52C492.47,-206.39 514.69,-195.11 533.93,-185.35"/>
+<polygon fill="black" stroke="black" points="535.29,-188.59 542.62,-180.95 532.12,-182.35 535.29,-188.59"/>
+</g>
+<!-- ghc&#45;internal&#45;&gt;ghc&#45;prim -->
+<g id="edge368" class="edge">
+<title>ghc&#45;internal&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M450.82,-215.59C465.34,-194.08 493.34,-158.55 528,-144 619,-105.81 14285.23,-91.9 15169.19,-91.04"/>
+<polygon fill="black" stroke="black" points="15168.92,-94.54 15178.91,-91.03 15168.91,-87.54 15168.92,-94.54"/>
+</g>
+<!-- rts -->
+<g id="node7" class="node">
+<title>rts</title>
+<polygon fill="none" stroke="black" points="7763,-36 7709,-36 7709,0 7763,0 7763,-36"/>
+<text text-anchor="middle" x="7736" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">rts</text>
+</g>
+<!-- ghc&#45;internal&#45;&gt;rts -->
+<g id="edge369" class="edge">
+<title>ghc&#45;internal&#45;&gt;rts</title>
+<path fill="none" stroke="black" d="M441.25,-215.8C443.8,-194.86 451.54,-160.28 475,-144 633.57,-33.96 7135.91,-20.06 7697.41,-19.06"/>
+<polygon fill="black" stroke="black" points="7697,-22.56 7706.99,-19.05 7696.99,-15.56 7697,-22.56"/>
+</g>
+<!-- ghc&#45;prim&#45;&gt;rts -->
+<g id="edge370" class="edge">
+<title>ghc&#45;prim&#45;&gt;rts</title>
+<path fill="none" stroke="black" d="M15180.66,-88.69C14664.88,-83.86 8330.27,-24.56 7774.83,-19.36"/>
+<polygon fill="black" stroke="black" points="7775.03,-15.87 7765,-19.27 7774.97,-22.87 7775.03,-15.87"/>
+</g>
+<!-- template&#45;haskell&#45;&gt;base -->
+<g id="edge720" class="edge">
+<title>template&#45;haskell&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10839.5,-575.64C10844.94,-543.36 10851.5,-473.59 10817,-432 10748.62,-349.56 10692.66,-377.62 10587,-360 10391.47,-327.4 8927.04,-310.2 8668.83,-307.41"/>
+<polygon fill="black" stroke="black" points="8669.01,-303.91 8658.97,-307.3 8668.93,-310.91 8669.01,-303.91"/>
+</g>
+<!-- template&#45;haskell&#45;&gt;ghc&#45;prim -->
+<g id="edge722" class="edge">
+<title>template&#45;haskell&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M10888.64,-592.68C11263.22,-590.31 13518.96,-574.66 13821,-540 13943.93,-525.89 14910,-430.74 14910,-307 14910,-307 14910,-307 14910,-233 14910,-119.92 15084.8,-96.69 15169.3,-92.06"/>
+<polygon fill="black" stroke="black" points="15169.26,-95.56 15179.09,-91.59 15168.93,-88.57 15169.26,-95.56"/>
+</g>
+<!-- pretty -->
+<g id="node21" class="node">
+<title>pretty</title>
+<ellipse fill="none" stroke="black" cx="6467" cy="-522" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="6467" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">pretty</text>
+</g>
+<!-- template&#45;haskell&#45;&gt;pretty -->
+<g id="edge723" class="edge">
+<title>template&#45;haskell&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M10783.5,-592.16C10320.1,-584.73 6935.09,-530.5 6510.67,-523.7"/>
+<polygon fill="black" stroke="black" points="6510.82,-520.2 6500.77,-523.54 6510.71,-527.2 6510.82,-520.2"/>
+</g>
+<!-- ghc&#45;boot&#45;th -->
+<g id="node120" class="node">
+<title>ghc&#45;boot&#45;th</title>
+<ellipse fill="none" stroke="black" cx="10753" cy="-450" rx="54.56" ry="18"/>
+<text text-anchor="middle" x="10753" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;boot&#45;th</text>
+</g>
+<!-- template&#45;haskell&#45;&gt;ghc&#45;boot&#45;th -->
+<g id="edge721" class="edge">
+<title>template&#45;haskell&#45;&gt;ghc&#45;boot&#45;th</title>
+<path fill="none" stroke="black" d="M10825.82,-575.59C10811.56,-551.18 10785.49,-506.58 10768.72,-477.89"/>
+<polygon fill="black" stroke="black" points="10771.83,-476.28 10763.77,-469.42 10765.79,-479.82 10771.83,-476.28"/>
+</g>
+<!-- zlib&#45;clib -->
+<g id="node9" class="node">
+<title>zlib&#45;clib</title>
+<ellipse fill="none" stroke="black" cx="178" cy="-18" rx="40.09" ry="18"/>
+<text text-anchor="middle" x="178" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">zlib&#45;clib</text>
+</g>
+<!-- Cabal&#45;&gt;base -->
+<g id="edge4" class="edge">
+<title>Cabal&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5777.73,-1167.97C5589.87,-1161.72 4642.02,-1126.22 4545,-1044 4418.71,-936.98 4690.3,-430.65 4840,-360 4929.48,-317.77 8197.69,-308.11 8591.33,-307.09"/>
+<polygon fill="black" stroke="black" points="8591.13,-310.59 8601.12,-307.07 8591.11,-303.59 8591.13,-310.59"/>
+</g>
+<!-- Cabal&#45;syntax -->
+<g id="node11" class="node">
+<title>Cabal&#45;syntax</title>
+<ellipse fill="none" stroke="black" cx="6425" cy="-1098" rx="59.05" ry="18"/>
+<text text-anchor="middle" x="6425" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">Cabal&#45;syntax</text>
+</g>
+<!-- Cabal&#45;&gt;Cabal&#45;syntax -->
+<g id="edge1" class="edge">
+<title>Cabal&#45;&gt;Cabal&#45;syntax</title>
+<path fill="none" stroke="black" d="M5841.34,-1165.43C5937.19,-1154.52 6227.84,-1121.44 6359.24,-1106.48"/>
+<polygon fill="black" stroke="black" points="6359.27,-1110 6368.81,-1105.4 6358.48,-1103.05 6359.27,-1110"/>
+</g>
+<!-- Win32 -->
+<g id="node12" class="node">
+<title>Win32</title>
+<ellipse fill="none" stroke="black" cx="5167" cy="-882" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="5167" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">Win32</text>
+</g>
+<!-- Cabal&#45;&gt;Win32 -->
+<g id="edge2" class="edge">
+<title>Cabal&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M5791.53,-1154.85C5777.62,-1144.19 5758.1,-1129.2 5741,-1116 5637.7,-1036.25 5628.86,-987.64 5509,-936 5409.76,-893.24 5281.17,-884.4 5213.44,-882.93"/>
+<polygon fill="black" stroke="black" points="5213.89,-879.44 5203.83,-882.77 5213.77,-886.44 5213.89,-879.44"/>
+</g>
+<!-- array -->
+<g id="node13" class="node">
+<title>array</title>
+<ellipse fill="none" stroke="black" cx="5457" cy="-378" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="5457" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">array</text>
+</g>
+<!-- Cabal&#45;&gt;array -->
+<g id="edge3" class="edge">
+<title>Cabal&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M5778.74,-1164.94C5748.43,-1161.12 5701.13,-1155.49 5660,-1152 5518.95,-1140.02 5153.4,-1173.4 5024,-1116 4982.34,-1097.52 4968.58,-1086.04 4951,-1044 4931.37,-997.06 4955.07,-973.92 4989,-936 5007.99,-914.78 5020.49,-918.66 5042,-900 5055.22,-888.53 5254,-684.5 5254,-667 5254,-667 5254,-667 5254,-521 5254,-441.57 5359.66,-402.84 5418.52,-387.43"/>
+<polygon fill="black" stroke="black" points="5419.3,-390.84 5428.15,-385.02 5417.6,-384.05 5419.3,-390.84"/>
+</g>
+<!-- Cabal&#45;&gt;bytestring -->
+<g id="edge5" class="edge">
+<title>Cabal&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5777.83,-1168.51C5572.78,-1165.08 4446.69,-1141.99 4119,-1044 4017.31,-1013.59 4006.52,-970.08 3906,-936 3823.36,-907.99 3795.9,-927.22 3713,-900 3643.12,-877.05 3625.3,-868.63 3564,-828 3523.57,-801.2 3517.83,-788.68 3482,-756 3464.81,-740.32 3464.35,-731.28 3444,-720 3397.68,-694.32 3338.53,-680.73 3295.87,-673.78"/>
+<polygon fill="black" stroke="black" points="3296.48,-670.33 3286.06,-672.26 3295.41,-677.25 3296.48,-670.33"/>
+</g>
+<!-- Cabal&#45;&gt;containers -->
+<g id="edge6" class="edge">
+<title>Cabal&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M5842.38,-1168.63C6123.99,-1165.23 8161.65,-1137.68 8766,-1044 8781.08,-1041.66 9021.73,-984.12 9031,-972 9060,-934.07 8988.89,-888.13 8974,-828 8962.46,-781.41 8941.94,-755.72 8974,-720 9002.24,-688.53 9279.5,-674.03 9403.54,-669.08"/>
+<polygon fill="black" stroke="black" points="9403.33,-672.59 9413.19,-668.7 9403.06,-665.6 9403.33,-672.59"/>
+</g>
+<!-- deepseq -->
+<g id="node16" class="node">
+<title>deepseq</title>
+<ellipse fill="none" stroke="black" cx="7763" cy="-450" rx="41.58" ry="18"/>
+<text text-anchor="middle" x="7763" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">deepseq</text>
+</g>
+<!-- Cabal&#45;&gt;deepseq -->
+<g id="edge7" class="edge">
+<title>Cabal&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5841.98,-1166.54C5885.12,-1163.22 5964.36,-1157.14 6032,-1152 6085.11,-1147.97 6473.78,-1155.05 6510,-1116 6535.18,-1088.85 6483.94,-1019.66 6478,-1008 6432.06,-917.87 6364,-912.16 6364,-811 6364,-811 6364,-811 6364,-665 6364,-582.4 6618.82,-523.82 6699,-504 6893.67,-455.88 7521.99,-451.25 7709.62,-450.96"/>
+<polygon fill="black" stroke="black" points="7709.56,-454.46 7719.56,-450.95 7709.55,-447.46 7709.56,-454.46"/>
+</g>
+<!-- directory -->
+<g id="node17" class="node">
+<title>directory</title>
+<ellipse fill="none" stroke="black" cx="5004" cy="-1026" rx="44.08" ry="18"/>
+<text text-anchor="middle" x="5004" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">directory</text>
+</g>
+<!-- Cabal&#45;&gt;directory -->
+<g id="edge8" class="edge">
+<title>Cabal&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M5779.87,-1163.69C5658.87,-1142.37 5207.4,-1062.84 5054.79,-1035.95"/>
+<polygon fill="black" stroke="black" points="5055.84,-1032.58 5045.39,-1034.29 5054.63,-1039.47 5055.84,-1032.58"/>
+</g>
+<!-- Cabal&#45;&gt;filepath -->
+<g id="edge9" class="edge">
+<title>Cabal&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M5827.86,-1154.86C5838.55,-1145.21 5851.15,-1131.41 5857,-1116 5862.68,-1101.04 5863.6,-1094.58 5857,-1080 5799.66,-953.34 5649.42,-864.15 5580.05,-828.39"/>
+<polygon fill="black" stroke="black" points="5581.89,-825.39 5571.38,-823.99 5578.72,-831.64 5581.89,-825.39"/>
+</g>
+<!-- Cabal&#45;&gt;mtl -->
+<g id="edge10" class="edge">
+<title>Cabal&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M5841.97,-1166.41C5885.1,-1162.94 5964.32,-1156.7 6032,-1152 6096.19,-1147.54 6555.95,-1150.92 6610,-1116 6652.74,-1088.38 6665.45,-1055.8 6648,-1008 6626.47,-949.04 6581.76,-957.68 6557,-900 6512.66,-796.69 6462.82,-734.2 6535,-648 6567.57,-609.1 6720.91,-598.73 6793.6,-595.98"/>
+<polygon fill="black" stroke="black" points="6793.57,-599.48 6803.44,-595.64 6793.32,-592.49 6793.57,-599.48"/>
+</g>
+<!-- parsec -->
+<g id="node20" class="node">
+<title>parsec</title>
+<ellipse fill="none" stroke="black" cx="6015" cy="-882" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="6015" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">parsec</text>
+</g>
+<!-- Cabal&#45;&gt;parsec -->
+<g id="edge11" class="edge">
+<title>Cabal&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M5836.41,-1159.41C5855.09,-1151.07 5878.73,-1136.99 5890,-1116 5897.57,-1101.9 5894.01,-1095.49 5890,-1080 5880.82,-1044.56 5872.24,-1037.07 5850,-1008 5836.06,-989.78 5821.93,-993.14 5813,-972 5806.78,-957.26 5803.23,-948.67 5813,-936 5831.98,-911.4 5916.12,-895.98 5969.64,-888.48"/>
+<polygon fill="black" stroke="black" points="5969.95,-891.97 5979.39,-887.15 5969.01,-885.03 5969.95,-891.97"/>
+</g>
+<!-- Cabal&#45;&gt;pretty -->
+<g id="edge12" class="edge">
+<title>Cabal&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M5841.99,-1166.55C5976.87,-1156.24 6492.3,-1116.76 6493,-1116 6503.87,-1104.26 6498.13,-1095.16 6493,-1080 6467.02,-1003.2 6432.63,-998.52 6381,-936 6367.56,-919.72 6357.35,-919.79 6350,-900 6299.89,-765 6271.96,-697.02 6350,-576 6354.76,-568.61 6398.04,-550.22 6430.59,-537.18"/>
+<polygon fill="black" stroke="black" points="6431.73,-540.49 6439.73,-533.55 6429.15,-533.99 6431.73,-540.49"/>
+</g>
+<!-- process -->
+<g id="node22" class="node">
+<title>process</title>
+<ellipse fill="none" stroke="black" cx="5073" cy="-1098" rx="40.09" ry="18"/>
+<text text-anchor="middle" x="5073" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">process</text>
+</g>
+<!-- Cabal&#45;&gt;process -->
+<g id="edge13" class="edge">
+<title>Cabal&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M5778.71,-1165.24C5748.38,-1161.65 5701.07,-1156.18 5660,-1152 5461.71,-1131.81 5225.33,-1111.66 5123.62,-1103.18"/>
+<polygon fill="black" stroke="black" points="5123.95,-1099.69 5113.69,-1102.35 5123.37,-1106.67 5123.95,-1099.69"/>
+</g>
+<!-- Cabal&#45;&gt;time -->
+<g id="edge14" class="edge">
+<title>Cabal&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M5781.3,-1161.4C5752.02,-1152.91 5705.91,-1137.48 5670,-1116 5607.29,-1078.47 5603.18,-1053.51 5546,-1008 5531.26,-996.27 5514.27,-983.87 5500.38,-974.01"/>
+<polygon fill="black" stroke="black" points="5502.76,-971.4 5492.57,-968.5 5498.73,-977.13 5502.76,-971.4"/>
+</g>
+<!-- transformers -->
+<g id="node24" class="node">
+<title>transformers</title>
+<ellipse fill="none" stroke="black" cx="12532" cy="-522" rx="57.55" ry="18"/>
+<text text-anchor="middle" x="12532" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">transformers</text>
+</g>
+<!-- Cabal&#45;&gt;transformers -->
+<g id="edge15" class="edge">
+<title>Cabal&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M5842.35,-1168.85C6210.27,-1167.07 9601.32,-1149.86 10045,-1116 10502.82,-1081.06 10613.89,-1039.81 11068,-972 11392.48,-923.55 11491.49,-959.64 11792,-828 11897.01,-782 11923,-763.07 12006,-684 12050.43,-641.68 12038.42,-605.91 12092,-576 12154.07,-541.36 12355.75,-529.11 12463.17,-524.98"/>
+<polygon fill="black" stroke="black" points="12463.16,-528.48 12473.02,-524.62 12462.9,-521.49 12463.16,-528.48"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;base -->
+<g id="edge17" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M6366.54,-1095.22C6263.57,-1092.08 6043.13,-1085.41 5857,-1080 5821.5,-1078.97 4604.02,-1069.2 4579,-1044 4522.63,-987.22 4550.03,-939.68 4576,-864 4595.73,-806.48 4625.76,-806.26 4660,-756 4775.48,-586.48 4718.31,-460.7 4897,-360 4981.86,-312.18 8200.49,-307.43 8591.28,-307.03"/>
+<polygon fill="black" stroke="black" points="8590.99,-310.53 8600.99,-307.02 8590.99,-303.53 8590.99,-310.53"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;array -->
+<g id="edge16" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M6386.85,-1083.83C6362.63,-1074.56 6331.2,-1060.83 6306,-1044 6286.65,-1031.08 6288.08,-1019.75 6268,-1008 6221.42,-980.73 6202.14,-992 6152,-972 6118.4,-958.6 6112.59,-949.42 6079,-936 6029.07,-916.05 5899.61,-879.08 5848,-864 5789.63,-846.95 5765.67,-863.09 5716,-828 5561.53,-718.88 5486.13,-486.31 5464.08,-406.53"/>
+<polygon fill="black" stroke="black" points="5467.59,-406.11 5461.61,-397.36 5460.83,-407.93 5467.59,-406.11"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;bytestring -->
+<g id="edge19" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M6366.54,-1095.08C6263.58,-1091.73 6043.15,-1084.75 5857,-1080 5809.5,-1078.79 4186.86,-1069.85 4147,-1044 4102.46,-1015.12 4138.67,-967.58 4096,-936 4006.83,-870 3956.92,-925.72 3849,-900 3750.97,-876.64 3725.03,-871.22 3634,-828 3579.86,-802.3 3567.31,-792.78 3520,-756 3501.63,-741.72 3502.56,-730.89 3482,-720 3423.69,-689.13 3348.37,-676.22 3297.36,-670.84"/>
+<polygon fill="black" stroke="black" points="3298.02,-667.39 3287.73,-669.89 3297.34,-674.35 3298.02,-667.39"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;containers -->
+<g id="edge20" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M6484.04,-1096.27C6839.3,-1091.83 8679.18,-1067.72 8732,-1044 8751.94,-1035.04 8791,-992.34 8799,-972 8804.86,-957.11 8802.14,-951.69 8799,-936 8795.6,-919 8787.4,-917 8784,-900 8780.86,-884.31 8780.15,-879.53 8784,-864 8801.4,-793.76 8799.72,-760.05 8860,-720 8882.45,-705.08 9256.31,-680.03 9403.83,-670.67"/>
+<polygon fill="black" stroke="black" points="9404.03,-674.17 9413.79,-670.04 9403.59,-667.18 9404.03,-674.17"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;deepseq -->
+<g id="edge21" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6405.33,-1080.77C6360.93,-1042.49 6254.73,-941.24 6228,-828 6202.19,-718.69 6169.19,-657 6247,-576 6290.32,-530.91 6327.48,-568.76 6383,-540 6405.13,-528.54 6402.75,-512.97 6426,-504 6547.15,-457.25 7476.66,-451.73 7709.99,-451.09"/>
+<polygon fill="black" stroke="black" points="7709.71,-454.59 7719.7,-451.06 7709.69,-447.59 7709.71,-454.59"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;directory -->
+<g id="edge22" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M6367.09,-1094.15C6136.38,-1082.78 5284.28,-1040.81 5058.96,-1029.71"/>
+<polygon fill="black" stroke="black" points="5059.45,-1026.23 5049.29,-1029.23 5059.1,-1033.22 5059.45,-1026.23"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;filepath -->
+<g id="edge23" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M6382.07,-1085.23C6351.96,-1076.09 6311.31,-1061.97 6278,-1044 6254.53,-1031.34 6253.71,-1020.2 6230,-1008 6206.47,-995.89 5801.53,-870.95 5776,-864 5711.55,-846.45 5635.98,-829.93 5589.03,-820.14"/>
+<polygon fill="black" stroke="black" points="5590.01,-816.76 5579.51,-818.16 5588.59,-823.62 5590.01,-816.76"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;mtl -->
+<g id="edge24" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M6438.89,-1080.01C6446.07,-1070.14 6454.12,-1057.1 6458,-1044 6508.25,-874.2 6358.1,-751.21 6502,-648 6548.25,-614.83 6717.41,-601.37 6793.94,-596.9"/>
+<polygon fill="black" stroke="black" points="6793.67,-600.42 6803.45,-596.36 6793.27,-593.43 6793.67,-600.42"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;parsec -->
+<g id="edge25" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M6405.66,-1080.58C6382.81,-1061.64 6343.18,-1030.27 6306,-1008 6241.19,-969.17 6221.5,-965.65 6152,-936 6150.78,-935.48 6093.05,-913.16 6052.92,-897.65"/>
+<polygon fill="black" stroke="black" points="6054.39,-894.47 6043.8,-894.13 6051.87,-901 6054.39,-894.47"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;pretty -->
+<g id="edge26" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M6427.59,-1079.73C6429.59,-1061.14 6430.49,-1031.11 6420,-1008 6408.17,-981.96 6247.09,-854.36 6236,-828 6229.8,-813.25 6234.43,-807.92 6236,-792 6245.6,-694.59 6211.6,-646.98 6279,-576 6323.83,-528.79 6358.82,-559.31 6421,-540 6424.13,-539.03 6427.35,-537.97 6430.57,-536.86"/>
+<polygon fill="black" stroke="black" points="6431.7,-540.17 6439.95,-533.52 6429.36,-533.58 6431.7,-540.17"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;time -->
+<g id="edge28" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M6372.8,-1089.21C6201.27,-1063.63 5657.55,-982.53 5510.16,-960.54"/>
+<polygon fill="black" stroke="black" points="5510.98,-957.13 5500.57,-959.11 5509.94,-964.05 5510.98,-957.13"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;transformers -->
+<g id="edge29" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M6484.32,-1097.14C6906.16,-1097.99 9457.25,-1100.7 10230,-1044 10252.64,-1042.34 11017.48,-938.88 11040,-936 11170.58,-919.3 11211.88,-949.16 11334,-900 11358.74,-890.04 11357.65,-874.87 11382,-864 11456.89,-830.56 11491.79,-868.69 11563,-828 11628.18,-790.75 11720.62,-609.09 11788,-576 11847.69,-546.69 12290.57,-530.29 12463.3,-524.96"/>
+<polygon fill="black" stroke="black" points="12463.37,-528.46 12473.26,-524.65 12463.16,-521.46 12463.37,-528.46"/>
+</g>
+<!-- binary -->
+<g id="node25" class="node">
+<title>binary</title>
+<ellipse fill="none" stroke="black" cx="8166" cy="-738" rx="33.6" ry="18"/>
+<text text-anchor="middle" x="8166" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">binary</text>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;binary -->
+<g id="edge18" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M6447.9,-1080.95C6462.08,-1070.76 6480.47,-1057.08 6496,-1044 6513.8,-1029.02 6516.67,-1023.52 6534,-1008 6570.87,-974.96 6575.78,-960.15 6619,-936 6708.81,-885.82 6737.79,-882.47 6839,-864 7191.76,-799.64 7295.98,-910.25 7645,-828 7683.35,-818.96 7688.02,-802.47 7726,-792 7744.95,-786.78 8013.98,-756.12 8121.79,-743.97"/>
+<polygon fill="black" stroke="black" points="8122.17,-747.45 8131.71,-742.85 8121.38,-740.49 8122.17,-747.45"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;text -->
+<g id="edge27" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M6457.64,-1082.75C6479.67,-1072.74 6509.14,-1058.59 6534,-1044 6606.42,-1001.51 6609.58,-963.24 6689,-936 6834.03,-886.26 7225.14,-911.8 7378,-900 7534.79,-887.89 7573.31,-877.33 7730,-864 8014.82,-839.78 8358.84,-819.58 8472.5,-813.15"/>
+<polygon fill="black" stroke="black" points="8472.7,-816.64 8482.49,-812.58 8472.3,-809.65 8472.7,-816.64"/>
+</g>
+<!-- Win32&#45;&gt;base -->
+<g id="edge53" class="edge">
+<title>Win32&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5155.46,-864.77C5121.79,-815.75 5026,-663.95 5026,-523 5026,-523 5026,-523 5026,-449 5026,-399.99 4595.4,-446.47 5419,-360 5749.43,-325.31 8248.35,-309.27 8591.09,-307.23"/>
+<polygon fill="black" stroke="black" points="8591.09,-310.73 8601.07,-307.17 8591.05,-303.73 8591.09,-310.73"/>
+</g>
+<!-- Win32&#45;&gt;filepath -->
+<g id="edge54" class="edge">
+<title>Win32&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M5194.46,-870.48C5201.41,-868.09 5208.92,-865.75 5216,-864 5319.86,-838.36 5348.53,-845.93 5454,-828 5468.6,-825.52 5484.48,-822.59 5498.78,-819.88"/>
+<polygon fill="black" stroke="black" points="5499.21,-823.36 5508.38,-818.04 5497.9,-816.48 5499.21,-823.36"/>
+</g>
+<!-- os&#45;string -->
+<g id="node37" class="node">
+<title>os&#45;string</title>
+<ellipse fill="none" stroke="black" cx="5761" cy="-738" rx="43.08" ry="18"/>
+<text text-anchor="middle" x="5761" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">os&#45;string</text>
+</g>
+<!-- Win32&#45;&gt;os&#45;string -->
+<g id="edge55" class="edge">
+<title>Win32&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M5195.42,-870.86C5202.14,-868.54 5209.31,-866.13 5216,-864 5325.36,-829.18 5352.24,-818.12 5464,-792 5549.35,-772.05 5650.03,-755.54 5709.52,-746.49"/>
+<polygon fill="black" stroke="black" points="5709.99,-749.96 5719.36,-745.01 5708.95,-743.04 5709.99,-749.96"/>
+</g>
+<!-- array&#45;&gt;base -->
+<g id="edge114" class="edge">
+<title>array&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5485.7,-373.87C5523.69,-369.88 5592.78,-363.1 5652,-360 6262.54,-327.99 8286.04,-309.9 8591.29,-307.32"/>
+<polygon fill="black" stroke="black" points="8591.12,-310.82 8601.09,-307.24 8591.06,-303.82 8591.12,-310.82"/>
+</g>
+<!-- bytestring&#45;&gt;base -->
+<g id="edge183" class="edge">
+<title>bytestring&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M3281.25,-656.96C3372.21,-638.05 3582,-587.45 3582,-523 3582,-523 3582,-523 3582,-449 3582,-281.59 3781.9,-380.86 3948,-360 4434.94,-298.85 8169.52,-305.91 8591.28,-306.9"/>
+<polygon fill="black" stroke="black" points="8591,-310.4 8601,-306.93 8591.01,-303.4 8591,-310.4"/>
+</g>
+<!-- bytestring&#45;&gt;ghc&#45;prim -->
+<g id="edge185" class="edge">
+<title>bytestring&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M3192.94,-663.53C2845.04,-652.09 686,-570.47 686,-307 686,-307 686,-307 686,-233 686,-135.37 14289.4,-93.72 15169.39,-91.13"/>
+<polygon fill="black" stroke="black" points="15169.07,-94.63 15179.06,-91.1 15169.05,-87.63 15169.07,-94.63"/>
+</g>
+<!-- bytestring&#45;&gt;template&#45;haskell -->
+<g id="edge186" class="edge">
+<title>bytestring&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M3287.03,-664.57C3888.73,-659.02 10073.79,-602.02 10771.98,-595.59"/>
+<polygon fill="black" stroke="black" points="10771.8,-599.09 10781.76,-595.5 10771.73,-592.09 10771.8,-599.09"/>
+</g>
+<!-- bytestring&#45;&gt;deepseq -->
+<g id="edge184" class="edge">
+<title>bytestring&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3286.82,-663.34C3407.59,-658.73 3739.4,-643.93 4014,-612 4307.5,-577.87 4375.72,-530.6 4670,-504 5294.39,-447.56 7352.43,-449.98 7709.85,-450.85"/>
+<polygon fill="black" stroke="black" points="7709.61,-454.35 7719.62,-450.87 7709.62,-447.35 7709.61,-454.35"/>
+</g>
+<!-- containers&#45;&gt;base -->
+<g id="edge223" class="edge">
+<title>containers&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M9420.13,-657.04C9356.89,-642.55 9246,-605.39 9246,-523 9246,-523 9246,-523 9246,-449 9246,-347.56 8752.75,-332.04 8668.57,-323.94"/>
+<polygon fill="black" stroke="black" points="8669.18,-320.49 8658.79,-322.55 8668.2,-327.42 8669.18,-320.49"/>
+</g>
+<!-- containers&#45;&gt;template&#45;haskell -->
+<g id="edge225" class="edge">
+<title>containers&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M9511.06,-662.55C9718.42,-651.98 10536.56,-610.27 10772.19,-598.25"/>
+<polygon fill="black" stroke="black" points="10772.3,-601.75 10782.11,-597.75 10771.94,-594.76 10772.3,-601.75"/>
+</g>
+<!-- containers&#45;&gt;array -->
+<g id="edge222" class="edge">
+<title>containers&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M9422.15,-655.78C9300.09,-628.55 8927.14,-547.68 8614,-504 8260.43,-454.68 8170.43,-452.02 7814,-432 6876.55,-379.33 5726.59,-378.5 5497.7,-378.89"/>
+<polygon fill="black" stroke="black" points="5497.81,-375.39 5487.82,-378.91 5497.83,-382.39 5497.81,-375.39"/>
+</g>
+<!-- containers&#45;&gt;deepseq -->
+<g id="edge224" class="edge">
+<title>containers&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M9414.49,-663.56C9231.49,-657.94 8591.54,-636.6 8556,-612 8512.81,-582.1 8551,-534.17 8508,-504 8451.72,-464.52 7977.44,-454.08 7816.32,-451.66"/>
+<polygon fill="black" stroke="black" points="7816.38,-448.16 7806.33,-451.51 7816.28,-455.16 7816.38,-448.16"/>
+</g>
+<!-- deepseq&#45;&gt;base -->
+<g id="edge320" class="edge">
+<title>deepseq&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M7801.37,-442.72C7944.65,-419.25 8447.46,-336.9 8591.29,-313.34"/>
+<polygon fill="black" stroke="black" points="8591.76,-316.81 8601.06,-311.74 8590.63,-309.9 8591.76,-316.81"/>
+</g>
+<!-- deepseq&#45;&gt;ghc&#45;prim -->
+<g id="edge321" class="edge">
+<title>deepseq&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M7804.26,-446.62C8191.89,-424.35 11234.79,-250.65 13703,-144 14282.29,-118.97 14986.91,-97.67 15169.24,-92.3"/>
+<polygon fill="black" stroke="black" points="15169.09,-95.81 15178.98,-92.02 15168.88,-88.81 15169.09,-95.81"/>
+</g>
+<!-- deepseq&#45;&gt;array -->
+<g id="edge319" class="edge">
+<title>deepseq&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M7721.5,-447.74C7437.1,-439.11 5778.69,-388.77 5497.5,-380.23"/>
+<polygon fill="black" stroke="black" points="5497.86,-376.74 5487.76,-379.93 5497.65,-383.74 5497.86,-376.74"/>
+</g>
+<!-- directory&#45;&gt;base -->
+<g id="edge323" class="edge">
+<title>directory&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M4960.68,-1021.96C4802.08,-1010.84 4261.87,-972.94 4253,-972 3688.3,-911.97 3553.36,-845.53 2988,-792 2904.06,-784.05 2304.39,-795.69 2230,-756 2186.55,-732.82 2164,-716.25 2164,-667 2164,-667 2164,-667 2164,-449 2164,-402.73 2177.78,-382.86 2218,-360 2291.89,-318 8065.2,-307.89 8591.66,-307.06"/>
+<polygon fill="black" stroke="black" points="8591.28,-310.56 8601.28,-307.04 8591.27,-303.56 8591.28,-310.56"/>
+</g>
+<!-- directory&#45;&gt;Win32 -->
+<g id="edge322" class="edge">
+<title>directory&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M5003.26,-1007.78C5003.35,-988.1 5006.49,-956.03 5024,-936 5025.82,-933.91 5086.5,-911.86 5128.22,-896.87"/>
+<polygon fill="black" stroke="black" points="5129.24,-900.22 5137.47,-893.55 5126.88,-893.63 5129.24,-900.22"/>
+</g>
+<!-- directory&#45;&gt;filepath -->
+<g id="edge324" class="edge">
+<title>directory&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M5029.94,-1011.28C5095.9,-976.54 5269.09,-886.29 5330,-864 5386.42,-843.36 5454.11,-828.1 5498.04,-819.39"/>
+<polygon fill="black" stroke="black" points="5498.59,-822.85 5507.73,-817.5 5497.25,-815.98 5498.59,-822.85"/>
+</g>
+<!-- directory&#45;&gt;time -->
+<g id="edge326" class="edge">
+<title>directory&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M5044.8,-1018.91C5134.71,-1005.49 5348.81,-973.54 5435.55,-960.59"/>
+<polygon fill="black" stroke="black" points="5435.81,-964.09 5445.18,-959.15 5434.77,-957.17 5435.81,-964.09"/>
+</g>
+<!-- directory&#45;&gt;os&#45;string -->
+<g id="edge325" class="edge">
+<title>directory&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M4998.61,-1007.76C4993.74,-988.64 4989.23,-957.64 5003,-936 5023.28,-904.13 5048.14,-920.3 5080,-900 5101.02,-886.61 5101.26,-876.18 5123,-864 5166.77,-839.47 5182.73,-844.81 5230,-828 5272.93,-812.73 5281.74,-802.83 5326,-792 5460.49,-759.09 5623.61,-746.18 5706.68,-741.48"/>
+<polygon fill="black" stroke="black" points="5706.79,-744.97 5716.59,-740.93 5706.41,-737.98 5706.79,-744.97"/>
+</g>
+<!-- filepath&#45;&gt;base -->
+<g id="edge345" class="edge">
+<title>filepath&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5542.98,-791.75C5539.96,-722.06 5539.2,-460.37 5690,-360 5753.35,-317.84 8250.18,-308.24 8591.5,-307.12"/>
+<polygon fill="black" stroke="black" points="8591.44,-310.62 8601.42,-307.09 8591.41,-303.62 8591.44,-310.62"/>
+</g>
+<!-- filepath&#45;&gt;template&#45;haskell -->
+<g id="edge350" class="edge">
+<title>filepath&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M5581.66,-807.51C5726.89,-801.73 6264.5,-779.89 6707,-756 7476.71,-714.45 7667.86,-680.52 8438,-648 8911.75,-627.99 10440.35,-601.64 10772.09,-596.06"/>
+<polygon fill="black" stroke="black" points="10771.93,-599.57 10781.87,-595.9 10771.81,-592.57 10771.93,-599.57"/>
+</g>
+<!-- filepath&#45;&gt;bytestring -->
+<g id="edge346" class="edge">
+<title>filepath&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5506.25,-808C5368.62,-804.16 4880.92,-788.93 4480,-756 4340,-744.5 4305.95,-732.02 4166,-720 3838.36,-691.86 3444.17,-674.89 3298.11,-669.17"/>
+<polygon fill="black" stroke="black" points="3298.44,-665.68 3288.31,-668.79 3298.17,-672.68 3298.44,-665.68"/>
+</g>
+<!-- filepath&#45;&gt;deepseq -->
+<g id="edge347" class="edge">
+<title>filepath&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5579.92,-804.01C5654.85,-793.41 5822.85,-768.59 5846,-756 5893.93,-729.92 5971.02,-610.86 6013,-576 6059.1,-537.71 6069.71,-521.59 6127,-504 6281,-456.72 7445.74,-451.62 7709.85,-451.07"/>
+<polygon fill="black" stroke="black" points="7709.52,-454.57 7719.51,-451.05 7709.51,-447.57 7709.52,-454.57"/>
+</g>
+<!-- filepath&#45;&gt;os&#45;string -->
+<g id="edge349" class="edge">
+<title>filepath&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M5574.63,-799.12C5611.74,-787.15 5674.53,-766.89 5716.85,-753.24"/>
+<polygon fill="black" stroke="black" points="5717.8,-756.61 5726.24,-750.21 5715.65,-749.95 5717.8,-756.61"/>
+</g>
+<!-- filepath&#45;&gt;exceptions -->
+<g id="edge348" class="edge">
+<title>filepath&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M5580.95,-805.63C5786.07,-786.92 6784.65,-695.85 7040.95,-672.48"/>
+<polygon fill="black" stroke="black" points="7041.09,-675.98 7050.73,-671.58 7040.45,-669.01 7041.09,-675.98"/>
+</g>
+<!-- mtl&#45;&gt;base -->
+<g id="edge544" class="edge">
+<title>mtl&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M6804.79,-592.67C6693.82,-591.02 6279.49,-582.1 6241,-540 6187.02,-480.96 6185.06,-417.19 6241,-360 6283.89,-316.14 8287.96,-308.08 8591.62,-307.11"/>
+<polygon fill="black" stroke="black" points="8591.37,-310.61 8601.36,-307.08 8591.35,-303.61 8591.37,-310.61"/>
+</g>
+<!-- mtl&#45;&gt;transformers -->
+<g id="edge545" class="edge">
+<title>mtl&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M6859.33,-592.66C7255.85,-587.79 11843.38,-531.46 12462.93,-523.85"/>
+<polygon fill="black" stroke="black" points="12462.84,-527.35 12472.8,-523.73 12462.76,-520.35 12462.84,-527.35"/>
+</g>
+<!-- parsec&#45;&gt;base -->
+<g id="edge577" class="edge">
+<title>parsec&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5986.54,-870.98C5979.82,-868.65 5972.67,-866.21 5966,-864 5841.35,-822.71 5763.95,-865.18 5691,-756 5589.97,-604.79 5637.16,-452.04 5794,-360 5857.19,-322.92 8255.26,-308.97 8591.09,-307.2"/>
+<polygon fill="black" stroke="black" points="8591.09,-310.7 8601.08,-307.15 8591.06,-303.7 8591.09,-310.7"/>
+</g>
+<!-- parsec&#45;&gt;bytestring -->
+<g id="edge578" class="edge">
+<title>parsec&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5979.69,-880.2C5707.61,-874 3954.92,-833.85 3943,-828 3887.42,-800.72 3909.73,-748.95 3855,-720 3759.5,-669.49 3432.94,-665.67 3298.53,-666.32"/>
+<polygon fill="black" stroke="black" points="3298.77,-662.82 3288.79,-666.38 3298.81,-669.82 3298.77,-662.82"/>
+</g>
+<!-- parsec&#45;&gt;mtl -->
+<g id="edge579" class="edge">
+<title>parsec&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M6033.82,-866.73C6089.91,-825 6262.26,-702.77 6426,-648 6555.63,-604.64 6719.59,-596.52 6793.17,-595.16"/>
+<polygon fill="black" stroke="black" points="6793.14,-598.66 6803.08,-595.01 6793.03,-591.66 6793.14,-598.66"/>
+</g>
+<!-- parsec&#45;&gt;text -->
+<g id="edge580" class="edge">
+<title>parsec&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M6040.61,-869.4C6046.54,-867.2 6052.89,-865.21 6059,-864 6089.92,-857.89 8162.26,-817.72 8472.35,-811.74"/>
+<polygon fill="black" stroke="black" points="8472.39,-815.24 8482.32,-811.55 8472.25,-808.25 8472.39,-815.24"/>
+</g>
+<!-- pretty&#45;&gt;base -->
+<g id="edge585" class="edge">
+<title>pretty&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M6491.95,-510.44C6498.68,-507.96 6506.03,-505.58 6513,-504 7336.6,-316.89 8379.12,-306.88 8591.3,-306.86"/>
+<polygon fill="black" stroke="black" points="8591.19,-310.36 8601.19,-306.87 8591.2,-303.36 8591.19,-310.36"/>
+</g>
+<!-- pretty&#45;&gt;ghc&#45;prim -->
+<g id="edge587" class="edge">
+<title>pretty&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M6499.44,-520.83C7024.46,-518.05 13746.57,-482.23 13844,-468 13907.43,-458.74 14398,-371.1 14398,-307 14398,-307 14398,-307 14398,-233 14398,-154.06 14998.4,-106.06 15169.18,-94.01"/>
+<polygon fill="black" stroke="black" points="15169.25,-97.51 15178.98,-93.32 15168.76,-90.53 15169.25,-97.51"/>
+</g>
+<!-- pretty&#45;&gt;deepseq -->
+<g id="edge586" class="edge">
+<title>pretty&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6491.9,-510.2C6498.63,-507.72 6505.99,-505.41 6513,-504 6631.4,-480.22 7487.46,-457.76 7710.16,-452.27"/>
+<polygon fill="black" stroke="black" points="7710.07,-455.77 7719.98,-452.03 7709.9,-448.78 7710.07,-455.77"/>
+</g>
+<!-- process&#45;&gt;base -->
+<g id="edge603" class="edge">
+<title>process&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5032.73,-1097.05C4830.92,-1097.04 3928.32,-1094.16 3653,-1044 3628.22,-1039.48 3460.56,-983.22 3438,-972 3361.83,-934.13 3352.07,-909.17 3280,-864 3205.36,-817.22 2936,-755.09 2936,-667 2936,-667 2936,-667 2936,-449 2936,-302.55 3442.94,-370.68 3589,-360 4117.2,-321.38 8153.01,-308.41 8591.41,-307.11"/>
+<polygon fill="black" stroke="black" points="8591.27,-310.61 8601.26,-307.08 8591.25,-303.61 8591.27,-310.61"/>
+</g>
+<!-- process&#45;&gt;Win32 -->
+<g id="edge602" class="edge">
+<title>process&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M5079.19,-1079.8C5090.06,-1050.04 5113.75,-987.22 5138,-936 5142.17,-927.2 5147.12,-917.82 5151.75,-909.43"/>
+<polygon fill="black" stroke="black" points="5154.77,-911.2 5156.61,-900.77 5148.66,-907.78 5154.77,-911.2"/>
+</g>
+<!-- process&#45;&gt;deepseq -->
+<g id="edge604" class="edge">
+<title>process&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5086.3,-1080.56C5120.76,-1038.9 5217.48,-927.98 5320,-864 5356.9,-840.97 5370.72,-844.4 5411,-828 5449.38,-812.38 5456.9,-802.45 5497,-792 5633.78,-756.35 5687.34,-820.74 5813,-756 5814.49,-755.23 5973.83,-577.2 5975,-576 6007.48,-542.68 6008.05,-521.89 6051,-504 6129.31,-471.38 7428.62,-454.8 7709.67,-451.58"/>
+<polygon fill="black" stroke="black" points="7709.67,-455.08 7719.63,-451.47 7709.59,-448.09 7709.67,-455.08"/>
+</g>
+<!-- process&#45;&gt;directory -->
+<g id="edge605" class="edge">
+<title>process&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M5057.34,-1081.12C5048.52,-1072.17 5037.33,-1060.81 5027.47,-1050.81"/>
+<polygon fill="black" stroke="black" points="5030.17,-1048.56 5020.66,-1043.9 5025.19,-1053.48 5030.17,-1048.56"/>
+</g>
+<!-- process&#45;&gt;filepath -->
+<g id="edge606" class="edge">
+<title>process&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M5099.15,-1083.99C5118.3,-1074.02 5144.57,-1059.4 5166,-1044 5214.83,-1008.92 5315.39,-893.1 5368,-864 5418.22,-836.23 5437.16,-844.92 5492,-828 5495.54,-826.91 5499.21,-825.75 5502.88,-824.58"/>
+<polygon fill="black" stroke="black" points="5503.92,-827.92 5512.37,-821.52 5501.78,-821.26 5503.92,-827.92"/>
+</g>
+<!-- time&#45;&gt;base -->
+<g id="edge762" class="edge">
+<title>time&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5445.7,-952.92C5327.18,-952.28 4861.17,-946.81 4818,-900 4775.61,-854.05 4922.35,-392.09 4976,-360 5057.76,-311.09 8204.63,-307.3 8591.2,-307.02"/>
+<polygon fill="black" stroke="black" points="8591.06,-310.52 8601.05,-307.02 8591.05,-303.52 8591.06,-310.52"/>
+</g>
+<!-- time&#45;&gt;Win32 -->
+<g id="edge761" class="edge">
+<title>time&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M5447.7,-947.21C5395.29,-935.22 5274.36,-907.56 5209.66,-892.76"/>
+<polygon fill="black" stroke="black" points="5210.65,-889.39 5200.12,-890.58 5209.08,-896.22 5210.65,-889.39"/>
+</g>
+<!-- time&#45;&gt;deepseq -->
+<g id="edge763" class="edge">
+<title>time&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5490.14,-939.6C5530.17,-908.95 5633.87,-833.19 5732,-792 5794.42,-765.8 5820.38,-788.06 5880,-756 5892.95,-749.04 6062.33,-584.94 6074,-576 6121.87,-539.33 6131.33,-521.62 6189,-504 6336.84,-458.83 7451.81,-452.11 7709.82,-451.15"/>
+<polygon fill="black" stroke="black" points="7709.6,-454.65 7719.59,-451.12 7709.57,-447.65 7709.6,-454.65"/>
+</g>
+<!-- transformers&#45;&gt;base -->
+<g id="edge790" class="edge">
+<title>transformers&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M12513.97,-504.5C12474.57,-469.69 12376.37,-389.53 12277,-360 12094.89,-305.88 9048.39,-306.65 8668.73,-306.96"/>
+<polygon fill="black" stroke="black" points="8668.83,-303.46 8658.83,-306.97 8668.83,-310.46 8668.83,-303.46"/>
+</g>
+<!-- binary&#45;&gt;base -->
+<g id="edge174" class="edge">
+<title>binary&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M8189.59,-724.95C8228.97,-705.4 8311.08,-667.06 8385,-648 8450.45,-631.13 8637.07,-657.55 8687,-612 8716.88,-584.74 8706,-563.45 8706,-523 8706,-523 8706,-523 8706,-449 8706,-404.03 8676.01,-359.52 8653.71,-332.64"/>
+<polygon fill="black" stroke="black" points="8656.64,-330.69 8647.48,-325.38 8651.33,-335.25 8656.64,-330.69"/>
+</g>
+<!-- binary&#45;&gt;array -->
+<g id="edge173" class="edge">
+<title>binary&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M8134.65,-730.79C8053.73,-714.96 7831.08,-672.59 7644,-648 7300.58,-602.86 7213.35,-602.57 6868,-576 6606.51,-555.88 6540.07,-565.01 6279,-540 6033.15,-516.45 5968.82,-522.77 5728,-468 5682.11,-457.56 5554.95,-413.56 5492.52,-391.59"/>
+<polygon fill="black" stroke="black" points="5494.02,-388.41 5483.43,-388.38 5491.7,-395.01 5494.02,-388.41"/>
+</g>
+<!-- binary&#45;&gt;bytestring -->
+<g id="edge175" class="edge">
+<title>binary&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M8132.34,-736C8033.86,-733.1 7737.76,-724.63 7492,-720 6621.58,-703.6 3746.08,-672.43 3298.73,-667.63"/>
+<polygon fill="black" stroke="black" points="3298.95,-664.13 3288.91,-667.52 3298.88,-671.13 3298.95,-664.13"/>
+</g>
+<!-- binary&#45;&gt;containers -->
+<g id="edge176" class="edge">
+<title>binary&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M8199.69,-735.18C8374.41,-725.75 9177.8,-682.39 9403.74,-670.2"/>
+<polygon fill="black" stroke="black" points="9403.68,-673.71 9413.48,-669.67 9403.31,-666.72 9403.68,-673.71"/>
+</g>
+<!-- text&#45;&gt;base -->
+<g id="edge731" class="edge">
+<title>text&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M8530.72,-797.12C8559.2,-779.98 8613.53,-747.37 8660,-720 8714.91,-687.66 8726.82,-676.13 8784,-648 8821.92,-629.35 8848.45,-647.08 8872,-612 8934.43,-519.01 8944.2,-445.63 8872,-360 8813.34,-290.43 8756.25,-349.58 8668.22,-325.58"/>
+<polygon fill="black" stroke="black" points="8669.36,-322.27 8658.78,-322.67 8667.3,-328.96 8669.36,-322.27"/>
+</g>
+<!-- text&#45;&gt;ghc&#45;prim -->
+<g id="edge735" class="edge">
+<title>text&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M8538.31,-808.59C8744.04,-805.5 10071.8,-785 11151,-756 11626.21,-743.23 11744.77,-732.03 12220,-720 12337.81,-717.02 14231.61,-727.84 14341,-684 14450.48,-640.12 14433.76,-562.81 14536,-504 14664.99,-429.8 15176,-455.81 15176,-307 15176,-307 15176,-307 15176,-233 15176,-192.18 15190.84,-146.93 15201.97,-118.72"/>
+<polygon fill="black" stroke="black" points="15205.2,-120.08 15205.74,-109.49 15198.72,-117.43 15205.2,-120.08"/>
+</g>
+<!-- text&#45;&gt;template&#45;haskell -->
+<g id="edge736" class="edge">
+<title>text&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M8534.89,-800.95C8564.44,-790.9 8616.21,-772.94 8660,-756 8698.65,-741.05 8705.88,-730.36 8746,-720 9143.44,-617.4 10466.27,-598.54 10772.38,-595.52"/>
+<polygon fill="black" stroke="black" points="10772.2,-599.03 10782.17,-595.43 10772.14,-592.03 10772.2,-599.03"/>
+</g>
+<!-- text&#45;&gt;array -->
+<g id="edge730" class="edge">
+<title>text&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M8487.38,-800.96C8436.84,-784 8314.22,-744.14 8209,-720 8018.42,-676.28 7968.71,-674.61 7775,-648 7482.67,-607.84 7409.12,-599.71 7115,-576 6809.35,-551.36 6730.84,-573.18 6426,-540 6061.07,-500.28 5624.75,-413.53 5495.1,-386.92"/>
+<polygon fill="black" stroke="black" points="5496.19,-383.57 5485.69,-384.98 5494.78,-390.43 5496.19,-383.57"/>
+</g>
+<!-- text&#45;&gt;bytestring -->
+<g id="edge733" class="edge">
+<title>text&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M8484,-807.32C8319.18,-797.15 7431.77,-743.41 6707,-720 6004.14,-697.3 3696.46,-671.89 3298.65,-667.62"/>
+<polygon fill="black" stroke="black" points="3298.73,-664.12 3288.69,-667.52 3298.65,-671.12 3298.73,-664.12"/>
+</g>
+<!-- text&#45;&gt;deepseq -->
+<g id="edge734" class="edge">
+<title>text&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8494.92,-795.12C8460.54,-764.8 8378.92,-689.14 8328,-612 8299.06,-568.16 8322.52,-534.83 8280,-504 8242.94,-477.13 7939.7,-459.55 7815.62,-453.42"/>
+<polygon fill="black" stroke="black" points="7815.86,-449.93 7805.7,-452.94 7815.52,-456.92 7815.86,-449.93"/>
+</g>
+<!-- text&#45;&gt;binary -->
+<g id="edge732" class="edge">
+<title>text&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M8485.35,-803.8C8426.35,-791.83 8280.55,-762.24 8208.16,-747.56"/>
+<polygon fill="black" stroke="black" points="8209.18,-744.19 8198.69,-745.63 8207.79,-751.05 8209.18,-744.19"/>
+</g>
+<!-- OneTuple -->
+<g id="node27" class="node">
+<title>OneTuple</title>
+<ellipse fill="none" stroke="black" cx="14834" cy="-666" rx="47.57" ry="18"/>
+<text text-anchor="middle" x="14834" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">OneTuple</text>
+</g>
+<!-- OneTuple&#45;&gt;base -->
+<g id="edge30" class="edge">
+<title>OneTuple&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14789.9,-658.64C14676.84,-642.55 14367.23,-599.79 14108,-576 14042.71,-570.01 13573.37,-576.65 13519,-540 13445.48,-490.45 13507.74,-407.7 13433,-360 13379.75,-326.01 9120.57,-308.87 8668.69,-307.14"/>
+<polygon fill="black" stroke="black" points="8668.81,-303.65 8658.8,-307.11 8668.79,-310.65 8668.81,-303.65"/>
+</g>
+<!-- OneTuple&#45;&gt;ghc&#45;prim -->
+<g id="edge31" class="edge">
+<title>OneTuple&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M14873.18,-655.32C14908.38,-646.04 14961.12,-630.72 15005,-612 15096.13,-573.13 15109.8,-544.98 15200,-504 15285.63,-465.09 15308.13,-456.26 15399,-432 15487.95,-408.25 15536.75,-459.93 15603,-396 15632.11,-367.91 15622,-347.45 15622,-307 15622,-307 15622,-307 15622,-233 15622,-156.73 15364.5,-112.02 15258.63,-96.87"/>
+<polygon fill="black" stroke="black" points="15259.28,-93.42 15248.89,-95.5 15258.3,-100.35 15259.28,-93.42"/>
+</g>
+<!-- OneTuple&#45;&gt;template&#45;haskell -->
+<g id="edge32" class="edge">
+<title>OneTuple&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M14786.76,-663.07C14698.98,-659.54 14504.74,-652.06 14341,-648 12949.9,-613.5 11247.63,-598.35 10899.82,-595.5"/>
+<polygon fill="black" stroke="black" points="10900.04,-592.01 10890.01,-595.42 10899.98,-599.01 10900.04,-592.01"/>
+</g>
+<!-- QuickCheck -->
+<g id="node28" class="node">
+<title>QuickCheck</title>
+<ellipse fill="none" stroke="black" cx="10327" cy="-810" rx="57.05" ry="18"/>
+<text text-anchor="middle" x="10327" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">QuickCheck</text>
+</g>
+<!-- QuickCheck&#45;&gt;base -->
+<g id="edge33" class="edge">
+<title>QuickCheck&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10317.49,-792.11C10303.76,-766.09 10280,-714.26 10280,-667 10280,-667 10280,-667 10280,-449 10280,-395.21 10247,-382.17 10198,-360 10045.5,-291.01 8874.22,-364.23 8668.38,-324.99"/>
+<polygon fill="black" stroke="black" points="8669.24,-321.59 8658.72,-322.84 8667.72,-328.43 8669.24,-321.59"/>
+</g>
+<!-- QuickCheck&#45;&gt;template&#45;haskell -->
+<g id="edge38" class="edge">
+<title>QuickCheck&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M10331.26,-791.62C10340.56,-757.66 10366.15,-682.81 10418,-648 10474.51,-610.07 10669.71,-599.28 10772.13,-596.21"/>
+<polygon fill="black" stroke="black" points="10772.14,-599.71 10782.03,-595.93 10771.94,-592.72 10772.14,-599.71"/>
+</g>
+<!-- QuickCheck&#45;&gt;containers -->
+<g id="edge34" class="edge">
+<title>QuickCheck&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M10291.34,-795.65C10230.79,-773.17 10110.15,-729.32 10066,-720 9870.31,-678.67 9632.32,-669.5 9523.07,-667.51"/>
+<polygon fill="black" stroke="black" points="9523.22,-664.02 9513.17,-667.35 9523.11,-671.02 9523.22,-664.02"/>
+</g>
+<!-- QuickCheck&#45;&gt;deepseq -->
+<g id="edge35" class="edge">
+<title>QuickCheck&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M10296.68,-794.3C10246.87,-770.25 10151.57,-724.68 10135,-720 10101.95,-710.66 9555.24,-650.66 9521,-648 9417.68,-639.96 8676.5,-667.53 8589,-612 8543.35,-583.03 8578.21,-533.66 8533,-504 8473.37,-464.88 7980.41,-454.17 7816.08,-451.67"/>
+<polygon fill="black" stroke="black" points="7816.39,-448.18 7806.34,-451.53 7816.29,-455.18 7816.39,-448.18"/>
+</g>
+<!-- QuickCheck&#45;&gt;transformers -->
+<g id="edge39" class="edge">
+<title>QuickCheck&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M10371.64,-798.39C10531.92,-760.78 11093.85,-633 11565,-576 11899.84,-535.49 12303.7,-525.92 12462.8,-523.68"/>
+<polygon fill="black" stroke="black" points="12462.81,-527.18 12472.76,-523.55 12462.72,-520.18 12462.81,-527.18"/>
+</g>
+<!-- random -->
+<g id="node29" class="node">
+<title>random</title>
+<ellipse fill="none" stroke="black" cx="6659" cy="-738" rx="39.09" ry="18"/>
+<text text-anchor="middle" x="6659" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">random</text>
+</g>
+<!-- QuickCheck&#45;&gt;random -->
+<g id="edge36" class="edge">
+<title>QuickCheck&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M10270.12,-807.91C9840.88,-799.72 7116.2,-747.73 6709.7,-739.97"/>
+<polygon fill="black" stroke="black" points="6709.93,-736.47 6699.87,-739.78 6709.8,-743.47 6709.93,-736.47"/>
+</g>
+<!-- splitmix -->
+<g id="node30" class="node">
+<title>splitmix</title>
+<ellipse fill="none" stroke="black" cx="8638" cy="-594" rx="39.59" ry="18"/>
+<text text-anchor="middle" x="8638" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">splitmix</text>
+</g>
+<!-- QuickCheck&#45;&gt;splitmix -->
+<g id="edge37" class="edge">
+<title>QuickCheck&#45;&gt;splitmix</title>
+<path fill="none" stroke="black" d="M10307.93,-792.58C10279.46,-768.2 10228.11,-724.77 10218,-720 10070.03,-650.2 10019.42,-667.61 9857,-648 9406.97,-593.66 8857.56,-593.13 8689.35,-594.42"/>
+<polygon fill="black" stroke="black" points="8689.39,-590.92 8679.42,-594.51 8689.45,-597.92 8689.39,-590.92"/>
+</g>
+<!-- random&#45;&gt;base -->
+<g id="edge619" class="edge">
+<title>random&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M6622.73,-730.6C6550.76,-716.83 6386.26,-680 6264,-612 6160.19,-554.27 6084.68,-437.14 6175,-360 6222.96,-319.04 8281.24,-308.51 8591.11,-307.16"/>
+<polygon fill="black" stroke="black" points="8591.09,-310.66 8601.07,-307.12 8591.06,-303.66 8591.09,-310.66"/>
+</g>
+<!-- random&#45;&gt;bytestring -->
+<g id="edge620" class="edge">
+<title>random&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M6619.72,-736.2C6271.71,-729.07 3718.92,-676.81 3298.53,-668.2"/>
+<polygon fill="black" stroke="black" points="3298.87,-664.7 3288.8,-668 3298.72,-671.7 3298.87,-664.7"/>
+</g>
+<!-- random&#45;&gt;deepseq -->
+<g id="edge621" class="edge">
+<title>random&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6667.21,-719.97C6685,-685.24 6730.86,-606.94 6796,-576 6960.69,-497.77 7532.89,-462.69 7710.2,-453.53"/>
+<polygon fill="black" stroke="black" points="7710.22,-457.03 7720.03,-453.03 7709.87,-450.04 7710.22,-457.03"/>
+</g>
+<!-- random&#45;&gt;mtl -->
+<g id="edge622" class="edge">
+<title>random&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M6677.51,-721.8C6708.64,-696.25 6771.49,-644.66 6806.68,-615.78"/>
+<polygon fill="black" stroke="black" points="6808.73,-618.63 6814.24,-609.58 6804.29,-613.22 6808.73,-618.63"/>
+</g>
+<!-- random&#45;&gt;splitmix -->
+<g id="edge623" class="edge">
+<title>random&#45;&gt;splitmix</title>
+<path fill="none" stroke="black" d="M6689.96,-726.53C6697.16,-724.24 6704.82,-721.93 6712,-720 6856.54,-681.1 6892.47,-666.56 7041,-648 7350.61,-609.31 8349.22,-597.69 8586.89,-595.44"/>
+<polygon fill="black" stroke="black" points="8586.79,-598.94 8596.76,-595.35 8586.72,-591.94 8586.79,-598.94"/>
+</g>
+<!-- splitmix&#45;&gt;base -->
+<g id="edge677" class="edge">
+<title>splitmix&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M8637.51,-575.54C8636.18,-527.76 8632.45,-394.51 8630.8,-335.61"/>
+<polygon fill="black" stroke="black" points="8634.3,-335.64 8630.52,-325.74 8627.31,-335.84 8634.3,-335.64"/>
+</g>
+<!-- splitmix&#45;&gt;deepseq -->
+<g id="edge678" class="edge">
+<title>splitmix&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8632.96,-575.75C8625.82,-554.75 8610.58,-520.11 8584,-504 8518.59,-464.35 7987.77,-453.95 7816.24,-451.61"/>
+<polygon fill="black" stroke="black" points="7816.32,-448.11 7806.27,-451.47 7816.23,-455.11 7816.32,-448.11"/>
+</g>
+<!-- RSA -->
+<g id="node31" class="node">
+<title>RSA</title>
+<ellipse fill="none" stroke="black" cx="2948" cy="-1386" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="2948" y="-1380.58" font-family="Times New Roman,serif" font-size="14.00">RSA</text>
+</g>
+<!-- RSA&#45;&gt;base -->
+<g id="edge41" class="edge">
+<title>RSA&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2922.86,-1376.34C2868.42,-1357.99 2735.22,-1315.32 2620,-1296 2385.4,-1256.66 2317.39,-1315.15 2086,-1260 1949.11,-1227.37 1914.93,-1202.59 1804,-1116 1684.78,-1022.94 1556,-1034.24 1556,-883 1556,-883 1556,-883 1556,-665 1556,-524.4 1527.3,-444.07 1640,-360 1714.4,-304.5 8036.02,-306.68 8591.17,-306.98"/>
+<polygon fill="black" stroke="black" points="8590.99,-310.48 8600.99,-306.98 8591,-303.48 8590.99,-310.48"/>
+</g>
+<!-- RSA&#45;&gt;bytestring -->
+<g id="edge43" class="edge">
+<title>RSA&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2940.49,-1368.34C2929.42,-1342.2 2910,-1289.7 2910,-1243 2910,-1243 2910,-1243 2910,-1169 2910,-1094.46 2910.65,-1065.33 2863,-1008 2841.39,-982 2813.35,-1001.01 2796,-972 2787.79,-958.27 2788.67,-950.22 2796,-936 2846.5,-837.99 2900.02,-842.55 2998,-792 3041.47,-769.57 3058.8,-778.95 3102,-756 3125.55,-743.49 3127.81,-734.79 3150,-720 3167.37,-708.42 3187.31,-696.54 3204.01,-686.97"/>
+<polygon fill="black" stroke="black" points="3205.65,-690.06 3212.61,-682.08 3202.19,-683.98 3205.65,-690.06"/>
+</g>
+<!-- RSA&#45;&gt;binary -->
+<g id="edge42" class="edge">
+<title>RSA&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M2977.43,-1384.94C3301.17,-1384.18 6194.49,-1376.24 6572,-1332 6718.51,-1314.83 6754.88,-1302.94 6896,-1260 7315.25,-1132.43 7392.78,-1028.42 7799,-864 7916.02,-816.63 8058.57,-771.58 8126.42,-750.87"/>
+<polygon fill="black" stroke="black" points="8127.05,-754.34 8135.6,-748.08 8125.01,-747.64 8127.05,-754.34"/>
+</g>
+<!-- SHA -->
+<g id="node32" class="node">
+<title>SHA</title>
+<ellipse fill="none" stroke="black" cx="3981" cy="-810" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="3981" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">SHA</text>
+</g>
+<!-- RSA&#45;&gt;SHA -->
+<g id="edge40" class="edge">
+<title>RSA&#45;&gt;SHA</title>
+<path fill="none" stroke="black" d="M2951.2,-1367.67C2959.31,-1320.92 2978.9,-1188.42 2962,-1080 2956.83,-1046.81 2954.92,-1037.58 2939,-1008 2929.26,-989.91 2916.83,-991.38 2910,-972 2904.68,-956.91 2901.77,-949.72 2910,-936 2944.99,-877.69 2979.52,-882.35 3045,-864 3088.66,-851.76 3765.83,-820.66 3940.27,-812.82"/>
+<polygon fill="black" stroke="black" points="3940.37,-816.32 3950.2,-812.37 3940.05,-809.32 3940.37,-816.32"/>
+</g>
+<!-- crypto&#45;api -->
+<g id="node33" class="node">
+<title>crypto&#45;api</title>
+<ellipse fill="none" stroke="black" cx="3063" cy="-1314" rx="49.07" ry="18"/>
+<text text-anchor="middle" x="3063" y="-1308.58" font-family="Times New Roman,serif" font-size="14.00">crypto&#45;api</text>
+</g>
+<!-- RSA&#45;&gt;crypto&#45;api -->
+<g id="edge44" class="edge">
+<title>RSA&#45;&gt;crypto&#45;api</title>
+<path fill="none" stroke="black" d="M2968.29,-1372.65C2984.99,-1362.49 3009.01,-1347.86 3028.68,-1335.89"/>
+<polygon fill="black" stroke="black" points="3030.5,-1338.88 3037.22,-1330.69 3026.86,-1332.9 3030.5,-1338.88"/>
+</g>
+<!-- crypto&#45;pubkey&#45;types -->
+<g id="node34" class="node">
+<title>crypto&#45;pubkey&#45;types</title>
+<ellipse fill="none" stroke="black" cx="1604" cy="-1242" rx="88.49" ry="18"/>
+<text text-anchor="middle" x="1604" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">crypto&#45;pubkey&#45;types</text>
+</g>
+<!-- RSA&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge45" class="edge">
+<title>RSA&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M2919.83,-1380.82C2864.25,-1372.47 2736.59,-1352.71 2630,-1332 2557.6,-1317.93 2541.04,-1306.29 2468,-1296 2393.71,-1285.53 1909.56,-1259.14 1700.2,-1248.04"/>
+<polygon fill="black" stroke="black" points="1700.61,-1244.56 1690.44,-1247.53 1700.24,-1251.55 1700.61,-1244.56"/>
+</g>
+<!-- SHA&#45;&gt;base -->
+<g id="edge47" class="edge">
+<title>SHA&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M3977.25,-792.05C3971.71,-765.52 3962,-712.52 3962,-667 3962,-667 3962,-667 3962,-449 3962,-400.79 3981.4,-382.56 4024,-360 4130.92,-303.39 8153.21,-306.45 8591.39,-306.95"/>
+<polygon fill="black" stroke="black" points="8591.23,-310.45 8601.24,-306.96 8591.24,-303.45 8591.23,-310.45"/>
+</g>
+<!-- SHA&#45;&gt;array -->
+<g id="edge46" class="edge">
+<title>SHA&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M3996.35,-794.47C4061.66,-733.87 4325.38,-501.12 4594,-432 4752.52,-391.21 5267.3,-381.45 5416.27,-379.46"/>
+<polygon fill="black" stroke="black" points="5416.08,-382.96 5426.04,-379.33 5415.99,-375.96 5416.08,-382.96"/>
+</g>
+<!-- SHA&#45;&gt;bytestring -->
+<g id="edge49" class="edge">
+<title>SHA&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3971.66,-792.75C3958.62,-771.78 3932.82,-736.11 3900,-720 3794.99,-668.46 3439.78,-665.37 3298.58,-666.27"/>
+<polygon fill="black" stroke="black" points="3298.68,-662.77 3288.7,-666.34 3298.73,-669.77 3298.68,-662.77"/>
+</g>
+<!-- SHA&#45;&gt;binary -->
+<g id="edge48" class="edge">
+<title>SHA&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M4010.24,-808.51C4357.73,-802.7 7692.55,-746.92 8120.8,-739.76"/>
+<polygon fill="black" stroke="black" points="8120.61,-743.26 8130.55,-739.59 8120.49,-736.26 8120.61,-743.26"/>
+</g>
+<!-- crypto&#45;api&#45;&gt;base -->
+<g id="edge235" class="edge">
+<title>crypto&#45;api&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M3014.56,-1310.31C2835.67,-1300.35 2221.62,-1265.82 2202,-1260 1851.55,-1155.95 1632,-1032.57 1632,-667 1632,-667 1632,-667 1632,-449 1632,-402.5 1646.47,-382.8 1687,-360 1767.35,-314.79 8040.59,-307.58 8591.46,-307.04"/>
+<polygon fill="black" stroke="black" points="8591.21,-310.54 8601.2,-307.03 8591.2,-303.54 8591.21,-310.54"/>
+</g>
+<!-- crypto&#45;api&#45;&gt;bytestring -->
+<g id="edge236" class="edge">
+<title>crypto&#45;api&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3054.17,-1295.87C3029.51,-1246.96 2960.22,-1101.85 2937,-972 2934.18,-956.25 2929.83,-950.3 2937,-936 2996.91,-816.48 3085.04,-852.08 3178,-756 3196.34,-737.04 3213.17,-712.19 3224.65,-693.56"/>
+<polygon fill="black" stroke="black" points="3227.51,-695.6 3229.68,-685.23 3221.52,-691.99 3227.51,-695.6"/>
+</g>
+<!-- crypto&#45;api&#45;&gt;transformers -->
+<g id="edge240" class="edge">
+<title>crypto&#45;api&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M3112.14,-1312.58C3581.15,-1308.59 7254.7,-1276.83 7484,-1260 7602.98,-1251.27 7631.19,-1234.77 7750,-1224 8265.77,-1177.23 9562.47,-1165.33 10078,-1116 10520.61,-1073.65 10630.21,-1049.71 11068,-972 11144.68,-958.39 11686.29,-866.48 11754,-828 11787.09,-809.19 11951.93,-592.96 11986,-576 12068.15,-535.12 12335.95,-525.76 12463.4,-523.62"/>
+<polygon fill="black" stroke="black" points="12463.09,-527.13 12473.03,-523.47 12462.98,-520.13 12463.09,-527.13"/>
+</g>
+<!-- tagged -->
+<g id="node46" class="node">
+<title>tagged</title>
+<ellipse fill="none" stroke="black" cx="12969" cy="-738" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="12969" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">tagged</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;tagged -->
+<g id="edge239" class="edge">
+<title>crypto&#45;api&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M3112.1,-1312.57C3581.1,-1308.4 7262.74,-1275.35 7750,-1260 8988.37,-1220.99 9299.66,-1223.23 10534,-1116 10796.74,-1093.17 10861.4,-1077.4 11123,-1044 11539.63,-990.81 11676.83,-1078.56 12057,-900 12079.56,-889.4 12077.75,-875.24 12100,-864 12160.42,-833.47 12183.92,-849.83 12248,-828 12285.29,-815.29 12290.83,-801.76 12329,-792 12386.13,-777.39 12786.01,-750.72 12923.05,-741.91"/>
+<polygon fill="black" stroke="black" points="12923.08,-745.42 12932.83,-741.29 12922.63,-738.43 12923.08,-745.42"/>
+</g>
+<!-- cereal -->
+<g id="node103" class="node">
+<title>cereal</title>
+<ellipse fill="none" stroke="black" cx="2648" cy="-738" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="2648" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">cereal</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;cereal -->
+<g id="edge237" class="edge">
+<title>crypto&#45;api&#45;&gt;cereal</title>
+<path fill="none" stroke="black" d="M3014.62,-1310.35C2838.26,-1300.63 2239.79,-1267.14 2233,-1260 2128.48,-1150.13 2243.42,-1052.92 2340,-936 2403.5,-859.14 2426.2,-842.77 2512,-792 2542.67,-773.85 2580.68,-759.65 2608.72,-750.53"/>
+<polygon fill="black" stroke="black" points="2609.77,-753.87 2618.25,-747.52 2607.66,-747.2 2609.77,-753.87"/>
+</g>
+<!-- entropy -->
+<g id="node106" class="node">
+<title>entropy</title>
+<ellipse fill="none" stroke="black" cx="4337" cy="-1242" rx="39.09" ry="18"/>
+<text text-anchor="middle" x="4337" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">entropy</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;entropy -->
+<g id="edge238" class="edge">
+<title>crypto&#45;api&#45;&gt;entropy</title>
+<path fill="none" stroke="black" d="M3111.39,-1310.34C3312.58,-1299.29 4082,-1257.01 4286.72,-1245.76"/>
+<polygon fill="black" stroke="black" points="4286.69,-1249.27 4296.48,-1245.23 4286.3,-1242.28 4286.69,-1249.27"/>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;base -->
+<g id="edge243" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1591.49,-1223.9C1562.42,-1182.96 1490.89,-1075.06 1466,-972 1462.24,-956.45 1465.11,-951.98 1466,-936 1469.12,-880.18 1480,-866.9 1480,-811 1480,-811 1480,-811 1480,-665 1480,-596.98 1456.07,-406.2 1506,-360 1540.74,-327.86 8027.6,-308.71 8591.04,-307.11"/>
+<polygon fill="black" stroke="black" points="8591.04,-310.61 8601.03,-307.08 8591.02,-303.61 8591.04,-310.61"/>
+</g>
+<!-- asn1&#45;encoding -->
+<g id="node79" class="node">
+<title>asn1&#45;encoding</title>
+<ellipse fill="none" stroke="black" cx="1281" cy="-1170" rx="64.54" ry="18"/>
+<text text-anchor="middle" x="1281" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;encoding</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;encoding -->
+<g id="edge241" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M1545.13,-1228.24C1487.52,-1215.76 1400.17,-1196.83 1341.88,-1184.19"/>
+<polygon fill="black" stroke="black" points="1342.98,-1180.85 1332.47,-1182.15 1341.5,-1187.69 1342.98,-1180.85"/>
+</g>
+<!-- asn1&#45;types -->
+<g id="node80" class="node">
+<title>asn1&#45;types</title>
+<ellipse fill="none" stroke="black" cx="1109" cy="-1098" rx="50.56" ry="18"/>
+<text text-anchor="middle" x="1109" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;types</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;types -->
+<g id="edge242" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M1565.27,-1225.37C1516.73,-1206.19 1430.71,-1173.59 1355,-1152 1290.49,-1133.61 1214.87,-1118.21 1164.67,-1108.84"/>
+<polygon fill="black" stroke="black" points="1165.38,-1105.41 1154.91,-1107.03 1164.11,-1112.29 1165.38,-1105.41"/>
+</g>
+<!-- StateVar -->
+<g id="node35" class="node">
+<title>StateVar</title>
+<ellipse fill="none" stroke="black" cx="13459" cy="-666" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="13459" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">StateVar</text>
+</g>
+<!-- StateVar&#45;&gt;base -->
+<g id="edge50" class="edge">
+<title>StateVar&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13485.29,-651.53C13523.39,-632.47 13596.57,-597.53 13662,-576 13730.82,-553.35 13763.25,-583.76 13821,-540 13861.67,-509.18 13877.57,-479.91 13860,-432 13845.56,-392.62 13836.96,-377.83 13799,-360 13675.74,-302.11 9137.17,-306.35 8668.92,-306.95"/>
+<polygon fill="black" stroke="black" points="8668.94,-303.45 8658.94,-306.96 8668.94,-310.45 8668.94,-303.45"/>
+</g>
+<!-- StateVar&#45;&gt;transformers -->
+<g id="edge52" class="edge">
+<title>StateVar&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M13453.41,-647.7C13445.59,-626.66 13429.21,-591.98 13402,-576 13333.67,-535.87 12794.67,-525.93 12601,-523.64"/>
+<polygon fill="black" stroke="black" points="12601.12,-520.14 12591.08,-523.53 12601.04,-527.14 12601.12,-520.14"/>
+</g>
+<!-- stm -->
+<g id="node36" class="node">
+<title>stm</title>
+<ellipse fill="none" stroke="black" cx="4587" cy="-594" rx="27" ry="18"/>
+<text text-anchor="middle" x="4587" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">stm</text>
+</g>
+<!-- StateVar&#45;&gt;stm -->
+<g id="edge51" class="edge">
+<title>StateVar&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M13416.21,-664.66C12778.97,-659.63 5229.19,-600.07 4625.31,-595.3"/>
+<polygon fill="black" stroke="black" points="4625.75,-591.81 4615.72,-595.23 4625.69,-598.81 4625.75,-591.81"/>
+</g>
+<!-- stm&#45;&gt;base -->
+<g id="edge680" class="edge">
+<title>stm&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M4565.13,-583.01C4548.82,-574.24 4527.75,-559.78 4518,-540 4482.63,-468.24 4461.8,-416.93 4518,-360 4555.82,-321.69 8175.9,-308.51 8591.3,-307.13"/>
+<polygon fill="black" stroke="black" points="8591.14,-310.63 8601.13,-307.09 8591.12,-303.63 8591.14,-310.63"/>
+</g>
+<!-- stm&#45;&gt;array -->
+<g id="edge679" class="edge">
+<title>stm&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M4610.97,-585.34C4663.21,-568.16 4790.45,-523.67 4888,-468 4911.16,-454.78 4911.16,-441.7 4936,-432 5023.65,-397.76 5310.17,-384.24 5416.66,-380.32"/>
+<polygon fill="black" stroke="black" points="5416.48,-383.83 5426.35,-379.97 5416.23,-376.83 5416.48,-383.83"/>
+</g>
+<!-- os&#45;string&#45;&gt;base -->
+<g id="edge567" class="edge">
+<title>os&#45;string&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5762.83,-719.9C5770.45,-652.38 5802,-405.74 5861,-360 5917.51,-316.19 8260.96,-308.03 8591.42,-307.1"/>
+<polygon fill="black" stroke="black" points="8591.24,-310.6 8601.23,-307.07 8591.22,-303.6 8591.24,-310.6"/>
+</g>
+<!-- os&#45;string&#45;&gt;template&#45;haskell -->
+<g id="edge571" class="edge">
+<title>os&#45;string&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M5803.64,-734.95C5931.9,-728.7 6325.34,-708.72 6651,-684 6824.57,-670.82 6867.17,-657.22 7041,-648 7427.83,-627.48 10306.18,-599.94 10772.32,-595.59"/>
+<polygon fill="black" stroke="black" points="10772.03,-599.09 10782,-595.5 10771.97,-592.09 10772.03,-599.09"/>
+</g>
+<!-- os&#45;string&#45;&gt;bytestring -->
+<g id="edge568" class="edge">
+<title>os&#45;string&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5717.77,-735.8C5417.51,-727.46 3644.37,-678.23 3298.48,-668.62"/>
+<polygon fill="black" stroke="black" points="3298.62,-665.13 3288.53,-668.35 3298.43,-672.12 3298.62,-665.13"/>
+</g>
+<!-- os&#45;string&#45;&gt;deepseq -->
+<g id="edge569" class="edge">
+<title>os&#45;string&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5767.63,-719.95C5786.23,-674.76 5843.75,-552.13 5937,-504 6017.74,-462.33 7417.57,-452.79 7709.8,-451.25"/>
+<polygon fill="black" stroke="black" points="7709.81,-454.75 7719.79,-451.2 7709.78,-447.75 7709.81,-454.75"/>
+</g>
+<!-- os&#45;string&#45;&gt;exceptions -->
+<g id="edge570" class="edge">
+<title>os&#45;string&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M5804.02,-735.15C5982.82,-727.43 6667.89,-697.56 6884,-684 6937.14,-680.67 6997.53,-675.85 7041.08,-672.2"/>
+<polygon fill="black" stroke="black" points="7041.16,-675.7 7050.83,-671.37 7040.57,-668.73 7041.16,-675.7"/>
+</g>
+<!-- adjunctions -->
+<g id="node38" class="node">
+<title>adjunctions</title>
+<ellipse fill="none" stroke="black" cx="14437" cy="-1170" rx="53.06" ry="18"/>
+<text text-anchor="middle" x="14437" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">adjunctions</text>
+</g>
+<!-- adjunctions&#45;&gt;base -->
+<g id="edge57" class="edge">
+<title>adjunctions&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14488.31,-1165.11C14578.16,-1157.94 14769.68,-1141.05 14930,-1116 14969.23,-1109.87 15241.37,-1053.15 15280,-1044 15340.01,-1029.78 15491.11,-995.79 15548,-972 15606.44,-947.56 15635.07,-952.17 15671,-900 15716.82,-833.48 15696.95,-782.67 15646,-720 15613.9,-680.52 15597.08,-679.34 15557,-648 15494.25,-598.95 15472.93,-593.58 15414,-540 15397.94,-525.4 15399.97,-514.55 15381,-504 15305.51,-462.01 15271.26,-497.3 15190,-468 15158.93,-456.8 15155.5,-444.65 15125,-432 15071.6,-409.85 15052.74,-419.67 15000,-396 14972.66,-383.73 14971.75,-368.45 14943,-360 14782.58,-312.85 9189.36,-307.43 8668.76,-307.03"/>
+<polygon fill="black" stroke="black" points="8668.92,-303.53 8658.92,-307.02 8668.92,-310.53 8668.92,-303.53"/>
+</g>
+<!-- adjunctions&#45;&gt;array -->
+<g id="edge56" class="edge">
+<title>adjunctions&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M14383.84,-1168.16C14207,-1165.38 13622.39,-1156.45 13139,-1152 13044.81,-1151.13 6448.36,-1138.95 6357,-1116 6323.83,-1107.67 6319.32,-1095.82 6289,-1080 6226.97,-1047.63 6211.49,-1039.47 6149,-1008 6116.69,-991.73 6107.41,-989.94 6076,-972 6050.63,-957.51 6047.97,-947.23 6021,-936 5950.11,-906.47 5924.55,-925.18 5852,-900 5817.82,-888.14 5812.52,-877.62 5779,-864 5730.95,-844.48 5711.19,-856.71 5668,-828 5517.42,-727.88 5471.91,-489.99 5460.41,-407.64"/>
+<polygon fill="black" stroke="black" points="5463.91,-407.4 5459.12,-397.94 5456.97,-408.32 5463.91,-407.4"/>
+</g>
+<!-- adjunctions&#45;&gt;containers -->
+<g id="edge59" class="edge">
+<title>adjunctions&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M14383.68,-1168.7C14216.97,-1167.3 13690.97,-1159.48 13258,-1116 13052.1,-1095.32 12999.79,-1089.84 12798,-1044 12580.81,-994.66 12530.87,-965.54 12318,-900 12267.22,-884.37 12256.44,-872.56 12204,-864 12093.01,-845.88 10284.1,-870.56 10180,-828 10158.47,-819.2 10162.47,-803.06 10142,-792 10080.92,-758.99 10051.08,-789.01 9990,-756 9969.53,-744.94 9973.24,-729.5 9952,-720 9863.45,-680.41 9612.18,-702.68 9517,-684 9514.22,-683.45 9511.37,-682.81 9508.52,-682.11"/>
+<polygon fill="black" stroke="black" points="9509.59,-678.77 9499.02,-679.53 9507.75,-685.53 9509.59,-678.77"/>
+</g>
+<!-- adjunctions&#45;&gt;mtl -->
+<g id="edge63" class="edge">
+<title>adjunctions&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M14383.84,-1168.27C14206.99,-1165.84 13622.38,-1157.86 13139,-1152 11706.13,-1134.62 11347.41,-1156.48 9915,-1116 9826.78,-1113.51 8415.91,-1051.86 8328,-1044 8087.72,-1022.51 7995.47,-1098.42 7790,-972 7715.66,-926.26 7643.7,-691.44 7568,-648 7507.21,-613.11 7012.48,-599.14 6870.16,-595.82"/>
+<polygon fill="black" stroke="black" points="6870.6,-592.33 6860.53,-595.6 6870.44,-599.33 6870.6,-592.33"/>
+</g>
+<!-- adjunctions&#45;&gt;transformers -->
+<g id="edge68" class="edge">
+<title>adjunctions&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M14421.05,-1152.77C14390.71,-1122.36 14321.92,-1055.6 14257,-1008 14181.15,-952.38 14155.06,-949.37 14075,-900 13948.76,-822.14 13929.49,-780.34 13794,-720 13738.84,-695.44 13716.15,-712.65 13663,-684 13630.98,-666.74 13573.69,-589.71 13540,-576 13453.64,-540.85 12814.15,-527.51 12600.95,-524.01"/>
+<polygon fill="black" stroke="black" points="12601.19,-520.52 12591.13,-523.86 12601.07,-527.52 12601.19,-520.52"/>
+</g>
+<!-- comonad -->
+<g id="node39" class="node">
+<title>comonad</title>
+<ellipse fill="none" stroke="black" cx="14170" cy="-882" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="14170" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">comonad</text>
+</g>
+<!-- adjunctions&#45;&gt;comonad -->
+<g id="edge58" class="edge">
+<title>adjunctions&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M14442.33,-1151.79C14454.06,-1114.8 14482.77,-1029.37 14504,-1008 14532.92,-978.9 14566.34,-1006.2 14589,-972 14597.84,-958.66 14599.58,-948 14589,-936 14565.41,-909.23 14335.44,-892.53 14226.58,-886.06"/>
+<polygon fill="black" stroke="black" points="14226.88,-882.57 14216.69,-885.48 14226.47,-889.56 14226.88,-882.57"/>
+</g>
+<!-- contravariant -->
+<g id="node40" class="node">
+<title>contravariant</title>
+<ellipse fill="none" stroke="black" cx="14521" cy="-954" rx="58.55" ry="18"/>
+<text text-anchor="middle" x="14521" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">contravariant</text>
+</g>
+<!-- adjunctions&#45;&gt;contravariant -->
+<g id="edge60" class="edge">
+<title>adjunctions&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M14436.71,-1151.9C14436.9,-1121.22 14440.55,-1055.59 14466,-1008 14471.92,-996.92 14480.99,-986.79 14490.07,-978.41"/>
+<polygon fill="black" stroke="black" points="14492.27,-981.14 14497.53,-971.94 14487.68,-975.85 14492.27,-981.14"/>
+</g>
+<!-- distributive -->
+<g id="node41" class="node">
+<title>distributive</title>
+<ellipse fill="none" stroke="black" cx="14552" cy="-810" rx="51.56" ry="18"/>
+<text text-anchor="middle" x="14552" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">distributive</text>
+</g>
+<!-- adjunctions&#45;&gt;distributive -->
+<g id="edge61" class="edge">
+<title>adjunctions&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M14481.36,-1159.87C14590.09,-1137.07 14862.85,-1077.06 14888,-1044 14931.93,-986.24 14820.77,-943.14 14808,-936 14758.66,-908.41 14737.23,-923.91 14686,-900 14647.23,-881.91 14606.88,-853.6 14580.72,-833.78"/>
+<polygon fill="black" stroke="black" points="14583.02,-831.13 14572.95,-827.82 14578.76,-836.68 14583.02,-831.13"/>
+</g>
+<!-- free -->
+<g id="node42" class="node">
+<title>free</title>
+<ellipse fill="none" stroke="black" cx="13806" cy="-1098" rx="27" ry="18"/>
+<text text-anchor="middle" x="13806" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">free</text>
+</g>
+<!-- adjunctions&#45;&gt;free -->
+<g id="edge62" class="edge">
+<title>adjunctions&#45;&gt;free</title>
+<path fill="none" stroke="black" d="M14386.96,-1163.45C14264.6,-1149.87 13952.38,-1115.24 13843.86,-1103.2"/>
+<polygon fill="black" stroke="black" points="13844.36,-1099.73 13834.04,-1102.11 13843.59,-1106.69 13844.36,-1099.73"/>
+</g>
+<!-- profunctors -->
+<g id="node43" class="node">
+<title>profunctors</title>
+<ellipse fill="none" stroke="black" cx="14639" cy="-1026" rx="54.56" ry="18"/>
+<text text-anchor="middle" x="14639" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">profunctors</text>
+</g>
+<!-- adjunctions&#45;&gt;profunctors -->
+<g id="edge64" class="edge">
+<title>adjunctions&#45;&gt;profunctors</title>
+<path fill="none" stroke="black" d="M14459.39,-1153.26C14495.34,-1127.99 14566.05,-1078.28 14607.21,-1049.35"/>
+<polygon fill="black" stroke="black" points="14609.1,-1052.29 14615.27,-1043.68 14605.08,-1046.57 14609.1,-1052.29"/>
+</g>
+<!-- semigroupoids -->
+<g id="node44" class="node">
+<title>semigroupoids</title>
+<ellipse fill="none" stroke="black" cx="13806" cy="-1026" rx="65.53" ry="18"/>
+<text text-anchor="middle" x="13806" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">semigroupoids</text>
+</g>
+<!-- adjunctions&#45;&gt;semigroupoids -->
+<g id="edge65" class="edge">
+<title>adjunctions&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M14413.84,-1153.41C14382.02,-1132.85 14322.32,-1097.26 14266,-1080 14261.39,-1078.59 14005.06,-1049.49 13877.1,-1035.03"/>
+<polygon fill="black" stroke="black" points="13877.71,-1031.57 13867.38,-1033.93 13876.92,-1038.53 13877.71,-1031.57"/>
+</g>
+<!-- semigroups -->
+<g id="node45" class="node">
+<title>semigroups</title>
+<ellipse fill="none" stroke="black" cx="15573" cy="-594" rx="53.56" ry="18"/>
+<text text-anchor="middle" x="15573" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">semigroups</text>
+</g>
+<!-- adjunctions&#45;&gt;semigroups -->
+<g id="edge66" class="edge">
+<title>adjunctions&#45;&gt;semigroups</title>
+<path fill="none" stroke="black" d="M14489.7,-1167.53C14604.25,-1163.76 14884.28,-1151.41 15116,-1116 15257.53,-1094.37 15290.68,-1077.03 15430,-1044 15560.9,-1012.97 15595.53,-1011.91 15724,-972 15810.24,-945.21 15862.69,-974.31 15914,-900 15980.34,-803.91 15753.03,-662.77 15729,-648 15711.09,-636.99 15662.32,-621.15 15624.03,-609.66"/>
+<polygon fill="black" stroke="black" points="15625.07,-606.31 15614.49,-606.82 15623.07,-613.02 15625.07,-606.31"/>
+</g>
+<!-- adjunctions&#45;&gt;tagged -->
+<g id="edge67" class="edge">
+<title>adjunctions&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M14383.76,-1168.61C14198.68,-1166.89 13584.09,-1158.07 13392,-1116 13259.91,-1087.07 13214.78,-1072.21 13124,-972 13107.69,-954 13022.27,-821.92 12985.67,-764.99"/>
+<polygon fill="black" stroke="black" points="12988.8,-763.39 12980.45,-756.87 12982.91,-767.17 12988.8,-763.39"/>
+</g>
+<!-- transformers&#45;compat -->
+<g id="node47" class="node">
+<title>transformers&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="15398" cy="-810" rx="88.49" ry="18"/>
+<text text-anchor="middle" x="15398" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">transformers&#45;compat</text>
+</g>
+<!-- adjunctions&#45;&gt;transformers&#45;compat -->
+<g id="edge69" class="edge">
+<title>adjunctions&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M14486.89,-1163.44C14550.31,-1155.75 14662.89,-1140.05 14757,-1116 14803.98,-1103.99 14813.27,-1092.94 14860,-1080 14974.16,-1048.39 15277,-1026.83 15382,-972 15423.25,-950.46 15439.62,-942.74 15458,-900 15464.32,-885.3 15464.58,-878.59 15458,-864 15452.84,-852.55 15443.85,-842.59 15434.37,-834.48"/>
+<polygon fill="black" stroke="black" points="15436.83,-831.96 15426.82,-828.5 15432.49,-837.45 15436.83,-831.96"/>
+</g>
+<!-- void -->
+<g id="node48" class="node">
+<title>void</title>
+<ellipse fill="none" stroke="black" cx="15345" cy="-522" rx="27.11" ry="18"/>
+<text text-anchor="middle" x="15345" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">void</text>
+</g>
+<!-- adjunctions&#45;&gt;void -->
+<g id="edge70" class="edge">
+<title>adjunctions&#45;&gt;void</title>
+<path fill="none" stroke="black" d="M14486.68,-1163.13C14560.16,-1154.23 14702.07,-1136.2 14822,-1116 14915.55,-1100.25 15592.07,-976.62 15648,-900 15695.78,-834.55 15669.31,-783.53 15619,-720 15561.08,-646.86 15513.31,-668.41 15439,-612 15412.3,-591.73 15384.8,-564.87 15366.5,-545.98"/>
+<polygon fill="black" stroke="black" points="15369.27,-543.8 15359.82,-539 15364.21,-548.65 15369.27,-543.8"/>
+</g>
+<!-- comonad&#45;&gt;base -->
+<g id="edge215" class="edge">
+<title>comonad&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14173.81,-863.63C14181.93,-830.7 14204.08,-758.99 14250,-720 14291.47,-684.78 14330.63,-724.46 14367,-684 14463.37,-576.79 14467.47,-446.29 14352,-360 14291.42,-314.73 9165.69,-307.63 8668.65,-307.04"/>
+<polygon fill="black" stroke="black" points="8668.97,-303.54 8658.97,-307.03 8668.96,-310.54 8668.97,-303.54"/>
+</g>
+<!-- comonad&#45;&gt;containers -->
+<g id="edge216" class="edge">
+<title>comonad&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M14134.64,-870.25C14126.59,-868 14118.03,-865.78 14110,-864 13913.97,-820.56 13862.96,-819.04 13664,-792 13375.56,-752.79 13303.53,-738.19 13013,-720 12294.55,-675.01 9931.9,-668 9523.43,-667.11"/>
+<polygon fill="black" stroke="black" points="9523.44,-663.61 9513.43,-667.09 9523.42,-670.61 9523.44,-663.61"/>
+</g>
+<!-- comonad&#45;&gt;transformers -->
+<g id="edge220" class="edge">
+<title>comonad&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M14156.36,-864.62C14124.91,-827.27 14047.28,-737.66 14012,-720 13904.53,-666.2 13849.5,-741.55 13744,-684 13688.65,-653.8 13708.6,-603.78 13652,-576 13604.72,-552.79 12836.69,-530.94 12600.53,-524.74"/>
+<polygon fill="black" stroke="black" points="12600.97,-521.25 12590.88,-524.49 12600.78,-528.25 12600.97,-521.25"/>
+</g>
+<!-- comonad&#45;&gt;distributive -->
+<g id="edge217" class="edge">
+<title>comonad&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M14210.88,-873.51C14279.58,-860.92 14418.29,-835.5 14496,-821.26"/>
+<polygon fill="black" stroke="black" points="14496.31,-824.76 14505.51,-819.52 14495.05,-817.88 14496.31,-824.76"/>
+</g>
+<!-- comonad&#45;&gt;tagged -->
+<g id="edge219" class="edge">
+<title>comonad&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M14135.02,-870.03C14126.87,-867.77 14118.18,-865.6 14110,-864 14000.81,-842.71 13213.97,-763.45 13014.74,-743.55"/>
+<polygon fill="black" stroke="black" points="13015.35,-740.1 13005.05,-742.59 13014.66,-747.06 13015.35,-740.1"/>
+</g>
+<!-- comonad&#45;&gt;transformers&#45;compat -->
+<g id="edge221" class="edge">
+<title>comonad&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M14215.16,-878.43C14393.94,-868.23 15054.39,-830.59 15302.75,-816.43"/>
+<polygon fill="black" stroke="black" points="15302.61,-819.94 15312.39,-815.88 15302.21,-812.95 15302.61,-819.94"/>
+</g>
+<!-- indexed&#45;traversable -->
+<g id="node56" class="node">
+<title>indexed&#45;traversable</title>
+<ellipse fill="none" stroke="black" cx="12421" cy="-810" rx="82.5" ry="18"/>
+<text text-anchor="middle" x="12421" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">indexed&#45;traversable</text>
+</g>
+<!-- comonad&#45;&gt;indexed&#45;traversable -->
+<g id="edge218" class="edge">
+<title>comonad&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M14124.56,-879.18C13891.92,-869.87 12832.65,-827.48 12512.75,-814.67"/>
+<polygon fill="black" stroke="black" points="12513.33,-811.19 12503.2,-814.29 12513.05,-818.19 12513.33,-811.19"/>
+</g>
+<!-- contravariant&#45;&gt;base -->
+<g id="edge227" class="edge">
+<title>contravariant&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14510.28,-935.82C14492.2,-904.43 14460.47,-836.91 14491,-792 14515.45,-756.03 14552.91,-788.34 14582,-756 14604.21,-731.31 14597.51,-716.91 14602,-684 14620.93,-545.1 14493.02,-363.44 14488,-360 14424.14,-316.17 9172.91,-307.76 8668.78,-307.05"/>
+<polygon fill="black" stroke="black" points="8668.96,-303.55 8658.95,-307.04 8668.95,-310.55 8668.96,-303.55"/>
+</g>
+<!-- contravariant&#45;&gt;transformers -->
+<g id="edge228" class="edge">
+<title>contravariant&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M14469.93,-944.84C14451.11,-941.93 14429.6,-938.7 14410,-936 14279.15,-918 14230.03,-964.93 14115,-900 14070.75,-875.02 14018.12,-745.21 13974,-720 13868.51,-659.71 13809.23,-742.98 13703,-684 13648.62,-653.81 13669.59,-603.9 13614,-576 13523.86,-530.75 12825.02,-524.12 12600.91,-523.16"/>
+<polygon fill="black" stroke="black" points="12601.19,-519.66 12591.18,-523.12 12601.16,-526.66 12601.19,-519.66"/>
+</g>
+<!-- contravariant&#45;&gt;StateVar -->
+<g id="edge226" class="edge">
+<title>contravariant&#45;&gt;StateVar</title>
+<path fill="none" stroke="black" d="M14462.14,-952.79C14370.84,-951.06 14190.36,-942.02 14044,-900 13866.69,-849.09 13843.46,-782.79 13670,-720 13616.05,-700.47 13551.82,-685.45 13508.51,-676.47"/>
+<polygon fill="black" stroke="black" points="13509.41,-673.08 13498.91,-674.51 13508.01,-679.94 13509.41,-673.08"/>
+</g>
+<!-- distributive&#45;&gt;base -->
+<g id="edge327" class="edge">
+<title>distributive&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14594.35,-799.39C14617.45,-791.76 14644.1,-778.49 14658,-756 14751.45,-604.8 14742.33,-469.1 14602,-360 14539.63,-311.51 9178.29,-307.31 8668.77,-307.02"/>
+<polygon fill="black" stroke="black" points="8668.84,-303.52 8658.83,-307.01 8668.83,-310.52 8668.84,-303.52"/>
+</g>
+<!-- distributive&#45;&gt;transformers -->
+<g id="edge330" class="edge">
+<title>distributive&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M14506.43,-801.06C14453.6,-791.58 14364.05,-774.64 14288,-756 14232.26,-742.34 14219.82,-733.3 14164,-720 14079.54,-699.87 14053.17,-714.82 13972,-684 13913.85,-661.92 13903.61,-646.71 13852,-612 13829.87,-597.12 13829.12,-584.96 13804,-576 13747.04,-555.69 12857.57,-531.36 12600.86,-524.74"/>
+<polygon fill="black" stroke="black" points="12601.08,-521.24 12590.99,-524.48 12600.9,-528.24 12601.08,-521.24"/>
+</g>
+<!-- distributive&#45;&gt;tagged -->
+<g id="edge329" class="edge">
+<title>distributive&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M14501.12,-806.75C14261.2,-796.14 13244.86,-751.2 13015.24,-741.04"/>
+<polygon fill="black" stroke="black" points="13015.64,-737.56 13005.49,-740.61 13015.33,-744.55 13015.64,-737.56"/>
+</g>
+<!-- base&#45;orphans -->
+<g id="node93" class="node">
+<title>base&#45;orphans</title>
+<ellipse fill="none" stroke="black" cx="15514" cy="-738" rx="60.54" ry="18"/>
+<text text-anchor="middle" x="15514" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">base&#45;orphans</text>
+</g>
+<!-- distributive&#45;&gt;base&#45;orphans -->
+<g id="edge328" class="edge">
+<title>distributive&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M14602.37,-805.34C14762.46,-793.69 15259.97,-757.48 15444.34,-744.07"/>
+<polygon fill="black" stroke="black" points="15444.53,-747.56 15454.25,-743.35 15444.02,-740.58 15444.53,-747.56"/>
+</g>
+<!-- free&#45;&gt;base -->
+<g id="edge351" class="edge">
+<title>free&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13833.41,-1096.74C13951.42,-1095.35 14427.72,-1087.24 14816,-1044 15004.66,-1022.99 15052.9,-1018.28 15237,-972 15421.85,-925.53 15688.92,-879.12 15584,-720 15561.64,-686.09 15536.3,-702.23 15500,-684 15357.63,-612.49 15337.04,-565.34 15190,-504 15133.48,-480.42 15114.56,-488.9 15057,-468 15021.11,-454.97 15014.15,-446.9 14979,-432 14938.19,-414.7 14923.46,-419.69 14886,-396 14866.34,-383.57 14869.57,-368.7 14848,-360 14695.31,-298.4 9184.23,-306.08 8668.6,-306.93"/>
+<polygon fill="black" stroke="black" points="8668.86,-303.43 8658.87,-306.95 8668.87,-310.43 8668.86,-303.43"/>
+</g>
+<!-- free&#45;&gt;template&#45;haskell -->
+<g id="edge360" class="edge">
+<title>free&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M13779.7,-1092.81C13692.27,-1078.69 13403.58,-1030.4 13169,-972 12901.32,-905.36 12843.21,-856.48 12575,-792 12398.94,-749.67 12353.54,-743.51 12174,-720 11982.09,-694.87 11931.95,-708.84 11740,-684 11648.69,-672.18 11627.35,-659.49 11536,-648 11302.59,-618.64 11023.2,-603.42 10899.87,-597.71"/>
+<polygon fill="black" stroke="black" points="10900.09,-594.22 10889.94,-597.26 10899.77,-601.21 10900.09,-594.22"/>
+</g>
+<!-- free&#45;&gt;containers -->
+<g id="edge353" class="edge">
+<title>free&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M13778.76,-1095.65C13663.02,-1089.81 13211.61,-1066.07 13071,-1044 12937.67,-1023.07 12906.4,-1006.78 12776,-972 12609.24,-927.53 12572.93,-894.16 12403,-864 11512.1,-705.86 11270.83,-840.94 10370,-756 10264.8,-746.08 10239.96,-732.16 10135,-720 9909.15,-693.83 9639.06,-676.86 9521.96,-670.19"/>
+<polygon fill="black" stroke="black" points="9522.47,-666.72 9512.29,-669.65 9522.08,-673.71 9522.47,-666.72"/>
+</g>
+<!-- free&#45;&gt;mtl -->
+<g id="edge357" class="edge">
+<title>free&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M13778.89,-1095.09C13724.77,-1091.38 13599.46,-1083.26 13494,-1080 12410.49,-1046.5 9697.62,-1116.29 8616,-1044 8489.05,-1035.52 8458.6,-1020.68 8332,-1008 8223.8,-997.16 7939.14,-1024.65 7844,-972 7687.67,-885.49 7762.56,-734.1 7606,-648 7541.15,-612.33 7017.09,-598.84 6870.17,-595.74"/>
+<polygon fill="black" stroke="black" points="6870.66,-592.25 6860.59,-595.54 6870.52,-599.25 6870.66,-592.25"/>
+</g>
+<!-- free&#45;&gt;transformers -->
+<g id="edge362" class="edge">
+<title>free&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M13783.01,-1087.85C13765.22,-1079.39 13741.85,-1064.95 13731,-1044 13723.64,-1029.79 13726.22,-1023.27 13731,-1008 13742.64,-970.82 13752.27,-962.31 13781,-936 13804.78,-914.22 13827.81,-927.89 13844,-900 13852.03,-886.16 13850.81,-878.48 13844,-864 13801.27,-773.17 13756.31,-771.26 13670,-720 13632.96,-698 13617.69,-704.86 13580,-684 13508.75,-644.57 13508.64,-603.51 13432,-576 13354.59,-548.21 12797.59,-530.33 12600.71,-524.81"/>
+<polygon fill="black" stroke="black" points="12600.99,-521.32 12590.9,-524.54 12600.79,-528.32 12600.99,-521.32"/>
+</g>
+<!-- free&#45;&gt;comonad -->
+<g id="edge352" class="edge">
+<title>free&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M13828.99,-1087.85C13846.78,-1079.39 13870.15,-1064.95 13881,-1044 13888.36,-1029.79 13887.12,-1022.78 13881,-1008 13872.34,-987.09 13853.66,-992.91 13845,-972 13838.88,-957.22 13834.64,-948.19 13845,-936 13862.23,-915.73 14026.23,-896.92 14114.46,-888.16"/>
+<polygon fill="black" stroke="black" points="14114.74,-891.65 14124.35,-887.19 14114.06,-884.68 14114.74,-891.65"/>
+</g>
+<!-- free&#45;&gt;distributive -->
+<g id="edge354" class="edge">
+<title>free&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M13832.96,-1095.98C13978.22,-1090.4 14662.72,-1063.16 14703,-1044 14722.6,-1034.68 14719.46,-1022.05 14736,-1008 14758.27,-989.09 14777.11,-997.7 14791,-972 14798.61,-957.93 14801.15,-948.37 14791,-936 14738.97,-872.6 14677.93,-945.96 14610,-900 14587.96,-885.09 14572.34,-858.72 14562.9,-838.54"/>
+<polygon fill="black" stroke="black" points="14566.14,-837.2 14558.91,-829.46 14559.73,-840.02 14566.14,-837.2"/>
+</g>
+<!-- free&#45;&gt;profunctors -->
+<g id="edge358" class="edge">
+<title>free&#45;&gt;profunctors</title>
+<path fill="none" stroke="black" d="M13832.77,-1094.75C13948.26,-1085.05 14405.63,-1046.61 14575.25,-1032.36"/>
+<polygon fill="black" stroke="black" points="14575.3,-1035.87 14584.98,-1031.54 14574.72,-1028.89 14575.3,-1035.87"/>
+</g>
+<!-- free&#45;&gt;semigroupoids -->
+<g id="edge359" class="edge">
+<title>free&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M13806,-1079.7C13806,-1072.41 13806,-1063.73 13806,-1055.54"/>
+<polygon fill="black" stroke="black" points="13809.5,-1055.62 13806,-1045.62 13802.5,-1055.62 13809.5,-1055.62"/>
+</g>
+<!-- free&#45;&gt;exceptions -->
+<g id="edge355" class="edge">
+<title>free&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M13778.89,-1095.09C13724.77,-1091.38 13599.46,-1083.25 13494,-1080 12394.72,-1046.07 9643.31,-1101.38 8545,-1044 8462.61,-1039.7 7884.45,-997.53 7806,-972 7596.09,-903.69 7584.55,-797.89 7378,-720 7306.21,-692.93 7218.52,-679.14 7161.29,-672.52"/>
+<polygon fill="black" stroke="black" points="7161.74,-669.05 7151.42,-671.42 7160.97,-676 7161.74,-669.05"/>
+</g>
+<!-- free&#45;&gt;indexed&#45;traversable -->
+<g id="edge356" class="edge">
+<title>free&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M13778.92,-1095.15C13668.29,-1087.19 13240.31,-1052.57 12898,-972 12814.39,-952.32 12578,-867.96 12472.71,-829.83"/>
+<polygon fill="black" stroke="black" points="12474.05,-826.6 12463.46,-826.48 12471.66,-833.18 12474.05,-826.6"/>
+</g>
+<!-- th&#45;abstraction -->
+<g id="node66" class="node">
+<title>th&#45;abstraction</title>
+<ellipse fill="none" stroke="black" cx="13588" cy="-882" rx="61.54" ry="18"/>
+<text text-anchor="middle" x="13588" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">th&#45;abstraction</text>
+</g>
+<!-- free&#45;&gt;th&#45;abstraction -->
+<g id="edge361" class="edge">
+<title>free&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M13779.72,-1093.52C13724.81,-1084.67 13598.65,-1055.74 13546,-972 13533.1,-951.49 13547.38,-926.4 13562.68,-908.09"/>
+<polygon fill="black" stroke="black" points="13565.12,-910.62 13569.16,-900.83 13559.89,-905.96 13565.12,-910.62"/>
+</g>
+<!-- transformers&#45;base -->
+<g id="node119" class="node">
+<title>transformers&#45;base</title>
+<ellipse fill="none" stroke="black" cx="15148" cy="-882" rx="77.51" ry="18"/>
+<text text-anchor="middle" x="15148" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">transformers&#45;base</text>
+</g>
+<!-- free&#45;&gt;transformers&#45;base -->
+<g id="edge363" class="edge">
+<title>free&#45;&gt;transformers&#45;base</title>
+<path fill="none" stroke="black" d="M13833.03,-1096.37C13966.47,-1093.1 14555.86,-1077.04 14736,-1044 14879.63,-1017.66 15037.19,-941.62 15108.75,-904.25"/>
+<polygon fill="black" stroke="black" points="15110.12,-907.49 15117.33,-899.73 15106.86,-901.29 15110.12,-907.49"/>
+</g>
+<!-- profunctors&#45;&gt;base -->
+<g id="edge607" class="edge">
+<title>profunctors&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14679.27,-1013.57C14721.99,-1001.05 14784.26,-981.48 14791,-972 14801.8,-956.8 14836.06,-905.88 14727,-504 14707.17,-430.93 14704.68,-391.86 14636,-360 14563.92,-326.56 9180.52,-308.74 8668.93,-307.12"/>
+<polygon fill="black" stroke="black" points="8668.96,-303.62 8658.95,-307.09 8668.93,-310.62 8668.96,-303.62"/>
+</g>
+<!-- profunctors&#45;&gt;transformers -->
+<g id="edge614" class="edge">
+<title>profunctors&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M14671.81,-1011.15C14687.95,-1002.46 14705.85,-989.54 14715,-972 14722.4,-957.81 14725.04,-948.46 14715,-936 14667.61,-877.23 14621.43,-921.28 14549,-900 14373.72,-848.51 14326.63,-839.22 14164,-756 14138.32,-742.86 14136.8,-730.66 14110,-720 14021.6,-684.85 13989.39,-713.68 13899,-684 13797.4,-650.64 13787.46,-603.05 13684,-576 13579.53,-548.69 12833.04,-529.77 12600.78,-524.49"/>
+<polygon fill="black" stroke="black" points="12601.06,-521 12590.98,-524.27 12600.9,-528 12601.06,-521"/>
+</g>
+<!-- profunctors&#45;&gt;comonad -->
+<g id="edge610" class="edge">
+<title>profunctors&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M14661.66,-1009.53C14686.19,-990.95 14719.14,-959.37 14698,-936 14682.29,-918.64 14358.47,-895.42 14225.87,-886.6"/>
+<polygon fill="black" stroke="black" points="14226.5,-883.14 14216.29,-885.97 14226.03,-890.12 14226.5,-883.14"/>
+</g>
+<!-- profunctors&#45;&gt;contravariant -->
+<g id="edge611" class="edge">
+<title>profunctors&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M14613.4,-1009.81C14596.81,-999.97 14574.97,-987.02 14556.7,-976.18"/>
+<polygon fill="black" stroke="black" points="14558.65,-973.27 14548.26,-971.17 14555.08,-979.29 14558.65,-973.27"/>
+</g>
+<!-- profunctors&#45;&gt;distributive -->
+<g id="edge612" class="edge">
+<title>profunctors&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M14681.02,-1014.09C14716.44,-1003.95 14763.08,-988.02 14774,-972 14783.01,-958.78 14784.27,-948.27 14774,-936 14715.45,-866.09 14637.91,-963.03 14572,-900 14555.98,-884.68 14551.5,-859.51 14550.73,-839.84"/>
+<polygon fill="black" stroke="black" points="14554.23,-839.93 14550.67,-829.95 14547.23,-839.98 14554.23,-839.93"/>
+</g>
+<!-- profunctors&#45;&gt;tagged -->
+<g id="edge613" class="edge">
+<title>profunctors&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M14634.69,-1007.83C14628.44,-986.93 14614.71,-952.38 14589,-936 14499.91,-879.23 14220.16,-910.03 14115,-900 13835.77,-873.37 13766.07,-864.85 13488,-828 13381.29,-813.86 13112.58,-785.28 13009,-756 13007.61,-755.61 13006.21,-755.18 13004.8,-754.72"/>
+<polygon fill="black" stroke="black" points="13006.06,-751.46 12995.47,-751.3 13003.65,-758.03 13006.06,-751.46"/>
+</g>
+<!-- profunctors&#45;&gt;base&#45;orphans -->
+<g id="edge608" class="edge">
+<title>profunctors&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M14689.18,-1018.52C14834.09,-999.51 15251.23,-942.52 15382,-900 15450.8,-877.63 15489.79,-889.44 15528,-828 15539.41,-809.65 15534.43,-785.2 15527.43,-766.56"/>
+<polygon fill="black" stroke="black" points="15530.72,-765.37 15523.64,-757.49 15524.26,-768.06 15530.72,-765.37"/>
+</g>
+<!-- bifunctors -->
+<g id="node96" class="node">
+<title>bifunctors</title>
+<ellipse fill="none" stroke="black" cx="13293" cy="-954" rx="48.57" ry="18"/>
+<text text-anchor="middle" x="13293" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">bifunctors</text>
+</g>
+<!-- profunctors&#45;&gt;bifunctors -->
+<g id="edge609" class="edge">
+<title>profunctors&#45;&gt;bifunctors</title>
+<path fill="none" stroke="black" d="M14585.4,-1022.21C14371.06,-1011.07 13576.31,-969.73 13352.19,-958.08"/>
+<polygon fill="black" stroke="black" points="13352.7,-954.6 13342.53,-957.58 13352.34,-961.59 13352.7,-954.6"/>
+</g>
+<!-- semigroupoids&#45;&gt;base -->
+<g id="edge648" class="edge">
+<title>semigroupoids&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13863.96,-1017.3C13918.68,-1009.14 14002.61,-994.32 14073,-972 14110.55,-960.09 14117.35,-950.46 14154,-936 14199.5,-918.05 14219.69,-930.41 14258,-900 14409.24,-779.92 14474,-716.11 14474,-523 14474,-523 14474,-523 14474,-449 14474,-393.06 14436.58,-381.65 14385,-360 14244.77,-301.16 9163.59,-306.3 8668.67,-306.95"/>
+<polygon fill="black" stroke="black" points="8668.72,-303.45 8658.73,-306.96 8668.73,-310.45 8668.72,-303.45"/>
+</g>
+<!-- semigroupoids&#45;&gt;template&#45;haskell -->
+<g id="edge657" class="edge">
+<title>semigroupoids&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M13741.66,-1021.94C13599.4,-1014.79 13267.13,-995.75 13222,-972 13093.24,-904.23 13143.48,-784.41 13013,-720 12920.17,-674.18 12184.74,-696.71 12082,-684 12004.92,-674.47 11988.03,-657.94 11911,-648 11529.44,-598.74 11066.26,-594.44 10899.57,-594.64"/>
+<polygon fill="black" stroke="black" points="10900.06,-591.13 10890.07,-594.65 10900.08,-598.13 10900.06,-591.13"/>
+</g>
+<!-- semigroupoids&#45;&gt;containers -->
+<g id="edge652" class="edge">
+<title>semigroupoids&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M13742.3,-1021.27C13602.78,-1012.84 13273.9,-991.55 13164,-972 12868.45,-919.42 12810.07,-835.16 12513,-792 12091.79,-730.8 11018.03,-824.79 10598,-756 10545.57,-747.41 10536.29,-729.45 10484,-720 10297.63,-686.3 9712.47,-671.96 9522.91,-668.11"/>
+<polygon fill="black" stroke="black" points="9523.11,-664.62 9513.04,-667.92 9522.97,-671.62 9523.11,-664.62"/>
+</g>
+<!-- semigroupoids&#45;&gt;transformers -->
+<g id="edge658" class="edge">
+<title>semigroupoids&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M13796.97,-1007.75C13788.2,-988.33 13778.32,-956.79 13794,-936 13829.07,-889.5 13884.93,-946.5 13920,-900 13929.64,-887.23 13926.81,-878.48 13920,-864 13877.27,-773.17 13834.28,-767.78 13746,-720 13698.53,-694.3 13677.45,-709.74 13630,-684 13563.98,-648.18 13569.92,-603.44 13500,-576 13417.01,-543.43 12808.36,-528.47 12600.98,-524.28"/>
+<polygon fill="black" stroke="black" points="12601.24,-520.78 12591.17,-524.08 12601.1,-527.78 12601.24,-520.78"/>
+</g>
+<!-- semigroupoids&#45;&gt;comonad -->
+<g id="edge651" class="edge">
+<title>semigroupoids&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M13801.46,-1007.81C13797.32,-987.86 13794.25,-955.23 13812,-936 13832.18,-914.15 14018.37,-895.63 14113.94,-887.46"/>
+<polygon fill="black" stroke="black" points="14114.23,-890.95 14123.9,-886.62 14113.64,-883.98 14114.23,-890.95"/>
+</g>
+<!-- semigroupoids&#45;&gt;contravariant -->
+<g id="edge653" class="edge">
+<title>semigroupoids&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M13865.11,-1017.81C13892.96,-1014.55 13926.66,-1010.82 13957,-1008 14174.87,-987.76 14231.68,-1004.91 14448,-972 14453.95,-971.09 14460.13,-969.96 14466.27,-968.71"/>
+<polygon fill="black" stroke="black" points="14466.69,-972.2 14475.73,-966.68 14465.22,-965.36 14466.69,-972.2"/>
+</g>
+<!-- semigroupoids&#45;&gt;distributive -->
+<g id="edge654" class="edge">
+<title>semigroupoids&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M13864.02,-1017.38C13946.22,-1006.33 14092.32,-985.69 14144,-972 14231.3,-948.88 14249.97,-933.07 14334,-900 14395.19,-875.92 14465.56,-846.96 14509.41,-828.76"/>
+<polygon fill="black" stroke="black" points="14510.68,-832.02 14518.57,-824.96 14507.99,-825.56 14510.68,-832.02"/>
+</g>
+<!-- semigroupoids&#45;&gt;tagged -->
+<g id="edge656" class="edge">
+<title>semigroupoids&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M13762.18,-1012.24C13740.33,-1003.9 13715,-990.98 13698,-972 13663.95,-933.99 13699.58,-894.94 13659,-864 13577.99,-802.23 13297.3,-863.99 13202,-828 13177.05,-818.58 13178.09,-803.44 13154,-792 13094.02,-763.51 13071.98,-777.05 13009,-756 13007.67,-755.56 13006.33,-755.09 13004.97,-754.6"/>
+<polygon fill="black" stroke="black" points="13006.59,-751.47 12996,-751.13 13004.07,-758 13006.59,-751.47"/>
+</g>
+<!-- semigroupoids&#45;&gt;transformers&#45;compat -->
+<g id="edge659" class="edge">
+<title>semigroupoids&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M13865.78,-1018.19C13987.58,-1004.29 14253.48,-973.81 14258,-972 14282.76,-962.11 14280.86,-944.89 14306,-936 14515.66,-861.9 15101.4,-987.09 15306,-900 15322.3,-893.06 15353.98,-860.25 15375.56,-836.48"/>
+<polygon fill="black" stroke="black" points="15377.91,-839.1 15381.99,-829.32 15372.7,-834.42 15377.91,-839.1"/>
+</g>
+<!-- semigroupoids&#45;&gt;hashable -->
+<g id="edge655" class="edge">
+<title>semigroupoids&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M13740.32,-1024.66C13131.53,-1021.44 8494.47,-996.15 8429,-972 8405.62,-963.37 8408.85,-945.96 8386,-936 8268.56,-884.8 8225.37,-926.4 8100,-900 8095.69,-899.09 8091.23,-898.02 8086.8,-896.85"/>
+<polygon fill="black" stroke="black" points="8087.95,-893.54 8077.38,-894.23 8086.07,-900.28 8087.95,-893.54"/>
+</g>
+<!-- semigroupoids&#45;&gt;unordered&#45;containers -->
+<g id="edge660" class="edge">
+<title>semigroupoids&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M13740.23,-1024.75C13281.55,-1022.92 10554.59,-1010.56 9726,-972 9686.22,-970.15 9642.34,-966.84 9604.86,-963.63"/>
+<polygon fill="black" stroke="black" points="9605.22,-960.15 9594.96,-962.77 9604.62,-967.12 9605.22,-960.15"/>
+</g>
+<!-- semigroupoids&#45;&gt;base&#45;orphans -->
+<g id="edge649" class="edge">
+<title>semigroupoids&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M13865.52,-1018.21C13893.31,-1015.06 13926.84,-1011.3 13957,-1008 14107.62,-991.52 14146.56,-996.98 14296,-972 14366.61,-960.2 14382.04,-945.49 14453,-936 14550.77,-922.92 15248.2,-936.09 15340,-900 15362.88,-891 15360.53,-875.97 15382,-864 15428.04,-838.34 15459.6,-867.05 15495,-828 15509.69,-811.79 15514.05,-787.08 15514.95,-767.8"/>
+<polygon fill="black" stroke="black" points="15518.45,-767.91 15515.1,-757.86 15511.45,-767.81 15518.45,-767.91"/>
+</g>
+<!-- semigroupoids&#45;&gt;bifunctors -->
+<g id="edge650" class="edge">
+<title>semigroupoids&#45;&gt;bifunctors</title>
+<path fill="none" stroke="black" d="M13748.15,-1017.11C13648.84,-1003.56 13447.16,-976.04 13349.08,-962.65"/>
+<polygon fill="black" stroke="black" points="13349.81,-959.22 13339.43,-961.34 13348.87,-966.16 13349.81,-959.22"/>
+</g>
+<!-- semigroups&#45;&gt;base -->
+<g id="edge661" class="edge">
+<title>semigroups&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M15550.39,-577.36C15520.51,-557.41 15465.59,-523.19 15414,-504 15339.17,-476.17 15310.82,-500.75 15238,-468 15213.68,-457.06 15214.06,-443.5 15190,-432 15131.26,-403.92 15106.74,-424.08 15048,-396 15023.94,-384.5 15025.26,-368.54 15000,-360 14840.13,-305.97 9191.73,-306.79 8668.72,-306.98"/>
+<polygon fill="black" stroke="black" points="8668.83,-303.48 8658.84,-306.99 8668.84,-310.48 8668.83,-303.48"/>
+</g>
+<!-- tagged&#45;&gt;base -->
+<g id="edge705" class="edge">
+<title>tagged&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13003.82,-734.87C13130.16,-727.04 13560.18,-699.52 13620,-684 13819.88,-632.15 14098.29,-506.74 13953,-360 13903.6,-310.11 9148.26,-307.18 8668.86,-307.01"/>
+<polygon fill="black" stroke="black" points="8668.93,-303.51 8658.93,-307.01 8668.93,-310.51 8668.93,-303.51"/>
+</g>
+<!-- tagged&#45;&gt;template&#45;haskell -->
+<g id="edge707" class="edge">
+<title>tagged&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M12934.04,-735.68C12812.41,-730.96 12396.43,-713.52 12054,-684 11914.05,-671.93 11879.95,-660.12 11740,-648 11425.16,-620.74 11047.39,-603.61 10899.63,-597.51"/>
+<polygon fill="black" stroke="black" points="10900.2,-594.03 10890.06,-597.12 10899.91,-601.03 10900.2,-594.03"/>
+</g>
+<!-- tagged&#45;&gt;deepseq -->
+<g id="edge706" class="edge">
+<title>tagged&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M12934.89,-733.25C12704.6,-708.07 11352.91,-563.03 10248,-504 9272.98,-451.91 8080.18,-450.5 7816.3,-450.87"/>
+<polygon fill="black" stroke="black" points="7816.31,-447.37 7806.31,-450.89 7816.32,-454.37 7816.31,-447.37"/>
+</g>
+<!-- tagged&#45;&gt;transformers -->
+<g id="edge708" class="edge">
+<title>tagged&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M12947.43,-723.44C12900.11,-694.04 12783.07,-623.28 12679,-576 12647.57,-561.72 12611.07,-548.54 12582.3,-538.9"/>
+<polygon fill="black" stroke="black" points="12583.71,-535.68 12573.12,-535.86 12581.51,-542.32 12583.71,-535.68"/>
+</g>
+<!-- transformers&#45;compat&#45;&gt;base -->
+<g id="edge796" class="edge">
+<title>transformers&#45;compat&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M15323.15,-800.16C15246.34,-786.43 15138,-751.99 15138,-667 15138,-667 15138,-667 15138,-593 15138,-480.15 15012.99,-527.32 14917,-468 14868.24,-437.87 14854.74,-431.83 14810,-396 14791.84,-381.46 14793.57,-368.7 14772,-360 14621.22,-299.16 9180.23,-306.15 8668.52,-306.94"/>
+<polygon fill="black" stroke="black" points="8668.86,-303.44 8658.86,-306.95 8668.87,-310.44 8668.86,-303.44"/>
+</g>
+<!-- transformers&#45;compat&#45;&gt;ghc&#45;prim -->
+<g id="edge797" class="edge">
+<title>transformers&#45;compat&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M15403.5,-791.79C15410.4,-772.41 15423.83,-740.9 15444,-720 15512,-649.56 15573.05,-686.99 15636,-612 15727.72,-502.74 15736,-449.66 15736,-307 15736,-307 15736,-307 15736,-233 15736,-192.03 15743.16,-170.6 15712,-144 15677.84,-114.83 15374.32,-98.22 15258.57,-92.9"/>
+<polygon fill="black" stroke="black" points="15258.99,-89.41 15248.84,-92.46 15258.67,-96.41 15258.99,-89.41"/>
+</g>
+<!-- transformers&#45;compat&#45;&gt;transformers -->
+<g id="edge798" class="edge">
+<title>transformers&#45;compat&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M15321.64,-800.56C15265.74,-792.87 15188.68,-779.1 15124,-756 15028.87,-722.02 15020.55,-677.73 14924,-648 14774.12,-601.86 14378.47,-586.46 14222,-576 13593.37,-533.96 12830.93,-525.16 12600.9,-523.41"/>
+<polygon fill="black" stroke="black" points="12601.25,-519.91 12591.22,-523.34 12601.19,-526.91 12601.25,-519.91"/>
+</g>
+<!-- void&#45;&gt;base -->
+<g id="edge823" class="edge">
+<title>void&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M15323.09,-511.23C15316.98,-508.69 15310.29,-506.09 15304,-504 15242.21,-483.48 15224.1,-487.57 15162,-468 15075.87,-440.86 15055.88,-429.44 14972,-396 14933.51,-380.66 14926.59,-368.33 14886,-360 14723.73,-326.69 9186.81,-308.73 8668.78,-307.12"/>
+<polygon fill="black" stroke="black" points="8669,-303.62 8658.99,-307.09 8668.98,-310.62 8669,-303.62"/>
+</g>
+<!-- aeson&#45;&gt;base -->
+<g id="edge73" class="edge">
+<title>aeson&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10590.37,-1528.67C10948.2,-1525 14160.14,-1491.76 14582,-1476 14842.09,-1466.28 15536.38,-1551.23 15751,-1404 15925.46,-1284.32 15871.89,-1144.83 15838,-936 15832.6,-902.7 15832.74,-892.05 15814,-864 15786.87,-823.39 15771.71,-818.97 15731,-792 15715.84,-781.96 15601.44,-725.17 15584,-720 15457.37,-682.43 15420.02,-700.74 15289,-684 14929.18,-638.03 14841.39,-607.38 14480,-576 14381.62,-567.46 13678.91,-586.89 13592,-540 13505.38,-493.27 13550.3,-405.45 13463,-360 13350.26,-301.31 9119.52,-306.24 8668.78,-306.94"/>
+<polygon fill="black" stroke="black" points="8668.91,-303.44 8658.91,-306.95 8668.92,-310.44 8668.91,-303.44"/>
+</g>
+<!-- aeson&#45;&gt;ghc&#45;prim -->
+<g id="edge82" class="edge">
+<title>aeson&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M10590.4,-1528.99C11022.71,-1528.87 15640.57,-1526.42 15920,-1476 16034.42,-1455.35 16166,-1503.27 16166,-1387 16166,-1387 16166,-1387 16166,-1313 16166,-1226.57 16318,-1041.43 16318,-955 16318,-955 16318,-955 16318,-233 16318,-191.68 16521.04,-235.77 16119,-144 15952.28,-105.95 15416.48,-94.31 15258.34,-91.66"/>
+<polygon fill="black" stroke="black" points="15258.76,-88.16 15248.7,-91.5 15258.64,-95.16 15258.76,-88.16"/>
+</g>
+<!-- aeson&#45;&gt;template&#45;haskell -->
+<g id="edge93" class="edge">
+<title>aeson&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M10581.61,-1517.34C10586,-1515.4 10590.59,-1513.53 10595,-1512 10658.94,-1489.77 10684.27,-1509.67 10743,-1476 10829.85,-1426.2 11331.49,-920.82 11369,-828 11405.31,-738.15 11173.35,-695.24 11037,-648 10991.9,-632.37 10939.75,-618.75 10899.88,-609.23"/>
+<polygon fill="black" stroke="black" points="10900.72,-605.83 10890.18,-606.94 10899.11,-612.64 10900.72,-605.83"/>
+</g>
+<!-- aeson&#45;&gt;bytestring -->
+<g id="edge74" class="edge">
+<title>aeson&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M10525.49,-1528.91C10006.17,-1527.51 3439.26,-1509.17 3349,-1476 3325.61,-1467.4 3329.05,-1449.48 3306,-1440 3217.11,-1403.44 2946.74,-1467.96 2875,-1404 2765.37,-1306.27 2849.49,-1221.46 2810,-1080 2805.43,-1063.62 2802.27,-1060.17 2797,-1044 2786.67,-1012.31 2780.71,-1005 2776,-972 2769.18,-924.28 2766.87,-908.25 2786,-864 2802.31,-826.28 2808.84,-813.27 2844,-792 2914.55,-749.33 2952.74,-793.84 3026,-756 3046.67,-745.32 3043.87,-731.67 3064,-720 3102.03,-697.95 3150.09,-684.29 3186.38,-676.36"/>
+<polygon fill="black" stroke="black" points="3186.69,-679.88 3195.75,-674.4 3185.25,-673.03 3186.69,-679.88"/>
+</g>
+<!-- aeson&#45;&gt;containers -->
+<g id="edge76" class="edge">
+<title>aeson&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M10558,-1511.51C10558,-1484.71 10558,-1431.87 10558,-1387 10558,-1387 10558,-1387 10558,-1097 10558,-1048.79 10535.06,-1036.26 10496,-1008 10447.25,-972.73 10032.53,-877.92 9974,-864 9901.4,-846.74 9881.53,-849.28 9810,-828 9723.44,-802.25 9699.13,-799.52 9620,-756 9596.63,-743.15 9594.76,-733.89 9572,-720 9550.43,-706.84 9525.12,-694.36 9504.32,-684.83"/>
+<polygon fill="black" stroke="black" points="9505.83,-681.67 9495.27,-680.74 9502.95,-688.05 9505.83,-681.67"/>
+</g>
+<!-- aeson&#45;&gt;deepseq -->
+<g id="edge78" class="edge">
+<title>aeson&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M10525.71,-1528.18C10374.87,-1524.28 9724.53,-1506.42 9192,-1476 8979.74,-1463.88 8927.26,-1452.05 8715,-1440 8662.6,-1437.02 7813.13,-1435.3 7771,-1404 7553.69,-1242.57 7617.61,-1095 7573,-828 7570.36,-812.22 7567.89,-807.16 7573,-792 7595.28,-725.87 7668,-736.78 7668,-667 7668,-667 7668,-667 7668,-593 7668,-544.08 7707.44,-499.25 7735.49,-473.55"/>
+<polygon fill="black" stroke="black" points="7737.48,-476.46 7742.64,-467.21 7732.84,-471.22 7737.48,-476.46"/>
+</g>
+<!-- aeson&#45;&gt;time -->
+<g id="edge99" class="edge">
+<title>aeson&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M10525.83,-1529.01C10258.4,-1528.96 8400.24,-1526.77 7843,-1476 7349.65,-1431.05 7233.8,-1363.32 6743,-1296 6311.5,-1236.81 6188.01,-1306.86 5769,-1188 5655.5,-1155.8 5624.91,-1131.7 5546,-1044 5526.88,-1022.75 5506.33,-997.45 5491.92,-979.27"/>
+<polygon fill="black" stroke="black" points="5494.86,-977.35 5485.92,-971.66 5489.36,-981.68 5494.86,-977.35"/>
+</g>
+<!-- aeson&#45;&gt;text -->
+<g id="edge94" class="edge">
+<title>aeson&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M10525.49,-1529.13C10394.53,-1529.3 9905.69,-1526.46 9761,-1476 9353.86,-1334.01 9361.86,-1078.78 8955,-936 8830.37,-892.26 8779.51,-956.25 8660,-900 8638.95,-890.09 8641.29,-877 8622,-864 8590,-842.44 8577.61,-845.06 8543,-828 8542.53,-827.77 8542.07,-827.54 8541.59,-827.3"/>
+<polygon fill="black" stroke="black" points="8543.4,-824.3 8532.91,-822.85 8540.21,-830.53 8543.4,-824.3"/>
+</g>
+<!-- aeson&#45;&gt;OneTuple -->
+<g id="edge71" class="edge">
+<title>aeson&#45;&gt;OneTuple</title>
+<path fill="none" stroke="black" d="M10590.24,-1528.64C11018,-1523.77 15559.91,-1470.57 15678,-1404 15745.97,-1365.68 15748,-1321.03 15748,-1243 15748,-1243 15748,-1243 15748,-1097 15748,-1012.77 15720.33,-979.17 15648,-936 15535.78,-869.02 15179.8,-954.46 15061,-900 15047.94,-894.01 14912.13,-750.24 14857.04,-691.58"/>
+<polygon fill="black" stroke="black" points="14859.65,-689.25 14850.25,-684.35 14854.54,-694.04 14859.65,-689.25"/>
+</g>
+<!-- aeson&#45;&gt;QuickCheck -->
+<g id="edge72" class="edge">
+<title>aeson&#45;&gt;QuickCheck</title>
+<path fill="none" stroke="black" d="M10565.51,-1512.34C10576.58,-1486.2 10596,-1433.7 10596,-1387 10596,-1387 10596,-1387 10596,-1097 10596,-965.66 10443.6,-870 10368.22,-830.73"/>
+<polygon fill="black" stroke="black" points="10369.96,-827.69 10359.47,-826.25 10366.78,-833.92 10369.96,-827.69"/>
+</g>
+<!-- aeson&#45;&gt;tagged -->
+<g id="edge92" class="edge">
+<title>aeson&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M10590.13,-1527.63C10759.03,-1520.41 11540.48,-1486.67 11648,-1476 11862.23,-1454.75 11917.84,-1454.97 12127,-1404 12223.27,-1380.54 12246.7,-1370.5 12338,-1332 12644.41,-1202.79 12667.93,-1074.63 12891,-828 12910.66,-806.26 12932.63,-781.11 12948.23,-763.11"/>
+<polygon fill="black" stroke="black" points="12950.46,-765.89 12954.35,-756.03 12945.16,-761.31 12950.46,-765.89"/>
+</g>
+<!-- character&#45;ps -->
+<g id="node50" class="node">
+<title>character&#45;ps</title>
+<ellipse fill="none" stroke="black" cx="14939" cy="-594" rx="56.55" ry="18"/>
+<text text-anchor="middle" x="14939" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">character&#45;ps</text>
+</g>
+<!-- aeson&#45;&gt;character&#45;ps -->
+<g id="edge75" class="edge">
+<title>aeson&#45;&gt;character&#45;ps</title>
+<path fill="none" stroke="black" d="M10590.46,-1528.67C10761.79,-1526.93 11578.2,-1518.66 12246,-1512 12296.67,-1511.49 15855.95,-1509.46 15894,-1476 15942.52,-1433.33 15909.54,-1396.46 15914,-1332 15930.71,-1090.21 16017.18,-955.2 15838,-792 15776.13,-735.64 15744.4,-743.25 15664,-720 15538.89,-683.82 15153.01,-625.95 15001.24,-603.92"/>
+<polygon fill="black" stroke="black" points="15001.76,-600.46 14991.36,-602.49 15000.75,-607.38 15001.76,-600.46"/>
+</g>
+<!-- data&#45;fix -->
+<g id="node51" class="node">
+<title>data&#45;fix</title>
+<ellipse fill="none" stroke="black" cx="8115" cy="-954" rx="38.59" ry="18"/>
+<text text-anchor="middle" x="8115" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">data&#45;fix</text>
+</g>
+<!-- aeson&#45;&gt;data&#45;fix -->
+<g id="edge77" class="edge">
+<title>aeson&#45;&gt;data&#45;fix</title>
+<path fill="none" stroke="black" d="M10525.66,-1528.62C10361.12,-1526.5 9615.74,-1514.88 9388,-1476 8951,-1401.4 8844.98,-1351.73 8433,-1188 8366.5,-1161.57 8347.85,-1156.7 8289,-1116 8228.72,-1074.31 8168.11,-1012.71 8136.79,-979.08"/>
+<polygon fill="black" stroke="black" points="8139.5,-976.85 8130.15,-971.88 8134.36,-981.6 8139.5,-976.85"/>
+</g>
+<!-- dlist -->
+<g id="node52" class="node">
+<title>dlist</title>
+<ellipse fill="none" stroke="black" cx="10212" cy="-522" rx="27" ry="18"/>
+<text text-anchor="middle" x="10212" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">dlist</text>
+</g>
+<!-- aeson&#45;&gt;dlist -->
+<g id="edge79" class="edge">
+<title>aeson&#45;&gt;dlist</title>
+<path fill="none" stroke="black" d="M10572.9,-1513.61C10581.64,-1503.67 10592.09,-1490.02 10598,-1476 10610.58,-1446.17 10606.32,-1436.26 10609,-1404 10623.56,-1228.48 10662.34,-1170.33 10594,-1008 10506.65,-800.54 10305.53,-607.05 10236.09,-544.24"/>
+<polygon fill="black" stroke="black" points="10238.83,-542 10229.05,-537.92 10234.15,-547.2 10238.83,-542"/>
+</g>
+<!-- aeson&#45;&gt;exceptions -->
+<g id="edge80" class="edge">
+<title>aeson&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M10525.74,-1527.89C10372.89,-1522.62 9706.29,-1499.34 9160,-1476 9117.94,-1474.2 7682.8,-1424.46 7646,-1404 7561.1,-1356.78 7578.41,-1303.09 7522,-1224 7481.59,-1167.33 7194.36,-773.64 7150,-720 7142.09,-710.44 7132.97,-700.35 7124.76,-691.56"/>
+<polygon fill="black" stroke="black" points="7127.39,-689.25 7117.97,-684.39 7122.3,-694.06 7127.39,-689.25"/>
+</g>
+<!-- generically -->
+<g id="node54" class="node">
+<title>generically</title>
+<ellipse fill="none" stroke="black" cx="11092" cy="-1314" rx="49.57" ry="18"/>
+<text text-anchor="middle" x="11092" y="-1308.58" font-family="Times New Roman,serif" font-size="14.00">generically</text>
+</g>
+<!-- aeson&#45;&gt;generically -->
+<g id="edge81" class="edge">
+<title>aeson&#45;&gt;generically</title>
+<path fill="none" stroke="black" d="M10589.96,-1527.2C10638.56,-1523.38 10732.91,-1511.61 10804,-1476 10869.34,-1443.27 10864.38,-1403.97 10928,-1368 10947.7,-1356.86 11001.39,-1340.38 11042.01,-1328.76"/>
+<polygon fill="black" stroke="black" points="11042.96,-1332.13 11051.63,-1326.03 11041.05,-1325.39 11042.96,-1332.13"/>
+</g>
+<!-- aeson&#45;&gt;hashable -->
+<g id="edge83" class="edge">
+<title>aeson&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M10525.6,-1528.44C10377.52,-1525.69 9764.19,-1512.27 9576,-1476 8988.92,-1362.84 8837.26,-1310.39 8302,-1044 8251.01,-1018.63 8239.09,-1009.24 8196,-972 8179.58,-957.81 8180.64,-948.65 8163,-936 8149.65,-926.42 8113.23,-910.81 8083.99,-899"/>
+<polygon fill="black" stroke="black" points="8085.58,-895.87 8075,-895.4 8082.98,-902.37 8085.58,-895.87"/>
+</g>
+<!-- aeson&#45;&gt;indexed&#45;traversable -->
+<g id="edge84" class="edge">
+<title>aeson&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M10590.14,-1527.62C10758.82,-1520.37 11536.13,-1486.47 11586,-1476 11602.57,-1472.52 11855.02,-1373.59 11871,-1368 12019.05,-1316.19 12088.92,-1363.25 12207,-1260 12215.81,-1252.29 12363.33,-935.29 12408.17,-838.67"/>
+<polygon fill="black" stroke="black" points="12411.33,-840.18 12412.36,-829.63 12404.98,-837.23 12411.33,-840.18"/>
+</g>
+<!-- integer&#45;conversion -->
+<g id="node57" class="node">
+<title>integer&#45;conversion</title>
+<ellipse fill="none" stroke="black" cx="11023" cy="-882" rx="79.01" ry="18"/>
+<text text-anchor="middle" x="11023" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">integer&#45;conversion</text>
+</g>
+<!-- aeson&#45;&gt;integer&#45;conversion -->
+<g id="edge85" class="edge">
+<title>aeson&#45;&gt;integer&#45;conversion</title>
+<path fill="none" stroke="black" d="M10582.18,-1517.6C10586.43,-1515.68 10590.83,-1513.75 10595,-1512 10636.65,-1494.56 10657.19,-1507.02 10690,-1476 10728.17,-1439.91 10710.52,-1412.77 10738,-1368 10813.53,-1244.96 10872.92,-1242.23 10943,-1116 10981.31,-1047.01 11005.95,-956.43 11016.73,-911.22"/>
+<polygon fill="black" stroke="black" points="11020.09,-912.24 11018.94,-901.71 11013.27,-910.66 11020.09,-912.24"/>
+</g>
+<!-- integer&#45;logarithms -->
+<g id="node58" class="node">
+<title>integer&#45;logarithms</title>
+<ellipse fill="none" stroke="black" cx="10604" cy="-450" rx="76.51" ry="18"/>
+<text text-anchor="middle" x="10604" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">integer&#45;logarithms</text>
+</g>
+<!-- aeson&#45;&gt;integer&#45;logarithms -->
+<g id="edge86" class="edge">
+<title>aeson&#45;&gt;integer&#45;logarithms</title>
+<path fill="none" stroke="black" d="M10578.69,-1515.86C10591.68,-1506.42 10607.51,-1492.5 10616,-1476 10660.23,-1390.02 10633.54,-1356.32 10642,-1260 10657.41,-1084.66 10656.13,-1039.78 10647,-864 10639.47,-718.96 10617.16,-546.43 10608,-479.5"/>
+<polygon fill="black" stroke="black" points="10611.49,-479.19 10606.65,-469.76 10604.55,-480.15 10611.49,-479.19"/>
+</g>
+<!-- network&#45;uri -->
+<g id="node59" class="node">
+<title>network&#45;uri</title>
+<ellipse fill="none" stroke="black" cx="6751" cy="-954" rx="53.06" ry="18"/>
+<text text-anchor="middle" x="6751" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">network&#45;uri</text>
+</g>
+<!-- aeson&#45;&gt;network&#45;uri -->
+<g id="edge87" class="edge">
+<title>aeson&#45;&gt;network&#45;uri</title>
+<path fill="none" stroke="black" d="M10525.62,-1528.54C10221.38,-1524.15 7869.25,-1487.61 7570,-1404 7368.6,-1347.73 7332.16,-1294.16 7152,-1188 7077.45,-1144.07 7064.44,-1124.11 6990,-1080 6921.65,-1039.5 6838.92,-997.78 6790.89,-974.24"/>
+<polygon fill="black" stroke="black" points="6792.49,-971.13 6781.97,-969.89 6789.42,-977.42 6792.49,-971.13"/>
+</g>
+<!-- primitive -->
+<g id="node60" class="node">
+<title>primitive</title>
+<ellipse fill="none" stroke="black" cx="11317" cy="-810" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="11317" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">primitive</text>
+</g>
+<!-- aeson&#45;&gt;primitive -->
+<g id="edge88" class="edge">
+<title>aeson&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M10581.68,-1517.53C10586.06,-1515.58 10590.64,-1513.65 10595,-1512 10647.09,-1492.33 10671.5,-1510.75 10715,-1476 10758.07,-1441.59 10742.97,-1412.14 10776,-1368 10947.67,-1138.62 11207.18,-906.2 11290.35,-833.88"/>
+<polygon fill="black" stroke="black" points="11292.54,-836.62 11297.81,-827.42 11287.96,-831.33 11292.54,-836.62"/>
+</g>
+<!-- scientific -->
+<g id="node61" class="node">
+<title>scientific</title>
+<ellipse fill="none" stroke="black" cx="10131" cy="-954" rx="43.58" ry="18"/>
+<text text-anchor="middle" x="10131" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">scientific</text>
+</g>
+<!-- aeson&#45;&gt;scientific -->
+<g id="edge89" class="edge">
+<title>aeson&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M10529.14,-1521.87C10475.99,-1506.83 10368,-1466.48 10368,-1387 10368,-1387 10368,-1387 10368,-1241 10368,-1125.91 10338.3,-1087.42 10255,-1008 10242.8,-996.37 10205.08,-981.05 10174.42,-969.87"/>
+<polygon fill="black" stroke="black" points="10175.94,-966.7 10165.34,-966.62 10173.57,-973.29 10175.94,-966.7"/>
+</g>
+<!-- semialign -->
+<g id="node62" class="node">
+<title>semialign</title>
+<ellipse fill="none" stroke="black" cx="11263" cy="-1458" rx="44.58" ry="18"/>
+<text text-anchor="middle" x="11263" y="-1452.58" font-family="Times New Roman,serif" font-size="14.00">semialign</text>
+</g>
+<!-- aeson&#45;&gt;semialign -->
+<g id="edge90" class="edge">
+<title>aeson&#45;&gt;semialign</title>
+<path fill="none" stroke="black" d="M10589.66,-1525.86C10700.16,-1514.88 11069.51,-1478.21 11209.02,-1464.36"/>
+<polygon fill="black" stroke="black" points="11209.12,-1467.87 11218.73,-1463.4 11208.43,-1460.9 11209.12,-1467.87"/>
+</g>
+<!-- strict -->
+<g id="node63" class="node">
+<title>strict</title>
+<ellipse fill="none" stroke="black" cx="10083" cy="-1026" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="10083" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">strict</text>
+</g>
+<!-- aeson&#45;&gt;strict -->
+<g id="edge91" class="edge">
+<title>aeson&#45;&gt;strict</title>
+<path fill="none" stroke="black" d="M10525.69,-1527.7C10453.67,-1524.18 10282.92,-1512.14 10240,-1476 10107.81,-1364.71 10086.83,-1135.35 10083.57,-1055.31"/>
+<polygon fill="black" stroke="black" points="10087.08,-1055.59 10083.25,-1045.71 10080.09,-1055.82 10087.08,-1055.59"/>
+</g>
+<!-- text&#45;iso8601 -->
+<g id="node64" class="node">
+<title>text&#45;iso8601</title>
+<ellipse fill="none" stroke="black" cx="9980" cy="-1098" rx="56.05" ry="18"/>
+<text text-anchor="middle" x="9980" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">text&#45;iso8601</text>
+</g>
+<!-- aeson&#45;&gt;text&#45;iso8601 -->
+<g id="edge95" class="edge">
+<title>aeson&#45;&gt;text&#45;iso8601</title>
+<path fill="none" stroke="black" d="M10525.68,-1529.48C10433.86,-1530.2 10173.96,-1527.54 10110,-1476 9999.67,-1387.1 9982.66,-1199.39 9980.28,-1127.68"/>
+<polygon fill="black" stroke="black" points="9983.78,-1127.86 9980.03,-1117.95 9976.78,-1128.04 9983.78,-1127.86"/>
+</g>
+<!-- text&#45;short -->
+<g id="node65" class="node">
+<title>text&#45;short</title>
+<ellipse fill="none" stroke="black" cx="9781" cy="-954" rx="46.07" ry="18"/>
+<text text-anchor="middle" x="9781" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">text&#45;short</text>
+</g>
+<!-- aeson&#45;&gt;text&#45;short -->
+<g id="edge96" class="edge">
+<title>aeson&#45;&gt;text&#45;short</title>
+<path fill="none" stroke="black" d="M10525.91,-1527.94C10400.49,-1523.61 9947.49,-1506.01 9891,-1476 9846.31,-1452.26 9820,-1437.6 9820,-1387 9820,-1387 9820,-1387 9820,-1313 9820,-1189.88 9796.92,-1044.33 9786.27,-983.72"/>
+<polygon fill="black" stroke="black" points="9789.73,-983.16 9784.52,-973.93 9782.83,-984.38 9789.73,-983.16"/>
+</g>
+<!-- aeson&#45;&gt;th&#45;abstraction -->
+<g id="edge97" class="edge">
+<title>aeson&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M10590.34,-1529.05C10771.08,-1529.11 11674.34,-1526.75 12410,-1476 12703.05,-1455.78 12786.88,-1492.45 13067,-1404 13130.35,-1384 13149.28,-1377.16 13198,-1332 13350.47,-1190.67 13286.18,-1067.76 13447,-936 13470.2,-916.99 13500.92,-904.38 13527.76,-896.24"/>
+<polygon fill="black" stroke="black" points="13528.5,-899.67 13537.14,-893.55 13526.57,-892.94 13528.5,-899.67"/>
+</g>
+<!-- these -->
+<g id="node67" class="node">
+<title>these</title>
+<ellipse fill="none" stroke="black" cx="10001" cy="-954" rx="29.61" ry="18"/>
+<text text-anchor="middle" x="10001" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">these</text>
+</g>
+<!-- aeson&#45;&gt;these -->
+<g id="edge98" class="edge">
+<title>aeson&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M10525.75,-1528.52C10447.52,-1525.5 10254,-1505.98 10254,-1387 10254,-1387 10254,-1387 10254,-1169 10254,-1076.19 10195.42,-1063.46 10121,-1008 10088.1,-983.48 10073.35,-988.97 10036,-972 10035.24,-971.65 10034.47,-971.3 10033.69,-970.95"/>
+<polygon fill="black" stroke="black" points="10035.42,-967.89 10024.88,-966.79 10032.43,-974.22 10035.42,-967.89"/>
+</g>
+<!-- time&#45;compat -->
+<g id="node68" class="node">
+<title>time&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="9979" cy="-1026" rx="57.05" ry="18"/>
+<text text-anchor="middle" x="9979" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">time&#45;compat</text>
+</g>
+<!-- aeson&#45;&gt;time&#45;compat -->
+<g id="edge100" class="edge">
+<title>aeson&#45;&gt;time&#45;compat</title>
+<path fill="none" stroke="black" d="M10525.64,-1529.43C10387.97,-1530.38 9858,-1525.11 9858,-1387 9858,-1387 9858,-1387 9858,-1169 9858,-1115.93 9907.57,-1072.62 9943.26,-1048.32"/>
+<polygon fill="black" stroke="black" points="9944.76,-1051.52 9951.18,-1043.1 9940.91,-1045.68 9944.76,-1051.52"/>
+</g>
+<!-- aeson&#45;&gt;unordered&#45;containers -->
+<g id="edge101" class="edge">
+<title>aeson&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M10525.96,-1527.97C10394.01,-1523.56 9896.62,-1505.11 9833,-1476 9782.13,-1452.72 9744,-1442.94 9744,-1387 9744,-1387 9744,-1387 9744,-1313 9744,-1285.08 9604.53,-1138.5 9588,-1116 9565.08,-1084.81 9555.34,-1079.09 9539,-1044 9529.99,-1024.64 9523.59,-1001.36 9519.52,-983.46"/>
+<polygon fill="black" stroke="black" points="9522.97,-982.84 9517.45,-973.79 9516.12,-984.3 9522.97,-982.84"/>
+</g>
+<!-- uuid&#45;types -->
+<g id="node70" class="node">
+<title>uuid&#45;types</title>
+<ellipse fill="none" stroke="black" cx="8488" cy="-954" rx="49.57" ry="18"/>
+<text text-anchor="middle" x="8488" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">uuid&#45;types</text>
+</g>
+<!-- aeson&#45;&gt;uuid&#45;types -->
+<g id="edge102" class="edge">
+<title>aeson&#45;&gt;uuid&#45;types</title>
+<path fill="none" stroke="black" d="M10525.8,-1528.36C10389.02,-1525.45 9855.67,-1511.96 9692,-1476 9562.84,-1447.62 8694.89,-1114.48 8583,-1044 8554.81,-1026.24 8527.58,-999.42 8509.56,-979.87"/>
+<polygon fill="black" stroke="black" points="8512.27,-977.65 8502.97,-972.57 8507.08,-982.34 8512.27,-977.65"/>
+</g>
+<!-- vector -->
+<g id="node71" class="node">
+<title>vector</title>
+<ellipse fill="none" stroke="black" cx="11308" cy="-1314" rx="34.1" ry="18"/>
+<text text-anchor="middle" x="11308" y="-1308.58" font-family="Times New Roman,serif" font-size="14.00">vector</text>
+</g>
+<!-- aeson&#45;&gt;vector -->
+<g id="edge103" class="edge">
+<title>aeson&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M10589.12,-1525.15C10641.85,-1518.19 10751.83,-1501.81 10842,-1476 10968.64,-1439.76 10993.07,-1409.75 11118,-1368 11168.55,-1351.11 11227.86,-1335.17 11266.6,-1325.26"/>
+<polygon fill="black" stroke="black" points="11267.14,-1328.73 11275.97,-1322.88 11265.42,-1321.95 11267.14,-1328.73"/>
+</g>
+<!-- witherable -->
+<g id="node72" class="node">
+<title>witherable</title>
+<ellipse fill="none" stroke="black" cx="11529" cy="-1458" rx="48.07" ry="18"/>
+<text text-anchor="middle" x="11529" y="-1452.58" font-family="Times New Roman,serif" font-size="14.00">witherable</text>
+</g>
+<!-- aeson&#45;&gt;witherable -->
+<g id="edge104" class="edge">
+<title>aeson&#45;&gt;witherable</title>
+<path fill="none" stroke="black" d="M10589.82,-1526.9C10694.12,-1519.97 11035.12,-1497.14 11317,-1476 11369.11,-1472.09 11428.4,-1467.31 11471,-1463.81"/>
+<polygon fill="black" stroke="black" points="11471.09,-1467.32 11480.77,-1463.01 11470.51,-1460.34 11471.09,-1467.32"/>
+</g>
+<!-- character&#45;ps&#45;&gt;base -->
+<g id="edge213" class="edge">
+<title>character&#45;ps&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14886.03,-587.29C14849.08,-583.51 14798.59,-578.76 14754,-576 14691.42,-572.13 13677.94,-575.12 13626,-540 13553.63,-491.06 13619.89,-408.17 13547,-360 13493.01,-324.32 9125.66,-308.67 8668.57,-307.13"/>
+<polygon fill="black" stroke="black" points="8668.86,-303.63 8658.85,-307.09 8668.84,-310.63 8668.86,-303.63"/>
+</g>
+<!-- data&#45;fix&#45;&gt;base -->
+<g id="edge316" class="edge">
+<title>data&#45;fix&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M8153.17,-950.58C8212.25,-946.9 8329.44,-939.94 8429,-936 8468.87,-934.42 9837.14,-928.57 9865,-900 9926.74,-836.7 9804.1,-854.61 9772,-828 9707.15,-774.24 9672,-751.23 9672,-667 9672,-667 9672,-667 9672,-449 9672,-226.38 8903.81,-381.88 8668.09,-325.27"/>
+<polygon fill="black" stroke="black" points="8669.3,-321.97 8658.74,-322.79 8667.51,-328.73 8669.3,-321.97"/>
+</g>
+<!-- data&#45;fix&#45;&gt;deepseq -->
+<g id="edge317" class="edge">
+<title>data&#45;fix&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8083.49,-943.23C8050.95,-932.51 8003.24,-914.87 7991,-900 7965.3,-868.77 7972,-851.45 7972,-811 7972,-811 7972,-811 7972,-593 7972,-515.77 7873.17,-477.61 7811.43,-461.3"/>
+<polygon fill="black" stroke="black" points="7812.39,-457.94 7801.83,-458.88 7810.67,-464.72 7812.39,-457.94"/>
+</g>
+<!-- data&#45;fix&#45;&gt;hashable -->
+<g id="edge318" class="edge">
+<title>data&#45;fix&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M8099.02,-937.46C8089.74,-928.44 8077.85,-916.88 8067.41,-906.73"/>
+<polygon fill="black" stroke="black" points="8070.13,-904.49 8060.52,-900.03 8065.25,-909.51 8070.13,-904.49"/>
+</g>
+<!-- dlist&#45;&gt;base -->
+<g id="edge331" class="edge">
+<title>dlist&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10213.6,-503.68C10215.66,-469.84 10214.7,-395.18 10171,-360 10110.7,-311.45 8900.84,-307.37 8668.43,-307.03"/>
+<polygon fill="black" stroke="black" points="8668.72,-303.53 8658.71,-307.02 8668.71,-310.53 8668.72,-303.53"/>
+</g>
+<!-- dlist&#45;&gt;deepseq -->
+<g id="edge332" class="edge">
+<title>dlist&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M10184.71,-520.16C10103.19,-517.65 9854.37,-510.01 9648,-504 8922.22,-482.86 8039.22,-458.57 7816.13,-452.45"/>
+<polygon fill="black" stroke="black" points="7816.4,-448.96 7806.31,-452.19 7816.21,-455.96 7816.4,-448.96"/>
+</g>
+<!-- exceptions&#45;&gt;base -->
+<g id="edge340" class="edge">
+<title>exceptions&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M7072.05,-650.85C7028.79,-630.44 6944.22,-593.29 6868,-576 6819.95,-565.1 6459.4,-576.23 6426,-540 6415.16,-528.24 6416.17,-516.63 6426,-504 6564.75,-325.69 8309.62,-308.74 8591.63,-307.16"/>
+<polygon fill="black" stroke="black" points="8591.37,-310.66 8601.35,-307.11 8591.33,-303.66 8591.37,-310.66"/>
+</g>
+<!-- exceptions&#45;&gt;template&#45;haskell -->
+<g id="edge343" class="edge">
+<title>exceptions&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7151.2,-663.35C7253.12,-660.06 7491.63,-652.57 7692,-648 8931.88,-619.72 10447.14,-599.89 10772.58,-595.79"/>
+<polygon fill="black" stroke="black" points="10772.18,-599.29 10782.14,-595.67 10772.1,-592.29 10772.18,-599.29"/>
+</g>
+<!-- exceptions&#45;&gt;mtl -->
+<g id="edge341" class="edge">
+<title>exceptions&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M7061.53,-654.42C7053.12,-652.24 7044.28,-650 7036,-648 6963.88,-630.61 6943.76,-634.29 6873,-612 6870.23,-611.13 6867.4,-610.15 6864.57,-609.1"/>
+<polygon fill="black" stroke="black" points="6865.86,-605.85 6855.27,-605.45 6863.3,-612.37 6865.86,-605.85"/>
+</g>
+<!-- exceptions&#45;&gt;transformers -->
+<g id="edge344" class="edge">
+<title>exceptions&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M7151.59,-663.49C7253.74,-660.47 7491.91,-653.46 7692,-648 9640.41,-594.82 12030.2,-535.42 12463.12,-524.7"/>
+<polygon fill="black" stroke="black" points="12463.05,-528.21 12472.96,-524.46 12462.88,-521.21 12463.05,-528.21"/>
+</g>
+<!-- exceptions&#45;&gt;stm -->
+<g id="edge342" class="edge">
+<title>exceptions&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M7050.73,-662.9C6967.57,-659.48 6796.15,-652.61 6651,-648 5833.41,-622.06 4833.33,-600.25 4625.8,-595.82"/>
+<polygon fill="black" stroke="black" points="4625.93,-592.32 4615.86,-595.61 4625.78,-599.32 4625.93,-592.32"/>
+</g>
+<!-- generically&#45;&gt;base -->
+<g id="edge364" class="edge">
+<title>generically&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M11124.81,-1300.21C11222.96,-1259.79 11512.85,-1124.04 11600,-900 11605.8,-885.09 11603.81,-879.54 11600,-864 11559.27,-697.96 11422,-693.96 11422,-523 11422,-523 11422,-523 11422,-449 11422,-386.46 11371.7,-381.58 11313,-360 11183.28,-312.32 8988.27,-307.49 8668.69,-307.04"/>
+<polygon fill="black" stroke="black" points="8668.81,-303.54 8658.81,-307.03 8668.81,-310.54 8668.81,-303.54"/>
+</g>
+<!-- hashable&#45;&gt;base -->
+<g id="edge375" class="edge">
+<title>hashable&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M8073.97,-869.37C8202.36,-821.02 8687.31,-637.34 8711,-612 8788.8,-528.77 8822.89,-453.64 8758,-360 8734.07,-325.47 8707.98,-339.93 8667.95,-326.06"/>
+<polygon fill="black" stroke="black" points="8669.46,-322.9 8658.87,-322.44 8666.86,-329.4 8669.46,-322.9"/>
+</g>
+<!-- hashable&#45;&gt;ghc&#45;bignum -->
+<g id="edge380" class="edge">
+<title>hashable&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M8000.38,-880.18C7855.38,-877.42 7367.87,-868.39 6965,-864 6882.31,-863.1 1086.4,-861.96 1011,-828 767.05,-718.13 610,-646.55 610,-379 610,-379 610,-379 610,-305 610,-264.58 597.51,-219.23 588.13,-190.89"/>
+<polygon fill="black" stroke="black" points="591.51,-189.97 584.97,-181.64 584.89,-192.23 591.51,-189.97"/>
+</g>
+<!-- hashable&#45;&gt;ghc&#45;prim -->
+<g id="edge381" class="edge">
+<title>hashable&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M8085.74,-880.58C8516.75,-876.31 12065.03,-840.8 12172,-828 12243.08,-819.49 12258.08,-801.8 12329,-792 12813.21,-725.12 14052.32,-804.67 14526,-684 14650.82,-652.2 14925.87,-472.96 15048,-432 15125.35,-406.06 15168.44,-451.75 15228,-396 15257.91,-368 15252,-347.97 15252,-307 15252,-307 15252,-307 15252,-233 15252,-192.18 15237.16,-146.93 15226.03,-118.72"/>
+<polygon fill="black" stroke="black" points="15229.28,-117.43 15222.26,-109.49 15222.8,-120.08 15229.28,-117.43"/>
+</g>
+<!-- hashable&#45;&gt;bytestring -->
+<g id="edge376" class="edge">
+<title>hashable&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M8000.38,-879.71C7828.38,-874.42 7168.53,-853.52 6626,-828 5778.91,-788.15 5568.12,-759.17 4721,-720 4167.57,-694.41 3497.31,-674.37 3298.34,-668.65"/>
+<polygon fill="black" stroke="black" points="3298.63,-665.16 3288.53,-668.37 3298.43,-672.15 3298.63,-665.16"/>
+</g>
+<!-- hashable&#45;&gt;containers -->
+<g id="edge377" class="edge">
+<title>hashable&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M8081.82,-874.05C8135.17,-864.38 8234.09,-846.01 8318,-828 8351.94,-820.71 8588.43,-764.84 8622,-756 8677.49,-741.38 8689.52,-730.17 8746,-720 8986.69,-676.66 9278.94,-668.61 9402.85,-667.23"/>
+<polygon fill="black" stroke="black" points="9402.83,-670.73 9412.79,-667.13 9402.76,-663.73 9402.83,-670.73"/>
+</g>
+<!-- hashable&#45;&gt;deepseq -->
+<g id="edge378" class="edge">
+<title>hashable&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8047.65,-863.66C8054.38,-837.05 8066,-784.45 8066,-739 8066,-739 8066,-739 8066,-593 8066,-484 7903.24,-458.5 7816.3,-452.65"/>
+<polygon fill="black" stroke="black" points="7816.51,-449.16 7806.32,-452.05 7816.1,-456.15 7816.51,-449.16"/>
+</g>
+<!-- hashable&#45;&gt;filepath -->
+<g id="edge379" class="edge">
+<title>hashable&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M8000.41,-879.85C7793.76,-874.29 6874.87,-849.46 6122,-828 5926.01,-822.41 5692.64,-815.46 5593.01,-812.47"/>
+<polygon fill="black" stroke="black" points="5593.14,-808.97 5583.04,-812.17 5592.93,-815.97 5593.14,-808.97"/>
+</g>
+<!-- hashable&#45;&gt;text -->
+<g id="edge383" class="edge">
+<title>hashable&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M8082.9,-875.03C8172.08,-861.69 8386.54,-829.62 8473.46,-816.61"/>
+<polygon fill="black" stroke="black" points="8473.74,-820.11 8483.12,-815.17 8472.71,-813.19 8473.74,-820.11"/>
+</g>
+<!-- hashable&#45;&gt;os&#45;string -->
+<g id="edge382" class="edge">
+<title>hashable&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M8000.95,-878.38C7721.03,-860.96 6128.77,-761.88 5814.77,-742.35"/>
+<polygon fill="black" stroke="black" points="5815.01,-738.85 5804.81,-741.73 5814.57,-745.84 5815.01,-738.85"/>
+</g>
+<!-- indexed&#45;traversable&#45;&gt;base -->
+<g id="edge435" class="edge">
+<title>indexed&#45;traversable&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M12396.66,-792.44C12352.34,-760.11 12263,-683.9 12263,-595 12263,-595 12263,-595 12263,-449 12263,-306.07 11768.49,-371.17 11626,-360 11012.49,-311.89 8974.07,-307.44 8668.48,-307.04"/>
+<polygon fill="black" stroke="black" points="8668.69,-303.54 8658.68,-307.03 8668.68,-310.54 8668.69,-303.54"/>
+</g>
+<!-- indexed&#45;traversable&#45;&gt;array -->
+<g id="edge434" class="edge">
+<title>indexed&#45;traversable&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M12362.18,-796.96C12130.55,-750.08 11258.59,-578.72 10532,-504 9476.66,-395.47 5917.95,-380.52 5497.66,-379.12"/>
+<polygon fill="black" stroke="black" points="5497.94,-375.62 5487.92,-379.09 5497.91,-382.62 5497.94,-375.62"/>
+</g>
+<!-- indexed&#45;traversable&#45;&gt;containers -->
+<g id="edge436" class="edge">
+<title>indexed&#45;traversable&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M12340.5,-805.56C12252.47,-801.88 12107.21,-796.02 11982,-792 11354.56,-771.85 11194.51,-819.79 10570,-756 10480.15,-746.82 10459.69,-730.65 10370,-720 10052.03,-682.23 9668.01,-671.03 9522.64,-668.02"/>
+<polygon fill="black" stroke="black" points="9522.94,-664.52 9512.87,-667.82 9522.8,-671.52 9522.94,-664.52"/>
+</g>
+<!-- indexed&#45;traversable&#45;&gt;transformers -->
+<g id="edge437" class="edge">
+<title>indexed&#45;traversable&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M12427.61,-791.97C12446.08,-744.39 12498.33,-609.75 12521.13,-551"/>
+<polygon fill="black" stroke="black" points="12524.38,-552.31 12524.74,-541.72 12517.85,-549.77 12524.38,-552.31"/>
+</g>
+<!-- integer&#45;conversion&#45;&gt;base -->
+<g id="edge444" class="edge">
+<title>integer&#45;conversion&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M11078.2,-868.69C11133.04,-856.08 11210.61,-837.08 11222,-828 11278.6,-782.91 11280.6,-754.24 11298,-684 11309.47,-637.67 11270,-549.26 11270,-523 11270,-523 11270,-523 11270,-449 11270,-400.79 11250.5,-382.75 11208,-360 11149.49,-328.68 8986.15,-309.9 8668.72,-307.31"/>
+<polygon fill="black" stroke="black" points="8668.94,-303.81 8658.91,-307.23 8668.89,-310.81 8668.94,-303.81"/>
+</g>
+<!-- integer&#45;conversion&#45;&gt;bytestring -->
+<g id="edge445" class="edge">
+<title>integer&#45;conversion&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M10958.71,-871.14C10938.95,-868.43 10917.12,-865.76 10897,-864 10499.53,-829.29 10398.36,-850.37 10000,-828 9334.43,-790.63 9170.06,-747.34 8504,-720 7703.3,-687.13 5699.33,-692.11 4898,-684 4271.58,-677.66 3512.04,-669.81 3298.38,-667.6"/>
+<polygon fill="black" stroke="black" points="3298.7,-664.11 3288.66,-667.5 3298.62,-671.11 3298.7,-664.11"/>
+</g>
+<!-- integer&#45;conversion&#45;&gt;text -->
+<g id="edge447" class="edge">
+<title>integer&#45;conversion&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M10959.37,-871.01C10939.45,-868.26 10917.36,-865.59 10897,-864 10653.81,-844.95 8839,-816.1 8549.8,-811.6"/>
+<polygon fill="black" stroke="black" points="8549.86,-808.1 8539.8,-811.44 8549.75,-815.1 8549.86,-808.1"/>
+</g>
+<!-- integer&#45;conversion&#45;&gt;primitive -->
+<g id="edge446" class="edge">
+<title>integer&#45;conversion&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M11080.26,-869.37C11128.42,-859.3 11199,-843.9 11260,-828 11264.03,-826.95 11268.21,-825.81 11272.39,-824.63"/>
+<polygon fill="black" stroke="black" points="11273.26,-828.02 11281.9,-821.88 11271.32,-821.29 11273.26,-828.02"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;base -->
+<g id="edge453" class="edge">
+<title>integer&#45;logarithms&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10589.54,-432.18C10568.86,-408.61 10531.31,-367.77 10513,-360 10425.11,-322.71 8930.45,-309.35 8668.9,-307.29"/>
+<polygon fill="black" stroke="black" points="8668.93,-303.79 8658.9,-307.21 8668.87,-310.79 8668.93,-303.79"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;ghc&#45;bignum -->
+<g id="edge454" class="edge">
+<title>integer&#45;logarithms&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M10598.46,-431.6C10590.71,-410.46 10574.39,-375.67 10547,-360 10183.93,-152.26 9084.16,-299.23 8666,-288 5299.63,-197.57 1143.22,-166.87 630.63,-163.35"/>
+<polygon fill="black" stroke="black" points="630.74,-159.85 620.71,-163.28 630.69,-166.85 630.74,-159.85"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;ghc&#45;prim -->
+<g id="edge455" class="edge">
+<title>integer&#45;logarithms&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M10658.21,-436.87C10668.4,-434.96 10678.99,-433.22 10689,-432 10843.9,-413.17 13495,-463.04 13495,-307 13495,-307 13495,-307 13495,-233 13495,-146.42 14898.43,-100.37 15169.12,-92.29"/>
+<polygon fill="black" stroke="black" points="15169.03,-95.8 15178.92,-92 15168.82,-88.8 15169.03,-95.8"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;array -->
+<g id="edge452" class="edge">
+<title>integer&#45;logarithms&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M10528.53,-446.34C10418.49,-442.56 10207.54,-435.69 10028,-432 8147.92,-393.36 5832.23,-380.84 5497.95,-379.19"/>
+<polygon fill="black" stroke="black" points="5498,-375.7 5487.98,-379.15 5497.96,-382.7 5498,-375.7"/>
+</g>
+<!-- network&#45;uri&#45;&gt;base -->
+<g id="edge552" class="edge">
+<title>network&#45;uri&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M6698.71,-950.53C6620.95,-946.93 6470.21,-940.21 6342,-936 6300.54,-934.64 4877.98,-929.69 4849,-900 4793.44,-843.08 4911.97,-841.37 4926,-828 4981.51,-775.11 4988,-743.68 4988,-667 4988,-667 4988,-667 4988,-593 4988,-481.33 4979.47,-404.22 5082,-360 5166.86,-323.4 8211.44,-308.84 8591.24,-307.17"/>
+<polygon fill="black" stroke="black" points="8591.16,-310.67 8601.15,-307.12 8591.13,-303.67 8591.16,-310.67"/>
+</g>
+<!-- network&#45;uri&#45;&gt;template&#45;haskell -->
+<g id="edge555" class="edge">
+<title>network&#45;uri&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M6804.02,-952.3C7201.7,-947.06 9706.32,-913.55 9865,-900 9969.4,-891.09 9994.2,-878.35 10098,-864 10228.84,-845.91 10269.62,-875.15 10393,-828 10471.43,-798.03 10477.6,-765.76 10548,-720 10599.83,-686.31 10610.66,-673.43 10667,-648 10700.72,-632.78 10740.07,-620.16 10772.32,-611.06"/>
+<polygon fill="black" stroke="black" points="10773.24,-614.43 10781.95,-608.39 10771.37,-607.69 10773.24,-614.43"/>
+</g>
+<!-- network&#45;uri&#45;&gt;deepseq -->
+<g id="edge553" class="edge">
+<title>network&#45;uri&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6699.66,-949.07C6657.81,-943.65 6598.97,-930.73 6557,-900 6464.51,-832.28 6415.29,-722.98 6502,-648 6646.82,-522.77 6720.41,-542.29 6908,-504 7062.66,-472.43 7548.73,-456.77 7710.24,-452.35"/>
+<polygon fill="black" stroke="black" points="7709.88,-455.86 7719.79,-452.09 7709.69,-448.86 7709.88,-455.86"/>
+</g>
+<!-- network&#45;uri&#45;&gt;parsec -->
+<g id="edge554" class="edge">
+<title>network&#45;uri&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M6699.67,-948.99C6655.29,-945.53 6589.41,-940.41 6532,-936 6321.79,-919.84 6264.64,-946.49 6059,-900 6056.69,-899.48 6054.34,-898.86 6051.99,-898.17"/>
+<polygon fill="black" stroke="black" points="6053.16,-894.87 6042.57,-895.01 6050.94,-901.51 6053.16,-894.87"/>
+</g>
+<!-- th&#45;compat -->
+<g id="node133" class="node">
+<title>th&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="6593" cy="-666" rx="48.57" ry="18"/>
+<text text-anchor="middle" x="6593" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">th&#45;compat</text>
+</g>
+<!-- network&#45;uri&#45;&gt;th&#45;compat -->
+<g id="edge556" class="edge">
+<title>network&#45;uri&#45;&gt;th&#45;compat</title>
+<path fill="none" stroke="black" d="M6704.27,-945.09C6658.39,-936.25 6593.13,-920.46 6578,-900 6532.69,-838.73 6562.02,-741.79 6580.8,-694.62"/>
+<polygon fill="black" stroke="black" points="6584.02,-695.99 6584.6,-685.41 6577.55,-693.32 6584.02,-695.99"/>
+</g>
+<!-- primitive&#45;&gt;base -->
+<g id="edge598" class="edge">
+<title>primitive&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M11322.84,-791.94C11344.85,-724.12 11415.14,-471.83 11284,-360 11231.93,-315.6 8990.99,-307.96 8668.5,-307.09"/>
+<polygon fill="black" stroke="black" points="8668.95,-303.6 8658.94,-307.07 8668.93,-310.6 8668.95,-303.6"/>
+</g>
+<!-- primitive&#45;&gt;template&#45;haskell -->
+<g id="edge600" class="edge">
+<title>primitive&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M11292.7,-794.84C11260.74,-776.47 11202.6,-743.98 11151,-720 11063.87,-679.51 10959.72,-639.82 10895.72,-616.37"/>
+<polygon fill="black" stroke="black" points="10897.04,-613.13 10886.45,-612.99 10894.64,-619.71 10897.04,-613.13"/>
+</g>
+<!-- primitive&#45;&gt;deepseq -->
+<g id="edge599" class="edge">
+<title>primitive&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M11277.01,-803.58C11031.49,-770.51 9702.93,-594.28 8614,-504 8312.2,-478.98 7949.3,-460.1 7815.69,-453.53"/>
+<polygon fill="black" stroke="black" points="7815.89,-450.03 7805.74,-453.04 7815.55,-457.03 7815.89,-450.03"/>
+</g>
+<!-- primitive&#45;&gt;transformers -->
+<g id="edge601" class="edge">
+<title>primitive&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M11343.51,-795.75C11362.96,-785.65 11389.76,-770.99 11412,-756 11517.92,-684.64 11516.83,-621.95 11636,-576 11712.36,-546.56 12266.71,-529.75 12463.18,-524.66"/>
+<polygon fill="black" stroke="black" points="12463.07,-528.17 12472.98,-524.41 12462.89,-521.17 12463.07,-528.17"/>
+</g>
+<!-- scientific&#45;&gt;base -->
+<g id="edge627" class="edge">
+<title>scientific&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10135.74,-935.86C10153.96,-866.16 10213.13,-599.8 10104,-432 10065.42,-372.68 10030.59,-377.4 9962,-360 9685.43,-289.83 8960.16,-395.01 8668.29,-325.28"/>
+<polygon fill="black" stroke="black" points="8669.27,-321.91 8658.71,-322.87 8667.56,-328.7 8669.27,-321.91"/>
+</g>
+<!-- scientific&#45;&gt;template&#45;haskell -->
+<g id="edge635" class="edge">
+<title>scientific&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M10172.95,-948.88C10277.35,-938.51 10543.22,-911.36 10582,-900 10649.53,-880.22 10827.89,-816.39 10864,-756 10888.96,-714.25 10867.93,-656.21 10851.32,-622.43"/>
+<polygon fill="black" stroke="black" points="10854.52,-621 10846.83,-613.71 10848.29,-624.2 10854.52,-621"/>
+</g>
+<!-- scientific&#45;&gt;bytestring -->
+<g id="edge629" class="edge">
+<title>scientific&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M10093.58,-944.46C10077.22,-941.13 10057.76,-937.71 10040,-936 9465.85,-880.82 5422.65,-960.08 4849,-900 4769.59,-891.68 4752.24,-873.82 4673,-864 4495.73,-842.03 4035.97,-894.04 3870,-828 3852.95,-821.21 3761.84,-727.29 3745,-720 3666,-685.8 3413.64,-672.94 3298.4,-668.76"/>
+<polygon fill="black" stroke="black" points="3298.65,-665.27 3288.54,-668.41 3298.41,-672.26 3298.65,-665.27"/>
+</g>
+<!-- scientific&#45;&gt;containers -->
+<g id="edge630" class="edge">
+<title>scientific&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M10097.5,-942.14C10089.54,-939.85 10081.02,-937.63 10073,-936 9938.82,-908.65 9892.75,-954.22 9767,-900 9744.11,-890.13 9746.26,-875.21 9724,-864 9662.76,-833.18 9633.21,-862.57 9574,-828 9522.05,-797.67 9488.84,-732.21 9473.32,-694.77"/>
+<polygon fill="black" stroke="black" points="9476.58,-693.51 9469.63,-685.52 9470.08,-696.11 9476.58,-693.51"/>
+</g>
+<!-- scientific&#45;&gt;deepseq -->
+<g id="edge631" class="edge">
+<title>scientific&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M10097.52,-942.06C10089.55,-939.77 10081.03,-937.58 10073,-936 9919.99,-905.95 9875.47,-937.03 9724,-900 9681.75,-889.67 9674.5,-877.03 9633,-864 9233.92,-738.74 9126.05,-735.35 8717,-648 8633.8,-630.23 8599.88,-659.05 8529,-612 8480.94,-580.1 8506.79,-533.14 8457,-504 8402.11,-471.88 7968.2,-456.75 7815.74,-452.38"/>
+<polygon fill="black" stroke="black" points="7816.02,-448.89 7805.92,-452.11 7815.82,-455.89 7816.02,-448.89"/>
+</g>
+<!-- scientific&#45;&gt;binary -->
+<g id="edge628" class="edge">
+<title>scientific&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M10097.53,-942.02C10089.56,-939.73 10081.04,-937.55 10073,-936 9907.72,-904.19 9863.03,-920.75 9696,-900 9381.43,-860.92 9306.3,-824.63 8991,-792 8697.47,-761.62 8622.17,-779.41 8328,-756 8288.08,-752.82 8242.75,-747.96 8210.22,-744.25"/>
+<polygon fill="black" stroke="black" points="8210.68,-740.78 8200.35,-743.11 8209.88,-747.73 8210.68,-740.78"/>
+</g>
+<!-- scientific&#45;&gt;text -->
+<g id="edge636" class="edge">
+<title>scientific&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M10097.89,-941.81C10089.83,-939.5 10081.18,-937.36 10073,-936 9724.12,-877.84 9630.55,-928.4 9278,-900 9259.52,-898.51 8700.15,-833.13 8548.57,-815.4"/>
+<polygon fill="black" stroke="black" points="8549.41,-811.97 8539.07,-814.28 8548.6,-818.92 8549.41,-811.97"/>
+</g>
+<!-- scientific&#45;&gt;hashable -->
+<g id="edge632" class="edge">
+<title>scientific&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M10093.56,-944.63C10077.2,-941.33 10057.74,-937.88 10040,-936 9842.28,-915.04 8396.45,-889.1 8097.14,-883.92"/>
+<polygon fill="black" stroke="black" points="8097.34,-880.43 8087.28,-883.75 8097.22,-887.43 8097.34,-880.43"/>
+</g>
+<!-- scientific&#45;&gt;integer&#45;logarithms -->
+<g id="edge633" class="edge">
+<title>scientific&#45;&gt;integer&#45;logarithms</title>
+<path fill="none" stroke="black" d="M10172.77,-948.48C10242.38,-938.79 10382.49,-909.8 10464,-828 10564.19,-727.46 10593.54,-548.86 10601.38,-479.58"/>
+<polygon fill="black" stroke="black" points="10604.84,-480.14 10602.41,-469.82 10597.88,-479.4 10604.84,-480.14"/>
+</g>
+<!-- scientific&#45;&gt;primitive -->
+<g id="edge634" class="edge">
+<title>scientific&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M10173.2,-949.16C10215.59,-945.4 10282.78,-939.72 10341,-936 10426.48,-930.54 11031.21,-931.12 11111,-900 11134.22,-890.94 11132.2,-876.07 11154,-864 11164.59,-858.14 11227.57,-838.32 11272.06,-824.65"/>
+<polygon fill="black" stroke="black" points="11272.94,-828.04 11281.48,-821.76 11270.89,-821.34 11272.94,-828.04"/>
+</g>
+<!-- semialign&#45;&gt;base -->
+<g id="edge637" class="edge">
+<title>semialign&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M11275.72,-1440.37C11290.94,-1421.24 11317.91,-1389.69 11346,-1368 11382.48,-1339.83 11711,-1217.09 11711,-1171 11711,-1171 11711,-1171 11711,-1097 11711,-960.95 11498,-659.05 11498,-523 11498,-523 11498,-523 11498,-449 11498,-379.35 11435.3,-381.36 11369,-360 11234.57,-316.69 8990.93,-308.12 8668.48,-307.11"/>
+<polygon fill="black" stroke="black" points="8668.93,-303.61 8658.92,-307.08 8668.91,-310.61 8668.93,-303.61"/>
+</g>
+<!-- semialign&#45;&gt;containers -->
+<g id="edge638" class="edge">
+<title>semialign&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M11254.41,-1440.26C11237.76,-1409.01 11198.52,-1340.89 11151,-1296 11039.9,-1191.05 10982.86,-1204.13 10858,-1116 10842.38,-1104.97 10741.09,-1016.58 10724,-1008 10609.18,-950.33 10290.19,-888.24 10164,-864 10041.65,-840.49 10001.41,-874.92 9886,-828 9861.3,-817.96 9861.55,-804.51 9838,-792 9794.8,-769.05 9779.69,-773.45 9734,-756 9695.29,-741.22 9687.17,-733.52 9648,-720 9590.92,-700.3 9574.92,-701.07 9517,-684 9514.63,-683.3 9512.2,-682.57 9509.74,-681.83"/>
+<polygon fill="black" stroke="black" points="9511,-678.56 9500.41,-678.97 9508.94,-685.25 9511,-678.56"/>
+</g>
+<!-- semialign&#45;&gt;transformers -->
+<g id="edge645" class="edge">
+<title>semialign&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M11296.28,-1445.59C11324.17,-1435.65 11364.81,-1420.32 11399,-1404 11428.1,-1390.11 11431.74,-1379.16 11462,-1368 11542.64,-1338.27 11756.93,-1308.23 11842,-1296 11922.68,-1284.4 12134.1,-1296.45 12207,-1260 12226.41,-1250.29 12222.6,-1236.98 12240,-1224 12269.32,-1202.13 12284.76,-1209.98 12314,-1188 12504.66,-1044.67 12608,-977.53 12608,-739 12608,-739 12608,-739 12608,-665 12608,-619.73 12577.6,-574.92 12555.25,-548.1"/>
+<polygon fill="black" stroke="black" points="12557.92,-545.83 12548.74,-540.54 12552.61,-550.4 12557.92,-545.83"/>
+</g>
+<!-- semialign&#45;&gt;semigroupoids -->
+<g id="edge642" class="edge">
+<title>semialign&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M11304.27,-1450.9C11402.47,-1436.39 11657.71,-1398.75 11871,-1368 12593.51,-1263.84 12784.77,-1288.8 13494,-1116 13585.9,-1093.61 13691.47,-1062.3 13753.25,-1043.41"/>
+<polygon fill="black" stroke="black" points="13753.91,-1046.86 13762.44,-1040.59 13751.85,-1040.17 13753.91,-1046.86"/>
+</g>
+<!-- semialign&#45;&gt;tagged -->
+<g id="edge643" class="edge">
+<title>semialign&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M11299.24,-1447.12C11363.8,-1429.73 11503.1,-1393.1 11622,-1368 11690.2,-1353.6 12174.87,-1284.83 12240,-1260 12560.28,-1137.89 12560.36,-970.47 12853,-792 12877.8,-776.87 12907.66,-763.33 12930.87,-753.72"/>
+<polygon fill="black" stroke="black" points="12932,-757.04 12939.95,-750.03 12929.36,-750.55 12932,-757.04"/>
+</g>
+<!-- semialign&#45;&gt;hashable -->
+<g id="edge639" class="edge">
+<title>semialign&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M11218.74,-1455.7C11079.89,-1451.39 10640.51,-1435.98 10278,-1404 10016.61,-1380.94 9951.27,-1372.45 9692,-1332 9399.86,-1286.43 8671.7,-1142.74 8393,-1044 8323.67,-1019.44 8306.82,-1010.24 8244,-972 8221.22,-958.13 8219.57,-948.48 8196,-936 8152.4,-912.92 8137.59,-916.24 8091,-900 8089.22,-899.38 8087.41,-898.75 8085.57,-898.1"/>
+<polygon fill="black" stroke="black" points="8087.02,-894.9 8076.43,-894.89 8084.7,-901.51 8087.02,-894.9"/>
+</g>
+<!-- semialign&#45;&gt;indexed&#45;traversable -->
+<g id="edge640" class="edge">
+<title>semialign&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M11286,-1442.26C11316.01,-1423.42 11370.54,-1390.56 11420,-1368 11550.83,-1308.31 11597.68,-1326.85 11725,-1260 11990.73,-1120.48 12006.37,-1003.71 12272,-864 12300,-849.28 12332.97,-837.07 12360.77,-828.1"/>
+<polygon fill="black" stroke="black" points="12361.62,-831.5 12370.1,-825.15 12359.51,-824.83 12361.62,-831.5"/>
+</g>
+<!-- semialign&#45;&gt;these -->
+<g id="edge644" class="edge">
+<title>semialign&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M11235.53,-1443.42C11115,-1384.27 10619.91,-1145.96 10192,-1008 10124.28,-986.17 10103.09,-995.69 10036,-972 10035.05,-971.67 10034.1,-971.31 10033.14,-970.94"/>
+<polygon fill="black" stroke="black" points="10034.86,-967.87 10024.29,-967.16 10032.11,-974.31 10034.86,-967.87"/>
+</g>
+<!-- semialign&#45;&gt;unordered&#45;containers -->
+<g id="edge646" class="edge">
+<title>semialign&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M11219.51,-1453.54C10996.13,-1435.15 9977.85,-1343.9 9708,-1188 9620.74,-1137.59 9555.49,-1032.26 9528.14,-982.35"/>
+<polygon fill="black" stroke="black" points="9531.27,-980.79 9523.45,-973.64 9525.11,-984.1 9531.27,-980.79"/>
+</g>
+<!-- semialign&#45;&gt;vector -->
+<g id="edge647" class="edge">
+<title>semialign&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M11261.06,-1439.67C11259.67,-1421.29 11259.32,-1391.68 11268,-1368 11271.85,-1357.51 11278.51,-1347.36 11285.32,-1338.81"/>
+<polygon fill="black" stroke="black" points="11287.84,-1341.24 11291.64,-1331.36 11282.5,-1336.71 11287.84,-1341.24"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances -->
+<g id="node125" class="node">
+<title>indexed&#45;traversable&#45;instances</title>
+<ellipse fill="none" stroke="black" cx="11999" cy="-1386" rx="119.43" ry="18"/>
+<text text-anchor="middle" x="11999" y="-1380.58" font-family="Times New Roman,serif" font-size="14.00">indexed&#45;traversable&#45;instances</text>
+</g>
+<!-- semialign&#45;&gt;indexed&#45;traversable&#45;instances -->
+<g id="edge641" class="edge">
+<title>semialign&#45;&gt;indexed&#45;traversable&#45;instances</title>
+<path fill="none" stroke="black" d="M11306.29,-1452.88C11418.87,-1442.18 11723.51,-1413.2 11888.78,-1397.48"/>
+<polygon fill="black" stroke="black" points="11888.82,-1401 11898.44,-1396.56 11888.16,-1394.03 11888.82,-1401"/>
+</g>
+<!-- strict&#45;&gt;base -->
+<g id="edge696" class="edge">
+<title>strict&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10106.5,-1015.23C10112.79,-1012.74 10119.62,-1010.17 10126,-1008 10181.15,-989.27 10196.96,-991.05 10252,-972 10331.86,-944.35 10364.21,-955.44 10428,-900 10455.96,-875.7 10454.52,-861.66 10470,-828 10560.95,-630.29 10529.72,-436.53 10326,-360 10156.01,-296.14 8887.98,-367.96 8668.29,-325"/>
+<polygon fill="black" stroke="black" points="8669.25,-321.63 8658.72,-322.84 8667.71,-328.46 8669.25,-321.63"/>
+</g>
+<!-- strict&#45;&gt;ghc&#45;prim -->
+<g id="edge700" class="edge">
+<title>strict&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M10112.51,-1024.85C10459.83,-1023.03 13764.31,-1004.88 14196,-972 14311,-963.24 14338.14,-946.49 14453,-936 14824.24,-902.1 14923.95,-965.15 15291,-900 15394.8,-881.58 15420.56,-870.58 15517,-828 15706.62,-744.28 15921,-802.28 15921,-595 15921,-595 15921,-595 15921,-233 15921,-174.16 15876.91,-167.56 15823,-144 15721.61,-99.68 15381.33,-92.4 15258.61,-91.22"/>
+<polygon fill="black" stroke="black" points="15258.97,-87.72 15248.94,-91.14 15258.91,-94.72 15258.97,-87.72"/>
+</g>
+<!-- strict&#45;&gt;bytestring -->
+<g id="edge698" class="edge">
+<title>strict&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M10061.42,-1013.52C10056.19,-1011.26 10050.51,-1009.21 10045,-1008 9862.87,-968.09 6875.37,-977.64 6689,-972 6367.86,-962.28 6288.05,-948.23 5967,-936 5359.67,-912.87 5205.28,-954.91 4600,-900 4496.52,-890.61 4472.3,-875.21 4369,-864 4239.96,-849.99 3905.04,-879.74 3786,-828 3764.66,-818.73 3766.13,-806.58 3748,-792 3703.63,-756.3 3695.22,-740.27 3642,-720 3526,-675.82 3379.08,-667.36 3298.87,-666.37"/>
+<polygon fill="black" stroke="black" points="3299.07,-662.87 3289.04,-666.29 3299.01,-669.87 3299.07,-662.87"/>
+</g>
+<!-- strict&#45;&gt;deepseq -->
+<g id="edge699" class="edge">
+<title>strict&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M10061.41,-1013.55C10056.18,-1011.28 10050.5,-1009.23 10045,-1008 9830.46,-960.15 8275.41,-1041.88 8067,-972 8011.41,-953.36 7858,-869.63 7858,-811 7858,-811 7858,-811 7858,-593 7858,-544.08 7818.56,-499.25 7790.51,-473.55"/>
+<polygon fill="black" stroke="black" points="7793.16,-471.22 7783.36,-467.21 7788.52,-476.46 7793.16,-471.22"/>
+</g>
+<!-- strict&#45;&gt;transformers -->
+<g id="edge704" class="edge">
+<title>strict&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M10110.84,-1020.65C10134.93,-1016.98 10170.71,-1011.73 10202,-1008 10368.69,-988.12 10413.91,-1007.47 10578,-972 10626.22,-961.58 10634.66,-945.86 10683,-936 10900.87,-891.57 10963.79,-942.75 11182,-900 11283.38,-880.14 11308.77,-870.34 11403,-828 11460.78,-802.04 11472.9,-790.54 11526,-756 11571.91,-726.13 11583.08,-718.02 11626,-684 11640.32,-672.65 11733.12,-582.98 11750,-576 11814.98,-549.13 12284.89,-531.1 12463.42,-525.15"/>
+<polygon fill="black" stroke="black" points="12463.36,-528.65 12473.24,-524.82 12463.13,-521.66 12463.36,-528.65"/>
+</g>
+<!-- strict&#45;&gt;binary -->
+<g id="edge697" class="edge">
+<title>strict&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M10060.49,-1014.36C10017.82,-994.76 9921.77,-953.4 9836,-936 9607.22,-889.58 9543.99,-926 9312,-900 9208.74,-888.43 8952.41,-845.58 8850,-828 8764.43,-813.31 8744.06,-803.46 8658,-792 8457.8,-765.35 8400.93,-805.02 8205,-756 8203.43,-755.61 8201.85,-755.16 8200.26,-754.66"/>
+<polygon fill="black" stroke="black" points="8201.92,-751.54 8191.33,-751.41 8199.53,-758.12 8201.92,-751.54"/>
+</g>
+<!-- strict&#45;&gt;text -->
+<g id="edge702" class="edge">
+<title>strict&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M10060.92,-1013.75C10055.8,-1011.53 10050.3,-1009.45 10045,-1008 9907.36,-970.42 9857.15,-1028.18 9726,-972 9703.09,-962.19 9706.23,-945.04 9683,-936 9518.19,-871.86 9062.13,-930.89 8888,-900 8835.68,-890.72 8825.45,-877.27 8774,-864 8694.29,-843.45 8599.29,-826.01 8548.1,-817.19"/>
+<polygon fill="black" stroke="black" points="8548.91,-813.77 8538.46,-815.54 8547.73,-820.67 8548.91,-813.77"/>
+</g>
+<!-- strict&#45;&gt;hashable -->
+<g id="edge701" class="edge">
+<title>strict&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M10061.41,-1013.57C10056.18,-1011.3 10050.5,-1009.24 10045,-1008 9866.2,-967.78 8569.22,-1031.85 8396,-972 8370.8,-963.29 8372.63,-946.23 8348,-936 8245.15,-893.26 8208.77,-923.98 8100,-900 8095.7,-899.05 8091.25,-897.95 8086.82,-896.77"/>
+<polygon fill="black" stroke="black" points="8087.97,-893.45 8077.4,-894.12 8086.08,-900.19 8087.97,-893.45"/>
+</g>
+<!-- strict&#45;&gt;these -->
+<g id="edge703" class="edge">
+<title>strict&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M10066.41,-1010.83C10054.85,-1000.97 10039.22,-987.63 10026.14,-976.46"/>
+<polygon fill="black" stroke="black" points="10028.6,-973.96 10018.72,-970.13 10024.05,-979.28 10028.6,-973.96"/>
+</g>
+<!-- assoc -->
+<g id="node84" class="node">
+<title>assoc</title>
+<ellipse fill="none" stroke="black" cx="10856" cy="-882" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="10856" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">assoc</text>
+</g>
+<!-- strict&#45;&gt;assoc -->
+<g id="edge695" class="edge">
+<title>strict&#45;&gt;assoc</title>
+<path fill="none" stroke="black" d="M10105.82,-1014.58C10112.23,-1012.04 10119.28,-1009.6 10126,-1008 10297.49,-967.18 10349.92,-1014.53 10521,-972 10561.21,-962 10567.45,-948.37 10607,-936 10678.27,-913.71 10763.92,-897.76 10813.93,-889.49"/>
+<polygon fill="black" stroke="black" points="10814.45,-892.95 10823.75,-887.89 10813.32,-886.04 10814.45,-892.95"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;base -->
+<g id="edge737" class="edge">
+<title>text&#45;iso8601&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10015.37,-1083.82C10078.87,-1060.25 10207.57,-1012.86 10229,-1008 10381.07,-973.51 10430.63,-1022.98 10578,-972 10606.32,-962.2 10606.85,-946.27 10635,-936 10745.42,-895.7 10791.03,-950.86 10897,-900 10917.97,-889.93 10914.97,-875.83 10935,-864 10980.39,-837.2 10999.85,-849.44 11048,-828 11105.86,-802.23 11136.87,-809.36 11171,-756 11269.36,-602.22 11223.23,-445.61 11062,-360 10951.75,-301.46 8970.16,-305.85 8668.39,-306.86"/>
+<polygon fill="black" stroke="black" points="8668.71,-303.35 8658.72,-306.89 8668.73,-310.35 8668.71,-303.35"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;time -->
+<g id="edge740" class="edge">
+<title>text&#45;iso8601&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M9923.91,-1096.33C9554.41,-1091.73 7431.16,-1062.2 5704,-972 5636.17,-968.46 5557.29,-962.19 5511.47,-958.33"/>
+<polygon fill="black" stroke="black" points="5511.77,-954.85 5501.51,-957.49 5511.18,-961.82 5511.77,-954.85"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;text -->
+<g id="edge739" class="edge">
+<title>text&#45;iso8601&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M9951.85,-1082.08C9915.86,-1063.35 9851.35,-1030.9 9794,-1008 9745.84,-988.76 9727.59,-998.49 9683,-972 9663,-960.12 9666.43,-945.06 9645,-936 9466.56,-860.59 8952.44,-975.41 8774,-900 8752.57,-890.94 8756.73,-874.57 8736,-864 8658.26,-824.37 8625.37,-856.8 8543,-828 8542.37,-827.78 8541.74,-827.55 8541.1,-827.31"/>
+<polygon fill="black" stroke="black" points="8542.83,-824.25 8532.28,-823.37 8539.98,-830.64 8542.83,-824.25"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;integer&#45;conversion -->
+<g id="edge738" class="edge">
+<title>text&#45;iso8601&#45;&gt;integer&#45;conversion</title>
+<path fill="none" stroke="black" d="M10023.23,-1086.1C10032.07,-1083.99 10041.32,-1081.85 10050,-1080 10308.56,-1024.78 10376.09,-1025.57 10635,-972 10749.82,-948.24 10882.86,-916.89 10959.54,-898.44"/>
+<polygon fill="black" stroke="black" points="10960.07,-901.91 10968.97,-896.17 10958.43,-895.11 10960.07,-901.91"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;time&#45;compat -->
+<g id="edge741" class="edge">
+<title>text&#45;iso8601&#45;&gt;time&#45;compat</title>
+<path fill="none" stroke="black" d="M9979.75,-1079.7C9979.65,-1072.41 9979.52,-1063.73 9979.41,-1055.54"/>
+<polygon fill="black" stroke="black" points="9982.91,-1055.57 9979.27,-1045.62 9975.91,-1055.67 9982.91,-1055.57"/>
+</g>
+<!-- text&#45;short&#45;&gt;base -->
+<g id="edge742" class="edge">
+<title>text&#45;short&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M9815.79,-941.81C9838.24,-933.21 9866.9,-919.46 9887,-900 9914.68,-873.2 10052,-633.53 10052,-595 10052,-595 10052,-595 10052,-449 10052,-261.67 9825.88,-383.31 9640,-360 9427.79,-333.38 8890.27,-378.89 8668.22,-325.28"/>
+<polygon fill="black" stroke="black" points="8669.27,-321.94 8658.72,-322.86 8667.54,-328.72 8669.27,-321.94"/>
+</g>
+<!-- text&#45;short&#45;&gt;ghc&#45;prim -->
+<g id="edge746" class="edge">
+<title>text&#45;short&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M9824.81,-947.85C9861.43,-943.79 9915.04,-938.43 9962,-936 10782.5,-893.55 12840.07,-966.07 13659,-900 13738.37,-893.6 15006.73,-723.27 15076,-684 15228.96,-597.28 15328,-554.84 15328,-379 15328,-379 15328,-379 15328,-233 15328,-192.03 15328.83,-176.59 15304,-144 15292.17,-128.47 15274.37,-116.63 15257.72,-108.12"/>
+<polygon fill="black" stroke="black" points="15259.46,-105.07 15248.93,-103.91 15256.43,-111.39 15259.46,-105.07"/>
+</g>
+<!-- text&#45;short&#45;&gt;template&#45;haskell -->
+<g id="edge748" class="edge">
+<title>text&#45;short&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M9825.44,-948.65C9939.01,-937.47 10234.05,-908.07 10278,-900 10339.92,-888.63 10786.03,-804.64 10826,-756 10856.67,-718.68 10850.55,-658.55 10843.29,-623.3"/>
+<polygon fill="black" stroke="black" points="10846.78,-622.84 10841.17,-613.84 10839.94,-624.37 10846.78,-622.84"/>
+</g>
+<!-- text&#45;short&#45;&gt;bytestring -->
+<g id="edge744" class="edge">
+<title>text&#45;short&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M9737.67,-947.52C9703.58,-943.49 9654.84,-938.31 9612,-936 8539.31,-878.18 5848.92,-984.55 4778,-900 4671.35,-891.58 4646.44,-874.74 4540,-864 4383.7,-848.23 3979.67,-886.81 3834,-828 3800.12,-814.32 3743.45,-734.71 3710,-720 3637.48,-688.1 3407.24,-674.18 3298.26,-669.25"/>
+<polygon fill="black" stroke="black" points="3298.5,-665.76 3288.35,-668.82 3298.19,-672.76 3298.5,-665.76"/>
+</g>
+<!-- text&#45;short&#45;&gt;deepseq -->
+<g id="edge745" class="edge">
+<title>text&#45;short&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M9744.89,-942.33C9736.14,-940 9726.78,-937.73 9718,-936 9591.42,-911.14 9556.95,-922.9 9430,-900 9052.34,-831.88 8959.08,-802.27 8594,-684 8508.09,-656.17 8474.09,-668.94 8404,-612 8359.79,-576.08 8383.64,-533.64 8335,-504 8291.24,-477.33 7949,-459.32 7815.8,-453.26"/>
+<polygon fill="black" stroke="black" points="7815.98,-449.76 7805.83,-452.81 7815.67,-456.75 7815.98,-449.76"/>
+</g>
+<!-- text&#45;short&#45;&gt;binary -->
+<g id="edge743" class="edge">
+<title>text&#45;short&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M9745.62,-942.13C9736.68,-939.75 9727.05,-937.5 9718,-936 9474.58,-895.66 9408.99,-929.31 9164,-900 8887.58,-866.93 8822.02,-835.19 8547,-792 8425.13,-772.86 8280.77,-753.75 8209.82,-744.59"/>
+<polygon fill="black" stroke="black" points="8210.54,-741.15 8200.18,-743.35 8209.65,-748.09 8210.54,-741.15"/>
+</g>
+<!-- text&#45;short&#45;&gt;text -->
+<g id="edge749" class="edge">
+<title>text&#45;short&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M9746.41,-941.74C9738.16,-939.46 9729.34,-937.35 9721,-936 9548.63,-908.01 9100.36,-959 8936,-900 8910.9,-890.99 8912.65,-874.18 8888,-864 8827.15,-838.88 8632.73,-820.76 8549.45,-813.96"/>
+<polygon fill="black" stroke="black" points="8549.76,-810.47 8539.51,-813.16 8549.2,-817.45 8549.76,-810.47"/>
+</g>
+<!-- text&#45;short&#45;&gt;hashable -->
+<g id="edge747" class="edge">
+<title>text&#45;short&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M9737.3,-947.8C9703.21,-943.94 9654.66,-938.86 9612,-936 9019.09,-896.21 8298.02,-885.75 8097.18,-883.53"/>
+<polygon fill="black" stroke="black" points="8097.35,-880.03 8087.31,-883.42 8097.27,-887.03 8097.35,-880.03"/>
+</g>
+<!-- th&#45;abstraction&#45;&gt;base -->
+<g id="edge750" class="edge">
+<title>th&#45;abstraction&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13638.35,-871.43C13747.97,-847.9 14009.36,-776.72 14146,-612 14172.16,-580.47 14170,-563.97 14170,-523 14170,-523 14170,-523 14170,-449 14170,-408.03 14178.4,-385.07 14146,-360 14088.4,-315.44 9156.45,-307.7 8668.72,-307.05"/>
+<polygon fill="black" stroke="black" points="8668.93,-303.55 8658.93,-307.04 8668.93,-310.55 8668.93,-303.55"/>
+</g>
+<!-- th&#45;abstraction&#45;&gt;ghc&#45;prim -->
+<g id="edge752" class="edge">
+<title>th&#45;abstraction&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M13640.66,-872.39C13742.93,-855.8 13975.61,-818.69 14172,-792 14572.95,-737.51 14686.55,-793.82 15076,-684 15297.26,-621.61 15345.54,-580.54 15546,-468 15631.81,-419.83 15698,-405.41 15698,-307 15698,-307 15698,-307 15698,-233 15698,-175.14 15655.24,-168.86 15603,-144 15542.85,-115.38 15347.75,-99.56 15258.86,-93.69"/>
+<polygon fill="black" stroke="black" points="15259.27,-90.21 15249.07,-93.05 15258.82,-97.19 15259.27,-90.21"/>
+</g>
+<!-- th&#45;abstraction&#45;&gt;template&#45;haskell -->
+<g id="edge753" class="edge">
+<title>th&#45;abstraction&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M13574.76,-864.06C13546.61,-829.52 13476.88,-751.55 13398,-720 13159.68,-624.68 11272.63,-599.67 10899.84,-595.63"/>
+<polygon fill="black" stroke="black" points="10900.04,-592.14 10890.01,-595.53 10899.97,-599.14 10900.04,-592.14"/>
+</g>
+<!-- th&#45;abstraction&#45;&gt;containers -->
+<g id="edge751" class="edge">
+<title>th&#45;abstraction&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M13531.88,-874.17C13387.53,-856.93 12991.42,-811.59 12660,-792 11949.5,-750 11769.84,-791.72 11059,-756 10853.75,-745.69 10803.11,-732.79 10598,-720 10187.07,-694.37 9691.73,-675.3 9522.79,-669.13"/>
+<polygon fill="black" stroke="black" points="9523.06,-665.64 9512.94,-668.77 9522.81,-672.64 9523.06,-665.64"/>
+</g>
+<!-- these&#45;&gt;base -->
+<g id="edge757" class="edge">
+<title>these&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10010.02,-936.48C10032.65,-893.45 10090,-773.86 10090,-667 10090,-667 10090,-667 10090,-449 10090,-395.73 10416.8,-461.94 9855,-360 9597.6,-313.29 8936.77,-389.85 8668.19,-325.26"/>
+<polygon fill="black" stroke="black" points="8669.27,-321.93 8658.72,-322.87 8667.55,-328.71 8669.27,-321.93"/>
+</g>
+<!-- these&#45;&gt;deepseq -->
+<g id="edge759" class="edge">
+<title>these&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M9975.57,-944.39C9966.06,-941.41 9955.12,-938.25 9945,-936 9835.86,-911.69 9805.85,-920.91 9696,-900 9687.47,-898.38 8486.68,-617.54 8480,-612 8439.57,-578.46 8474.88,-534.34 8432,-504 8382.12,-468.7 7964.73,-455.66 7815.66,-452.11"/>
+<polygon fill="black" stroke="black" points="7816.16,-448.62 7806.08,-451.88 7816,-455.62 7816.16,-448.62"/>
+</g>
+<!-- these&#45;&gt;binary -->
+<g id="edge758" class="edge">
+<title>these&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M9972.18,-949.14C9945.45,-945.59 9904.56,-940.26 9869,-936 9724.7,-918.72 9688.06,-919.18 9544,-900 9234.57,-858.81 9160.21,-826.77 8850,-792 8618.9,-766.1 8559.68,-776.14 8328,-756 8288.1,-752.53 8242.78,-747.7 8210.23,-744.07"/>
+<polygon fill="black" stroke="black" points="8210.69,-740.6 8200.36,-742.96 8209.91,-747.56 8210.69,-740.6"/>
+</g>
+<!-- these&#45;&gt;hashable -->
+<g id="edge760" class="edge">
+<title>these&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M9972.14,-949.38C9939.25,-945.41 9883.84,-939.17 9836,-936 9485.01,-912.76 8357.28,-889.27 8096.97,-884.06"/>
+<polygon fill="black" stroke="black" points="8097.17,-880.57 8087.1,-883.87 8097.03,-887.56 8097.17,-880.57"/>
+</g>
+<!-- these&#45;&gt;assoc -->
+<g id="edge756" class="edge">
+<title>these&#45;&gt;assoc</title>
+<path fill="none" stroke="black" d="M10027.9,-946.03C10042.61,-942.48 10061.2,-938.41 10078,-936 10114.57,-930.75 10654.43,-895.92 10812.7,-885.77"/>
+<polygon fill="black" stroke="black" points="10812.59,-889.28 10822.34,-885.15 10812.14,-882.3 10812.59,-889.28"/>
+</g>
+<!-- time&#45;compat&#45;&gt;base -->
+<g id="edge764" class="edge">
+<title>time&#45;compat&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10021.92,-1013.94C10080.85,-998.75 10180.04,-973.17 10184,-972 10184.38,-971.89 10400.75,-900.31 10401,-900 10555.46,-709.21 10499.56,-479.26 10285,-360 10208.4,-317.42 8830.68,-345.1 8668.28,-324.44"/>
+<polygon fill="black" stroke="black" points="8669.19,-321.05 8658.74,-322.77 8667.98,-327.94 8669.19,-321.05"/>
+</g>
+<!-- time&#45;compat&#45;&gt;template&#45;haskell -->
+<g id="edge768" class="edge">
+<title>time&#45;compat&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M10021.09,-1013.44C10029,-1011.47 10037.23,-1009.56 10045,-1008 10154.2,-986.08 10183.27,-991.11 10293,-972 10451.17,-944.46 10493.96,-948.55 10647,-900 10722.88,-875.93 10745.28,-872.92 10811,-828 10848.36,-802.46 10865.68,-797.81 10883,-756 10888.59,-742.5 10889.08,-669.08 10881,-648 10877.13,-637.9 10870.46,-628.38 10863.42,-620.27"/>
+<polygon fill="black" stroke="black" points="10866.17,-618.08 10856.78,-613.16 10861.05,-622.86 10866.17,-618.08"/>
+</g>
+<!-- time&#45;compat&#45;&gt;deepseq -->
+<g id="edge766" class="edge">
+<title>time&#45;compat&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M9959.16,-1008.66C9932.81,-987.94 9883.99,-952.89 9836,-936 9710.16,-891.7 9669.35,-923.34 9538,-900 9263.31,-851.19 9198.4,-820.66 8927,-756 8924.92,-755.51 8630.03,-684.66 8628,-684 8626.76,-683.6 8456.05,-612.77 8455,-612 8404.37,-574.89 8419.7,-532.95 8364,-504 8269.36,-454.82 7944.99,-450.34 7816.26,-450.57"/>
+<polygon fill="black" stroke="black" points="7816.29,-447.07 7806.3,-450.6 7816.31,-454.07 7816.29,-447.07"/>
+</g>
+<!-- time&#45;compat&#45;&gt;time -->
+<g id="edge769" class="edge">
+<title>time&#45;compat&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M9921.83,-1024.19C9744.95,-1021.71 9190.97,-1013.96 8732,-1008 7434.68,-991.16 7109.8,-1012.4 5813,-972 5703.4,-968.59 5574.07,-961.19 5511.18,-957.38"/>
+<polygon fill="black" stroke="black" points="5511.58,-953.9 5501.38,-956.78 5511.15,-960.88 5511.58,-953.9"/>
+</g>
+<!-- time&#45;compat&#45;&gt;hashable -->
+<g id="edge767" class="edge">
+<title>time&#45;compat&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M9921.83,-1025.16C9651.44,-1025.67 8507.75,-1024.65 8358,-972 8332.84,-963.15 8334.49,-946.55 8310,-936 8223.03,-898.55 8192.21,-921.57 8100,-900 8095.77,-899.01 8091.38,-897.88 8087.01,-896.7"/>
+<polygon fill="black" stroke="black" points="8088.31,-893.43 8077.73,-894.07 8086.4,-900.16 8088.31,-893.43"/>
+</g>
+<!-- time&#45;compat&#45;&gt;base&#45;orphans -->
+<g id="edge765" class="edge">
+<title>time&#45;compat&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M10019.54,-1012.91C10027.88,-1010.89 10036.67,-1009.09 10045,-1008 10492.4,-949.29 13658.04,-1026.34 14106,-972 14174.92,-963.64 14189.2,-945.28 14258,-936 14313.64,-928.49 15223.47,-934.2 15268,-900 15307.81,-869.43 15264.59,-826.54 15301,-792 15322.13,-771.95 15393.98,-756.95 15448.44,-748.11"/>
+<polygon fill="black" stroke="black" points="15448.95,-751.58 15458.28,-746.56 15447.86,-744.66 15448.95,-751.58"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;base -->
+<g id="edge803" class="edge">
+<title>unordered&#45;containers&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M9595.52,-946.18C9634.93,-942.95 9682.91,-939.13 9726,-936 10170.29,-903.7 10314.58,-957.23 10712,-756 10835.97,-693.23 10980,-733.95 10980,-595 10980,-595 10980,-595 10980,-449 10980,-316.3 10825.91,-381.69 10695,-360 10488,-325.71 8933.72,-309.82 8668.45,-307.35"/>
+<polygon fill="black" stroke="black" points="8668.69,-303.85 8658.65,-307.26 8668.62,-310.85 8668.69,-303.85"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;template&#45;haskell -->
+<g id="edge806" class="edge">
+<title>unordered&#45;containers&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M9595.79,-946.35C9635.15,-943.18 9683.02,-939.35 9726,-936 9937.52,-919.52 9993.23,-937.78 10202,-900 10258.47,-889.78 10270.29,-877.76 10326,-864 10403.51,-844.85 10429.18,-860.75 10502,-828 10526.32,-817.06 10526.14,-803.91 10550,-792 10601.34,-766.37 10624.56,-785.13 10674,-756 10734.53,-720.34 10788.87,-656.93 10816.59,-621.25"/>
+<polygon fill="black" stroke="black" points="10819.16,-623.66 10822.46,-613.6 10813.6,-619.41 10819.16,-623.66"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;deepseq -->
+<g id="edge804" class="edge">
+<title>unordered&#45;containers&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M9439.95,-943.59C9368.9,-934.13 9258.72,-918.36 9164,-900 8891.37,-847.17 8807.18,-874.42 8556,-756 8460.16,-710.82 8435.16,-692.28 8366,-612 8330.3,-570.56 8352.63,-534.16 8307,-504 8266.6,-477.3 7944.75,-459.48 7815.98,-453.36"/>
+<polygon fill="black" stroke="black" points="7816.16,-449.86 7806.01,-452.89 7815.83,-456.85 7816.16,-449.86"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;hashable -->
+<g id="edge805" class="edge">
+<title>unordered&#45;containers&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M9427.74,-948.9C9155.17,-935.92 8317.35,-896.06 8096.71,-885.56"/>
+<polygon fill="black" stroke="black" points="8097.14,-882.07 8086.98,-885.09 8096.8,-889.06 8097.14,-882.07"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;base -->
+<g id="edge807" class="edge">
+<title>uuid&#45;types&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M8523.56,-941C8530.9,-938.97 8538.64,-937.15 8546,-936 9182.48,-836.56 9357.7,-994.05 9995,-900 10054.73,-891.18 10066.84,-876.06 10126,-864 10184.66,-852.04 10353.6,-873.07 10393,-828 10403.53,-815.95 10395.89,-807.74 10393,-792 10376.05,-699.86 10318,-688.69 10318,-595 10318,-595 10318,-595 10318,-449 10318,-397.27 10289.65,-382.34 10243,-360 10087.54,-285.55 8879.31,-365.26 8668.39,-324.99"/>
+<polygon fill="black" stroke="black" points="8669.24,-321.6 8658.72,-322.84 8667.72,-328.43 8669.24,-321.6"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;template&#45;haskell -->
+<g id="edge813" class="edge">
+<title>uuid&#45;types&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M8523.56,-940.99C8530.9,-938.96 8538.64,-937.14 8546,-936 8893.05,-882.15 9784.25,-980.95 10126,-900 10162.37,-891.39 10166.18,-874.67 10202,-864 10314.65,-830.45 10358.03,-878.86 10464,-828 10484.97,-817.93 10483.42,-806 10502,-792 10598.72,-719.14 10724.42,-651.41 10790.62,-617.57"/>
+<polygon fill="black" stroke="black" points="10792.05,-620.77 10799.37,-613.12 10788.87,-614.53 10792.05,-620.77"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;bytestring -->
+<g id="edge809" class="edge">
+<title>uuid&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M8439.3,-949.82C8375.76,-945.82 8261.12,-939.1 8163,-936 7794.94,-924.38 5215.31,-937.74 4849,-900 4437.15,-857.57 4345.24,-775.84 3935,-720 3700.31,-688.06 3418.21,-673.98 3298.4,-669.12"/>
+<polygon fill="black" stroke="black" points="3298.62,-665.62 3288.49,-668.72 3298.34,-672.62 3298.62,-665.62"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;deepseq -->
+<g id="edge810" class="edge">
+<title>uuid&#45;types&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8449.18,-942.46C8439.98,-940.16 8430.18,-937.85 8421,-936 8316.14,-914.82 8267.31,-965.85 8183,-900 8096.82,-832.69 8104,-776.35 8104,-667 8104,-667 8104,-667 8104,-593 8104,-545.79 8085.25,-530.24 8046,-504 8008.9,-479.2 7885.87,-463.21 7814.84,-455.81"/>
+<polygon fill="black" stroke="black" points="7815.29,-452.34 7804.99,-454.8 7814.58,-459.3 7815.29,-452.34"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;binary -->
+<g id="edge808" class="edge">
+<title>uuid&#45;types&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M8448.79,-942.52C8439.7,-940.24 8430.04,-937.93 8421,-936 8329.68,-916.5 8283.8,-962.04 8214,-900 8176.1,-866.31 8167.54,-804.13 8165.95,-767.69"/>
+<polygon fill="black" stroke="black" points="8169.45,-767.81 8165.68,-757.91 8162.46,-768 8169.45,-767.81"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;text -->
+<g id="edge814" class="edge">
+<title>uuid&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M8450.6,-941.75C8418.47,-931.24 8375.82,-914.97 8366,-900 8357.23,-886.62 8356.83,-877.11 8366,-864 8389.94,-829.76 8438.49,-817.57 8472.8,-813.27"/>
+<polygon fill="black" stroke="black" points="8472.75,-816.79 8482.33,-812.25 8472.01,-809.83 8472.75,-816.79"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;random -->
+<g id="edge812" class="edge">
+<title>uuid&#45;types&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M8449.56,-942.39C8440.26,-940.06 8430.31,-937.77 8421,-936 8296.43,-912.36 8254.19,-950.75 8138,-900 8115.16,-890.02 8117.68,-874.34 8095,-864 7910.71,-779.96 7846.56,-811.9 7645,-792 7436.53,-771.41 6908.17,-798.33 6703,-756 6701.13,-755.61 6699.23,-755.16 6697.32,-754.64"/>
+<polygon fill="black" stroke="black" points="6698.54,-751.36 6687.95,-751.68 6696.43,-758.03 6698.54,-751.36"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;hashable -->
+<g id="edge811" class="edge">
+<title>uuid&#45;types&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M8450.31,-941.99C8441.72,-939.76 8432.59,-937.61 8424,-936 8281.59,-909.33 8241.99,-928.82 8100,-900 8095.68,-899.12 8091.22,-898.07 8086.79,-896.92"/>
+<polygon fill="black" stroke="black" points="8087.93,-893.6 8077.36,-894.31 8086.06,-900.35 8087.93,-893.6"/>
+</g>
+<!-- vector&#45;&gt;base -->
+<g id="edge815" class="edge">
+<title>vector&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M11334.33,-1302.31C11394.18,-1277.05 11542.74,-1208.73 11640,-1116 11750.98,-1010.18 11785.92,-974.87 11830,-828 11834.6,-812.68 11837.07,-806.35 11830,-792 11766.59,-663.2 11574,-738.57 11574,-595 11574,-595 11574,-595 11574,-449 11574,-400.79 11554.53,-382.7 11512,-360 11446.27,-324.91 9006.88,-309.23 8668.74,-307.22"/>
+<polygon fill="black" stroke="black" points="8668.92,-303.72 8658.9,-307.17 8668.88,-310.72 8668.92,-303.72"/>
+</g>
+<!-- vector&#45;&gt;deepseq -->
+<g id="edge816" class="edge">
+<title>vector&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M11274.63,-1309.29C11242.85,-1305.78 11193.68,-1300.41 11151,-1296 10988.41,-1279.2 10947.66,-1276.1 10785,-1260 10754.87,-1257.02 8636.32,-1066.44 8616,-1044 8605.26,-1032.14 8609.49,-1022.62 8616,-1008 8625.73,-986.15 8646.27,-993.85 8656,-972 8662.51,-957.38 8666.26,-948.28 8656,-936 8598.38,-867.02 8532.09,-949.4 8457,-900 8272.09,-778.34 8357.74,-592.81 8155,-504 8095.13,-477.77 7907.55,-461.25 7815.29,-454.49"/>
+<polygon fill="black" stroke="black" points="7815.73,-451.02 7805.51,-453.79 7815.23,-458 7815.73,-451.02"/>
+</g>
+<!-- vector&#45;&gt;random -->
+<g id="edge818" class="edge">
+<title>vector&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M11274.97,-1308.89C11243.23,-1305.06 11193.9,-1299.45 11151,-1296 10848,-1271.63 10771.33,-1279.86 10468,-1260 9239.77,-1179.6 8917.5,-1266.95 7707,-1044 7539.79,-1013.2 7503.22,-983.62 7340,-936 7099.22,-865.75 6810.24,-782.51 6702.38,-751.47"/>
+<polygon fill="black" stroke="black" points="6703.65,-748.2 6693.07,-748.8 6701.72,-754.93 6703.65,-748.2"/>
+</g>
+<!-- vector&#45;&gt;primitive -->
+<g id="edge817" class="edge">
+<title>vector&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M11317.26,-1296.34C11322.47,-1286.16 11328.61,-1272.69 11332,-1260 11340.3,-1228.94 11337.44,-1220.11 11339,-1188 11345.31,-1057.85 11328.56,-902.55 11320.76,-839.6"/>
+<polygon fill="black" stroke="black" points="11324.24,-839.26 11319.51,-829.78 11317.3,-840.14 11324.24,-839.26"/>
+</g>
+<!-- tasty -->
+<g id="node143" class="node">
+<title>tasty</title>
+<ellipse fill="none" stroke="black" cx="12170" cy="-1242" rx="28.11" ry="18"/>
+<text text-anchor="middle" x="12170" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">tasty</text>
+</g>
+<!-- vector&#45;&gt;tasty -->
+<g id="edge819" class="edge">
+<title>vector&#45;&gt;tasty</title>
+<path fill="none" stroke="black" d="M11341.79,-1310.26C11477.88,-1299.2 11985.47,-1257.99 12130.86,-1246.18"/>
+<polygon fill="black" stroke="black" points="12131.05,-1249.67 12140.74,-1245.38 12130.48,-1242.7 12131.05,-1249.67"/>
+</g>
+<!-- vector&#45;stream -->
+<g id="node146" class="node">
+<title>vector&#45;stream</title>
+<ellipse fill="none" stroke="black" cx="15532" cy="-378" rx="61.54" ry="18"/>
+<text text-anchor="middle" x="15532" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">vector&#45;stream</text>
+</g>
+<!-- vector&#45;&gt;vector&#45;stream -->
+<g id="edge820" class="edge">
+<title>vector&#45;&gt;vector&#45;stream</title>
+<path fill="none" stroke="black" d="M11342.2,-1312.91C11659,-1311.99 14085.89,-1303.62 14812,-1260 15117.13,-1241.67 15947.75,-1314.74 16180,-1116 16220.71,-1081.16 16242,-936.58 16242,-883 16242,-883 16242,-883 16242,-521 16242,-392.09 15786.26,-378.59 15605.04,-378.32"/>
+<polygon fill="black" stroke="black" points="15605.28,-374.82 15595.28,-378.32 15605.28,-381.82 15605.28,-374.82"/>
+</g>
+<!-- witherable&#45;&gt;base -->
+<g id="edge824" class="edge">
+<title>witherable&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M11576.51,-1455.06C11843.44,-1443.87 13183.27,-1383.62 14271,-1260 14590.14,-1223.73 15116.7,-1187.57 14917,-936 14843.88,-843.89 14803.1,-838.31 14695,-792 14631.58,-764.83 14609.64,-777.26 14544,-756 14504.19,-743.11 14497.26,-731.4 14457,-720 14359.98,-692.54 14330.61,-709.29 14233,-684 14096.63,-648.67 14072.67,-605.87 13935,-576 13738.49,-533.36 13681.15,-579.55 13484,-540 13433.56,-529.88 13423.75,-517.09 13374,-504 13217.05,-462.69 13175.42,-462.45 13016,-432 12839.43,-398.28 12796.93,-377.25 12618,-360 12204.01,-320.08 9054.33,-308.41 8668.66,-307.12"/>
+<polygon fill="black" stroke="black" points="8668.85,-303.62 8658.84,-307.09 8668.83,-310.62 8668.85,-303.62"/>
+</g>
+<!-- witherable&#45;&gt;containers -->
+<g id="edge826" class="edge">
+<title>witherable&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M11497.77,-1444C11447.58,-1422.72 11346.38,-1378.17 11265,-1332 11149.2,-1266.29 10879.47,-1068.78 10761,-1008 10683.6,-968.29 10662.07,-961.82 10579,-936 10442.69,-893.62 10406.79,-887.51 10266,-864 10115.25,-838.82 10066.26,-883.87 9924,-828 9899.18,-818.25 9899.13,-805.27 9876,-792 9804.48,-750.95 9783.93,-743.89 9705,-720 9623.57,-695.36 9599.49,-704.81 9517,-684 9514.43,-683.35 9511.8,-682.65 9509.15,-681.91"/>
+<polygon fill="black" stroke="black" points="9510.3,-678.61 9499.72,-679.17 9508.35,-685.33 9510.3,-678.61"/>
+</g>
+<!-- witherable&#45;&gt;transformers -->
+<g id="edge830" class="edge">
+<title>witherable&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M11567.71,-1446.87C11631.09,-1430.3 11760.95,-1396.4 11871,-1368 12169.81,-1290.88 12310.19,-1344.14 12518,-1116 12595.37,-1031.07 12627.06,-1010.06 12660,-900 12688.33,-805.35 12797.81,-841.51 12622,-576 12611.9,-560.75 12595.78,-549.28 12579.95,-540.99"/>
+<polygon fill="black" stroke="black" points="12581.55,-537.88 12571.03,-536.66 12578.49,-544.17 12581.55,-537.88"/>
+</g>
+<!-- witherable&#45;&gt;hashable -->
+<g id="edge827" class="edge">
+<title>witherable&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M11482.29,-1452.97C11439.34,-1449.34 11373.91,-1443.97 11317,-1440 11047.4,-1421.2 10978.79,-1432.03 10710,-1404 9723.25,-1301.09 9471,-1278.44 8507,-1044 8404.98,-1019.19 8375.29,-1020.17 8282,-972 8258.31,-959.77 8258.07,-947.48 8234,-936 8174.85,-907.78 8153.74,-918.96 8091,-900 8089.05,-899.41 8087.07,-898.79 8085.07,-898.15"/>
+<polygon fill="black" stroke="black" points="8086.39,-894.9 8075.8,-895.06 8084.18,-901.54 8086.39,-894.9"/>
+</g>
+<!-- witherable&#45;&gt;indexed&#45;traversable -->
+<g id="edge828" class="edge">
+<title>witherable&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M11550.69,-1441.56C11597.02,-1408.52 11709.02,-1328.41 11802,-1260 11930.88,-1165.18 11962.19,-1140.26 12090,-1044 12195.94,-964.21 12217.27,-936.99 12328,-864 12344.83,-852.91 12364.1,-841.7 12380.72,-832.46"/>
+<polygon fill="black" stroke="black" points="12382.27,-835.6 12389.35,-827.72 12378.9,-829.47 12382.27,-835.6"/>
+</g>
+<!-- witherable&#45;&gt;unordered&#45;containers -->
+<g id="edge831" class="edge">
+<title>witherable&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M11482.57,-1452.94C11239.04,-1431.15 10108.2,-1324.13 9787,-1188 9729.57,-1163.66 9594.98,-1034.87 9539.05,-979.9"/>
+<polygon fill="black" stroke="black" points="9541.74,-977.63 9532.16,-973.1 9536.83,-982.62 9541.74,-977.63"/>
+</g>
+<!-- witherable&#45;&gt;vector -->
+<g id="edge832" class="edge">
+<title>witherable&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M11509.9,-1441.18C11486.96,-1422.55 11446.92,-1391.18 11410,-1368 11388.51,-1354.51 11363.21,-1341.34 11343.18,-1331.51"/>
+<polygon fill="black" stroke="black" points="11344.83,-1328.42 11334.3,-1327.21 11341.78,-1334.72 11344.83,-1328.42"/>
+</g>
+<!-- witherable&#45;&gt;base&#45;orphans -->
+<g id="edge825" class="edge">
+<title>witherable&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M11576.87,-1455.89C11701.97,-1453.02 12049,-1445.21 12338,-1440 12604.43,-1435.2 14474.21,-1453.74 14736,-1404 15046.02,-1345.1 15182.18,-1357.76 15385,-1116 15479.11,-1003.82 15509.79,-970.13 15545,-828 15548.85,-812.47 15549.18,-807.44 15545,-792 15542.49,-782.74 15537.91,-773.44 15533.03,-765.27"/>
+<polygon fill="black" stroke="black" points="15536,-763.41 15527.64,-756.9 15530.11,-767.2 15536,-763.41"/>
+</g>
+<!-- witherable&#45;&gt;indexed&#45;traversable&#45;instances -->
+<g id="edge829" class="edge">
+<title>witherable&#45;&gt;indexed&#45;traversable&#45;instances</title>
+<path fill="none" stroke="black" d="M11573.22,-1450.41C11648.77,-1439.16 11804.28,-1416 11904.99,-1401"/>
+<polygon fill="black" stroke="black" points="11905.2,-1404.51 11914.58,-1399.57 11904.17,-1397.58 11905.2,-1404.51"/>
+</g>
+<!-- ansi&#45;terminal -->
+<g id="node73" class="node">
+<title>ansi&#45;terminal</title>
+<ellipse fill="none" stroke="black" cx="13755" cy="-522" rx="57.05" ry="18"/>
+<text text-anchor="middle" x="13755" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">ansi&#45;terminal</text>
+</g>
+<!-- ansi&#45;terminal&#45;&gt;base -->
+<g id="edge106" class="edge">
+<title>ansi&#45;terminal&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13720.83,-507.22C13702.5,-498.35 13680.71,-485.24 13666,-468 13632.47,-428.7 13665.6,-389.23 13623,-360 13568.79,-322.81 9131.13,-308.5 8668.81,-307.11"/>
+<polygon fill="black" stroke="black" points="8668.98,-303.61 8658.97,-307.08 8668.96,-310.61 8668.98,-303.61"/>
+</g>
+<!-- ansi&#45;terminal&#45;types -->
+<g id="node74" class="node">
+<title>ansi&#45;terminal&#45;types</title>
+<ellipse fill="none" stroke="black" cx="13755" cy="-450" rx="80.01" ry="18"/>
+<text text-anchor="middle" x="13755" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">ansi&#45;terminal&#45;types</text>
+</g>
+<!-- ansi&#45;terminal&#45;&gt;ansi&#45;terminal&#45;types -->
+<g id="edge105" class="edge">
+<title>ansi&#45;terminal&#45;&gt;ansi&#45;terminal&#45;types</title>
+<path fill="none" stroke="black" d="M13755,-503.7C13755,-496.41 13755,-487.73 13755,-479.54"/>
+<polygon fill="black" stroke="black" points="13758.5,-479.62 13755,-469.62 13751.5,-479.62 13758.5,-479.62"/>
+</g>
+<!-- colour -->
+<g id="node75" class="node">
+<title>colour</title>
+<ellipse fill="none" stroke="black" cx="13755" cy="-378" rx="34.6" ry="18"/>
+<text text-anchor="middle" x="13755" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">colour</text>
+</g>
+<!-- ansi&#45;terminal&#45;&gt;colour -->
+<g id="edge107" class="edge">
+<title>ansi&#45;terminal&#45;&gt;colour</title>
+<path fill="none" stroke="black" d="M13793.72,-508.32C13812.44,-500.01 13833.16,-487.07 13844,-468 13851.91,-454.09 13851.91,-445.91 13844,-432 13833.38,-413.31 13813.27,-400.52 13794.85,-392.19"/>
+<polygon fill="black" stroke="black" points="13796.26,-388.99 13785.68,-388.38 13793.57,-395.45 13796.26,-388.99"/>
+</g>
+<!-- ansi&#45;terminal&#45;types&#45;&gt;base -->
+<g id="edge108" class="edge">
+<title>ansi&#45;terminal&#45;types&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13740.02,-432.13C13718.61,-408.5 13679.75,-367.58 13661,-360 13538.19,-310.33 9127.83,-307.2 8668.55,-307.01"/>
+<polygon fill="black" stroke="black" points="8668.79,-303.51 8658.79,-307.01 8668.79,-310.51 8668.79,-303.51"/>
+</g>
+<!-- ansi&#45;terminal&#45;types&#45;&gt;colour -->
+<g id="edge109" class="edge">
+<title>ansi&#45;terminal&#45;types&#45;&gt;colour</title>
+<path fill="none" stroke="black" d="M13755,-431.7C13755,-424.41 13755,-415.73 13755,-407.54"/>
+<polygon fill="black" stroke="black" points="13758.5,-407.62 13755,-397.62 13751.5,-407.62 13758.5,-407.62"/>
+</g>
+<!-- colour&#45;&gt;base -->
+<g id="edge214" class="edge">
+<title>colour&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13727.6,-366.49C13719.48,-363.85 13710.49,-361.37 13702,-360 13438.52,-317.37 9123.85,-307.95 8668.76,-307.07"/>
+<polygon fill="black" stroke="black" points="8668.8,-303.57 8658.79,-307.05 8668.79,-310.57 8668.8,-303.57"/>
+</g>
+<!-- ansi&#45;wl&#45;pprint&#45;&gt;base -->
+<g id="edge110" class="edge">
+<title>ansi&#45;wl&#45;pprint&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M16086.77,-1079.81C16102.01,-1053.83 16128,-1002.52 16128,-955 16128,-955 16128,-955 16128,-809 16128,-768.03 16131.28,-750.56 16104,-720 16060.55,-671.33 15891.54,-636.31 15831,-612 15517.55,-486.13 15447.55,-413.25 15114,-360 14774.84,-305.86 9188.27,-306.78 8668.67,-306.98"/>
+<polygon fill="black" stroke="black" points="8668.86,-303.48 8658.86,-306.99 8668.86,-310.48 8668.86,-303.48"/>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint -->
+<g id="node77" class="node">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint</title>
+<ellipse fill="none" stroke="black" cx="14107" cy="-1026" rx="140.88" ry="18"/>
+<text text-anchor="middle" x="14107" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint</text>
+</g>
+<!-- ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint -->
+<g id="edge111" class="edge">
+<title>ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint</title>
+<path fill="none" stroke="black" d="M16014.88,-1094.86C15810.81,-1087.73 15134.28,-1064.03 14575,-1044 14466.87,-1040.13 14344.7,-1035.69 14252.3,-1032.32"/>
+<polygon fill="black" stroke="black" points="14252.53,-1028.82 14242.41,-1031.96 14252.28,-1035.82 14252.53,-1028.82"/>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;base -->
+<g id="edge594" class="edge">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14132.59,-1007.84C14168.46,-983.77 14235.74,-938.6 14293,-900 14387.75,-836.13 14430.33,-841.63 14506,-756 14559.17,-695.82 14588,-675.3 14588,-595 14588,-595 14588,-595 14588,-449 14588,-369.18 14509.06,-380.81 14432,-360 14283.95,-320.01 9164.78,-308.14 8668.57,-307.08"/>
+<polygon fill="black" stroke="black" points="8668.92,-303.58 8658.92,-307.06 8668.91,-310.58 8668.92,-303.58"/>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;text -->
+<g id="edge597" class="edge">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M13992.1,-1015.27C13956.51,-1012.54 13917.15,-1009.83 13881,-1008 12054.27,-915.37 11593.92,-988.66 9767,-900 9285.54,-876.63 8701.64,-827.49 8548.97,-814.31"/>
+<polygon fill="black" stroke="black" points="8549.7,-810.86 8539.44,-813.49 8549.1,-817.83 8549.7,-810.86"/>
+</g>
+<!-- prettyprinter -->
+<g id="node137" class="node">
+<title>prettyprinter</title>
+<ellipse fill="none" stroke="black" cx="13262" cy="-882" rx="56.05" ry="18"/>
+<text text-anchor="middle" x="13262" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">prettyprinter</text>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter -->
+<g id="edge595" class="edge">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M13989.73,-1015.74C13954.76,-1013.1 13916.34,-1010.31 13881,-1008 13845.13,-1005.65 13259.7,-998.11 13235,-972 13218.86,-954.94 13229.77,-928.54 13242.21,-908.92"/>
+<polygon fill="black" stroke="black" points="13244.94,-911.12 13247.67,-900.88 13239.15,-907.19 13244.94,-911.12"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal -->
+<g id="node138" class="node">
+<title>prettyprinter&#45;ansi&#45;terminal</title>
+<ellipse fill="none" stroke="black" cx="13959" cy="-954" rx="105.45" ry="18"/>
+<text text-anchor="middle" x="13959" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">prettyprinter&#45;ansi&#45;terminal</text>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter&#45;ansi&#45;terminal -->
+<g id="edge596" class="edge">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter&#45;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M14071.55,-1008.23C14051.27,-998.64 14025.62,-986.51 14003.94,-976.25"/>
+<polygon fill="black" stroke="black" points="14005.55,-973.15 13995.02,-972.04 14002.56,-979.48 14005.55,-973.15"/>
+</g>
+<!-- appar -->
+<g id="node78" class="node">
+<title>appar</title>
+<ellipse fill="none" stroke="black" cx="2338" cy="-738" rx="31.6" ry="18"/>
+<text text-anchor="middle" x="2338" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">appar</text>
+</g>
+<!-- appar&#45;&gt;base -->
+<g id="edge112" class="edge">
+<title>appar&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2340.37,-719.99C2343.87,-693.38 2350,-640.28 2350,-595 2350,-595 2350,-595 2350,-449 2350,-363.32 2437.87,-380.72 2521,-360 2677.88,-320.9 8080.72,-308.2 8591.36,-307.08"/>
+<polygon fill="black" stroke="black" points="8591.32,-310.58 8601.32,-307.06 8591.31,-303.58 8591.32,-310.58"/>
+</g>
+<!-- appar&#45;&gt;bytestring -->
+<g id="edge113" class="edge">
+<title>appar&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2366.99,-730.13C2383.1,-726.56 2403.56,-722.45 2422,-720 2705.06,-682.36 3046.92,-671.17 3181.52,-668.08"/>
+<polygon fill="black" stroke="black" points="3181.32,-671.59 3191.24,-667.87 3181.16,-664.59 3181.32,-671.59"/>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;base -->
+<g id="edge116" class="edge">
+<title>asn1&#45;encoding&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1259.22,-1152.84C1201.48,-1108.55 1044.66,-978.46 982,-828 942.01,-731.97 911.65,-424.84 993,-360 1032.74,-328.32 8009.01,-308.69 8591.39,-307.1"/>
+<polygon fill="black" stroke="black" points="8591.37,-310.6 8601.36,-307.08 8591.35,-303.6 8591.37,-310.6"/>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;bytestring -->
+<g id="edge117" class="edge">
+<title>asn1&#45;encoding&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1301.58,-1152.68C1362.83,-1104.56 1550.22,-960.62 1720,-864 1753.53,-844.92 1764.47,-845.21 1799,-828 1889.06,-783.11 1901.01,-746.84 1998,-720 2112.62,-688.29 2950.6,-671.89 3181.33,-667.95"/>
+<polygon fill="black" stroke="black" points="3181.35,-671.45 3191.29,-667.78 3181.24,-664.45 3181.35,-671.45"/>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;asn1&#45;types -->
+<g id="edge115" class="edge">
+<title>asn1&#45;encoding&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M1245.78,-1154.67C1218.67,-1143.64 1181.09,-1128.34 1152.17,-1116.57"/>
+<polygon fill="black" stroke="black" points="1153.54,-1113.35 1142.96,-1112.82 1150.9,-1119.83 1153.54,-1113.35"/>
+</g>
+<!-- hourglass -->
+<g id="node81" class="node">
+<title>hourglass</title>
+<ellipse fill="none" stroke="black" cx="2582" cy="-1026" rx="46.07" ry="18"/>
+<text text-anchor="middle" x="2582" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">hourglass</text>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;hourglass -->
+<g id="edge118" class="edge">
+<title>asn1&#45;encoding&#45;&gt;hourglass</title>
+<path fill="none" stroke="black" d="M1340.28,-1162.53C1558.48,-1138.71 2315.22,-1056.12 2526.71,-1033.03"/>
+<polygon fill="black" stroke="black" points="2527.05,-1036.52 2536.61,-1031.95 2526.29,-1029.56 2527.05,-1036.52"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;base -->
+<g id="edge123" class="edge">
+<title>asn1&#45;types&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1083.08,-1082.14C1036.5,-1053.75 939.95,-986.83 902,-900 849.87,-780.72 892.78,-400.98 938,-360 975.94,-325.62 8007.82,-308.45 8591.54,-307.09"/>
+<polygon fill="black" stroke="black" points="8591.16,-310.59 8601.15,-307.07 8591.15,-303.59 8591.16,-310.59"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;bytestring -->
+<g id="edge124" class="edge">
+<title>asn1&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1123.69,-1080.79C1151.64,-1050.43 1215.16,-983.73 1276,-936 1476.78,-778.49 1557.14,-766.79 1808,-720 2077.97,-669.65 2947.31,-666.73 3181.45,-666.87"/>
+<polygon fill="black" stroke="black" points="3181.24,-670.37 3191.25,-666.88 3181.25,-663.37 3181.24,-670.37"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;hourglass -->
+<g id="edge125" class="edge">
+<title>asn1&#45;types&#45;&gt;hourglass</title>
+<path fill="none" stroke="black" d="M1158.85,-1094.63C1381.86,-1084.03 2287.36,-1041 2524.78,-1029.72"/>
+<polygon fill="black" stroke="black" points="2524.89,-1033.22 2534.71,-1029.25 2524.56,-1026.23 2524.89,-1033.22"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;memory -->
+<g id="edge126" class="edge">
+<title>asn1&#45;types&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M1061.91,-1091.09C957.71,-1078.02 708.44,-1046.75 601.32,-1033.31"/>
+<polygon fill="black" stroke="black" points="602.05,-1029.88 591.7,-1032.11 601.18,-1036.82 602.05,-1029.88"/>
+</g>
+<!-- hourglass&#45;&gt;base -->
+<g id="edge385" class="edge">
+<title>hourglass&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2536.58,-1022.57C2290.35,-1008.97 1122.49,-938.94 1011,-828 959.85,-777.1 990,-739.16 990,-667 990,-667 990,-667 990,-449 990,-405.45 994.41,-383.61 1031,-360 1115.96,-305.18 8012.41,-306.75 8591.38,-306.98"/>
+<polygon fill="black" stroke="black" points="8591.29,-310.48 8601.29,-306.99 8591.29,-303.48 8591.29,-310.48"/>
+</g>
+<!-- hourglass&#45;&gt;Win32 -->
+<g id="edge384" class="edge">
+<title>hourglass&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M2628.01,-1023.39C2785.72,-1017.76 3318.96,-997.94 3759,-972 3978.76,-959.05 4033.3,-949.82 4253,-936 4555.05,-917 4630.95,-918.97 4933,-900 4998.4,-895.89 5074,-890.24 5121.17,-886.6"/>
+<polygon fill="black" stroke="black" points="5121.31,-890.1 5131.01,-885.83 5120.77,-883.12 5121.31,-890.1"/>
+</g>
+<!-- hourglass&#45;&gt;deepseq -->
+<g id="edge386" class="edge">
+<title>hourglass&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2606.23,-1010.39C2662.06,-977.56 2805.01,-898.15 2936,-864 3122.44,-815.4 3176.88,-852.38 3368,-828 3555,-804.15 3600.5,-789.55 3786,-756 3955.15,-725.41 3998.96,-724.56 4166,-684 4220.52,-670.76 4232.87,-662.76 4287,-648 4351.06,-630.53 4367.98,-629.62 4432,-612 4485.28,-597.34 4496.63,-585.86 4551,-576 5193.33,-459.46 7344.33,-451.53 7709.96,-451.03"/>
+<polygon fill="black" stroke="black" points="7709.72,-454.53 7719.72,-451.02 7709.71,-447.53 7709.72,-454.53"/>
+</g>
+<!-- asn1&#45;parse -->
+<g id="node82" class="node">
+<title>asn1&#45;parse</title>
+<ellipse fill="none" stroke="black" cx="1105" cy="-1242" rx="50.56" ry="18"/>
+<text text-anchor="middle" x="1105" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;parse</text>
+</g>
+<!-- asn1&#45;parse&#45;&gt;base -->
+<g id="edge121" class="edge">
+<title>asn1&#45;parse&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1091.4,-1224.18C1058.52,-1182.98 973.29,-1073.04 917,-972 784.63,-734.38 701.18,-528.13 915,-360 955.37,-328.26 8006.15,-308.67 8591.43,-307.1"/>
+<polygon fill="black" stroke="black" points="8591.09,-310.6 8601.08,-307.08 8591.07,-303.6 8591.09,-310.6"/>
+</g>
+<!-- asn1&#45;parse&#45;&gt;bytestring -->
+<g id="edge122" class="edge">
+<title>asn1&#45;parse&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1121.43,-1224.73C1200.04,-1148.18 1548.88,-823.35 1909,-720 2032.23,-684.64 2940.6,-670.77 3181.5,-667.69"/>
+<polygon fill="black" stroke="black" points="3181.32,-671.2 3191.28,-667.57 3181.23,-664.2 3181.32,-671.2"/>
+</g>
+<!-- asn1&#45;parse&#45;&gt;asn1&#45;encoding -->
+<g id="edge119" class="edge">
+<title>asn1&#45;parse&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M1137.69,-1228C1164.99,-1217.14 1204.23,-1201.53 1234.75,-1189.39"/>
+<polygon fill="black" stroke="black" points="1235.75,-1192.76 1243.75,-1185.82 1233.16,-1186.26 1235.75,-1192.76"/>
+</g>
+<!-- asn1&#45;parse&#45;&gt;asn1&#45;types -->
+<g id="edge120" class="edge">
+<title>asn1&#45;parse&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M1105.49,-1223.59C1106.17,-1199.61 1107.39,-1156.14 1108.2,-1127.42"/>
+<polygon fill="black" stroke="black" points="1111.69,-1127.72 1108.48,-1117.62 1104.7,-1127.52 1111.69,-1127.72"/>
+</g>
+<!-- memory&#45;&gt;base -->
+<g id="edge535" class="edge">
+<title>memory&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M559.15,-1008.17C563.81,-997.92 569.43,-984.45 573,-972 640.27,-737.46 551.01,-643.89 672,-432 695.07,-391.59 704.83,-377.37 748,-360 845.37,-320.82 8000.93,-308.05 8591.34,-307.06"/>
+<polygon fill="black" stroke="black" points="8591.08,-310.56 8601.08,-307.05 8591.07,-303.56 8591.08,-310.56"/>
+</g>
+<!-- memory&#45;&gt;ghc&#45;prim -->
+<g id="edge539" class="edge">
+<title>memory&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M520.79,-1013.39C431.99,-977.07 178,-856.61 178,-667 178,-667 178,-667 178,-593 178,-496.4 140,-475.6 140,-379 140,-379 140,-379 140,-233 140,-162.98 203.15,-164.82 270,-144 461.81,-84.26 14282.27,-90.51 15169.38,-90.98"/>
+<polygon fill="black" stroke="black" points="15169.14,-94.48 15179.14,-90.98 15169.14,-87.48 15169.14,-94.48"/>
+</g>
+<!-- memory&#45;&gt;bytestring -->
+<g id="edge537" class="edge">
+<title>memory&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M580.65,-1013.14C701.97,-965.25 1173.48,-785.62 1580,-720 1897.84,-668.69 2924.36,-666.57 3181.28,-666.86"/>
+<polygon fill="black" stroke="black" points="3181.06,-670.36 3191.07,-666.88 3181.07,-663.36 3181.06,-670.36"/>
+</g>
+<!-- memory&#45;&gt;deepseq -->
+<g id="edge538" class="edge">
+<title>memory&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M590.94,-1021.25C880.04,-993.91 2681.9,-820.59 4139,-612 4326.48,-585.16 4373.52,-578.26 4559,-540 4625.72,-526.24 4640.42,-512.64 4708,-504 5016.81,-464.5 7328.32,-452.88 7709.77,-451.22"/>
+<polygon fill="black" stroke="black" points="7709.76,-454.72 7719.74,-451.18 7709.73,-447.72 7709.76,-454.72"/>
+</g>
+<!-- basement -->
+<g id="node95" class="node">
+<title>basement</title>
+<ellipse fill="none" stroke="black" cx="518" cy="-954" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="518" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">basement</text>
+</g>
+<!-- memory&#45;&gt;basement -->
+<g id="edge536" class="edge">
+<title>memory&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M543.01,-1008.05C539.32,-1000.23 534.85,-990.75 530.72,-981.98"/>
+<polygon fill="black" stroke="black" points="533.99,-980.71 526.56,-973.16 527.66,-983.7 533.99,-980.71"/>
+</g>
+<!-- assoc&#45;&gt;base -->
+<g id="edge127" class="edge">
+<title>assoc&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10881.87,-870.93C10952.35,-843.4 11142.99,-768.09 11151,-756 11201.78,-679.34 11109.48,-407.92 11031,-360 10978.38,-327.87 8972.32,-309.86 8668.41,-307.31"/>
+<polygon fill="black" stroke="black" points="8668.69,-303.82 8658.66,-307.23 8668.63,-310.82 8668.69,-303.82"/>
+</g>
+<!-- async -->
+<g id="node85" class="node">
+<title>async</title>
+<ellipse fill="none" stroke="black" cx="4294" cy="-954" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="4294" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">async</text>
+</g>
+<!-- async&#45;&gt;base -->
+<g id="edge128" class="edge">
+<title>async&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M4276.89,-938.58C4225.5,-893.54 4076,-749.27 4076,-595 4076,-595 4076,-595 4076,-449 4076,-314.18 4232.8,-380.83 4366,-360 4586.57,-325.51 8178.09,-308.96 8591.34,-307.16"/>
+<polygon fill="black" stroke="black" points="8591.13,-310.67 8601.12,-307.12 8591.1,-303.67 8591.13,-310.67"/>
+</g>
+<!-- async&#45;&gt;stm -->
+<g id="edge130" class="edge">
+<title>async&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M4276.4,-938.61C4256.53,-920.56 4229.02,-888.97 4246,-864 4270.45,-828.03 4302.06,-853.91 4337,-828 4419.07,-767.14 4400.53,-712.22 4480,-648 4492.26,-638.09 4527.7,-621.26 4554.46,-609.22"/>
+<polygon fill="black" stroke="black" points="4555.86,-612.43 4563.57,-605.16 4553.01,-606.04 4555.86,-612.43"/>
+</g>
+<!-- async&#45;&gt;hashable -->
+<g id="edge129" class="edge">
+<title>async&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M4326.41,-952.39C4665.32,-946.07 7556.75,-892.08 7989.02,-884.01"/>
+<polygon fill="black" stroke="black" points="7988.78,-887.51 7998.71,-883.83 7988.65,-880.51 7988.78,-887.51"/>
+</g>
+<!-- attoparsec&#45;&gt;base -->
+<g id="edge132" class="edge">
+<title>attoparsec&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M8694.72,-1009.42C8717.12,-990.74 8747.07,-959.06 8727,-936 8650.69,-848.35 8544.31,-987.65 8468,-900 8456.15,-886.39 8462.07,-813.79 8475,-792 8501.54,-747.28 8858,-575 8858,-523 8858,-523 8858,-523 8858,-449 8858,-396.98 8825.57,-388.41 8782,-360 8738.45,-331.61 8716.51,-343.3 8668.15,-326.13"/>
+<polygon fill="black" stroke="black" points="8669.42,-322.87 8658.83,-322.55 8666.91,-329.4 8669.42,-322.87"/>
+</g>
+<!-- attoparsec&#45;&gt;ghc&#45;prim -->
+<g id="edge136" class="edge">
+<title>attoparsec&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M8723.28,-1024.23C8890.3,-1021.66 9450.24,-1013.18 9913,-1008 9970.78,-1007.35 14020.21,-995.49 14073,-972 14092.83,-963.17 14086.27,-945.06 14106,-936 14220.06,-883.64 15132.03,-971.77 15235,-900 15239.43,-896.91 15379.97,-545.3 15381,-540 15384.06,-524.3 15381.61,-519.99 15381,-504 15377.66,-416.25 15366,-394.81 15366,-307 15366,-307 15366,-307 15366,-233 15366,-189.81 15357.14,-174.93 15327,-144 15308.28,-124.8 15281.26,-111.78 15258.33,-103.45"/>
+<polygon fill="black" stroke="black" points="15259.48,-100.14 15248.89,-100.22 15257.22,-106.76 15259.48,-100.14"/>
+</g>
+<!-- attoparsec&#45;&gt;array -->
+<g id="edge131" class="edge">
+<title>attoparsec&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M8625.44,-1022.63C8477.41,-1015.25 8033.3,-992 7890,-972 7357.59,-897.68 7232.98,-831.06 6707,-720 6630.58,-703.86 6611.39,-700.28 6535,-684 6239.66,-621.07 6164.29,-611.89 5871,-540 5753.29,-511.15 5715.05,-524.81 5608,-468 5586.28,-456.47 5586.56,-445.49 5566,-432 5542.37,-416.5 5513.53,-402.67 5491.46,-393.03"/>
+<polygon fill="black" stroke="black" points="5492.86,-389.83 5482.29,-389.11 5490.11,-396.27 5492.86,-389.83"/>
+</g>
+<!-- attoparsec&#45;&gt;bytestring -->
+<g id="edge133" class="edge">
+<title>attoparsec&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M8624.73,-1024.76C8293.89,-1023.03 6391.5,-1011.51 5813,-972 5677.26,-962.73 5644.7,-945.88 5509,-936 4927.65,-893.68 4778.68,-950.63 4198,-900 4198,-900 3710,-828 3710,-828 3689.08,-817.83 3691.2,-805.14 3672,-792 3641.16,-770.88 3626.84,-777.12 3596,-756 3576.8,-742.86 3578.83,-730.36 3558,-720 3474.57,-678.48 3365.14,-668.55 3298.83,-666.68"/>
+<polygon fill="black" stroke="black" points="3298.96,-663.18 3288.88,-666.46 3298.8,-670.18 3298.96,-663.18"/>
+</g>
+<!-- attoparsec&#45;&gt;containers -->
+<g id="edge134" class="edge">
+<title>attoparsec&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M8715.75,-1016.04C8739.59,-1008.55 8767.53,-995.22 8782,-972 8790.46,-958.42 8791.43,-948.93 8782,-936 8751.2,-893.75 8700.8,-942.25 8670,-900 8660.57,-887.07 8663.68,-878.7 8670,-864 8706.77,-778.51 8737.05,-757.98 8822,-720 8874.35,-696.6 9255.34,-676.63 9403.9,-669.65"/>
+<polygon fill="black" stroke="black" points="9403.7,-673.16 9413.52,-669.2 9403.37,-666.17 9403.7,-673.16"/>
+</g>
+<!-- attoparsec&#45;&gt;deepseq -->
+<g id="edge135" class="edge">
+<title>attoparsec&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8627,-1020.55C8589.4,-1017.02 8535.33,-1012.04 8488,-1008 8343.42,-995.66 7936.76,-1011.59 7844,-900 7790.13,-835.2 7769.85,-567.97 7764.54,-479.55"/>
+<polygon fill="black" stroke="black" points="7768.04,-479.37 7763.96,-469.58 7761.05,-479.77 7768.04,-479.37"/>
+</g>
+<!-- attoparsec&#45;&gt;transformers -->
+<g id="edge139" class="edge">
+<title>attoparsec&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M8723.26,-1024.29C8912.42,-1021.35 9610.36,-1008.51 10184,-972 10357.72,-960.94 10400.45,-949.47 10574,-936 10700.98,-926.15 11029.92,-952.41 11146,-900 11166.62,-890.69 11162.01,-874.6 11182,-864 11256.77,-824.33 11294.81,-868.73 11369,-828 11388.29,-817.41 11386.8,-806.9 11403,-792 11403.89,-791.19 11672.88,-576.43 11674,-576 11746.81,-547.98 12273.12,-530.37 12463.5,-524.86"/>
+<polygon fill="black" stroke="black" points="12463.33,-528.37 12473.23,-524.58 12463.13,-521.37 12463.33,-528.37"/>
+</g>
+<!-- attoparsec&#45;&gt;text -->
+<g id="edge138" class="edge">
+<title>attoparsec&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M8710.75,-1013.72C8730.59,-1005.54 8753.34,-992.29 8765,-972 8772.97,-958.13 8775.58,-948 8765,-936 8680.57,-840.23 8564.43,-995.77 8480,-900 8463.89,-881.73 8477,-854.62 8490.79,-835.12"/>
+<polygon fill="black" stroke="black" points="8493.55,-837.27 8496.79,-827.18 8487.97,-833.05 8493.55,-837.27"/>
+</g>
+<!-- attoparsec&#45;&gt;scientific -->
+<g id="edge137" class="edge">
+<title>attoparsec&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M8723.13,-1024.06C8935.68,-1019.82 9777.03,-1001.51 10040,-972 10053.73,-970.46 10068.49,-968.04 10082.05,-965.5"/>
+<polygon fill="black" stroke="black" points="10082.47,-968.98 10091.62,-963.65 10081.14,-962.11 10082.47,-968.98"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;base -->
+<g id="edge142" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M3358.61,-1456C3239.6,-1453.22 3004.96,-1442.8 2810,-1404 2758.3,-1393.71 2747.47,-1383.22 2697,-1368 2585.07,-1334.25 2559.1,-1316.49 2444,-1296 2233.81,-1258.59 2168.22,-1325.42 1965,-1260 1696.96,-1173.71 1518,-1092.59 1518,-811 1518,-811 1518,-811 1518,-665 1518,-524.97 1476.58,-431.47 1597,-360 1677.33,-312.32 8036.07,-307.36 8591.38,-307.02"/>
+<polygon fill="black" stroke="black" points="8591.21,-310.52 8601.21,-307.02 8591.2,-303.52 8591.21,-310.52"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;bytestring -->
+<g id="edge145" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3378.72,-1445.5C3367.26,-1443.46 3355.27,-1441.5 3344,-1440 3248.08,-1427.19 2988.48,-1460.62 2910,-1404 2875.12,-1378.83 2872,-1358.01 2872,-1315 2872,-1315 2872,-1315 2872,-1169 2872,-1128.03 2863.66,-1117.86 2848,-1080 2826.84,-1028.86 2800.26,-1025.48 2786,-972 2773.22,-924.09 2783.55,-903.14 2814,-864 2847.85,-820.49 2864.85,-814.89 2915,-792 2976.98,-763.71 3004.14,-788.53 3064,-756 3084.44,-744.89 3082.32,-732.41 3102,-720 3129.57,-702.62 3163.75,-689.44 3191.2,-680.57"/>
+<polygon fill="black" stroke="black" points="3192.18,-683.93 3200.68,-677.6 3190.09,-677.25 3192.18,-683.93"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;time -->
+<g id="edge151" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M3513.04,-1455.52C3847.03,-1448.61 5160.34,-1416.26 5323,-1332 5452.46,-1264.94 5470.63,-1059.88 5472.85,-983.8"/>
+<polygon fill="black" stroke="black" points="5476.35,-983.93 5473.05,-973.85 5469.35,-983.78 5476.35,-983.93"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;transformers -->
+<g id="edge152" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M3513.57,-1456.68C4106.07,-1454.15 7906.16,-1436.77 8415,-1404 8957.66,-1369.06 9090.53,-1328.33 9630,-1260 10342.75,-1169.72 10523.63,-1163.86 11232,-1044 11516.9,-995.79 11605.46,-1024.95 11866,-900 11890.04,-888.47 11889.92,-875.46 11914,-864 11973.57,-835.65 12000.94,-861.11 12058,-828 12134.67,-783.51 12136.74,-749.93 12196,-684 12237.96,-637.32 12233.22,-608.37 12287,-576 12340.82,-543.61 12411.83,-530.89 12463.54,-525.97"/>
+<polygon fill="black" stroke="black" points="12463.76,-529.46 12473.42,-525.11 12463.15,-522.49 12463.76,-529.46"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;random -->
+<g id="edge150" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M3513.51,-1455.95C3867.83,-1451.06 5335.88,-1429.59 5795,-1404 6154.98,-1383.94 6283.96,-1499.93 6603,-1332 6775.15,-1241.38 6837.27,-1165.98 6852,-972 6853.21,-956.05 6862,-948.49 6852,-936 6806.47,-879.08 6743.04,-952.03 6692,-900 6657.35,-864.68 6654.5,-803.34 6656.27,-767.44"/>
+<polygon fill="black" stroke="black" points="6659.74,-768.03 6656.91,-757.82 6652.75,-767.57 6659.74,-768.03"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;RSA -->
+<g id="edge140" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;RSA</title>
+<path fill="none" stroke="black" d="M3377.67,-1445.77C3366.51,-1443.75 3354.91,-1441.74 3344,-1440 3213.9,-1419.29 3058.88,-1400.14 2987.52,-1391.63"/>
+<polygon fill="black" stroke="black" points="2988.25,-1388.19 2977.9,-1390.49 2987.42,-1395.14 2988.25,-1388.19"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;SHA -->
+<g id="edge141" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;SHA</title>
+<path fill="none" stroke="black" d="M3431.07,-1439.87C3411.53,-1367.97 3346.81,-1087.22 3480,-936 3541.54,-866.13 3833.04,-827.35 3940.82,-815.21"/>
+<polygon fill="black" stroke="black" points="3941.09,-818.7 3950.64,-814.12 3940.31,-811.74 3941.09,-818.7"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge146" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M3359.56,-1454.39C3237.05,-1449.4 2989.43,-1436.02 2782,-1404 2640.5,-1382.16 2603.27,-1378.92 2468,-1332 2432.69,-1319.75 2428.17,-1305.42 2392,-1296 2359.02,-1287.41 1901.76,-1260.18 1699.3,-1248.46"/>
+<polygon fill="black" stroke="black" points="1699.79,-1244.98 1689.61,-1247.9 1699.39,-1251.97 1699.79,-1244.98"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;transformers&#45;compat -->
+<g id="edge153" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M3513.86,-1456.94C4270.05,-1456.3 10318.1,-1449.77 12127,-1404 12846.15,-1385.8 13025.52,-1367.95 13744,-1332 14320.17,-1303.17 14477.91,-1389.84 15040,-1260 15284.18,-1203.6 15397.99,-1138.81 15474,-900 15478.85,-884.75 15481.4,-878.19 15474,-864 15467.31,-851.17 15455.93,-840.81 15444,-832.78"/>
+<polygon fill="black" stroke="black" points="15446.01,-829.91 15435.67,-827.62 15442.33,-835.86 15446.01,-829.91"/>
+</g>
+<!-- base64&#45;bytestring -->
+<g id="node88" class="node">
+<title>base64&#45;bytestring</title>
+<ellipse fill="none" stroke="black" cx="2388" cy="-1170" rx="76.01" ry="18"/>
+<text text-anchor="middle" x="2388" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">base64&#45;bytestring</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;base64&#45;bytestring -->
+<g id="edge143" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;base64&#45;bytestring</title>
+<path fill="none" stroke="black" d="M3379.22,-1445.51C3367.61,-1443.44 3355.44,-1441.48 3344,-1440 3236.59,-1426.14 2959.4,-1442.02 2858,-1404 2833.03,-1394.64 2833.37,-1380.85 2810,-1368 2730.87,-1324.48 2707.35,-1318.91 2620,-1296 2568.47,-1282.49 2417.72,-1300.4 2383,-1260 2368.9,-1243.6 2371.69,-1218.57 2377.13,-1199.23"/>
+<polygon fill="black" stroke="black" points="2380.44,-1200.36 2380.16,-1189.77 2373.77,-1198.22 2380.44,-1200.36"/>
+</g>
+<!-- blaze&#45;builder -->
+<g id="node89" class="node">
+<title>blaze&#45;builder</title>
+<ellipse fill="none" stroke="black" cx="6126" cy="-882" rx="58.05" ry="18"/>
+<text text-anchor="middle" x="6126" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">blaze&#45;builder</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;blaze&#45;builder -->
+<g id="edge144" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;blaze&#45;builder</title>
+<path fill="none" stroke="black" d="M3513.11,-1455.26C3989.4,-1444.34 6512.71,-1384.12 6572,-1332 6657.07,-1257.22 6673.22,-1173.98 6610,-1080 6515.86,-940.04 6303.18,-899.47 6193.79,-887.74"/>
+<polygon fill="black" stroke="black" points="6194.38,-884.28 6184.08,-886.76 6193.67,-891.25 6194.38,-884.28"/>
+</g>
+<!-- data&#45;default -->
+<g id="node90" class="node">
+<title>data&#45;default</title>
+<ellipse fill="none" stroke="black" cx="3108" cy="-882" rx="54.06" ry="18"/>
+<text text-anchor="middle" x="3108" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">data&#45;default</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;data&#45;default -->
+<g id="edge147" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M3419.97,-1440.3C3410.96,-1430.32 3399.96,-1417.07 3392,-1404 3328.69,-1300.09 3342.26,-1259.36 3285,-1152 3249.04,-1084.56 3233.03,-1071.84 3191,-1008 3168.49,-973.81 3142.34,-934.5 3125.5,-909.23"/>
+<polygon fill="black" stroke="black" points="3128.62,-907.59 3120.16,-901.21 3122.79,-911.48 3128.62,-907.59"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;http&#45;client -->
+<g id="edge148" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;http&#45;client</title>
+<path fill="none" stroke="black" d="M3508.05,-1450.92C3683.18,-1436.17 4145.19,-1397.59 4531,-1368 4783.09,-1348.67 5083.99,-1327.6 5208.1,-1318.99"/>
+<polygon fill="black" stroke="black" points="5208.31,-1322.49 5218.04,-1318.31 5207.82,-1315.51 5208.31,-1322.49"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;http&#45;types -->
+<g id="edge149" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M3437.62,-1439.53C3439.96,-1412.75 3444,-1359.94 3444,-1315 3444,-1315 3444,-1315 3444,-1241 3444,-1130.42 3585.29,-1067.35 3661.92,-1041.28"/>
+<polygon fill="black" stroke="black" points="3662.9,-1044.64 3671.3,-1038.18 3660.7,-1038 3662.9,-1044.64"/>
+</g>
+<!-- base64&#45;bytestring&#45;&gt;base -->
+<g id="edge160" class="edge">
+<title>base64&#45;bytestring&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2346.55,-1154.49C2236.36,-1113.2 1938.23,-983.17 1846,-756 1812.9,-674.46 1784.02,-422.47 1846,-360 1877.72,-328.03 8046.84,-308.75 8591.66,-307.11"/>
+<polygon fill="black" stroke="black" points="8591.3,-310.62 8601.28,-307.09 8591.27,-303.62 8591.3,-310.62"/>
+</g>
+<!-- base64&#45;bytestring&#45;&gt;bytestring -->
+<g id="edge161" class="edge">
+<title>base64&#45;bytestring&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2394.83,-1151.69C2410.48,-1112.52 2450.76,-1014.41 2492,-936 2492,-936 2580,-792 2580,-792 2661.44,-737.12 2707.69,-794.56 2798,-756 2822.52,-745.53 2821.32,-730.1 2846,-720 2905.71,-695.55 3088.33,-678.55 3182.5,-671.15"/>
+<polygon fill="black" stroke="black" points="3182.6,-674.66 3192.3,-670.39 3182.06,-667.68 3182.6,-674.66"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;base -->
+<g id="edge177" class="edge">
+<title>blaze&#45;builder&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M6088.57,-867.96C6036.05,-849.85 5937.31,-816.56 5852,-792 5789.02,-773.87 5749.29,-807.69 5709,-756 5652.35,-683.32 5756.76,-413.2 5832,-360 5891.02,-318.26 8259.82,-308.32 8591.57,-307.13"/>
+<polygon fill="black" stroke="black" points="8591.42,-310.63 8601.41,-307.09 8591.4,-303.63 8591.42,-310.63"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;ghc&#45;prim -->
+<g id="edge180" class="edge">
+<title>blaze&#45;builder&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M6183.76,-879.31C6305.09,-875.83 6595.42,-867.87 6839,-864 7845.57,-848 10363.05,-866.87 11369,-828 12061.7,-801.23 12232.55,-752.66 12925,-720 13085.09,-712.45 14210.36,-717.94 14367,-684 14646.87,-623.35 14687.08,-518.73 14960,-432 15079.91,-393.89 15214,-432.82 15214,-307 15214,-307 15214,-307 15214,-233 15214,-193.74 15214,-148.38 15214,-119.69"/>
+<polygon fill="black" stroke="black" points="15217.5,-120 15214,-110 15210.5,-120 15217.5,-120"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;bytestring -->
+<g id="edge178" class="edge">
+<title>blaze&#45;builder&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M6083.25,-869.5C6075.22,-867.53 6066.88,-865.6 6059,-864 5955.89,-843.04 5695.74,-802.07 5591,-792 5183.23,-752.79 5078.54,-786.03 4670,-756 4521.54,-745.09 4485.41,-731.6 4337,-720 3940.66,-689.03 3462.26,-673.35 3298.36,-668.6"/>
+<polygon fill="black" stroke="black" points="3298.72,-665.11 3288.62,-668.32 3298.52,-672.1 3298.72,-665.11"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;deepseq -->
+<g id="edge179" class="edge">
+<title>blaze&#45;builder&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6124.75,-863.6C6122.06,-811.86 6121.56,-657.52 6203,-576 6249.02,-529.94 6286.26,-568.08 6345,-540 6369.06,-528.5 6367.87,-512.92 6393,-504 6518.6,-459.42 7473.05,-452.28 7709.92,-451.19"/>
+<polygon fill="black" stroke="black" points="7709.8,-454.69 7719.78,-451.14 7709.77,-447.69 7709.8,-454.69"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;text -->
+<g id="edge181" class="edge">
+<title>blaze&#45;builder&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M6183.77,-879.3C6517.78,-869.5 8196.27,-820.24 8472.5,-812.13"/>
+<polygon fill="black" stroke="black" points="8472.47,-815.63 8482.36,-811.84 8472.26,-808.64 8472.47,-815.63"/>
+</g>
+<!-- data&#45;default&#45;&gt;base -->
+<g id="edge313" class="edge">
+<title>data&#45;default&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M3070.14,-868.72C3006.75,-848.75 2874.79,-809.69 2760,-792 2688.73,-781.01 2170.3,-798.45 2112,-756 2050.01,-710.87 2050,-671.68 2050,-595 2050,-595 2050,-595 2050,-449 2050,-400.79 2069.36,-382.48 2112,-360 2188.45,-319.69 8058.96,-308.04 8591.45,-307.07"/>
+<polygon fill="black" stroke="black" points="8591.18,-310.57 8601.18,-307.05 8591.17,-303.57 8591.18,-310.57"/>
+</g>
+<!-- data&#45;default&#45;&gt;containers -->
+<g id="edge314" class="edge">
+<title>data&#45;default&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3161.53,-878.52C3595.3,-858.42 6520.87,-722.91 6611,-720 7731.97,-683.83 9101.64,-670.18 9402.67,-667.51"/>
+<polygon fill="black" stroke="black" points="9402.68,-671.01 9412.65,-667.42 9402.62,-664.01 9402.68,-671.01"/>
+</g>
+<!-- http&#45;client&#45;&gt;base -->
+<g id="edge390" class="edge">
+<title>http&#45;client&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5218.34,-1312.55C4852.39,-1309.04 2502.02,-1285.5 2477,-1260 2465.79,-1248.58 2474.44,-1239.79 2477,-1224 2479.7,-1207.35 2486.3,-1204.65 2489,-1188 2491.56,-1172.21 2489.88,-1167.98 2489,-1152 2486.33,-1103.78 2479.67,-1092.22 2477,-1044 2476.12,-1028.02 2476.67,-1024 2477,-1008 2477.67,-975.98 2476.48,-967.83 2480,-936 2483.57,-903.68 2485.96,-895.75 2493,-864 2500.17,-831.69 2499.05,-822.46 2512,-792 2537.45,-732.17 2588,-732.02 2588,-667 2588,-667 2588,-667 2588,-449 2588,-393.06 2625.41,-381.64 2677,-360 2822.17,-299.11 8086,-306.12 8591.15,-306.93"/>
+<polygon fill="black" stroke="black" points="8590.99,-310.43 8601,-306.95 8591,-303.43 8590.99,-310.43"/>
+</g>
+<!-- http&#45;client&#45;&gt;ghc&#45;prim -->
+<g id="edge400" class="edge">
+<title>http&#45;client&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M5313.94,-1312.89C5968.5,-1311.44 13120.32,-1294.74 14051,-1260 14109.32,-1257.82 16102.92,-1154.24 16147,-1116 16177.55,-1089.5 16166,-1067.45 16166,-1027 16166,-1027 16166,-1027 16166,-809 16166,-709.67 16102.49,-686.68 16011,-648 15951.03,-622.65 15929.53,-635.97 15869,-612 15838.3,-599.84 15833.07,-591.67 15804,-576 15652.47,-494.29 15587.88,-512.37 15461,-396 15426.38,-364.25 15404,-353.97 15404,-307 15404,-307 15404,-307 15404,-233 15404,-187.85 15389.14,-173.55 15355,-144 15327.65,-120.32 15288.69,-106.76 15258.65,-99.29"/>
+<polygon fill="black" stroke="black" points="15259.62,-95.93 15249.09,-97.06 15258.04,-102.74 15259.62,-95.93"/>
+</g>
+<!-- http&#45;client&#45;&gt;Win32 -->
+<g id="edge387" class="edge">
+<title>http&#45;client&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M5262,-1295.61C5246.77,-1229.49 5192.39,-993.29 5173.51,-911.29"/>
+<polygon fill="black" stroke="black" points="5176.94,-910.57 5171.28,-901.61 5170.12,-912.14 5176.94,-910.57"/>
+</g>
+<!-- http&#45;client&#45;&gt;array -->
+<g id="edge388" class="edge">
+<title>http&#45;client&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M5218.52,-1311.82C5023.37,-1306.82 4291.25,-1286.36 4250,-1260 4148.05,-1194.85 4069.91,-1101.25 4147,-1008 4201.2,-942.43 4259.56,-1011.32 4335,-972 4355.35,-961.4 4354.39,-950.71 4372,-936 4604.23,-741.92 4689.26,-728.56 4926,-540 4982.64,-494.88 4982.08,-461.97 5048,-432 5113.26,-402.33 5326.7,-386.65 5416.55,-381.22"/>
+<polygon fill="black" stroke="black" points="5416.6,-384.73 5426.37,-380.64 5416.19,-377.74 5416.6,-384.73"/>
+</g>
+<!-- http&#45;client&#45;&gt;bytestring -->
+<g id="edge393" class="edge">
+<title>http&#45;client&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5218.03,-1313.04C4997.73,-1312.96 4081.71,-1309.58 3800,-1260 3697.43,-1241.95 3668.17,-1238.36 3577,-1188 3555.18,-1175.95 3555.29,-1164.96 3534,-1152 3498.6,-1130.46 3477.84,-1144.75 3448,-1116 3381.98,-1052.4 3281.48,-782.79 3249.87,-694.86"/>
+<polygon fill="black" stroke="black" points="3253.21,-693.81 3246.55,-685.57 3246.62,-696.17 3253.21,-693.81"/>
+</g>
+<!-- http&#45;client&#45;&gt;containers -->
+<g id="edge395" class="edge">
+<title>http&#45;client&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M5313.77,-1312.89C5586.83,-1312.11 6952.32,-1305.94 7370,-1260 7617.62,-1232.77 7672.72,-1182.16 7920,-1152 8245.09,-1112.34 8331.82,-1162.54 8656,-1116 8689.83,-1111.14 8922.52,-1054.63 8955,-1044 8994.38,-1031.11 9002.29,-1022.78 9041,-1008 9086.69,-990.55 9116.63,-1011.84 9145,-972 9210.15,-880.51 9053.01,-805.37 9126,-720 9160.95,-679.13 9315.89,-669.57 9403,-667.47"/>
+<polygon fill="black" stroke="black" points="9402.87,-670.97 9412.8,-667.26 9402.72,-663.98 9402.87,-670.97"/>
+</g>
+<!-- http&#45;client&#45;&gt;deepseq -->
+<g id="edge397" class="edge">
+<title>http&#45;client&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5299.62,-1300.9C5305.98,-1298.98 5312.64,-1297.23 5319,-1296 5427.27,-1275.01 5712.27,-1302.6 5814,-1260 5858.74,-1241.27 5868.44,-1227.9 5896,-1188 5918.54,-1155.38 5963.28,-994.11 5967,-972 5974.97,-924.63 5955.8,-909.56 5971,-864 6020.32,-716.17 6047.69,-671.29 6171,-576 6207.72,-547.63 6226.21,-557.95 6269,-540 6303.47,-525.54 6308.69,-512.88 6345,-504 6479.28,-471.16 7468.11,-455.16 7709.81,-451.72"/>
+<polygon fill="black" stroke="black" points="7709.62,-455.22 7719.57,-451.58 7709.52,-448.22 7709.62,-455.22"/>
+</g>
+<!-- http&#45;client&#45;&gt;filepath -->
+<g id="edge399" class="edge">
+<title>http&#45;client&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M5271.43,-1295.76C5289.36,-1240.3 5350.54,-1062.76 5437,-936 5449.57,-917.56 5457.19,-916.69 5472,-900 5490.53,-879.11 5510.41,-854.34 5524.58,-836.24"/>
+<polygon fill="black" stroke="black" points="5527.12,-838.68 5530.5,-828.64 5521.59,-834.38 5527.12,-838.68"/>
+</g>
+<!-- http&#45;client&#45;&gt;time -->
+<g id="edge411" class="edge">
+<title>http&#45;client&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M5298.69,-1300.6C5317.78,-1291.86 5340.99,-1278.41 5356,-1260 5430.76,-1168.26 5392.77,-1115.62 5442,-1008 5446.22,-998.77 5451.6,-989.06 5456.68,-980.52"/>
+<polygon fill="black" stroke="black" points="5459.61,-982.44 5461.85,-972.08 5453.64,-978.78 5459.61,-982.44"/>
+</g>
+<!-- http&#45;client&#45;&gt;transformers -->
+<g id="edge412" class="edge">
+<title>http&#45;client&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M5313.73,-1313.11C5598.56,-1313.56 7102.91,-1313.24 8329,-1260 9249.91,-1220.01 9479.82,-1197.33 10398,-1116 10695.88,-1089.61 10770.59,-1083.64 11067,-1044 11267.76,-1017.15 11322.76,-1029.39 11517,-972 11668.9,-927.12 11702.78,-901.68 11843,-828 11897.05,-799.6 11910.75,-792.1 11960,-756 12058.6,-683.73 12056.82,-626.85 12168,-576 12219.6,-552.4 12374.97,-536.02 12465.17,-528.22"/>
+<polygon fill="black" stroke="black" points="12465.47,-531.7 12475.13,-527.37 12464.87,-524.73 12465.47,-531.7"/>
+</g>
+<!-- http&#45;client&#45;&gt;text -->
+<g id="edge410" class="edge">
+<title>http&#45;client&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M5313.73,-1312.4C5565.9,-1309.12 6737.68,-1292.22 6896,-1260 7135.08,-1211.35 7682.4,-919.44 7920,-864 8124.2,-816.36 8377.3,-810.97 8472.45,-810.76"/>
+<polygon fill="black" stroke="black" points="8472.26,-814.26 8482.26,-810.76 8472.26,-807.26 8472.26,-814.26"/>
+</g>
+<!-- http&#45;client&#45;&gt;random -->
+<g id="edge406" class="edge">
+<title>http&#45;client&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M5313.81,-1312.53C5495.46,-1310.44 6142.57,-1300.27 6344,-1260 6436.64,-1241.48 6457.45,-1225.87 6544,-1188 6671.12,-1132.38 6737.21,-1154.59 6821,-1044 6840.74,-1017.95 6832.65,-1004.51 6836,-972 6837.64,-956.08 6846.16,-948.36 6836,-936 6783.66,-872.29 6706.34,-963.71 6654,-900 6623.08,-862.37 6636.55,-801.43 6648.31,-766.31"/>
+<polygon fill="black" stroke="black" points="6651.46,-767.9 6651.51,-757.3 6644.87,-765.56 6651.46,-767.9"/>
+</g>
+<!-- http&#45;client&#45;&gt;stm -->
+<g id="edge408" class="edge">
+<title>http&#45;client&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M5218.52,-1311.52C4999.79,-1304.62 4098.76,-1275.32 4074,-1260 4042.87,-1240.74 4044.41,-1223.1 4034,-1188 4011.18,-1111.03 4007.17,-1076.52 4049,-1008 4110.46,-907.34 4338.12,-709.11 4439,-648 4458.3,-636.31 4514.44,-617.6 4551.76,-605.82"/>
+<polygon fill="black" stroke="black" points="4552.73,-609.19 4561.23,-602.86 4550.64,-602.51 4552.73,-609.19"/>
+</g>
+<!-- http&#45;client&#45;&gt;exceptions -->
+<g id="edge398" class="edge">
+<title>http&#45;client&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M5313.76,-1312.56C5502.96,-1310.55 6200.2,-1300.48 6417,-1260 6669.07,-1212.94 6773.65,-1228.25 6952,-1044 6988.29,-1006.51 7030.56,-976.76 6998,-936 6952.78,-879.39 6884.22,-956.61 6839,-900 6829.01,-887.5 6831.85,-878.32 6839,-864 6884.78,-772.31 6995.8,-712.13 7057.62,-684.51"/>
+<polygon fill="black" stroke="black" points="7058.69,-687.86 7066.45,-680.65 7055.88,-681.45 7058.69,-687.86"/>
+</g>
+<!-- http&#45;client&#45;&gt;network&#45;uri -->
+<g id="edge405" class="edge">
+<title>http&#45;client&#45;&gt;network&#45;uri</title>
+<path fill="none" stroke="black" d="M5313.78,-1312.49C5488.03,-1310.33 6088.85,-1300.06 6276,-1260 6319.34,-1250.72 6613.69,-1144.06 6648,-1116 6692.62,-1079.51 6724.11,-1018.42 6739.74,-982.91"/>
+<polygon fill="black" stroke="black" points="6742.95,-984.3 6743.66,-973.73 6736.52,-981.55 6742.95,-984.3"/>
+</g>
+<!-- http&#45;client&#45;&gt;async -->
+<g id="edge389" class="edge">
+<title>http&#45;client&#45;&gt;async</title>
+<path fill="none" stroke="black" d="M5218.19,-1312.37C5005.96,-1309.37 4157.59,-1295.2 4114,-1260 4025.88,-1188.83 4004.58,-1095.91 4076,-1008 4125.24,-947.38 4172.94,-993.6 4248,-972 4251.14,-971.1 4254.38,-970.08 4257.61,-969"/>
+<polygon fill="black" stroke="black" points="4258.73,-972.32 4267.01,-965.71 4256.41,-965.72 4258.73,-972.32"/>
+</g>
+<!-- http&#45;client&#45;&gt;base64&#45;bytestring -->
+<g id="edge391" class="edge">
+<title>http&#45;client&#45;&gt;base64&#45;bytestring</title>
+<path fill="none" stroke="black" d="M5218.27,-1312.94C4849.16,-1312.38 2462.31,-1306.94 2406,-1260 2388.77,-1245.64 2385.13,-1219.75 2385.3,-1199.58"/>
+<polygon fill="black" stroke="black" points="2388.79,-1199.86 2385.72,-1189.72 2381.8,-1199.56 2388.79,-1199.86"/>
+</g>
+<!-- http&#45;client&#45;&gt;blaze&#45;builder -->
+<g id="edge392" class="edge">
+<title>http&#45;client&#45;&gt;blaze&#45;builder</title>
+<path fill="none" stroke="black" d="M5313.89,-1312.62C5468.86,-1310.98 5949.82,-1302.47 6004,-1260 6115.07,-1172.95 6126.47,-983.34 6126.62,-911.43"/>
+<polygon fill="black" stroke="black" points="6130.12,-911.66 6126.56,-901.68 6123.12,-911.71 6130.12,-911.66"/>
+</g>
+<!-- http&#45;client&#45;&gt;http&#45;types -->
+<g id="edge401" class="edge">
+<title>http&#45;client&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M5218.18,-1312.54C5005.49,-1310.26 4150.97,-1298.75 4038,-1260 3907.77,-1215.34 3783.65,-1101.33 3733.42,-1051.24"/>
+<polygon fill="black" stroke="black" points="3736.05,-1048.92 3726.52,-1044.28 3731.08,-1053.85 3736.05,-1048.92"/>
+</g>
+<!-- http&#45;client&#45;&gt;case&#45;insensitive -->
+<g id="edge394" class="edge">
+<title>http&#45;client&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M5313.45,-1311.56C5422.15,-1307.69 5686.08,-1294.88 5767,-1260 5848.69,-1224.79 5877.5,-1200.26 5906,-1116 5921.15,-1071.21 5909.46,-1015.71 5899.67,-982.96"/>
+<polygon fill="black" stroke="black" points="5903.01,-981.9 5896.67,-973.42 5896.34,-984.01 5903.01,-981.9"/>
+</g>
+<!-- cookie -->
+<g id="node104" class="node">
+<title>cookie</title>
+<ellipse fill="none" stroke="black" cx="4192" cy="-1026" rx="35.6" ry="18"/>
+<text text-anchor="middle" x="4192" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">cookie</text>
+</g>
+<!-- http&#45;client&#45;&gt;cookie -->
+<g id="edge396" class="edge">
+<title>http&#45;client&#45;&gt;cookie</title>
+<path fill="none" stroke="black" d="M5218,-1313.35C5032,-1314.31 4365.3,-1313.92 4289,-1260 4220.9,-1211.87 4200.45,-1106.54 4194.43,-1055.65"/>
+<polygon fill="black" stroke="black" points="4197.92,-1055.31 4193.38,-1045.74 4190.95,-1056.05 4197.92,-1055.31"/>
+</g>
+<!-- network -->
+<g id="node113" class="node">
+<title>network</title>
+<ellipse fill="none" stroke="black" cx="3627" cy="-1170" rx="40.58" ry="18"/>
+<text text-anchor="middle" x="3627" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">network</text>
+</g>
+<!-- http&#45;client&#45;&gt;network -->
+<g id="edge404" class="edge">
+<title>http&#45;client&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M5218.35,-1312.46C5014.08,-1309.93 4211.51,-1297.75 3962,-1260 3854.51,-1243.74 3731.9,-1206.11 3669.04,-1185.36"/>
+<polygon fill="black" stroke="black" points="3670.41,-1182.13 3659.82,-1182.3 3668.2,-1188.77 3670.41,-1182.13"/>
+</g>
+<!-- iproute -->
+<g id="node118" class="node">
+<title>iproute</title>
+<ellipse fill="none" stroke="black" cx="2279" cy="-1242" rx="36.59" ry="18"/>
+<text text-anchor="middle" x="2279" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">iproute</text>
+</g>
+<!-- http&#45;client&#45;&gt;iproute -->
+<g id="edge402" class="edge">
+<title>http&#45;client&#45;&gt;iproute</title>
+<path fill="none" stroke="black" d="M5218.33,-1312.62C4865.31,-1309.73 2662.52,-1290.6 2368,-1260 2353.18,-1258.46 2337.15,-1255.73 2322.83,-1252.91"/>
+<polygon fill="black" stroke="black" points="2323.75,-1249.53 2313.25,-1250.95 2322.35,-1256.38 2323.75,-1249.53"/>
+</g>
+<!-- http&#45;client&#45;&gt;mime&#45;types -->
+<g id="edge403" class="edge">
+<title>http&#45;client&#45;&gt;mime&#45;types</title>
+<path fill="none" stroke="black" d="M5313.85,-1313.11C5561.46,-1313.43 6691.48,-1312.01 6838,-1260 6937.85,-1224.55 6978.24,-1209.55 7028,-1116 7065.61,-1045.3 7081.02,-1002.22 7036,-936 7026.24,-921.64 6987.67,-907.27 6954.4,-897.12"/>
+<polygon fill="black" stroke="black" points="6955.4,-893.77 6944.82,-894.28 6953.41,-900.48 6955.4,-893.77"/>
+</g>
+<!-- safe -->
+<g id="node122" class="node">
+<title>safe</title>
+<ellipse fill="none" stroke="black" cx="2407" cy="-594" rx="27" ry="18"/>
+<text text-anchor="middle" x="2407" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">safe</text>
+</g>
+<!-- http&#45;client&#45;&gt;safe -->
+<g id="edge407" class="edge">
+<title>http&#45;client&#45;&gt;safe</title>
+<path fill="none" stroke="black" d="M5218.36,-1312.56C4850.02,-1309.11 2469.33,-1285.81 2444,-1260 2432.79,-1248.58 2438.68,-1239.09 2444,-1224 2450.83,-1204.62 2466.17,-1207.38 2473,-1188 2478.32,-1172.91 2478.65,-1166.97 2473,-1152 2450.44,-1092.19 2400.56,-1103.81 2378,-1044 2348.8,-966.6 2387.77,-709.91 2402.1,-623.6"/>
+<polygon fill="black" stroke="black" points="2405.53,-624.3 2403.73,-613.86 2398.62,-623.14 2405.53,-624.3"/>
+</g>
+<!-- streaming&#45;commons -->
+<g id="node123" class="node">
+<title>streaming&#45;commons</title>
+<ellipse fill="none" stroke="black" cx="4698" cy="-1242" rx="85.99" ry="18"/>
+<text text-anchor="middle" x="4698" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">streaming&#45;commons</text>
+</g>
+<!-- http&#45;client&#45;&gt;streaming&#45;commons -->
+<g id="edge409" class="edge">
+<title>http&#45;client&#45;&gt;streaming&#45;commons</title>
+<path fill="none" stroke="black" d="M5221.43,-1307.51C5126.71,-1295.83 4904.06,-1268.39 4781.88,-1253.34"/>
+<polygon fill="black" stroke="black" points="4782.6,-1249.9 4772.24,-1252.15 4781.74,-1256.85 4782.6,-1249.9"/>
+</g>
+<!-- http&#45;types&#45;&gt;base -->
+<g id="edge430" class="edge">
+<title>http&#45;types&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M3664.53,-1019.89C3634.2,-1013.86 3596.46,-1000.7 3577,-972 3568.02,-958.76 3568.24,-949.39 3577,-936 3620.83,-869.06 3664.9,-885.37 3742,-864 3801.82,-847.42 3976.17,-872.93 4019,-828 4090.69,-752.79 4038,-698.9 4038,-595 4038,-595 4038,-595 4038,-449 4038,-404.06 4047.54,-383.26 4086,-360 4188.07,-298.27 8155.2,-305.88 8591.21,-306.9"/>
+<polygon fill="black" stroke="black" points="8591,-310.4 8601.01,-306.93 8591.02,-303.4 8591,-310.4"/>
+</g>
+<!-- http&#45;types&#45;&gt;array -->
+<g id="edge429" class="edge">
+<title>http&#45;types&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M3666.11,-1018.12C3638.91,-1011.33 3606,-998.01 3589,-972 3580.25,-958.61 3579.05,-948.53 3589,-936 3589.51,-935.35 4051.25,-828.35 4052,-828 4170.95,-771.8 4167.08,-702.12 4287,-648 4362.55,-613.9 4390.96,-636.99 4470,-612 4507.56,-600.12 4514.89,-591.74 4551,-576 4700.31,-510.92 4730.12,-472.04 4888,-432 5081.21,-383.01 5321.61,-378.27 5416.13,-378.5"/>
+<polygon fill="black" stroke="black" points="5415.91,-382 5425.93,-378.55 5415.95,-375 5415.91,-382"/>
+</g>
+<!-- http&#45;types&#45;&gt;bytestring -->
+<g id="edge431" class="edge">
+<title>http&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3667.49,-1017.08C3605.26,-1005.2 3495.08,-983 3480,-972 3374.7,-895.19 3422.38,-811.95 3330,-720 3315.84,-705.91 3297.21,-694.13 3280.57,-685.29"/>
+<polygon fill="black" stroke="black" points="3282.37,-682.28 3271.87,-680.85 3279.19,-688.52 3282.37,-682.28"/>
+</g>
+<!-- http&#45;types&#45;&gt;text -->
+<g id="edge433" class="edge">
+<title>http&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3757.37,-1022.07C3959.53,-1009.68 4770.22,-961.03 5437,-936 6115.82,-910.52 6287.89,-954.5 6965,-900 7081.72,-890.61 7109.37,-874.42 7226,-864 7477.21,-841.55 8285.76,-817.45 8472.34,-812.09"/>
+<polygon fill="black" stroke="black" points="8472.31,-815.6 8482.2,-811.81 8472.11,-808.6 8472.31,-815.6"/>
+</g>
+<!-- http&#45;types&#45;&gt;case&#45;insensitive -->
+<g id="edge432" class="edge">
+<title>http&#45;types&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M3757.84,-1022.94C3838.22,-1019.53 4005.47,-1012.62 4147,-1008 4752.22,-988.23 4903.84,-993.5 5509,-972 5614.17,-968.26 5735.6,-962.61 5812.57,-958.87"/>
+<polygon fill="black" stroke="black" points="5812.27,-962.39 5822.09,-958.4 5811.93,-955.39 5812.27,-962.39"/>
+</g>
+<!-- base&#45;orphans&#45;&gt;base -->
+<g id="edge156" class="edge">
+<title>base&#45;orphans&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M15461.84,-728.4C15424.85,-720.7 15375.04,-706.98 15336,-684 15237.4,-625.98 15251.81,-559.9 15152,-504 15094.82,-471.98 15070.66,-490.21 15009,-468 14939.05,-442.8 14921.61,-434.49 14858,-396 14835.19,-382.19 14835.26,-368.54 14810,-360 14654.98,-307.59 9180.54,-306.94 8668.34,-306.99"/>
+<polygon fill="black" stroke="black" points="8668.68,-303.49 8658.68,-306.99 8668.68,-310.49 8668.68,-303.49"/>
+</g>
+<!-- base&#45;orphans&#45;&gt;ghc&#45;prim -->
+<g id="edge157" class="edge">
+<title>base&#45;orphans&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M15558.51,-725.42C15656.65,-696.9 15883,-613.51 15883,-451 15883,-451 15883,-451 15883,-233 15883,-104.97 15408.23,-91.88 15258.6,-90.93"/>
+<polygon fill="black" stroke="black" points="15258.71,-87.43 15248.69,-90.88 15258.67,-94.43 15258.71,-87.43"/>
+</g>
+<!-- base16&#45;bytestring&#45;&gt;base -->
+<g id="edge158" class="edge">
+<title>base16&#45;bytestring&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M242,-1367.82C222.63,-1342.26 190,-1291.93 190,-1243 190,-1243 190,-1243 190,-1169 190,-766.11 217.75,-490.27 599,-360 700.25,-325.4 7996.57,-308.41 8591.52,-307.08"/>
+<polygon fill="black" stroke="black" points="8591.35,-310.59 8601.34,-307.06 8591.33,-303.59 8591.35,-310.59"/>
+</g>
+<!-- base16&#45;bytestring&#45;&gt;bytestring -->
+<g id="edge159" class="edge">
+<title>base16&#45;bytestring&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M322.45,-1376.97C464.93,-1359.99 810.47,-1320 1101,-1296 1167.56,-1290.5 1655.21,-1308.62 1701,-1260 1754.38,-1203.32 1632.87,-1201.94 1624,-1188 1596.8,-1145.26 1626.38,-1107.45 1672,-1008 1703.08,-940.24 1701.79,-912.96 1758,-864 1788.94,-837.06 1806.15,-846.04 1843,-828 1854.03,-822.6 2024.18,-723.36 2036,-720 2146.65,-688.53 2955.77,-672.02 3181.61,-667.99"/>
+<polygon fill="black" stroke="black" points="3181.4,-671.49 3191.34,-667.81 3181.28,-664.49 3181.4,-671.49"/>
+</g>
+<!-- basement&#45;&gt;base -->
+<g id="edge163" class="edge">
+<title>basement&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M516.09,-935.72C507.46,-847.9 481.86,-451.79 710,-360 807.87,-320.62 8001.53,-308.03 8591.6,-307.06"/>
+<polygon fill="black" stroke="black" points="8591.33,-310.56 8601.33,-307.05 8591.32,-303.56 8591.33,-310.56"/>
+</g>
+<!-- basement&#45;&gt;ghc&#45;prim -->
+<g id="edge164" class="edge">
+<title>basement&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M495.3,-938.01C425.07,-890.83 216,-743.9 216,-667 216,-667 216,-667 216,-593 216,-388.06 146.27,-251.09 321,-144 406.35,-91.69 14278.65,-90.99 15169.21,-91"/>
+<polygon fill="black" stroke="black" points="15169.01,-94.5 15179.01,-91 15169.01,-87.5 15169.01,-94.5"/>
+</g>
+<!-- basement&#45;&gt;Win32 -->
+<g id="edge162" class="edge">
+<title>basement&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M563.95,-952.83C974.52,-951.29 4019.47,-938.63 4933,-900 4998.47,-897.23 5074.06,-891.23 5121.2,-887.15"/>
+<polygon fill="black" stroke="black" points="5121.38,-890.65 5131.04,-886.29 5120.77,-883.68 5121.38,-890.65"/>
+</g>
+<!-- bifunctors&#45;&gt;base -->
+<g id="edge166" class="edge">
+<title>bifunctors&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13325.38,-940.28C13479.56,-879.21 14132,-615.37 14132,-523 14132,-523 14132,-523 14132,-449 14132,-386.11 14081.18,-381.27 14022,-360 13888.15,-311.89 9146.53,-307.36 8668.72,-307.02"/>
+<polygon fill="black" stroke="black" points="8668.84,-303.52 8658.84,-307.02 8668.83,-310.52 8668.84,-303.52"/>
+</g>
+<!-- bifunctors&#45;&gt;template&#45;haskell -->
+<g id="edge170" class="edge">
+<title>bifunctors&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M13327.01,-941C13345.34,-932.58 13366.34,-919.33 13377,-900 13384.73,-885.99 13384.58,-878.09 13377,-864 13321.29,-760.43 13266.74,-756.68 13155,-720 13098.23,-701.37 12141.66,-651.27 12082,-648 11629.33,-623.19 11083.6,-603.51 10899.87,-597.16"/>
+<polygon fill="black" stroke="black" points="10900.18,-593.67 10890.06,-596.83 10899.94,-600.67 10900.18,-593.67"/>
+</g>
+<!-- bifunctors&#45;&gt;containers -->
+<g id="edge168" class="edge">
+<title>bifunctors&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M13308.33,-936.73C13325.03,-917.07 13346.88,-884.12 13327,-864 13267.13,-803.42 10340.88,-857.56 10261,-828 10237.62,-819.35 10240.28,-803.17 10218,-792 10155.94,-760.88 10127.08,-789.01 10066,-756 10045.53,-744.94 10049.19,-729.61 10028,-720 9982.72,-699.46 9657.54,-678.36 9522.03,-670.35"/>
+<polygon fill="black" stroke="black" points="9522.38,-666.87 9512.19,-669.77 9521.97,-673.85 9522.38,-666.87"/>
+</g>
+<!-- bifunctors&#45;&gt;transformers -->
+<g id="edge172" class="edge">
+<title>bifunctors&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M13332.26,-943.03C13354.25,-935.21 13379.83,-921.89 13393,-900 13401.25,-886.29 13395.88,-879.74 13393,-864 13386.84,-830.34 13311.45,-596.42 13284,-576 13229.96,-535.79 12776.49,-525.98 12600.99,-523.68"/>
+<polygon fill="black" stroke="black" points="12601.14,-520.18 12591.1,-523.55 12601.05,-527.18 12601.14,-520.18"/>
+</g>
+<!-- bifunctors&#45;&gt;comonad -->
+<g id="edge167" class="edge">
+<title>bifunctors&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M13340.15,-949.24C13489.81,-937.29 13953.71,-900.26 14114.47,-887.43"/>
+<polygon fill="black" stroke="black" points="14114.32,-890.96 14124.01,-886.67 14113.76,-883.98 14114.32,-890.96"/>
+</g>
+<!-- bifunctors&#45;&gt;tagged -->
+<g id="edge169" class="edge">
+<title>bifunctors&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M13320.99,-938.89C13335.5,-929.92 13351.86,-916.82 13360,-900 13366.97,-885.6 13370.24,-876.29 13360,-864 13303.31,-795.95 13245.14,-863.51 13164,-828 13139.57,-817.31 13139.47,-804.66 13116,-792 13082.23,-773.78 13040.91,-759.52 13010.68,-750.4"/>
+<polygon fill="black" stroke="black" points="13011.72,-747.05 13001.13,-747.58 13009.74,-753.77 13011.72,-747.05"/>
+</g>
+<!-- bifunctors&#45;&gt;th&#45;abstraction -->
+<g id="edge171" class="edge">
+<title>bifunctors&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M13331.25,-942.42C13339.4,-940.24 13347.98,-938 13356,-936 13388.23,-927.97 13471.49,-909.12 13528.96,-896.21"/>
+<polygon fill="black" stroke="black" points="13529.63,-899.65 13538.62,-894.04 13528.09,-892.82 13529.63,-899.65"/>
+</g>
+<!-- bifunctors&#45;&gt;assoc -->
+<g id="edge165" class="edge">
+<title>bifunctors&#45;&gt;assoc</title>
+<path fill="none" stroke="black" d="M13244.33,-953.16C12950.02,-953.95 11405.21,-955.37 10935,-900 10922.09,-898.48 10908.18,-895.83 10895.68,-893.08"/>
+<polygon fill="black" stroke="black" points="10896.68,-889.71 10886.15,-890.88 10895.11,-896.53 10896.68,-889.71"/>
+</g>
+<!-- byteorder -->
+<g id="node97" class="node">
+<title>byteorder</title>
+<ellipse fill="none" stroke="black" cx="1745" cy="-450" rx="46.57" ry="18"/>
+<text text-anchor="middle" x="1745" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">byteorder</text>
+</g>
+<!-- byteorder&#45;&gt;base -->
+<g id="edge182" class="edge">
+<title>byteorder&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1751.06,-431.8C1759.59,-410.51 1777.39,-375.22 1806,-360 1885.98,-317.46 8047.65,-307.82 8591.72,-307.05"/>
+<polygon fill="black" stroke="black" points="8591.33,-310.55 8601.32,-307.04 8591.32,-303.55 8591.33,-310.55"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;base -->
+<g id="edge188" class="edge">
+<title>cabal&#45;doctest&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5636.15,-1241.29C5491.94,-1241.14 5118.4,-1235.72 4811,-1188 4682.33,-1168.02 4645.15,-1170.73 4527,-1116 4476.98,-1092.83 4457.78,-1089.04 4426,-1044 4346.97,-931.98 4380,-876.09 4380,-739 4380,-739 4380,-739 4380,-449 4380,-386.8 4429.59,-381.39 4488,-360 4589.82,-322.71 8178.06,-308.64 8591.33,-307.14"/>
+<polygon fill="black" stroke="black" points="8591.12,-310.64 8601.11,-307.1 8591.09,-303.64 8591.12,-310.64"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;Cabal -->
+<g id="edge187" class="edge">
+<title>cabal&#45;doctest&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M5722.36,-1225.29C5739.19,-1214.86 5761.39,-1201.12 5779.23,-1190.06"/>
+<polygon fill="black" stroke="black" points="5780.95,-1193.11 5787.61,-1184.87 5777.26,-1187.16 5780.95,-1193.11"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;directory -->
+<g id="edge189" class="edge">
+<title>cabal&#45;doctest&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M5637.42,-1238.12C5489.59,-1229.76 5111.62,-1200.4 5024,-1116 5008.04,-1100.62 5003.55,-1075.46 5002.76,-1055.81"/>
+<polygon fill="black" stroke="black" points="5006.26,-1055.91 5002.69,-1045.93 4999.26,-1055.96 5006.26,-1055.91"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;filepath -->
+<g id="edge190" class="edge">
+<title>cabal&#45;doctest&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M5697.49,-1223.66C5697.94,-1183.61 5695.22,-1082.41 5660,-1008 5650.84,-988.65 5640.57,-989.33 5628,-972 5606.25,-942.01 5603.25,-932.78 5586,-900 5575.31,-879.69 5564.27,-856.18 5556.2,-838.43"/>
+<polygon fill="black" stroke="black" points="5559.39,-837 5552.09,-829.33 5553.01,-839.88 5559.39,-837"/>
+</g>
+<!-- call&#45;stack -->
+<g id="node99" class="node">
+<title>call&#45;stack</title>
+<ellipse fill="none" stroke="black" cx="12002" cy="-882" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="12002" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">call&#45;stack</text>
+</g>
+<!-- call&#45;stack&#45;&gt;base -->
+<g id="edge191" class="edge">
+<title>call&#45;stack&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M12038.11,-870.53C12045.97,-868.32 12054.25,-866.04 12062,-864 12127.47,-846.77 12148.78,-856.9 12210,-828 12234.11,-816.62 12233.19,-801.78 12258,-792 12535.39,-682.65 12627.9,-745.15 12925,-720 13185.01,-697.99 13256.96,-743.61 13511,-684 13551.04,-674.61 13823.88,-570.02 13852,-540 13906.93,-481.35 13904.48,-400.38 13835,-360 13775.68,-325.52 9140.39,-308.75 8668.63,-307.13"/>
+<polygon fill="black" stroke="black" points="8668.89,-303.63 8658.88,-307.1 8668.87,-310.63 8668.89,-303.63"/>
+</g>
+<!-- call&#45;stack&#45;&gt;filepath -->
+<g id="edge192" class="edge">
+<title>call&#45;stack&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M11956.57,-879.98C11825.45,-877.07 11435.1,-868.63 11111,-864 9951.62,-847.42 6075.45,-815.36 5593.36,-811.4"/>
+<polygon fill="black" stroke="black" points="5593.51,-807.91 5583.48,-811.32 5593.45,-814.91 5593.51,-807.91"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;base -->
+<g id="edge193" class="edge">
+<title>case&#45;insensitive&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5826.54,-947.37C5783.75,-943.73 5726.02,-939.1 5675,-936 5628.1,-933.15 4862.51,-933.92 4830,-900 4818.93,-888.45 4822.22,-877.98 4830,-864 4844.75,-837.49 4870.09,-852.49 4888,-828 5015.84,-653.15 4840.59,-475.23 5024,-360 5103.59,-310 8208.49,-307.17 8591.4,-307.01"/>
+<polygon fill="black" stroke="black" points="8591.15,-310.51 8601.15,-307.01 8591.15,-303.51 8591.15,-310.51"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;bytestring -->
+<g id="edge194" class="edge">
+<title>case&#45;insensitive&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5829.7,-945.4C5800.28,-941.98 5764.34,-938.21 5732,-936 5190.81,-898.96 5053.06,-938.93 4512,-900 4371.89,-889.92 4337.8,-877.73 4198,-864 4100.37,-854.41 3849.73,-862.8 3758,-828 3733.07,-818.54 3731.96,-807.13 3710,-792 3660.66,-757.99 3652.18,-740.86 3596,-720 3495.64,-682.73 3370.15,-671.61 3298.13,-668.33"/>
+<polygon fill="black" stroke="black" points="3298.69,-664.85 3288.55,-667.93 3298.4,-671.84 3298.69,-664.85"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;deepseq -->
+<g id="edge195" class="edge">
+<title>case&#45;insensitive&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5858.49,-937.81C5804.22,-909.65 5703.05,-847.2 5748,-792 5797.86,-730.76 5851.32,-791.22 5922,-756 6030.52,-701.92 6023.09,-638.48 6127,-576 6204.39,-529.46 6228.49,-521.89 6317,-504 6591.24,-448.57 7483.03,-449.47 7710.04,-450.64"/>
+<polygon fill="black" stroke="black" points="7709.74,-454.14 7719.76,-450.7 7709.78,-447.14 7709.74,-454.14"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;text -->
+<g id="edge197" class="edge">
+<title>case&#45;insensitive&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M5955.1,-948.41C6010.18,-944.65 6091.23,-939.41 6162,-936 6280.15,-930.31 7114.43,-939.3 7226,-900 7251.15,-891.14 7248.86,-872.88 7274,-864 7379.46,-826.74 8168.32,-834.11 8280,-828 8347.82,-824.29 8426.71,-818.08 8472.53,-814.28"/>
+<polygon fill="black" stroke="black" points="8472.81,-817.77 8482.48,-813.45 8472.23,-810.79 8472.81,-817.77"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;hashable -->
+<g id="edge196" class="edge">
+<title>case&#45;insensitive&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M5957.39,-950.81C6283.71,-940.2 7695.88,-894.29 7989.43,-884.74"/>
+<polygon fill="black" stroke="black" points="7989.2,-888.25 7999.08,-884.43 7988.97,-881.25 7989.2,-888.25"/>
+</g>
+<!-- cborg -->
+<g id="node101" class="node">
+<title>cborg</title>
+<ellipse fill="none" stroke="black" cx="4891" cy="-882" rx="32.6" ry="18"/>
+<text text-anchor="middle" x="4891" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">cborg</text>
+</g>
+<!-- cborg&#45;&gt;base -->
+<g id="edge199" class="edge">
+<title>cborg&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M4858.37,-879.48C4731.51,-873.54 4258.92,-851.06 3870,-828 3629.89,-813.76 3570.23,-804.09 3330,-792 3271.26,-789.04 2318.59,-791.89 2272,-756 2186.35,-690.01 2202,-631.13 2202,-523 2202,-523 2202,-523 2202,-449 2202,-391.79 2242,-381.53 2295,-360 2372.76,-328.41 8066.72,-308.86 8591.37,-307.13"/>
+<polygon fill="black" stroke="black" points="8591.3,-310.63 8601.28,-307.09 8591.27,-303.63 8591.3,-310.63"/>
+</g>
+<!-- cborg&#45;&gt;ghc&#45;bignum -->
+<g id="edge203" class="edge">
+<title>cborg&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M4858.2,-880.67C4483.72,-876.83 1027.71,-841.08 978,-828 718.88,-759.83 458,-790.93 458,-523 458,-523 458,-523 458,-449 458,-395.16 531.24,-250.89 563.28,-190.35"/>
+<polygon fill="black" stroke="black" points="566.26,-192.19 567.87,-181.72 560.09,-188.9 566.26,-192.19"/>
+</g>
+<!-- cborg&#45;&gt;ghc&#45;prim -->
+<g id="edge204" class="edge">
+<title>cborg&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M4858.08,-880.7C4476.61,-877.18 906.39,-843.89 800,-828 552.43,-791.02 469.21,-737.95 316,-540 293.85,-511.39 286.7,-503.12 278,-468 274.15,-452.47 276.63,-447.94 278,-432 289.56,-297.85 255.02,-210.67 372,-144 458.67,-94.6 14281.96,-91.18 15169.37,-91.01"/>
+<polygon fill="black" stroke="black" points="15169.13,-94.51 15179.13,-91.01 15169.13,-87.51 15169.13,-94.51"/>
+</g>
+<!-- cborg&#45;&gt;array -->
+<g id="edge198" class="edge">
+<title>cborg&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M4913.2,-868.62C4928.86,-859.07 4949.54,-844.69 4964,-828 4999.55,-786.99 5058.22,-662.54 5078,-612 5108.18,-534.9 5064.55,-487.49 5126,-432 5168.01,-394.07 5337.28,-383.18 5416.16,-380.14"/>
+<polygon fill="black" stroke="black" points="5416.18,-383.64 5426.05,-379.78 5415.93,-376.64 5416.18,-383.64"/>
+</g>
+<!-- cborg&#45;&gt;bytestring -->
+<g id="edge200" class="edge">
+<title>cborg&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4861.29,-873.87C4845.05,-870.27 4824.53,-866.21 4806,-864 4707.07,-852.19 3998.87,-873.06 3910,-828 3855.27,-800.25 3878.01,-749.12 3824,-720 3734.29,-671.64 3427.71,-666.51 3298.34,-666.56"/>
+<polygon fill="black" stroke="black" points="3298.63,-663.06 3288.64,-666.58 3298.64,-670.06 3298.63,-663.06"/>
+</g>
+<!-- cborg&#45;&gt;containers -->
+<g id="edge201" class="edge">
+<title>cborg&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M4921.79,-875.57C5010.67,-860.1 5275.46,-815.39 5497,-792 5990.4,-739.91 6115.28,-740.61 6611,-720 7731.59,-673.4 9101.55,-667.77 9402.66,-667.09"/>
+<polygon fill="black" stroke="black" points="9402.64,-670.59 9412.64,-667.07 9402.63,-663.59 9402.64,-670.59"/>
+</g>
+<!-- cborg&#45;&gt;deepseq -->
+<g id="edge202" class="edge">
+<title>cborg&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M4916.2,-870.2C4939.05,-860.13 4973.41,-844.25 5002,-828 5077.24,-785.25 5086.72,-758.94 5164,-720 5260.05,-671.6 5689.11,-521.27 5785,-504 5979.03,-469.06 7415.57,-454.16 7710.26,-451.46"/>
+<polygon fill="black" stroke="black" points="7709.97,-454.96 7719.94,-451.37 7709.91,-447.96 7709.97,-454.96"/>
+</g>
+<!-- cborg&#45;&gt;text -->
+<g id="edge207" class="edge">
+<title>cborg&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4923.24,-878.03C4968.02,-874.05 5051.59,-867.12 5123,-864 6242.93,-815.02 6524.16,-847 7645,-828 7964.76,-822.58 8350.89,-814.43 8472.45,-811.83"/>
+<polygon fill="black" stroke="black" points="8472.26,-815.34 8482.19,-811.62 8472.11,-808.34 8472.26,-815.34"/>
+</g>
+<!-- cborg&#45;&gt;primitive -->
+<g id="edge206" class="edge">
+<title>cborg&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M4923.24,-877.96C4968.01,-873.89 5051.57,-866.86 5123,-864 6293.2,-817.18 9221.95,-842.77 10393,-828 10723.42,-823.83 11120.25,-815.37 11262.76,-812.22"/>
+<polygon fill="black" stroke="black" points="11262.74,-815.72 11272.66,-812 11262.58,-808.72 11262.74,-815.72"/>
+</g>
+<!-- half -->
+<g id="node102" class="node">
+<title>half</title>
+<ellipse fill="none" stroke="black" cx="7609" cy="-810" rx="27" ry="18"/>
+<text text-anchor="middle" x="7609" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">half</text>
+</g>
+<!-- cborg&#45;&gt;half -->
+<g id="edge205" class="edge">
+<title>cborg&#45;&gt;half</title>
+<path fill="none" stroke="black" d="M4923.25,-878.11C4968.03,-874.21 5051.6,-867.37 5123,-864 6118.01,-816.97 7339.03,-811.66 7570.25,-811.07"/>
+<polygon fill="black" stroke="black" points="7570.19,-814.57 7580.19,-811.05 7570.18,-807.57 7570.19,-814.57"/>
+</g>
+<!-- half&#45;&gt;base -->
+<g id="edge371" class="edge">
+<title>half&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M7581.72,-808.76C7172.82,-805.11 2303.84,-761.59 2297,-756 2265.68,-730.4 2278,-707.45 2278,-667 2278,-667 2278,-667 2278,-449 2278,-393.06 2315.41,-381.63 2367,-360 2443.51,-327.93 8070.23,-308.83 8591.41,-307.12"/>
+<polygon fill="black" stroke="black" points="8591.27,-310.62 8601.26,-307.09 8591.24,-303.62 8591.27,-310.62"/>
+</g>
+<!-- half&#45;&gt;template&#45;haskell -->
+<g id="edge374" class="edge">
+<title>half&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7634.55,-803.18C7649.99,-799.74 7670.08,-795.41 7688,-792 7880.51,-755.38 7928.55,-744.34 8123,-720 8497,-673.19 8591.69,-669.35 8968,-648 9675.11,-607.88 10534.59,-597.64 10772.4,-595.5"/>
+<polygon fill="black" stroke="black" points="10772.1,-599 10782.07,-595.41 10772.04,-592 10772.1,-599"/>
+</g>
+<!-- half&#45;&gt;deepseq -->
+<g id="edge373" class="edge">
+<title>half&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M7630.69,-798.75C7668.85,-779.04 7744,-731.97 7744,-667 7744,-667 7744,-667 7744,-593 7744,-553.39 7751.35,-508.11 7756.91,-479.54"/>
+<polygon fill="black" stroke="black" points="7760.31,-480.37 7758.86,-469.87 7753.45,-478.98 7760.31,-480.37"/>
+</g>
+<!-- half&#45;&gt;binary -->
+<g id="edge372" class="edge">
+<title>half&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M7634.14,-802.91C7649.6,-799.33 7669.86,-794.95 7688,-792 7846.6,-766.21 8036.88,-749.24 8121.57,-742.41"/>
+<polygon fill="black" stroke="black" points="8121.61,-745.92 8131.3,-741.63 8121.06,-738.94 8121.61,-745.92"/>
+</g>
+<!-- cereal&#45;&gt;base -->
+<g id="edge209" class="edge">
+<title>cereal&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2650.23,-719.55C2653.44,-692.79 2659,-640 2659,-595 2659,-595 2659,-595 2659,-449 2659,-371.86 2733.74,-380.86 2808,-360 2956.15,-318.39 8093.34,-307.98 8591.29,-307.07"/>
+<polygon fill="black" stroke="black" points="8590.99,-310.57 8600.99,-307.05 8590.98,-303.57 8590.99,-310.57"/>
+</g>
+<!-- cereal&#45;&gt;ghc&#45;prim -->
+<g id="edge212" class="edge">
+<title>cereal&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2616.86,-733.03C2342.74,-698.07 350.61,-442.51 311,-396 271.99,-350.19 359.05,-176.01 410,-144 494.25,-91.07 14280.74,-90.95 15169.14,-91"/>
+<polygon fill="black" stroke="black" points="15168.92,-94.5 15178.92,-91 15168.92,-87.5 15168.92,-94.5"/>
+</g>
+<!-- cereal&#45;&gt;array -->
+<g id="edge208" class="edge">
+<title>cereal&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M2673.55,-726.73C2680.14,-724.31 2687.28,-721.89 2694,-720 3253.01,-562.85 3407.64,-586.99 3976,-468 4048.19,-452.89 4064.86,-441.52 4138,-432 4394.27,-398.65 5222.69,-382.93 5416.28,-379.66"/>
+<polygon fill="black" stroke="black" points="5416.14,-383.16 5426.08,-379.49 5416.02,-376.16 5416.14,-383.16"/>
+</g>
+<!-- cereal&#45;&gt;bytestring -->
+<g id="edge210" class="edge">
+<title>cereal&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2672.95,-726.45C2679.68,-723.98 2687.03,-721.6 2694,-720 2868.12,-680.08 3080.21,-670.2 3181.15,-667.78"/>
+<polygon fill="black" stroke="black" points="3181.17,-671.28 3191.09,-667.56 3181.02,-664.28 3181.17,-671.28"/>
+</g>
+<!-- cereal&#45;&gt;containers -->
+<g id="edge211" class="edge">
+<title>cereal&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2680.29,-736.67C3156.9,-731.77 8759.69,-674.22 9402.94,-667.62"/>
+<polygon fill="black" stroke="black" points="9402.75,-671.12 9412.71,-667.52 9402.68,-664.12 9402.75,-671.12"/>
+</g>
+<!-- cookie&#45;&gt;base -->
+<g id="edge229" class="edge">
+<title>cookie&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M4159.81,-1017.65C4088.11,-1001.45 3909.69,-962.01 3759,-936 3418.03,-877.14 3326.93,-897.66 2988,-828 2928.44,-815.76 2916.04,-801.66 2856,-792 2781.3,-779.98 2240.27,-795.93 2176,-756 2137.46,-732.06 2126,-712.37 2126,-667 2126,-667 2126,-667 2126,-449 2126,-404.68 2133.34,-383.37 2171,-360 2243.75,-314.85 8060.9,-307.61 8591.37,-307.04"/>
+<polygon fill="black" stroke="black" points="8591.07,-310.54 8601.07,-307.03 8591.06,-303.54 8591.07,-310.54"/>
+</g>
+<!-- cookie&#45;&gt;bytestring -->
+<g id="edge230" class="edge">
+<title>cookie&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4193.21,-1007.69C4193.61,-987.62 4190.96,-954.89 4172,-936 4152.25,-916.33 3707.34,-839.63 3682,-828 3657.76,-816.88 3656.43,-806.42 3634,-792 3605.9,-773.93 3596.1,-774.07 3568,-756 3545.57,-741.58 3544.4,-730.76 3520,-720 3447.53,-688.05 3356.21,-675.33 3297.95,-670.29"/>
+<polygon fill="black" stroke="black" points="3298.51,-666.82 3288.26,-669.5 3297.95,-673.8 3298.51,-666.82"/>
+</g>
+<!-- cookie&#45;&gt;deepseq -->
+<g id="edge232" class="edge">
+<title>cookie&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M4218.21,-1013.34C4223.08,-1011.4 4228.15,-1009.53 4233,-1008 4303.55,-985.75 4484.89,-947.27 4558,-936 4737.91,-908.25 4789.28,-943.66 4966,-900 5006.23,-890.06 5013.75,-879.92 5052,-864 5054.11,-863.12 5658.91,-612.93 5661,-612 5729.33,-581.7 5745.98,-573.1 5813,-540 5844.37,-524.51 5849.12,-512.71 5883,-504 6063.91,-457.5 7423.5,-451.78 7710.07,-451.09"/>
+<polygon fill="black" stroke="black" points="7709.86,-454.59 7719.85,-451.07 7709.84,-447.59 7709.86,-454.59"/>
+</g>
+<!-- cookie&#45;&gt;time -->
+<g id="edge234" class="edge">
+<title>cookie&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M4227.41,-1023.28C4357.53,-1016.95 4821.54,-994.1 5204,-972 5286.13,-967.25 5382.32,-961.01 5434.53,-957.56"/>
+<polygon fill="black" stroke="black" points="5434.64,-961.06 5444.39,-956.91 5434.18,-954.08 5434.64,-961.06"/>
+</g>
+<!-- cookie&#45;&gt;text -->
+<g id="edge233" class="edge">
+<title>cookie&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4227.47,-1023.23C4295.59,-1019.87 4449.45,-1012.53 4579,-1008 5195.72,-986.46 5350.41,-997.1 5967,-972 6039.11,-969.06 7192.32,-908.41 7264,-900 7353.7,-889.48 7374.27,-874.3 7464,-864 7856.24,-818.96 8335.52,-812.19 8472.69,-811.18"/>
+<polygon fill="black" stroke="black" points="8472.31,-814.68 8482.28,-811.11 8472.26,-807.68 8472.31,-814.68"/>
+</g>
+<!-- data&#45;default&#45;class -->
+<g id="node105" class="node">
+<title>data&#45;default&#45;class</title>
+<ellipse fill="none" stroke="black" cx="3674" cy="-954" rx="75.51" ry="18"/>
+<text text-anchor="middle" x="3674" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">data&#45;default&#45;class</text>
+</g>
+<!-- cookie&#45;&gt;data&#45;default&#45;class -->
+<g id="edge231" class="edge">
+<title>cookie&#45;&gt;data&#45;default&#45;class</title>
+<path fill="none" stroke="black" d="M4157.22,-1021.45C4084.18,-1013.83 3909.55,-994.73 3764,-972 3756.8,-970.88 3749.3,-969.61 3741.83,-968.29"/>
+<polygon fill="black" stroke="black" points="3742.51,-964.85 3732.05,-966.52 3741.26,-971.74 3742.51,-964.85"/>
+</g>
+<!-- data&#45;default&#45;class&#45;&gt;data&#45;default -->
+<g id="edge315" class="edge">
+<title>data&#45;default&#45;class&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M3605.69,-946.08C3515.75,-936.76 3352.77,-919.11 3214,-900 3198.55,-897.87 3181.87,-895.32 3166.42,-892.85"/>
+<polygon fill="black" stroke="black" points="3167.35,-889.45 3156.92,-891.31 3166.23,-896.36 3167.35,-889.45"/>
+</g>
+<!-- entropy&#45;&gt;base -->
+<g id="edge335" class="edge">
+<title>entropy&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M4297.65,-1240.13C4184.9,-1237.24 3851.16,-1225.85 3577,-1188 3109.35,-1123.43 2991.01,-1101.37 2537,-972 2378.31,-926.78 1860,-832.01 1860,-667 1860,-667 1860,-667 1860,-449 1860,-394.91 1893.48,-381.76 1943,-360 2024.21,-324.31 8050.52,-308.45 8591.29,-307.1"/>
+<polygon fill="black" stroke="black" points="8591.2,-310.6 8601.19,-307.07 8591.18,-303.6 8591.2,-310.6"/>
+</g>
+<!-- entropy&#45;&gt;Cabal -->
+<g id="edge333" class="edge">
+<title>entropy&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M4375.75,-1238.28C4427.53,-1234.7 4522.14,-1228.36 4603,-1224 5057.7,-1199.49 5609.21,-1178.44 5766.35,-1172.6"/>
+<polygon fill="black" stroke="black" points="5766.44,-1176.1 5776.3,-1172.23 5766.18,-1169.11 5766.44,-1176.1"/>
+</g>
+<!-- entropy&#45;&gt;Win32 -->
+<g id="edge334" class="edge">
+<title>entropy&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M4334.34,-1223.7C4332.27,-1205.07 4331.32,-1175.02 4342,-1152 4361.58,-1109.79 4375.74,-1099.46 4418,-1080 4557.23,-1015.9 4615.22,-1091.37 4761,-1044 4852.28,-1014.34 4858.89,-971.65 4948,-936 4979.62,-923.35 5069.53,-903.39 5123.82,-891.92"/>
+<polygon fill="black" stroke="black" points="5124.28,-895.4 5133.35,-889.91 5122.84,-888.54 5124.28,-895.4"/>
+</g>
+<!-- entropy&#45;&gt;bytestring -->
+<g id="edge336" class="edge">
+<title>entropy&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4305.65,-1230.89C4230.02,-1205.74 4032.93,-1135.77 3886,-1044 3823.16,-1004.75 3825.68,-968.3 3759,-936 3685.58,-900.44 3655.35,-928.74 3579,-900 3519,-877.42 3503.72,-868.48 3454,-828 3404.2,-787.45 3409.77,-758 3358,-720 3336.12,-703.94 3308.6,-691.23 3285.64,-682.29"/>
+<polygon fill="black" stroke="black" points="3287.12,-679.11 3276.53,-678.86 3284.66,-685.66 3287.12,-679.11"/>
+</g>
+<!-- entropy&#45;&gt;directory -->
+<g id="edge337" class="edge">
+<title>entropy&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M4355.64,-1225.97C4397.69,-1192.99 4504.4,-1114.46 4608,-1080 4751.35,-1032.32 4797.81,-1073.36 4946,-1044 4950.33,-1043.14 4954.81,-1042.1 4959.27,-1040.97"/>
+<polygon fill="black" stroke="black" points="4960.01,-1044.4 4968.75,-1038.4 4958.18,-1037.64 4960.01,-1044.4"/>
+</g>
+<!-- entropy&#45;&gt;filepath -->
+<g id="edge338" class="edge">
+<title>entropy&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M4346.96,-1224.41C4359,-1205.33 4380.68,-1173.82 4405,-1152 4451.01,-1110.72 4465.61,-1100.29 4524,-1080 4645.43,-1037.8 4686.1,-1074.43 4811,-1044 4945.84,-1011.15 4973.1,-982.13 5104,-936 5151.32,-919.32 5168.74,-927.04 5211,-900 5229.54,-888.14 5225.63,-874.45 5245,-864 5324.99,-820.85 5432.83,-811.78 5494.75,-810.46"/>
+<polygon fill="black" stroke="black" points="5494.66,-813.96 5504.61,-810.32 5494.56,-806.96 5494.66,-813.96"/>
+</g>
+<!-- entropy&#45;&gt;process -->
+<g id="edge339" class="edge">
+<title>entropy&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M4371.33,-1232.97C4441.86,-1216.6 4608.26,-1178.69 4749,-1152 4846.26,-1133.55 4960.69,-1115.74 5024.22,-1106.19"/>
+<polygon fill="black" stroke="black" points="5024.61,-1109.67 5033.98,-1104.73 5023.57,-1102.75 5024.61,-1109.67"/>
+</g>
+<!-- crypton&#45;&gt;base -->
+<g id="edge245" class="edge">
+<title>crypton&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M353.66,-1079.88C376.39,-975.52 502.08,-427.04 647,-360 743.5,-315.36 7996.36,-307.6 8591.28,-307.03"/>
+<polygon fill="black" stroke="black" points="8591.11,-310.54 8601.1,-307.03 8591.1,-303.54 8591.11,-310.54"/>
+</g>
+<!-- crypton&#45;&gt;ghc&#45;prim -->
+<g id="edge249" class="edge">
+<title>crypton&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M314.38,-1090C254.46,-1075.94 140,-1038.18 140,-955 140,-955 140,-955 140,-881 140,-784.4 102,-763.6 102,-667 102,-667 102,-667 102,-233 102,-185.54 119.23,-166.52 161,-144 250.07,-95.98 14272.31,-91.26 15169.07,-91.01"/>
+<polygon fill="black" stroke="black" points="15168.95,-94.51 15178.95,-91.01 15168.95,-87.51 15168.95,-94.51"/>
+</g>
+<!-- crypton&#45;&gt;Win32 -->
+<g id="edge244" class="edge">
+<title>crypton&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M389.8,-1095.85C496.53,-1092.81 798.07,-1084.47 1049,-1080 1403.19,-1073.69 3885.13,-1084.99 4237,-1044 4273.31,-1039.77 4524.81,-987.31 4558,-972 4582.22,-960.83 4581.11,-945.56 4606,-936 4771.79,-872.29 4827.22,-917.21 5004,-900 5043.6,-896.14 5088.57,-891.43 5121.23,-887.94"/>
+<polygon fill="black" stroke="black" points="5121.59,-891.42 5131.17,-886.88 5120.85,-884.46 5121.59,-891.42"/>
+</g>
+<!-- crypton&#45;&gt;bytestring -->
+<g id="edge247" class="edge">
+<title>crypton&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M360.72,-1080.47C386.14,-1041.46 448.98,-946.19 463,-936 727.03,-744.04 842.84,-772.66 1165,-720 1368.42,-686.75 2865.68,-670.6 3181.58,-667.54"/>
+<polygon fill="black" stroke="black" points="3181.27,-671.05 3191.23,-667.45 3181.2,-664.05 3181.27,-671.05"/>
+</g>
+<!-- crypton&#45;&gt;deepseq -->
+<g id="edge248" class="edge">
+<title>crypton&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M388.88,-1093.84C689.72,-1069.08 2677.36,-899.38 4270,-612 4342.58,-598.9 4359.6,-590.1 4432,-576 4527.1,-557.48 4551.73,-557.61 4647,-540 4726.37,-525.33 4744.76,-512.76 4825,-504 5122.09,-471.55 7336.96,-454.1 7709.8,-451.38"/>
+<polygon fill="black" stroke="black" points="7709.8,-454.88 7719.77,-451.3 7709.75,-447.88 7709.8,-454.88"/>
+</g>
+<!-- crypton&#45;&gt;memory -->
+<g id="edge251" class="edge">
+<title>crypton&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M380.53,-1086.37C414.71,-1074.46 470.34,-1055.09 508.7,-1041.73"/>
+<polygon fill="black" stroke="black" points="509.8,-1045.05 518.09,-1038.46 507.5,-1038.44 509.8,-1045.05"/>
+</g>
+<!-- crypton&#45;&gt;basement -->
+<g id="edge246" class="edge">
+<title>crypton&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M381.39,-1086.61C404.42,-1077.86 435.49,-1063.62 458,-1044 477.91,-1026.64 494.17,-1001.22 504.71,-981.99"/>
+<polygon fill="black" stroke="black" points="507.69,-983.84 509.26,-973.37 501.5,-980.58 507.69,-983.84"/>
+</g>
+<!-- integer&#45;gmp -->
+<g id="node108" class="node">
+<title>integer&#45;gmp</title>
+<ellipse fill="none" stroke="black" cx="375" cy="-378" rx="54.56" ry="18"/>
+<text text-anchor="middle" x="375" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">integer&#45;gmp</text>
+</g>
+<!-- crypton&#45;&gt;integer&#45;gmp -->
+<g id="edge250" class="edge">
+<title>crypton&#45;&gt;integer&#45;gmp</title>
+<path fill="none" stroke="black" d="M345.95,-1079.62C340.11,-1052.97 330,-1000.31 330,-955 330,-955 330,-955 330,-521 330,-479.45 347.73,-434.12 360.93,-406.12"/>
+<polygon fill="black" stroke="black" points="363.99,-407.82 365.23,-397.3 357.7,-404.75 363.99,-407.82"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;base -->
+<g id="edge448" class="edge">
+<title>integer&#45;gmp&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M421.43,-368.06C440.16,-364.86 462.04,-361.64 482,-360 914.54,-324.44 8007.09,-308.35 8591.73,-307.08"/>
+<polygon fill="black" stroke="black" points="8591.36,-310.58 8601.36,-307.06 8591.35,-303.58 8591.36,-310.58"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;bignum -->
+<g id="edge449" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M390.59,-360.56C425.76,-323.49 511.45,-233.16 553.67,-188.65"/>
+<polygon fill="black" stroke="black" points="556.12,-191.15 560.47,-181.48 551.05,-186.33 556.12,-191.15"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;internal -->
+<g id="edge450" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;internal</title>
+<path fill="none" stroke="black" d="M382.84,-359.87C393.92,-335.67 414.27,-291.21 427.46,-262.39"/>
+<polygon fill="black" stroke="black" points="430.52,-264.11 431.5,-253.57 424.16,-261.2 430.52,-264.11"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;prim -->
+<g id="edge451" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M372.72,-359.85C369.46,-329.09 366.33,-263.32 391,-216 413.73,-172.4 428.91,-161.14 475,-144 567.84,-109.47 14285.42,-92.14 15169.36,-91.05"/>
+<polygon fill="black" stroke="black" points="15169.09,-94.55 15179.09,-91.04 15169.08,-87.55 15169.09,-94.55"/>
+</g>
+<!-- crypton&#45;connection -->
+<g id="node109" class="node">
+<title>crypton&#45;connection</title>
+<ellipse fill="none" stroke="black" cx="2531" cy="-1602" rx="83.5" ry="18"/>
+<text text-anchor="middle" x="2531" y="-1596.58" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;connection</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;base -->
+<g id="edge252" class="edge">
+<title>crypton&#45;connection&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2490.87,-1585.86C2365.76,-1538.96 1971.16,-1393.43 1637,-1296 1572.01,-1277.05 1535.41,-1309.28 1489,-1260 1420.36,-1187.12 1364.28,-417.83 1446,-360 1523.93,-304.85 8029.55,-306.72 8591.39,-306.98"/>
+<polygon fill="black" stroke="black" points="8591.33,-310.48 8601.33,-306.98 8591.34,-303.48 8591.33,-310.48"/>
+</g>
+<!-- crypton&#45;connection&#45;&gt;bytestring -->
+<g id="edge253" class="edge">
+<title>crypton&#45;connection&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2523.7,-1583.91C2511.95,-1553.78 2491.99,-1489.72 2511,-1440 2541.69,-1359.74 2580.09,-1357.6 2640,-1296 2656.22,-1279.32 2666.67,-1280.32 2678,-1260 2693.93,-1231.46 2689.65,-1220.51 2693,-1188 2703.19,-1089.12 2650.43,-1070.2 2635,-972 2627.42,-923.78 2632.88,-907.52 2655,-864 2673.49,-827.62 2677.42,-813.68 2712,-792 2774.49,-752.83 2808.87,-790.62 2874,-756 2894.54,-745.08 2891.15,-730.31 2912,-720 2998.88,-677.03 3113.02,-667.64 3181.2,-666.25"/>
+<polygon fill="black" stroke="black" points="3181.1,-669.75 3191.05,-666.11 3181,-662.76 3181.1,-669.75"/>
+</g>
+<!-- crypton&#45;connection&#45;&gt;containers -->
+<g id="edge254" class="edge">
+<title>crypton&#45;connection&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2614.8,-1601.16C3243.3,-1601.89 7227.01,-1598.72 8415,-1404 8524.9,-1385.99 8550.16,-1369.55 8655,-1332 8991.07,-1211.63 9086.98,-1185.6 9373,-972 9392.97,-957.09 9394.41,-948.45 9416,-936 9456.56,-912.62 9488.14,-938.35 9515,-900 9524.18,-886.89 9523.84,-877.34 9515,-864 9492.34,-829.8 9452.66,-862.2 9430,-828 9403.49,-787.98 9416.81,-766.15 9430,-720 9432.71,-710.52 9437.66,-701.08 9442.92,-692.85"/>
+<polygon fill="black" stroke="black" points="9445.72,-694.96 9448.5,-684.74 9439.95,-691 9445.72,-694.96"/>
+</g>
+<!-- crypton&#45;connection&#45;&gt;data&#45;default -->
+<g id="edge258" class="edge">
+<title>crypton&#45;connection&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M2614.65,-1601.03C2797.39,-1598.83 3216,-1580.53 3216,-1459 3216,-1459 3216,-1459 3216,-1385 3216,-1287.05 3079.39,-1068.4 3062,-972 3059.16,-956.25 3056.4,-950.99 3062,-936 3065.99,-925.33 3073.2,-915.38 3080.75,-907.05"/>
+<polygon fill="black" stroke="black" points="3083.07,-909.68 3087.56,-900.08 3078.07,-904.79 3083.07,-909.68"/>
+</g>
+<!-- crypton&#45;socks -->
+<g id="node110" class="node">
+<title>crypton&#45;socks</title>
+<ellipse fill="none" stroke="black" cx="2551" cy="-1242" rx="64.54" ry="18"/>
+<text text-anchor="middle" x="2551" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;socks</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;crypton&#45;socks -->
+<g id="edge255" class="edge">
+<title>crypton&#45;connection&#45;&gt;crypton&#45;socks</title>
+<path fill="none" stroke="black" d="M2507.36,-1584.46C2496.2,-1575.18 2484.03,-1562.55 2478,-1548 2447.39,-1474.09 2458.77,-1445.65 2478,-1368 2487.33,-1330.31 2511.99,-1292.59 2530.07,-1268.6"/>
+<polygon fill="black" stroke="black" points="2532.6,-1271.05 2535.95,-1261 2527.06,-1266.77 2532.6,-1271.05"/>
+</g>
+<!-- crypton&#45;x509&#45;store -->
+<g id="node111" class="node">
+<title>crypton&#45;x509&#45;store</title>
+<ellipse fill="none" stroke="black" cx="1686" cy="-1386" rx="82" ry="18"/>
+<text text-anchor="middle" x="1686" y="-1380.58" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;x509&#45;store</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;crypton&#45;x509&#45;store -->
+<g id="edge256" class="edge">
+<title>crypton&#45;connection&#45;&gt;crypton&#45;x509&#45;store</title>
+<path fill="none" stroke="black" d="M2463.97,-1590.93C2404.31,-1581.48 2314.86,-1566.11 2238,-1548 2053.69,-1504.58 1839.44,-1437.11 1740.82,-1405.07"/>
+<polygon fill="black" stroke="black" points="1741.97,-1401.76 1731.38,-1402 1739.81,-1408.42 1741.97,-1401.76"/>
+</g>
+<!-- crypton&#45;x509&#45;system -->
+<g id="node112" class="node">
+<title>crypton&#45;x509&#45;system</title>
+<ellipse fill="none" stroke="black" cx="2609" cy="-1458" rx="89.49" ry="18"/>
+<text text-anchor="middle" x="2609" y="-1452.58" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;x509&#45;system</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;crypton&#45;x509&#45;system -->
+<g id="edge257" class="edge">
+<title>crypton&#45;connection&#45;&gt;crypton&#45;x509&#45;system</title>
+<path fill="none" stroke="black" d="M2540.41,-1583.87C2553.76,-1559.56 2578.34,-1514.82 2594.16,-1486.01"/>
+<polygon fill="black" stroke="black" points="2597.08,-1487.97 2598.83,-1477.52 2590.95,-1484.6 2597.08,-1487.97"/>
+</g>
+<!-- crypton&#45;connection&#45;&gt;network -->
+<g id="edge259" class="edge">
+<title>crypton&#45;connection&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M2613.9,-1599.03C2870.42,-1591.84 3634,-1561.81 3634,-1459 3634,-1459 3634,-1459 3634,-1313 3634,-1273.69 3631.29,-1228.34 3629.24,-1199.67"/>
+<polygon fill="black" stroke="black" points="3632.76,-1199.7 3628.53,-1189.98 3625.77,-1200.22 3632.76,-1199.7"/>
+</g>
+<!-- tls -->
+<g id="node114" class="node">
+<title>tls</title>
+<ellipse fill="none" stroke="black" cx="1816" cy="-1530" rx="27" ry="18"/>
+<text text-anchor="middle" x="1816" y="-1524.58" font-family="Times New Roman,serif" font-size="14.00">tls</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;tls -->
+<g id="edge260" class="edge">
+<title>crypton&#45;connection&#45;&gt;tls</title>
+<path fill="none" stroke="black" d="M2456.17,-1593.67C2304.85,-1578.86 1967.28,-1545.81 1853.94,-1534.71"/>
+<polygon fill="black" stroke="black" points="1854.57,-1531.26 1844.27,-1533.77 1853.88,-1538.23 1854.57,-1531.26"/>
+</g>
+<!-- crypton&#45;socks&#45;&gt;base -->
+<g id="edge261" class="edge">
+<title>crypton&#45;socks&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2496.06,-1232.31C2445.29,-1223.56 2368.11,-1208.44 2303,-1188 2066.58,-1113.78 1412.14,-962.39 1275,-756 1256.96,-728.85 1279.3,-715.12 1289,-684 1311.02,-613.35 1308.1,-406.09 1366,-360 1441.54,-299.86 8025.81,-306.29 8591.36,-306.95"/>
+<polygon fill="black" stroke="black" points="8591.01,-310.45 8601.02,-306.96 8591.02,-303.45 8591.01,-310.45"/>
+</g>
+<!-- crypton&#45;socks&#45;&gt;bytestring -->
+<g id="edge262" class="edge">
+<title>crypton&#45;socks&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2560.54,-1223.93C2565.64,-1213.82 2571.39,-1200.57 2574,-1188 2577.25,-1172.33 2575.1,-1167.96 2574,-1152 2571.77,-1119.77 2578.59,-1108.83 2564,-1080 2553.64,-1059.53 2535.93,-1065.14 2527,-1044 2520.86,-1029.45 2522.37,-955.09 2530,-936 2561.56,-857.03 2582.4,-834.6 2656,-792 2726.61,-751.13 2761.52,-789.3 2836,-756 2860.34,-745.12 2859.39,-730.28 2884,-720 2982.79,-678.74 3108.81,-668.97 3181.36,-667.02"/>
+<polygon fill="black" stroke="black" points="3181.1,-670.52 3191.01,-666.8 3180.94,-663.53 3181.1,-670.52"/>
+</g>
+<!-- crypton&#45;socks&#45;&gt;cereal -->
+<g id="edge263" class="edge">
+<title>crypton&#45;socks&#45;&gt;cereal</title>
+<path fill="none" stroke="black" d="M2554.92,-1223.72C2560.99,-1192.74 2569.48,-1126.66 2544,-1080 2530.7,-1055.65 2505.94,-1068.55 2493,-1044 2470.62,-1001.53 2484.02,-983.33 2492,-936 2503.27,-869.2 2497.29,-842.9 2542,-792 2551.96,-780.65 2585.35,-764.9 2612.02,-753.51"/>
+<polygon fill="black" stroke="black" points="2613.32,-756.76 2621.19,-749.67 2610.61,-750.31 2613.32,-756.76"/>
+</g>
+<!-- crypton&#45;socks&#45;&gt;network -->
+<g id="edge264" class="edge">
+<title>crypton&#45;socks&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M2613.5,-1236.93C2807.5,-1224.31 3397.03,-1185.96 3575.35,-1174.36"/>
+<polygon fill="black" stroke="black" points="3575.48,-1177.86 3585.23,-1173.72 3575.02,-1170.87 3575.48,-1177.86"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;base -->
+<g id="edge278" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1603.84,-1384.46C1464.37,-1382.4 1187.96,-1373.09 1101,-1332 1060.37,-1312.8 1047.05,-1301.58 1030,-1260 999.48,-1185.57 1028.09,-1157.68 1049,-1080 1080.46,-963.17 1112.85,-942.49 1152,-828 1211.06,-655.27 1198.66,-603.57 1261,-432 1273.02,-398.92 1264.44,-379.12 1294,-360 1375.9,-307.03 8023.67,-306.91 8591.44,-306.99"/>
+<polygon fill="black" stroke="black" points="8591.14,-310.49 8601.14,-306.99 8591.14,-303.49 8591.14,-310.49"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;bytestring -->
+<g id="edge279" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1706.64,-1368.16C1733.21,-1345.68 1779.55,-1303.61 1810,-1260 1924.55,-1095.99 1875.17,-997.68 2024,-864 2049.73,-840.89 2128.98,-802.31 2162,-792 2285.13,-753.56 2330.39,-804.32 2450,-756 2474.73,-746.01 2473.02,-729.33 2498,-720 2622.84,-673.38 3028.61,-667.48 3181.23,-666.95"/>
+<polygon fill="black" stroke="black" points="3181.13,-670.45 3191.12,-666.92 3181.11,-663.45 3181.13,-670.45"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;containers -->
+<g id="edge280" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1767.65,-1383.75C1964.27,-1380.77 2479.68,-1373.1 2910,-1368 3723.76,-1358.35 5758.98,-1367.94 6572,-1332 6979.53,-1313.98 7080.96,-1299.13 7487,-1260 8048.93,-1205.85 8196.84,-1233.54 8749,-1116 8800.97,-1104.94 8811.81,-1094.25 8863,-1080 8928.63,-1061.73 8949.26,-1070.54 9012,-1044 9039.6,-1032.33 9042.14,-1021.28 9069,-1008 9110.22,-987.61 9133.01,-1004.04 9166,-972 9252.68,-887.82 9177.62,-800.2 9268,-720 9305.14,-687.05 9360.81,-674.33 9403.17,-669.55"/>
+<polygon fill="black" stroke="black" points="9403.36,-673.05 9412.96,-668.57 9402.66,-666.08 9403.36,-673.05"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;directory -->
+<g id="edge283" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1763.34,-1379.68C2081.45,-1357.25 3319.72,-1264.69 4329,-1116 4416.19,-1103.15 4436.81,-1092.84 4524,-1080 4677.8,-1057.34 4860.62,-1039.7 4949.74,-1031.7"/>
+<polygon fill="black" stroke="black" points="4950.01,-1035.19 4959.66,-1030.81 4949.39,-1028.22 4950.01,-1035.19"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;filepath -->
+<g id="edge284" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1766.53,-1382.33C1984.64,-1375.03 2605.1,-1353.83 3121,-1332 3456.64,-1317.8 3540.38,-1310.59 3876,-1296 4079.74,-1287.14 4593.38,-1301.74 4793,-1260 4964.91,-1224.06 5010.43,-1206.42 5161,-1116 5305.38,-1029.29 5306.09,-960.66 5444,-864 5463.69,-850.2 5487.39,-837.49 5506.79,-827.97"/>
+<polygon fill="black" stroke="black" points="5508.2,-831.17 5515.7,-823.68 5505.17,-824.87 5508.2,-831.17"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;mtl -->
+<g id="edge285" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M1767.85,-1383.87C2298.38,-1376.5 5231.19,-1335.69 5323,-1332 5809.88,-1312.44 5940.66,-1362.65 6417,-1260 6623.74,-1215.45 6753.37,-1236.48 6841,-1044 6860.99,-1000.09 6880.89,-974.64 6852,-936 6818.15,-890.72 6763.85,-945.28 6730,-900 6720.42,-887.18 6727.12,-879.74 6730,-864 6747.04,-771.02 6794.63,-668.5 6818.29,-621.36"/>
+<polygon fill="black" stroke="black" points="6821.26,-623.23 6822.67,-612.73 6815.02,-620.06 6821.26,-623.23"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;asn1&#45;encoding -->
+<g id="edge276" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M1630.53,-1372.4C1562.39,-1355.05 1445.35,-1319.08 1360,-1260 1335.44,-1243 1313.42,-1216.82 1298.91,-1197.24"/>
+<polygon fill="black" stroke="black" points="1301.8,-1195.26 1293.11,-1189.19 1296.12,-1199.35 1301.8,-1195.26"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;asn1&#45;types -->
+<g id="edge277" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M1611.44,-1378.16C1556.8,-1371.25 1481.7,-1357.77 1420,-1332 1298.43,-1281.23 1181.37,-1172.34 1132.67,-1123.54"/>
+<polygon fill="black" stroke="black" points="1135.24,-1121.16 1125.72,-1116.5 1130.26,-1126.08 1135.24,-1121.16"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;crypton -->
+<g id="edge281" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M1604.68,-1383.1C1429.81,-1378.45 1023.03,-1364.4 889,-1332 687.54,-1283.3 466.12,-1165 383.5,-1118.36"/>
+<polygon fill="black" stroke="black" points="385.42,-1115.42 374.99,-1113.53 381.96,-1121.51 385.42,-1115.42"/>
+</g>
+<!-- crypton&#45;x509 -->
+<g id="node115" class="node">
+<title>crypton&#45;x509</title>
+<ellipse fill="none" stroke="black" cx="1171" cy="-1314" rx="60.54" ry="18"/>
+<text text-anchor="middle" x="1171" y="-1308.58" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;x509</text>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;crypton&#45;x509 -->
+<g id="edge282" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;crypton&#45;x509</title>
+<path fill="none" stroke="black" d="M1617.61,-1375.7C1517.99,-1362.16 1334.22,-1337.18 1236.34,-1323.88"/>
+<polygon fill="black" stroke="black" points="1237.01,-1320.44 1226.63,-1322.56 1236.07,-1327.38 1237.01,-1320.44"/>
+</g>
+<!-- pem -->
+<g id="node116" class="node">
+<title>pem</title>
+<ellipse fill="none" stroke="black" cx="760" cy="-1170" rx="27" ry="18"/>
+<text text-anchor="middle" x="760" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">pem</text>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;pem -->
+<g id="edge286" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;pem</title>
+<path fill="none" stroke="black" d="M1604.62,-1383.38C1443.6,-1379.45 1089.91,-1367.01 974,-1332 911.52,-1313.13 897.67,-1299.89 846,-1260 820.86,-1240.59 796.08,-1213.92 779.63,-1194.85"/>
+<polygon fill="black" stroke="black" points="782.37,-1192.68 773.23,-1187.32 777.03,-1197.21 782.37,-1192.68"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;base -->
+<g id="edge289" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2543.27,-1445.51C2306.59,-1404.1 1511.64,-1264.72 1507,-1260 1473.9,-1226.36 1442,-780.12 1442,-739 1442,-739 1442,-739 1442,-665 1442,-528.28 1378.61,-449.46 1482,-360 1553.82,-297.86 8028.78,-306.11 8591.12,-306.94"/>
+<polygon fill="black" stroke="black" points="8591.08,-310.44 8601.09,-306.95 8591.09,-303.44 8591.08,-310.44"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;Win32 -->
+<g id="edge287" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M2697.91,-1455.31C2831.03,-1451.63 3074.96,-1440.03 3154,-1404 3175.17,-1394.35 3173.27,-1381.8 3192,-1368 3349.98,-1251.64 3391.12,-1214.81 3577,-1152 3901.89,-1042.22 4002.98,-1101.83 4341,-1044 4580.96,-1002.95 4638.93,-981.96 4878,-936 4964.7,-919.33 5066.26,-900.98 5122.97,-890.83"/>
+<polygon fill="black" stroke="black" points="5123.31,-894.33 5132.54,-889.12 5122.08,-887.44 5123.31,-894.33"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;bytestring -->
+<g id="edge290" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2611.26,-1439.71C2616.23,-1407.85 2630.78,-1339.18 2668,-1296 2689.81,-1270.69 2716.94,-1288.73 2734,-1260 2774.84,-1191.21 2761.23,-1155.22 2734,-1080 2728.68,-1065.31 2649.32,-986.69 2644,-972 2638.55,-956.96 2638.37,-950.98 2644,-936 2673.91,-856.39 2697.51,-836.46 2770,-792 2825.5,-757.96 2850.25,-776.63 2912,-756 2951.3,-742.87 2958.49,-732.48 2998,-720 3061.54,-699.92 3136.81,-684.74 3186.34,-675.87"/>
+<polygon fill="black" stroke="black" points="3186.69,-679.36 3195.93,-674.18 3185.48,-672.47 3186.69,-679.36"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;containers -->
+<g id="edge291" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2697.27,-1454.52C2836,-1450.73 3113.54,-1443.56 3349,-1440 3624.81,-1435.83 8041.47,-1446.59 8314,-1404 8526.08,-1370.86 8575.77,-1339.89 8775,-1260 8875.36,-1219.76 8892.46,-1191.79 8993,-1152 9044.38,-1131.67 9062.2,-1139.94 9112,-1116 9188.33,-1079.3 9196.84,-1052.34 9269,-1008 9297.47,-990.51 9306.9,-990.07 9335,-972 9357.43,-957.58 9359.3,-948.22 9383,-936 9429.85,-911.85 9464.9,-942.55 9496,-900 9550.16,-825.91 9403.77,-844.53 9392,-828 9364.16,-788.9 9370.49,-762.91 9392,-720 9398.92,-706.19 9411.34,-695.06 9423.87,-686.64"/>
+<polygon fill="black" stroke="black" points="9425.46,-689.77 9432.1,-681.52 9421.76,-683.83 9425.46,-689.77"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;directory -->
+<g id="edge294" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M2697.26,-1454.87C2812.19,-1450.77 3018.87,-1438.78 3192,-1404 3244.09,-1393.53 3254.1,-1379.4 3306,-1368 3553.68,-1313.6 3619.64,-1320.89 3872,-1296 4099.46,-1273.57 4166.42,-1326.82 4385,-1260 4538.1,-1213.2 4546.46,-1134.46 4697,-1080 4720.56,-1071.48 4870.84,-1047.53 4952.06,-1034.95"/>
+<polygon fill="black" stroke="black" points="4952.2,-1038.47 4961.55,-1033.48 4951.13,-1031.55 4952.2,-1038.47"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;filepath -->
+<g id="edge295" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M2695.49,-1453.09C3054.84,-1436.29 4430.73,-1366.19 4851,-1260 5061.05,-1206.93 5126.97,-1188.94 5288,-1044 5290.66,-1041.61 5469.28,-866.32 5472,-864 5485.23,-852.76 5500.64,-841.22 5513.81,-831.79"/>
+<polygon fill="black" stroke="black" points="5515.55,-834.84 5521.69,-826.21 5511.51,-829.13 5515.55,-834.84"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;mtl -->
+<g id="edge296" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M2697.44,-1454.89C3271.01,-1441.15 6446.34,-1363.87 6648,-1332 6817.4,-1305.23 6924.44,-1338.86 7006,-1188 7037.32,-1130.06 7174.82,-1149.11 6998,-936 6951.74,-880.24 6884.22,-956.61 6839,-900 6818.83,-874.76 6843.53,-859.84 6849,-828 6862.55,-749.14 6860.67,-726.65 6846,-648 6844.48,-639.83 6842.36,-631.06 6840.24,-623.06"/>
+<polygon fill="black" stroke="black" points="6843.63,-622.2 6837.59,-613.5 6836.89,-624.07 6843.63,-622.2"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;process -->
+<g id="edge298" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M2693.88,-1451.91C2825.25,-1443.73 3085.65,-1426.28 3306,-1404 3560.05,-1378.31 3623.59,-1370.63 3876,-1332 3965.28,-1318.34 3986.27,-1306.29 4076,-1296 4234.5,-1277.83 4639.95,-1305.01 4793,-1260 4893.87,-1230.34 4997.18,-1157.76 5045.25,-1121.04"/>
+<polygon fill="black" stroke="black" points="5047.14,-1124.01 5052.91,-1115.12 5042.86,-1118.47 5047.14,-1124.01"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;asn1&#45;encoding -->
+<g id="edge288" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M2527.49,-1450.18C2338.61,-1432.81 1857.8,-1379.55 1474,-1260 1417.97,-1242.55 1357.07,-1212.43 1318.97,-1192.12"/>
+<polygon fill="black" stroke="black" points="1320.65,-1189.05 1310.19,-1187.39 1317.33,-1195.21 1320.65,-1189.05"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;crypton&#45;x509&#45;store -->
+<g id="edge293" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;crypton&#45;x509&#45;store</title>
+<path fill="none" stroke="black" d="M2526.28,-1450.73C2352.76,-1437.57 1952.13,-1407.18 1774.06,-1393.68"/>
+<polygon fill="black" stroke="black" points="1774.4,-1390.19 1764.17,-1392.93 1773.88,-1397.17 1774.4,-1390.19"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;crypton&#45;x509 -->
+<g id="edge292" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;crypton&#45;x509</title>
+<path fill="none" stroke="black" d="M2519.4,-1456.96C2342.11,-1455.85 1934.34,-1448.21 1595,-1404 1461.08,-1386.55 1306.44,-1349.8 1226.02,-1329.4"/>
+<polygon fill="black" stroke="black" points="1227.2,-1326.09 1216.64,-1327.01 1225.47,-1332.87 1227.2,-1326.09"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;pem -->
+<g id="edge297" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;pem</title>
+<path fill="none" stroke="black" d="M2519.85,-1456.13C2318.42,-1453.49 1812.88,-1443.19 1392,-1404 1167.14,-1383.06 1095.5,-1423.42 889,-1332 843.11,-1311.68 832.78,-1299.64 802,-1260 787.6,-1241.45 776.55,-1217.16 769.41,-1198.64"/>
+<polygon fill="black" stroke="black" points="772.74,-1197.55 766,-1189.38 766.17,-1199.97 772.74,-1197.55"/>
+</g>
+<!-- network&#45;&gt;base -->
+<g id="edge546" class="edge">
+<title>network&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M3592.09,-1160.38C3356.53,-1102.17 2008.25,-768.64 1991,-756 1953.49,-728.52 1936,-713.5 1936,-667 1936,-667 1936,-667 1936,-449 1936,-402.73 1949.77,-382.86 1990,-360 2066.57,-316.49 8051.19,-307.75 8591.13,-307.05"/>
+<polygon fill="black" stroke="black" points="8591.02,-310.55 8601.01,-307.04 8591.01,-303.55 8591.02,-310.55"/>
+</g>
+<!-- network&#45;&gt;bytestring -->
+<g id="edge547" class="edge">
+<title>network&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3594.56,-1158.92C3549.49,-1144.82 3472.85,-1120.4 3468,-1116 3468,-1116 3292,-720 3292,-720 3284.86,-709.5 3275.52,-699.23 3266.72,-690.57"/>
+<polygon fill="black" stroke="black" points="3269.3,-688.2 3259.64,-683.85 3264.48,-693.27 3269.3,-688.2"/>
+</g>
+<!-- network&#45;&gt;deepseq -->
+<g id="edge548" class="edge">
+<title>network&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3623.83,-1151.68C3618.85,-1118.51 3613.48,-1045.94 3653,-1008 3701.43,-961.5 4186.1,-941.78 4253,-936 4328.38,-929.49 4864.57,-932.29 4933,-900 4952.63,-890.74 4948.26,-876.5 4966,-864 4984.95,-850.65 5713.79,-549.36 5735,-540 5769.93,-524.59 5775.82,-512.7 5813,-504 6002.05,-459.78 7417.03,-452.25 7710,-451.17"/>
+<polygon fill="black" stroke="black" points="7709.64,-454.67 7719.62,-451.13 7709.61,-447.67 7709.64,-454.67"/>
+</g>
+<!-- network&#45;&gt;directory -->
+<g id="edge549" class="edge">
+<title>network&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M3666.36,-1164.94C3861.54,-1144.81 4725.17,-1055.75 4950.22,-1032.55"/>
+<polygon fill="black" stroke="black" points="4950.28,-1036.06 4959.87,-1031.55 4949.57,-1029.09 4950.28,-1036.06"/>
+</g>
+<!-- network&#45;&gt;stm -->
+<g id="edge550" class="edge">
+<title>network&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M3594.15,-1159.1C3561.92,-1148.64 3516.16,-1131.55 3506,-1116 3463.59,-1051.12 3511.85,-993.27 3589,-936 3830.73,-756.57 3998.79,-933.43 4242,-756 4291.57,-719.84 4275.09,-679.07 4328,-648 4412.68,-598.27 4451.58,-638.98 4546,-612 4548.79,-611.2 4551.64,-610.27 4554.48,-609.27"/>
+<polygon fill="black" stroke="black" points="4555.72,-612.54 4563.79,-605.67 4553.2,-606.01 4555.72,-612.54"/>
+</g>
+<!-- temporary -->
+<g id="node132" class="node">
+<title>temporary</title>
+<ellipse fill="none" stroke="black" cx="5799" cy="-1098" rx="48.57" ry="18"/>
+<text text-anchor="middle" x="5799" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">temporary</text>
+</g>
+<!-- network&#45;&gt;temporary -->
+<g id="edge551" class="edge">
+<title>network&#45;&gt;temporary</title>
+<path fill="none" stroke="black" d="M3667.5,-1167.69C3932.81,-1159.14 5421.72,-1111.16 5739.38,-1100.92"/>
+<polygon fill="black" stroke="black" points="5739.22,-1104.43 5749.1,-1100.61 5738.99,-1097.43 5739.22,-1104.43"/>
+</g>
+<!-- tls&#45;&gt;base -->
+<g id="edge774" class="edge">
+<title>tls&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1788.97,-1529.26C1641.09,-1530.46 928.92,-1533.14 718,-1476 651.23,-1457.91 619.85,-1460.55 580,-1404 368.98,-1104.6 1056.17,-914.4 1119,-828 1247.15,-651.78 1089.95,-489.74 1265,-360 1343.67,-301.69 8020.97,-306.45 8591.27,-306.96"/>
+<polygon fill="black" stroke="black" points="8591.01,-310.46 8601.02,-306.97 8591.02,-303.46 8591.01,-310.46"/>
+</g>
+<!-- tls&#45;&gt;bytestring -->
+<g id="edge776" class="edge">
+<title>tls&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1822.51,-1512.11C1859.62,-1418.58 2054.33,-962.12 2383,-792 2441.2,-761.87 2464.05,-777.39 2526,-756 2563.24,-743.14 2568.84,-729.78 2607,-720 2714.95,-692.33 3047,-675.32 3182.01,-669.38"/>
+<polygon fill="black" stroke="black" points="3181.95,-672.89 3191.79,-668.95 3181.65,-665.89 3181.95,-672.89"/>
+</g>
+<!-- tls&#45;&gt;mtl -->
+<g id="edge784" class="edge">
+<title>tls&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M1843.23,-1528.21C2005.68,-1523.48 2863.77,-1498.38 3564,-1476 4040.03,-1460.78 4158.92,-1453.57 4635,-1440 5318.47,-1420.51 5490.95,-1452.06 6173,-1404 6445.76,-1384.78 6518.01,-1395.36 6784,-1332 6981.68,-1284.91 7093.09,-1296.22 7187,-1116 7209.72,-1072.39 7186.93,-1050.96 7163,-1008 7142.73,-971.61 7134.32,-963.46 7103,-936 7080.47,-916.25 7067.69,-920.67 7046,-900 6997.88,-854.16 6889.11,-685.37 6848.08,-620.57"/>
+<polygon fill="black" stroke="black" points="6851.2,-618.96 6842.9,-612.37 6845.28,-622.7 6851.2,-618.96"/>
+</g>
+<!-- tls&#45;&gt;transformers -->
+<g id="edge787" class="edge">
+<title>tls&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M1843.33,-1528.73C2334.24,-1523.9 9283.55,-1453.45 10171,-1332 11013.28,-1216.73 11300.23,-1245.92 11995,-756 12105.72,-677.93 12116.53,-629.5 12241,-576 12313.36,-544.9 12403.46,-532.04 12464.07,-526.73"/>
+<polygon fill="black" stroke="black" points="12464.23,-530.23 12473.91,-525.92 12463.65,-523.25 12464.23,-530.23"/>
+</g>
+<!-- tls&#45;&gt;asn1&#45;encoding -->
+<g id="edge772" class="edge">
+<title>tls&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M1788.6,-1528.5C1681.59,-1526.26 1295.92,-1515.5 1260,-1476 1223.71,-1436.08 1258.3,-1267.22 1274.08,-1199.39"/>
+<polygon fill="black" stroke="black" points="1277.46,-1200.32 1276.35,-1189.78 1270.64,-1198.71 1277.46,-1200.32"/>
+</g>
+<!-- tls&#45;&gt;asn1&#45;types -->
+<g id="edge773" class="edge">
+<title>tls&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M1788.92,-1528.05C1618.93,-1521.85 703.33,-1484.82 612,-1404 520.22,-1322.77 613.87,-1205.78 724,-1152 779.8,-1124.75 954.4,-1109.29 1048.12,-1102.75"/>
+<polygon fill="black" stroke="black" points="1048.16,-1106.25 1057.89,-1102.08 1047.68,-1099.27 1048.16,-1106.25"/>
+</g>
+<!-- tls&#45;&gt;memory -->
+<g id="edge783" class="edge">
+<title>tls&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M1788.75,-1528.84C1598.81,-1527.64 478.6,-1518.73 422,-1476 363.68,-1431.98 331.72,-1216.53 366,-1152 382.3,-1121.32 466.47,-1072.32 515.48,-1045.7"/>
+<polygon fill="black" stroke="black" points="516.89,-1048.91 524.03,-1041.09 513.57,-1042.75 516.89,-1048.91"/>
+</g>
+<!-- tls&#45;&gt;data&#45;default -->
+<g id="edge782" class="edge">
+<title>tls&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M1842.45,-1525.02C1934.49,-1511.3 2249.48,-1465.42 2511,-1440 2630.92,-1428.34 2940.31,-1449.21 3052,-1404 3097.89,-1385.42 3116.18,-1376.92 3137,-1332 3143.73,-1317.48 3138.53,-1311.93 3137,-1296 3133.87,-1263.55 3130.48,-1255.73 3123,-1224 3115.38,-1191.67 3112.9,-1183.7 3103,-1152 3092.91,-1119.66 3090.98,-1111.29 3078,-1080 3064.36,-1047.14 3059.08,-1039.74 3043,-1008 3034.82,-991.86 3028.35,-989.56 3024,-972 3020.15,-956.47 3016.27,-950.01 3024,-936 3032.39,-920.79 3047.19,-909.34 3062.05,-901.05"/>
+<polygon fill="black" stroke="black" points="3063.62,-904.18 3070.92,-896.5 3060.43,-897.95 3063.62,-904.18"/>
+</g>
+<!-- tls&#45;&gt;base16&#45;bytestring -->
+<g id="edge775" class="edge">
+<title>tls&#45;&gt;base16&#45;bytestring</title>
+<path fill="none" stroke="black" d="M1788.64,-1529.2C1598.96,-1530.46 483.21,-1535.3 346,-1476 315.74,-1462.92 290.04,-1434.61 273.94,-1413.4"/>
+<polygon fill="black" stroke="black" points="276.86,-1411.47 268.14,-1405.47 271.21,-1415.6 276.86,-1411.47"/>
+</g>
+<!-- tls&#45;&gt;cereal -->
+<g id="edge777" class="edge">
+<title>tls&#45;&gt;cereal</title>
+<path fill="none" stroke="black" d="M1840.66,-1522.06C1864.55,-1514.25 1900.53,-1499.49 1924,-1476 2062.54,-1337.37 2003.5,-1239.06 2118,-1080 2171.25,-1006.03 2195.4,-996 2264,-936 2342.69,-867.17 2356.33,-838.43 2450,-792 2477.51,-778.36 2557.89,-759.03 2607.37,-747.88"/>
+<polygon fill="black" stroke="black" points="2607.86,-751.35 2616.86,-745.75 2606.33,-744.52 2607.86,-751.35"/>
+</g>
+<!-- tls&#45;&gt;crypton -->
+<g id="edge778" class="edge">
+<title>tls&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M1788.65,-1528.84C1595.55,-1527.57 443.42,-1518.28 384,-1476 380.5,-1473.51 328.79,-1336.22 328,-1332 313.25,-1253.37 312.36,-1230.46 328,-1152 329.74,-1143.27 332.95,-1134.17 336.38,-1126.03"/>
+<polygon fill="black" stroke="black" points="339.53,-1127.58 340.47,-1117.03 333.15,-1124.69 339.53,-1127.58"/>
+</g>
+<!-- tls&#45;&gt;crypton&#45;x509&#45;store -->
+<g id="edge780" class="edge">
+<title>tls&#45;&gt;crypton&#45;x509&#45;store</title>
+<path fill="none" stroke="black" d="M1802.33,-1514.07C1780.14,-1489.83 1736.04,-1441.66 1708.97,-1412.09"/>
+<polygon fill="black" stroke="black" points="1711.84,-1410.04 1702.51,-1405.03 1706.68,-1414.77 1711.84,-1410.04"/>
+</g>
+<!-- tls&#45;&gt;network -->
+<g id="edge785" class="edge">
+<title>tls&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M1843.17,-1528.8C2055.64,-1527.12 3444.4,-1514.69 3523,-1476 3568.9,-1453.41 3596,-1438.16 3596,-1387 3596,-1387 3596,-1387 3596,-1313 3596,-1272.64 3608.1,-1227.27 3617.18,-1198.92"/>
+<polygon fill="black" stroke="black" points="3620.43,-1200.25 3620.25,-1189.66 3613.78,-1198.05 3620.43,-1200.25"/>
+</g>
+<!-- tls&#45;&gt;crypton&#45;x509 -->
+<g id="edge779" class="edge">
+<title>tls&#45;&gt;crypton&#45;x509</title>
+<path fill="none" stroke="black" d="M1788.86,-1528.27C1679.1,-1525.08 1271.76,-1510.95 1227,-1476 1186.24,-1444.17 1175.03,-1380.78 1172.02,-1343.74"/>
+<polygon fill="black" stroke="black" points="1175.52,-1343.54 1171.38,-1333.79 1168.53,-1343.99 1175.52,-1343.54"/>
+</g>
+<!-- crypton&#45;x509&#45;validation -->
+<g id="node117" class="node">
+<title>crypton&#45;x509&#45;validation</title>
+<ellipse fill="none" stroke="black" cx="1368" cy="-1458" rx="98.97" ry="18"/>
+<text text-anchor="middle" x="1368" y="-1452.58" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;x509&#45;validation</text>
+</g>
+<!-- tls&#45;&gt;crypton&#45;x509&#45;validation -->
+<g id="edge781" class="edge">
+<title>tls&#45;&gt;crypton&#45;x509&#45;validation</title>
+<path fill="none" stroke="black" d="M1789.65,-1524.88C1724.93,-1514.77 1555.93,-1488.36 1452.6,-1472.22"/>
+<polygon fill="black" stroke="black" points="1453.18,-1468.77 1442.76,-1470.68 1452.1,-1475.68 1453.18,-1468.77"/>
+</g>
+<!-- serialise -->
+<g id="node140" class="node">
+<title>serialise</title>
+<ellipse fill="none" stroke="black" cx="7850" cy="-1386" rx="39.59" ry="18"/>
+<text text-anchor="middle" x="7850" y="-1380.58" font-family="Times New Roman,serif" font-size="14.00">serialise</text>
+</g>
+<!-- tls&#45;&gt;serialise -->
+<g id="edge786" class="edge">
+<title>tls&#45;&gt;serialise</title>
+<path fill="none" stroke="black" d="M1843.1,-1528.58C2055.8,-1525.28 3478.88,-1502.87 4635,-1476 5921.95,-1446.09 7498.36,-1397.87 7799.13,-1388.58"/>
+<polygon fill="black" stroke="black" points="7799.1,-1392.08 7808.99,-1388.27 7798.88,-1385.08 7799.1,-1392.08"/>
+</g>
+<!-- zlib -->
+<g id="node141" class="node">
+<title>zlib</title>
+<ellipse fill="none" stroke="black" cx="1311" cy="-738" rx="27" ry="18"/>
+<text text-anchor="middle" x="1311" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">zlib</text>
+</g>
+<!-- tls&#45;&gt;zlib -->
+<g id="edge789" class="edge">
+<title>tls&#45;&gt;zlib</title>
+<path fill="none" stroke="black" d="M1816.96,-1511.67C1817.79,-1479.11 1814.77,-1408.48 1777,-1368 1668.54,-1251.77 1565.66,-1351.98 1436,-1260 1387.06,-1225.28 1392.6,-1198.76 1355,-1152 1288.85,-1069.72 1236.74,-1070.97 1200,-972 1170.23,-891.8 1246.6,-801.63 1287.35,-760.97"/>
+<polygon fill="black" stroke="black" points="1289.66,-763.61 1294.38,-754.12 1284.77,-758.6 1289.66,-763.61"/>
+</g>
+<!-- unix&#45;time -->
+<g id="node145" class="node">
+<title>unix&#45;time</title>
+<ellipse fill="none" stroke="black" cx="1065" cy="-810" rx="44.58" ry="18"/>
+<text text-anchor="middle" x="1065" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">unix&#45;time</text>
+</g>
+<!-- tls&#45;&gt;unix&#45;time -->
+<g id="edge788" class="edge">
+<title>tls&#45;&gt;unix&#45;time</title>
+<path fill="none" stroke="black" d="M1788.84,-1528.89C1601.94,-1527.99 512.31,-1520.86 460,-1476 350.49,-1382.08 389.01,-1263.97 480,-1152 558.63,-1055.24 908.62,-884.7 1026.27,-829.09"/>
+<polygon fill="black" stroke="black" points="1027.68,-832.3 1035.23,-824.87 1024.69,-825.96 1027.68,-832.3"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;base -->
+<g id="edge268" class="edge">
+<title>crypton&#45;x509&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1120.4,-1303.78C1091.07,-1296.23 1055.1,-1282.93 1030,-1260 847.91,-1093.71 865.19,-993.26 798,-756 767.45,-648.14 761.77,-613.23 787,-504 803.73,-431.59 805.21,-392.59 872,-360 964.82,-314.71 8007.01,-307.55 8591.49,-307.03"/>
+<polygon fill="black" stroke="black" points="8591.12,-310.53 8601.12,-307.02 8591.12,-303.53 8591.12,-310.53"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;bytestring -->
+<g id="edge269" class="edge">
+<title>crypton&#45;x509&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1227.66,-1307.22C1260.71,-1303.87 1303.21,-1299.62 1341,-1296 1384.65,-1291.82 1703.85,-1291.84 1734,-1260 1742.26,-1251.28 1735.86,-1163.82 1738,-1152 1738,-1152 1834,-864 1834,-864 1890.19,-813.58 1931.33,-859.37 2000,-828 2024.26,-816.92 2024.13,-803.9 2048,-792 2151.1,-740.6 2183.44,-739.35 2297,-720 2468.43,-690.78 3003.15,-673.6 3181.47,-668.56"/>
+<polygon fill="black" stroke="black" points="3181.53,-672.06 3191.42,-668.28 3181.33,-665.07 3181.53,-672.06"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;containers -->
+<g id="edge270" class="edge">
+<title>crypton&#45;x509&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1231.62,-1312.39C1757.27,-1307.05 5529.63,-1268.54 5767,-1260 6826.47,-1221.88 7091.33,-1201.87 8148,-1116 8304.96,-1103.24 8699.58,-1079.56 8853,-1044 8858.63,-1042.7 9044.21,-976.36 9048,-972 9123.24,-885.51 9019.2,-798.23 9103,-720 9145.4,-680.42 9312.23,-670.35 9403.14,-667.82"/>
+<polygon fill="black" stroke="black" points="9402.96,-671.33 9412.86,-667.58 9402.78,-664.33 9402.96,-671.33"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;transformers -->
+<g id="edge275" class="edge">
+<title>crypton&#45;x509&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M1231.7,-1312.43C1785.62,-1307.2 5949.76,-1267.75 6211,-1260 7194.85,-1230.82 7439.34,-1186.92 8423,-1152 8513.08,-1148.8 9962.9,-1153.21 10045,-1116 10064.77,-1107.04 10058.73,-1089.98 10078,-1080 10083.25,-1077.28 10917.19,-973.09 10923,-972 10988.26,-959.77 11002.68,-947.93 11068,-936 11201.84,-911.56 11240.15,-933.55 11372,-900 11413.75,-889.38 11421.11,-877.57 11462,-864 11520.93,-844.43 11540.95,-854.73 11597,-828 11768.71,-746.1 11764.93,-642.95 11943,-576 12036.61,-540.8 12328.87,-528.48 12463.2,-524.6"/>
+<polygon fill="black" stroke="black" points="12463.13,-528.11 12473.02,-524.33 12462.93,-521.11 12463.13,-528.11"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;asn1&#45;encoding -->
+<g id="edge265" class="edge">
+<title>crypton&#45;x509&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M1184.05,-1296.15C1203.07,-1271.6 1238.57,-1225.77 1260.93,-1196.91"/>
+<polygon fill="black" stroke="black" points="1263.68,-1199.07 1267.04,-1189.02 1258.15,-1194.78 1263.68,-1199.07"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;asn1&#45;types -->
+<g id="edge267" class="edge">
+<title>crypton&#45;x509&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M1118.03,-1304.81C1091.35,-1297.71 1061.28,-1284.51 1045,-1260 1015.79,-1216.03 1056.71,-1156.68 1085.33,-1123.7"/>
+<polygon fill="black" stroke="black" points="1087.93,-1126.05 1092,-1116.26 1082.72,-1121.37 1087.93,-1126.05"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;hourglass -->
+<g id="edge272" class="edge">
+<title>crypton&#45;x509&#45;&gt;hourglass</title>
+<path fill="none" stroke="black" d="M1231.63,-1313.11C1500.71,-1313.3 2575.93,-1310.89 2625,-1260 2641.46,-1242.93 2678.64,-1252.12 2620,-1080 2616.6,-1070.03 2610.66,-1060.31 2604.47,-1051.98"/>
+<polygon fill="black" stroke="black" points="2607.4,-1050.04 2598.44,-1044.4 2601.92,-1054.4 2607.4,-1050.04"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;asn1&#45;parse -->
+<g id="edge266" class="edge">
+<title>crypton&#45;x509&#45;&gt;asn1&#45;parse</title>
+<path fill="none" stroke="black" d="M1155.36,-1296.41C1147.3,-1287.87 1137.32,-1277.28 1128.37,-1267.79"/>
+<polygon fill="black" stroke="black" points="1130.97,-1265.45 1121.57,-1260.57 1125.88,-1270.25 1130.97,-1265.45"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;memory -->
+<g id="edge273" class="edge">
+<title>crypton&#45;x509&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M1114.64,-1307.26C1065.59,-1300.66 993.53,-1287.05 936,-1260 927.11,-1255.82 804.18,-1157.44 796,-1152 741.96,-1116.09 726.88,-1109.32 669,-1080 643.23,-1066.94 613.57,-1053.63 590.43,-1043.61"/>
+<polygon fill="black" stroke="black" points="591.93,-1040.44 581.36,-1039.71 589.16,-1046.87 591.93,-1040.44"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;crypton -->
+<g id="edge271" class="edge">
+<title>crypton&#45;x509&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M1113.92,-1307.45C1049.08,-1300.25 940.52,-1285.51 850,-1260 727.19,-1225.39 705.74,-1190.22 584,-1152 520.67,-1132.12 445.51,-1116.45 397.79,-1107.46"/>
+<polygon fill="black" stroke="black" points="398.52,-1104.03 388.05,-1105.64 397.24,-1110.91 398.52,-1104.03"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;pem -->
+<g id="edge274" class="edge">
+<title>crypton&#45;x509&#45;&gt;pem</title>
+<path fill="none" stroke="black" d="M1112.26,-1309.25C1055.38,-1303.88 967.73,-1290.94 898,-1260 873.63,-1249.18 872.19,-1238.79 850,-1224 830.58,-1211.05 807.93,-1197.73 790.21,-1187.67"/>
+<polygon fill="black" stroke="black" points="792.16,-1184.76 781.73,-1182.9 788.73,-1190.86 792.16,-1184.76"/>
+</g>
+<!-- pem&#45;&gt;base -->
+<g id="edge581" class="edge">
+<title>pem&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M756.69,-1151.7C747.33,-1101.76 720.75,-952.94 712,-828 704.53,-721.32 732.61,-415.53 824,-360 912.83,-306.03 8006.37,-306.83 8591.67,-306.99"/>
+<polygon fill="black" stroke="black" points="8591.31,-310.49 8601.31,-306.99 8591.32,-303.49 8591.31,-310.49"/>
+</g>
+<!-- pem&#45;&gt;bytestring -->
+<g id="edge583" class="edge">
+<title>pem&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M783.11,-1160.6C809.09,-1150.88 852.32,-1133.91 888,-1116 1139.16,-989.91 1177.65,-913.61 1431,-792 1513.54,-752.38 1534.18,-737.73 1624,-720 1778.92,-689.41 2910.02,-671.65 3181.53,-667.8"/>
+<polygon fill="black" stroke="black" points="3181.23,-671.3 3191.18,-667.66 3181.13,-664.3 3181.23,-671.3"/>
+</g>
+<!-- pem&#45;&gt;memory -->
+<g id="edge584" class="edge">
+<title>pem&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M741.45,-1156.4C705.51,-1131.98 626.03,-1077.98 581.96,-1048.03"/>
+<polygon fill="black" stroke="black" points="584.09,-1045.25 573.85,-1042.53 580.16,-1051.04 584.09,-1045.25"/>
+</g>
+<!-- pem&#45;&gt;basement -->
+<g id="edge582" class="edge">
+<title>pem&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M747.37,-1154.14C721.64,-1124.37 660.57,-1056.17 601,-1008 586.06,-995.92 568.24,-984.23 552.95,-974.92"/>
+<polygon fill="black" stroke="black" points="555,-972.07 544.62,-969.94 551.41,-978.08 555,-972.07"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;base -->
+<g id="edge301" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1269.92,-1455.12C1090.19,-1450.85 722.05,-1438.03 675,-1404 600.23,-1349.92 646,-1103.18 646,-1099 646,-1099 646,-1099 646,-953 646,-817.6 672.29,-433.51 786,-360 873.72,-303.29 8003.2,-306.6 8591.48,-306.97"/>
+<polygon fill="black" stroke="black" points="8591.17,-310.47 8601.18,-306.98 8591.18,-303.47 8591.17,-310.47"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;bytestring -->
+<g id="edge302" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1417.22,-1441.93C1495.76,-1415.82 1650.68,-1355.61 1750,-1260 1897.28,-1118.22 1837.42,-1006.5 1984,-864 2004.68,-843.89 2015.33,-845.84 2038,-828 2056.54,-813.41 2055.58,-801.88 2077,-792 2199.75,-735.4 2249.63,-795.16 2379,-756 2412.86,-745.75 2415.88,-729.37 2450,-720 2587.8,-682.14 3022.89,-670.82 3181.45,-667.9"/>
+<polygon fill="black" stroke="black" points="3181.38,-671.4 3191.32,-667.72 3181.26,-664.4 3181.38,-671.4"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;containers -->
+<g id="edge303" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1466.23,-1455.27C1663.99,-1451.84 2124.27,-1444.17 2511,-1440 3109.65,-1433.55 7302.36,-1453.44 7899,-1404 8100.85,-1387.28 8151.41,-1376.54 8349,-1332 8708.28,-1251.02 8785.85,-1185.21 9126,-1044 9130.74,-1042.03 9291.83,-974.99 9296,-972 9313.39,-959.52 9351.73,-919.75 9360,-900 9390.97,-826.05 9329.75,-788.14 9372,-720 9382.29,-703.4 9399.84,-691.43 9416.8,-683.11"/>
+<polygon fill="black" stroke="black" points="9418.17,-686.33 9425.83,-679.01 9415.28,-679.95 9418.17,-686.33"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;mtl -->
+<g id="edge311" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M1465.49,-1454.43C2094.84,-1437.84 5565.12,-1345.98 5788,-1332 6117.79,-1311.32 6204.24,-1326.11 6528,-1260 6701.57,-1224.56 6808.65,-1212.61 6863,-1044 6877.79,-998.12 6894.11,-979.34 6873,-936 6861.63,-912.66 6838.37,-923.34 6827,-900 6819.99,-885.62 6826.85,-880 6827,-864 6827.81,-776.38 6830.12,-672.72 6831.29,-623.58"/>
+<polygon fill="black" stroke="black" points="6834.79,-623.9 6831.53,-613.82 6827.79,-623.73 6834.79,-623.9"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;asn1&#45;encoding -->
+<g id="edge299" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M1358.01,-1439.77C1352.43,-1429.61 1345.68,-1416.36 1341,-1404 1313.93,-1332.42 1294.87,-1243.96 1286.23,-1199.44"/>
+<polygon fill="black" stroke="black" points="1289.71,-1199.01 1284.4,-1189.84 1282.83,-1200.32 1289.71,-1199.01"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;asn1&#45;types -->
+<g id="edge300" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M1297.94,-1444.91C1195.44,-1425.65 1012.57,-1384.7 974,-1332 936.68,-1281 968.46,-1240.43 1039,-1152 1048.77,-1139.75 1061.98,-1128.79 1074.3,-1120.06"/>
+<polygon fill="black" stroke="black" points="1075.9,-1123.2 1082.21,-1114.69 1071.97,-1117.41 1075.9,-1123.2"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;hourglass -->
+<g id="edge308" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;hourglass</title>
+<path fill="none" stroke="black" d="M1452.05,-1448.26C1541.46,-1438.66 1686.97,-1422.17 1812,-1404 1858.86,-1397.19 2619.52,-1294.45 2652,-1260 2707.01,-1201.63 2681.11,-1148.26 2639,-1080 2631.99,-1068.64 2621.91,-1058.16 2612.16,-1049.57"/>
+<polygon fill="black" stroke="black" points="2614.48,-1046.94 2604.57,-1043.21 2609.99,-1052.31 2614.48,-1046.94"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;memory -->
+<g id="edge310" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M1269.17,-1456.44C1075.65,-1454.43 661.24,-1445.3 612,-1404 507.79,-1316.6 531.42,-1127.2 544.93,-1055.39"/>
+<polygon fill="black" stroke="black" points="548.35,-1056.12 546.85,-1045.63 541.48,-1054.77 548.35,-1056.12"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;data&#45;default -->
+<g id="edge307" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M1466.13,-1455.01C1805.47,-1447.99 2912.5,-1423.66 2986,-1404 3051.69,-1386.43 3086.01,-1390.31 3121,-1332 3129.23,-1318.28 3123.73,-1311.76 3121,-1296 3109.38,-1229.03 3062.8,-1059.12 3018,-1008 2994.94,-981.69 2966.22,-1001.86 2948,-972 2939.67,-958.34 2938.63,-948.97 2948,-936 2960.45,-918.76 3010.33,-904.01 3051.13,-894.49"/>
+<polygon fill="black" stroke="black" points="3051.91,-897.9 3060.88,-892.27 3050.36,-891.07 3051.91,-897.9"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;crypton -->
+<g id="edge304" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M1270.31,-1454.54C1071.91,-1448.94 635.29,-1433.44 574,-1404 454.44,-1346.58 384.15,-1190.05 359.77,-1126.43"/>
+<polygon fill="black" stroke="black" points="363.19,-1125.58 356.41,-1117.44 356.63,-1128.03 363.19,-1125.58"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;crypton&#45;x509&#45;store -->
+<g id="edge306" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;crypton&#45;x509&#45;store</title>
+<path fill="none" stroke="black" d="M1429.31,-1443.5C1483.43,-1431.59 1562.2,-1414.25 1618.18,-1401.93"/>
+<polygon fill="black" stroke="black" points="1618.92,-1405.35 1627.93,-1399.78 1617.41,-1398.51 1618.92,-1405.35"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;crypton&#45;x509 -->
+<g id="edge305" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;crypton&#45;x509</title>
+<path fill="none" stroke="black" d="M1344.63,-1440.15C1309.32,-1414.7 1242.3,-1366.39 1202.65,-1337.81"/>
+<polygon fill="black" stroke="black" points="1204.82,-1335.06 1194.66,-1332.05 1200.73,-1340.74 1204.82,-1335.06"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;pem -->
+<g id="edge312" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;pem</title>
+<path fill="none" stroke="black" d="M1271.96,-1453.32C1104.6,-1446.28 772.78,-1429.32 726,-1404 652.32,-1364.12 628.42,-1296.74 670,-1224 681.77,-1203.41 705,-1190.03 724.91,-1181.86"/>
+<polygon fill="black" stroke="black" points="726.01,-1185.19 734.12,-1178.38 723.53,-1178.64 726.01,-1185.19"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;iproute -->
+<g id="edge309" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;iproute</title>
+<path fill="none" stroke="black" d="M1460.23,-1451.07C1562.98,-1443.42 1721.91,-1428.14 1777,-1404 1799.83,-1394 1797.91,-1379.54 1820,-1368 1959.97,-1294.87 2146.92,-1261.25 2232.58,-1248.91"/>
+<polygon fill="black" stroke="black" points="2232.82,-1252.42 2242.24,-1247.56 2231.85,-1245.48 2232.82,-1252.42"/>
+</g>
+<!-- iproute&#45;&gt;base -->
+<g id="edge473" class="edge">
+<title>iproute&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2250.04,-1230.54C2129.01,-1184.77 1670,-989.91 1670,-667 1670,-667 1670,-667 1670,-449 1670,-390.82 1711.92,-381.45 1766,-360 1850.7,-326.4 8044.61,-308.61 8591.52,-307.1"/>
+<polygon fill="black" stroke="black" points="8591.19,-310.61 8601.18,-307.08 8591.17,-303.61 8591.19,-310.61"/>
+</g>
+<!-- iproute&#45;&gt;bytestring -->
+<g id="edge475" class="edge">
+<title>iproute&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2281.84,-1223.66C2285.26,-1205.26 2291.98,-1175.64 2303,-1152 2385.4,-975.21 2391.55,-899.95 2554,-792 2617.6,-749.74 2649.68,-780.51 2722,-756 2757.4,-744 2762.09,-730.36 2798,-720 2931.65,-681.45 3095.84,-670.91 3181.57,-668.05"/>
+<polygon fill="black" stroke="black" points="3181.49,-671.55 3191.37,-667.74 3181.27,-664.55 3181.49,-671.55"/>
+</g>
+<!-- iproute&#45;&gt;containers -->
+<g id="edge476" class="edge">
+<title>iproute&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2314.72,-1237.12C2354.32,-1233.01 2420.14,-1226.74 2477,-1224 2826.13,-1207.17 8461.99,-1216.48 8766,-1044 8910.42,-962.06 8813.71,-811.9 8952,-720 8988.96,-695.44 9277.34,-677.03 9403.85,-670.06"/>
+<polygon fill="black" stroke="black" points="9403.9,-673.56 9413.7,-669.52 9403.52,-666.57 9403.9,-673.56"/>
+</g>
+<!-- iproute&#45;&gt;appar -->
+<g id="edge472" class="edge">
+<title>iproute&#45;&gt;appar</title>
+<path fill="none" stroke="black" d="M2261.71,-1225.96C2251.52,-1216.16 2239.25,-1202.52 2232,-1188 2153.1,-1030.03 2094.04,-933.25 2200,-792 2222.36,-762.2 2263.74,-749.15 2295.37,-743.44"/>
+<polygon fill="black" stroke="black" points="2295.72,-746.93 2305.04,-741.89 2294.61,-740.02 2295.72,-746.93"/>
+</g>
+<!-- iproute&#45;&gt;byteorder -->
+<g id="edge474" class="edge">
+<title>iproute&#45;&gt;byteorder</title>
+<path fill="none" stroke="black" d="M2259.77,-1226.37C2246.06,-1215.85 2227.24,-1201.24 2211,-1188 2134.51,-1125.65 2115.72,-1109.6 2042,-1044 1971.75,-981.49 1780.57,-836.52 1732,-756 1710.84,-720.92 1708,-707.97 1708,-667 1708,-667 1708,-667 1708,-593 1708,-552.25 1722.45,-506.98 1733.29,-478.75"/>
+<polygon fill="black" stroke="black" points="1736.51,-480.11 1736.95,-469.52 1730.01,-477.52 1736.51,-480.11"/>
+</g>
+<!-- iproute&#45;&gt;network -->
+<g id="edge477" class="edge">
+<title>iproute&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M2314.74,-1237.5C2354.36,-1233.73 2420.2,-1227.75 2477,-1224 2900.84,-1196.05 3413.52,-1177.98 3575.44,-1172.65"/>
+<polygon fill="black" stroke="black" points="3575.09,-1176.16 3584.97,-1172.34 3574.86,-1169.17 3575.09,-1176.16"/>
+</g>
+<!-- transformers&#45;base&#45;&gt;base -->
+<g id="edge791" class="edge">
+<title>transformers&#45;base&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M15136.1,-863.91C15122.95,-845.46 15100.75,-815.56 15079,-792 15014.54,-722.2 14994.2,-708.57 14921,-648 14900.46,-631 14889.2,-633.18 14873,-612 14841.61,-570.97 14854.02,-549.74 14830,-504 14812.12,-469.95 14767.83,-378.29 14734,-360 14662.92,-321.56 9181.45,-308.25 8668.41,-307.08"/>
+<polygon fill="black" stroke="black" points="8668.74,-303.59 8658.73,-307.06 8668.72,-310.59 8668.74,-303.59"/>
+</g>
+<!-- transformers&#45;base&#45;&gt;transformers -->
+<g id="edge794" class="edge">
+<title>transformers&#45;base&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M15128.09,-864.15C15115.89,-853.78 15099.98,-840.19 15086,-828 15013.38,-764.7 14992.64,-751.59 14924,-684 14908.54,-668.77 14910.63,-657.27 14891,-648 14823.69,-616.2 14296.03,-619.82 14222,-612 14119.98,-601.23 14096.11,-585.88 13994,-576 13459.93,-524.35 12811.71,-521.85 12601.43,-522.56"/>
+<polygon fill="black" stroke="black" points="12601.48,-519.06 12591.49,-522.59 12601.5,-526.06 12601.48,-519.06"/>
+</g>
+<!-- transformers&#45;base&#45;&gt;stm -->
+<g id="edge793" class="edge">
+<title>transformers&#45;base&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M15070.82,-879.34C14912.33,-875.97 14538.7,-868.31 14225,-864 13344.16,-851.89 11141.16,-864.71 10261,-828 10180.24,-824.63 8890.75,-723.64 8810,-720 7799.79,-674.45 7545.76,-715.08 6535,-684 5765.24,-660.33 4825.37,-608.45 4625.49,-597.19"/>
+<polygon fill="black" stroke="black" points="4625.87,-593.7 4615.68,-596.63 4625.47,-600.69 4625.87,-593.7"/>
+</g>
+<!-- transformers&#45;base&#45;&gt;transformers&#45;compat -->
+<g id="edge795" class="edge">
+<title>transformers&#45;base&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M15196.2,-867.5C15236.14,-856.32 15293.16,-840.35 15336.41,-828.24"/>
+<polygon fill="black" stroke="black" points="15337.23,-831.65 15345.91,-825.58 15335.34,-824.91 15337.23,-831.65"/>
+</g>
+<!-- transformers&#45;base&#45;&gt;base&#45;orphans -->
+<g id="edge792" class="edge">
+<title>transformers&#45;base&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M15165.54,-864.13C15187.63,-843.86 15227.6,-810.3 15268,-792 15324.89,-766.24 15394.94,-752.72 15445.72,-745.81"/>
+<polygon fill="black" stroke="black" points="15445.94,-749.31 15455.4,-744.55 15445.03,-742.37 15445.94,-749.31"/>
+</g>
+<!-- ghc&#45;boot&#45;th&#45;&gt;base -->
+<g id="edge366" class="edge">
+<title>ghc&#45;boot&#45;th&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M10711.22,-438C10679.51,-428.86 10635.33,-414.39 10599,-396 10573.92,-383.31 10573.71,-368.75 10547,-360 10454.54,-329.71 8932.26,-310.54 8668.72,-307.44"/>
+<polygon fill="black" stroke="black" points="8669.03,-303.95 8658.99,-307.33 8668.95,-310.95 8669.03,-303.95"/>
+</g>
+<!-- mime&#45;types&#45;&gt;base -->
+<g id="edge540" class="edge">
+<title>mime&#45;types&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M6852.47,-874.82C6647.32,-847.89 5875,-732.59 5875,-523 5875,-523 5875,-523 5875,-449 5875,-323.91 6018.75,-381.35 6142,-360 6393.14,-316.5 8295.34,-308.16 8591.34,-307.12"/>
+<polygon fill="black" stroke="black" points="8591.21,-310.62 8601.2,-307.09 8591.18,-303.62 8591.21,-310.62"/>
+</g>
+<!-- mime&#45;types&#45;&gt;bytestring -->
+<g id="edge541" class="edge">
+<title>mime&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M6849.47,-877.88C6723.75,-870.3 6395.63,-849.95 6122,-828 5948.93,-814.11 5906.23,-803.74 5733,-792 5362.39,-766.88 5268.58,-781.48 4898,-756 4728.31,-744.33 4686.7,-731.53 4517,-720 4047.46,-688.1 3479.41,-672.68 3298.37,-668.33"/>
+<polygon fill="black" stroke="black" points="3298.61,-664.83 3288.52,-668.09 3298.44,-671.83 3298.61,-664.83"/>
+</g>
+<!-- mime&#45;types&#45;&gt;containers -->
+<g id="edge542" class="edge">
+<title>mime&#45;types&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M6954.54,-877.95C7110.17,-868.85 7567.13,-841.71 7716,-828 8119.81,-790.81 8218.15,-756.77 8622,-720 8914.69,-693.35 9265.92,-675.89 9403.56,-669.61"/>
+<polygon fill="black" stroke="black" points="9403.7,-673.1 9413.53,-669.15 9403.38,-666.11 9403.7,-673.1"/>
+</g>
+<!-- mime&#45;types&#45;&gt;text -->
+<g id="edge543" class="edge">
+<title>mime&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M6954.38,-877.61C7013.52,-873.87 7112.64,-867.87 7198,-864 7678.66,-842.2 7799.53,-853.66 8280,-828 8347.82,-824.38 8426.71,-818.13 8472.53,-814.31"/>
+<polygon fill="black" stroke="black" points="8472.82,-817.79 8482.49,-813.47 8472.23,-810.82 8472.82,-817.79"/>
+</g>
+<!-- safe&#45;&gt;base -->
+<g id="edge626" class="edge">
+<title>safe&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M2412.84,-576.2C2429.55,-531.11 2482.34,-407.58 2574,-360 2645.14,-323.07 8080.18,-308.39 8591.51,-307.1"/>
+<polygon fill="black" stroke="black" points="8591.16,-310.6 8601.15,-307.07 8591.14,-303.6 8591.16,-310.6"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;base -->
+<g id="edge684" class="edge">
+<title>streaming&#45;commons&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M4620.75,-1233.86C4534.41,-1225.33 4390.62,-1209.47 4268,-1188 4197.06,-1175.58 4180.52,-1166.64 4110,-1152 3854.98,-1099.06 3782.51,-1121.99 3534,-1044 3459.6,-1020.65 3444.02,-1006.33 3374,-972 3282.24,-927.01 3261.41,-911.64 3171,-864 2997.74,-772.71 2822,-790.84 2822,-595 2822,-595 2822,-595 2822,-449 2822,-373.38 2894.33,-380.89 2967,-360 3110.75,-318.68 8100.42,-308.02 8591.24,-307.07"/>
+<polygon fill="black" stroke="black" points="8591.11,-310.57 8601.1,-307.05 8591.09,-303.57 8591.11,-310.57"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;Win32 -->
+<g id="edge681" class="edge">
+<title>streaming&#45;commons&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M4703.85,-1223.82C4711.49,-1203.87 4726.68,-1171.25 4750,-1152 4861.54,-1059.91 4946.14,-1136.9 5057,-1044 5099.25,-1008.59 5085.51,-980.54 5118,-936 5125.42,-925.83 5134.57,-915.47 5142.94,-906.65"/>
+<polygon fill="black" stroke="black" points="5145.45,-909.09 5149.91,-899.48 5140.43,-904.21 5145.45,-909.09"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;array -->
+<g id="edge682" class="edge">
+<title>streaming&#45;commons&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M4691.97,-1223.63C4682.14,-1191.92 4666.63,-1123.91 4697,-1080 4715.56,-1053.16 4741.21,-1069.95 4761,-1044 4811.02,-978.44 4772.64,-939.41 4806,-864 4852.68,-758.49 4996.48,-493.67 5094,-432 5120.98,-414.94 5328.36,-392.09 5417.02,-382.99"/>
+<polygon fill="black" stroke="black" points="5417.11,-386.5 5426.71,-382 5416.4,-379.53 5417.11,-386.5"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;bytestring -->
+<g id="edge685" class="edge">
+<title>streaming&#45;commons&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4622.23,-1233.17C4557.54,-1225.34 4462.48,-1211.08 4382,-1188 4221.1,-1141.86 4187.46,-1110.84 4034,-1044 3928.24,-997.94 3907.74,-971.55 3798,-936 3720.39,-910.86 3693.02,-932.05 3618,-900 3566.64,-878.06 3559.08,-862.3 3515,-828 3457.06,-782.91 3453.49,-756.87 3390,-720 3358.62,-701.78 3319.95,-688.3 3289.73,-679.5"/>
+<polygon fill="black" stroke="black" points="3291.04,-676.23 3280.47,-676.88 3289.14,-682.97 3291.04,-676.23"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;directory -->
+<g id="edge686" class="edge">
+<title>streaming&#45;commons&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M4694.68,-1223.59C4689.48,-1190.6 4683.65,-1118.79 4722,-1080 4757.45,-1044.15 4896.82,-1055.11 4946,-1044 4950.25,-1043.04 4954.66,-1041.94 4959.04,-1040.78"/>
+<polygon fill="black" stroke="black" points="4959.68,-1044.23 4968.38,-1038.19 4957.81,-1037.49 4959.68,-1044.23"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;filepath -->
+<g id="edge687" class="edge">
+<title>streaming&#45;commons&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M4727.21,-1224.77C4769.12,-1201.74 4844.54,-1161.31 4874,-1152 4980.2,-1118.43 5020.99,-1162.93 5122,-1116 5198.52,-1080.45 5333.9,-907.83 5406,-864 5422.77,-853.8 5468.76,-836.87 5503.07,-824.89"/>
+<polygon fill="black" stroke="black" points="5504.01,-828.27 5512.32,-821.69 5501.72,-821.66 5504.01,-828.27"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;process -->
+<g id="edge689" class="edge">
+<title>streaming&#45;commons&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M4714.64,-1224.19C4737.89,-1201.05 4779.35,-1161.21 4798,-1152 4870.39,-1116.24 4964.58,-1104.57 5021.83,-1100.79"/>
+<polygon fill="black" stroke="black" points="5021.83,-1104.29 5031.6,-1100.2 5021.41,-1097.31 5021.83,-1104.29"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;transformers -->
+<g id="edge693" class="edge">
+<title>streaming&#45;commons&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M4783.46,-1239.31C5461.33,-1225.85 9950.37,-1136.17 10234,-1116 10367.95,-1106.47 10400.48,-1094.33 10534,-1080 10702.68,-1061.89 10746.61,-1071.55 10914,-1044 11310.52,-978.73 11443.06,-1027.33 11792,-828 11930.9,-748.65 11904.43,-644.49 12049,-576 12120.68,-542.04 12347.66,-529.38 12463.11,-525.04"/>
+<polygon fill="black" stroke="black" points="12463.22,-528.54 12473.09,-524.68 12462.97,-521.55 12463.22,-528.54"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;text -->
+<g id="edge692" class="edge">
+<title>streaming&#45;commons&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4783.29,-1239.47C5063.2,-1234.23 5952.26,-1215.77 6238,-1188 6979.23,-1115.97 7145.19,-972.24 7882,-864 8104.22,-831.35 8373.78,-817.01 8472.45,-812.59"/>
+<polygon fill="black" stroke="black" points="8472.54,-816.09 8482.38,-812.15 8472.23,-809.09 8472.54,-816.09"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;random -->
+<g id="edge690" class="edge">
+<title>streaming&#45;commons&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M4783.19,-1238.88C5136.34,-1229.63 6474.92,-1189.96 6648,-1116 6747.8,-1073.36 6882.5,-1019.35 6813,-936 6756,-867.64 6673,-968.36 6616,-900 6583.29,-860.77 6616.16,-799.06 6639.7,-764.55"/>
+<polygon fill="black" stroke="black" points="6642.54,-766.59 6645.46,-756.41 6636.83,-762.55 6642.54,-766.59"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;stm -->
+<g id="edge691" class="edge">
+<title>streaming&#45;commons&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M4620.41,-1233.88C4579.85,-1227.1 4531.07,-1213.85 4494,-1188 4378.2,-1107.24 4376.33,-1040.23 4360,-900 4358.15,-884.11 4354.51,-879.03 4360,-864 4381.31,-805.71 4511.73,-670.56 4564.68,-617.22"/>
+<polygon fill="black" stroke="black" points="4566.84,-620.01 4571.42,-610.46 4561.88,-615.07 4566.84,-620.01"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;async -->
+<g id="edge683" class="edge">
+<title>streaming&#45;commons&#45;&gt;async</title>
+<path fill="none" stroke="black" d="M4625.61,-1231.88C4576.46,-1224.08 4510.71,-1210.45 4456,-1188 4400.56,-1165.25 4387.38,-1155.13 4342,-1116 4310.02,-1088.42 4294.7,-1083.59 4280,-1044 4272.64,-1024.18 4276.96,-1000.48 4282.67,-982.52"/>
+<polygon fill="black" stroke="black" points="4285.88,-983.93 4285.91,-973.33 4279.28,-981.6 4285.88,-983.93"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;network -->
+<g id="edge688" class="edge">
+<title>streaming&#45;commons&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M4615.92,-1236.28C4464.22,-1227.46 4129.72,-1207.62 3848,-1188 3789.86,-1183.95 3723.15,-1178.74 3678.37,-1175.16"/>
+<polygon fill="black" stroke="black" points="3678.67,-1171.68 3668.42,-1174.37 3678.11,-1178.65 3678.67,-1171.68"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;zlib -->
+<g id="edge694" class="edge">
+<title>streaming&#45;commons&#45;&gt;zlib</title>
+<path fill="none" stroke="black" d="M4621.77,-1233.36C4528.7,-1223.81 4366.57,-1206.47 4228,-1188 3044.31,-1030.23 1598.24,-787.59 1348.56,-745.37"/>
+<polygon fill="black" stroke="black" points="1349.2,-741.93 1338.76,-743.71 1348.03,-748.83 1349.2,-741.93"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;base -->
+<g id="edge413" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M3878.79,-1672.71C3428.55,-1670.41 557.91,-1654.47 379,-1620 199.29,-1585.38 0,-1642.01 0,-1459 0,-1459 0,-1459 0,-1169 0,-1063.64 102,-1060.36 102,-955 102,-955 102,-955 102,-881 102,-784.4 140,-763.6 140,-667 140,-667 140,-667 140,-593 140,-568.71 486.64,-366.65 510,-360 718.05,-300.81 7994.5,-306.4 8591.17,-306.96"/>
+<polygon fill="black" stroke="black" points="8591.02,-310.46 8601.03,-306.97 8591.03,-303.46 8591.02,-310.46"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;bytestring -->
+<g id="edge414" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3878.71,-1673.2C3636.63,-1673.65 2722.54,-1671.84 2439,-1620 2317.61,-1597.81 2176,-1654.4 2176,-1531 2176,-1531 2176,-1531 2176,-1313 2176,-1208.94 2150.29,-1171.95 2199,-1080 2242.41,-998.05 2418.55,-834.45 2501,-792 2576.64,-753.06 2614.71,-797.46 2689,-756 2707.95,-745.42 2702.6,-729.74 2722,-720 2762.39,-699.71 3055.85,-678.78 3182.29,-670.59"/>
+<polygon fill="black" stroke="black" points="3182.37,-674.09 3192.12,-669.95 3181.92,-667.1 3182.37,-674.09"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;containers -->
+<g id="edge416" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3997.4,-1672.85C4360.74,-1671.82 6287.16,-1664.32 6876,-1620 7547.46,-1569.46 9463.24,-1532.77 9836,-972 9844.86,-958.68 9845.49,-948.88 9836,-936 9803.98,-892.54 9771.09,-917.44 9720,-900 9633.36,-870.42 9598.21,-885.54 9527,-828 9486.22,-795.05 9471.3,-732.33 9465.94,-695.66"/>
+<polygon fill="black" stroke="black" points="9469.41,-695.27 9464.65,-685.8 9462.47,-696.17 9469.41,-695.27"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;transformers -->
+<g id="edge428" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M3997.05,-1672.89C4522.68,-1671.81 8407.1,-1662.5 9573,-1620 10077.24,-1601.62 10202.66,-1583.23 10706,-1548 11124.86,-1518.68 11258.87,-1633.75 11648,-1476 11723.02,-1445.59 11928,-1323.95 11928,-1243 11928,-1243 11928,-1243 11928,-953 11928,-912.55 11918.78,-892.98 11947,-864 11994.53,-815.19 12033.9,-856.01 12096,-828 12266.9,-750.91 12440.86,-604.36 12505.61,-546.93"/>
+<polygon fill="black" stroke="black" points="12507.75,-549.71 12512.88,-540.44 12503.09,-544.49 12507.75,-549.71"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;text -->
+<g id="edge426" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3997.22,-1672.54C4395.83,-1669.39 6676.08,-1650.08 6819,-1620 6859.55,-1611.47 6865.27,-1595.76 6905,-1584 7335.5,-1456.57 7477.08,-1557.47 7899,-1404 7944.5,-1387.45 8631.68,-1013.87 8656,-972 8718.79,-863.87 8535.48,-981.63 8468,-900 8451.31,-879.81 8469.81,-852.06 8487.46,-832.94"/>
+<polygon fill="black" stroke="black" points="8489.85,-835.51 8494.33,-825.91 8484.84,-830.62 8489.85,-835.51"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;exceptions -->
+<g id="edge420" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M3997.45,-1673.48C4355.77,-1675.67 6229.93,-1677.21 6761,-1476 6998.57,-1385.99 7143.92,-1362.6 7205,-1116 7216.7,-1068.77 7205.65,-1052.95 7187,-1008 7165.53,-956.26 7139.4,-953.25 7122,-900 7098.94,-829.42 7098.1,-740.83 7099.51,-695.94"/>
+<polygon fill="black" stroke="black" points="7103.01,-696.13 7099.89,-686 7096.01,-695.86 7103.01,-696.13"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;network&#45;uri -->
+<g id="edge425" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;network&#45;uri</title>
+<path fill="none" stroke="black" d="M3996.78,-1671.05C4392.71,-1657.48 6662.4,-1572.69 6914,-1404 6986.13,-1355.64 7020.85,-1305.17 6990,-1224 6967.73,-1165.4 6833.48,-1033.35 6776.52,-979.03"/>
+<polygon fill="black" stroke="black" points="6779.15,-976.7 6769.49,-972.35 6774.32,-981.77 6779.15,-976.7"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;memory -->
+<g id="edge423" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M3878.84,-1672.76C3468.65,-1670.97 1054.6,-1658.89 731,-1620 427.29,-1583.5 114,-1620.9 114,-1315 114,-1315 114,-1315 114,-1241 114,-1071.53 382.35,-1036.25 498.48,-1028.92"/>
+<polygon fill="black" stroke="black" points="498.6,-1032.42 508.38,-1028.35 498.19,-1025.43 498.6,-1032.42"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;data&#45;default -->
+<g id="edge419" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M3880.72,-1669.25C3765.45,-1658.76 3503.33,-1619.59 3349,-1476 3174.22,-1313.37 3123.06,-1006.08 3111.13,-911.46"/>
+<polygon fill="black" stroke="black" points="3114.64,-911.28 3109.96,-901.77 3107.69,-912.12 3114.64,-911.28"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;http&#45;client -->
+<g id="edge421" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;http&#45;client</title>
+<path fill="none" stroke="black" d="M3981.05,-1661.39C4179.65,-1607.86 5006.55,-1384.94 5217.07,-1328.19"/>
+<polygon fill="black" stroke="black" points="5217.85,-1331.61 5226.59,-1325.62 5216.03,-1324.85 5217.85,-1331.61"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;http&#45;types -->
+<g id="edge422" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M3912.98,-1657.35C3879.42,-1634.21 3824,-1587.43 3824,-1531 3824,-1531 3824,-1531 3824,-1457 3824,-1295.12 3724.91,-1275.28 3696,-1116 3692.31,-1095.65 3696.17,-1072.57 3700.76,-1055.01"/>
+<polygon fill="black" stroke="black" points="3704.08,-1056.13 3703.48,-1045.56 3697.35,-1054.2 3704.08,-1056.13"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;case&#45;insensitive -->
+<g id="edge415" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M3994.41,-1668.32C4267.41,-1645.13 5452.28,-1538.34 5795,-1404 5900.02,-1362.83 5951.54,-1359.86 6004,-1260 6055.82,-1161.37 5960.27,-1033.82 5913.56,-980.34"/>
+<polygon fill="black" stroke="black" points="5916.25,-978.1 5906.99,-972.96 5911.02,-982.76 5916.25,-978.1"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;crypton -->
+<g id="edge417" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M3878.73,-1672.62C3641.5,-1670.84 2737.5,-1661.54 1995,-1620 1237.92,-1577.64 1018.2,-1703.91 295,-1476 234.22,-1456.85 202.8,-1459.23 171,-1404 163.02,-1390.13 166.37,-1383.32 171,-1368 201.83,-1266.02 285.43,-1167.31 326.54,-1123.13"/>
+<polygon fill="black" stroke="black" points="329.04,-1125.58 333.36,-1115.9 323.95,-1120.78 329.04,-1125.58"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;crypton&#45;connection -->
+<g id="edge418" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;crypton&#45;connection</title>
+<path fill="none" stroke="black" d="M3880.22,-1670.13C3662.41,-1659.29 2889.86,-1620.85 2622.7,-1607.56"/>
+<polygon fill="black" stroke="black" points="2623.18,-1604.08 2613.02,-1607.08 2622.83,-1611.07 2623.18,-1604.08"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;network -->
+<g id="edge424" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M3938,-1655.51C3938,-1628.71 3938,-1575.87 3938,-1531 3938,-1531 3938,-1531 3938,-1385 3938,-1368.23 3739.07,-1241.4 3659.41,-1191.28"/>
+<polygon fill="black" stroke="black" points="3661.48,-1188.45 3651.15,-1186.09 3657.76,-1194.38 3661.48,-1188.45"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;tls -->
+<g id="edge427" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;tls</title>
+<path fill="none" stroke="black" d="M3878.62,-1673C3609.73,-1672.71 2504.45,-1668.54 2162,-1620 2045.51,-1603.49 1911.68,-1562.58 1850.17,-1542.5"/>
+<polygon fill="black" stroke="black" points="1851.57,-1539.27 1840.98,-1539.47 1849.38,-1545.92 1851.57,-1539.27"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;base -->
+<g id="edge439" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M12071.63,-1371.29C12184.12,-1350.71 12407.53,-1312.51 12599,-1296 13242.14,-1240.54 13407.23,-1307.62 14051,-1260 14311.37,-1240.74 14380.35,-1249.84 14634,-1188 14774.2,-1153.82 14860.15,-1172.91 14925,-1044 14947.8,-998.67 14922.71,-973.01 14888,-936 14866.66,-913.25 14676.47,-802.22 14647,-792 14529.28,-751.19 14488.16,-792.37 14369,-756 14334.78,-745.56 14330.74,-731.91 14297,-720 14226.22,-695.02 14203.67,-706.29 14132,-684 14051.3,-658.9 14032.76,-647.36 13956,-612 13924.22,-597.36 13919.65,-585.58 13886,-576 13693.03,-521.05 13634.2,-571.21 13436,-540 13367.42,-529.2 13351.91,-518.42 13284,-504 13114.57,-468.03 13071.44,-462.84 12901,-432 12717.22,-398.75 12672.96,-377.34 12487,-360 12086.9,-322.7 9046.58,-308.75 8668.54,-307.16"/>
+<polygon fill="black" stroke="black" points="8668.7,-303.66 8658.69,-307.12 8668.67,-310.66 8668.7,-303.66"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;OneTuple -->
+<g id="edge438" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;OneTuple</title>
+<path fill="none" stroke="black" d="M12081.59,-1372.6C12095.39,-1370.84 12109.58,-1369.22 12123,-1368 12841.22,-1302.96 13023.36,-1323.34 13744,-1296 13998.17,-1286.36 14638.56,-1309.74 14888,-1260 14976.56,-1242.34 14997.19,-1228.31 15078,-1188 15171.69,-1141.26 15255.18,-1109.64 15230,-1008 15221.3,-972.88 15220.79,-957.92 15192,-936 15132.62,-890.8 15095.99,-930.76 15028,-900 14978.76,-877.72 14966.34,-868.01 14930,-828 14892.29,-786.48 14861.84,-727.9 14845.97,-694.04"/>
+<polygon fill="black" stroke="black" points="14849.33,-692.97 14841.97,-685.34 14842.97,-695.89 14849.33,-692.97"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;tagged -->
+<g id="edge441" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M12089.88,-1374.03C12183.54,-1359.49 12330.99,-1327.34 12441,-1260 12517.93,-1212.91 12526.41,-1185.42 12584,-1116 12646.03,-1041.24 12635.83,-1001.03 12708,-936 12732.82,-913.63 12746.57,-919.09 12774,-900 12833.99,-858.26 12841.12,-837.89 12898,-792 12911.58,-781.04 12927.07,-769.39 12940.11,-759.8"/>
+<polygon fill="black" stroke="black" points="12941.87,-762.85 12947.89,-754.12 12937.75,-757.2 12941.87,-762.85"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;indexed&#45;traversable -->
+<g id="edge440" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M12058.53,-1370.09C12165.69,-1339.28 12380,-1257.8 12380,-1099 12380,-1099 12380,-1099 12380,-1025 12380,-957.35 12400.01,-879.77 12412.07,-839.16"/>
+<polygon fill="black" stroke="black" points="12415.39,-840.29 12414.95,-829.71 12408.69,-838.26 12415.39,-840.29"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;unordered&#45;containers -->
+<g id="edge442" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M11927.49,-1371.24C11672.67,-1322.23 10821.03,-1158.78 10762,-1152 10574.84,-1130.51 10096.47,-1166.61 9915,-1116 9818.82,-1089.18 9810.81,-1044.84 9718,-1008 9676.12,-991.38 9627.33,-978.48 9587.97,-969.58"/>
+<polygon fill="black" stroke="black" points="9588.87,-966.19 9578.35,-967.44 9587.35,-973.03 9588.87,-966.19"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;vector -->
+<g id="edge443" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M11895.66,-1376.68C11781.9,-1367.22 11593.69,-1350.63 11432,-1332 11405.29,-1328.92 11375.42,-1324.85 11351.7,-1321.46"/>
+<polygon fill="black" stroke="black" points="11352.48,-1318.04 11342.08,-1320.07 11351.48,-1324.96 11352.48,-1318.04"/>
+</g>
+<!-- invariant -->
+<g id="node126" class="node">
+<title>invariant</title>
+<ellipse fill="none" stroke="black" cx="13443" cy="-1098" rx="41.58" ry="18"/>
+<text text-anchor="middle" x="13443" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">invariant</text>
+</g>
+<!-- invariant&#45;&gt;base -->
+<g id="edge458" class="edge">
+<title>invariant&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13484.34,-1094.63C13648.99,-1085.17 14249.49,-1050.26 14257,-1044 14307.65,-1001.73 14284.94,-965.48 14293,-900 14307.07,-785.73 14210.84,-760.98 14233,-648 14244.55,-589.12 14284,-583 14284,-523 14284,-523 14284,-523 14284,-449 14284,-398.4 14258.49,-382.17 14213,-360 14146.72,-327.7 9159.52,-308.91 8668.76,-307.14"/>
+<polygon fill="black" stroke="black" points="8668.91,-303.64 8658.9,-307.1 8668.89,-310.64 8668.91,-303.64"/>
+</g>
+<!-- invariant&#45;&gt;ghc&#45;prim -->
+<g id="edge463" class="edge">
+<title>invariant&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M13484.29,-1094.65C13546.3,-1091.16 13667.21,-1084.55 13770,-1080 14275.99,-1057.62 15997,-1101.49 15997,-595 15997,-595 15997,-595 15997,-233 15997,-165.52 15937.31,-167.34 15874,-144 15760.65,-102.21 15388.51,-93.31 15258.95,-91.47"/>
+<polygon fill="black" stroke="black" points="15259.1,-87.97 15249.06,-91.34 15259.01,-94.97 15259.1,-87.97"/>
+</g>
+<!-- invariant&#45;&gt;template&#45;haskell -->
+<g id="edge467" class="edge">
+<title>invariant&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M13404.23,-1091.02C13313.83,-1076.44 13082.73,-1035.56 12898,-972 12719.39,-910.54 12694.68,-843.68 12513,-792 12354.92,-747.03 11186.93,-629.68 10899.68,-601.26"/>
+<polygon fill="black" stroke="black" points="10900.44,-597.82 10890.15,-600.32 10899.75,-604.79 10900.44,-597.82"/>
+</g>
+<!-- invariant&#45;&gt;array -->
+<g id="edge457" class="edge">
+<title>invariant&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M13401.11,-1096.8C12915.54,-1094.5 8367.24,-1072.2 8087,-1044 7919.01,-1027.1 7879.73,-1004.22 7714,-972 6810.66,-796.37 6543.65,-881.22 5689,-540 5604.52,-506.27 5520.62,-436.86 5480.85,-401.21"/>
+<polygon fill="black" stroke="black" points="5483.25,-398.67 5473.5,-394.54 5478.55,-403.85 5483.25,-398.67"/>
+</g>
+<!-- invariant&#45;&gt;containers -->
+<g id="edge461" class="edge">
+<title>invariant&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M13402.39,-1093.7C13298.57,-1085.12 13025.34,-1061.53 12936,-1044 12795.64,-1016.45 12459.43,-885.42 12318,-864 12202.63,-846.53 10326.02,-872.12 10218,-828 10196.46,-819.2 10200.47,-803.06 10180,-792 10118.92,-758.99 10089.08,-789.01 10028,-756 10007.53,-744.94 10011.27,-729.43 9990,-720 9893.63,-677.29 9620.51,-703.96 9517,-684 9514.07,-683.44 9511.08,-682.77 9508.07,-682.02"/>
+<polygon fill="black" stroke="black" points="9509.3,-678.73 9498.73,-679.48 9507.45,-685.48 9509.3,-678.73"/>
+</g>
+<!-- invariant&#45;&gt;transformers -->
+<g id="edge469" class="edge">
+<title>invariant&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M13453.91,-1080.39C13475.39,-1048.77 13526.03,-979.19 13583,-936 13612.78,-913.42 13639.01,-931.58 13659,-900 13667.56,-886.48 13666.55,-878.11 13659,-864 13604.56,-762.27 13542.29,-778.77 13443,-720 13413.23,-702.38 13399.27,-707.62 13374,-684 13332.9,-645.59 13356.1,-605.17 13308,-576 13248.37,-539.83 12779.63,-527.52 12600.9,-524.12"/>
+<polygon fill="black" stroke="black" points="12601.13,-520.62 12591.07,-523.94 12601,-527.62 12601.13,-520.62"/>
+</g>
+<!-- invariant&#45;&gt;StateVar -->
+<g id="edge456" class="edge">
+<title>invariant&#45;&gt;StateVar</title>
+<path fill="none" stroke="black" d="M13471.23,-1084.44C13490.65,-1074.98 13516.38,-1060.8 13536,-1044 13582.61,-1004.09 13571.71,-971.15 13622,-936 13663.47,-907.01 13700.42,-941.05 13730,-900 13765.64,-850.55 13648.36,-790.87 13546,-720 13529.14,-708.33 13509.71,-696.36 13493.49,-686.75"/>
+<polygon fill="black" stroke="black" points="13495.56,-683.91 13485.17,-681.87 13492.02,-689.95 13495.56,-683.91"/>
+</g>
+<!-- invariant&#45;&gt;stm -->
+<g id="edge465" class="edge">
+<title>invariant&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M13401.07,-1096.79C12744.26,-1093.43 4591.68,-1051.57 4579,-1044 4532.04,-1015.95 4555.38,-977.71 4520,-936 4503.21,-916.2 4485.37,-923.34 4474,-900 4466.99,-885.62 4466.17,-877.95 4474,-864 4489.04,-837.21 4510.55,-848.97 4533,-828 4561.66,-801.24 4571.76,-793.25 4584,-756 4598.69,-711.29 4595.36,-655.77 4591.35,-622.98"/>
+<polygon fill="black" stroke="black" points="4594.88,-622.94 4590.08,-613.5 4587.94,-623.87 4594.88,-622.94"/>
+</g>
+<!-- invariant&#45;&gt;comonad -->
+<g id="edge460" class="edge">
+<title>invariant&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M13473.44,-1085.4C13500.16,-1075.05 13539.96,-1059.22 13574,-1044 13673.44,-999.55 13689.88,-968 13794,-936 13903.91,-902.22 14038.59,-889.87 14113.27,-885.42"/>
+<polygon fill="black" stroke="black" points="14113.43,-888.92 14123.21,-884.86 14113.03,-881.93 14113.43,-888.92"/>
+</g>
+<!-- invariant&#45;&gt;contravariant -->
+<g id="edge462" class="edge">
+<title>invariant&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M13484.22,-1094.77C13648.58,-1085.84 14250.26,-1052.68 14290,-1044 14308.81,-1039.89 14414.52,-997.91 14476.22,-973.1"/>
+<polygon fill="black" stroke="black" points="14477.46,-976.37 14485.43,-969.39 14474.84,-969.88 14477.46,-976.37"/>
+</g>
+<!-- invariant&#45;&gt;profunctors -->
+<g id="edge464" class="edge">
+<title>invariant&#45;&gt;profunctors</title>
+<path fill="none" stroke="black" d="M13484.11,-1094.81C13614.97,-1087.8 14033.6,-1065.16 14380,-1044 14446.28,-1039.95 14522.07,-1034.93 14574.46,-1031.4"/>
+<polygon fill="black" stroke="black" points="14574.68,-1034.89 14584.42,-1030.73 14574.21,-1027.91 14574.68,-1034.89"/>
+</g>
+<!-- invariant&#45;&gt;tagged -->
+<g id="edge466" class="edge">
+<title>invariant&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M13407.93,-1087.99C13351.56,-1072.13 13239.46,-1034.83 13164,-972 13089.35,-909.84 13107.37,-861.99 13040,-792 13028.07,-779.61 13013.01,-767.92 12999.83,-758.7"/>
+<polygon fill="black" stroke="black" points="13002.13,-756.03 12991.89,-753.29 12998.19,-761.81 13002.13,-756.03"/>
+</g>
+<!-- invariant&#45;&gt;transformers&#45;compat -->
+<g id="edge470" class="edge">
+<title>invariant&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M13484.29,-1094.68C13546.31,-1091.23 13667.21,-1084.65 13770,-1080 13977.28,-1070.61 14500.9,-1090.98 14703,-1044 14741.37,-1035.08 14746.42,-1019.83 14784,-1008 15024.11,-932.4 15131.18,-1040.58 15340,-900 15362.07,-885.14 15377.69,-858.76 15387.11,-838.56"/>
+<polygon fill="black" stroke="black" points="15390.29,-840.04 15391.11,-829.48 15383.88,-837.23 15390.29,-840.04"/>
+</g>
+<!-- invariant&#45;&gt;th&#45;abstraction -->
+<g id="edge468" class="edge">
+<title>invariant&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M13440.96,-1079.67C13438.18,-1047.74 13436.83,-978.96 13470,-936 13484.44,-917.29 13506.94,-905.01 13528.44,-897.03"/>
+<polygon fill="black" stroke="black" points="13529.45,-900.39 13537.78,-893.84 13527.19,-893.76 13529.45,-900.39"/>
+</g>
+<!-- invariant&#45;&gt;unordered&#45;containers -->
+<g id="edge471" class="edge">
+<title>invariant&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M13401.12,-1097.08C13027.69,-1097.68 10274.2,-1100.21 9913,-1044 9858.4,-1035.5 9847.67,-1021.16 9794,-1008 9727.13,-991.61 9650.22,-977.37 9593.95,-967.8"/>
+<polygon fill="black" stroke="black" points="9594.56,-964.35 9584.11,-966.14 9593.39,-971.25 9594.56,-964.35"/>
+</g>
+<!-- invariant&#45;&gt;bifunctors -->
+<g id="edge459" class="edge">
+<title>invariant&#45;&gt;bifunctors</title>
+<path fill="none" stroke="black" d="M13426.37,-1081.26C13400.16,-1056.44 13349.04,-1008.05 13318.26,-978.92"/>
+<polygon fill="black" stroke="black" points="13320.93,-976.62 13311.26,-972.29 13316.12,-981.7 13320.93,-976.62"/>
+</g>
+<!-- kan&#45;extensions -->
+<g id="node127" class="node">
+<title>kan&#45;extensions</title>
+<ellipse fill="none" stroke="black" cx="13976" cy="-1242" rx="65.53" ry="18"/>
+<text text-anchor="middle" x="13976" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">kan&#45;extensions</text>
+</g>
+<!-- kan&#45;extensions&#45;&gt;base -->
+<g id="edge480" class="edge">
+<title>kan&#45;extensions&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14039.14,-1236.82C14156.46,-1228.84 14415.95,-1210.26 14634,-1188 15215.05,-1128.69 16282.35,-1125.51 15862,-720 15824.38,-683.71 15814.37,-673.96 15769,-648 15731.61,-626.61 15715.98,-634.1 15679,-612 15657.61,-599.21 15657.57,-588.48 15636,-576 15595.84,-552.76 15580.65,-558.29 15538,-540 15504.75,-525.74 15499.3,-515.49 15465,-504 15383.92,-476.84 15354.22,-502.54 15276,-468 15251.61,-457.23 15252.06,-443.5 15228,-432 15169.26,-403.92 15144.74,-424.08 15086,-396 15061.94,-384.5 15063.26,-368.54 15038,-360 14877.18,-305.65 9195.08,-306.76 8668.95,-306.98"/>
+<polygon fill="black" stroke="black" points="8669,-303.48 8659,-306.99 8669,-310.48 8669,-303.48"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;array -->
+<g id="edge479" class="edge">
+<title>kan&#45;extensions&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M13910.54,-1240.28C13678.33,-1237.73 12872.31,-1229.06 12207,-1224 11491.68,-1218.56 6483.54,-1221.97 5769,-1188 5724.26,-1185.87 5001.64,-1143.13 4966,-1116 4902.21,-1067.43 4924.01,-1010.36 4954,-936 5003.5,-813.3 5165.15,-511.38 5271,-432 5314.15,-399.64 5376.39,-387.02 5416.77,-382.11"/>
+<polygon fill="black" stroke="black" points="5416.98,-385.61 5426.54,-381.04 5416.22,-378.65 5416.98,-385.61"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;containers -->
+<g id="edge482" class="edge">
+<title>kan&#45;extensions&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M13910.57,-1239.97C13711.18,-1236.48 13113.09,-1223.29 12922,-1188 12718.83,-1150.48 12673.46,-1116.52 12480,-1044 12288.69,-972.29 12256.8,-906.7 12057,-864 11848.88,-819.52 10348.21,-880.62 10142,-828 10108.48,-819.45 10105.06,-804.99 10073,-792 10021,-770.93 10003.09,-779.2 9952,-756 9924.72,-743.61 9923.35,-729.68 9895,-720 9735.3,-665.45 9682.4,-717.52 9517,-684 9514.22,-683.44 9511.38,-682.78 9508.53,-682.07"/>
+<polygon fill="black" stroke="black" points="9509.61,-678.74 9499.04,-679.46 9507.75,-685.49 9509.61,-678.74"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;mtl -->
+<g id="edge487" class="edge">
+<title>kan&#45;extensions&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M13910.53,-1240C13271.03,-1230.13 8155.54,-1148.02 7854,-1044 7800.85,-1025.67 7794.95,-1005.76 7750,-972 7668.92,-911.09 7645.93,-898.47 7573,-828 7496.66,-754.24 7510.55,-696.27 7416,-648 7320.22,-599.1 6984.77,-594.82 6870.48,-594.81"/>
+<polygon fill="black" stroke="black" points="6870.71,-591.31 6860.71,-594.82 6870.71,-598.31 6870.71,-591.31"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;transformers -->
+<g id="edge491" class="edge">
+<title>kan&#45;extensions&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M13940.38,-1226.51C13895.88,-1206.95 13819.59,-1168.42 13770,-1116 13743.57,-1088.06 13733.14,-1080.81 13722,-1044 13709.52,-1002.78 13745.51,-913.02 13747,-900 13748.82,-884.1 13754.8,-877.97 13747,-864 13683.89,-751.06 13611.08,-775.06 13494,-720 13456.13,-702.19 13439.17,-710.77 13407,-684 13363.03,-647.41 13386.33,-604.95 13337,-576 13274.32,-539.22 12784.15,-527.24 12600.86,-524.02"/>
+<polygon fill="black" stroke="black" points="12601.07,-520.53 12591.01,-523.85 12600.95,-527.53 12601.07,-520.53"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;adjunctions -->
+<g id="edge478" class="edge">
+<title>kan&#45;extensions&#45;&gt;adjunctions</title>
+<path fill="none" stroke="black" d="M14036.76,-1235.02C14114.45,-1226.86 14252.94,-1210.65 14370,-1188 14375.18,-1187 14380.55,-1185.84 14385.9,-1184.61"/>
+<polygon fill="black" stroke="black" points="14386.4,-1188.09 14395.31,-1182.35 14384.77,-1181.28 14386.4,-1188.09"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;comonad -->
+<g id="edge481" class="edge">
+<title>kan&#45;extensions&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M14040.27,-1238.13C14171.89,-1231.74 14462.8,-1214.74 14499,-1188 14533.93,-1162.2 14552.11,-1044.9 14575,-1008 14586.13,-990.06 14598.65,-991.79 14606,-972 14611.57,-957 14616.61,-947.98 14606,-936 14581.22,-908.02 14338.66,-891.81 14226.44,-885.75"/>
+<polygon fill="black" stroke="black" points="14226.71,-882.26 14216.54,-885.23 14226.34,-889.25 14226.71,-882.26"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;contravariant -->
+<g id="edge483" class="edge">
+<title>kan&#45;extensions&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M14005.3,-1225.62C14097,-1177.5 14378.54,-1029.76 14482.18,-975.37"/>
+<polygon fill="black" stroke="black" points="14483.65,-978.55 14490.87,-970.81 14480.39,-972.36 14483.65,-978.55"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;distributive -->
+<g id="edge484" class="edge">
+<title>kan&#45;extensions&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M14041.83,-1240.81C14151.64,-1239.23 14378.57,-1230.52 14565,-1188 14653.85,-1167.73 14673.17,-1151.75 14757,-1116 14825.02,-1086.99 14867.62,-1106.59 14907,-1044 14935.69,-998.41 14896.57,-966.25 14852,-936 14803.1,-902.81 14777.89,-924.25 14724,-900 14697.02,-887.86 14693.97,-878.18 14668,-864 14644.45,-851.14 14617.21,-838.58 14595.04,-828.92"/>
+<polygon fill="black" stroke="black" points="14596.57,-825.76 14586,-825.02 14593.79,-832.19 14596.57,-825.76"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;free -->
+<g id="edge485" class="edge">
+<title>kan&#45;extensions&#45;&gt;free</title>
+<path fill="none" stroke="black" d="M13956.17,-1224.43C13924.97,-1198.38 13864.51,-1147.87 13830.59,-1119.54"/>
+<polygon fill="black" stroke="black" points="13833.26,-1117.21 13823.34,-1113.48 13828.77,-1122.58 13833.26,-1117.21"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;profunctors -->
+<g id="edge488" class="edge">
+<title>kan&#45;extensions&#45;&gt;profunctors</title>
+<path fill="none" stroke="black" d="M14041.85,-1241.68C14170.75,-1241.9 14450.89,-1236.58 14532,-1188 14582.88,-1157.53 14614.5,-1092.4 14629.21,-1054.99"/>
+<polygon fill="black" stroke="black" points="14632.44,-1056.35 14632.7,-1045.76 14625.89,-1053.87 14632.44,-1056.35"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;semigroupoids -->
+<g id="edge489" class="edge">
+<title>kan&#45;extensions&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M13962.66,-1224.21C13933.06,-1186.95 13861.74,-1097.17 13826.47,-1052.76"/>
+<polygon fill="black" stroke="black" points="13829.42,-1050.85 13820.45,-1045.2 13823.93,-1055.2 13829.42,-1050.85"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;tagged -->
+<g id="edge490" class="edge">
+<title>kan&#45;extensions&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M13910.41,-1240.07C13689.43,-1236.6 12984.09,-1222.85 12951,-1188 12850.62,-1082.3 13020.76,-1008.56 13002,-864 12997.59,-829.99 12986.68,-792.05 12978.61,-766.98"/>
+<polygon fill="black" stroke="black" points="12981.96,-765.95 12975.5,-757.55 12975.31,-768.14 12981.96,-765.95"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;invariant -->
+<g id="edge486" class="edge">
+<title>kan&#45;extensions&#45;&gt;invariant</title>
+<path fill="none" stroke="black" d="M13930.1,-1228.77C13829.31,-1201.92 13589.67,-1138.07 13488.89,-1111.23"/>
+<polygon fill="black" stroke="black" points="13489.9,-1107.87 13479.34,-1108.68 13488.1,-1114.64 13489.9,-1107.87"/>
+</g>
+<!-- lens&#45;&gt;base -->
+<g id="edge494" class="edge">
+<title>lens&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M12401.16,-1456.87C12714.27,-1455.39 15631.26,-1440.57 15711,-1404 15866.66,-1332.61 16168.69,-857.05 16066,-720 16031.85,-674.42 15997.13,-701.74 15943,-684 15854.02,-654.83 15831.22,-648.53 15745,-612 15711.32,-597.73 15704.47,-590.74 15671,-576 15631.19,-558.47 15619.33,-558.58 15580,-540 15550.14,-525.9 15545.5,-516.67 15515,-504 15461.81,-481.91 15321.71,-446.64 15266,-432 15198.86,-414.35 15175.08,-429.01 15114,-396 15093.53,-384.94 15097.58,-368.7 15076,-360 14996.75,-328.04 9197.35,-308.81 8668.51,-307.12"/>
+<polygon fill="black" stroke="black" points="8668.86,-303.62 8658.85,-307.09 8668.84,-310.62 8668.86,-303.62"/>
+</g>
+<!-- lens&#45;&gt;ghc&#45;prim -->
+<g id="edge506" class="edge">
+<title>lens&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M12401.19,-1457C12711.71,-1456.92 15580.97,-1454.83 15751,-1404 16067.17,-1309.48 16280,-1212.99 16280,-883 16280,-883 16280,-883 16280,-233 16280,-128.26 15460.89,-98.03 15258.7,-92.17"/>
+<polygon fill="black" stroke="black" points="15258.98,-88.67 15248.88,-91.89 15258.78,-95.67 15258.98,-88.67"/>
+</g>
+<!-- lens&#45;&gt;template&#45;haskell -->
+<g id="edge518" class="edge">
+<title>lens&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M12364.82,-1440.75C12353.48,-1421.69 12332.77,-1389.93 12309,-1368 12292.14,-1352.44 12146.24,-1278.74 12133,-1260 12109.65,-1226.97 12114,-1211.45 12114,-1171 12114,-1171 12114,-1171 12114,-1097 12114,-990.39 12131.97,-939.8 12057,-864 11830.51,-634.99 11666.46,-766.08 11355,-684 11295.78,-668.39 11282.01,-660.19 11222,-648 11109.61,-625.17 10976.78,-609.33 10899.88,-601.24"/>
+<polygon fill="black" stroke="black" points="10900.3,-597.77 10890,-600.21 10899.58,-604.73 10900.3,-597.77"/>
+</g>
+<!-- lens&#45;&gt;array -->
+<g id="edge492" class="edge">
+<title>lens&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M12346.78,-1456.29C12245.97,-1453.69 11884.27,-1444.58 11586,-1440 9830.58,-1413.07 9391.44,-1429.91 7636,-1404 6851.92,-1392.43 6656,-1383.81 5872,-1368 5771.67,-1365.98 4155.71,-1376.99 4066,-1332 4047.88,-1322.91 4051.08,-1311.48 4038,-1296 4023.99,-1279.42 4016.12,-1278.64 4005,-1260 3987.64,-1230.91 3985.63,-1221.4 3980,-1188 3960.22,-1070.73 3983.49,-1017.61 4070,-936 4109.42,-898.81 4878.52,-494.13 4926,-468 4954.93,-452.08 4959.55,-442.06 4991,-432 5142.35,-383.6 5333.75,-378.19 5416.19,-378.36"/>
+<polygon fill="black" stroke="black" points="5416.01,-381.86 5426.03,-378.41 5416.05,-374.86 5416.01,-381.86"/>
+</g>
+<!-- lens&#45;&gt;bytestring -->
+<g id="edge497" class="edge">
+<title>lens&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M12346.78,-1456.29C12245.97,-1453.68 11884.27,-1444.57 11586,-1440 10747.35,-1427.16 4872.49,-1416.49 4038,-1332 3746.85,-1302.52 3618.56,-1327.2 3416,-1116 3295.52,-990.39 3254.66,-772.71 3243.55,-695.32"/>
+<polygon fill="black" stroke="black" points="3247.05,-695.06 3242.22,-685.63 3240.11,-696.02 3247.05,-695.06"/>
+</g>
+<!-- lens&#45;&gt;containers -->
+<g id="edge500" class="edge">
+<title>lens&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M12347.11,-1455.31C12304.62,-1451.6 12220.56,-1439.96 12160,-1404 12141.34,-1392.92 12146.11,-1378.29 12127,-1368 12037.82,-1320 12000.56,-1355.28 11902,-1332 11210.35,-1168.65 11072.49,-989.57 10373,-864 10209.51,-834.65 10161.68,-870.09 10001,-828 9981.85,-822.98 9855.82,-764.64 9838,-756 9807.23,-741.08 9802.52,-730.57 9770,-720 9661.98,-684.91 9627.76,-709.14 9517,-684 9514.37,-683.4 9511.69,-682.74 9508.99,-682.03"/>
+<polygon fill="black" stroke="black" points="9509.95,-678.67 9499.38,-679.32 9508.05,-685.4 9509.95,-678.67"/>
+</g>
+<!-- lens&#45;&gt;filepath -->
+<g id="edge504" class="edge">
+<title>lens&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M12346.78,-1456.29C12245.97,-1453.7 11884.27,-1444.61 11586,-1440 11371.35,-1436.68 7932.27,-1447.26 7722,-1404 7681.41,-1395.65 7675.27,-1381.22 7636,-1368 7272.29,-1245.59 7178.6,-1214.72 6800,-1152 6590.69,-1117.33 6528.4,-1172.84 6324,-1116 6152.8,-1068.39 6133.5,-998.07 5967,-936 5905.59,-913.11 5887.05,-917.88 5824,-900 5738.33,-875.71 5639.28,-843.16 5584.95,-824.91"/>
+<polygon fill="black" stroke="black" points="5586.09,-821.6 5575.49,-821.72 5583.85,-828.23 5586.09,-821.6"/>
+</g>
+<!-- lens&#45;&gt;mtl -->
+<g id="edge511" class="edge">
+<title>lens&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M12346.78,-1456.29C12245.97,-1453.7 11884.27,-1444.64 11586,-1440 11533.43,-1439.18 7843.08,-1435.52 7801,-1404 7767.92,-1379.22 7774,-1356.34 7774,-1315 7774,-1315 7774,-1315 7774,-1241 7774,-988.3 7402,-1063.7 7402,-811 7402,-811 7402,-811 7402,-737 7402,-627.1 6998,-601.6 6870.25,-596.29"/>
+<polygon fill="black" stroke="black" points="6870.75,-592.8 6860.62,-595.9 6870.47,-599.8 6870.75,-592.8"/>
+</g>
+<!-- lens&#45;&gt;transformers -->
+<g id="edge522" class="edge">
+<title>lens&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M12401.06,-1456.75C12690.41,-1454.04 15205.79,-1429.82 15360,-1404 15486.28,-1382.85 15634,-1443.04 15634,-1315 15634,-1315 15634,-1315 15634,-1025 15634,-960.37 15579.37,-959.08 15519,-936 15310.9,-856.42 15230.08,-971.29 15019,-900 14991.32,-890.65 14988.75,-879.52 14964,-864 14911.3,-830.96 14900.21,-818.62 14844,-792 14758.24,-751.39 14733.96,-747.04 14643,-720 14510.74,-680.67 14477.03,-671.17 14341,-648 14188.15,-621.97 14146.87,-637.92 13994,-612 13925.55,-600.39 13910.78,-585.45 13842,-576 13598.76,-542.59 12835.18,-527.85 12600.98,-524.04"/>
+<polygon fill="black" stroke="black" points="12601.15,-520.54 12591.09,-523.88 12601.03,-527.54 12601.15,-520.54"/>
+</g>
+<!-- lens&#45;&gt;text -->
+<g id="edge519" class="edge">
+<title>lens&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M12346.8,-1456.77C12251.48,-1455.6 11923.87,-1448.39 11658,-1404 11642.48,-1401.41 11397.48,-1340.13 11384,-1332 11365.42,-1320.79 11370.28,-1305.96 11351,-1296 11342.07,-1291.39 9924.58,-1119.04 9915,-1116 9785.37,-1074.86 9752.49,-1055.32 9645,-972 9627.85,-958.7 9631.68,-945.15 9612,-936 9435.31,-853.9 8925.17,-946.64 8736,-900 8699.71,-891.05 8694.84,-877.53 8660,-864 8609.28,-844.3 8593.25,-848.86 8543,-828 8542.38,-827.74 8541.76,-827.48 8541.14,-827.21"/>
+<polygon fill="black" stroke="black" points="8542.93,-824.19 8532.4,-823.04 8539.92,-830.5 8542.93,-824.19"/>
+</g>
+<!-- lens&#45;&gt;comonad -->
+<g id="edge499" class="edge">
+<title>lens&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M12401.02,-1456.81C12672.32,-1454.82 14896.61,-1437.54 14955,-1404 15053.33,-1347.52 15036.36,-1257.59 14995,-1152 14937.67,-1005.66 14864.17,-985.52 14715,-936 14625.41,-906.26 14346.84,-890.77 14226.41,-885.31"/>
+<polygon fill="black" stroke="black" points="14226.92,-881.83 14216.77,-884.88 14226.61,-888.83 14226.92,-881.83"/>
+</g>
+<!-- lens&#45;&gt;contravariant -->
+<g id="edge501" class="edge">
+<title>lens&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M12401.21,-1456.96C12674.36,-1456.38 14912,-1447.6 14912,-1315 14912,-1315 14912,-1315 14912,-1169 14912,-1009.25 14698.17,-1145.72 14575,-1044 14555.22,-1027.67 14540.78,-1002.09 14531.83,-982.53"/>
+<polygon fill="black" stroke="black" points="14535.1,-981.28 14527.91,-973.5 14528.68,-984.07 14535.1,-981.28"/>
+</g>
+<!-- lens&#45;&gt;distributive -->
+<g id="edge502" class="edge">
+<title>lens&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M12401.43,-1456.8C12663.42,-1454.8 14720.02,-1438.13 14990,-1404 15161.23,-1382.35 15368,-1487.59 15368,-1315 15368,-1315 15368,-1315 15368,-1097 15368,-1037.5 15320.27,-1036.41 15268,-1008 15150.29,-944.02 14751.78,-854.08 14606,-822.5"/>
+<polygon fill="black" stroke="black" points="14607.12,-819.16 14596.61,-820.47 14605.64,-826.01 14607.12,-819.16"/>
+</g>
+<!-- lens&#45;&gt;free -->
+<g id="edge505" class="edge">
+<title>lens&#45;&gt;free</title>
+<path fill="none" stroke="black" d="M12401.24,-1456.89C12592.36,-1455.97 13725.94,-1448.64 13782,-1404 13814.05,-1378.48 13806,-1355.97 13806,-1315 13806,-1315 13806,-1315 13806,-1241 13806,-1201.74 13806,-1156.38 13806,-1127.69"/>
+<polygon fill="black" stroke="black" points="13809.5,-1128 13806,-1118 13802.5,-1128 13809.5,-1128"/>
+</g>
+<!-- lens&#45;&gt;profunctors -->
+<g id="edge513" class="edge">
+<title>lens&#45;&gt;profunctors</title>
+<path fill="none" stroke="black" d="M12401.26,-1456.96C12672.63,-1456.53 14879.44,-1451.54 14926,-1404 15026.76,-1301.12 15018.12,-1190.68 14926,-1080 14898.37,-1046.8 14780.24,-1034.31 14704.41,-1029.68"/>
+<polygon fill="black" stroke="black" points="14704.78,-1026.19 14694.6,-1029.11 14704.38,-1033.18 14704.78,-1026.19"/>
+</g>
+<!-- lens&#45;&gt;semigroupoids -->
+<g id="edge515" class="edge">
+<title>lens&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M12401.29,-1457.02C12591.72,-1457 13718.48,-1454.75 13861,-1404 13970.58,-1364.98 14100.67,-1329.19 14051,-1224 14009.67,-1136.47 13908.02,-1075.67 13849.46,-1046.57"/>
+<polygon fill="black" stroke="black" points="13851.29,-1043.57 13840.76,-1042.34 13848.22,-1049.86 13851.29,-1043.57"/>
+</g>
+<!-- lens&#45;&gt;tagged -->
+<g id="edge517" class="edge">
+<title>lens&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M12393.97,-1445.46C12397.88,-1443.47 12402.01,-1441.54 12406,-1440 12466.32,-1416.66 12484.74,-1421.52 12547,-1404 12676.37,-1367.59 12836,-1449.4 12836,-1315 12836,-1315 12836,-1315 12836,-1025 12836,-956.54 12896.69,-961.86 12926,-900 12946.85,-855.99 12958.87,-800.25 12964.66,-767.23"/>
+<polygon fill="black" stroke="black" points="12968.07,-768.09 12966.27,-757.65 12961.16,-766.93 12968.07,-768.09"/>
+</g>
+<!-- lens&#45;&gt;transformers&#45;compat -->
+<g id="edge523" class="edge">
+<title>lens&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M12401.19,-1456.99C12711.68,-1456.81 15577.89,-1453.85 15648,-1404 15720.71,-1352.31 15786,-1116.21 15786,-1027 15786,-1027 15786,-1027 15786,-953 15786,-888.01 15591.58,-843.87 15477.99,-823.63"/>
+<polygon fill="black" stroke="black" points="15478.86,-820.24 15468.41,-821.95 15477.65,-827.13 15478.86,-820.24"/>
+</g>
+<!-- lens&#45;&gt;exceptions -->
+<g id="edge503" class="edge">
+<title>lens&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M12346.78,-1456.29C12245.97,-1453.7 11884.27,-1444.62 11586,-1440 11532.87,-1439.18 7807.3,-1428.22 7760,-1404 7600.97,-1322.55 7635.84,-1217.72 7522,-1080 7382.95,-911.78 7357.02,-858.08 7188,-720 7172.94,-707.7 7154.78,-696.19 7138.95,-687.06"/>
+<polygon fill="black" stroke="black" points="7140.69,-684.03 7130.26,-682.17 7137.25,-690.12 7140.69,-684.03"/>
+</g>
+<!-- lens&#45;&gt;hashable -->
+<g id="edge507" class="edge">
+<title>lens&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M12346.73,-1456.65C12219.32,-1454.81 11670.12,-1444.79 11222,-1404 10043.12,-1296.69 9743.39,-1278.04 8583,-1044 8522.55,-1031.81 8508.63,-1023.73 8449,-1008 8387.3,-991.72 8365.82,-1002.93 8310,-972 8289.65,-960.73 8292.66,-946.69 8272,-936 8199.15,-898.32 8170.08,-921.75 8091,-900 8089.01,-899.45 8086.98,-898.86 8084.94,-898.24"/>
+<polygon fill="black" stroke="black" points="8086.07,-894.93 8075.48,-895.19 8083.92,-901.59 8086.07,-894.93"/>
+</g>
+<!-- lens&#45;&gt;indexed&#45;traversable -->
+<g id="edge508" class="edge">
+<title>lens&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M12399.22,-1451.35C12452.16,-1437.84 12570,-1398.41 12570,-1315 12570,-1315 12570,-1315 12570,-1241 12570,-1080.51 12476.19,-903.98 12437.44,-837.91"/>
+<polygon fill="black" stroke="black" points="12440.6,-836.38 12432.49,-829.57 12434.59,-839.96 12440.6,-836.38"/>
+</g>
+<!-- lens&#45;&gt;strict -->
+<g id="edge516" class="edge">
+<title>lens&#45;&gt;strict</title>
+<path fill="none" stroke="black" d="M12346.78,-1455.61C12267.72,-1451.29 12031.44,-1436.42 11838,-1404 11633.44,-1369.72 11585.92,-1343.39 11384,-1296 11107.75,-1231.17 11039.83,-1209.7 10762,-1152 10519.61,-1101.66 10226.36,-1051.18 10122.1,-1033.56"/>
+<polygon fill="black" stroke="black" points="10122.84,-1030.13 10112.39,-1031.92 10121.67,-1037.03 10122.84,-1030.13"/>
+</g>
+<!-- lens&#45;&gt;th&#45;abstraction -->
+<g id="edge520" class="edge">
+<title>lens&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M12401.29,-1457.43C12488.05,-1458.2 12764.9,-1456.13 12986,-1404 13070.67,-1384.04 13104.77,-1391.74 13168,-1332 13283.35,-1223.03 13225.41,-1136.87 13318,-1008 13324.79,-998.55 13383.86,-941.7 13394,-936 13406.11,-929.19 13478.16,-910.36 13530.94,-897.09"/>
+<polygon fill="black" stroke="black" points="13531.56,-900.54 13540.41,-894.71 13529.86,-893.75 13531.56,-900.54"/>
+</g>
+<!-- lens&#45;&gt;these -->
+<g id="edge521" class="edge">
+<title>lens&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M12346.68,-1456.22C12270.51,-1453.61 12049.66,-1442.97 11871,-1404 11821.98,-1393.31 11812.2,-1381.93 11764,-1368 11575.38,-1313.48 10325.06,-1022 10255,-1008 10158.27,-988.67 10130.01,-1001.86 10036,-972 10035.01,-971.69 10034.02,-971.35 10033.02,-970.99"/>
+<polygon fill="black" stroke="black" points="10034.42,-967.78 10023.84,-967.19 10031.74,-974.25 10034.42,-967.78"/>
+</g>
+<!-- lens&#45;&gt;unordered&#45;containers -->
+<g id="edge524" class="edge">
+<title>lens&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M12346.92,-1456.6C12235.3,-1454.72 11800.06,-1445.01 11445,-1404 11353.38,-1393.42 9893.6,-1146.9 9806,-1116 9753.81,-1097.59 9616.71,-1016.88 9550.64,-977.2"/>
+<polygon fill="black" stroke="black" points="9552.71,-974.36 9542.34,-972.2 9549.11,-980.36 9552.71,-974.36"/>
+</g>
+<!-- lens&#45;&gt;vector -->
+<g id="edge525" class="edge">
+<title>lens&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M12346.65,-1456.51C12220.46,-1454.06 11693.81,-1441.73 11534,-1404 11494.07,-1394.57 11487.1,-1383.22 11449,-1368 11414.48,-1354.21 11374.83,-1339.4 11346.38,-1328.94"/>
+<polygon fill="black" stroke="black" points="11347.7,-1325.7 11337.11,-1325.55 11345.29,-1332.27 11347.7,-1325.7"/>
+</g>
+<!-- lens&#45;&gt;assoc -->
+<g id="edge493" class="edge">
+<title>lens&#45;&gt;assoc</title>
+<path fill="none" stroke="black" d="M12353.45,-1445.79C12320.93,-1428.22 12255.38,-1393.59 12198,-1368 11996.36,-1278.08 11934.85,-1281.83 11735,-1188 11585.89,-1117.99 11560.88,-1076.36 11411,-1008 11325.81,-969.14 11303.98,-958.15 11213,-936 11091.95,-906.53 11057.78,-921.12 10935,-900 10922.3,-897.81 10908.54,-895.01 10896.11,-892.31"/>
+<polygon fill="black" stroke="black" points="10897.15,-888.95 10886.63,-890.21 10895.63,-895.79 10897.15,-888.95"/>
+</g>
+<!-- lens&#45;&gt;base&#45;orphans -->
+<g id="edge495" class="edge">
+<title>lens&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M12401.4,-1456.92C12714.23,-1456 15602.2,-1446.32 15678,-1404 15715.55,-1383.04 15824,-1248 15824,-1171 15824,-1171 15824,-1171 15824,-953 15824,-832.74 15664.05,-774.83 15573.94,-751.75"/>
+<polygon fill="black" stroke="black" points="15574.8,-748.36 15564.25,-749.34 15573.11,-755.15 15574.8,-748.36"/>
+</g>
+<!-- lens&#45;&gt;bifunctors -->
+<g id="edge496" class="edge">
+<title>lens&#45;&gt;bifunctors</title>
+<path fill="none" stroke="black" d="M12401.02,-1455.04C12539.06,-1444.68 13159,-1393.77 13159,-1315 13159,-1315 13159,-1315 13159,-1097 13159,-1040.87 13215.06,-997.94 13254.66,-974.62"/>
+<polygon fill="black" stroke="black" points="13256.3,-977.72 13263.27,-969.73 13252.84,-971.63 13256.3,-977.72"/>
+</g>
+<!-- lens&#45;&gt;call&#45;stack -->
+<g id="edge498" class="edge">
+<title>lens&#45;&gt;call&#45;stack</title>
+<path fill="none" stroke="black" d="M12359.44,-1442.59C12340.56,-1424.24 12306.22,-1392.06 12274,-1368 12201.07,-1313.54 12153.98,-1333.29 12100,-1260 12019.02,-1150.04 12004.82,-978.99 12002.43,-911.63"/>
+<polygon fill="black" stroke="black" points="12005.93,-911.71 12002.15,-901.81 11998.94,-911.91 12005.93,-911.71"/>
+</g>
+<!-- lens&#45;&gt;indexed&#45;traversable&#45;instances -->
+<g id="edge509" class="edge">
+<title>lens&#45;&gt;indexed&#45;traversable&#45;instances</title>
+<path fill="none" stroke="black" d="M12347.93,-1452.13C12293.96,-1442.06 12167.97,-1418.54 12083.1,-1402.7"/>
+<polygon fill="black" stroke="black" points="12083.89,-1399.29 12073.42,-1400.89 12082.61,-1406.17 12083.89,-1399.29"/>
+</g>
+<!-- lens&#45;&gt;kan&#45;extensions -->
+<g id="edge510" class="edge">
+<title>lens&#45;&gt;kan&#45;extensions</title>
+<path fill="none" stroke="black" d="M12401.23,-1457.22C12588.78,-1458.56 13685.75,-1463.78 13820,-1404 13883.97,-1375.52 13935.08,-1307.54 13959.81,-1269.66"/>
+<polygon fill="black" stroke="black" points="13962.55,-1271.86 13964.98,-1261.55 13956.65,-1268.1 13962.55,-1271.86"/>
+</g>
+<!-- parallel -->
+<g id="node129" class="node">
+<title>parallel</title>
+<ellipse fill="none" stroke="black" cx="11105" cy="-738" rx="36.59" ry="18"/>
+<text text-anchor="middle" x="11105" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">parallel</text>
+</g>
+<!-- lens&#45;&gt;parallel -->
+<g id="edge512" class="edge">
+<title>lens&#45;&gt;parallel</title>
+<path fill="none" stroke="black" d="M12347.72,-1453.01C12311.92,-1446.74 12246.73,-1432.25 12198,-1404 12177.87,-1392.33 12180.45,-1379.09 12160,-1368 12099.73,-1335.31 12075.64,-1351.8 12010,-1332 11920.75,-1305.08 11900.44,-1292.32 11813,-1260 11427.15,-1117.39 11337.39,-1062.63 10946,-936 10888.55,-917.41 10851.6,-948.02 10815,-900 10805.3,-887.28 10806.21,-877.37 10815,-864 10843.66,-820.43 10989.86,-772.59 11063.09,-750.88"/>
+<polygon fill="black" stroke="black" points="11063.7,-754.35 11072.31,-748.18 11061.73,-747.64 11063.7,-754.35"/>
+</g>
+<!-- reflection -->
+<g id="node130" class="node">
+<title>reflection</title>
+<ellipse fill="none" stroke="black" cx="14287" cy="-666" rx="45.08" ry="18"/>
+<text text-anchor="middle" x="14287" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">reflection</text>
+</g>
+<!-- lens&#45;&gt;reflection -->
+<g id="edge514" class="edge">
+<title>lens&#45;&gt;reflection</title>
+<path fill="none" stroke="black" d="M12401.33,-1456.89C12673.74,-1455.72 14896.49,-1444.94 15187,-1404 15338.7,-1382.62 15520,-1468.19 15520,-1315 15520,-1315 15520,-1315 15520,-1025 15520,-782.98 15216.57,-985.09 14990,-900 14925.97,-875.95 14911.76,-864.63 14854,-828 14831.48,-813.72 14829.94,-803.74 14806,-792 14697.57,-738.84 14661.42,-748.21 14544,-720 14473.17,-702.98 14390.55,-686.55 14338.51,-676.6"/>
+<polygon fill="black" stroke="black" points="14339.21,-673.17 14328.73,-674.74 14337.9,-680.05 14339.21,-673.17"/>
+</g>
+<!-- parallel&#45;&gt;base -->
+<g id="edge573" class="edge">
+<title>parallel&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M11095.32,-720.59C11081.04,-694.78 11056,-642.73 11056,-595 11056,-595 11056,-595 11056,-449 11056,-400.79 11036.48,-382.79 10994,-360 10887.24,-302.73 8966.61,-306.02 8668.69,-306.87"/>
+<polygon fill="black" stroke="black" points="8668.75,-303.37 8658.76,-306.9 8668.77,-310.37 8668.75,-303.37"/>
+</g>
+<!-- parallel&#45;&gt;ghc&#45;prim -->
+<g id="edge576" class="edge">
+<title>parallel&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M11141.77,-736.69C11526.02,-733.38 14794.19,-704.67 14891,-684 15088.81,-641.77 15120.23,-576.67 15309,-504 15447.9,-450.52 15518.85,-499.31 15626,-396 15656.48,-366.61 15660,-349.34 15660,-307 15660,-307 15660,-307 15660,-233 15660,-168.02 15603.68,-169.71 15544,-144 15448.18,-102.71 15324.16,-93.28 15258.83,-91.32"/>
+<polygon fill="black" stroke="black" points="15258.93,-87.82 15248.85,-91.07 15258.76,-94.82 15258.93,-87.82"/>
+</g>
+<!-- parallel&#45;&gt;array -->
+<g id="edge572" class="edge">
+<title>parallel&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M11086.79,-721.98C11040.2,-683.7 10918.8,-584.82 10897,-576 10627.99,-467.12 10537.46,-524.84 10248,-504 9251.04,-432.21 5905.48,-385.07 5497.81,-379.55"/>
+<polygon fill="black" stroke="black" points="5497.91,-376.05 5487.86,-379.41 5497.82,-383.05 5497.91,-376.05"/>
+</g>
+<!-- parallel&#45;&gt;containers -->
+<g id="edge574" class="edge">
+<title>parallel&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M11070.33,-731.43C11044.86,-727.56 11009.37,-722.64 10978,-720 10413.64,-672.47 9727.55,-667.4 9523.18,-666.99"/>
+<polygon fill="black" stroke="black" points="9523.35,-663.49 9513.34,-666.97 9523.34,-670.49 9523.35,-663.49"/>
+</g>
+<!-- parallel&#45;&gt;deepseq -->
+<g id="edge575" class="edge">
+<title>parallel&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M11072.23,-729.37C10997.9,-712.33 10810.66,-670.89 10652,-648 9514.63,-483.94 8105.07,-455.8 7816.18,-451.65"/>
+<polygon fill="black" stroke="black" points="7816.38,-448.15 7806.33,-451.51 7816.28,-455.15 7816.38,-448.15"/>
+</g>
+<!-- reflection&#45;&gt;base -->
+<g id="edge624" class="edge">
+<title>reflection&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14294.08,-647.85C14304.31,-621.49 14322,-569.21 14322,-523 14322,-523 14322,-523 14322,-449 14322,-408.03 14330.41,-385.07 14298,-360 14238.76,-314.18 9163.21,-307.57 8668.65,-307.04"/>
+<polygon fill="black" stroke="black" points="8668.72,-303.54 8658.71,-307.03 8668.71,-310.54 8668.72,-303.54"/>
+</g>
+<!-- reflection&#45;&gt;template&#45;haskell -->
+<g id="edge625" class="edge">
+<title>reflection&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M14241.95,-663.98C14122.7,-661.29 13788.87,-653.8 13511,-648 12467.85,-626.24 11195.82,-601.86 10899.69,-596.21"/>
+<polygon fill="black" stroke="black" points="10899.92,-592.72 10889.86,-596.03 10899.79,-599.72 10899.92,-592.72"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;base -->
+<g id="edge527" class="edge">
+<title>lens&#45;aeson&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M9563.65,-1600.47C10156.33,-1594.12 15856.54,-1531.59 15920,-1476 15971.32,-1431.05 16001.25,-924.65 15970,-864 15867.5,-665.06 15227.63,-598.8 15005,-576 14932.24,-568.55 13752.52,-576.26 13689,-540 13606.97,-493.17 13658.42,-406.15 13576,-360 13519.2,-328.19 9128.33,-309.07 8668.77,-307.16"/>
+<polygon fill="black" stroke="black" points="8669.01,-303.66 8659,-307.12 8668.98,-310.66 8669.01,-303.66"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;bytestring -->
+<g id="edge528" class="edge">
+<title>lens&#45;aeson&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M9464.3,-1600.91C8950.43,-1599.89 4598.8,-1587.96 3306,-1476 3096.34,-1457.84 3000.51,-1537.71 2838,-1404 2811.73,-1382.38 2819.94,-1365.08 2812,-1332 2770.68,-1159.75 2764.54,-1113.12 2767,-936 2767.91,-870.45 2748.53,-833.85 2799,-792 2858.45,-742.7 2897.45,-785.08 2969,-756 2996.76,-744.72 2998.44,-731.75 3026,-720 3078.15,-697.77 3141.58,-683.52 3185.79,-675.46"/>
+<polygon fill="black" stroke="black" points="3186.15,-678.95 3195.39,-673.76 3184.93,-672.06 3186.15,-678.95"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;text -->
+<g id="edge531" class="edge">
+<title>lens&#45;aeson&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M9466.72,-1596.03C9419.73,-1589.7 9346.55,-1576.03 9289,-1548 9240.25,-1524.26 8908,-1297.23 8908,-1243 8908,-1243 8908,-1243 8908,-1169 8908,-1061.25 8922.17,-1006.87 8841,-936 8757.43,-863.04 8692.27,-951.47 8594,-900 8565.85,-885.26 8542.13,-857.12 8527.35,-836.42"/>
+<polygon fill="black" stroke="black" points="8530.24,-834.44 8521.69,-828.19 8524.47,-838.41 8530.24,-834.44"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;aeson -->
+<g id="edge526" class="edge">
+<title>lens&#45;aeson&#45;&gt;aeson</title>
+<path fill="none" stroke="black" d="M9562.61,-1597.74C9739.5,-1585.88 10347.33,-1545.13 10514.91,-1533.89"/>
+<polygon fill="black" stroke="black" points="10514.95,-1537.39 10524.7,-1533.23 10514.48,-1530.41 10514.95,-1537.39"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;scientific -->
+<g id="edge530" class="edge">
+<title>lens&#45;aeson&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M9517.56,-1583.98C9524.71,-1552.84 9543.22,-1485.72 9578,-1440 9610.08,-1397.83 9629.94,-1398.87 9673,-1368 9835.3,-1251.65 9889.33,-1241.09 10045,-1116 10081.27,-1086.86 10100.25,-1085.65 10121,-1044 10130.28,-1025.37 10132.59,-1001.88 10132.68,-983.71"/>
+<polygon fill="black" stroke="black" points="10136.18,-983.82 10132.49,-973.89 10129.18,-983.96 10136.18,-983.82"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;text&#45;short -->
+<g id="edge532" class="edge">
+<title>lens&#45;aeson&#45;&gt;text&#45;short</title>
+<path fill="none" stroke="black" d="M9502.23,-1584.17C9473.47,-1541.38 9402,-1424.05 9402,-1315 9402,-1315 9402,-1315 9402,-1169 9402,-1075.33 9457.76,-1056.32 9538,-1008 9595.26,-973.52 9672.12,-961.36 9723.94,-957.13"/>
+<polygon fill="black" stroke="black" points="9724.02,-960.64 9733.74,-956.41 9723.51,-953.66 9724.02,-960.64"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;unordered&#45;containers -->
+<g id="edge533" class="edge">
+<title>lens&#45;aeson&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M9467.3,-1595.34C9413.73,-1587.77 9330.82,-1572.4 9312,-1548 9253.79,-1472.55 9300.94,-1343.67 9388,-1080 9399.04,-1046.57 9397.23,-1033.96 9421,-1008 9433.15,-994.73 9449.4,-983.92 9464.93,-975.6"/>
+<polygon fill="black" stroke="black" points="9466.29,-978.84 9473.62,-971.18 9463.12,-972.6 9466.29,-978.84"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;vector -->
+<g id="edge534" class="edge">
+<title>lens&#45;aeson&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M9563.57,-1599.77C9748.07,-1595.01 10394.84,-1576.61 10599,-1548 10738.22,-1528.49 10772.94,-1518.31 10907,-1476 11045.53,-1432.28 11203.92,-1362.58 11272.87,-1331.22"/>
+<polygon fill="black" stroke="black" points="11274.13,-1334.49 11281.77,-1327.16 11271.22,-1328.13 11274.13,-1334.49"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;lens -->
+<g id="edge529" class="edge">
+<title>lens&#45;aeson&#45;&gt;lens</title>
+<path fill="none" stroke="black" d="M9563.89,-1600.86C9788.77,-1600 10709.52,-1593.67 10994,-1548 11050.66,-1538.9 11061.37,-1521.28 11118,-1512 11240.55,-1491.93 12137.98,-1465.65 12335.58,-1460.07"/>
+<polygon fill="black" stroke="black" points="12335.39,-1463.58 12345.29,-1459.8 12335.2,-1456.58 12335.39,-1463.58"/>
+</g>
+<!-- temporary&#45;&gt;base -->
+<g id="edge724" class="edge">
+<title>temporary&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M5750.57,-1095.77C5639.46,-1092.96 5357.66,-1085.85 5122,-1080 4795.56,-1071.9 3976.85,-1085.85 3653,-1044 3377.59,-1008.41 3314.74,-966.01 3045,-900 2918.1,-868.94 2885.68,-863.69 2760,-828 2708.89,-813.49 2698.23,-801.73 2646,-792 2519.92,-768.52 2187.87,-806.53 2070,-756 2016.53,-733.08 1974,-725.18 1974,-667 1974,-667 1974,-667 1974,-449 1974,-393.68 2010.1,-381.66 2061,-360 2141.16,-325.88 8057.77,-308.6 8591.57,-307.11"/>
+<polygon fill="black" stroke="black" points="8591.33,-310.61 8601.32,-307.08 8591.32,-303.61 8591.33,-310.61"/>
+</g>
+<!-- temporary&#45;&gt;directory -->
+<g id="edge725" class="edge">
+<title>temporary&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M5751.94,-1092.86C5613.11,-1080.63 5205.7,-1044.76 5058.15,-1031.77"/>
+<polygon fill="black" stroke="black" points="5058.52,-1028.29 5048.25,-1030.9 5057.9,-1035.26 5058.52,-1028.29"/>
+</g>
+<!-- temporary&#45;&gt;filepath -->
+<g id="edge727" class="edge">
+<title>temporary&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M5790.3,-1080.07C5779.64,-1060.66 5760.02,-1028.85 5736,-1008 5709.58,-985.07 5692.66,-994.65 5666,-972 5620.47,-933.33 5622.33,-911.41 5586,-864 5578.97,-854.83 5571.14,-844.88 5564.16,-836.1"/>
+<polygon fill="black" stroke="black" points="5566.92,-833.95 5557.95,-828.31 5561.45,-838.31 5566.92,-833.95"/>
+</g>
+<!-- temporary&#45;&gt;transformers -->
+<g id="edge729" class="edge">
+<title>temporary&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M5847.13,-1095.19C5943.77,-1091.65 6168.29,-1083.78 6357,-1080 6566.08,-1075.82 9914.69,-1078.2 10121,-1044 10171.33,-1035.66 10180.03,-1018.28 10230,-1008 10410.91,-970.79 10462.24,-1004.78 10644,-972 10703,-961.36 10715.01,-946.7 10774,-936 10951.37,-903.81 11001.37,-936.03 11178,-900 11279.63,-879.27 11308.86,-877.53 11400,-828 11533.81,-755.28 11552.89,-713.98 11666,-612 11682.81,-596.85 11681.38,-585.32 11702,-576 11770.5,-545.03 12276.87,-529.37 12463.33,-524.61"/>
+<polygon fill="black" stroke="black" points="12463.19,-528.12 12473.1,-524.36 12463.02,-521.12 12463.19,-528.12"/>
+</g>
+<!-- temporary&#45;&gt;random -->
+<g id="edge728" class="edge">
+<title>temporary&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M5793.71,-1079.69C5785.17,-1048.1 5772.14,-980.27 5802,-936 5847.65,-868.31 5892.79,-887.44 5971,-864 6204.85,-793.9 6495.84,-756.8 6609.9,-744.11"/>
+<polygon fill="black" stroke="black" points="6609.96,-747.63 6619.51,-743.05 6609.19,-740.67 6609.96,-747.63"/>
+</g>
+<!-- temporary&#45;&gt;exceptions -->
+<g id="edge726" class="edge">
+<title>temporary&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M5834.5,-1085.28C6016.79,-1025.07 6847.1,-750.85 7054.13,-682.48"/>
+<polygon fill="black" stroke="black" points="7055.08,-685.85 7063.48,-679.39 7052.89,-679.2 7055.08,-685.85"/>
+</g>
+<!-- th&#45;compat&#45;&gt;base -->
+<g id="edge754" class="edge">
+<title>th&#45;compat&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M6550.72,-656.74C6461.08,-638.38 6256.31,-591.71 6210,-540 6156.63,-480.41 6148.49,-411.15 6210,-360 6257.78,-320.27 8284.17,-308.71 8591.19,-307.18"/>
+<polygon fill="black" stroke="black" points="8591.07,-310.68 8601.06,-307.13 8591.04,-303.68 8591.07,-310.68"/>
+</g>
+<!-- th&#45;compat&#45;&gt;template&#45;haskell -->
+<g id="edge755" class="edge">
+<title>th&#45;compat&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M6640,-661.23C6692.58,-657.19 6780.33,-650.95 6856,-648 7664.71,-616.5 10325.54,-598.27 10772.13,-595.4"/>
+<polygon fill="black" stroke="black" points="10771.99,-598.9 10781.97,-595.34 10771.94,-591.9 10771.99,-598.9"/>
+</g>
+<!-- old&#45;locale -->
+<g id="node134" class="node">
+<title>old&#45;locale</title>
+<ellipse fill="none" stroke="black" cx="1141" cy="-378" rx="47.07" ry="18"/>
+<text text-anchor="middle" x="1141" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">old&#45;locale</text>
+</g>
+<!-- old&#45;locale&#45;&gt;base -->
+<g id="edge557" class="edge">
+<title>old&#45;locale&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1175.82,-365.59C1184.3,-363.29 1193.4,-361.21 1202,-360 1592.92,-305.12 8032.71,-306.74 8591.39,-306.98"/>
+<polygon fill="black" stroke="black" points="8591.28,-310.48 8601.28,-306.99 8591.28,-303.48 8591.28,-310.48"/>
+</g>
+<!-- old&#45;time -->
+<g id="node135" class="node">
+<title>old&#45;time</title>
+<ellipse fill="none" stroke="black" cx="1097" cy="-450" rx="41.08" ry="18"/>
+<text text-anchor="middle" x="1097" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">old&#45;time</text>
+</g>
+<!-- old&#45;time&#45;&gt;base -->
+<g id="edge558" class="edge">
+<title>old&#45;time&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1087.7,-432.34C1077.88,-412.27 1066.21,-378.92 1085,-360 1120.37,-324.38 8012.68,-308.37 8591.4,-307.08"/>
+<polygon fill="black" stroke="black" points="8591.31,-310.58 8601.3,-307.06 8591.29,-303.58 8591.31,-310.58"/>
+</g>
+<!-- old&#45;time&#45;&gt;old&#45;locale -->
+<g id="edge559" class="edge">
+<title>old&#45;time&#45;&gt;old&#45;locale</title>
+<path fill="none" stroke="black" d="M1107.43,-432.41C1112.45,-424.42 1118.6,-414.64 1124.25,-405.64"/>
+<polygon fill="black" stroke="black" points="1127.18,-407.57 1129.54,-397.24 1121.25,-403.84 1127.18,-407.57"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;base -->
+<g id="edge560" class="edge">
+<title>optparse&#45;applicative&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13126.62,-1164.36C13275.85,-1155.76 13602.7,-1136.35 13878,-1116 13889.88,-1115.12 14722.14,-1048.91 14733,-1044 14786.25,-1019.93 14840.17,-984.79 14808,-936 14785.64,-902.09 14757.79,-922.54 14724,-900 14695.37,-880.9 14644.02,-806.92 14613,-792 14497.14,-736.29 14450.21,-789.13 14326,-756 14285.96,-745.32 14279.87,-731.29 14240,-720 14140.44,-691.82 14106.71,-720.77 14010,-684 13968.51,-668.23 13884.05,-590.19 13842,-576 13650.63,-511.45 13589.42,-564.96 13389,-540 12915.68,-481.05 12805.99,-403.54 12331,-360 11947.51,-324.84 9037.17,-309.06 8668.38,-307.19"/>
+<polygon fill="black" stroke="black" points="8668.57,-303.69 8658.55,-307.14 8668.54,-310.69 8668.57,-303.69"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;process -->
+<g id="edge563" class="edge">
+<title>optparse&#45;applicative&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M12959.15,-1168.97C12357.4,-1168.62 8709.52,-1164.54 5741,-1116 5510.78,-1112.24 5236.01,-1104.09 5124.15,-1100.62"/>
+<polygon fill="black" stroke="black" points="5124.52,-1097.13 5114.41,-1100.32 5124.3,-1104.13 5124.52,-1097.13"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;transformers -->
+<g id="edge565" class="edge">
+<title>optparse&#45;applicative&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M13047.76,-1151.68C13059.08,-1078.21 13099.26,-792.72 13052,-720 12952.85,-567.44 12717.84,-532.74 12600.76,-525.04"/>
+<polygon fill="black" stroke="black" points="12601.17,-521.56 12590.97,-524.45 12600.74,-528.55 12601.17,-521.56"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;text -->
+<g id="edge564" class="edge">
+<title>optparse&#45;applicative&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M12964.57,-1163.48C12661.24,-1142.69 11557.66,-1067.28 10648,-1008 10521.35,-999.75 10194.36,-1022.68 10078,-972 10056.67,-962.71 10061.46,-944.97 10040,-936 9820.91,-844.39 9195.16,-981.18 8972,-900 8947.6,-891.13 8949.96,-874 8926,-864 8858.25,-835.71 8638.68,-819.05 8549.34,-813.29"/>
+<polygon fill="black" stroke="black" points="8549.83,-809.82 8539.63,-812.68 8549.39,-816.8 8549.83,-809.82"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;transformers&#45;compat -->
+<g id="edge566" class="edge">
+<title>optparse&#45;applicative&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M13130.53,-1168.17C13338.4,-1165.58 13886.49,-1155.26 14342,-1116 14585.86,-1094.98 14646.65,-1084.75 14888,-1044 14890.44,-1043.59 15234.68,-972.85 15237,-972 15300.15,-948.96 15327.23,-951.85 15370,-900 15384.19,-882.8 15391.21,-858.37 15394.68,-839.45"/>
+<polygon fill="black" stroke="black" points="15398.11,-840.14 15396.21,-829.72 15391.2,-839.06 15398.11,-840.14"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;prettyprinter -->
+<g id="edge561" class="edge">
+<title>optparse&#45;applicative&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M13054.19,-1151.83C13070.69,-1121.59 13107.16,-1057.35 13145,-1008 13173.63,-970.65 13211.6,-931.69 13236.41,-907.39"/>
+<polygon fill="black" stroke="black" points="13238.78,-909.97 13243.51,-900.49 13233.9,-904.95 13238.78,-909.97"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;prettyprinter&#45;ansi&#45;terminal -->
+<g id="edge562" class="edge">
+<title>optparse&#45;applicative&#45;&gt;prettyprinter&#45;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M13129.97,-1167.3C13322.58,-1162.88 13780.48,-1149.01 13842,-1116 13896.18,-1086.93 13931.56,-1020.49 13948.11,-982.67"/>
+<polygon fill="black" stroke="black" points="13951.2,-984.34 13951.87,-973.77 13944.76,-981.62 13951.2,-984.34"/>
+</g>
+<!-- prettyprinter&#45;&gt;base -->
+<g id="edge588" class="edge">
+<title>prettyprinter&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M13296.63,-867.4C13449.45,-807.14 14056,-565.29 14056,-523 14056,-523 14056,-523 14056,-449 14056,-396.98 14027.13,-382.01 13980,-360 13852.17,-300.29 9145.4,-306.18 8668.82,-306.93"/>
+<polygon fill="black" stroke="black" points="8668.95,-303.43 8658.96,-306.95 8668.96,-310.43 8668.95,-303.43"/>
+</g>
+<!-- prettyprinter&#45;&gt;text -->
+<g id="edge589" class="edge">
+<title>prettyprinter&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M13205.75,-880.17C12701.75,-872.75 8970.87,-817.78 8549.66,-811.57"/>
+<polygon fill="black" stroke="black" points="8549.74,-808.07 8539.69,-811.42 8549.63,-815.07 8549.74,-808.07"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;base -->
+<g id="edge591" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M14035.05,-941.21C14116.58,-928.2 14235.33,-908.04 14242,-900 14252.22,-887.69 14243.83,-879.9 14242,-864 14232.61,-782.39 14209.39,-765.61 14200,-684 14198.17,-668.1 14197.19,-663.75 14200,-648 14210.38,-589.72 14246,-582.2 14246,-523 14246,-523 14246,-523 14246,-449 14246,-397.27 14217.8,-382.04 14171,-360 14038.66,-297.69 9153.96,-305.94 8668.72,-306.92"/>
+<polygon fill="black" stroke="black" points="8668.97,-303.42 8658.98,-306.94 8668.99,-310.42 8668.97,-303.42"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;text -->
+<g id="edge593" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M13918.57,-937.07C13861.71,-915.58 13754.36,-878.33 13659,-864 13460.06,-834.1 10239.17,-830.12 10038,-828 9445.14,-821.75 8722.8,-813.45 8549.63,-811.45"/>
+<polygon fill="black" stroke="black" points="8549.67,-807.95 8539.63,-811.33 8549.59,-814.95 8549.67,-807.95"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;ansi&#45;terminal -->
+<g id="edge590" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M14032.56,-940.7C14109.13,-927.54 14218.81,-907.54 14225,-900 14235.15,-887.63 14231.87,-878.45 14225,-864 14179.79,-768.94 13895.59,-602.06 13792.39,-543.78"/>
+<polygon fill="black" stroke="black" points="13794.16,-540.77 13783.73,-538.91 13790.73,-546.87 13794.16,-540.77"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;prettyprinter -->
+<g id="edge592" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M13870.02,-944.06C13727.48,-929.75 13451.34,-902.02 13326.3,-889.46"/>
+<polygon fill="black" stroke="black" points="13326.84,-885.99 13316.54,-888.48 13326.14,-892.96 13326.84,-885.99"/>
+</g>
+<!-- psqueues&#45;&gt;base -->
+<g id="edge615" class="edge">
+<title>psqueues&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M8566.88,-941.64C8560.32,-939.63 8553.47,-937.66 8547,-936 8463.13,-914.53 8331.79,-943.53 8366,-864 8402.77,-778.51 8443.04,-775.15 8518,-720 8527.9,-712.72 8703.01,-621.34 8711,-612 8738.43,-579.95 8744,-565.19 8744,-523 8744,-523 8744,-523 8744,-449 8744,-398.57 8699.74,-355.86 8666.38,-330.82"/>
+<polygon fill="black" stroke="black" points="8668.68,-328.17 8658.53,-325.13 8664.57,-333.83 8668.68,-328.17"/>
+</g>
+<!-- psqueues&#45;&gt;ghc&#45;prim -->
+<g id="edge617" class="edge">
+<title>psqueues&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M8646.5,-951.94C8770.15,-949.07 9122.74,-941.06 9416,-936 10589.71,-915.76 10884.25,-951.7 12057,-900 12916.33,-862.12 13129.39,-822.15 13987,-756 14187.93,-740.5 14697.31,-739.63 14891,-684 14973.35,-660.35 15062,-680.68 15062,-595 15062,-595 15062,-595 15062,-521 15062,-419.55 15188.22,-474.07 15253,-396 15280.36,-363.03 15290,-349.84 15290,-307 15290,-307 15290,-307 15290,-233 15290,-188.03 15260.01,-143.52 15237.71,-116.64"/>
+<polygon fill="black" stroke="black" points="15240.64,-114.69 15231.48,-109.38 15235.33,-119.25 15240.64,-114.69"/>
+</g>
+<!-- psqueues&#45;&gt;deepseq -->
+<g id="edge616" class="edge">
+<title>psqueues&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8567.24,-941.43C8560.59,-939.42 8553.62,-937.49 8547,-936 8434.5,-910.6 8388.28,-960.36 8290,-900 8248.92,-874.77 8228,-859.21 8228,-811 8228,-811 8228,-811 8228,-593 8228,-507.34 7935.74,-468.25 7814.62,-455.73"/>
+<polygon fill="black" stroke="black" points="7815.26,-452.28 7804.96,-454.75 7814.56,-459.24 7815.26,-452.28"/>
+</g>
+<!-- psqueues&#45;&gt;hashable -->
+<g id="edge618" class="edge">
+<title>psqueues&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M8567.57,-941.33C8560.83,-939.31 8553.74,-937.4 8547,-936 8525.1,-931.45 8219.83,-900.67 8095.31,-888.22"/>
+<polygon fill="black" stroke="black" points="8096,-884.77 8085.7,-887.26 8095.3,-891.73 8096,-884.77"/>
+</g>
+<!-- serialise&#45;&gt;base -->
+<g id="edge663" class="edge">
+<title>serialise&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M7810.03,-1384.99C7402.23,-1384.84 3990.25,-1382.11 2973,-1332 2790.3,-1323 2745.32,-1310.88 2563,-1296 2098.87,-1258.11 1934.42,-1300.86 1546,-1044 1386.76,-938.7 1246.65,-910.11 1264,-720 1278.84,-557.42 1207.39,-459.26 1337,-360 1413.99,-301.04 8026.85,-306.39 8591.64,-306.96"/>
+<polygon fill="black" stroke="black" points="8591.28,-310.46 8601.28,-306.97 8591.28,-303.46 8591.28,-310.46"/>
+</g>
+<!-- serialise&#45;&gt;ghc&#45;prim -->
+<g id="edge667" class="edge">
+<title>serialise&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M7810.08,-1384.91C7271.39,-1383.65 1456.62,-1369.21 1101,-1332 613.26,-1280.97 64,-1445.4 64,-955 64,-955 64,-955 64,-233 64,-188.06 73.45,-167.1 112,-144 199.09,-91.81 14272.63,-91 15169.26,-91"/>
+<polygon fill="black" stroke="black" points="15169.13,-94.5 15179.13,-91 15169.13,-87.5 15169.13,-94.5"/>
+</g>
+<!-- serialise&#45;&gt;array -->
+<g id="edge662" class="edge">
+<title>serialise&#45;&gt;array</title>
+<path fill="none" stroke="black" d="M7811.39,-1381.13C7768.58,-1377.02 7697.43,-1370.75 7636,-1368 7442.13,-1359.31 4331.24,-1379.18 4143,-1332 4134.61,-1329.9 4010.65,-1266.55 4005,-1260 3889.94,-1126.69 3921.52,-1011.32 4018,-864 4123.69,-702.61 4584.65,-481.91 4771,-432 4894.08,-399.04 5288.44,-384.21 5416.45,-380.18"/>
+<polygon fill="black" stroke="black" points="5416.25,-383.69 5426.13,-379.88 5416.03,-376.69 5416.25,-383.69"/>
+</g>
+<!-- serialise&#45;&gt;bytestring -->
+<g id="edge664" class="edge">
+<title>serialise&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M7810,-1384.9C7348.84,-1383.75 3054.59,-1371.95 3005,-1332 2923.56,-1266.38 2890.49,-946.33 2955,-864 2990.58,-818.59 3012.73,-820.3 3063,-792 3095.92,-773.47 3108.78,-777.26 3140,-756 3159.23,-742.91 3160.71,-735.56 3178,-720 3189.1,-710.01 3201.58,-699.25 3212.41,-690.06"/>
+<polygon fill="black" stroke="black" points="3214.53,-692.86 3219.91,-683.73 3210.01,-687.51 3214.53,-692.86"/>
+</g>
+<!-- serialise&#45;&gt;containers -->
+<g id="edge666" class="edge">
+<title>serialise&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M7885.08,-1377.4C8032.07,-1345.11 8611.97,-1213.1 9069,-1044 9107.86,-1029.62 9116.29,-1022.78 9155,-1008 9200.69,-990.55 9216.5,-996.22 9259,-972 9269.75,-965.87 9338.8,-911.23 9344,-900 9350.73,-885.48 9349.19,-879.13 9344,-864 9337.42,-844.83 9327,-845.03 9316,-828 9296.37,-797.6 9286.7,-791.12 9278,-756 9274.15,-740.47 9268.37,-732.78 9278,-720 9293.64,-699.25 9358.56,-684.15 9407.11,-675.5"/>
+<polygon fill="black" stroke="black" points="9407.69,-678.95 9416.94,-673.8 9406.49,-672.05 9407.69,-678.95"/>
+</g>
+<!-- serialise&#45;&gt;time -->
+<g id="edge674" class="edge">
+<title>serialise&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M7812.97,-1378.95C7674.71,-1356.48 7175.43,-1276.43 6762,-1224 6535.66,-1195.29 5955.58,-1193.52 5741,-1116 5659.62,-1086.6 5653.84,-1051.43 5579,-1008 5554.79,-993.95 5526.39,-979.87 5505.08,-969.76"/>
+<polygon fill="black" stroke="black" points="5506.84,-966.72 5496.31,-965.63 5503.87,-973.06 5506.84,-966.72"/>
+</g>
+<!-- serialise&#45;&gt;text -->
+<g id="edge672" class="edge">
+<title>serialise&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M7848.48,-1368C7842.94,-1294.21 7831.72,-999.26 7991,-864 8027.58,-832.94 8358.69,-817.02 8472.66,-812.43"/>
+<polygon fill="black" stroke="black" points="8472.56,-815.94 8482.41,-812.05 8472.28,-808.94 8472.56,-815.94"/>
+</g>
+<!-- serialise&#45;&gt;hashable -->
+<g id="edge669" class="edge">
+<title>serialise&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M7874.1,-1371.45C7909.66,-1349.48 7972,-1302.48 7972,-1243 7972,-1243 7972,-1243 7972,-1025 7972,-984.03 7976.56,-972.06 7996,-936 8001.69,-925.45 8009.86,-915.24 8017.8,-906.65"/>
+<polygon fill="black" stroke="black" points="8020.06,-909.35 8024.51,-899.74 8015.04,-904.48 8020.06,-909.35"/>
+</g>
+<!-- serialise&#45;&gt;primitive -->
+<g id="edge670" class="edge">
+<title>serialise&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M7889.37,-1383.73C8007.76,-1379.64 8370.82,-1365.1 8670,-1332 9780.29,-1209.17 10091.69,-1269.16 11146,-900 11196.67,-882.26 11250.98,-851.81 11284.47,-831.54"/>
+<polygon fill="black" stroke="black" points="11286.18,-834.6 11292.88,-826.39 11282.52,-828.63 11286.18,-834.6"/>
+</g>
+<!-- serialise&#45;&gt;strict -->
+<g id="edge671" class="edge">
+<title>serialise&#45;&gt;strict</title>
+<path fill="none" stroke="black" d="M7889.53,-1383.28C7995.53,-1378.38 8294.78,-1362.69 8542,-1332 8729.08,-1308.78 8774.65,-1294.41 8960,-1260 9201.71,-1215.13 9810.77,-1118.67 10045,-1044 10046.8,-1043.43 10048.63,-1042.79 10050.46,-1042.12"/>
+<polygon fill="black" stroke="black" points="10051.46,-1045.49 10059.42,-1038.49 10048.84,-1039 10051.46,-1045.49"/>
+</g>
+<!-- serialise&#45;&gt;these -->
+<g id="edge673" class="edge">
+<title>serialise&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M7889.03,-1382.44C7973.4,-1376.55 8178.85,-1360.35 8349,-1332 8682.2,-1276.49 9747.01,-1017.19 9962.69,-964.4"/>
+<polygon fill="black" stroke="black" points="9963.37,-967.83 9972.25,-962.05 9961.7,-961.03 9963.37,-967.83"/>
+</g>
+<!-- serialise&#45;&gt;unordered&#45;containers -->
+<g id="edge675" class="edge">
+<title>serialise&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M7889.14,-1382.39C7964.63,-1376.86 8135.31,-1361.94 8276,-1332 8336.84,-1319.05 9219.08,-1046.31 9455.87,-973.01"/>
+<polygon fill="black" stroke="black" points="9456.69,-976.42 9465.21,-970.11 9454.62,-969.73 9456.69,-976.42"/>
+</g>
+<!-- serialise&#45;&gt;vector -->
+<g id="edge676" class="edge">
+<title>serialise&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M7889.87,-1384.87C8217.62,-1383.68 10472.57,-1374.09 11151,-1332 11189.09,-1329.64 11232.19,-1324.82 11263.57,-1320.91"/>
+<polygon fill="black" stroke="black" points="11264.01,-1324.38 11273.49,-1319.66 11263.13,-1317.44 11264.01,-1324.38"/>
+</g>
+<!-- serialise&#45;&gt;cborg -->
+<g id="edge665" class="edge">
+<title>serialise&#45;&gt;cborg</title>
+<path fill="none" stroke="black" d="M7811.39,-1381.18C7768.57,-1377.12 7697.43,-1370.89 7636,-1368 6558.41,-1317.26 6287,-1373.11 5209,-1332 5078.74,-1327.03 4130.22,-1352.13 4038,-1260 3958.69,-1180.77 3972.48,-1089.93 4049,-1008 4158.72,-890.51 4690.05,-882.44 4847.16,-882.66"/>
+<polygon fill="black" stroke="black" points="4846.72,-886.16 4856.73,-882.69 4846.74,-879.16 4846.72,-886.16"/>
+</g>
+<!-- serialise&#45;&gt;half -->
+<g id="edge668" class="edge">
+<title>serialise&#45;&gt;half</title>
+<path fill="none" stroke="black" d="M7846.76,-1367.63C7839.15,-1328.34 7818.41,-1230 7788,-1152 7739.97,-1028.81 7659.33,-892.46 7625.12,-836.79"/>
+<polygon fill="black" stroke="black" points="7628.14,-835.01 7619.9,-828.35 7622.18,-838.69 7628.14,-835.01"/>
+</g>
+<!-- zlib&#45;&gt;base -->
+<g id="edge874" class="edge">
+<title>zlib&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1320.07,-720.76C1325.43,-710.5 1331.96,-696.81 1336,-684 1358.01,-614.33 1336.28,-407.27 1392,-360 1465.37,-297.76 8027.81,-306.11 8591.48,-306.94"/>
+<polygon fill="black" stroke="black" points="8591.1,-310.44 8601.11,-306.95 8591.11,-303.44 8591.1,-310.44"/>
+</g>
+<!-- zlib&#45;&gt;zlib&#45;clib -->
+<g id="edge876" class="edge">
+<title>zlib&#45;&gt;zlib&#45;clib</title>
+<path fill="none" stroke="black" d="M1283.57,-736.95C1151.53,-735.15 576.38,-709.03 298,-396 205.42,-291.9 184.21,-116.11 179.4,-47.57"/>
+<polygon fill="black" stroke="black" points="182.91,-47.69 178.79,-37.93 175.93,-48.13 182.91,-47.69"/>
+</g>
+<!-- zlib&#45;&gt;bytestring -->
+<g id="edge875" class="edge">
+<title>zlib&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1335.71,-730.46C1351.19,-726.67 1371.62,-722.22 1390,-720 1749.09,-676.59 2907.45,-668.54 3181.49,-667.23"/>
+<polygon fill="black" stroke="black" points="3181.25,-670.73 3191.23,-667.19 3181.22,-663.73 3181.25,-670.73"/>
+</g>
+<!-- tagsoup&#45;&gt;base -->
+<g id="edge709" class="edge">
+<title>tagsoup&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M9856.22,-880.15C10034.04,-876.27 10767.53,-859.13 11369,-828 12061.29,-792.17 12232.56,-752.82 12925,-720 12964.3,-718.14 14311.93,-710.51 14341,-684 14394.24,-635.45 14360,-595.05 14360,-523 14360,-523 14360,-523 14360,-449 14360,-406.16 14358.52,-383.94 14323,-360 14260.63,-317.96 9165.28,-307.94 8668.8,-307.07"/>
+<polygon fill="black" stroke="black" points="8668.82,-303.57 8658.82,-307.05 8668.81,-310.57 8668.82,-303.57"/>
+</g>
+<!-- tagsoup&#45;&gt;bytestring -->
+<g id="edge710" class="edge">
+<title>tagsoup&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M9778.37,-875.39C9675.44,-860.19 9380.44,-817.65 9134,-792 8723.86,-749.31 8620.95,-738.21 8209,-720 8144.5,-717.15 3852.3,-673.25 3298.6,-667.6"/>
+<polygon fill="black" stroke="black" points="3298.88,-664.1 3288.84,-667.5 3298.81,-671.1 3298.88,-664.1"/>
+</g>
+<!-- tagsoup&#45;&gt;containers -->
+<g id="edge711" class="edge">
+<title>tagsoup&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M9784.11,-870.63C9776.86,-868.37 9769.19,-866.04 9762,-864 9699.37,-846.22 9677.03,-859.4 9620,-828 9588.05,-810.41 9519.09,-732.71 9484.17,-692.03"/>
+<polygon fill="black" stroke="black" points="9487.01,-689.96 9477.85,-684.63 9481.68,-694.51 9487.01,-689.96"/>
+</g>
+<!-- tagsoup&#45;&gt;text -->
+<g id="edge712" class="edge">
+<title>tagsoup&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M9776.23,-878.87C9582.61,-868.48 8740.16,-823.29 8549.47,-813.06"/>
+<polygon fill="black" stroke="black" points="8549.8,-809.58 8539.62,-812.54 8549.42,-816.57 8549.8,-809.58"/>
+</g>
+<!-- tasty&#45;&gt;base -->
+<g id="edge714" class="edge">
+<title>tasty&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M12171.46,-1223.83C12175.44,-1165.51 12180.48,-972.58 12085,-864 12063.61,-839.67 11612,-555.39 11612,-523 11612,-523 11612,-523 11612,-449 11612,-408.03 11620.3,-385.2 11588,-360 11527.63,-312.89 9011.36,-307.56 8668.53,-307.05"/>
+<polygon fill="black" stroke="black" points="8668.78,-303.55 8658.77,-307.03 8668.77,-310.55 8668.78,-303.55"/>
+</g>
+<!-- tasty&#45;&gt;containers -->
+<g id="edge715" class="edge">
+<title>tasty&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M12147.99,-1230.27C12038.96,-1177.75 11544.68,-946.98 11111,-864 10675.5,-780.67 10548.64,-915.72 10114,-828 10025.48,-810.13 10007.88,-789.44 9924,-756 9885.51,-740.66 9878.11,-730.41 9838,-720 9699.05,-683.92 9657.46,-713.69 9517,-684 9514.22,-683.41 9511.39,-682.74 9508.54,-682.01"/>
+<polygon fill="black" stroke="black" points="9509.63,-678.68 9499.05,-679.38 9507.75,-685.43 9509.63,-678.68"/>
+</g>
+<!-- tasty&#45;&gt;transformers -->
+<g id="edge719" class="edge">
+<title>tasty&#45;&gt;transformers</title>
+<path fill="none" stroke="black" d="M12182.79,-1225.8C12244.33,-1152.65 12507.25,-839.84 12513,-828 12530.65,-791.61 12532,-779.45 12532,-739 12532,-739 12532,-739 12532,-665 12532,-625.74 12532,-580.38 12532,-551.69"/>
+<polygon fill="black" stroke="black" points="12535.5,-552 12532,-542 12528.5,-552 12535.5,-552"/>
+</g>
+<!-- tasty&#45;&gt;stm -->
+<g id="edge717" class="edge">
+<title>tasty&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M12141.59,-1241.07C11732.37,-1241.96 7020.02,-1250.84 5632,-1188 5372.07,-1176.23 4673.1,-1206.65 4470,-1044 4402.75,-990.14 4371.19,-945.89 4398,-864 4428.87,-769.72 4473.89,-765.81 4530,-684 4544.4,-663 4559.94,-638.62 4571.15,-620.69"/>
+<polygon fill="black" stroke="black" points="4574.1,-622.58 4576.41,-612.24 4568.15,-618.88 4574.1,-622.58"/>
+</g>
+<!-- tasty&#45;&gt;tagged -->
+<g id="edge718" class="edge">
+<title>tasty&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M12193.05,-1231.16C12220.77,-1219.1 12265.42,-1198.94 12280,-1188 12366.1,-1123.42 12361.64,-1079.6 12442,-1008 12565.74,-897.73 12595.04,-860.42 12746,-792 12804.31,-765.57 12877.39,-751.43 12923.66,-744.57"/>
+<polygon fill="black" stroke="black" points="12923.91,-748.07 12933.32,-743.19 12922.92,-741.14 12923.91,-748.07"/>
+</g>
+<!-- tasty&#45;&gt;ansi&#45;terminal -->
+<g id="edge713" class="edge">
+<title>tasty&#45;&gt;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M12198.21,-1240.78C12446.83,-1238.83 14260.59,-1223.41 14499,-1188 14689.21,-1159.75 14804.59,-1206.76 14907,-1044 14935.69,-998.41 14890.89,-973.28 14852,-936 14771.36,-858.7 14747.4,-838.86 14646,-792 14624.47,-782.05 14255.56,-691.32 14233,-684 14107.31,-643.22 14081.64,-616.91 13956,-576 13907.7,-560.27 13851.74,-545.82 13811.15,-535.99"/>
+<polygon fill="black" stroke="black" points="13812.14,-532.63 13801.6,-533.7 13810.51,-539.43 13812.14,-532.63"/>
+</g>
+<!-- tasty&#45;&gt;optparse&#45;applicative -->
+<g id="edge716" class="edge">
+<title>tasty&#45;&gt;optparse&#45;applicative</title>
+<path fill="none" stroke="black" d="M12198.12,-1238.75C12314.49,-1229.44 12761.31,-1193.7 12954.8,-1178.22"/>
+<polygon fill="black" stroke="black" points="12954.86,-1181.72 12964.55,-1177.44 12954.3,-1174.74 12954.86,-1181.72"/>
+</g>
+<!-- time&#45;locale&#45;compat&#45;&gt;base -->
+<g id="edge770" class="edge">
+<title>time&#45;locale&#45;compat&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M4687.6,-1008.09C4705.02,-989.26 4726.84,-958.52 4710,-936 4676.15,-890.72 4621.85,-945.28 4588,-900 4578.42,-887.18 4578.72,-877.03 4588,-864 4616.37,-824.16 4649.72,-852.6 4692,-828 4733.92,-803.61 4745.57,-795.29 4774,-756 4886.39,-600.69 4784.4,-464.69 4945,-360 5025.51,-307.52 8202.41,-306.86 8591.15,-306.98"/>
+<polygon fill="black" stroke="black" points="8591.06,-310.48 8601.06,-306.98 8591.06,-303.48 8591.06,-310.48"/>
+</g>
+<!-- time&#45;locale&#45;compat&#45;&gt;time -->
+<g id="edge771" class="edge">
+<title>time&#45;locale&#45;compat&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M4744.82,-1018.48C4911.91,-1003.91 5310.49,-969.17 5435.1,-958.3"/>
+<polygon fill="black" stroke="black" points="5435.12,-961.82 5444.78,-957.46 5434.51,-954.84 5435.12,-961.82"/>
+</g>
+<!-- unix&#45;time&#45;&gt;base -->
+<g id="edge799" class="edge">
+<title>unix&#45;time&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M1057.51,-791.89C1046.7,-765.58 1028,-713.37 1028,-667 1028,-667 1028,-667 1028,-449 1028,-405.26 1033.14,-383.55 1070,-360 1154.75,-305.86 8012.13,-306.81 8591.15,-306.99"/>
+<polygon fill="black" stroke="black" points="8591.05,-310.49 8601.06,-306.99 8591.06,-303.49 8591.05,-310.49"/>
+</g>
+<!-- unix&#45;time&#45;&gt;bytestring -->
+<g id="edge801" class="edge">
+<title>unix&#45;time&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1090.16,-794.65C1128.56,-773.62 1204.77,-735.26 1275,-720 1465.15,-678.69 2876.08,-668.92 3181.71,-667.28"/>
+<polygon fill="black" stroke="black" points="3181.46,-670.78 3191.44,-667.23 3181.42,-663.78 3181.46,-670.78"/>
+</g>
+<!-- unix&#45;time&#45;&gt;binary -->
+<g id="edge800" class="edge">
+<title>unix&#45;time&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M1109.87,-808.62C1501.18,-805.27 4375.17,-780.54 6707,-756 7264.41,-750.13 7941.58,-741.79 8120.76,-739.56"/>
+<polygon fill="black" stroke="black" points="8120.6,-743.07 8130.56,-739.44 8120.51,-736.07 8120.6,-743.07"/>
+</g>
+<!-- unix&#45;time&#45;&gt;old&#45;time -->
+<g id="edge802" class="edge">
+<title>unix&#45;time&#45;&gt;old&#45;time</title>
+<path fill="none" stroke="black" d="M1065.2,-791.51C1065.49,-764.71 1066,-711.87 1066,-667 1066,-667 1066,-667 1066,-593 1066,-552.64 1078.1,-507.27 1087.18,-478.92"/>
+<polygon fill="black" stroke="black" points="1090.43,-480.25 1090.25,-469.66 1083.78,-478.05 1090.43,-480.25"/>
+</g>
+<!-- vector&#45;stream&#45;&gt;base -->
+<g id="edge821" class="edge">
+<title>vector&#45;stream&#45;&gt;base</title>
+<path fill="none" stroke="black" d="M15487.26,-365.34C15477.05,-363.14 15466.21,-361.17 15456,-360 15096.32,-318.85 9202.65,-307.97 8668.65,-307.06"/>
+<polygon fill="black" stroke="black" points="8668.89,-303.56 8658.89,-307.05 8668.88,-310.56 8668.89,-303.56"/>
+</g>
+<!-- vector&#45;stream&#45;&gt;ghc&#45;prim -->
+<g id="edge822" class="edge">
+<title>vector&#45;stream&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M15528.67,-359.58C15519.44,-316.13 15489.32,-202.26 15418,-144 15372.48,-106.81 15303.76,-95.42 15258.88,-92.1"/>
+<polygon fill="black" stroke="black" points="15259.16,-88.61 15248.96,-91.49 15258.72,-95.6 15259.16,-88.61"/>
+</g>
+</g>
+</svg>
diff --git a/doc/img/dot_command/wreq-example4.svg b/doc/img/dot_command/wreq-example4.svg
new file mode 100644
index 0000000000..9554d2ccb1
--- /dev/null
+++ b/doc/img/dot_command/wreq-example4.svg
@@ -0,0 +1,3553 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 12.0.0 (20240704.0754)
+ -->
+<!-- Title: deps Pages: 1 -->
+<svg width="9135pt" height="1196pt"
+ viewBox="0.00 0.00 9135.49 1196.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1192)">
+<title>deps</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-1192 9131.49,-1192 9131.49,4 -4,4"/>
+<!-- wreq -->
+<g id="node1" class="node">
+<title>wreq</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="3213" cy="-1098" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="3213" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">wreq</text>
+</g>
+<!-- ghc&#45;prim -->
+<g id="node7" class="node">
+<title>ghc&#45;prim</title>
+<polygon fill="none" stroke="black" points="1928.12,-108 1861.88,-108 1861.88,-72 1928.12,-72 1928.12,-108"/>
+<text text-anchor="middle" x="1895" y="-84.58" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;prim</text>
+</g>
+<!-- wreq&#45;&gt;ghc&#45;prim -->
+<g id="edge463" class="edge">
+<title>wreq&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M3183.88,-1096.82C2896.35,-1094.96 573.63,-1078.9 433,-1044 278.86,-1005.75 114,-1041.81 114,-883 114,-883 114,-883 114,-737 114,-533.13 618.14,-200.58 814,-144 914.56,-114.95 1659.11,-96.32 1850.33,-91.98"/>
+<polygon fill="black" stroke="black" points="1850.18,-95.48 1860.09,-91.76 1850.02,-88.48 1850.18,-95.48"/>
+</g>
+<!-- template&#45;haskell -->
+<g id="node11" class="node">
+<title>template&#45;haskell</title>
+<polygon fill="none" stroke="black" points="5790.25,-324 5685.75,-324 5685.75,-288 5790.25,-288 5790.25,-324"/>
+<text text-anchor="middle" x="5738" y="-300.57" font-family="Times New Roman,serif" font-size="14.00">template&#45;haskell</text>
+</g>
+<!-- wreq&#45;&gt;template&#45;haskell -->
+<g id="edge473" class="edge">
+<title>wreq&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M3242.29,-1096.57C3396.76,-1094.15 4118.07,-1081.01 4338,-1044 4714.37,-980.66 4900.83,-1047.66 5147,-756 5270.65,-609.5 5146.74,-446.15 5318,-360 5378.93,-329.35 5572.27,-315.28 5674,-309.87"/>
+<polygon fill="black" stroke="black" points="5674.02,-313.37 5683.83,-309.36 5673.66,-306.38 5674.02,-313.37"/>
+</g>
+<!-- Cabal -->
+<g id="node12" class="node">
+<title>Cabal</title>
+<ellipse fill="none" stroke="black" cx="1756" cy="-882" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="1756" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">Cabal</text>
+</g>
+<!-- wreq&#45;&gt;Cabal -->
+<g id="edge452" class="edge">
+<title>wreq&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M3183.56,-1097C3003.01,-1096.82 2049.2,-1093.55 1930,-1044 1860.63,-1015.17 1801.72,-945.6 1773.63,-908.04"/>
+<polygon fill="black" stroke="black" points="1776.79,-906.44 1768.06,-900.45 1771.15,-910.58 1776.79,-906.44"/>
+</g>
+<!-- bytestring -->
+<g id="node15" class="node">
+<title>bytestring</title>
+<ellipse fill="none" stroke="black" cx="2854" cy="-378" rx="47.07" ry="18"/>
+<text text-anchor="middle" x="2854" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">bytestring</text>
+</g>
+<!-- wreq&#45;&gt;bytestring -->
+<g id="edge457" class="edge">
+<title>wreq&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3183.58,-1097.15C3084.31,-1097.18 2752.95,-1093.33 2485,-1044 2375.48,-1023.84 2350.1,-1008.82 2245,-972 2083.14,-915.3 1983.01,-970.11 1887,-828 1878.04,-814.74 1882.12,-807.24 1887,-792 1916.98,-698.39 2058.34,-480.21 2144,-432 2200.12,-400.41 2635.42,-385.13 2795.33,-380.54"/>
+<polygon fill="black" stroke="black" points="2795.4,-384.04 2805.3,-380.26 2795.2,-377.04 2795.4,-384.04"/>
+</g>
+<!-- containers -->
+<g id="node16" class="node">
+<title>containers</title>
+<ellipse fill="none" stroke="black" cx="6473" cy="-378" rx="48.57" ry="18"/>
+<text text-anchor="middle" x="6473" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">containers</text>
+</g>
+<!-- wreq&#45;&gt;containers -->
+<g id="edge460" class="edge">
+<title>wreq&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3242.21,-1096.64C3493.79,-1093.53 5291.17,-1070.5 5529,-1044 5689.87,-1026.08 5730.28,-1016.16 5886,-972 6187.25,-886.56 6362.46,-949.18 6529,-684 6585.49,-594.06 6521.65,-461.6 6489.4,-405.58"/>
+<polygon fill="black" stroke="black" points="6492.46,-403.87 6484.37,-397.03 6486.43,-407.43 6492.46,-403.87"/>
+</g>
+<!-- time -->
+<g id="node23" class="node">
+<title>time</title>
+<ellipse fill="none" stroke="black" cx="3471" cy="-666" rx="27" ry="18"/>
+<text text-anchor="middle" x="3471" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">time</text>
+</g>
+<!-- wreq&#45;&gt;time -->
+<g id="edge475" class="edge">
+<title>wreq&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M3222.8,-1080.67C3262,-1015.34 3407.71,-772.48 3455.62,-692.63"/>
+<polygon fill="black" stroke="black" points="3458.54,-694.56 3460.69,-684.19 3452.54,-690.96 3458.54,-694.56"/>
+</g>
+<!-- text -->
+<g id="node25" class="node">
+<title>text</title>
+<ellipse fill="none" stroke="black" cx="4068" cy="-522" rx="27" ry="18"/>
+<text text-anchor="middle" x="4068" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">text</text>
+</g>
+<!-- wreq&#45;&gt;text -->
+<g id="edge474" class="edge">
+<title>wreq&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3242.39,-1096.16C3397.87,-1091.08 4122.57,-1059 4262,-900 4293.71,-863.84 4284.41,-837.56 4269,-792 4256.1,-753.85 4246.41,-743.89 4214,-720 4176.65,-692.47 4150.24,-715.32 4116,-684 4078.58,-649.78 4069.85,-587.79 4068.1,-551.53"/>
+<polygon fill="black" stroke="black" points="4071.6,-551.69 4067.79,-541.81 4064.61,-551.91 4071.6,-551.69"/>
+</g>
+<!-- aeson -->
+<g id="node32" class="node">
+<title>aeson</title>
+<ellipse fill="none" stroke="black" cx="5537" cy="-882" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="5537" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">aeson</text>
+</g>
+<!-- wreq&#45;&gt;aeson -->
+<g id="edge453" class="edge">
+<title>wreq&#45;&gt;aeson</title>
+<path fill="none" stroke="black" d="M3242.16,-1096.52C3492.99,-1092.4 5278.5,-1062.39 5330,-1044 5409.19,-1015.72 5481.86,-944.44 5516.2,-906.93"/>
+<polygon fill="black" stroke="black" points="5518.6,-909.5 5522.69,-899.73 5513.4,-904.81 5518.6,-909.5"/>
+</g>
+<!-- exceptions -->
+<g id="node35" class="node">
+<title>exceptions</title>
+<ellipse fill="none" stroke="black" cx="491" cy="-378" rx="50.56" ry="18"/>
+<text text-anchor="middle" x="491" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">exceptions</text>
+</g>
+<!-- wreq&#45;&gt;exceptions -->
+<g id="edge462" class="edge">
+<title>wreq&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M3183.86,-1096.78C2903.35,-1094.57 689.52,-1076.21 555,-1044 367.95,-999.21 281.23,-941.93 232,-756 190.43,-599 279.16,-539.39 401,-432 415.98,-418.79 434.73,-407.14 451.23,-398.15"/>
+<polygon fill="black" stroke="black" points="452.62,-401.38 459.83,-393.61 449.35,-395.19 452.62,-401.38"/>
+</g>
+<!-- hashable -->
+<g id="node36" class="node">
+<title>hashable</title>
+<ellipse fill="none" stroke="black" cx="4635" cy="-594" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="4635" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">hashable</text>
+</g>
+<!-- wreq&#45;&gt;hashable -->
+<g id="edge464" class="edge">
+<title>wreq&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M3215.16,-1079.81C3224.93,-1010.37 3271.8,-749.48 3435,-648 3482.02,-618.76 4375.73,-615.3 4431,-612 4482.45,-608.93 4541.08,-603.88 4582.24,-600.08"/>
+<polygon fill="black" stroke="black" points="4582.49,-603.57 4592.12,-599.16 4581.84,-596.6 4582.49,-603.57"/>
+</g>
+<!-- unordered&#45;containers -->
+<g id="node51" class="node">
+<title>unordered&#45;containers</title>
+<ellipse fill="none" stroke="black" cx="6223" cy="-666" rx="89.49" ry="18"/>
+<text text-anchor="middle" x="6223" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">unordered&#45;containers</text>
+</g>
+<!-- wreq&#45;&gt;unordered&#45;containers -->
+<g id="edge477" class="edge">
+<title>wreq&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M3242.19,-1096.63C3484.34,-1093.51 5156.53,-1071.09 5378,-1044 5670.41,-1008.23 5750.07,-1005.81 6025,-900 6120.29,-863.33 6162.56,-849.32 6204,-756 6212.53,-736.78 6217.33,-713.5 6219.97,-695.56"/>
+<polygon fill="black" stroke="black" points="6223.41,-696.26 6221.24,-685.88 6216.47,-695.34 6223.41,-696.26"/>
+</g>
+<!-- attoparsec -->
+<g id="node58" class="node">
+<title>attoparsec</title>
+<ellipse fill="none" stroke="black" cx="3149" cy="-738" rx="49.07" ry="18"/>
+<text text-anchor="middle" x="3149" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">attoparsec</text>
+</g>
+<!-- wreq&#45;&gt;attoparsec -->
+<g id="edge454" class="edge">
+<title>wreq&#45;&gt;attoparsec</title>
+<path fill="none" stroke="black" d="M3208.04,-1079.91C3205.15,-1069.58 3201.58,-1056.1 3199,-1044 3177.44,-943.01 3160.04,-821.5 3152.73,-767.39"/>
+<polygon fill="black" stroke="black" points="3156.24,-767.25 3151.45,-757.81 3149.3,-768.18 3156.24,-767.25"/>
+</g>
+<!-- authenticate&#45;oauth -->
+<g id="node59" class="node">
+<title>authenticate&#45;oauth</title>
+<ellipse fill="none" stroke="black" cx="3538" cy="-1026" rx="77.51" ry="18"/>
+<text text-anchor="middle" x="3538" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">authenticate&#45;oauth</text>
+</g>
+<!-- wreq&#45;&gt;authenticate&#45;oauth -->
+<g id="edge455" class="edge">
+<title>wreq&#45;&gt;authenticate&#45;oauth</title>
+<path fill="none" stroke="black" d="M3240.43,-1091.09C3291.05,-1080.19 3400.48,-1056.62 3471.59,-1041.3"/>
+<polygon fill="black" stroke="black" points="3472.14,-1044.76 3481.18,-1039.24 3470.67,-1037.92 3472.14,-1044.76"/>
+</g>
+<!-- http&#45;client -->
+<g id="node63" class="node">
+<title>http&#45;client</title>
+<ellipse fill="none" stroke="black" cx="2649" cy="-954" rx="47.57" ry="18"/>
+<text text-anchor="middle" x="2649" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">http&#45;client</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;client -->
+<g id="edge465" class="edge">
+<title>wreq&#45;&gt;http&#45;client</title>
+<path fill="none" stroke="black" d="M3183.8,-1096.47C3091.93,-1094.4 2810.16,-1084.8 2730,-1044 2702.32,-1029.91 2679.47,-1002.17 2665.18,-981.38"/>
+<polygon fill="black" stroke="black" points="2668.13,-979.51 2659.7,-973.09 2662.29,-983.36 2668.13,-979.51"/>
+</g>
+<!-- http&#45;types -->
+<g id="node64" class="node">
+<title>http&#45;types</title>
+<ellipse fill="none" stroke="black" cx="3050" cy="-882" rx="48.07" ry="18"/>
+<text text-anchor="middle" x="3050" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">http&#45;types</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;types -->
+<g id="edge467" class="edge">
+<title>wreq&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M3197.26,-1082.35C3186.55,-1072.05 3172.32,-1057.72 3161,-1044 3123.96,-999.1 3086.75,-942.13 3066.21,-909.39"/>
+<polygon fill="black" stroke="black" points="3069.2,-907.58 3060.94,-900.95 3063.26,-911.29 3069.2,-907.58"/>
+</g>
+<!-- base16&#45;bytestring -->
+<g id="node67" class="node">
+<title>base16&#45;bytestring</title>
+<ellipse fill="none" stroke="black" cx="1972" cy="-810" rx="76.01" ry="18"/>
+<text text-anchor="middle" x="1972" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">base16&#45;bytestring</text>
+</g>
+<!-- wreq&#45;&gt;base16&#45;bytestring -->
+<g id="edge456" class="edge">
+<title>wreq&#45;&gt;base16&#45;bytestring</title>
+<path fill="none" stroke="black" d="M3183.55,-1096.2C3071.97,-1092.47 2665.6,-1072.33 2350,-972 2223.59,-931.82 2081.38,-865.06 2013.02,-831.54"/>
+<polygon fill="black" stroke="black" points="2014.96,-828.59 2004.45,-827.32 2011.87,-834.87 2014.96,-828.59"/>
+</g>
+<!-- cabal&#45;doctest -->
+<g id="node71" class="node">
+<title>cabal&#45;doctest</title>
+<ellipse fill="none" stroke="black" cx="1007" cy="-954" rx="60.54" ry="18"/>
+<text text-anchor="middle" x="1007" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">cabal&#45;doctest</text>
+</g>
+<!-- wreq&#45;&gt;cabal&#45;doctest -->
+<g id="edge458" class="edge">
+<title>wreq&#45;&gt;cabal&#45;doctest</title>
+<path fill="none" stroke="black" d="M3183.68,-1096.35C3041.46,-1093.09 2409.08,-1077.33 1892,-1044 1531.33,-1020.75 1439.04,-1028.07 1082,-972 1075.98,-971.05 1069.73,-969.91 1063.51,-968.66"/>
+<polygon fill="black" stroke="black" points="1064.41,-965.27 1053.9,-966.64 1062.97,-972.12 1064.41,-965.27"/>
+</g>
+<!-- case&#45;insensitive -->
+<g id="node73" class="node">
+<title>case&#45;insensitive</title>
+<ellipse fill="none" stroke="black" cx="2748" cy="-738" rx="68.03" ry="18"/>
+<text text-anchor="middle" x="2748" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">case&#45;insensitive</text>
+</g>
+<!-- wreq&#45;&gt;case&#45;insensitive -->
+<g id="edge459" class="edge">
+<title>wreq&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M3191.91,-1085.13C3174.8,-1075.1 3150.43,-1059.86 3131,-1044 3100.63,-1019.21 2916.72,-813.6 2884,-792 2859.85,-776.06 2830.19,-763.79 2804.73,-755.1"/>
+<polygon fill="black" stroke="black" points="2806.14,-751.88 2795.55,-752.06 2803.95,-758.52 2806.14,-751.88"/>
+</g>
+<!-- crypton -->
+<g id="node76" class="node">
+<title>crypton</title>
+<ellipse fill="none" stroke="black" cx="880" cy="-810" rx="39.59" ry="18"/>
+<text text-anchor="middle" x="880" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">crypton</text>
+</g>
+<!-- wreq&#45;&gt;crypton -->
+<g id="edge461" class="edge">
+<title>wreq&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M3183.54,-1096.68C2976.1,-1094.36 1732.33,-1079.13 1356,-1044 1153.02,-1025.05 1058.48,-1103.85 903,-972 865.21,-939.95 868.42,-876.17 874.18,-839.24"/>
+<polygon fill="black" stroke="black" points="877.57,-840.2 875.83,-829.75 870.67,-839 877.57,-840.2"/>
+</g>
+<!-- memory -->
+<g id="node78" class="node">
+<title>memory</title>
+<ellipse fill="none" stroke="black" cx="683" cy="-738" rx="41.08" ry="18"/>
+<text text-anchor="middle" x="683" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">memory</text>
+</g>
+<!-- wreq&#45;&gt;memory -->
+<g id="edge470" class="edge">
+<title>wreq&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M3183.88,-1097.11C2886.42,-1098.06 410,-1101.56 410,-955 410,-955 410,-955 410,-881 410,-782.34 552.06,-752.13 631.22,-742.95"/>
+<polygon fill="black" stroke="black" points="631.35,-746.46 640.92,-741.91 630.6,-739.5 631.35,-746.46"/>
+</g>
+<!-- mime&#45;types -->
+<g id="node86" class="node">
+<title>mime&#45;types</title>
+<ellipse fill="none" stroke="black" cx="4368" cy="-594" rx="53.56" ry="18"/>
+<text text-anchor="middle" x="4368" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">mime&#45;types</text>
+</g>
+<!-- wreq&#45;&gt;mime&#45;types -->
+<g id="edge471" class="edge">
+<title>wreq&#45;&gt;mime&#45;types</title>
+<path fill="none" stroke="black" d="M3242.4,-1097.29C3407.12,-1098.68 4211.25,-1102.41 4303,-1044 4439.32,-957.22 4365.14,-845.21 4354,-684 4352.9,-668.04 4351.94,-663.87 4354,-648 4355.07,-639.76 4357.04,-630.97 4359.17,-622.97"/>
+<polygon fill="black" stroke="black" points="4362.52,-623.99 4361.91,-613.42 4355.79,-622.07 4362.52,-623.99"/>
+</g>
+<!-- http&#45;client&#45;tls -->
+<g id="node88" class="node">
+<title>http&#45;client&#45;tls</title>
+<ellipse fill="none" stroke="black" cx="2798" cy="-1026" rx="59.05" ry="18"/>
+<text text-anchor="middle" x="2798" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">http&#45;client&#45;tls</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;client&#45;tls -->
+<g id="edge466" class="edge">
+<title>wreq&#45;&gt;http&#45;client&#45;tls</title>
+<path fill="none" stroke="black" d="M3185.13,-1092.3C3119.07,-1081.16 2951.72,-1052.93 2860.17,-1037.49"/>
+<polygon fill="black" stroke="black" points="2860.79,-1034.04 2850.35,-1035.83 2859.62,-1040.94 2860.79,-1034.04"/>
+</g>
+<!-- lens -->
+<g id="node91" class="node">
+<title>lens</title>
+<ellipse fill="none" stroke="black" cx="7161" cy="-954" rx="27" ry="18"/>
+<text text-anchor="middle" x="7161" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">lens</text>
+</g>
+<!-- wreq&#45;&gt;lens -->
+<g id="edge468" class="edge">
+<title>wreq&#45;&gt;lens</title>
+<path fill="none" stroke="black" d="M3242.07,-1096.64C3534.32,-1092.96 5938.11,-1062.3 6255,-1044 6592.81,-1024.5 6999.26,-975.37 7123.27,-959.81"/>
+<polygon fill="black" stroke="black" points="7123.39,-963.32 7132.88,-958.6 7122.52,-956.37 7123.39,-963.32"/>
+</g>
+<!-- lens&#45;aeson -->
+<g id="node94" class="node">
+<title>lens&#45;aeson</title>
+<ellipse fill="none" stroke="black" cx="5271" cy="-1026" rx="49.57" ry="18"/>
+<text text-anchor="middle" x="5271" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">lens&#45;aeson</text>
+</g>
+<!-- wreq&#45;&gt;lens&#45;aeson -->
+<g id="edge469" class="edge">
+<title>wreq&#45;&gt;lens&#45;aeson</title>
+<path fill="none" stroke="black" d="M3242.09,-1096.01C3464.69,-1088.44 4897.79,-1039.69 5210.71,-1029.05"/>
+<polygon fill="black" stroke="black" points="5210.4,-1032.56 5220.28,-1028.73 5210.17,-1025.57 5210.4,-1032.56"/>
+</g>
+<!-- psqueues -->
+<g id="node98" class="node">
+<title>psqueues</title>
+<ellipse fill="none" stroke="black" cx="3638" cy="-666" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="3638" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">psqueues</text>
+</g>
+<!-- wreq&#45;&gt;psqueues -->
+<g id="edge472" class="edge">
+<title>wreq&#45;&gt;psqueues</title>
+<path fill="none" stroke="black" d="M3242.14,-1095.44C3331.89,-1090.34 3599.67,-1072.8 3625,-1044 3635.57,-1031.99 3627.02,-1023.87 3625,-1008 3616.75,-943.33 3590.32,-928.86 3597,-864 3603.29,-802.9 3620.28,-732.81 3630.3,-694.89"/>
+<polygon fill="black" stroke="black" points="3633.57,-696.23 3632.78,-685.67 3626.81,-694.42 3633.57,-696.23"/>
+</g>
+<!-- time&#45;locale&#45;compat -->
+<g id="node100" class="node">
+<title>time&#45;locale&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="3361" cy="-1026" rx="81.5" ry="18"/>
+<text text-anchor="middle" x="3361" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">time&#45;locale&#45;compat</text>
+</g>
+<!-- wreq&#45;&gt;time&#45;locale&#45;compat -->
+<g id="edge476" class="edge">
+<title>wreq&#45;&gt;time&#45;locale&#45;compat</title>
+<path fill="none" stroke="black" d="M3235.8,-1086.22C3257.42,-1075.99 3290.47,-1060.36 3317.19,-1047.72"/>
+<polygon fill="black" stroke="black" points="3318.54,-1050.96 3326.08,-1043.52 3315.55,-1044.63 3318.54,-1050.96"/>
+</g>
+<!-- wreq&#45;examples -->
+<g id="node2" class="node">
+<title>wreq&#45;examples</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="4403" cy="-1170" rx="66.53" ry="18"/>
+<text text-anchor="middle" x="4403" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">wreq&#45;examples</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;wreq -->
+<g id="edge490" class="edge">
+<title>wreq&#45;examples&#45;&gt;wreq</title>
+<path fill="none" stroke="black" d="M4338.6,-1165.21C4122.78,-1152.52 3428.84,-1111.7 3253.53,-1101.38"/>
+<polygon fill="black" stroke="black" points="3253.98,-1097.9 3243.79,-1100.81 3253.57,-1104.89 3253.98,-1097.9"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;ghc&#45;prim -->
+<g id="edge483" class="edge">
+<title>wreq&#45;examples&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M4336.2,-1168.84C3851.35,-1167.58 879.73,-1158.19 482,-1116 281.86,-1094.77 38,-1228.26 38,-1027 38,-1027 38,-1027 38,-665 38,-474.63 534.64,-195.18 718,-144 828.47,-113.17 1648.79,-95.68 1850.36,-91.82"/>
+<polygon fill="black" stroke="black" points="1850.22,-95.32 1860.15,-91.63 1850.08,-88.32 1850.22,-95.32"/>
+</g>
+<!-- mtl -->
+<g id="node8" class="node">
+<title>mtl</title>
+<ellipse fill="none" stroke="black" cx="570" cy="-18" rx="27" ry="18"/>
+<text text-anchor="middle" x="570" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">mtl</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;mtl -->
+<g id="edge486" class="edge">
+<title>wreq&#45;examples&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M4336.12,-1169.15C3794.23,-1170.23 140.11,-1175.29 45,-1116 7.39,-1092.55 0,-1071.32 0,-1027 0,-1027 0,-1027 0,-665 0,-374.67 23.01,-217.92 274,-72 317.3,-46.82 462.01,-29.61 531.76,-22.57"/>
+<polygon fill="black" stroke="black" points="531.97,-26.07 541.58,-21.6 531.28,-19.1 531.97,-26.07"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;bytestring -->
+<g id="edge480" class="edge">
+<title>wreq&#45;examples&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4336.16,-1168.9C3931.81,-1167.89 1830,-1156.39 1830,-1027 1830,-1027 1830,-1027 1830,-881 1830,-649.51 1886.65,-534.94 2094,-432 2125.32,-416.45 2623.71,-390.42 2795.97,-381.84"/>
+<polygon fill="black" stroke="black" points="2795.99,-385.34 2805.8,-381.35 2795.64,-378.35 2795.99,-385.34"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;containers -->
+<g id="edge481" class="edge">
+<title>wreq&#45;examples&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M4469.36,-1168.18C4959.87,-1161.87 8004,-1119.04 8004,-1027 8004,-1027 8004,-1027 8004,-881 8004,-757.17 7856.37,-827.12 7755,-756 7716.91,-729.28 7711.88,-716.93 7679,-684 7632.35,-637.28 7627.89,-618.06 7577,-576 7531.1,-538.06 7517.54,-530.08 7464,-504 7442.39,-493.47 7283.54,-436.85 7260,-432 7121.06,-403.36 6691.51,-386.36 6532.77,-380.92"/>
+<polygon fill="black" stroke="black" points="6532.99,-377.43 6522.88,-380.59 6532.75,-384.42 6532.99,-377.43"/>
+</g>
+<!-- filepath -->
+<g id="node19" class="node">
+<title>filepath</title>
+<ellipse fill="none" stroke="black" cx="1554" cy="-522" rx="37.59" ry="18"/>
+<text text-anchor="middle" x="1554" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">filepath</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;filepath -->
+<g id="edge482" class="edge">
+<title>wreq&#45;examples&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M4336.59,-1168.32C3804.37,-1162.73 251.13,-1122.5 176,-1044 -232.37,-617.31 1217.26,-536.48 1505.17,-524.74"/>
+<polygon fill="black" stroke="black" points="1505.1,-528.24 1514.95,-524.35 1504.82,-521.25 1505.1,-528.24"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;text -->
+<g id="edge489" class="edge">
+<title>wreq&#45;examples&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4462.53,-1161.62C4516.22,-1153.6 4589.37,-1138.79 4607,-1116 4616.79,-1103.34 4613.12,-1094.78 4607,-1080 4563.7,-975.47 4337.8,-787.49 4247,-720 4219.87,-699.83 4206.99,-704.36 4180,-684 4144.37,-657.12 4135.43,-648.68 4110,-612 4096.7,-592.81 4085.63,-568.75 4078.2,-550.49"/>
+<polygon fill="black" stroke="black" points="4081.53,-549.39 4074.61,-541.37 4075.02,-551.96 4081.53,-549.39"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;aeson -->
+<g id="edge478" class="edge">
+<title>wreq&#45;examples&#45;&gt;aeson</title>
+<path fill="none" stroke="black" d="M4467.23,-1164.82C4656.65,-1151.85 5210.18,-1109.22 5378,-1044 5430.4,-1023.64 5443.29,-1012.77 5482,-972 5499.46,-953.61 5514.23,-928.81 5524.06,-910.06"/>
+<polygon fill="black" stroke="black" points="5527.17,-911.67 5528.57,-901.16 5520.92,-908.5 5527.17,-911.67"/>
+</g>
+<!-- ansi&#45;wl&#45;pprint -->
+<g id="node55" class="node">
+<title>ansi&#45;wl&#45;pprint</title>
+<ellipse fill="none" stroke="black" cx="4536" cy="-1098" rx="61.54" ry="18"/>
+<text text-anchor="middle" x="4536" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">ansi&#45;wl&#45;pprint</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;ansi&#45;wl&#45;pprint -->
+<g id="edge479" class="edge">
+<title>wreq&#45;examples&#45;&gt;ansi&#45;wl&#45;pprint</title>
+<path fill="none" stroke="black" d="M4432.52,-1153.46C4451.5,-1143.47 4476.39,-1130.38 4496.99,-1119.53"/>
+<polygon fill="black" stroke="black" points="4498.46,-1122.71 4505.68,-1114.96 4495.2,-1116.52 4498.46,-1122.71"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;lens -->
+<g id="edge484" class="edge">
+<title>wreq&#45;examples&#45;&gt;lens</title>
+<path fill="none" stroke="black" d="M4469.35,-1168.64C4764.35,-1166.81 5958.63,-1156.95 6331,-1116 6642.03,-1081.79 7010.61,-992.91 7125.21,-964.14"/>
+<polygon fill="black" stroke="black" points="7125.8,-967.6 7134.64,-961.76 7124.08,-960.81 7125.8,-967.6"/>
+</g>
+<!-- wreq&#45;examples&#45;&gt;lens&#45;aeson -->
+<g id="edge485" class="edge">
+<title>wreq&#45;examples&#45;&gt;lens&#45;aeson</title>
+<path fill="none" stroke="black" d="M4458.95,-1159.85C4615.77,-1134.19 5058.34,-1061.79 5215.1,-1036.14"/>
+<polygon fill="black" stroke="black" points="5215.53,-1039.62 5224.83,-1034.55 5214.4,-1032.71 5215.53,-1039.62"/>
+</g>
+<!-- optparse&#45;applicative -->
+<g id="node95" class="node">
+<title>optparse&#45;applicative</title>
+<ellipse fill="none" stroke="black" cx="3800" cy="-882" rx="85.49" ry="18"/>
+<text text-anchor="middle" x="3800" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">optparse&#45;applicative</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;optparse&#45;applicative -->
+<g id="edge487" class="edge">
+<title>wreq&#45;examples&#45;&gt;optparse&#45;applicative</title>
+<path fill="none" stroke="black" d="M4404.42,-1151.81C4407.01,-1107.89 4407.04,-991.12 4341,-936 4302.75,-904.07 3943.41,-906.44 3894,-900 3886.9,-899.07 3879.52,-897.98 3872.16,-896.79"/>
+<polygon fill="black" stroke="black" points="3872.98,-893.38 3862.54,-895.19 3871.83,-900.29 3872.98,-893.38"/>
+</g>
+<!-- tagsoup -->
+<g id="node99" class="node">
+<title>tagsoup</title>
+<ellipse fill="none" stroke="black" cx="3532" cy="-594" rx="40.09" ry="18"/>
+<text text-anchor="middle" x="3532" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">tagsoup</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;tagsoup -->
+<g id="edge488" class="edge">
+<title>wreq&#45;examples&#45;&gt;tagsoup</title>
+<path fill="none" stroke="black" d="M4337.78,-1166.06C4195.46,-1155.74 3857.63,-1109.28 3706,-900 3640.2,-809.18 3761.06,-737.13 3693,-648 3667.43,-614.51 3620.09,-601.9 3583.34,-597.3"/>
+<polygon fill="black" stroke="black" points="3584.13,-593.86 3573.82,-596.27 3583.38,-600.82 3584.13,-593.86"/>
+</g>
+<!-- contravariant -->
+<g id="node3" class="node">
+<title>contravariant</title>
+<ellipse fill="none" stroke="black" cx="8874" cy="-18" rx="58.55" ry="18"/>
+<text text-anchor="middle" x="8874" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">contravariant</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types -->
+<g id="node4" class="node">
+<title>crypto&#45;pubkey&#45;types</title>
+<ellipse fill="none" stroke="black" cx="9039" cy="-18" rx="88.49" ry="18"/>
+<text text-anchor="middle" x="9039" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">crypto&#45;pubkey&#45;types</text>
+</g>
+<!-- ghc&#45;bignum -->
+<g id="node5" class="node">
+<title>ghc&#45;bignum</title>
+<polygon fill="none" stroke="black" points="1136,-180 1054,-180 1054,-144 1136,-144 1136,-180"/>
+<text text-anchor="middle" x="1095" y="-156.57" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;bignum</text>
+</g>
+<!-- ghc&#45;bignum&#45;&gt;ghc&#45;prim -->
+<g id="edge169" class="edge">
+<title>ghc&#45;bignum&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1136.49,-147.08C1141.01,-145.89 1145.58,-144.83 1150,-144 1412.14,-94.84 1733.97,-90.46 1850.36,-90.64"/>
+<polygon fill="black" stroke="black" points="1850.09,-94.14 1860.1,-90.67 1850.11,-87.14 1850.09,-94.14"/>
+</g>
+<!-- ghc&#45;internal -->
+<g id="node6" class="node">
+<title>ghc&#45;internal</title>
+<polygon fill="none" stroke="black" points="1032.25,-252 951.75,-252 951.75,-216 1032.25,-216 1032.25,-252"/>
+<text text-anchor="middle" x="992" y="-228.57" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;internal</text>
+</g>
+<!-- ghc&#45;internal&#45;&gt;ghc&#45;bignum -->
+<g id="edge170" class="edge">
+<title>ghc&#45;internal&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M1017.73,-215.52C1030.6,-206.76 1046.38,-196.04 1060.31,-186.58"/>
+<polygon fill="black" stroke="black" points="1062.05,-189.63 1068.35,-181.11 1058.11,-183.84 1062.05,-189.63"/>
+</g>
+<!-- ghc&#45;internal&#45;&gt;ghc&#45;prim -->
+<g id="edge171" class="edge">
+<title>ghc&#45;internal&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M996.85,-215.75C1003.75,-194.75 1018.6,-160.11 1045,-144 1113.98,-101.9 1685.08,-93.05 1850.35,-91.37"/>
+<polygon fill="black" stroke="black" points="1850.06,-94.87 1860.03,-91.27 1849.99,-87.87 1850.06,-94.87"/>
+</g>
+<!-- rts -->
+<g id="node9" class="node">
+<title>rts</title>
+<polygon fill="none" stroke="black" points="1445,-36 1391,-36 1391,0 1445,0 1445,-36"/>
+<text text-anchor="middle" x="1418" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">rts</text>
+</g>
+<!-- ghc&#45;internal&#45;&gt;rts -->
+<g id="edge172" class="edge">
+<title>ghc&#45;internal&#45;&gt;rts</title>
+<path fill="none" stroke="black" d="M990.39,-215.65C989.54,-195.85 991.35,-163.67 1009,-144 1106.99,-34.83 1297.33,-19.71 1379.12,-18.5"/>
+<polygon fill="black" stroke="black" points="1379.12,-22 1389.09,-18.43 1379.06,-15 1379.12,-22"/>
+</g>
+<!-- ghc&#45;prim&#45;&gt;rts -->
+<g id="edge173" class="edge">
+<title>ghc&#45;prim&#45;&gt;rts</title>
+<path fill="none" stroke="black" d="M1861.46,-84.08C1775.52,-71.47 1547.82,-38.05 1456.59,-24.66"/>
+<polygon fill="black" stroke="black" points="1457.31,-21.23 1446.91,-23.24 1456.29,-28.16 1457.31,-21.23"/>
+</g>
+<!-- stm -->
+<g id="node10" class="node">
+<title>stm</title>
+<ellipse fill="none" stroke="black" cx="190" cy="-18" rx="27" ry="18"/>
+<text text-anchor="middle" x="190" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">stm</text>
+</g>
+<!-- template&#45;haskell&#45;&gt;ghc&#45;prim -->
+<g id="edge392" class="edge">
+<title>template&#45;haskell&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M5698.75,-287.54C5649.47,-266.5 5561.81,-231.99 5483,-216 4997.64,-117.5 4865.8,-165.3 4371,-144 3388.36,-101.69 2184.83,-92.68 1939.78,-91.24"/>
+<polygon fill="black" stroke="black" points="1940.05,-87.74 1930.03,-91.18 1940.01,-94.74 1940.05,-87.74"/>
+</g>
+<!-- pretty -->
+<g id="node21" class="node">
+<title>pretty</title>
+<ellipse fill="none" stroke="black" cx="1547" cy="-234" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="1547" y="-228.57" font-family="Times New Roman,serif" font-size="14.00">pretty</text>
+</g>
+<!-- template&#45;haskell&#45;&gt;pretty -->
+<g id="edge393" class="edge">
+<title>template&#45;haskell&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M5685.39,-304.12C5232.92,-296.56 2004.6,-242.64 1590.65,-235.73"/>
+<polygon fill="black" stroke="black" points="1590.8,-232.23 1580.75,-235.56 1590.69,-239.23 1590.8,-232.23"/>
+</g>
+<!-- Cabal&#45;&gt;mtl -->
+<g id="edge8" class="edge">
+<title>Cabal&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M1732.18,-869.44C1726.66,-867.24 1720.72,-865.24 1715,-864 1478.12,-812.76 853.15,-909.75 625,-828 415.54,-752.95 228,-745.5 228,-523 228,-523 228,-523 228,-161 228,-95.55 444.34,-44.39 532.89,-26.18"/>
+<polygon fill="black" stroke="black" points="533.42,-29.65 542.53,-24.23 532.03,-22.79 533.42,-29.65"/>
+</g>
+<!-- Cabal&#45;syntax -->
+<g id="node13" class="node">
+<title>Cabal&#45;syntax</title>
+<ellipse fill="none" stroke="black" cx="2239" cy="-810" rx="59.05" ry="18"/>
+<text text-anchor="middle" x="2239" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">Cabal&#45;syntax</text>
+</g>
+<!-- Cabal&#45;&gt;Cabal&#45;syntax -->
+<g id="edge1" class="edge">
+<title>Cabal&#45;&gt;Cabal&#45;syntax</title>
+<path fill="none" stroke="black" d="M1786.88,-876.71C1850.65,-867.83 2001.51,-846.7 2128,-828 2143.6,-825.69 2160.42,-823.15 2176.13,-820.75"/>
+<polygon fill="black" stroke="black" points="2176.49,-824.23 2185.85,-819.26 2175.43,-817.31 2176.49,-824.23"/>
+</g>
+<!-- Win32 -->
+<g id="node14" class="node">
+<title>Win32</title>
+<ellipse fill="none" stroke="black" cx="1699" cy="-594" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="1699" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">Win32</text>
+</g>
+<!-- Cabal&#45;&gt;Win32 -->
+<g id="edge2" class="edge">
+<title>Cabal&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1758.01,-863.83C1760.99,-834.11 1765.13,-771.36 1754,-720 1746.26,-684.27 1727.89,-646.24 1714.5,-621.64"/>
+<polygon fill="black" stroke="black" points="1717.6,-620 1709.68,-612.97 1711.49,-623.41 1717.6,-620"/>
+</g>
+<!-- Cabal&#45;&gt;bytestring -->
+<g id="edge3" class="edge">
+<title>Cabal&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1788.07,-878.95C1856.64,-874 2014.66,-859.43 2057,-828 2128.98,-774.57 2093.1,-718.86 2148,-648 2237.11,-532.98 2261.01,-491.01 2394,-432 2464.72,-400.62 2689.15,-386.47 2796.16,-381.37"/>
+<polygon fill="black" stroke="black" points="2796.04,-384.88 2805.87,-380.92 2795.72,-377.89 2796.04,-384.88"/>
+</g>
+<!-- Cabal&#45;&gt;containers -->
+<g id="edge4" class="edge">
+<title>Cabal&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1788.32,-880.13C1888.31,-877.44 2201.5,-869.18 2461,-864 2587.32,-861.48 4611.95,-856.69 4735,-828 4771.4,-819.51 4774.7,-800.9 4811,-792 5012.73,-742.54 5545.03,-812.16 5745,-756 5776.61,-747.12 5845.85,-700.88 5874,-684 5899.37,-668.78 5903.12,-660.37 5930,-648 5980.58,-624.72 6001.82,-639.9 6050,-612 6070.13,-600.34 6067.95,-587.8 6088,-576 6133.79,-549.04 6158.21,-570.09 6202,-540 6252.57,-505.25 6236.97,-466.07 6288,-432 6326.44,-406.34 6377.36,-392.93 6416.05,-386.03"/>
+<polygon fill="black" stroke="black" points="6416.35,-389.53 6425.63,-384.42 6415.19,-382.63 6416.35,-389.53"/>
+</g>
+<!-- deepseq -->
+<g id="node17" class="node">
+<title>deepseq</title>
+<ellipse fill="none" stroke="black" cx="4320" cy="-162" rx="41.58" ry="18"/>
+<text text-anchor="middle" x="4320" y="-156.57" font-family="Times New Roman,serif" font-size="14.00">deepseq</text>
+</g>
+<!-- Cabal&#45;&gt;deepseq -->
+<g id="edge5" class="edge">
+<title>Cabal&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1731.64,-869.71C1726.25,-867.55 1720.5,-865.5 1715,-864 1658.71,-848.7 1495.69,-869.8 1455,-828 1327.08,-696.58 1374.24,-331.07 1506,-216 1560.03,-168.82 3883.74,-163.6 4266.8,-163.06"/>
+<polygon fill="black" stroke="black" points="4266.57,-166.56 4276.56,-163.05 4266.56,-159.56 4266.57,-166.56"/>
+</g>
+<!-- directory -->
+<g id="node18" class="node">
+<title>directory</title>
+<ellipse fill="none" stroke="black" cx="1668" cy="-738" rx="44.08" ry="18"/>
+<text text-anchor="middle" x="1668" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">directory</text>
+</g>
+<!-- Cabal&#45;&gt;directory -->
+<g id="edge6" class="edge">
+<title>Cabal&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1745.91,-864.71C1730.8,-840.34 1702.17,-794.14 1684.14,-765.05"/>
+<polygon fill="black" stroke="black" points="1687.29,-763.48 1679.05,-756.82 1681.34,-767.17 1687.29,-763.48"/>
+</g>
+<!-- Cabal&#45;&gt;filepath -->
+<g id="edge7" class="edge">
+<title>Cabal&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1731.58,-869.91C1726.2,-867.73 1720.47,-865.63 1715,-864 1631.79,-839.24 1578.45,-894.81 1523,-828 1455.62,-746.81 1511.17,-608.49 1539.68,-550.19"/>
+<polygon fill="black" stroke="black" points="1542.78,-551.81 1544.14,-541.3 1536.52,-548.67 1542.78,-551.81"/>
+</g>
+<!-- parsec -->
+<g id="node20" class="node">
+<title>parsec</title>
+<ellipse fill="none" stroke="black" cx="2365" cy="-594" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="2365" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">parsec</text>
+</g>
+<!-- Cabal&#45;&gt;parsec -->
+<g id="edge9" class="edge">
+<title>Cabal&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M1788.1,-880.04C1899.91,-876.42 2267.55,-862 2307,-828 2307.25,-827.79 2342.71,-684.88 2358.06,-623.01"/>
+<polygon fill="black" stroke="black" points="2361.38,-624.13 2360.39,-613.58 2354.59,-622.45 2361.38,-624.13"/>
+</g>
+<!-- Cabal&#45;&gt;pretty -->
+<g id="edge10" class="edge">
+<title>Cabal&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M1732.18,-869.47C1726.66,-867.27 1720.72,-865.26 1715,-864 1667,-853.42 865.04,-863.46 831,-828 704.79,-696.55 1358.32,-335.61 1514.21,-252.31"/>
+<polygon fill="black" stroke="black" points="1515.64,-255.52 1522.82,-247.73 1512.35,-249.34 1515.64,-255.52"/>
+</g>
+<!-- process -->
+<g id="node22" class="node">
+<title>process</title>
+<ellipse fill="none" stroke="black" cx="1572" cy="-810" rx="40.09" ry="18"/>
+<text text-anchor="middle" x="1572" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">process</text>
+</g>
+<!-- Cabal&#45;&gt;process -->
+<g id="edge11" class="edge">
+<title>Cabal&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M1730.91,-870.42C1725.67,-868.26 1720.16,-866.03 1715,-864 1681.06,-850.68 1642.25,-836.35 1613.63,-825.96"/>
+<polygon fill="black" stroke="black" points="1614.83,-822.67 1604.24,-822.55 1612.45,-829.25 1614.83,-822.67"/>
+</g>
+<!-- Cabal&#45;&gt;time -->
+<g id="edge12" class="edge">
+<title>Cabal&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M1788.2,-880.39C1914.43,-877.75 2387.55,-865.78 2775,-828 2999.33,-806.12 3060.78,-819.65 3277,-756 3337.92,-738.07 3404.22,-704.25 3441.4,-683.86"/>
+<polygon fill="black" stroke="black" points="3442.71,-687.14 3449.76,-679.23 3439.31,-681.02 3442.71,-687.14"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;mtl -->
+<g id="edge19" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M2210.2,-793.89C2112.48,-742.63 1799.38,-578.4 1794,-576 1710.39,-538.69 1689.03,-529.13 1601,-504 1212.1,-392.97 1024.53,-577 709,-324 681.68,-302.09 689.25,-284.81 677,-252 647.74,-173.63 664.74,-143.91 622,-72 614.94,-60.12 604.68,-48.9 595.13,-39.87"/>
+<polygon fill="black" stroke="black" points="597.57,-37.35 587.8,-33.24 592.87,-42.54 597.57,-37.35"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;bytestring -->
+<g id="edge14" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2241.97,-791.6C2253.87,-728.08 2304.67,-508.45 2449,-432 2507.86,-400.82 2698.43,-386.86 2795.71,-381.64"/>
+<polygon fill="black" stroke="black" points="2795.78,-385.14 2805.58,-381.12 2795.42,-378.15 2795.78,-385.14"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;containers -->
+<g id="edge15" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2298.28,-808.35C2742.6,-803.46 5535.51,-772.1 5575,-756 5596.54,-747.22 5592.2,-730.43 5613,-720 5696.86,-677.94 5731.53,-712.23 5821,-684 5838.92,-678.35 5957.59,-621.15 5974,-612 6101.89,-540.65 6115.43,-489.79 6250,-432 6304.27,-408.69 6370.57,-394.6 6416.71,-386.87"/>
+<polygon fill="black" stroke="black" points="6417.18,-390.33 6426.49,-385.28 6416.06,-383.42 6417.18,-390.33"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;deepseq -->
+<g id="edge16" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2239.31,-791.8C2239.87,-773.78 2241.48,-744.7 2246,-720 2264.67,-618.03 2275.39,-589.5 2334,-504 2480.09,-290.89 2588.26,-278.38 2839,-216 2979.55,-181.03 4018.67,-166.57 4266.87,-163.6"/>
+<polygon fill="black" stroke="black" points="4266.61,-167.1 4276.57,-163.48 4266.53,-160.1 4266.61,-167.1"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;directory -->
+<g id="edge17" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M2185.02,-802.38C2075.86,-789 1830.01,-758.86 1721.36,-745.54"/>
+<polygon fill="black" stroke="black" points="1721.89,-742.08 1711.54,-744.34 1721.04,-749.03 1721.89,-742.08"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;filepath -->
+<g id="edge18" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M2194.54,-797.91C2159.49,-788.54 2109.74,-773.8 2068,-756 1916.12,-691.22 1895.75,-638.71 1743,-576 1695.47,-556.49 1638.38,-541.57 1599.46,-532.61"/>
+<polygon fill="black" stroke="black" points="1600.25,-529.2 1589.73,-530.41 1598.71,-536.03 1600.25,-529.2"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;parsec -->
+<g id="edge20" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M2249.1,-791.85C2271.05,-754.57 2323.23,-665.94 2349.43,-621.44"/>
+<polygon fill="black" stroke="black" points="2352.38,-623.34 2354.43,-612.94 2346.34,-619.79 2352.38,-623.34"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;pretty -->
+<g id="edge21" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M2221,-792.65C2165.83,-742.62 2001.19,-593.88 1974,-576 1911.55,-534.92 1891.95,-530.36 1822,-504 1767.5,-483.46 1742.71,-502.78 1696,-468 1622.91,-413.57 1576.3,-311.79 1557.08,-262.78"/>
+<polygon fill="black" stroke="black" points="1560.36,-261.56 1553.52,-253.47 1553.82,-264.06 1560.36,-261.56"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;time -->
+<g id="edge23" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M2298.14,-807.85C2480.34,-803.99 3031.39,-789.76 3207,-756 3252.39,-747.27 3377.13,-701.98 3437.46,-679.58"/>
+<polygon fill="black" stroke="black" points="3438.37,-682.97 3446.52,-676.2 3435.93,-676.41 3438.37,-682.97"/>
+</g>
+<!-- binary -->
+<g id="node24" class="node">
+<title>binary</title>
+<ellipse fill="none" stroke="black" cx="5314" cy="-450" rx="33.6" ry="18"/>
+<text text-anchor="middle" x="5314" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">binary</text>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;binary -->
+<g id="edge13" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M2297.89,-807.77C2721.81,-798.75 5292.65,-741.71 5347,-684 5400.51,-627.18 5355.77,-525.4 5329.63,-477.41"/>
+<polygon fill="black" stroke="black" points="5332.75,-475.82 5324.81,-468.81 5326.64,-479.24 5332.75,-475.82"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;text -->
+<g id="edge22" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2286.21,-798.76C2365.53,-781.66 2530.68,-746.56 2671,-720 2855.79,-685.02 2901.32,-670.88 3088,-648 3197.03,-634.64 3482.13,-659.87 3581,-612 3600.54,-602.54 3594.67,-585.88 3614,-576 3623.27,-571.26 3922.5,-538.67 4030.01,-527.08"/>
+<polygon fill="black" stroke="black" points="4030.19,-530.58 4039.76,-526.03 4029.44,-523.62 4030.19,-530.58"/>
+</g>
+<!-- Win32&#45;&gt;filepath -->
+<g id="edge36" class="edge">
+<title>Win32&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1674.07,-580.97C1650.87,-569.77 1616.04,-552.95 1589.85,-540.31"/>
+<polygon fill="black" stroke="black" points="1591.47,-537.2 1580.94,-536 1588.42,-543.5 1591.47,-537.2"/>
+</g>
+<!-- os&#45;string -->
+<g id="node31" class="node">
+<title>os&#45;string</title>
+<ellipse fill="none" stroke="black" cx="1748" cy="-450" rx="43.08" ry="18"/>
+<text text-anchor="middle" x="1748" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">os&#45;string</text>
+</g>
+<!-- Win32&#45;&gt;os&#45;string -->
+<g id="edge37" class="edge">
+<title>Win32&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M1704.91,-575.87C1713.22,-551.78 1728.47,-507.6 1738.42,-478.77"/>
+<polygon fill="black" stroke="black" points="1741.62,-480.21 1741.57,-469.62 1735,-477.93 1741.62,-480.21"/>
+</g>
+<!-- bytestring&#45;&gt;ghc&#45;prim -->
+<g id="edge107" class="edge">
+<title>bytestring&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2817.58,-366.14C2668.08,-321.55 2101.79,-152.67 1939.01,-104.12"/>
+<polygon fill="black" stroke="black" points="1940.47,-100.91 1929.89,-101.4 1938.47,-107.62 1940.47,-100.91"/>
+</g>
+<!-- bytestring&#45;&gt;template&#45;haskell -->
+<g id="edge108" class="edge">
+<title>bytestring&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M2901.06,-375.86C3238.29,-367.67 5285.04,-317.99 5674.15,-308.55"/>
+<polygon fill="black" stroke="black" points="5674.01,-312.05 5683.93,-308.31 5673.84,-305.06 5674.01,-312.05"/>
+</g>
+<!-- bytestring&#45;&gt;deepseq -->
+<g id="edge106" class="edge">
+<title>bytestring&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2880.45,-362.87C2943.59,-329.94 3108.98,-248.47 3258,-216 3453.57,-173.39 4079.83,-164.94 4266.8,-163.35"/>
+<polygon fill="black" stroke="black" points="4266.73,-166.85 4276.71,-163.27 4266.68,-159.85 4266.73,-166.85"/>
+</g>
+<!-- containers&#45;&gt;template&#45;haskell -->
+<g id="edge123" class="edge">
+<title>containers&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M6426.18,-372.54C6299.04,-360.43 5947.13,-326.92 5801.92,-313.09"/>
+<polygon fill="black" stroke="black" points="5802.39,-309.62 5792.1,-312.15 5801.72,-316.58 5802.39,-309.62"/>
+</g>
+<!-- containers&#45;&gt;deepseq -->
+<g id="edge122" class="edge">
+<title>containers&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6449.42,-361.89C6395.04,-328.03 6255.59,-246.6 6126,-216 5951.82,-174.87 4652.87,-164.95 4373.02,-163.28"/>
+<polygon fill="black" stroke="black" points="4373.14,-159.78 4363.12,-163.23 4373.1,-166.78 4373.14,-159.78"/>
+</g>
+<!-- deepseq&#45;&gt;ghc&#45;prim -->
+<g id="edge143" class="edge">
+<title>deepseq&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M4278.42,-159.8C3986.07,-151.36 2242.27,-101.02 1939.72,-92.29"/>
+<polygon fill="black" stroke="black" points="1939.99,-88.8 1929.89,-92.01 1939.79,-95.79 1939.99,-88.8"/>
+</g>
+<!-- directory&#45;&gt;Win32 -->
+<g id="edge144" class="edge">
+<title>directory&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1671.8,-719.59C1677.06,-695.5 1686.61,-651.75 1692.88,-623.03"/>
+<polygon fill="black" stroke="black" points="1696.23,-624.11 1694.94,-613.59 1689.39,-622.61 1696.23,-624.11"/>
+</g>
+<!-- directory&#45;&gt;filepath -->
+<g id="edge145" class="edge">
+<title>directory&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1659.05,-720.21C1639.37,-683.25 1592.15,-594.61 1568.3,-549.84"/>
+<polygon fill="black" stroke="black" points="1571.41,-548.23 1563.62,-541.05 1565.23,-551.52 1571.41,-548.23"/>
+</g>
+<!-- directory&#45;&gt;time -->
+<g id="edge147" class="edge">
+<title>directory&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M1711.68,-735.3C1960.64,-725.64 3197.76,-677.61 3432.51,-668.49"/>
+<polygon fill="black" stroke="black" points="3432.47,-672 3442.32,-668.11 3432.19,-665 3432.47,-672"/>
+</g>
+<!-- directory&#45;&gt;os&#45;string -->
+<g id="edge146" class="edge">
+<title>directory&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M1681.72,-720.53C1699.7,-697.79 1730.45,-654.74 1743,-612 1756.14,-567.27 1754.29,-512.53 1751.4,-479.78"/>
+<polygon fill="black" stroke="black" points="1754.88,-479.48 1750.41,-469.87 1747.92,-480.17 1754.88,-479.48"/>
+</g>
+<!-- filepath&#45;&gt;template&#45;haskell -->
+<g id="edge158" class="edge">
+<title>filepath&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M1573.09,-506.15C1599.36,-486.42 1648.76,-451.76 1696,-432 1824.09,-378.41 1862.21,-377.09 2000,-360 2378.26,-313.1 5209.87,-307.64 5673.79,-307.06"/>
+<polygon fill="black" stroke="black" points="5673.75,-310.57 5683.74,-307.05 5673.74,-303.57 5673.75,-310.57"/>
+</g>
+<!-- filepath&#45;&gt;bytestring -->
+<g id="edge154" class="edge">
+<title>filepath&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1589.64,-515.69C1638.04,-507.95 1726.9,-491.84 1800,-468 1837.45,-455.79 1842.7,-441.22 1881,-432 2056.02,-389.85 2612.52,-381.15 2795.25,-379.42"/>
+<polygon fill="black" stroke="black" points="2795.25,-382.92 2805.22,-379.33 2795.19,-375.92 2795.25,-382.92"/>
+</g>
+<!-- filepath&#45;&gt;deepseq -->
+<g id="edge155" class="edge">
+<title>filepath&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1557.1,-503.71C1561.25,-484.55 1570.1,-453.51 1587,-432 1736.76,-241.29 1847.71,-248.48 2088,-216 2309.96,-186 3950.71,-166.97 4267.24,-163.55"/>
+<polygon fill="black" stroke="black" points="4266.88,-167.06 4276.85,-163.45 4266.81,-160.06 4266.88,-167.06"/>
+</g>
+<!-- filepath&#45;&gt;os&#45;string -->
+<g id="edge157" class="edge">
+<title>filepath&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M1583.46,-510.37C1615.98,-498.64 1668.58,-479.66 1705.54,-466.32"/>
+<polygon fill="black" stroke="black" points="1706.35,-469.75 1714.57,-463.06 1703.98,-463.16 1706.35,-469.75"/>
+</g>
+<!-- filepath&#45;&gt;exceptions -->
+<g id="edge156" class="edge">
+<title>filepath&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M1516.14,-520.24C1411.25,-517.67 1108.27,-507.16 860,-468 743.53,-449.63 609.61,-413.46 539.53,-393.35"/>
+<polygon fill="black" stroke="black" points="540.87,-390.09 530.3,-390.68 538.93,-396.82 540.87,-390.09"/>
+</g>
+<!-- parsec&#45;&gt;mtl -->
+<g id="edge312" class="edge">
+<title>parsec&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M2336.63,-582.95C2254.65,-554.33 2009.92,-471.93 1800,-432 1639.86,-401.54 1594.96,-427.39 1435,-396 1379.94,-385.2 1369.14,-370.35 1314,-360 1217.8,-341.95 959.94,-372.65 875,-324 756.23,-255.98 804.81,-157.58 698,-72 670.9,-50.29 633.66,-36.21 606.33,-28.06"/>
+<polygon fill="black" stroke="black" points="607.31,-24.7 596.74,-25.34 605.4,-31.43 607.31,-24.7"/>
+</g>
+<!-- parsec&#45;&gt;bytestring -->
+<g id="edge311" class="edge">
+<title>parsec&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2373.43,-576.11C2391.26,-542.37 2436.28,-466.85 2498,-432 2547.86,-403.84 2708.79,-388.84 2796.2,-382.58"/>
+<polygon fill="black" stroke="black" points="2796.27,-386.09 2806,-381.9 2795.78,-379.11 2796.27,-386.09"/>
+</g>
+<!-- parsec&#45;&gt;text -->
+<g id="edge313" class="edge">
+<title>parsec&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2400.18,-591.55C2619.71,-582.53 3799.72,-534.03 4029.28,-524.59"/>
+<polygon fill="black" stroke="black" points="4029.32,-528.09 4039.17,-524.18 4029.04,-521.1 4029.32,-528.09"/>
+</g>
+<!-- pretty&#45;&gt;ghc&#45;prim -->
+<g id="edge315" class="edge">
+<title>pretty&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1550.92,-215.91C1556.56,-195.41 1569.03,-161.61 1593,-144 1633.21,-114.45 1776.48,-99.76 1850.31,-94.01"/>
+<polygon fill="black" stroke="black" points="1850.32,-97.52 1860.02,-93.28 1849.79,-90.54 1850.32,-97.52"/>
+</g>
+<!-- pretty&#45;&gt;deepseq -->
+<g id="edge314" class="edge">
+<title>pretty&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1575.95,-225.8C1592.05,-222.14 1612.51,-218.04 1631,-216 2169.1,-156.74 3938.49,-161.35 4267.2,-162.74"/>
+<polygon fill="black" stroke="black" points="4266.75,-166.24 4276.76,-162.79 4266.78,-159.24 4266.75,-166.24"/>
+</g>
+<!-- process&#45;&gt;Win32 -->
+<g id="edge324" class="edge">
+<title>process&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1579.39,-791.9C1587.45,-773.71 1601.08,-744.26 1615,-720 1635.56,-684.16 1662.75,-644.94 1680.54,-620.17"/>
+<polygon fill="black" stroke="black" points="1683.18,-622.49 1686.21,-612.33 1677.51,-618.38 1683.18,-622.49"/>
+</g>
+<!-- process&#45;&gt;deepseq -->
+<g id="edge325" class="edge">
+<title>process&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1562.25,-792.12C1536.56,-745.41 1471.39,-610.83 1507,-504 1569.52,-316.45 1653.26,-260.01 1846,-216 2089.31,-160.44 3929.27,-162.08 4266.87,-162.85"/>
+<polygon fill="black" stroke="black" points="4266.72,-166.35 4276.73,-162.87 4266.74,-159.35 4266.72,-166.35"/>
+</g>
+<!-- process&#45;&gt;directory -->
+<g id="edge326" class="edge">
+<title>process&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1592.36,-794.15C1605.54,-784.54 1622.95,-771.85 1637.74,-761.07"/>
+<polygon fill="black" stroke="black" points="1639.77,-763.92 1645.78,-755.2 1635.64,-758.26 1639.77,-763.92"/>
+</g>
+<!-- process&#45;&gt;filepath -->
+<g id="edge327" class="edge">
+<title>process&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1570.9,-791.54C1567.89,-743.76 1559.51,-610.51 1555.8,-551.61"/>
+<polygon fill="black" stroke="black" points="1559.3,-551.5 1555.18,-541.74 1552.31,-551.94 1559.3,-551.5"/>
+</g>
+<!-- time&#45;&gt;Win32 -->
+<g id="edge416" class="edge">
+<title>time&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M3443.88,-663.93C3244.24,-656.04 2003.03,-607.01 1745.68,-596.84"/>
+<polygon fill="black" stroke="black" points="1745.82,-593.35 1735.69,-596.45 1745.54,-600.34 1745.82,-593.35"/>
+</g>
+<!-- time&#45;&gt;deepseq -->
+<g id="edge417" class="edge">
+<title>time&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3470.12,-647.54C3469.47,-629.54 3469.13,-600.71 3472,-576 3478.58,-519.45 3500,-507.93 3500,-451 3500,-451 3500,-451 3500,-305 3500,-226.76 4087.12,-179.26 4267.76,-166.49"/>
+<polygon fill="black" stroke="black" points="4267.81,-170 4277.55,-165.81 4267.33,-163.01 4267.81,-170"/>
+</g>
+<!-- binary&#45;&gt;bytestring -->
+<g id="edge100" class="edge">
+<title>binary&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5280.18,-448.03C5189.47,-445.43 4933.21,-438.08 4720,-432 4007.53,-411.69 3142.04,-387.16 2912.27,-380.65"/>
+<polygon fill="black" stroke="black" points="2912.48,-377.16 2902.38,-380.37 2912.28,-384.15 2912.48,-377.16"/>
+</g>
+<!-- binary&#45;&gt;containers -->
+<g id="edge101" class="edge">
+<title>binary&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M5347.44,-446.98C5508.53,-437.25 6205.4,-395.16 6413.87,-382.57"/>
+<polygon fill="black" stroke="black" points="6413.88,-386.08 6423.65,-381.98 6413.46,-379.09 6413.88,-386.08"/>
+</g>
+<!-- text&#45;&gt;ghc&#45;prim -->
+<g id="edge397" class="edge">
+<title>text&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M4044.59,-512.77C3912.29,-466.65 3243.93,-238.94 2678,-144 2400.04,-97.37 2060.03,-91.49 1939.75,-90.95"/>
+<polygon fill="black" stroke="black" points="1940,-87.46 1929.99,-90.92 1939.97,-94.46 1940,-87.46"/>
+</g>
+<!-- text&#45;&gt;template&#45;haskell -->
+<g id="edge398" class="edge">
+<title>text&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M4092.59,-514.15C4185.2,-488.65 4522.1,-398.79 4806,-360 5130.15,-315.71 5522.6,-308.31 5674.08,-307.17"/>
+<polygon fill="black" stroke="black" points="5673.94,-310.67 5683.91,-307.1 5673.89,-303.67 5673.94,-310.67"/>
+</g>
+<!-- text&#45;&gt;bytestring -->
+<g id="edge395" class="edge">
+<title>text&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4040.97,-519.53C3961.36,-514.96 3721.03,-499.37 3524,-468 3451.16,-456.4 3434.8,-443.85 3362,-432 3199.64,-405.58 3005.82,-389.62 2911.4,-382.83"/>
+<polygon fill="black" stroke="black" points="2911.85,-379.36 2901.63,-382.14 2911.35,-386.34 2911.85,-379.36"/>
+</g>
+<!-- text&#45;&gt;deepseq -->
+<g id="edge396" class="edge">
+<title>text&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M4071.75,-504.05C4077.29,-477.52 4087,-424.52 4087,-379 4087,-379 4087,-379 4087,-305 4087,-220.08 4201.26,-184.46 4269.75,-170.74"/>
+<polygon fill="black" stroke="black" points="4270.08,-174.24 4279.25,-168.93 4268.77,-167.36 4270.08,-174.24"/>
+</g>
+<!-- text&#45;&gt;binary -->
+<g id="edge394" class="edge">
+<title>text&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M4095.18,-519.47C4254.65,-510.51 5068.47,-464.79 5269.2,-453.52"/>
+<polygon fill="black" stroke="black" points="5269.16,-457.02 5278.95,-452.97 5268.77,-450.04 5269.16,-457.02"/>
+</g>
+<!-- OneTuple -->
+<g id="node26" class="node">
+<title>OneTuple</title>
+<ellipse fill="none" stroke="black" cx="7724" cy="-378" rx="47.57" ry="18"/>
+<text text-anchor="middle" x="7724" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">OneTuple</text>
+</g>
+<!-- OneTuple&#45;&gt;ghc&#45;prim -->
+<g id="edge24" class="edge">
+<title>OneTuple&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M7705.82,-361.16C7652.97,-316.29 7493.07,-188.73 7334,-144 7196.42,-105.31 2452.48,-92.39 1939.79,-91.11"/>
+<polygon fill="black" stroke="black" points="1939.99,-87.61 1929.99,-91.08 1939.98,-94.61 1939.99,-87.61"/>
+</g>
+<!-- OneTuple&#45;&gt;template&#45;haskell -->
+<g id="edge25" class="edge">
+<title>OneTuple&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7676.8,-375.09C7596.66,-371.87 7428.89,-365.19 7287,-360 6710.68,-338.93 6013.65,-315.99 5801.97,-309.08"/>
+<polygon fill="black" stroke="black" points="5802.11,-305.58 5792,-308.76 5801.88,-312.58 5802.11,-305.58"/>
+</g>
+<!-- QuickCheck -->
+<g id="node27" class="node">
+<title>QuickCheck</title>
+<ellipse fill="none" stroke="black" cx="6463" cy="-666" rx="57.05" ry="18"/>
+<text text-anchor="middle" x="6463" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">QuickCheck</text>
+</g>
+<!-- QuickCheck&#45;&gt;template&#45;haskell -->
+<g id="edge29" class="edge">
+<title>QuickCheck&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M6452.7,-648.15C6440.23,-628.81 6417.67,-597.07 6392,-576 6230.35,-443.34 6170.51,-431.5 5974,-360 5917.37,-339.4 5850.08,-325.24 5801.87,-316.77"/>
+<polygon fill="black" stroke="black" points="5802.6,-313.35 5792.15,-315.1 5801.41,-320.25 5802.6,-313.35"/>
+</g>
+<!-- QuickCheck&#45;&gt;containers -->
+<g id="edge26" class="edge">
+<title>QuickCheck&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M6464.94,-647.84C6466.03,-637.47 6467.31,-623.99 6468,-612 6472.25,-538.5 6472.98,-451.77 6473.05,-407.75"/>
+<polygon fill="black" stroke="black" points="6476.55,-407.78 6473.06,-397.78 6469.55,-407.77 6476.55,-407.78"/>
+</g>
+<!-- QuickCheck&#45;&gt;deepseq -->
+<g id="edge27" class="edge">
+<title>QuickCheck&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6474.85,-648.22C6507.71,-599.47 6593.51,-455.25 6531,-360 6441.41,-223.49 6352.62,-250.42 6193,-216 6011.18,-176.8 4659.34,-165.34 4373.14,-163.34"/>
+<polygon fill="black" stroke="black" points="4373.39,-159.84 4363.37,-163.27 4373.34,-166.84 4373.39,-159.84"/>
+</g>
+<!-- random -->
+<g id="node28" class="node">
+<title>random</title>
+<ellipse fill="none" stroke="black" cx="3111" cy="-594" rx="39.09" ry="18"/>
+<text text-anchor="middle" x="3111" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">random</text>
+</g>
+<!-- QuickCheck&#45;&gt;random -->
+<g id="edge28" class="edge">
+<title>QuickCheck&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M6411.86,-657.53C6384.89,-653.94 6351.23,-649.98 6321,-648 4969.14,-559.35 4625.47,-690.78 3273,-612 3234.78,-609.77 3191.68,-605.15 3159.55,-601.28"/>
+<polygon fill="black" stroke="black" points="3160.09,-597.82 3149.74,-600.08 3159.24,-604.77 3160.09,-597.82"/>
+</g>
+<!-- random&#45;&gt;mtl -->
+<g id="edge339" class="edge">
+<title>random&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M3074.42,-587.22C2892.59,-558.64 2067.62,-431.04 1388,-360 1281.83,-348.9 1002.02,-376.37 909,-324 849.03,-290.24 784.36,-112.89 729,-72 692.62,-45.13 641.8,-31.35 607.49,-24.67"/>
+<polygon fill="black" stroke="black" points="608.49,-21.3 598.02,-22.94 607.23,-28.18 608.49,-21.3"/>
+</g>
+<!-- random&#45;&gt;bytestring -->
+<g id="edge337" class="edge">
+<title>random&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3111.06,-575.74C3110.15,-542.01 3102.87,-467.53 3058,-432 3016.39,-399.06 2956.45,-386.43 2912.3,-381.67"/>
+<polygon fill="black" stroke="black" points="2912.66,-378.19 2902.38,-380.72 2912,-385.16 2912.66,-378.19"/>
+</g>
+<!-- random&#45;&gt;deepseq -->
+<g id="edge338" class="edge">
+<title>random&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3141.28,-582.2C3187.92,-563.4 3272,-519.95 3272,-451 3272,-451 3272,-451 3272,-305 3272,-222.46 3355.67,-238.79 3435,-216 3592.56,-170.73 4100.65,-164.1 4266.85,-163.15"/>
+<polygon fill="black" stroke="black" points="4266.72,-166.65 4276.7,-163.1 4266.68,-159.65 4266.72,-166.65"/>
+</g>
+<!-- RSA -->
+<g id="node29" class="node">
+<title>RSA</title>
+<ellipse fill="none" stroke="black" cx="5105" cy="-594" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="5105" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">RSA</text>
+</g>
+<!-- RSA&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge33" class="edge">
+<title>RSA&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M5134.1,-591.41C5309.73,-581.89 6246.29,-531.77 7011,-504 7165.17,-498.4 8252.5,-516.36 8399,-468 8674.45,-377.07 8936.03,-125.04 9014.93,-44.26"/>
+<polygon fill="black" stroke="black" points="9017.31,-46.83 9021.76,-37.22 9012.29,-41.96 9017.31,-46.83"/>
+</g>
+<!-- RSA&#45;&gt;bytestring -->
+<g id="edge32" class="edge">
+<title>RSA&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5102.56,-575.67C5098.73,-555.25 5089.28,-521.87 5067,-504 5062.76,-500.6 4687.41,-432.58 4682,-432 4326.83,-393.88 3183.72,-381.82 2912.24,-379.47"/>
+<polygon fill="black" stroke="black" points="2912.62,-375.97 2902.6,-379.38 2912.56,-382.97 2912.62,-375.97"/>
+</g>
+<!-- RSA&#45;&gt;binary -->
+<g id="edge31" class="edge">
+<title>RSA&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M5123.92,-580.15C5160.37,-555.38 5240.58,-500.88 5284.25,-471.21"/>
+<polygon fill="black" stroke="black" points="5286.2,-474.12 5292.5,-465.61 5282.26,-468.33 5286.2,-474.12"/>
+</g>
+<!-- SHA -->
+<g id="node30" class="node">
+<title>SHA</title>
+<ellipse fill="none" stroke="black" cx="5029" cy="-522" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="5029" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">SHA</text>
+</g>
+<!-- RSA&#45;&gt;SHA -->
+<g id="edge30" class="edge">
+<title>RSA&#45;&gt;SHA</title>
+<path fill="none" stroke="black" d="M5089.25,-578.5C5078.76,-568.83 5064.76,-555.94 5052.9,-545.02"/>
+<polygon fill="black" stroke="black" points="5055.57,-542.71 5045.84,-538.51 5050.82,-547.86 5055.57,-542.71"/>
+</g>
+<!-- SHA&#45;&gt;bytestring -->
+<g id="edge35" class="edge">
+<title>SHA&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5006.15,-510.72C4999.74,-508.18 4992.69,-505.7 4986,-504 4858.42,-471.54 4814.12,-517.16 4692,-468 4667.26,-458.04 4669.17,-440.81 4644,-432 4560.56,-402.81 3212.25,-383.65 2912.67,-379.74"/>
+<polygon fill="black" stroke="black" points="2912.78,-376.24 2902.74,-379.61 2912.69,-383.24 2912.78,-376.24"/>
+</g>
+<!-- SHA&#45;&gt;binary -->
+<g id="edge34" class="edge">
+<title>SHA&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M5055.81,-514.41C5105.83,-502.13 5213.63,-475.65 5272.9,-461.1"/>
+<polygon fill="black" stroke="black" points="5273.72,-464.5 5282.6,-458.71 5272.06,-457.7 5273.72,-464.5"/>
+</g>
+<!-- os&#45;string&#45;&gt;template&#45;haskell -->
+<g id="edge307" class="edge">
+<title>os&#45;string&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M1778.38,-436.87C1784.15,-434.95 1790.2,-433.21 1796,-432 2233.04,-340.65 2351.97,-380.03 2798,-360 3950.98,-308.22 5360.46,-306.56 5674.16,-306.88"/>
+<polygon fill="black" stroke="black" points="5673.77,-310.38 5683.77,-306.89 5673.78,-303.38 5673.77,-310.38"/>
+</g>
+<!-- os&#45;string&#45;&gt;bytestring -->
+<g id="edge304" class="edge">
+<title>os&#45;string&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1785.75,-441.13C1803.11,-437.8 1824.02,-434.19 1843,-432 2203.49,-390.46 2640.09,-381.45 2795.57,-379.52"/>
+<polygon fill="black" stroke="black" points="2795.24,-383.02 2805.19,-379.41 2795.15,-376.02 2795.24,-383.02"/>
+</g>
+<!-- os&#45;string&#45;&gt;deepseq -->
+<g id="edge305" class="edge">
+<title>os&#45;string&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1752.48,-431.65C1762.32,-397.42 1789.36,-321.59 1843,-288 1949.36,-221.39 3916.78,-172.42 4266.93,-164.22"/>
+<polygon fill="black" stroke="black" points="4266.8,-167.72 4276.71,-163.99 4266.63,-160.72 4266.8,-167.72"/>
+</g>
+<!-- os&#45;string&#45;&gt;exceptions -->
+<g id="edge306" class="edge">
+<title>os&#45;string&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M1705.46,-446.63C1518.81,-436.24 771.98,-394.65 552.16,-382.41"/>
+<polygon fill="black" stroke="black" points="552.56,-378.92 542.39,-381.86 552.17,-385.91 552.56,-378.92"/>
+</g>
+<!-- aeson&#45;&gt;ghc&#45;prim -->
+<g id="edge46" class="edge">
+<title>aeson&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M5569.15,-880.83C5856.96,-879.22 7986.78,-866.1 8267,-828 8529.76,-792.28 8856.41,-754 8768,-504 8699.41,-310.04 8662.3,-233.4 8477,-144 8398.68,-106.21 2513.77,-92.36 1939.89,-91.1"/>
+<polygon fill="black" stroke="black" points="1939.95,-87.6 1929.94,-91.07 1939.93,-94.6 1939.95,-87.6"/>
+</g>
+<!-- aeson&#45;&gt;template&#45;haskell -->
+<g id="edge57" class="edge">
+<title>aeson&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M5518.69,-866.9C5507.67,-857.26 5494.55,-843.46 5488,-828 5469.26,-783.77 5469.22,-765.7 5484,-720 5502.22,-663.66 5527.55,-660.16 5562,-612 5584.81,-580.1 5592.36,-573.34 5613,-540 5657.55,-468.04 5702.77,-378.87 5724.58,-334.61"/>
+<polygon fill="black" stroke="black" points="5727.68,-336.24 5728.94,-325.72 5721.4,-333.16 5727.68,-336.24"/>
+</g>
+<!-- aeson&#45;&gt;bytestring -->
+<g id="edge40" class="edge">
+<title>aeson&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5504.53,-881.01C5326.89,-880.88 4454.65,-877.6 3744,-828 3725.8,-826.73 3106.59,-765.48 3091,-756 3025.28,-716.04 3033.46,-678.61 2995,-612 2950.38,-534.71 2957.68,-504.76 2906,-432 2898.65,-421.65 2889.25,-411.41 2880.48,-402.74"/>
+<polygon fill="black" stroke="black" points="2883.08,-400.38 2873.43,-396 2878.24,-405.44 2883.08,-400.38"/>
+</g>
+<!-- aeson&#45;&gt;containers -->
+<g id="edge41" class="edge">
+<title>aeson&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M5569.45,-880.95C5748.94,-880.51 6621.64,-875.87 6886,-828 6986.4,-809.82 7044.22,-838.69 7104,-756 7142.1,-703.3 7063.37,-621.84 6648,-432 6608.14,-413.78 6560.38,-399.8 6524.83,-390.78"/>
+<polygon fill="black" stroke="black" points="6525.76,-387.41 6515.21,-388.39 6524.07,-394.2 6525.76,-387.41"/>
+</g>
+<!-- aeson&#45;&gt;deepseq -->
+<g id="edge43" class="edge">
+<title>aeson&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5569.42,-880.69C5811.74,-878.33 7343.29,-862.24 7806,-828 7934.64,-818.48 7965.93,-807.44 8094,-792 8162.85,-783.7 8355.76,-805.83 8404,-756 8437.44,-721.46 8418.29,-695.35 8410,-648 8397.52,-576.72 8388.43,-551.69 8334,-504 8307.68,-480.95 8292.26,-488.62 8264,-468 8245.72,-454.67 8247.8,-442.96 8228,-432 8040.08,-328.02 7499.18,-242.06 7286,-216 6986.37,-179.37 4747.89,-165.38 4373.14,-163.28"/>
+<polygon fill="black" stroke="black" points="4373.38,-159.79 4363.36,-163.23 4373.34,-166.79 4373.38,-159.79"/>
+</g>
+<!-- aeson&#45;&gt;time -->
+<g id="edge63" class="edge">
+<title>aeson&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M5504.69,-880.59C5373.77,-878.68 4869.99,-868.92 4458,-828 4243.34,-806.68 4168.45,-857.31 3978,-756 3958.84,-745.81 3964.41,-729.71 3945,-720 3872.71,-683.82 3663.21,-694.07 3583,-684 3558.02,-680.86 3530.02,-676.61 3508.27,-673.15"/>
+<polygon fill="black" stroke="black" points="3509.12,-669.74 3498.69,-671.61 3508.01,-676.65 3509.12,-669.74"/>
+</g>
+<!-- aeson&#45;&gt;text -->
+<g id="edge58" class="edge">
+<title>aeson&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M5504.64,-880.29C5342.25,-876.57 4620.09,-858.44 4525,-828 4439.93,-800.77 4256.41,-666.97 4186,-612 4167.66,-597.68 4166.21,-590.48 4148,-576 4131.95,-563.24 4112.85,-550.5 4097.34,-540.71"/>
+<polygon fill="black" stroke="black" points="4099.35,-537.85 4089.01,-535.54 4095.65,-543.79 4099.35,-537.85"/>
+</g>
+<!-- aeson&#45;&gt;OneTuple -->
+<g id="edge38" class="edge">
+<title>aeson&#45;&gt;OneTuple</title>
+<path fill="none" stroke="black" d="M5569.33,-880.88C5759.07,-880.05 6747.1,-873.58 7552,-828 7575.02,-826.7 8361.86,-771.43 8379,-756 8414.98,-723.62 8403.32,-695.29 8393,-648 8385.49,-613.61 8378.26,-606.09 8360,-576 8338.97,-541.34 8335.05,-530.06 8304,-504 8277.81,-482.01 8264.38,-487.08 8236,-468 8215.32,-454.09 8215.91,-441.82 8193,-432 8120.51,-400.94 7891.88,-386.63 7782.9,-381.43"/>
+<polygon fill="black" stroke="black" points="7783.14,-377.94 7772.98,-380.97 7782.81,-384.93 7783.14,-377.94"/>
+</g>
+<!-- aeson&#45;&gt;QuickCheck -->
+<g id="edge39" class="edge">
+<title>aeson&#45;&gt;QuickCheck</title>
+<path fill="none" stroke="black" d="M5565.47,-873.41C5578.12,-870.21 5593.24,-866.63 5607,-864 5719.85,-842.42 5753.81,-863.75 5863,-828 5895.13,-817.48 5898.38,-803.96 5930,-792 6017.52,-758.89 6285.71,-702.77 6404.89,-678.62"/>
+<polygon fill="black" stroke="black" points="6405.35,-682.09 6414.46,-676.68 6403.96,-675.23 6405.35,-682.09"/>
+</g>
+<!-- data&#45;fix -->
+<g id="node33" class="node">
+<title>data&#45;fix</title>
+<ellipse fill="none" stroke="black" cx="5773" cy="-666" rx="38.59" ry="18"/>
+<text text-anchor="middle" x="5773" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">data&#45;fix</text>
+</g>
+<!-- aeson&#45;&gt;data&#45;fix -->
+<g id="edge42" class="edge">
+<title>aeson&#45;&gt;data&#45;fix</title>
+<path fill="none" stroke="black" d="M5560.59,-869.52C5609.43,-845.33 5719.25,-788.68 5745,-756 5758.71,-738.59 5765.77,-714.37 5769.36,-695.59"/>
+<polygon fill="black" stroke="black" points="5772.78,-696.37 5770.97,-685.93 5765.88,-695.22 5772.78,-696.37"/>
+</g>
+<!-- dlist -->
+<g id="node34" class="node">
+<title>dlist</title>
+<ellipse fill="none" stroke="black" cx="8068" cy="-306" rx="27" ry="18"/>
+<text text-anchor="middle" x="8068" y="-300.57" font-family="Times New Roman,serif" font-size="14.00">dlist</text>
+</g>
+<!-- aeson&#45;&gt;dlist -->
+<g id="edge44" class="edge">
+<title>aeson&#45;&gt;dlist</title>
+<path fill="none" stroke="black" d="M5569.33,-881.07C5828.47,-881.55 7571.25,-882.69 8094,-828 8332.93,-803.01 8424.17,-829.93 8615,-684 8693.39,-624.05 8811.86,-576.58 8745,-504 8678.83,-432.17 8397.35,-505.09 8307,-468 8283.94,-458.54 8284.1,-446.73 8264,-432 8207.22,-390.39 8136.83,-347.46 8097.73,-324.32"/>
+<polygon fill="black" stroke="black" points="8099.73,-321.43 8089.34,-319.37 8096.18,-327.46 8099.73,-321.43"/>
+</g>
+<!-- aeson&#45;&gt;exceptions -->
+<g id="edge45" class="edge">
+<title>aeson&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M5504.53,-880.56C5354.94,-878.54 4717.16,-870.01 4194,-864 4096.95,-862.89 792.29,-858.05 700,-828 647.58,-810.93 630.7,-801.1 599,-756 512.99,-633.63 551.07,-575.24 508,-432 505.54,-423.82 502.75,-414.98 500.16,-406.9"/>
+<polygon fill="black" stroke="black" points="503.55,-406.01 497.14,-397.58 496.89,-408.17 503.55,-406.01"/>
+</g>
+<!-- aeson&#45;&gt;hashable -->
+<g id="edge47" class="edge">
+<title>aeson&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M5504.77,-880.03C5340.79,-875 4605.17,-851.2 4563,-828 4511.35,-799.59 4533.45,-754.98 4486,-720 4444.93,-689.73 4406.89,-725.35 4377,-684 4367.63,-671.03 4366.89,-660.4 4377,-648 4402.3,-616.97 4513.72,-603.59 4581.59,-598.24"/>
+<polygon fill="black" stroke="black" points="4581.69,-601.74 4591.4,-597.5 4581.16,-594.76 4581.69,-601.74"/>
+</g>
+<!-- indexed&#45;traversable -->
+<g id="node37" class="node">
+<title>indexed&#45;traversable</title>
+<ellipse fill="none" stroke="black" cx="7103" cy="-522" rx="82.5" ry="18"/>
+<text text-anchor="middle" x="7103" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">indexed&#45;traversable</text>
+</g>
+<!-- aeson&#45;&gt;indexed&#45;traversable -->
+<g id="edge48" class="edge">
+<title>aeson&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M5569.24,-880.85C5789.71,-879.68 7068.12,-871.1 7137,-828 7228.56,-770.71 7153.8,-612.9 7118.71,-549.69"/>
+<polygon fill="black" stroke="black" points="7121.97,-548.35 7114,-541.37 7115.87,-551.8 7121.97,-548.35"/>
+</g>
+<!-- integer&#45;conversion -->
+<g id="node38" class="node">
+<title>integer&#45;conversion</title>
+<ellipse fill="none" stroke="black" cx="4465" cy="-666" rx="79.01" ry="18"/>
+<text text-anchor="middle" x="4465" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">integer&#45;conversion</text>
+</g>
+<!-- aeson&#45;&gt;integer&#45;conversion -->
+<g id="edge49" class="edge">
+<title>aeson&#45;&gt;integer&#45;conversion</title>
+<path fill="none" stroke="black" d="M5504.86,-879.93C5345.44,-874.54 4645.49,-849.7 4605,-828 4552.12,-799.65 4564.51,-764.26 4524,-720 4514.89,-710.05 4504.11,-699.95 4494.27,-691.27"/>
+<polygon fill="black" stroke="black" points="4496.57,-688.64 4486.72,-684.74 4491.99,-693.93 4496.57,-688.64"/>
+</g>
+<!-- integer&#45;logarithms -->
+<g id="node39" class="node">
+<title>integer&#45;logarithms</title>
+<ellipse fill="none" stroke="black" cx="1241" cy="-234" rx="76.51" ry="18"/>
+<text text-anchor="middle" x="1241" y="-228.57" font-family="Times New Roman,serif" font-size="14.00">integer&#45;logarithms</text>
+</g>
+<!-- aeson&#45;&gt;integer&#45;logarithms -->
+<g id="edge50" class="edge">
+<title>aeson&#45;&gt;integer&#45;logarithms</title>
+<path fill="none" stroke="black" d="M5504.74,-880.59C5125.45,-875.83 1529.09,-830.54 1523,-828 1433.63,-790.8 1212,-619.8 1212,-523 1212,-523 1212,-523 1212,-377 1212,-336.75 1223.32,-291.36 1231.82,-262.97"/>
+<polygon fill="black" stroke="black" points="1235.07,-264.29 1234.68,-253.7 1228.38,-262.22 1235.07,-264.29"/>
+</g>
+<!-- network&#45;uri -->
+<g id="node40" class="node">
+<title>network&#45;uri</title>
+<ellipse fill="none" stroke="black" cx="4873" cy="-810" rx="53.06" ry="18"/>
+<text text-anchor="middle" x="4873" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">network&#45;uri</text>
+</g>
+<!-- aeson&#45;&gt;network&#45;uri -->
+<g id="edge51" class="edge">
+<title>aeson&#45;&gt;network&#45;uri</title>
+<path fill="none" stroke="black" d="M5505.42,-877.67C5402.01,-866.77 5072.31,-832.01 4934.48,-817.48"/>
+<polygon fill="black" stroke="black" points="4935.14,-814.03 4924.83,-816.46 4934.41,-820.99 4935.14,-814.03"/>
+</g>
+<!-- primitive -->
+<g id="node41" class="node">
+<title>primitive</title>
+<ellipse fill="none" stroke="black" cx="5793" cy="-594" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="5793" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">primitive</text>
+</g>
+<!-- aeson&#45;&gt;primitive -->
+<g id="edge52" class="edge">
+<title>aeson&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M5563.25,-871.24C5569.7,-868.86 5576.6,-866.32 5583,-864 5627.8,-847.74 5642.85,-852.03 5684,-828 5726.17,-803.38 5733.72,-791.74 5767,-756 5794.26,-726.73 5808.35,-721.95 5821,-684 5826.06,-668.82 5824.85,-663.53 5821,-648 5818.77,-639.01 5814.71,-629.87 5810.36,-621.76"/>
+<polygon fill="black" stroke="black" points="5813.39,-620.02 5805.35,-613.11 5807.33,-623.52 5813.39,-620.02"/>
+</g>
+<!-- scientific -->
+<g id="node42" class="node">
+<title>scientific</title>
+<ellipse fill="none" stroke="black" cx="5294" cy="-666" rx="43.58" ry="18"/>
+<text text-anchor="middle" x="5294" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">scientific</text>
+</g>
+<!-- aeson&#45;&gt;scientific -->
+<g id="edge53" class="edge">
+<title>aeson&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M5508.14,-873.74C5480.97,-865.84 5440.2,-851.14 5411,-828 5363.64,-790.46 5326.38,-729.06 5307.53,-693.93"/>
+<polygon fill="black" stroke="black" points="5310.73,-692.49 5302.98,-685.27 5304.53,-695.75 5310.73,-692.49"/>
+</g>
+<!-- semialign -->
+<g id="node43" class="node">
+<title>semialign</title>
+<ellipse fill="none" stroke="black" cx="6544" cy="-810" rx="44.58" ry="18"/>
+<text text-anchor="middle" x="6544" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">semialign</text>
+</g>
+<!-- aeson&#45;&gt;semialign -->
+<g id="edge54" class="edge">
+<title>aeson&#45;&gt;semialign</title>
+<path fill="none" stroke="black" d="M5569.08,-878.77C5713.51,-868.73 6304.35,-827.66 6488.76,-814.84"/>
+<polygon fill="black" stroke="black" points="6488.81,-818.35 6498.54,-814.16 6488.32,-811.36 6488.81,-818.35"/>
+</g>
+<!-- strict -->
+<g id="node44" class="node">
+<title>strict</title>
+<ellipse fill="none" stroke="black" cx="5537" cy="-738" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="5537" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">strict</text>
+</g>
+<!-- aeson&#45;&gt;strict -->
+<g id="edge55" class="edge">
+<title>aeson&#45;&gt;strict</title>
+<path fill="none" stroke="black" d="M5537,-863.59C5537,-839.61 5537,-796.14 5537,-767.42"/>
+<polygon fill="black" stroke="black" points="5540.5,-767.62 5537,-757.62 5533.5,-767.62 5540.5,-767.62"/>
+</g>
+<!-- tagged -->
+<g id="node45" class="node">
+<title>tagged</title>
+<ellipse fill="none" stroke="black" cx="7761" cy="-450" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="7761" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">tagged</text>
+</g>
+<!-- aeson&#45;&gt;tagged -->
+<g id="edge56" class="edge">
+<title>aeson&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M5569.39,-880.68C5792.27,-878.41 7092.25,-863.65 7167,-828 7300.67,-764.24 7261.88,-658.3 7385,-576 7491.53,-504.78 7642.12,-471.02 7716.23,-457.92"/>
+<polygon fill="black" stroke="black" points="7716.7,-461.39 7725.96,-456.24 7715.51,-454.49 7716.7,-461.39"/>
+</g>
+<!-- text&#45;iso8601 -->
+<g id="node46" class="node">
+<title>text&#45;iso8601</title>
+<ellipse fill="none" stroke="black" cx="4670" cy="-810" rx="56.05" ry="18"/>
+<text text-anchor="middle" x="4670" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">text&#45;iso8601</text>
+</g>
+<!-- aeson&#45;&gt;text&#45;iso8601 -->
+<g id="edge59" class="edge">
+<title>aeson&#45;&gt;text&#45;iso8601</title>
+<path fill="none" stroke="black" d="M5505.11,-879.21C5403.6,-873.4 5078.93,-853.92 4811,-828 4785.26,-825.51 4756.94,-822.21 4732.48,-819.17"/>
+<polygon fill="black" stroke="black" points="4733.03,-815.72 4722.67,-817.95 4732.16,-822.66 4733.03,-815.72"/>
+</g>
+<!-- text&#45;short -->
+<g id="node47" class="node">
+<title>text&#45;short</title>
+<ellipse fill="none" stroke="black" cx="5440" cy="-666" rx="46.07" ry="18"/>
+<text text-anchor="middle" x="5440" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">text&#45;short</text>
+</g>
+<!-- aeson&#45;&gt;text&#45;short -->
+<g id="edge60" class="edge">
+<title>aeson&#45;&gt;text&#45;short</title>
+<path fill="none" stroke="black" d="M5506.56,-875.42C5480.68,-868.89 5445.08,-855.29 5428,-828 5402.49,-787.23 5416.57,-728.77 5428.63,-694.66"/>
+<polygon fill="black" stroke="black" points="5431.83,-696.1 5432.05,-685.51 5425.27,-693.65 5431.83,-696.1"/>
+</g>
+<!-- th&#45;abstraction -->
+<g id="node48" class="node">
+<title>th&#45;abstraction</title>
+<ellipse fill="none" stroke="black" cx="7456" cy="-594" rx="61.54" ry="18"/>
+<text text-anchor="middle" x="7456" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">th&#45;abstraction</text>
+</g>
+<!-- aeson&#45;&gt;th&#45;abstraction -->
+<g id="edge61" class="edge">
+<title>aeson&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M5569.21,-880.84C5801.21,-879.55 7210.15,-870.02 7289,-828 7289,-828 7393.66,-681.98 7437.27,-621.13"/>
+<polygon fill="black" stroke="black" points="7439.86,-623.53 7442.84,-613.36 7434.17,-619.45 7439.86,-623.53"/>
+</g>
+<!-- these -->
+<g id="node49" class="node">
+<title>these</title>
+<ellipse fill="none" stroke="black" cx="5610" cy="-666" rx="29.61" ry="18"/>
+<text text-anchor="middle" x="5610" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">these</text>
+</g>
+<!-- aeson&#45;&gt;these -->
+<g id="edge62" class="edge">
+<title>aeson&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M5525.86,-865.07C5506.05,-834.58 5469.43,-766.88 5499,-720 5503.5,-712.87 5544.67,-694.38 5575.57,-681.25"/>
+<polygon fill="black" stroke="black" points="5576.74,-684.55 5584.59,-677.44 5574.02,-678.1 5576.74,-684.55"/>
+</g>
+<!-- time&#45;compat -->
+<g id="node50" class="node">
+<title>time&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="5679" cy="-738" rx="57.05" ry="18"/>
+<text text-anchor="middle" x="5679" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">time&#45;compat</text>
+</g>
+<!-- aeson&#45;&gt;time&#45;compat -->
+<g id="edge64" class="edge">
+<title>aeson&#45;&gt;time&#45;compat</title>
+<path fill="none" stroke="black" d="M5552.2,-865.8C5576.68,-841.32 5625.08,-792.92 5654.49,-763.51"/>
+<polygon fill="black" stroke="black" points="5656.94,-766.01 5661.54,-756.46 5651.99,-761.06 5656.94,-766.01"/>
+</g>
+<!-- aeson&#45;&gt;unordered&#45;containers -->
+<g id="edge65" class="edge">
+<title>aeson&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M5565.86,-873.58C5578.46,-870.45 5593.42,-866.87 5607,-864 5694.93,-845.39 5719.81,-853.5 5806,-828 5845.73,-816.24 5853.5,-807.32 5892,-792 5989.85,-753.06 6105.11,-710.21 6170.56,-686.15"/>
+<polygon fill="black" stroke="black" points="6171.41,-689.57 6179.6,-682.84 6169,-683 6171.41,-689.57"/>
+</g>
+<!-- uuid&#45;types -->
+<g id="node52" class="node">
+<title>uuid&#45;types</title>
+<ellipse fill="none" stroke="black" cx="5030" cy="-666" rx="49.57" ry="18"/>
+<text text-anchor="middle" x="5030" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">uuid&#45;types</text>
+</g>
+<!-- aeson&#45;&gt;uuid&#45;types -->
+<g id="edge66" class="edge">
+<title>aeson&#45;&gt;uuid&#45;types</title>
+<path fill="none" stroke="black" d="M5508.52,-873.23C5474.95,-863.79 5417.7,-846.76 5370,-828 5257.1,-783.59 5129.03,-718.86 5067.25,-686.68"/>
+<polygon fill="black" stroke="black" points="5069.03,-683.67 5058.55,-682.14 5065.79,-689.87 5069.03,-683.67"/>
+</g>
+<!-- vector -->
+<g id="node53" class="node">
+<title>vector</title>
+<ellipse fill="none" stroke="black" cx="6876" cy="-666" rx="34.1" ry="18"/>
+<text text-anchor="middle" x="6876" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">vector</text>
+</g>
+<!-- aeson&#45;&gt;vector -->
+<g id="edge67" class="edge">
+<title>aeson&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M5565.44,-873.27C5578.09,-870.05 5593.22,-866.48 5607,-864 5740.47,-839.95 5782.96,-875.45 5910,-828 5936.68,-818.04 5936.41,-802.2 5963,-792 6045.09,-760.5 6659.46,-690.92 6831.4,-671.89"/>
+<polygon fill="black" stroke="black" points="6831.72,-675.38 6841.27,-670.8 6830.95,-668.42 6831.72,-675.38"/>
+</g>
+<!-- witherable -->
+<g id="node54" class="node">
+<title>witherable</title>
+<ellipse fill="none" stroke="black" cx="6829" cy="-810" rx="48.07" ry="18"/>
+<text text-anchor="middle" x="6829" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">witherable</text>
+</g>
+<!-- aeson&#45;&gt;witherable -->
+<g id="edge68" class="edge">
+<title>aeson&#45;&gt;witherable</title>
+<path fill="none" stroke="black" d="M5569.13,-879.67C5698.29,-874.27 6192.1,-853.07 6598,-828 6656.83,-824.37 6724.02,-819.32 6770.71,-815.67"/>
+<polygon fill="black" stroke="black" points="6770.92,-819.17 6780.62,-814.89 6770.37,-812.19 6770.92,-819.17"/>
+</g>
+<!-- data&#45;fix&#45;&gt;deepseq -->
+<g id="edge141" class="edge">
+<title>data&#45;fix&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5802.13,-653.87C5877.67,-622.89 6074,-528.03 6074,-379 6074,-379 6074,-379 6074,-305 6074,-154.38 5895.9,-238.72 5747,-216 5474.48,-174.41 4598.5,-165.08 4373.22,-163.35"/>
+<polygon fill="black" stroke="black" points="4373.3,-159.85 4363.28,-163.28 4373.25,-166.85 4373.3,-159.85"/>
+</g>
+<!-- data&#45;fix&#45;&gt;hashable -->
+<g id="edge142" class="edge">
+<title>data&#45;fix&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M5736.74,-659.21C5712.07,-655.47 5678.64,-650.8 5649,-648 5459.88,-630.13 4870.53,-604.78 4688.86,-597.22"/>
+<polygon fill="black" stroke="black" points="4689.14,-593.72 4679.01,-596.81 4688.85,-600.72 4689.14,-593.72"/>
+</g>
+<!-- dlist&#45;&gt;deepseq -->
+<g id="edge150" class="edge">
+<title>dlist&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8051.18,-291.43C8024.04,-270.48 7968.06,-231.12 7913,-216 7734.76,-167.06 4806.34,-163.31 4373.33,-163.02"/>
+<polygon fill="black" stroke="black" points="4373.34,-159.52 4363.34,-163.02 4373.33,-166.52 4373.34,-159.52"/>
+</g>
+<!-- exceptions&#45;&gt;mtl -->
+<g id="edge151" class="edge">
+<title>exceptions&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M488.65,-359.79C482.87,-311.67 471.59,-172.65 518,-72 523.74,-59.54 533.7,-48.28 543.37,-39.38"/>
+<polygon fill="black" stroke="black" points="545.61,-42.07 550.9,-32.89 541.04,-36.77 545.61,-42.07"/>
+</g>
+<!-- exceptions&#45;&gt;stm -->
+<g id="edge152" class="edge">
+<title>exceptions&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M475.87,-360.5C454.49,-335.38 418,-285.17 418,-235 418,-235 418,-235 418,-161 418,-72.32 292.19,-37.03 227.48,-24.75"/>
+<polygon fill="black" stroke="black" points="228.11,-21.31 217.64,-22.98 226.87,-28.2 228.11,-21.31"/>
+</g>
+<!-- exceptions&#45;&gt;template&#45;haskell -->
+<g id="edge153" class="edge">
+<title>exceptions&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M541.67,-376.32C1043.37,-369.63 5113.69,-315.33 5674.11,-307.85"/>
+<polygon fill="black" stroke="black" points="5674.1,-311.35 5684.05,-307.72 5674,-304.35 5674.1,-311.35"/>
+</g>
+<!-- hashable&#45;&gt;ghc&#45;bignum -->
+<g id="edge178" class="edge">
+<title>hashable&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M4601.69,-582.51C4544.5,-564.74 4423.75,-528.28 4320,-504 4150.08,-464.23 4107.1,-454.16 3934,-432 3481.46,-374.08 3365.25,-390.01 2910,-360 2715.05,-347.15 1324.59,-349 1155,-252 1131.42,-238.51 1115.23,-211.52 1105.67,-190.78"/>
+<polygon fill="black" stroke="black" points="1108.93,-189.5 1101.75,-181.71 1102.51,-192.28 1108.93,-189.5"/>
+</g>
+<!-- hashable&#45;&gt;ghc&#45;prim -->
+<g id="edge179" class="edge">
+<title>hashable&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M4677.76,-592.61C4868.04,-589.32 5620.3,-559.22 5430,-288 5295.87,-96.83 5136.49,-184.2 4371,-144 3388.81,-92.42 2184.93,-90.7 1939.79,-90.92"/>
+<polygon fill="black" stroke="black" points="1940.04,-87.42 1930.04,-90.93 1940.04,-94.42 1940.04,-87.42"/>
+</g>
+<!-- hashable&#45;&gt;bytestring -->
+<g id="edge174" class="edge">
+<title>hashable&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4598.27,-584.57C4526.15,-568.14 4360.84,-531.06 4221,-504 4035.92,-468.18 3990.31,-453.29 3803,-432 3467.03,-393.81 3060.88,-382.8 2912.16,-379.93"/>
+<polygon fill="black" stroke="black" points="2912.64,-376.44 2902.58,-379.75 2912.51,-383.43 2912.64,-376.44"/>
+</g>
+<!-- hashable&#45;&gt;containers -->
+<g id="edge175" class="edge">
+<title>hashable&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M4667.96,-582.11C4761.27,-551.82 5035.76,-466.59 5271,-432 5384.37,-415.33 6186.54,-388.3 6413.38,-380.91"/>
+<polygon fill="black" stroke="black" points="6413.29,-384.42 6423.17,-380.6 6413.06,-377.42 6413.29,-384.42"/>
+</g>
+<!-- hashable&#45;&gt;deepseq -->
+<g id="edge176" class="edge">
+<title>hashable&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M4650.16,-576.71C4680.11,-542.75 4744,-460.72 4744,-379 4744,-379 4744,-379 4744,-305 4744,-128.47 4536.54,-229.16 4367,-180 4365.05,-179.44 4363.07,-178.83 4361.07,-178.2"/>
+<polygon fill="black" stroke="black" points="4362.43,-174.97 4351.84,-175.12 4360.22,-181.61 4362.43,-174.97"/>
+</g>
+<!-- hashable&#45;&gt;filepath -->
+<g id="edge177" class="edge">
+<title>hashable&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M4594.02,-588.8C4552.87,-584.77 4487.61,-578.88 4431,-576 3285.59,-517.79 1880.8,-521.36 1603.01,-522.72"/>
+<polygon fill="black" stroke="black" points="1603.24,-519.22 1593.26,-522.77 1603.28,-526.22 1603.24,-519.22"/>
+</g>
+<!-- hashable&#45;&gt;text -->
+<g id="edge181" class="edge">
+<title>hashable&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4602.11,-582.06C4594.28,-579.77 4585.9,-577.57 4578,-576 4487.41,-557.95 4208.53,-534.33 4106.18,-526.04"/>
+<polygon fill="black" stroke="black" points="4106.63,-522.56 4096.38,-525.25 4106.07,-529.54 4106.63,-522.56"/>
+</g>
+<!-- hashable&#45;&gt;os&#45;string -->
+<g id="edge180" class="edge">
+<title>hashable&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M4602.07,-582.23C4594.24,-579.93 4585.87,-577.69 4578,-576 4460.5,-550.75 4428.77,-558.35 4310,-540 4218.15,-525.81 4196.5,-513.07 4104,-504 3636.41,-458.15 2111.51,-451.91 1802.8,-451.11"/>
+<polygon fill="black" stroke="black" points="1803.02,-447.61 1793.01,-451.09 1803,-454.61 1803.02,-447.61"/>
+</g>
+<!-- indexed&#45;traversable&#45;&gt;containers -->
+<g id="edge221" class="edge">
+<title>indexed&#45;traversable&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M7056.53,-506.77C6993.76,-487.9 6878.2,-454.37 6778,-432 6691.76,-412.75 6590.5,-396.36 6529.08,-387.1"/>
+<polygon fill="black" stroke="black" points="6529.62,-383.65 6519.21,-385.63 6528.58,-390.57 6529.62,-383.65"/>
+</g>
+<!-- integer&#45;conversion&#45;&gt;bytestring -->
+<g id="edge227" class="edge">
+<title>integer&#45;conversion&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4386.79,-662.77C4120.36,-655.03 3263.29,-628.86 3240,-612 3170.72,-561.87 3238.1,-486.26 3172,-432 3133.24,-400.18 2992.94,-386.94 2912.24,-381.86"/>
+<polygon fill="black" stroke="black" points="2912.49,-378.37 2902.29,-381.26 2912.07,-385.35 2912.49,-378.37"/>
+</g>
+<!-- integer&#45;conversion&#45;&gt;text -->
+<g id="edge229" class="edge">
+<title>integer&#45;conversion&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4411.12,-652.41C4372.05,-642.74 4318.19,-628.32 4272,-612 4254.92,-605.96 4153.34,-560.99 4100.27,-537.38"/>
+<polygon fill="black" stroke="black" points="4101.97,-534.31 4091.41,-533.44 4099.13,-540.7 4101.97,-534.31"/>
+</g>
+<!-- integer&#45;conversion&#45;&gt;primitive -->
+<g id="edge228" class="edge">
+<title>integer&#45;conversion&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M4541.17,-660.99C4783.38,-648.22 5532.07,-608.75 5739.33,-597.83"/>
+<polygon fill="black" stroke="black" points="5739.47,-601.33 5749.27,-597.3 5739.1,-594.34 5739.47,-601.33"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;ghc&#45;bignum -->
+<g id="edge233" class="edge">
+<title>integer&#45;logarithms&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M1208.23,-217.29C1188.58,-207.87 1163.27,-195.73 1141.57,-185.33"/>
+<polygon fill="black" stroke="black" points="1143.14,-182.2 1132.61,-181.03 1140.11,-188.51 1143.14,-182.2"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;ghc&#45;prim -->
+<g id="edge234" class="edge">
+<title>integer&#45;logarithms&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1268.85,-216.8C1305.59,-196.23 1372.9,-161.35 1435,-144 1583.11,-102.62 1766.73,-93.49 1850.08,-91.52"/>
+<polygon fill="black" stroke="black" points="1849.96,-95.02 1859.89,-91.31 1849.82,-88.02 1849.96,-95.02"/>
+</g>
+<!-- network&#45;uri&#45;&gt;template&#45;haskell -->
+<g id="edge298" class="edge">
+<title>network&#45;uri&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M4914.58,-798.58C4966.08,-783.19 5051.56,-748.93 5089,-684 5096.99,-670.14 5096.61,-662.07 5089,-648 5075.11,-622.3 5054.23,-633.08 5034,-612 4998.23,-574.72 4970.2,-551.29 4991,-504 5029.11,-417.33 5061.39,-398.25 5148,-360 5240.9,-318.97 5541.6,-309.7 5674.19,-307.61"/>
+<polygon fill="black" stroke="black" points="5673.89,-311.12 5683.84,-307.47 5673.79,-304.12 5673.89,-311.12"/>
+</g>
+<!-- network&#45;uri&#45;&gt;deepseq -->
+<g id="edge296" class="edge">
+<title>network&#45;uri&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M4848.82,-793.71C4782.81,-751.8 4603.05,-636.58 4583,-612 4534.01,-551.94 4516,-528.5 4516,-451 4516,-451 4516,-451 4516,-305 4516,-266.23 4414.18,-209.58 4357.31,-180.96"/>
+<polygon fill="black" stroke="black" points="4359.12,-177.95 4348.61,-176.63 4356,-184.22 4359.12,-177.95"/>
+</g>
+<!-- network&#45;uri&#45;&gt;parsec -->
+<g id="edge297" class="edge">
+<title>network&#45;uri&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M4824.9,-801.87C4798.43,-798.25 4764.98,-794.17 4735,-792 4370.53,-765.63 3453.79,-799.77 3091,-756 2825.77,-724 2514.98,-638.54 2405.57,-606.95"/>
+<polygon fill="black" stroke="black" points="2406.75,-603.65 2396.17,-604.23 2404.8,-610.38 2406.75,-603.65"/>
+</g>
+<!-- primitive&#45;&gt;template&#45;haskell -->
+<g id="edge323" class="edge">
+<title>primitive&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M5789.72,-575.97C5780.59,-528.49 5754.79,-394.31 5743.45,-335.36"/>
+<polygon fill="black" stroke="black" points="5746.94,-334.95 5741.61,-325.79 5740.07,-336.27 5746.94,-334.95"/>
+</g>
+<!-- primitive&#45;&gt;deepseq -->
+<g id="edge322" class="edge">
+<title>primitive&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5796.08,-575.86C5806.01,-518.24 5834.59,-332.61 5799,-288 5708.29,-174.29 4627.05,-163.92 4373.13,-163.06"/>
+<polygon fill="black" stroke="black" points="4373.2,-159.56 4363.19,-163.03 4373.18,-166.56 4373.2,-159.56"/>
+</g>
+<!-- scientific&#45;&gt;template&#45;haskell -->
+<g id="edge348" class="edge">
+<title>scientific&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M5285.14,-647.9C5264.88,-606.15 5220.64,-497.62 5271,-432 5320.08,-368.05 5558.47,-329.69 5674.42,-314.52"/>
+<polygon fill="black" stroke="black" points="5674.61,-318.03 5684.08,-313.28 5673.71,-311.08 5674.61,-318.03"/>
+</g>
+<!-- scientific&#45;&gt;bytestring -->
+<g id="edge342" class="edge">
+<title>scientific&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5253.9,-658.39C5196.59,-648.82 5088.01,-630.25 4996,-612 4775.98,-568.35 4723.13,-547.09 4503,-504 4318.43,-467.87 4273,-452.08 4086,-432 3636.58,-383.73 3090.48,-379.03 2912.85,-378.87"/>
+<polygon fill="black" stroke="black" points="2912.96,-375.37 2902.96,-378.86 2912.96,-382.37 2912.96,-375.37"/>
+</g>
+<!-- scientific&#45;&gt;containers -->
+<g id="edge343" class="edge">
+<title>scientific&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M5324.64,-652.83C5423.72,-613.98 5745.1,-491.99 6022,-432 6160.49,-401.99 6326.83,-388 6413.65,-382.32"/>
+<polygon fill="black" stroke="black" points="6413.84,-385.81 6423.59,-381.69 6413.39,-378.83 6413.84,-385.81"/>
+</g>
+<!-- scientific&#45;&gt;deepseq -->
+<g id="edge344" class="edge">
+<title>scientific&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5313.43,-649.84C5341.48,-626.08 5390,-577.16 5390,-523 5390,-523 5390,-523 5390,-305 5390,-164.71 4904.35,-232.21 4765,-216 4588.58,-195.47 4540.38,-218.52 4367,-180 4364.87,-179.53 4362.71,-178.98 4360.54,-178.39"/>
+<polygon fill="black" stroke="black" points="4361.78,-175.11 4351.19,-175.5 4359.71,-181.8 4361.78,-175.11"/>
+</g>
+<!-- scientific&#45;&gt;binary -->
+<g id="edge341" class="edge">
+<title>scientific&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M5295.6,-647.85C5299.03,-611.14 5307.12,-524.66 5311.33,-479.53"/>
+<polygon fill="black" stroke="black" points="5314.8,-480.02 5312.25,-469.74 5307.83,-479.37 5314.8,-480.02"/>
+</g>
+<!-- scientific&#45;&gt;text -->
+<g id="edge349" class="edge">
+<title>scientific&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M5251.5,-661.11C5140.69,-650.87 4848.61,-623.18 4806,-612 4766.71,-601.69 4761.43,-585.77 4722,-576 4604.02,-546.77 4228.31,-529.44 4106.51,-524.49"/>
+<polygon fill="black" stroke="black" points="4106.85,-521 4096.72,-524.09 4106.57,-527.99 4106.85,-521"/>
+</g>
+<!-- scientific&#45;&gt;hashable -->
+<g id="edge345" class="edge">
+<title>scientific&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M5251.69,-661.12C5162.29,-652.85 4947.64,-632.53 4768,-612 4741.05,-608.92 4711.07,-605.12 4686.41,-601.9"/>
+<polygon fill="black" stroke="black" points="4687,-598.44 4676.63,-600.61 4686.08,-605.38 4687,-598.44"/>
+</g>
+<!-- scientific&#45;&gt;integer&#45;logarithms -->
+<g id="edge346" class="edge">
+<title>scientific&#45;&gt;integer&#45;logarithms</title>
+<path fill="none" stroke="black" d="M5278.78,-648.71C5247.33,-616.05 5171.51,-542.42 5093,-504 4969.45,-443.54 4928.11,-451.84 4792,-432 3344.66,-221.01 2966.05,-338.82 1506,-252 1445.44,-248.4 1377.12,-244.01 1325.02,-240.59"/>
+<polygon fill="black" stroke="black" points="1325.54,-237.12 1315.33,-239.95 1325.08,-244.1 1325.54,-237.12"/>
+</g>
+<!-- scientific&#45;&gt;primitive -->
+<g id="edge347" class="edge">
+<title>scientific&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M5332.44,-657.33C5348.63,-654.23 5367.7,-650.74 5385,-648 5512.33,-627.85 5662.92,-609.77 5740.68,-600.85"/>
+<polygon fill="black" stroke="black" points="5741.02,-604.34 5750.56,-599.73 5740.23,-597.38 5741.02,-604.34"/>
+</g>
+<!-- semialign&#45;&gt;containers -->
+<g id="edge350" class="edge">
+<title>semialign&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M6541.31,-791.73C6539.25,-772.86 6538.56,-742.35 6551,-720 6564.14,-696.39 6587.8,-708.11 6600,-684 6629.11,-626.49 6731.93,-650.83 6582,-432 6568.57,-412.4 6545.78,-399.78 6524.5,-391.79"/>
+<polygon fill="black" stroke="black" points="6525.92,-388.58 6515.33,-388.62 6523.64,-395.2 6525.92,-388.58"/>
+</g>
+<!-- semialign&#45;&gt;hashable -->
+<g id="edge351" class="edge">
+<title>semialign&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M6499.72,-807.34C6271.03,-798.78 5233.02,-759.79 5200,-756 5030.96,-736.59 4985.79,-736.66 4824,-684 4794,-674.24 4717.51,-636.65 4671.56,-613.56"/>
+<polygon fill="black" stroke="black" points="4673.27,-610.5 4662.76,-609.13 4670.12,-616.75 4673.27,-610.5"/>
+</g>
+<!-- semialign&#45;&gt;indexed&#45;traversable -->
+<g id="edge352" class="edge">
+<title>semialign&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M6554.57,-792.35C6568.42,-771.98 6594.66,-737.99 6626,-720 6690.72,-682.84 6723.02,-716.9 6790,-684 6812.37,-673.01 6810.95,-659.61 6833,-648 6885.67,-620.27 6907.59,-636.14 6962,-612 7002.24,-594.15 7044.43,-566.1 7072.05,-546.27"/>
+<polygon fill="black" stroke="black" points="7073.93,-549.23 7079.96,-540.52 7069.81,-543.57 7073.93,-549.23"/>
+</g>
+<!-- semialign&#45;&gt;tagged -->
+<g id="edge355" class="edge">
+<title>semialign&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M6546.1,-791.77C6549.52,-771.46 6558.26,-738.18 6580,-720 6639.92,-669.9 6682.81,-720.23 6752,-684 6772.61,-673.21 6772.2,-662.98 6790,-648 6871.88,-579.08 6882.59,-541.05 6983,-504 7096.87,-461.98 7406.92,-476.42 7528,-468 7592.9,-463.49 7667.95,-457.96 7714.95,-454.45"/>
+<polygon fill="black" stroke="black" points="7715.05,-457.96 7724.76,-453.72 7714.53,-450.98 7715.05,-457.96"/>
+</g>
+<!-- semialign&#45;&gt;these -->
+<g id="edge356" class="edge">
+<title>semialign&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M6502.66,-802.72C6347.66,-779.15 5802.05,-696.2 5649.75,-673.04"/>
+<polygon fill="black" stroke="black" points="5650.57,-669.63 5640.16,-671.58 5649.52,-676.55 5650.57,-669.63"/>
+</g>
+<!-- semialign&#45;&gt;unordered&#45;containers -->
+<g id="edge357" class="edge">
+<title>semialign&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M6514.66,-796.02C6458.69,-771.26 6336.27,-717.11 6269.2,-687.44"/>
+<polygon fill="black" stroke="black" points="6270.87,-684.35 6260.31,-683.51 6268.04,-690.75 6270.87,-684.35"/>
+</g>
+<!-- semialign&#45;&gt;vector -->
+<g id="edge358" class="edge">
+<title>semialign&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M6566.27,-794.09C6595.93,-774.78 6650.56,-741.09 6701,-720 6755.13,-697.37 6772.1,-701.8 6828,-684 6831.12,-683.01 6834.34,-681.94 6837.57,-680.86"/>
+<polygon fill="black" stroke="black" points="6838.7,-684.17 6847.01,-677.6 6836.41,-677.55 6838.7,-684.17"/>
+</g>
+<!-- semigroupoids -->
+<g id="node84" class="node">
+<title>semigroupoids</title>
+<ellipse fill="none" stroke="black" cx="7830" cy="-738" rx="65.53" ry="18"/>
+<text text-anchor="middle" x="7830" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">semigroupoids</text>
+</g>
+<!-- semialign&#45;&gt;semigroupoids -->
+<g id="edge354" class="edge">
+<title>semialign&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M6587.26,-805.46C6633.11,-801.78 6707.62,-796.01 6772,-792 7140.02,-769.07 7580.54,-749.55 7754.26,-742.16"/>
+<polygon fill="black" stroke="black" points="7754.21,-745.67 7764.05,-741.74 7753.91,-738.67 7754.21,-745.67"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances -->
+<g id="node89" class="node">
+<title>indexed&#45;traversable&#45;instances</title>
+<ellipse fill="none" stroke="black" cx="6976" cy="-738" rx="119.43" ry="18"/>
+<text text-anchor="middle" x="6976" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">indexed&#45;traversable&#45;instances</text>
+</g>
+<!-- semialign&#45;&gt;indexed&#45;traversable&#45;instances -->
+<g id="edge353" class="edge">
+<title>semialign&#45;&gt;indexed&#45;traversable&#45;instances</title>
+<path fill="none" stroke="black" d="M6585.03,-802.35C6653.57,-791.25 6792.93,-768.66 6885.39,-753.68"/>
+<polygon fill="black" stroke="black" points="6885.9,-757.14 6895.21,-752.09 6884.78,-750.23 6885.9,-757.14"/>
+</g>
+<!-- strict&#45;&gt;ghc&#45;prim -->
+<g id="edge383" class="edge">
+<title>strict&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M5563.52,-729.82C5578.02,-726.21 5596.37,-722.16 5613,-720 5822.95,-692.78 6359.77,-735.96 6565,-684 6600.07,-675.12 6605.3,-663.46 6638,-648 6778.26,-581.68 6811.8,-561.26 6956,-504 7114.98,-440.87 7320,-550.05 7320,-379 7320,-379 7320,-379 7320,-233 7320,-90.33 2460.92,-90.52 1940.08,-90.95"/>
+<polygon fill="black" stroke="black" points="1940.1,-87.45 1930.1,-90.96 1940.1,-94.45 1940.1,-87.45"/>
+</g>
+<!-- strict&#45;&gt;bytestring -->
+<g id="edge381" class="edge">
+<title>strict&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5507.7,-736.44C5402.55,-734.16 5034.57,-723.64 4734,-684 4652.68,-673.28 4634.5,-657.19 4553,-648 4482.31,-640.03 3331.63,-652.29 3273,-612 3201.57,-562.92 3266.23,-485.44 3198,-432 3154.62,-398.02 2998.48,-385.56 2912.24,-381.2"/>
+<polygon fill="black" stroke="black" points="2912.48,-377.71 2902.32,-380.72 2912.14,-384.7 2912.48,-377.71"/>
+</g>
+<!-- strict&#45;&gt;deepseq -->
+<g id="edge382" class="edge">
+<title>strict&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5563.52,-729.83C5578.02,-726.22 5596.38,-722.17 5613,-720 5714,-706.83 6438.24,-730.23 6529,-684 6619.8,-637.75 6585.47,-559.38 6671,-504 6862.19,-380.2 7168,-606.77 7168,-379 7168,-379 7168,-379 7168,-305 7168,-264.03 7176.29,-241.22 7144,-216 7087.25,-171.68 4756.17,-164.07 4373.03,-163.12"/>
+<polygon fill="black" stroke="black" points="4373.28,-159.62 4363.27,-163.09 4373.26,-166.62 4373.28,-159.62"/>
+</g>
+<!-- strict&#45;&gt;binary -->
+<g id="edge380" class="edge">
+<title>strict&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M5560.96,-727.27C5592.32,-714.3 5643.91,-692.04 5649,-684 5657.56,-670.48 5656.64,-662.06 5649,-648 5587.42,-534.65 5430.98,-480.73 5355.71,-460.69"/>
+<polygon fill="black" stroke="black" points="5356.8,-457.36 5346.24,-458.25 5355.05,-464.14 5356.8,-457.36"/>
+</g>
+<!-- strict&#45;&gt;text -->
+<g id="edge385" class="edge">
+<title>strict&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M5507.45,-737.24C5411.36,-737.48 5099.5,-734.07 4848,-684 4797.55,-673.96 4787.55,-661.83 4738,-648 4669.88,-628.98 4651.33,-630.25 4583,-612 4529.62,-597.74 4518.2,-586.77 4464,-576 4304.55,-544.31 4255.62,-587.02 4100,-540 4099.34,-539.8 4098.68,-539.59 4098.02,-539.36"/>
+<polygon fill="black" stroke="black" points="4099.42,-536.15 4088.85,-535.46 4096.68,-542.6 4099.42,-536.15"/>
+</g>
+<!-- strict&#45;&gt;hashable -->
+<g id="edge384" class="edge">
+<title>strict&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M5507.75,-735.52C5390.4,-729.46 4957.31,-705.79 4900,-684 4875.07,-674.52 4876.21,-659.17 4852,-648 4785.82,-617.46 4762.52,-630.43 4692,-612 4687.97,-610.95 4683.79,-609.8 4679.61,-608.62"/>
+<polygon fill="black" stroke="black" points="4680.68,-605.29 4670.1,-605.87 4678.74,-612.01 4680.68,-605.29"/>
+</g>
+<!-- strict&#45;&gt;these -->
+<g id="edge386" class="edge">
+<title>strict&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M5552.13,-722.5C5562.04,-712.99 5575.21,-700.36 5586.48,-689.55"/>
+<polygon fill="black" stroke="black" points="5588.75,-692.22 5593.55,-682.77 5583.91,-687.17 5588.75,-692.22"/>
+</g>
+<!-- tagged&#45;&gt;template&#45;haskell -->
+<g id="edge388" class="edge">
+<title>tagged&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7728.19,-442.95C7708.71,-439.48 7683.49,-435.19 7661,-432 7520.61,-412.11 7484.57,-414.61 7344,-396 7237.94,-381.96 7212.5,-370.09 7106,-360 6605.42,-312.59 5997.97,-307.34 5802.12,-306.95"/>
+<polygon fill="black" stroke="black" points="5802.16,-303.45 5792.15,-306.94 5802.15,-310.45 5802.16,-303.45"/>
+</g>
+<!-- tagged&#45;&gt;deepseq -->
+<g id="edge387" class="edge">
+<title>tagged&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M7736.29,-436.83C7645.38,-392.29 7329.09,-239.53 7220,-216 7075.48,-184.82 4754.93,-166.24 4373.01,-163.39"/>
+<polygon fill="black" stroke="black" points="4373.31,-159.89 4363.28,-163.31 4373.26,-166.89 4373.31,-159.89"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;time -->
+<g id="edge401" class="edge">
+<title>text&#45;iso8601&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M4614.78,-806.55C4484.94,-800.41 4163.39,-782.92 4059,-756 4020.85,-746.16 4016.13,-729.92 3978,-720 3807.4,-675.61 3758,-705.24 3583,-684 3558.01,-680.97 3530.01,-676.72 3508.26,-673.23"/>
+<polygon fill="black" stroke="black" points="3509.12,-669.82 3498.68,-671.67 3507.99,-676.73 3509.12,-669.82"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;text -->
+<g id="edge400" class="edge">
+<title>text&#45;iso8601&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4663.06,-791.87C4648.37,-758.01 4610.68,-682.83 4553,-648 4457.66,-590.43 4409.92,-649.38 4305,-612 4275.71,-601.56 4273.74,-587.88 4245,-576 4183.63,-550.64 4162.01,-563.75 4100,-540 4099.38,-539.76 4098.75,-539.51 4098.12,-539.26"/>
+<polygon fill="black" stroke="black" points="4099.88,-536.22 4089.34,-535.2 4096.95,-542.57 4099.88,-536.22"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;integer&#45;conversion -->
+<g id="edge399" class="edge">
+<title>text&#45;iso8601&#45;&gt;integer&#45;conversion</title>
+<path fill="none" stroke="black" d="M4652.47,-792.79C4631.76,-774.05 4595.81,-742.87 4562,-720 4544.73,-708.32 4524.64,-697 4507.24,-687.85"/>
+<polygon fill="black" stroke="black" points="4509.18,-684.91 4498.69,-683.42 4505.96,-691.13 4509.18,-684.91"/>
+</g>
+<!-- text&#45;iso8601&#45;&gt;time&#45;compat -->
+<g id="edge402" class="edge">
+<title>text&#45;iso8601&#45;&gt;time&#45;compat</title>
+<path fill="none" stroke="black" d="M4711.57,-797.48C4720.86,-795.31 4730.71,-793.31 4740,-792 5122.34,-738.18 5225.57,-809.2 5608,-756 5613.74,-755.2 5619.69,-754.15 5625.6,-752.95"/>
+<polygon fill="black" stroke="black" points="5626.32,-756.38 5635.35,-750.83 5624.84,-749.54 5626.32,-756.38"/>
+</g>
+<!-- text&#45;short&#45;&gt;ghc&#45;prim -->
+<g id="edge406" class="edge">
+<title>text&#45;short&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M5483.21,-659.38C5587.39,-645.81 5843.94,-612.39 5845,-612 6014.17,-550.5 6207.76,-422.38 6088,-288 5902.25,-79.59 5118.56,-162.53 4840,-144 4240.86,-104.14 2262.55,-92.81 1939.72,-91.21"/>
+<polygon fill="black" stroke="black" points="1940.05,-87.71 1930.03,-91.16 1940.02,-94.71 1940.05,-87.71"/>
+</g>
+<!-- text&#45;short&#45;&gt;template&#45;haskell -->
+<g id="edge408" class="edge">
+<title>text&#45;short&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M5468,-651.36C5504.13,-632.08 5565.7,-593.2 5594,-540 5631.71,-469.09 5562.46,-424.73 5610,-360 5625.37,-339.07 5650.54,-326.37 5674.52,-318.68"/>
+<polygon fill="black" stroke="black" points="5675.34,-322.08 5683.95,-315.91 5673.37,-315.36 5675.34,-322.08"/>
+</g>
+<!-- text&#45;short&#45;&gt;bytestring -->
+<g id="edge404" class="edge">
+<title>text&#45;short&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5399.34,-657.08C5383.09,-654.05 5364.19,-650.67 5347,-648 5223.02,-628.71 5190.24,-635.56 5067,-612 5003.47,-599.85 4988.92,-590.98 4926,-576 4781.65,-541.64 4745.37,-533.75 4600,-504 4430.74,-469.37 4389.67,-451.41 4218,-432 3959.2,-402.74 3139.27,-384.65 2912.57,-380.12"/>
+<polygon fill="black" stroke="black" points="2912.87,-376.63 2902.81,-379.93 2912.74,-383.63 2912.87,-376.63"/>
+</g>
+<!-- text&#45;short&#45;&gt;deepseq -->
+<g id="edge405" class="edge">
+<title>text&#45;short&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5444.65,-647.63C5459.3,-588.65 5498.15,-393.88 5404,-288 5303.09,-174.52 5220.54,-235.95 5070,-216 4759.86,-174.9 4673.67,-241.88 4367,-180 4364.83,-179.56 4362.63,-179.04 4360.42,-178.46"/>
+<polygon fill="black" stroke="black" points="4361.49,-175.13 4350.9,-175.59 4359.46,-181.83 4361.49,-175.13"/>
+</g>
+<!-- text&#45;short&#45;&gt;binary -->
+<g id="edge403" class="edge">
+<title>text&#45;short&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M5434.39,-648.01C5423.86,-617.5 5399.16,-552.13 5366,-504 5358.38,-492.95 5348.36,-482.12 5339.15,-473.16"/>
+<polygon fill="black" stroke="black" points="5341.79,-470.84 5332.11,-466.54 5337,-475.94 5341.79,-470.84"/>
+</g>
+<!-- text&#45;short&#45;&gt;text -->
+<g id="edge409" class="edge">
+<title>text&#45;short&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M5399.83,-656.94C5383.49,-653.85 5364.39,-650.48 5347,-648 5191.75,-625.88 5151.43,-632.79 4996,-612 4898.67,-598.98 4875.51,-587.67 4778,-576 4522.74,-545.46 4213.6,-529.56 4106.62,-524.67"/>
+<polygon fill="black" stroke="black" points="4106.83,-521.18 4096.68,-524.22 4106.51,-528.17 4106.83,-521.18"/>
+</g>
+<!-- text&#45;short&#45;&gt;hashable -->
+<g id="edge407" class="edge">
+<title>text&#45;short&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M5399.87,-656.63C5383.53,-653.49 5364.43,-650.17 5347,-648 5107.86,-618.29 5046.15,-631.92 4806,-612 4766.07,-608.69 4720.96,-604.17 4687.11,-600.63"/>
+<polygon fill="black" stroke="black" points="4687.9,-597.19 4677.59,-599.62 4687.17,-604.15 4687.9,-597.19"/>
+</g>
+<!-- th&#45;abstraction&#45;&gt;ghc&#45;prim -->
+<g id="edge411" class="edge">
+<title>th&#45;abstraction&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M7509.18,-584.52C7614.76,-567.83 7858.42,-530.08 8064,-504 8138.28,-494.58 8343.39,-518.14 8399,-468 8429.04,-440.91 8418,-419.45 8418,-379 8418,-379 8418,-379 8418,-233 8418,-180.39 9052.13,-257.7 8053,-144 7730.55,-107.31 2478.98,-92.54 1939.63,-91.11"/>
+<polygon fill="black" stroke="black" points="1939.99,-87.62 1929.98,-91.09 1939.97,-94.62 1939.99,-87.62"/>
+</g>
+<!-- th&#45;abstraction&#45;&gt;template&#45;haskell -->
+<g id="edge412" class="edge">
+<title>th&#45;abstraction&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7444.91,-575.94C7431.51,-556.41 7407.31,-524.48 7380,-504 7253.15,-408.88 7191.61,-442.39 7040,-396 7000.38,-383.88 6994.44,-369.04 6954,-360 6731.4,-310.22 6019.46,-306.71 5801.81,-306.83"/>
+<polygon fill="black" stroke="black" points="5802.12,-303.33 5792.12,-306.84 5802.13,-310.33 5802.12,-303.33"/>
+</g>
+<!-- th&#45;abstraction&#45;&gt;containers -->
+<g id="edge410" class="edge">
+<title>th&#45;abstraction&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M7427.79,-577.57C7391.34,-558.15 7325.48,-524.83 7266,-504 7201.29,-481.34 7178.04,-497.17 7116,-468 7091.87,-456.65 7092.9,-441.55 7068,-432 6971.42,-394.96 6664.08,-383.47 6533.08,-380.19"/>
+<polygon fill="black" stroke="black" points="6533.31,-376.7 6523.22,-379.96 6533.14,-383.7 6533.31,-376.7"/>
+</g>
+<!-- these&#45;&gt;deepseq -->
+<g id="edge414" class="edge">
+<title>these&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5638.26,-660.09C5697.17,-649.66 5829,-625.13 5845,-612 5937.65,-535.97 6000.43,-464.08 5941,-360 5869.05,-234 5789.63,-247.55 5648,-216 5398.93,-160.51 4588.93,-161.34 4373.2,-162.6"/>
+<polygon fill="black" stroke="black" points="4373.39,-159.09 4363.41,-162.66 4373.43,-166.09 4373.39,-159.09"/>
+</g>
+<!-- these&#45;&gt;binary -->
+<g id="edge413" class="edge">
+<title>these&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M5591.85,-651.5C5554.34,-623.65 5465.48,-557.93 5390,-504 5374.69,-493.06 5357.5,-481.05 5343.34,-471.23"/>
+<polygon fill="black" stroke="black" points="5345.55,-468.5 5335.33,-465.69 5341.56,-474.26 5345.55,-468.5"/>
+</g>
+<!-- these&#45;&gt;hashable -->
+<g id="edge415" class="edge">
+<title>these&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M5581.73,-660.13C5558.5,-656.3 5524.71,-651.11 5495,-648 5191.05,-616.23 4824.53,-601.41 4688.88,-596.72"/>
+<polygon fill="black" stroke="black" points="4689.24,-593.23 4679.12,-596.39 4689,-600.23 4689.24,-593.23"/>
+</g>
+<!-- time&#45;compat&#45;&gt;template&#45;haskell -->
+<g id="edge421" class="edge">
+<title>time&#45;compat&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M5681.39,-719.61C5690.46,-653.49 5722.87,-417.29 5734.12,-335.29"/>
+<polygon fill="black" stroke="black" points="5737.55,-336.02 5735.44,-325.63 5730.62,-335.07 5737.55,-336.02"/>
+</g>
+<!-- time&#45;compat&#45;&gt;deepseq -->
+<g id="edge419" class="edge">
+<title>time&#45;compat&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M5735.44,-734.92C5938.72,-727.3 6622.39,-700.49 6638,-684 6766.2,-548.51 6648.27,-399.85 6499,-288 6426.07,-233.35 6396.45,-233.46 6307,-216 6112.62,-178.07 4669.12,-165.55 4372.99,-163.37"/>
+<polygon fill="black" stroke="black" points="4373.29,-159.87 4363.26,-163.29 4373.23,-166.87 4373.29,-159.87"/>
+</g>
+<!-- time&#45;compat&#45;&gt;time -->
+<g id="edge422" class="edge">
+<title>time&#45;compat&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M5631.29,-727.72C5613.67,-724.69 5593.49,-721.67 5575,-720 4693.11,-640.37 4465.33,-758.6 3583,-684 3557.75,-681.87 3529.55,-677.57 3507.76,-673.84"/>
+<polygon fill="black" stroke="black" points="3508.63,-670.44 3498.18,-672.15 3507.42,-677.33 3508.63,-670.44"/>
+</g>
+<!-- time&#45;compat&#45;&gt;hashable -->
+<g id="edge420" class="edge">
+<title>time&#45;compat&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M5630.73,-728.02C5613.23,-725.06 5593.28,-722 5575,-720 5434.06,-704.54 5071.19,-732.61 4938,-684 4912.95,-674.86 4914.48,-658.58 4890,-648 4804.28,-610.96 4773.33,-635.67 4683,-612 4681,-611.48 4678.97,-610.91 4676.92,-610.3"/>
+<polygon fill="black" stroke="black" points="4678.04,-606.99 4667.45,-607.29 4675.92,-613.66 4678.04,-606.99"/>
+</g>
+<!-- base&#45;orphans -->
+<g id="node66" class="node">
+<title>base&#45;orphans</title>
+<ellipse fill="none" stroke="black" cx="8123" cy="-450" rx="60.54" ry="18"/>
+<text text-anchor="middle" x="8123" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">base&#45;orphans</text>
+</g>
+<!-- time&#45;compat&#45;&gt;base&#45;orphans -->
+<g id="edge418" class="edge">
+<title>time&#45;compat&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M5735.37,-734.69C5939.51,-726.22 6630.52,-696.74 6676,-684 6838.76,-638.42 6848.07,-548.95 7011,-504 7181.27,-457.03 7628.59,-476.71 7805,-468 7890.17,-463.79 7988.15,-458.48 8052.58,-454.93"/>
+<polygon fill="black" stroke="black" points="8052.51,-458.44 8062.3,-454.39 8052.12,-451.45 8052.51,-458.44"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;template&#45;haskell -->
+<g id="edge434" class="edge">
+<title>unordered&#45;containers&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M6183.27,-649.52C6114.05,-621.18 5969.27,-555.71 5870,-468 5822.91,-426.39 5778.91,-367.05 5755.51,-333.25"/>
+<polygon fill="black" stroke="black" points="5758.59,-331.55 5750.06,-325.28 5752.81,-335.51 5758.59,-331.55"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;deepseq -->
+<g id="edge432" class="edge">
+<title>unordered&#45;containers&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6222.74,-647.65C6221.85,-617.66 6218.05,-554.51 6202,-504 6169.13,-400.55 6167.95,-361.43 6088,-288 6027.57,-232.5 5998.13,-233.66 5918,-216 5764.57,-182.19 4632.74,-166.73 4373.01,-163.61"/>
+<polygon fill="black" stroke="black" points="4373.22,-160.11 4363.18,-163.49 4373.13,-167.11 4373.22,-160.11"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;hashable -->
+<g id="edge433" class="edge">
+<title>unordered&#45;containers&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M6136.21,-661.17C5847.07,-648.43 4921.68,-607.64 4688.66,-597.37"/>
+<polygon fill="black" stroke="black" points="4689.11,-593.88 4678.97,-596.94 4688.8,-600.88 4689.11,-593.88"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;template&#45;haskell -->
+<g id="edge440" class="edge">
+<title>uuid&#45;types&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M4992.81,-653.74C4946.63,-637.38 4870.67,-602.01 4844,-540 4812.39,-466.51 4789.13,-418.22 4844,-360 4872.43,-329.84 5473.85,-313.15 5673.92,-308.42"/>
+<polygon fill="black" stroke="black" points="5673.96,-311.92 5683.88,-308.18 5673.8,-304.92 5673.96,-311.92"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;bytestring -->
+<g id="edge436" class="edge">
+<title>uuid&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4991.85,-654.24C4954.23,-643.61 4895.11,-626.82 4844,-612 4789.7,-596.25 4776.99,-589.1 4722,-576 4375.67,-493.5 4287.67,-472.81 3934,-432 3545.86,-387.21 3074.98,-380.22 2912.45,-379.17"/>
+<polygon fill="black" stroke="black" points="2912.82,-375.67 2902.8,-379.11 2912.78,-382.67 2912.82,-375.67"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;deepseq -->
+<g id="edge437" class="edge">
+<title>uuid&#45;types&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M4996.78,-652.18C4974.17,-642.71 4944.08,-628.61 4920,-612 4820.92,-543.68 4782,-499.36 4782,-379 4782,-379 4782,-379 4782,-305 4782,-259.85 4770.7,-240.85 4733,-216 4664.76,-171.02 4446.71,-198.04 4367,-180 4364.87,-179.52 4362.71,-178.97 4360.54,-178.37"/>
+<polygon fill="black" stroke="black" points="4361.79,-175.09 4351.2,-175.47 4359.71,-181.77 4361.79,-175.09"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;binary -->
+<g id="edge435" class="edge">
+<title>uuid&#45;types&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M5063.51,-652.34C5086.74,-642.84 5117.9,-628.65 5143,-612 5203.82,-571.65 5263.19,-509.01 5293.41,-474.98"/>
+<polygon fill="black" stroke="black" points="5295.82,-477.54 5299.79,-467.72 5290.56,-472.92 5295.82,-477.54"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;text -->
+<g id="edge441" class="edge">
+<title>uuid&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4991.92,-654.16C4983.43,-651.95 4974.44,-649.76 4966,-648 4862.13,-626.35 4826.7,-655.67 4730,-612 4707.28,-601.74 4710.04,-585.5 4687,-576 4581.08,-532.31 4224.64,-524.63 4106.44,-523.29"/>
+<polygon fill="black" stroke="black" points="4106.68,-519.79 4096.64,-523.18 4106.61,-526.79 4106.68,-519.79"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;random -->
+<g id="edge439" class="edge">
+<title>uuid&#45;types&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M4980.56,-663.12C4893.95,-659.84 4709.12,-652.98 4553,-648 3984.18,-629.86 3840.86,-649.73 3273,-612 3234.93,-609.47 3191.98,-604.88 3159.88,-601.11"/>
+<polygon fill="black" stroke="black" points="3160.42,-597.65 3150.08,-599.94 3159.59,-604.6 3160.42,-597.65"/>
+</g>
+<!-- uuid&#45;types&#45;&gt;hashable -->
+<g id="edge438" class="edge">
+<title>uuid&#45;types&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M4991.95,-654.03C4983.45,-651.82 4974.46,-649.67 4966,-648 4845.51,-624.18 4812.12,-637.63 4692,-612 4687.69,-611.08 4683.24,-610 4678.8,-608.83"/>
+<polygon fill="black" stroke="black" points="4679.96,-605.51 4669.38,-606.2 4678.07,-612.26 4679.96,-605.51"/>
+</g>
+<!-- vector&#45;&gt;deepseq -->
+<g id="edge442" class="edge">
+<title>vector&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M6879.16,-647.81C6886.32,-614.21 6907.08,-539.95 6956,-504 7037.96,-443.77 7115.98,-545.37 7182,-468 7254.7,-382.8 7260.46,-295.93 7182,-216 7130.85,-163.9 4760.59,-162.79 4373.26,-162.96"/>
+<polygon fill="black" stroke="black" points="4373.38,-159.46 4363.38,-162.96 4373.38,-166.46 4373.38,-159.46"/>
+</g>
+<!-- vector&#45;&gt;random -->
+<g id="edge444" class="edge">
+<title>vector&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M6842.03,-662.91C6779.92,-659.18 6643.85,-651.45 6529,-648 5805.73,-626.29 3995.39,-653.8 3273,-612 3234.78,-609.79 3191.68,-605.16 3159.55,-601.29"/>
+<polygon fill="black" stroke="black" points="3160.09,-597.83 3149.74,-600.09 3159.24,-604.78 3160.09,-597.83"/>
+</g>
+<!-- vector&#45;&gt;primitive -->
+<g id="edge443" class="edge">
+<title>vector&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M6842.1,-662.81C6686.28,-652.74 6038.26,-610.85 5846.61,-598.47"/>
+<polygon fill="black" stroke="black" points="5846.9,-594.98 5836.69,-597.82 5846.45,-601.96 5846.9,-594.98"/>
+</g>
+<!-- witherable&#45;&gt;containers -->
+<g id="edge446" class="edge">
+<title>witherable&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M6828.46,-791.79C6828.73,-772.41 6831.91,-740.91 6848,-720 6869.58,-691.96 6900.48,-714.15 6919,-684 6927.37,-670.37 6926.93,-661.89 6919,-648 6903.39,-620.66 6884.66,-628.74 6858,-612 6809.14,-581.33 6797.04,-573.4 6750,-540 6685.06,-493.89 6676.44,-471 6607,-432 6579.42,-416.51 6546.4,-403.39 6520.03,-394.08"/>
+<polygon fill="black" stroke="black" points="6521.2,-390.78 6510.61,-390.82 6518.92,-397.4 6521.2,-390.78"/>
+</g>
+<!-- witherable&#45;&gt;hashable -->
+<g id="edge447" class="edge">
+<title>witherable&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M6782.58,-805.03C6735.96,-801.17 6662.05,-795.4 6598,-792 6109.98,-766.06 5986.45,-791.05 5499,-756 5426.85,-750.81 4920.07,-708.48 4852,-684 4824.51,-674.11 4823.4,-660.52 4797,-648 4748.99,-625.24 4733.38,-628.87 4683,-612 4681.18,-611.39 4679.33,-610.77 4677.46,-610.13"/>
+<polygon fill="black" stroke="black" points="4678.73,-606.86 4668.13,-606.9 4676.44,-613.48 4678.73,-606.86"/>
+</g>
+<!-- witherable&#45;&gt;indexed&#45;traversable -->
+<g id="edge448" class="edge">
+<title>witherable&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M6876.71,-806.88C6947.67,-802.61 7075.71,-790.26 7104,-756 7129.07,-725.63 7115.43,-606.67 7107.46,-551.45"/>
+<polygon fill="black" stroke="black" points="7110.97,-551.25 7106.03,-541.88 7104.04,-552.28 7110.97,-551.25"/>
+</g>
+<!-- witherable&#45;&gt;unordered&#45;containers -->
+<g id="edge450" class="edge">
+<title>witherable&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M6789.24,-799.68C6687.64,-775.88 6417.58,-712.59 6290.68,-682.86"/>
+<polygon fill="black" stroke="black" points="6291.59,-679.48 6281.06,-680.6 6290,-686.29 6291.59,-679.48"/>
+</g>
+<!-- witherable&#45;&gt;vector -->
+<g id="edge451" class="edge">
+<title>witherable&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M6820.75,-791.82C6813.1,-773.3 6804.36,-743.34 6815,-720 6821.14,-706.54 6832.57,-695.17 6843.9,-686.46"/>
+<polygon fill="black" stroke="black" points="6845.92,-689.31 6852.03,-680.66 6841.86,-683.61 6845.92,-689.31"/>
+</g>
+<!-- witherable&#45;&gt;base&#45;orphans -->
+<g id="edge445" class="edge">
+<title>witherable&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M6877.14,-807.84C7080.37,-802.8 7859.85,-781.84 7905,-756 7988.02,-708.48 7966.84,-653.43 8023,-576 8048.75,-540.49 8080.76,-501.25 8101.53,-476.38"/>
+<polygon fill="black" stroke="black" points="8104.18,-478.66 8107.92,-468.75 8098.82,-474.16 8104.18,-478.66"/>
+</g>
+<!-- witherable&#45;&gt;indexed&#45;traversable&#45;instances -->
+<g id="edge449" class="edge">
+<title>witherable&#45;&gt;indexed&#45;traversable&#45;instances</title>
+<path fill="none" stroke="black" d="M6857.69,-795.34C6878.51,-785.42 6907.08,-771.82 6930.93,-760.46"/>
+<polygon fill="black" stroke="black" points="6932.27,-763.7 6939.8,-756.24 6929.26,-757.38 6932.27,-763.7"/>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint -->
+<g id="node56" class="node">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint</title>
+<ellipse fill="none" stroke="black" cx="4044" cy="-882" rx="140.88" ry="18"/>
+<text text-anchor="middle" x="4044" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint</text>
+</g>
+<!-- ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint -->
+<g id="edge69" class="edge">
+<title>ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint</title>
+<path fill="none" stroke="black" d="M4528.87,-1079.85C4513.79,-1045.96 4475.21,-970.71 4417,-936 4377.81,-912.63 4270.53,-898.99 4181.03,-891.42"/>
+<polygon fill="black" stroke="black" points="4181.41,-887.94 4171.16,-890.6 4180.83,-894.91 4181.41,-887.94"/>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;text -->
+<g id="edge321" class="edge">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4040.1,-863.83C4035.65,-845.58 4027.61,-816.09 4017,-792 3976.7,-700.48 3899.64,-659.93 3954,-576 3970.9,-549.91 4004.28,-536.44 4030.57,-529.63"/>
+<polygon fill="black" stroke="black" points="4031.29,-533.06 4040.23,-527.37 4029.69,-526.24 4031.29,-533.06"/>
+</g>
+<!-- prettyprinter -->
+<g id="node96" class="node">
+<title>prettyprinter</title>
+<ellipse fill="none" stroke="black" cx="3880" cy="-738" rx="56.05" ry="18"/>
+<text text-anchor="middle" x="3880" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">prettyprinter</text>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter -->
+<g id="edge319" class="edge">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M4036.84,-863.58C4028.05,-844.02 4011.5,-812.34 3989,-792 3971.8,-776.45 3949.21,-764.47 3929.06,-755.86"/>
+<polygon fill="black" stroke="black" points="3930.46,-752.65 3919.88,-752.12 3927.81,-759.14 3930.46,-752.65"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal -->
+<g id="node97" class="node">
+<title>prettyprinter&#45;ansi&#45;terminal</title>
+<ellipse fill="none" stroke="black" cx="3858" cy="-810" rx="105.45" ry="18"/>
+<text text-anchor="middle" x="3858" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">prettyprinter&#45;ansi&#45;terminal</text>
+</g>
+<!-- prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter&#45;ansi&#45;terminal -->
+<g id="edge320" class="edge">
+<title>prettyprinter&#45;compat&#45;ansi&#45;wl&#45;pprint&#45;&gt;prettyprinter&#45;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M4000.39,-864.59C3973.64,-854.52 3939.2,-841.56 3910.89,-830.91"/>
+<polygon fill="black" stroke="black" points="3912.38,-827.73 3901.79,-827.48 3909.92,-834.28 3912.38,-827.73"/>
+</g>
+<!-- async -->
+<g id="node57" class="node">
+<title>async</title>
+<ellipse fill="none" stroke="black" cx="1270" cy="-738" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="1270" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">async</text>
+</g>
+<!-- async&#45;&gt;stm -->
+<g id="edge71" class="edge">
+<title>async&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M1242.48,-728.32C1113.25,-687.21 567.12,-509.27 431,-396 308.82,-294.33 227.99,-114.35 200.47,-46.19"/>
+<polygon fill="black" stroke="black" points="203.87,-45.28 196.93,-37.28 197.37,-47.87 203.87,-45.28"/>
+</g>
+<!-- async&#45;&gt;hashable -->
+<g id="edge70" class="edge">
+<title>async&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M1301.87,-735.41C1362.72,-732.39 1499.7,-725.6 1615,-720 2284.75,-687.5 2451.93,-673.22 3122,-648 3703.59,-626.11 3849.89,-644.18 4431,-612 4482.46,-609.15 4541.09,-604.07 4582.24,-600.21"/>
+<polygon fill="black" stroke="black" points="4582.5,-603.7 4592.12,-599.27 4581.84,-596.73 4582.5,-603.7"/>
+</g>
+<!-- attoparsec&#45;&gt;ghc&#45;prim -->
+<g id="edge75" class="edge">
+<title>attoparsec&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M3110.38,-726.47C3102.33,-724.31 3093.89,-722.06 3086,-720 3063.31,-714.08 1449,-330.45 1449,-307 1449,-307 1449,-307 1449,-233 1449,-169.77 1502.17,-169.57 1560,-144 1657.29,-100.98 1784.09,-92.28 1850.31,-90.89"/>
+<polygon fill="black" stroke="black" points="1850.1,-94.39 1860.04,-90.74 1849.99,-87.39 1850.1,-94.39"/>
+</g>
+<!-- attoparsec&#45;&gt;bytestring -->
+<g id="edge72" class="edge">
+<title>attoparsec&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3158.78,-720.09C3168.55,-700.69 3180.02,-668.89 3164,-648 3126.48,-599.06 3077.41,-651.43 3030,-612 2961.83,-555.31 3003.92,-497.35 2944,-432 2930.6,-417.39 2912.24,-405.59 2895.59,-396.87"/>
+<polygon fill="black" stroke="black" points="2897.37,-393.85 2886.86,-392.52 2894.24,-400.11 2897.37,-393.85"/>
+</g>
+<!-- attoparsec&#45;&gt;containers -->
+<g id="edge73" class="edge">
+<title>attoparsec&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3197.88,-735.68C3308.02,-732.73 3584.03,-725.42 3815,-720 4001.66,-715.62 5313.29,-726.91 5495,-684 5531.38,-675.41 5535.15,-658.56 5571,-648 5688.82,-613.29 5730.69,-656.93 5845,-612 5973.43,-561.52 5969.81,-483.11 6098,-432 6203.29,-390.02 6336.84,-380.54 6412.83,-378.83"/>
+<polygon fill="black" stroke="black" points="6412.62,-382.34 6422.56,-378.66 6412.49,-375.34 6412.62,-382.34"/>
+</g>
+<!-- attoparsec&#45;&gt;deepseq -->
+<g id="edge74" class="edge">
+<title>attoparsec&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3117.61,-723.86C3013.8,-678.47 2693.94,-522.21 2798,-360 2885.07,-224.28 2973.52,-250.63 3131,-216 3352.12,-167.38 4065.9,-163.16 4266.89,-162.96"/>
+<polygon fill="black" stroke="black" points="4266.77,-166.46 4276.77,-162.95 4266.76,-159.46 4266.77,-166.46"/>
+</g>
+<!-- attoparsec&#45;&gt;text -->
+<g id="edge77" class="edge">
+<title>attoparsec&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3164.92,-720.71C3188.12,-697.38 3230.57,-656.35 3250,-648 3414.81,-577.19 3484.53,-676.27 3652,-612 3676.9,-602.45 3675.2,-585.81 3700,-576 3835.97,-522.23 3885.38,-576.37 4027,-540 4029.98,-539.24 4033.02,-538.3 4036.04,-537.26"/>
+<polygon fill="black" stroke="black" points="4037.19,-540.56 4045.28,-533.72 4034.69,-534.03 4037.19,-540.56"/>
+</g>
+<!-- attoparsec&#45;&gt;scientific -->
+<g id="edge76" class="edge">
+<title>attoparsec&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M3198.11,-735.74C3490.43,-728.2 4991.86,-689.35 5089,-684 5140.55,-681.16 5199.26,-676.11 5240.59,-672.24"/>
+<polygon fill="black" stroke="black" points="5240.9,-675.73 5250.53,-671.31 5240.25,-668.76 5240.9,-675.73"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge83" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M3615.28,-1024.21C4185.14,-1018.37 7720.15,-981.81 7945,-972 8066.51,-966.7 9036,-1004.62 9036,-883 9036,-883 9036,-883 9036,-161 9036,-121.73 9037.16,-76.37 9038.04,-47.69"/>
+<polygon fill="black" stroke="black" points="9041.53,-48.1 9038.35,-38 9034.53,-47.88 9041.53,-48.1"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;bytestring -->
+<g id="edge82" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3506.89,-1009.14C3429.49,-969.95 3221.67,-866.36 3043,-792 2999.77,-774.01 2975.57,-790.57 2944,-756 2851.76,-654.98 2849.26,-476.66 2852.14,-407.51"/>
+<polygon fill="black" stroke="black" points="2855.63,-407.95 2852.63,-397.79 2848.63,-407.61 2855.63,-407.95"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;time -->
+<g id="edge88" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M3534.89,-1007.69C3530.74,-983.63 3523.62,-938.68 3521,-900 3517.76,-852.11 3507.54,-838.07 3521,-792 3526.32,-773.78 3538.68,-774.22 3544,-756 3548.49,-740.64 3551.27,-734.25 3544,-720 3535.36,-703.06 3518.5,-690.27 3503.16,-681.5"/>
+<polygon fill="black" stroke="black" points="3505.2,-678.62 3494.73,-677.02 3501.92,-684.8 3505.2,-678.62"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;random -->
+<g id="edge87" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M3523.67,-1007.82C3477.18,-952.53 3325.21,-775.44 3181,-648 3168.44,-636.9 3153.75,-625.56 3141.09,-616.23"/>
+<polygon fill="black" stroke="black" points="3143.23,-613.46 3133.08,-610.41 3139.12,-619.12 3143.23,-613.46"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;RSA -->
+<g id="edge78" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;RSA</title>
+<path fill="none" stroke="black" d="M3613.55,-1021.62C3745.88,-1015.22 4028.04,-999.46 4265,-972 4581.81,-935.29 4670.51,-942.96 4968,-828 5067.5,-789.55 5130.09,-786.39 5160,-684 5164.49,-668.64 5166.26,-662.72 5160,-648 5154.46,-634.97 5143.98,-623.6 5133.64,-614.76"/>
+<polygon fill="black" stroke="black" points="5135.91,-612.09 5125.91,-608.61 5131.56,-617.57 5135.91,-612.09"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;SHA -->
+<g id="edge79" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;SHA</title>
+<path fill="none" stroke="black" d="M3604.61,-1016.49C3732.54,-1000.23 4021.49,-963.87 4265,-936 4415.09,-918.82 4454.09,-925.46 4603,-900 4671.43,-888.3 4687.17,-878.81 4755,-864 4834.71,-846.6 4863.92,-868.05 4935,-828 4953.91,-817.34 4950.32,-804.59 4968,-792 5000.75,-768.67 5019.44,-780.91 5051,-756 5082.4,-731.21 5092.35,-721.95 5105,-684 5110.06,-668.82 5111.32,-662.7 5105,-648 5095.81,-626.63 5080.29,-631.1 5067,-612 5053.95,-593.25 5044.04,-569.3 5037.62,-550.97"/>
+<polygon fill="black" stroke="black" points="5040.96,-549.93 5034.47,-541.55 5034.32,-552.15 5040.96,-549.93"/>
+</g>
+<!-- base64&#45;bytestring -->
+<g id="node60" class="node">
+<title>base64&#45;bytestring</title>
+<ellipse fill="none" stroke="black" cx="2832" cy="-882" rx="76.01" ry="18"/>
+<text text-anchor="middle" x="2832" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">base64&#45;bytestring</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;base64&#45;bytestring -->
+<g id="edge80" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;base64&#45;bytestring</title>
+<path fill="none" stroke="black" d="M3481.66,-1013.29C3471.8,-1011.41 3461.61,-1009.56 3452,-1008 3327.28,-987.74 3294.02,-996.14 3170,-972 3069.43,-952.43 2954.48,-919.96 2887.88,-900.12"/>
+<polygon fill="black" stroke="black" points="2889.25,-896.87 2878.66,-897.36 2887.24,-903.58 2889.25,-896.87"/>
+</g>
+<!-- blaze&#45;builder -->
+<g id="node61" class="node">
+<title>blaze&#45;builder</title>
+<ellipse fill="none" stroke="black" cx="3340" cy="-594" rx="58.05" ry="18"/>
+<text text-anchor="middle" x="3340" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">blaze&#45;builder</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;blaze&#45;builder -->
+<g id="edge81" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;blaze&#45;builder</title>
+<path fill="none" stroke="black" d="M3540,-1007.83C3546.93,-947.49 3568.99,-747.36 3560,-720 3547.6,-682.25 3539.3,-671.14 3507,-648 3476.23,-625.95 3435.92,-612.82 3402.61,-605.14"/>
+<polygon fill="black" stroke="black" points="3403.6,-601.77 3393.08,-603.06 3402.11,-608.61 3403.6,-601.77"/>
+</g>
+<!-- data&#45;default -->
+<g id="node62" class="node">
+<title>data&#45;default</title>
+<ellipse fill="none" stroke="black" cx="6026" cy="-810" rx="54.06" ry="18"/>
+<text text-anchor="middle" x="6026" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">data&#45;default</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;data&#45;default -->
+<g id="edge84" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M3614.56,-1022.59C3948,-1011.77 5275.11,-965.38 5687,-900 5792.52,-883.25 5912.78,-847.61 5977.91,-826.87"/>
+<polygon fill="black" stroke="black" points="5978.75,-830.27 5987.2,-823.89 5976.61,-823.61 5978.75,-830.27"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;http&#45;client -->
+<g id="edge85" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;http&#45;client</title>
+<path fill="none" stroke="black" d="M3483.14,-1012.91C3472.84,-1010.99 3462.12,-1009.24 3452,-1008 3122.51,-967.71 3033.21,-1027.84 2706,-972 2702.22,-971.36 2698.34,-970.54 2694.46,-969.62"/>
+<polygon fill="black" stroke="black" points="2695.68,-966.32 2685.12,-967.17 2693.9,-973.09 2695.68,-966.32"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;http&#45;types -->
+<g id="edge86" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M3480.7,-1013.58C3404.83,-998.45 3279.96,-973.47 3275,-972 3208.39,-952.29 3133.95,-920.9 3089.59,-901.15"/>
+<polygon fill="black" stroke="black" points="3091.19,-898.04 3080.63,-897.14 3088.33,-904.42 3091.19,-898.04"/>
+</g>
+<!-- transformers&#45;compat -->
+<g id="node65" class="node">
+<title>transformers&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="8648" cy="-522" rx="88.49" ry="18"/>
+<text text-anchor="middle" x="8648" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">transformers&#45;compat</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;transformers&#45;compat -->
+<g id="edge89" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M3615.63,-1024.22C4077.09,-1019.51 6463.96,-994.41 7197,-972 7540.1,-961.51 8451.26,-1085.63 8740,-900 8858.23,-823.99 8722.65,-621.48 8668.43,-549.14"/>
+<polygon fill="black" stroke="black" points="8671.39,-547.26 8662.56,-541.41 8665.82,-551.49 8671.39,-547.26"/>
+</g>
+<!-- base64&#45;bytestring&#45;&gt;bytestring -->
+<g id="edge92" class="edge">
+<title>base64&#45;bytestring&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2796.92,-865.6C2757.95,-846.32 2697.06,-809.23 2671,-756 2663.96,-741.63 2669.05,-735.88 2671,-720 2687.12,-589.05 2659.51,-534.16 2743,-432 2758.55,-412.97 2782.54,-400.34 2804.25,-392.2"/>
+<polygon fill="black" stroke="black" points="2805.29,-395.55 2813.58,-388.95 2802.98,-388.94 2805.29,-395.55"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;ghc&#45;prim -->
+<g id="edge104" class="edge">
+<title>blaze&#45;builder&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M3340.29,-575.68C3340.04,-557.31 3338.06,-527.71 3329,-504 3315.09,-467.61 3311.02,-454.2 3279,-432 2851.67,-135.71 2651.45,-261.94 2145,-144 2073.24,-127.29 1989.38,-109.96 1939.32,-99.84"/>
+<polygon fill="black" stroke="black" points="1940.23,-96.45 1929.74,-97.91 1938.85,-103.32 1940.23,-96.45"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;bytestring -->
+<g id="edge102" class="edge">
+<title>blaze&#45;builder&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3335.61,-575.64C3326.06,-541.74 3299.94,-466.98 3248,-432 3194.36,-395.88 3008.15,-384.24 2912.18,-380.6"/>
+<polygon fill="black" stroke="black" points="2912.58,-377.11 2902.46,-380.25 2912.32,-384.1 2912.58,-377.11"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;deepseq -->
+<g id="edge103" class="edge">
+<title>blaze&#45;builder&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3363.86,-577.17C3376.32,-567.74 3390.84,-554.76 3400,-540 3421.6,-505.19 3424,-491.97 3424,-451 3424,-451 3424,-451 3424,-305 3424,-256.79 3444,-239.66 3486,-216 3553.81,-177.81 4093.85,-166.41 4266.87,-163.71"/>
+<polygon fill="black" stroke="black" points="4266.74,-167.22 4276.69,-163.57 4266.64,-160.22 4266.74,-167.22"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;text -->
+<g id="edge105" class="edge">
+<title>blaze&#45;builder&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3392.93,-586.35C3419.88,-583.06 3453.16,-579.12 3483,-576 3688.99,-554.43 3936.34,-533.73 4029.77,-526.09"/>
+<polygon fill="black" stroke="black" points="4029.96,-529.59 4039.64,-525.29 4029.39,-522.61 4029.96,-529.59"/>
+</g>
+<!-- data&#45;default&#45;&gt;containers -->
+<g id="edge140" class="edge">
+<title>data&#45;default&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M6027.96,-791.71C6032.65,-758.59 6047.68,-686.11 6092,-648 6143.33,-603.86 6176.19,-634.61 6240,-612 6310.46,-587.04 6339.78,-593.49 6392,-540 6428.69,-502.41 6415.39,-478.41 6440,-432 6444.69,-423.15 6450.3,-413.78 6455.55,-405.42"/>
+<polygon fill="black" stroke="black" points="6458.43,-407.42 6460.87,-397.11 6452.53,-403.64 6458.43,-407.42"/>
+</g>
+<!-- http&#45;client&#45;&gt;ghc&#45;prim -->
+<g id="edge193" class="edge">
+<title>http&#45;client&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2601.03,-953.18C2413.01,-953.5 1708.24,-951 1131,-900 846.45,-874.86 532,-952.65 532,-667 532,-667 532,-667 532,-593 532,-531.22 804.31,-170.74 860,-144 950.06,-100.75 1662.96,-92.65 1850.13,-91.27"/>
+<polygon fill="black" stroke="black" points="1849.94,-94.77 1859.92,-91.2 1849.89,-87.77 1849.94,-94.77"/>
+</g>
+<!-- http&#45;client&#45;&gt;stm -->
+<g id="edge200" class="edge">
+<title>http&#45;client&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M2601.24,-952.73C2292.13,-950.86 579.94,-938.83 351,-900 224.35,-878.52 76,-939.46 76,-811 76,-811 76,-811 76,-665 76,-433.2 59.04,-372.15 100,-144 105.94,-110.94 103.88,-99.62 123,-72 132.68,-58.01 147.15,-45.91 160.16,-36.82"/>
+<polygon fill="black" stroke="black" points="162.07,-39.75 168.47,-31.31 158.2,-33.92 162.07,-39.75"/>
+</g>
+<!-- http&#45;client&#45;&gt;Win32 -->
+<g id="edge182" class="edge">
+<title>http&#45;client&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M2608.99,-944.02C2564.27,-933.86 2489.74,-916.57 2426,-900 2228.49,-848.67 2174.46,-843.29 1990,-756 1892.88,-710.04 1783.19,-645.82 1730.52,-614.18"/>
+<polygon fill="black" stroke="black" points="1732.44,-611.25 1722.06,-609.08 1728.82,-617.24 1732.44,-611.25"/>
+</g>
+<!-- http&#45;client&#45;&gt;bytestring -->
+<g id="edge186" class="edge">
+<title>http&#45;client&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2605.05,-946.78C2555.14,-938.72 2478.35,-922.91 2461,-900 2373.49,-784.4 2442.6,-709.57 2499,-576 2527.82,-507.74 2522.61,-474.93 2583,-432 2616.78,-407.99 2728.52,-392.24 2797.52,-384.54"/>
+<polygon fill="black" stroke="black" points="2797.56,-388.06 2807.12,-383.49 2796.8,-381.1 2797.56,-388.06"/>
+</g>
+<!-- http&#45;client&#45;&gt;containers -->
+<g id="edge188" class="edge">
+<title>http&#45;client&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2683.31,-941.1C2690.71,-939.01 2698.55,-937.14 2706,-936 2863.75,-911.97 5432.35,-965.17 5578,-900 5597.81,-891.14 5592.74,-875.74 5611,-864 5654.63,-835.96 5674.06,-847.79 5722,-828 5852.82,-774.01 5884.11,-755.9 6006,-684 6030.53,-669.53 6033.15,-659.93 6059,-648 6113.82,-622.7 6135.53,-638.05 6190,-612 6214.7,-600.19 6217.13,-591.06 6240,-576 6265.97,-558.9 6275.15,-558.7 6300,-540 6330.55,-517.02 6408.27,-442.2 6448.32,-403.18"/>
+<polygon fill="black" stroke="black" points="6450.7,-405.75 6455.41,-396.26 6445.81,-400.74 6450.7,-405.75"/>
+</g>
+<!-- http&#45;client&#45;&gt;deepseq -->
+<g id="edge190" class="edge">
+<title>http&#45;client&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2683.32,-941.16C2690.72,-939.06 2698.55,-937.17 2706,-936 3053.8,-881.2 3941.83,-952.43 4290,-900 4348.01,-891.26 4359.44,-875.34 4417,-864 4486.78,-850.26 4687.62,-881.04 4735,-828 4790.77,-765.56 4704.46,-762.82 4624,-684 4619.93,-680.01 4554.58,-616.43 4551,-612 4473.65,-516.47 4402,-501.92 4402,-379 4402,-379 4402,-379 4402,-305 4402,-258.45 4368.55,-213.43 4344.37,-186.98"/>
+<polygon fill="black" stroke="black" points="4347.05,-184.71 4337.63,-179.85 4341.96,-189.52 4347.05,-184.71"/>
+</g>
+<!-- http&#45;client&#45;&gt;filepath -->
+<g id="edge192" class="edge">
+<title>http&#45;client&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M2601.35,-953.31C2364.59,-954.6 1321.01,-956.97 1189,-900 1147.16,-881.94 1133.58,-870.04 1116,-828 1096.13,-780.49 1124.35,-758.99 1158,-720 1253.96,-608.83 1427.56,-553.81 1509.24,-533.1"/>
+<polygon fill="black" stroke="black" points="1509.8,-536.56 1518.66,-530.76 1508.12,-529.77 1509.8,-536.56"/>
+</g>
+<!-- http&#45;client&#45;&gt;time -->
+<g id="edge203" class="edge">
+<title>http&#45;client&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M2661.94,-936.46C2679.04,-915.87 2711.21,-881.31 2747,-864 2835.4,-821.24 2868.35,-845.38 2965,-828 3129.88,-798.35 3179.79,-819.05 3335,-756 3376.91,-738.98 3419.66,-708.37 3445.77,-687.87"/>
+<polygon fill="black" stroke="black" points="3447.79,-690.74 3453.42,-681.77 3443.42,-685.27 3447.79,-690.74"/>
+</g>
+<!-- http&#45;client&#45;&gt;text -->
+<g id="edge202" class="edge">
+<title>http&#45;client&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2683.32,-941.16C2690.72,-939.07 2698.55,-937.18 2706,-936 2788.61,-922.93 4152.57,-959.84 4211,-900 4256.84,-853.05 4259.63,-821.34 4149,-720 4111.38,-685.54 4078.21,-717.81 4040,-684 4002.31,-650.66 3984.94,-621.7 4006,-576 4012.75,-561.34 4025.78,-549.23 4038.15,-540.31"/>
+<polygon fill="black" stroke="black" points="4039.77,-543.44 4046.12,-534.96 4035.87,-537.63 4039.77,-543.44"/>
+</g>
+<!-- http&#45;client&#45;&gt;random -->
+<g id="edge199" class="edge">
+<title>http&#45;client&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M2641.4,-935.81C2624.13,-893.86 2587.23,-784.92 2638,-720 2678.91,-667.7 2718.86,-701.19 2783,-684 2838.84,-669.03 2852.25,-663.3 2908,-648 2962.26,-633.11 3024.95,-616.89 3066.14,-606.37"/>
+<polygon fill="black" stroke="black" points="3066.88,-609.79 3075.7,-603.93 3065.15,-603.01 3066.88,-609.79"/>
+</g>
+<!-- http&#45;client&#45;&gt;exceptions -->
+<g id="edge191" class="edge">
+<title>http&#45;client&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M2601.15,-952.6C2307.64,-950.02 756.4,-934.82 548,-900 443.19,-882.49 382.82,-913.71 320,-828 307.9,-811.49 332.28,-644.35 404,-504 413.22,-485.95 420.17,-484.46 432,-468 446.81,-447.39 462.65,-423.38 474.19,-405.49"/>
+<polygon fill="black" stroke="black" points="477.01,-407.57 479.46,-397.26 471.12,-403.79 477.01,-407.57"/>
+</g>
+<!-- http&#45;client&#45;&gt;network&#45;uri -->
+<g id="edge198" class="edge">
+<title>http&#45;client&#45;&gt;network&#45;uri</title>
+<path fill="none" stroke="black" d="M2683.32,-941.15C2690.72,-939.05 2698.55,-937.17 2706,-936 3081.72,-877.12 4039.42,-945.47 4417,-900 4490.23,-891.18 4506.54,-877.78 4579,-864 4679.35,-844.91 4705.95,-848.58 4806,-828 4810.96,-826.98 4816.11,-825.83 4821.24,-824.63"/>
+<polygon fill="black" stroke="black" points="4822.02,-828.04 4830.92,-822.29 4820.38,-821.24 4822.02,-828.04"/>
+</g>
+<!-- http&#45;client&#45;&gt;async -->
+<g id="edge183" class="edge">
+<title>http&#45;client&#45;&gt;async</title>
+<path fill="none" stroke="black" d="M2601.59,-951.92C2377.71,-946.73 1434.69,-923.53 1377,-900 1332.71,-881.94 1322.66,-868.37 1297,-828 1285.28,-809.56 1278.4,-785.74 1274.53,-767.38"/>
+<polygon fill="black" stroke="black" points="1277.99,-766.87 1272.68,-757.71 1271.12,-768.19 1277.99,-766.87"/>
+</g>
+<!-- http&#45;client&#45;&gt;base64&#45;bytestring -->
+<g id="edge184" class="edge">
+<title>http&#45;client&#45;&gt;base64&#45;bytestring</title>
+<path fill="none" stroke="black" d="M2681.72,-940.49C2709.8,-929.74 2750.68,-914.1 2782.72,-901.85"/>
+<polygon fill="black" stroke="black" points="2783.72,-905.22 2791.8,-898.38 2781.21,-898.68 2783.72,-905.22"/>
+</g>
+<!-- http&#45;client&#45;&gt;blaze&#45;builder -->
+<g id="edge185" class="edge">
+<title>http&#45;client&#45;&gt;blaze&#45;builder</title>
+<path fill="none" stroke="black" d="M2648.07,-935.84C2645.84,-887.46 2642.3,-751.43 2671,-720 2672.3,-718.58 3116.12,-636.39 3280.07,-606.08"/>
+<polygon fill="black" stroke="black" points="3280.23,-609.61 3289.43,-604.35 3278.96,-602.72 3280.23,-609.61"/>
+</g>
+<!-- http&#45;client&#45;&gt;http&#45;types -->
+<g id="edge194" class="edge">
+<title>http&#45;client&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M2684.38,-941.63C2691.49,-939.58 2698.95,-937.59 2706,-936 2759.7,-923.92 2911.18,-902.19 2994.08,-890.66"/>
+<polygon fill="black" stroke="black" points="2994.38,-894.16 3003.81,-889.32 2993.42,-887.22 2994.38,-894.16"/>
+</g>
+<!-- http&#45;client&#45;&gt;case&#45;insensitive -->
+<g id="edge187" class="edge">
+<title>http&#45;client&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M2656.93,-935.85C2674.02,-898.91 2714.44,-811.55 2735.2,-766.67"/>
+<polygon fill="black" stroke="black" points="2738.37,-768.15 2739.39,-757.61 2732.02,-765.21 2738.37,-768.15"/>
+</g>
+<!-- cookie -->
+<g id="node75" class="node">
+<title>cookie</title>
+<ellipse fill="none" stroke="black" cx="4104" cy="-738" rx="35.6" ry="18"/>
+<text text-anchor="middle" x="4104" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">cookie</text>
+</g>
+<!-- http&#45;client&#45;&gt;cookie -->
+<g id="edge189" class="edge">
+<title>http&#45;client&#45;&gt;cookie</title>
+<path fill="none" stroke="black" d="M2683.32,-941.17C2690.72,-939.07 2698.55,-937.18 2706,-936 2787.67,-923.07 4136.24,-959.17 4194,-900 4205.18,-888.55 4200.51,-878.62 4194,-864 4184.27,-842.15 4168.94,-846.67 4154,-828 4138.8,-809 4125.52,-784.79 4116.48,-766.41"/>
+<polygon fill="black" stroke="black" points="4119.66,-764.96 4112.19,-757.45 4113.35,-767.98 4119.66,-764.96"/>
+</g>
+<!-- network -->
+<g id="node80" class="node">
+<title>network</title>
+<ellipse fill="none" stroke="black" cx="1166" cy="-810" rx="40.58" ry="18"/>
+<text text-anchor="middle" x="1166" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">network</text>
+</g>
+<!-- http&#45;client&#45;&gt;network -->
+<g id="edge197" class="edge">
+<title>http&#45;client&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M2601.23,-952.4C2360.63,-949.24 1290.6,-933.34 1229,-900 1204.47,-886.73 1187.31,-859.26 1177.16,-838.32"/>
+<polygon fill="black" stroke="black" points="1180.45,-837.11 1173.12,-829.46 1174.08,-840.01 1180.45,-837.11"/>
+</g>
+<!-- iproute -->
+<g id="node85" class="node">
+<title>iproute</title>
+<ellipse fill="none" stroke="black" cx="2507" cy="-882" rx="36.59" ry="18"/>
+<text text-anchor="middle" x="2507" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">iproute</text>
+</g>
+<!-- http&#45;client&#45;&gt;iproute -->
+<g id="edge195" class="edge">
+<title>http&#45;client&#45;&gt;iproute</title>
+<path fill="none" stroke="black" d="M2620.95,-939.17C2598.41,-928.06 2566.64,-912.4 2542.37,-900.44"/>
+<polygon fill="black" stroke="black" points="2544.02,-897.35 2533.5,-896.06 2540.92,-903.62 2544.02,-897.35"/>
+</g>
+<!-- http&#45;client&#45;&gt;mime&#45;types -->
+<g id="edge196" class="edge">
+<title>http&#45;client&#45;&gt;mime&#45;types</title>
+<path fill="none" stroke="black" d="M2683.32,-941.16C2690.72,-939.06 2698.55,-937.17 2706,-936 2748.79,-929.25 4234.54,-930.8 4265,-900 4343.76,-820.36 4209.68,-743.63 4268,-648 4278.78,-630.32 4297.64,-618.21 4316.09,-610.09"/>
+<polygon fill="black" stroke="black" points="4317.18,-613.42 4325.14,-606.43 4314.56,-606.93 4317.18,-613.42"/>
+</g>
+<!-- streaming&#45;commons -->
+<g id="node87" class="node">
+<title>streaming&#45;commons</title>
+<ellipse fill="none" stroke="black" cx="1620" cy="-882" rx="85.99" ry="18"/>
+<text text-anchor="middle" x="1620" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">streaming&#45;commons</text>
+</g>
+<!-- http&#45;client&#45;&gt;streaming&#45;commons -->
+<g id="edge201" class="edge">
+<title>http&#45;client&#45;&gt;streaming&#45;commons</title>
+<path fill="none" stroke="black" d="M2601.2,-952.32C2463.28,-949.91 2052.94,-939.68 1715,-900 1707.62,-899.13 1699.95,-898.06 1692.3,-896.87"/>
+<polygon fill="black" stroke="black" points="1693.09,-893.45 1682.66,-895.3 1691.97,-900.36 1693.09,-893.45"/>
+</g>
+<!-- http&#45;types&#45;&gt;bytestring -->
+<g id="edge218" class="edge">
+<title>http&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3048.8,-863.57C3046.45,-843.39 3039.52,-810.54 3019,-792 2967.81,-745.74 2915.75,-805.8 2868,-756 2775.25,-659.27 2821.82,-476.33 2844.25,-406.78"/>
+<polygon fill="black" stroke="black" points="2847.44,-408.29 2847.27,-397.69 2840.8,-406.08 2847.44,-408.29"/>
+</g>
+<!-- http&#45;types&#45;&gt;text -->
+<g id="edge220" class="edge">
+<title>http&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3074.71,-866.23C3111.66,-843.8 3183.07,-799.21 3240,-756 3298.22,-711.82 3296.9,-676.97 3364,-648 3513.25,-583.56 3572.07,-657.99 3728,-612 3761.56,-602.1 3764.95,-587.48 3798,-576 3878.13,-548.16 3977,-533.44 4030.06,-527.04"/>
+<polygon fill="black" stroke="black" points="4030.26,-530.54 4039.79,-525.9 4029.45,-523.58 4030.26,-530.54"/>
+</g>
+<!-- http&#45;types&#45;&gt;case&#45;insensitive -->
+<g id="edge219" class="edge">
+<title>http&#45;types&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M3042.88,-864C3033.43,-843.6 3014.76,-809.91 2988,-792 2984.25,-789.49 2880.62,-767.15 2810.77,-752.28"/>
+<polygon fill="black" stroke="black" points="2811.86,-748.94 2801.35,-750.28 2810.41,-755.78 2811.86,-748.94"/>
+</g>
+<!-- transformers&#45;compat&#45;&gt;ghc&#45;prim -->
+<g id="edge431" class="edge">
+<title>transformers&#45;compat&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M8627.79,-504.16C8590.13,-470.77 8513,-392 8513,-307 8513,-307 8513,-307 8513,-233 8513,-179.52 8480.83,-165.82 8432,-144 8353.17,-108.77 2512.42,-92.61 1940.01,-91.12"/>
+<polygon fill="black" stroke="black" points="1940.1,-87.62 1930.09,-91.09 1940.08,-94.62 1940.1,-87.62"/>
+</g>
+<!-- base&#45;orphans&#45;&gt;ghc&#45;prim -->
+<g id="edge90" class="edge">
+<title>base&#45;orphans&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M8123,-431.51C8123,-404.71 8123,-351.87 8123,-307 8123,-307 8123,-307 8123,-233 8123,-69.58 7556.07,-154.69 7393,-144 6817.68,-106.27 2431.4,-92.55 1939.77,-91.13"/>
+<polygon fill="black" stroke="black" points="1940.09,-87.63 1930.08,-91.1 1940.07,-94.63 1940.09,-87.63"/>
+</g>
+<!-- base16&#45;bytestring&#45;&gt;bytestring -->
+<g id="edge91" class="edge">
+<title>base16&#45;bytestring&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1979.02,-791.66C2007.1,-723.24 2113.33,-473.62 2185,-432 2237.13,-401.72 2642.3,-385.76 2795.55,-380.76"/>
+<polygon fill="black" stroke="black" points="2795.6,-384.26 2805.49,-380.44 2795.38,-377.26 2795.6,-384.26"/>
+</g>
+<!-- basement -->
+<g id="node68" class="node">
+<title>basement</title>
+<ellipse fill="none" stroke="black" cx="796" cy="-666" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="796" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">basement</text>
+</g>
+<!-- basement&#45;&gt;ghc&#45;prim -->
+<g id="edge94" class="edge">
+<title>basement&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M794.98,-647.65C791.59,-572.4 789.28,-272.23 957,-144 1028.45,-89.38 1673.03,-89.53 1850.15,-90.63"/>
+<polygon fill="black" stroke="black" points="1850.07,-94.12 1860.09,-90.69 1850.11,-87.12 1850.07,-94.12"/>
+</g>
+<!-- basement&#45;&gt;Win32 -->
+<g id="edge93" class="edge">
+<title>basement&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M840.47,-661.55C993.56,-649.68 1497.87,-610.59 1653.11,-598.56"/>
+<polygon fill="black" stroke="black" points="1653.31,-602.05 1663.01,-597.79 1652.77,-595.07 1653.31,-602.05"/>
+</g>
+<!-- bifunctors -->
+<g id="node69" class="node">
+<title>bifunctors</title>
+<ellipse fill="none" stroke="black" cx="7775" cy="-666" rx="48.57" ry="18"/>
+<text text-anchor="middle" x="7775" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">bifunctors</text>
+</g>
+<!-- bifunctors&#45;&gt;template&#45;haskell -->
+<g id="edge98" class="edge">
+<title>bifunctors&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7765.14,-648.14C7737.57,-602.89 7654.62,-479.01 7547,-432 7366.79,-353.28 7285.57,-476.17 7106,-396 7084.76,-386.52 7089.44,-369.04 7068,-360 6950.82,-310.58 6051.76,-306.96 5802.11,-306.92"/>
+<polygon fill="black" stroke="black" points="5802.24,-303.42 5792.24,-306.92 5802.24,-310.42 5802.24,-303.42"/>
+</g>
+<!-- bifunctors&#45;&gt;containers -->
+<g id="edge96" class="edge">
+<title>bifunctors&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M7757.32,-648.92C7722.14,-617.58 7639.96,-547.6 7561,-504 7482.31,-460.55 7459.89,-450.86 7372,-432 7211.17,-397.48 6707.38,-383.9 6533.06,-380.16"/>
+<polygon fill="black" stroke="black" points="6533.16,-376.66 6523.09,-379.95 6533.02,-383.66 6533.16,-376.66"/>
+</g>
+<!-- bifunctors&#45;&gt;tagged -->
+<g id="edge97" class="edge">
+<title>bifunctors&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M7780.27,-648.01C7783.19,-637.7 7786.52,-624.23 7788,-612 7790.72,-589.53 7785.77,-507.23 7785,-504 7782.89,-495.12 7779.28,-485.9 7775.49,-477.69"/>
+<polygon fill="black" stroke="black" points="7778.74,-476.38 7771.18,-468.95 7772.46,-479.47 7778.74,-476.38"/>
+</g>
+<!-- bifunctors&#45;&gt;th&#45;abstraction -->
+<g id="edge99" class="edge">
+<title>bifunctors&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M7733.95,-655.99C7678.39,-643.8 7578.9,-621.97 7515.24,-608"/>
+<polygon fill="black" stroke="black" points="7516.18,-604.62 7505.66,-605.9 7514.68,-611.46 7516.18,-604.62"/>
+</g>
+<!-- comonad -->
+<g id="node70" class="node">
+<title>comonad</title>
+<ellipse fill="none" stroke="black" cx="8078" cy="-594" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="8078" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">comonad</text>
+</g>
+<!-- bifunctors&#45;&gt;comonad -->
+<g id="edge95" class="edge">
+<title>bifunctors&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M7815.55,-655.63C7870.69,-642.89 7969.25,-620.12 8028.63,-606.41"/>
+<polygon fill="black" stroke="black" points="8029.17,-609.87 8038.13,-604.21 8027.6,-603.05 8029.17,-609.87"/>
+</g>
+<!-- comonad&#45;&gt;containers -->
+<g id="edge117" class="edge">
+<title>comonad&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M8059.05,-577.21C8016.74,-543.06 7910.04,-462.92 7805,-432 7682.2,-395.85 6776.72,-382.6 6533.17,-379.67"/>
+<polygon fill="black" stroke="black" points="6533.3,-376.17 6523.26,-379.55 6533.22,-383.17 6533.3,-376.17"/>
+</g>
+<!-- comonad&#45;&gt;indexed&#45;traversable -->
+<g id="edge119" class="edge">
+<title>comonad&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M8033.25,-589.79C7882.93,-578.99 7394.2,-543.91 7191.91,-529.38"/>
+<polygon fill="black" stroke="black" points="7192.19,-525.89 7181.97,-528.67 7191.69,-532.88 7192.19,-525.89"/>
+</g>
+<!-- comonad&#45;&gt;tagged -->
+<g id="edge120" class="edge">
+<title>comonad&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M8038.64,-584.39C8004.06,-575.91 7953,-561.15 7912,-540 7888.3,-527.77 7886.6,-518.15 7864,-504 7842.47,-490.52 7817.11,-477.44 7796.95,-467.65"/>
+<polygon fill="black" stroke="black" points="7798.52,-464.52 7787.99,-463.36 7795.5,-470.84 7798.52,-464.52"/>
+</g>
+<!-- comonad&#45;&gt;transformers&#45;compat -->
+<g id="edge121" class="edge">
+<title>comonad&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M8120.84,-587.74C8214.49,-576.24 8438.92,-548.68 8562.61,-533.49"/>
+<polygon fill="black" stroke="black" points="8562.89,-536.98 8572.39,-532.29 8562.03,-530.03 8562.89,-536.98"/>
+</g>
+<!-- distributive -->
+<g id="node74" class="node">
+<title>distributive</title>
+<ellipse fill="none" stroke="black" cx="8212" cy="-522" rx="51.56" ry="18"/>
+<text text-anchor="middle" x="8212" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">distributive</text>
+</g>
+<!-- comonad&#45;&gt;distributive -->
+<g id="edge118" class="edge">
+<title>comonad&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M8104.79,-579C8124.71,-568.6 8152.14,-554.27 8174.27,-542.71"/>
+<polygon fill="black" stroke="black" points="8175.75,-545.89 8182.99,-538.16 8172.5,-539.68 8175.75,-545.89"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;Cabal -->
+<g id="edge109" class="edge">
+<title>cabal&#45;doctest&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M1067.09,-950.95C1214.8,-945.53 1592.55,-929.17 1715,-900 1717.14,-899.49 1719.31,-898.88 1721.47,-898.21"/>
+<polygon fill="black" stroke="black" points="1722.49,-901.56 1730.72,-894.89 1720.13,-894.97 1722.49,-901.56"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;directory -->
+<g id="edge110" class="edge">
+<title>cabal&#45;doctest&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1012.98,-935.66C1025.78,-901.43 1059.4,-825.6 1116,-792 1158.09,-767.02 1481.65,-748.28 1612.92,-741.63"/>
+<polygon fill="black" stroke="black" points="1612.95,-745.14 1622.76,-741.14 1612.6,-738.14 1612.95,-745.14"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;filepath -->
+<g id="edge111" class="edge">
+<title>cabal&#45;doctest&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1007.79,-935.79C1011.19,-883.25 1029.08,-723.88 1122,-648 1236.62,-554.4 1418.32,-530.88 1504.94,-524.97"/>
+<polygon fill="black" stroke="black" points="1505,-528.48 1514.76,-524.36 1504.56,-521.49 1505,-528.48"/>
+</g>
+<!-- call&#45;stack -->
+<g id="node72" class="node">
+<title>call&#45;stack</title>
+<ellipse fill="none" stroke="black" cx="1432" cy="-882" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="1432" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">call&#45;stack</text>
+</g>
+<!-- call&#45;stack&#45;&gt;filepath -->
+<g id="edge112" class="edge">
+<title>call&#45;stack&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1395.15,-871.06C1327.33,-850.65 1192.86,-799.18 1229,-720 1262.96,-645.59 1309.2,-656.23 1378,-612 1400.43,-597.58 1402.83,-589.2 1426,-576 1453.88,-560.11 1487.48,-546.38 1513.25,-536.88"/>
+<polygon fill="black" stroke="black" points="1514.14,-540.28 1522.35,-533.59 1511.76,-533.7 1514.14,-540.28"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;bytestring -->
+<g id="edge113" class="edge">
+<title>case&#45;insensitive&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2743.69,-719.87C2732.35,-670.76 2706.36,-526.96 2764,-432 2774.13,-415.31 2791.65,-403.29 2808.57,-394.95"/>
+<polygon fill="black" stroke="black" points="2809.91,-398.19 2817.57,-390.86 2807.01,-391.81 2809.91,-398.19"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;deepseq -->
+<g id="edge114" class="edge">
+<title>case&#45;insensitive&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2736.52,-720.02C2711.97,-681.52 2658.42,-584.71 2682,-504 2729.21,-342.42 2767.84,-267.84 2928,-216 3056.9,-174.28 4026.76,-164.99 4266.52,-163.32"/>
+<polygon fill="black" stroke="black" points="4266.54,-166.82 4276.52,-163.25 4266.5,-159.82 4266.54,-166.82"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;text -->
+<g id="edge116" class="edge">
+<title>case&#45;insensitive&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2809.98,-730.29C2878.57,-722.19 2992.09,-706.74 3088,-684 3138.88,-671.94 3148.74,-658.33 3200,-648 3381.05,-611.51 3445.55,-687.74 3614,-612 3635.22,-602.46 3630.82,-585.64 3652,-576 3804.4,-506.65 3864.54,-580.51 4027,-540 4029.98,-539.26 4033.03,-538.33 4036.05,-537.3"/>
+<polygon fill="black" stroke="black" points="4037.2,-540.61 4045.29,-533.77 4034.7,-534.07 4037.2,-540.61"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;hashable -->
+<g id="edge115" class="edge">
+<title>case&#45;insensitive&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M2807.28,-728.89C2881.73,-718.66 3013.38,-700.41 3126,-684 3231.86,-668.57 3257.47,-657.82 3364,-648 3836.49,-604.44 3957.32,-639.71 4431,-612 4482.45,-608.99 4541.08,-603.93 4582.24,-600.12"/>
+<polygon fill="black" stroke="black" points="4582.49,-603.61 4592.12,-599.19 4581.84,-596.64 4582.49,-603.61"/>
+</g>
+<!-- distributive&#45;&gt;tagged -->
+<g id="edge149" class="edge">
+<title>distributive&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M8165.43,-513.77C8078.18,-500.23 7891.19,-471.21 7805.52,-457.91"/>
+<polygon fill="black" stroke="black" points="7806.28,-454.49 7795.87,-456.41 7805.21,-461.4 7806.28,-454.49"/>
+</g>
+<!-- distributive&#45;&gt;base&#45;orphans -->
+<g id="edge148" class="edge">
+<title>distributive&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M8191.8,-505.12C8180.25,-496.03 8165.54,-484.46 8152.69,-474.35"/>
+<polygon fill="black" stroke="black" points="8154.95,-471.67 8144.92,-468.24 8150.62,-477.18 8154.95,-471.67"/>
+</g>
+<!-- cookie&#45;&gt;bytestring -->
+<g id="edge124" class="edge">
+<title>cookie&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4073.11,-728.53C4005.05,-710.26 3836.82,-667.27 3693,-648 3623.51,-638.69 3121.9,-650.03 3063,-612 3025.09,-587.52 3001.69,-463.11 2969,-432 2950.32,-414.22 2924.61,-401.61 2902.24,-393.16"/>
+<polygon fill="black" stroke="black" points="2903.59,-389.92 2893,-389.85 2901.23,-396.51 2903.59,-389.92"/>
+</g>
+<!-- cookie&#45;&gt;deepseq -->
+<g id="edge125" class="edge">
+<title>cookie&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M4115.05,-720.7C4147.29,-671.48 4239,-519.16 4239,-379 4239,-379 4239,-379 4239,-305 4239,-258.59 4272.05,-213.54 4295.92,-187.04"/>
+<polygon fill="black" stroke="black" points="4298.32,-189.6 4302.58,-179.9 4293.2,-184.83 4298.32,-189.6"/>
+</g>
+<!-- cookie&#45;&gt;time -->
+<g id="edge127" class="edge">
+<title>cookie&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M4076.31,-726.21C4069.14,-723.79 4061.37,-721.51 4054,-720 3848.33,-677.88 3791.59,-707.77 3583,-684 3557.99,-681.15 3529.99,-676.9 3508.24,-673.36"/>
+<polygon fill="black" stroke="black" points="3509.11,-669.96 3498.67,-671.78 3507.97,-676.86 3509.11,-669.96"/>
+</g>
+<!-- cookie&#45;&gt;text -->
+<g id="edge126" class="edge">
+<title>cookie&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4072.12,-729.4C4034.85,-719.79 3976.63,-702.28 3964,-684 3954.37,-670.05 3954.92,-596.43 3968,-576 3972.13,-569.54 4008.39,-551.26 4036.07,-537.97"/>
+<polygon fill="black" stroke="black" points="4037.28,-541.27 4044.81,-533.81 4034.27,-534.95 4037.28,-541.27"/>
+</g>
+<!-- crypton&#45;&gt;ghc&#45;prim -->
+<g id="edge132" class="edge">
+<title>crypton&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M883.02,-791.56C897.53,-712.88 967.31,-387.44 1155,-216 1219.53,-157.05 1253,-164.34 1338,-144 1524.59,-99.35 1754.82,-92.05 1850.28,-91.04"/>
+<polygon fill="black" stroke="black" points="1850.03,-94.55 1860,-90.96 1849.97,-87.55 1850.03,-94.55"/>
+</g>
+<!-- crypton&#45;&gt;Win32 -->
+<g id="edge128" class="edge">
+<title>crypton&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M913.89,-800.14C1044.39,-766.05 1514.21,-643.28 1657.33,-605.89"/>
+<polygon fill="black" stroke="black" points="1657.97,-609.34 1666.76,-603.42 1656.2,-602.57 1657.97,-609.34"/>
+</g>
+<!-- crypton&#45;&gt;bytestring -->
+<g id="edge130" class="edge">
+<title>crypton&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M895.08,-793.04C935.61,-751.08 1051.93,-636.7 1171,-576 1386.56,-466.11 1457.01,-469.76 1696,-432 1911.23,-397.99 2590.91,-383.59 2795.3,-379.97"/>
+<polygon fill="black" stroke="black" points="2795.21,-383.47 2805.15,-379.79 2795.09,-376.47 2795.21,-383.47"/>
+</g>
+<!-- crypton&#45;&gt;deepseq -->
+<g id="edge131" class="edge">
+<title>crypton&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M887.7,-792.19C896.5,-773.72 911.92,-743.56 929,-720 1122.46,-453.15 1162.52,-326.6 1473,-216 1609.58,-167.34 3887.44,-163.36 4266.68,-163.03"/>
+<polygon fill="black" stroke="black" points="4266.59,-166.53 4276.59,-163.02 4266.59,-159.53 4266.59,-166.53"/>
+</g>
+<!-- crypton&#45;&gt;basement -->
+<g id="edge129" class="edge">
+<title>crypton&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M856.51,-795.17C842.66,-785.82 825.96,-772.23 816,-756 804.85,-737.81 799.89,-714.12 797.7,-695.76"/>
+<polygon fill="black" stroke="black" points="801.19,-695.43 796.75,-685.8 794.22,-696.09 801.19,-695.43"/>
+</g>
+<!-- integer&#45;gmp -->
+<g id="node77" class="node">
+<title>integer&#45;gmp</title>
+<ellipse fill="none" stroke="black" cx="973" cy="-306" rx="54.56" ry="18"/>
+<text text-anchor="middle" x="973" y="-300.57" font-family="Times New Roman,serif" font-size="14.00">integer&#45;gmp</text>
+</g>
+<!-- crypton&#45;&gt;integer&#45;gmp -->
+<g id="edge133" class="edge">
+<title>crypton&#45;&gt;integer&#45;gmp</title>
+<path fill="none" stroke="black" d="M869.49,-792.55C863.67,-782.44 857.01,-768.98 854,-756 850.38,-740.41 851.76,-735.84 854,-720 875.01,-571.19 936.62,-400.9 961.94,-335.03"/>
+<polygon fill="black" stroke="black" points="965.19,-336.33 965.54,-325.74 958.67,-333.8 965.19,-336.33"/>
+</g>
+<!-- crypton&#45;&gt;memory -->
+<g id="edge134" class="edge">
+<title>crypton&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M849.65,-798.22C816.25,-786.35 762.35,-767.19 724.93,-753.9"/>
+<polygon fill="black" stroke="black" points="726.38,-750.7 715.79,-750.65 724.04,-757.3 726.38,-750.7"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;bignum -->
+<g id="edge230" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M997.13,-289.46C1011,-279.77 1028.17,-266.43 1041,-252 1057.57,-233.38 1071.96,-208.98 1081.71,-190.45"/>
+<polygon fill="black" stroke="black" points="1084.77,-192.14 1086.21,-181.64 1078.54,-188.96 1084.77,-192.14"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;internal -->
+<g id="edge231" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;internal</title>
+<path fill="none" stroke="black" d="M977.7,-287.7C979.72,-280.24 982.14,-271.32 984.41,-262.97"/>
+<polygon fill="black" stroke="black" points="987.72,-264.13 986.96,-253.57 980.96,-262.3 987.72,-264.13"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;prim -->
+<g id="edge232" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M960.18,-288.1C948.16,-270.08 933.36,-240.77 943,-216 958.74,-175.54 969.8,-162.66 1009,-144 1085.26,-107.7 1680.71,-94.7 1850.15,-91.72"/>
+<polygon fill="black" stroke="black" points="1850.15,-95.22 1860.09,-91.55 1850.03,-88.22 1850.15,-95.22"/>
+</g>
+<!-- memory&#45;&gt;ghc&#45;prim -->
+<g id="edge288" class="edge">
+<title>memory&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M682.8,-719.73C682.89,-635.27 696.01,-264.85 915,-144 997.48,-98.48 1668.84,-92.06 1850.06,-91.15"/>
+<polygon fill="black" stroke="black" points="1850.02,-94.65 1860.01,-91.1 1849.99,-87.65 1850.02,-94.65"/>
+</g>
+<!-- memory&#45;&gt;bytestring -->
+<g id="edge286" class="edge">
+<title>memory&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M690.06,-719.83C699.08,-699.89 716.51,-667.28 741,-648 966.63,-470.33 1067.87,-485.68 1350,-432 1634.41,-377.88 2553.56,-377.74 2795.3,-378.68"/>
+<polygon fill="black" stroke="black" points="2795.1,-382.18 2805.11,-378.72 2795.13,-375.18 2795.1,-382.18"/>
+</g>
+<!-- memory&#45;&gt;deepseq -->
+<g id="edge287" class="edge">
+<title>memory&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M684.12,-719.72C686.02,-700.84 691.16,-670.32 705,-648 731.1,-605.93 751.57,-607.21 790,-576 951.76,-444.63 971.18,-376.17 1160,-288 1228.8,-255.87 1258.79,-285.34 1327,-252 1349.39,-241.05 1346.65,-224.72 1370,-216 1510.99,-163.33 3880.3,-162.7 4266.87,-162.95"/>
+<polygon fill="black" stroke="black" points="4266.72,-166.45 4276.73,-162.96 4266.73,-159.45 4266.72,-166.45"/>
+</g>
+<!-- memory&#45;&gt;basement -->
+<g id="edge285" class="edge">
+<title>memory&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M706.14,-722.67C722.38,-712.61 744.34,-699 762.48,-687.76"/>
+<polygon fill="black" stroke="black" points="764.17,-690.84 770.83,-682.59 760.48,-684.89 764.17,-690.84"/>
+</g>
+<!-- crypton&#45;connection -->
+<g id="node79" class="node">
+<title>crypton&#45;connection</title>
+<ellipse fill="none" stroke="black" cx="2798" cy="-954" rx="83.5" ry="18"/>
+<text text-anchor="middle" x="2798" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;connection</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;bytestring -->
+<g id="edge135" class="edge">
+<title>crypton&#45;connection&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2779.65,-936.05C2756.14,-913.44 2715.52,-871.23 2691,-828 2635.62,-730.36 2663.53,-687.76 2674,-576 2680.19,-509.98 2665.03,-477.77 2713,-432 2736.8,-409.29 2771.26,-396.1 2800.15,-388.56"/>
+<polygon fill="black" stroke="black" points="2800.97,-391.97 2809.86,-386.2 2799.31,-385.16 2800.97,-391.97"/>
+</g>
+<!-- crypton&#45;connection&#45;&gt;containers -->
+<g id="edge136" class="edge">
+<title>crypton&#45;connection&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2881.49,-952.66C3129.99,-951.18 3886.43,-943.17 4512,-900 5110.44,-858.7 5287.5,-953.28 5854,-756 5910.59,-736.29 5918.66,-718.01 5968,-684 5989.96,-668.87 5992.09,-659.81 6016,-648 6068.98,-621.83 6089.53,-634.92 6144,-612 6158.77,-605.78 6256.6,-550.15 6269,-540 6318.47,-499.51 6313.15,-470.74 6364,-432 6383.67,-417.02 6408.25,-404.62 6429.09,-395.59"/>
+<polygon fill="black" stroke="black" points="6430.33,-398.87 6438.2,-391.77 6427.63,-392.41 6430.33,-398.87"/>
+</g>
+<!-- crypton&#45;connection&#45;&gt;data&#45;default -->
+<g id="edge137" class="edge">
+<title>crypton&#45;connection&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M2880.5,-950.74C3009.19,-947.27 3265.5,-940.54 3483,-936 3601.21,-933.53 5499.15,-938.34 5611,-900 5636.23,-891.35 5634.25,-873.93 5659,-864 5783.22,-814.15 5826.37,-852.28 5958,-828 5963.26,-827.03 5968.71,-825.89 5974.15,-824.67"/>
+<polygon fill="black" stroke="black" points="5974.78,-828.12 5983.71,-822.43 5973.18,-821.3 5974.78,-828.12"/>
+</g>
+<!-- crypton&#45;connection&#45;&gt;network -->
+<g id="edge138" class="edge">
+<title>crypton&#45;connection&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M2739.8,-940.83C2728.62,-938.9 2716.98,-937.16 2706,-936 2412.18,-905.06 1664.34,-968.71 1377,-900 1340.65,-891.31 1335.3,-878.84 1301,-864 1269.82,-850.51 1234.01,-836.52 1207.11,-826.3"/>
+<polygon fill="black" stroke="black" points="1208.54,-823.1 1197.95,-822.84 1206.07,-829.65 1208.54,-823.1"/>
+</g>
+<!-- tls -->
+<g id="node81" class="node">
+<title>tls</title>
+<ellipse fill="none" stroke="black" cx="1265" cy="-882" rx="27" ry="18"/>
+<text text-anchor="middle" x="1265" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">tls</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;tls -->
+<g id="edge139" class="edge">
+<title>crypton&#45;connection&#45;&gt;tls</title>
+<path fill="none" stroke="black" d="M2739.8,-940.82C2728.63,-938.89 2716.99,-937.15 2706,-936 2396.47,-903.63 1610.42,-964.69 1306,-900 1302.99,-899.36 1299.93,-898.51 1296.9,-897.53"/>
+<polygon fill="black" stroke="black" points="1298.24,-894.29 1287.64,-894.06 1295.78,-900.85 1298.24,-894.29"/>
+</g>
+<!-- network&#45;&gt;stm -->
+<g id="edge295" class="edge">
+<title>network&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M1130.66,-800.65C1056.99,-782.81 882.1,-738.14 741,-684 463.97,-577.71 190,-603.72 190,-307 190,-307 190,-307 190,-161 190,-121.74 190,-76.38 190,-47.69"/>
+<polygon fill="black" stroke="black" points="193.5,-48 190,-38 186.5,-48 193.5,-48"/>
+</g>
+<!-- network&#45;&gt;bytestring -->
+<g id="edge292" class="edge">
+<title>network&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1174.17,-792C1184.44,-772.22 1203.84,-739.76 1229,-720 1263.21,-693.14 1914.53,-441.4 1957,-432 2038.45,-413.97 2610.09,-389.07 2795.84,-381.36"/>
+<polygon fill="black" stroke="black" points="2795.89,-384.87 2805.74,-380.96 2795.6,-377.87 2795.89,-384.87"/>
+</g>
+<!-- network&#45;&gt;deepseq -->
+<g id="edge293" class="edge">
+<title>network&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1166.07,-791.87C1166.88,-761.13 1171.84,-695.41 1198,-648 1343.35,-384.65 1430.75,-301.98 1719,-216 1845.41,-178.29 3907.82,-165.27 4266.9,-163.28"/>
+<polygon fill="black" stroke="black" points="4266.73,-166.78 4276.71,-163.23 4266.7,-159.78 4266.73,-166.78"/>
+</g>
+<!-- network&#45;&gt;directory -->
+<g id="edge294" class="edge">
+<title>network&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1204.56,-803.62C1293.76,-791.19 1514.45,-760.41 1615.7,-746.29"/>
+<polygon fill="black" stroke="black" points="1615.95,-749.79 1625.37,-744.94 1614.98,-742.86 1615.95,-749.79"/>
+</g>
+<!-- tls&#45;&gt;mtl -->
+<g id="edge429" class="edge">
+<title>tls&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M1239.91,-874.61C1224.46,-870.92 1204.2,-866.53 1186,-864 1062.26,-846.81 734.62,-887.91 625,-828 505.01,-762.42 285.25,-417.21 330,-288 369.91,-172.75 488.13,-77.09 542.31,-37.98"/>
+<polygon fill="black" stroke="black" points="544.29,-40.86 550.41,-32.21 540.24,-35.16 544.29,-40.86"/>
+</g>
+<!-- tls&#45;&gt;bytestring -->
+<g id="edge425" class="edge">
+<title>tls&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1291.25,-876.98C1313.94,-873.52 1347.63,-868.4 1377,-864 1485.41,-847.77 1519.42,-869.19 1621,-828 1845.34,-737.03 1778.64,-540.6 1995,-432 2030.76,-414.05 2608.41,-389.02 2795.8,-381.34"/>
+<polygon fill="black" stroke="black" points="2795.69,-384.84 2805.54,-380.94 2795.4,-377.85 2795.69,-384.84"/>
+</g>
+<!-- tls&#45;&gt;data&#45;default -->
+<g id="edge427" class="edge">
+<title>tls&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M1290.68,-876.05C1313.31,-871.94 1347.2,-866.4 1377,-864 1771.08,-832.26 4539.68,-833.08 4935,-828 5323.88,-823 5790.7,-815.09 5960.34,-812.15"/>
+<polygon fill="black" stroke="black" points="5960.34,-815.65 5970.28,-811.98 5960.22,-808.65 5960.34,-815.65"/>
+</g>
+<!-- tls&#45;&gt;base16&#45;bytestring -->
+<g id="edge424" class="edge">
+<title>tls&#45;&gt;base16&#45;bytestring</title>
+<path fill="none" stroke="black" d="M1291.18,-876.52C1313.84,-872.76 1347.51,-867.47 1377,-864 1567.02,-841.63 1615.49,-845.75 1806,-828 1834.27,-825.37 1865.22,-822.26 1892.66,-819.42"/>
+<polygon fill="black" stroke="black" points="1892.69,-822.94 1902.28,-818.43 1891.97,-815.98 1892.69,-822.94"/>
+</g>
+<!-- tls&#45;&gt;crypton -->
+<g id="edge426" class="edge">
+<title>tls&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M1239.44,-875.22C1224,-871.8 1203.9,-867.48 1186,-864 1095.01,-846.34 988.22,-828.49 927.9,-818.68"/>
+<polygon fill="black" stroke="black" points="928.75,-815.27 918.32,-817.13 927.63,-822.18 928.75,-815.27"/>
+</g>
+<!-- tls&#45;&gt;memory -->
+<g id="edge428" class="edge">
+<title>tls&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M1239.89,-874.71C1224.44,-871.07 1204.18,-866.68 1186,-864 1087.63,-849.51 825.24,-879.2 740,-828 717.07,-814.23 701.77,-787.27 692.84,-766.62"/>
+<polygon fill="black" stroke="black" points="696.2,-765.58 689.21,-757.61 689.71,-768.2 696.2,-765.58"/>
+</g>
+<!-- tls&#45;&gt;network -->
+<g id="edge430" class="edge">
+<title>tls&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M1246.84,-868.16C1232.66,-858.13 1212.64,-843.98 1196.07,-832.26"/>
+<polygon fill="black" stroke="black" points="1198.21,-829.48 1188.02,-826.57 1194.16,-835.2 1198.21,-829.48"/>
+</g>
+<!-- free -->
+<g id="node82" class="node">
+<title>free</title>
+<ellipse fill="none" stroke="black" cx="7516" cy="-810" rx="27" ry="18"/>
+<text text-anchor="middle" x="7516" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">free</text>
+</g>
+<!-- free&#45;&gt;mtl -->
+<g id="edge164" class="edge">
+<title>free&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M7488.68,-808.09C7401.07,-805.22 7119.29,-796.25 6886,-792 6675.19,-788.16 3299.92,-784.39 3091,-756 3029.47,-747.64 3016.67,-733.22 2956,-720 2676.29,-659.05 2602.69,-663.04 2321,-612 2300.17,-608.22 841.81,-335.45 824,-324 708.46,-249.68 742.26,-169.02 645,-72 631.43,-58.46 614.06,-45.95 599.45,-36.48"/>
+<polygon fill="black" stroke="black" points="601.47,-33.62 591.14,-31.25 597.74,-39.54 601.47,-33.62"/>
+</g>
+<!-- free&#45;&gt;template&#45;haskell -->
+<g id="edge167" class="edge">
+<title>free&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7502.07,-794.15C7485.45,-776.45 7456.78,-745.99 7432,-720 7340.04,-623.54 7334.57,-578.41 7224,-504 7152.52,-455.89 7127.27,-454.15 7044,-432 6821.5,-372.82 6760.01,-383.69 6531,-360 6260.61,-332.03 5936.75,-315.72 5801.85,-309.69"/>
+<polygon fill="black" stroke="black" points="5802.2,-306.2 5792.05,-309.26 5801.89,-313.2 5802.2,-306.2"/>
+</g>
+<!-- free&#45;&gt;containers -->
+<g id="edge160" class="edge">
+<title>free&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M7523.1,-792.4C7539.44,-751.33 7574.82,-643.37 7527,-576 7498.93,-536.46 7366.88,-519.7 7321,-504 7225.66,-471.37 7204.7,-452.35 7106,-432 6898.67,-389.25 6646.36,-380.81 6533.1,-379.27"/>
+<polygon fill="black" stroke="black" points="6533.16,-375.77 6523.12,-379.14 6533.08,-382.77 6533.16,-375.77"/>
+</g>
+<!-- free&#45;&gt;exceptions -->
+<g id="edge162" class="edge">
+<title>free&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M7488.68,-808.09C7401.07,-805.21 7119.29,-796.24 6886,-792 6460.72,-784.26 3481.67,-793.81 3058,-756 2963.03,-747.52 2305.95,-628.3 2212,-612 1940.29,-564.86 1873.93,-543.45 1601,-504 1201.37,-446.24 717.52,-399.75 550.81,-384.4"/>
+<polygon fill="black" stroke="black" points="551.61,-380.96 541.34,-383.53 550.97,-387.93 551.61,-380.96"/>
+</g>
+<!-- free&#45;&gt;indexed&#45;traversable -->
+<g id="edge163" class="edge">
+<title>free&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M7498.08,-796.14C7432.13,-748.81 7205.85,-586.47 7190,-576 7174.02,-565.44 7156,-554.34 7140.51,-545.03"/>
+<polygon fill="black" stroke="black" points="7142.43,-542.1 7132.05,-539.98 7138.84,-548.11 7142.43,-542.1"/>
+</g>
+<!-- free&#45;&gt;th&#45;abstraction -->
+<g id="edge168" class="edge">
+<title>free&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M7511.19,-791.85C7500.88,-755.07 7476.55,-668.29 7463.92,-623.24"/>
+<polygon fill="black" stroke="black" points="7467.31,-622.37 7461.24,-613.69 7460.57,-624.26 7467.31,-622.37"/>
+</g>
+<!-- free&#45;&gt;comonad -->
+<g id="edge159" class="edge">
+<title>free&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M7543.12,-808.35C7630.35,-805.87 7902.56,-795.1 7980,-756 8019.02,-736.3 8024.44,-721.44 8047,-684 8058.36,-665.15 8066.34,-641.53 8071.36,-623.36"/>
+<polygon fill="black" stroke="black" points="8074.72,-624.34 8073.85,-613.78 8067.95,-622.58 8074.72,-624.34"/>
+</g>
+<!-- free&#45;&gt;distributive -->
+<g id="edge161" class="edge">
+<title>free&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M7543.35,-808.75C7635.41,-807.52 7932.94,-800.14 8016,-756 8105.8,-708.27 8171.32,-600.69 8198.34,-550.17"/>
+<polygon fill="black" stroke="black" points="8201.42,-551.84 8202.96,-541.36 8195.22,-548.59 8201.42,-551.84"/>
+</g>
+<!-- profunctors -->
+<g id="node83" class="node">
+<title>profunctors</title>
+<ellipse fill="none" stroke="black" cx="8315" cy="-738" rx="54.56" ry="18"/>
+<text text-anchor="middle" x="8315" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">profunctors</text>
+</g>
+<!-- free&#45;&gt;profunctors -->
+<g id="edge165" class="edge">
+<title>free&#45;&gt;profunctors</title>
+<path fill="none" stroke="black" d="M7543.13,-807.15C7632.7,-800.97 7927.13,-780.07 8170,-756 8197.46,-753.28 8227.8,-749.8 8253.59,-746.69"/>
+<polygon fill="black" stroke="black" points="8253.71,-750.2 8263.22,-745.53 8252.87,-743.26 8253.71,-750.2"/>
+</g>
+<!-- free&#45;&gt;semigroupoids -->
+<g id="edge166" class="edge">
+<title>free&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M7541.43,-803.33C7590.6,-792.37 7699.92,-768 7769,-752.6"/>
+<polygon fill="black" stroke="black" points="7769.67,-756.04 7778.67,-750.44 7768.15,-749.2 7769.67,-756.04"/>
+</g>
+<!-- profunctors&#45;&gt;contravariant -->
+<g id="edge331" class="edge">
+<title>profunctors&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M8340.77,-721.81C8356.57,-711.95 8376.8,-698.31 8393,-684 8472.77,-613.52 8474.53,-578.06 8551,-504 8686.18,-373.08 8878,-423.19 8878,-235 8878,-235 8878,-235 8878,-161 8878,-121.72 8876.45,-76.36 8875.28,-47.69"/>
+<polygon fill="black" stroke="black" points="8878.79,-47.84 8874.87,-38 8871.8,-48.14 8878.79,-47.84"/>
+</g>
+<!-- profunctors&#45;&gt;tagged -->
+<g id="edge333" class="edge">
+<title>profunctors&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M8304.46,-719.97C8282.88,-686.64 8230.26,-612.85 8166,-576 8045.78,-507.07 7883.25,-471.91 7805.73,-458.13"/>
+<polygon fill="black" stroke="black" points="7806.43,-454.7 7795.97,-456.44 7805.23,-461.6 7806.43,-454.7"/>
+</g>
+<!-- profunctors&#45;&gt;base&#45;orphans -->
+<g id="edge328" class="edge">
+<title>profunctors&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M8341.17,-721.88C8354.25,-712.76 8368.78,-699.83 8376,-684 8397.5,-636.84 8362.01,-618.26 8332,-576 8308.05,-542.27 8306.86,-527.77 8273,-504 8246.04,-485.08 8211.64,-472.28 8182.59,-464.01"/>
+<polygon fill="black" stroke="black" points="8183.77,-460.71 8173.21,-461.46 8181.94,-467.46 8183.77,-460.71"/>
+</g>
+<!-- profunctors&#45;&gt;bifunctors -->
+<g id="edge329" class="edge">
+<title>profunctors&#45;&gt;bifunctors</title>
+<path fill="none" stroke="black" d="M8265.17,-730.54C8164.52,-717.49 7937.61,-688.08 7831.58,-674.33"/>
+<polygon fill="black" stroke="black" points="7832.36,-670.91 7821.99,-673.09 7831.46,-677.85 7832.36,-670.91"/>
+</g>
+<!-- profunctors&#45;&gt;comonad -->
+<g id="edge330" class="edge">
+<title>profunctors&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M8298.46,-720.43C8278.43,-701.07 8243.01,-669.01 8208,-648 8181.48,-632.09 8149.32,-618.93 8123.62,-609.71"/>
+<polygon fill="black" stroke="black" points="8125.06,-606.5 8114.46,-606.5 8122.74,-613.11 8125.06,-606.5"/>
+</g>
+<!-- profunctors&#45;&gt;distributive -->
+<g id="edge332" class="edge">
+<title>profunctors&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M8333.97,-720.92C8343.77,-711.34 8354.76,-698.28 8360,-684 8365.52,-668.98 8366.74,-662.51 8360,-648 8337.6,-599.76 8286.4,-563.42 8250.53,-542.69"/>
+<polygon fill="black" stroke="black" points="8252.61,-539.84 8242.18,-538 8249.18,-545.95 8252.61,-539.84"/>
+</g>
+<!-- semigroupoids&#45;&gt;contravariant -->
+<g id="edge363" class="edge">
+<title>semigroupoids&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M7842.36,-720.31C7866.63,-688.53 7923.49,-618.7 7985,-576 8051.06,-530.14 8073.5,-525.48 8151,-504 8268.51,-471.42 8316.89,-528.1 8423,-468 8502.54,-422.95 8551,-398.41 8551,-307 8551,-307 8551,-307 8551,-161 8551,-51.22 8709.3,-25.55 8804.26,-20.03"/>
+<polygon fill="black" stroke="black" points="8804.19,-23.54 8814,-19.53 8803.83,-16.55 8804.19,-23.54"/>
+</g>
+<!-- semigroupoids&#45;&gt;template&#45;haskell -->
+<g id="edge367" class="edge">
+<title>semigroupoids&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7789.37,-723.52C7766.54,-714.65 7738.43,-701.43 7717,-684 7670.46,-646.14 7675.77,-620.92 7636,-576 7605.37,-541.4 7600.04,-528.72 7561,-504 7485.06,-455.91 7459.29,-453.45 7372,-432 7239.87,-399.54 7196.24,-441.45 7068,-396 7039.76,-385.99 7039.6,-368.93 7011,-360 6895.24,-323.88 6043.76,-310.75 5801.9,-307.73"/>
+<polygon fill="black" stroke="black" points="5802.07,-304.23 5792.03,-307.61 5801.99,-311.23 5802.07,-304.23"/>
+</g>
+<!-- semigroupoids&#45;&gt;containers -->
+<g id="edge362" class="edge">
+<title>semigroupoids&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M7777.04,-726.97C7692.02,-709.82 7520.85,-670.88 7385,-612 7328.28,-587.42 7315.16,-577.47 7266,-540 7247.5,-525.9 7248.53,-514.95 7228,-504 7163.68,-469.71 7136.91,-491.75 7068,-468 7032.66,-455.82 7028,-442.04 6992,-432 6830.62,-386.98 6631.48,-379.35 6533.41,-378.58"/>
+<polygon fill="black" stroke="black" points="6533.49,-375.08 6523.47,-378.53 6533.45,-382.08 6533.49,-375.08"/>
+</g>
+<!-- semigroupoids&#45;&gt;hashable -->
+<g id="edge365" class="edge">
+<title>semigroupoids&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M7764.92,-735.33C7637.88,-732.11 7347.91,-724.91 7104,-720 6985.51,-717.61 5082.05,-725.41 4971,-684 4947.65,-675.29 4950.74,-658.2 4928,-648 4827.57,-602.98 4789.82,-638.5 4683,-612 4680.88,-611.47 4678.71,-610.89 4676.54,-610.26"/>
+<polygon fill="black" stroke="black" points="4677.75,-606.97 4667.16,-607.32 4675.66,-613.65 4677.75,-606.97"/>
+</g>
+<!-- semigroupoids&#45;&gt;tagged -->
+<g id="edge366" class="edge">
+<title>semigroupoids&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M7831.22,-719.82C7831.89,-709.46 7832.66,-695.98 7833,-684 7835.3,-602.7 7833.89,-577.93 7800,-504 7795.43,-494.04 7788.82,-484.1 7782.32,-475.57"/>
+<polygon fill="black" stroke="black" points="7785.08,-473.42 7776.11,-467.79 7779.62,-477.79 7785.08,-473.42"/>
+</g>
+<!-- semigroupoids&#45;&gt;unordered&#45;containers -->
+<g id="edge369" class="edge">
+<title>semigroupoids&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M7764.58,-735.99C7561.51,-732.54 6923.9,-719.45 6397,-684 6369.05,-682.12 6338.64,-679.39 6311.18,-676.66"/>
+<polygon fill="black" stroke="black" points="6311.81,-673.2 6301.51,-675.69 6311.11,-680.17 6311.81,-673.2"/>
+</g>
+<!-- semigroupoids&#45;&gt;transformers&#45;compat -->
+<g id="edge368" class="edge">
+<title>semigroupoids&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M7878.34,-725.52C7922.37,-714.98 7989.14,-698.81 8047,-684 8244.33,-633.48 8477.06,-570.03 8585.96,-540.11"/>
+<polygon fill="black" stroke="black" points="8586.87,-543.49 8595.59,-537.46 8585.02,-536.74 8586.87,-543.49"/>
+</g>
+<!-- semigroupoids&#45;&gt;base&#45;orphans -->
+<g id="edge359" class="edge">
+<title>semigroupoids&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M7835.64,-719.73C7846.62,-688.2 7873.39,-620.46 7914,-576 7959.76,-525.9 8030.29,-489.49 8076.55,-469.29"/>
+<polygon fill="black" stroke="black" points="8077.68,-472.61 8085.5,-465.46 8074.93,-466.18 8077.68,-472.61"/>
+</g>
+<!-- semigroupoids&#45;&gt;bifunctors -->
+<g id="edge360" class="edge">
+<title>semigroupoids&#45;&gt;bifunctors</title>
+<path fill="none" stroke="black" d="M7816.69,-720.05C7810.27,-711.89 7802.43,-701.91 7795.29,-692.82"/>
+<polygon fill="black" stroke="black" points="7798.06,-690.68 7789.13,-684.98 7792.55,-695 7798.06,-690.68"/>
+</g>
+<!-- semigroupoids&#45;&gt;comonad -->
+<g id="edge361" class="edge">
+<title>semigroupoids&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M7890.57,-730.8C7929.91,-724.3 7980.63,-711.03 8018,-684 8039.66,-668.33 8055.88,-642.28 8065.96,-622.4"/>
+<polygon fill="black" stroke="black" points="8069.08,-623.99 8070.27,-613.46 8062.78,-620.95 8069.08,-623.99"/>
+</g>
+<!-- semigroupoids&#45;&gt;distributive -->
+<g id="edge364" class="edge">
+<title>semigroupoids&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M7870.27,-723.46C7892.89,-714.56 7920.75,-701.34 7942,-684 7988.48,-646.06 7973.49,-609.9 8023,-576 8061.26,-549.8 8112.24,-536.48 8151.62,-529.75"/>
+<polygon fill="black" stroke="black" points="8152.1,-533.22 8161.42,-528.18 8150.99,-526.31 8152.1,-533.22"/>
+</g>
+<!-- iproute&#45;&gt;bytestring -->
+<g id="edge235" class="edge">
+<title>iproute&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2502.12,-863.73C2491.84,-824.66 2470.5,-726.74 2490,-648 2498.7,-612.88 2506.52,-605.12 2528,-576 2541.43,-557.79 2551.19,-558.65 2564,-540 2593.74,-496.7 2571.29,-465.2 2612,-432 2640.01,-409.16 2735.52,-393.47 2797.84,-385.38"/>
+<polygon fill="black" stroke="black" points="2798.09,-388.88 2807.57,-384.15 2797.21,-381.94 2798.09,-388.88"/>
+</g>
+<!-- iproute&#45;&gt;containers -->
+<g id="edge236" class="edge">
+<title>iproute&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2542.75,-877.86C2589.61,-873.88 2674.39,-867.17 2747,-864 3718.65,-821.63 3965.21,-901.59 4935,-828 5053.52,-819.01 5081.7,-803.48 5200,-792 5336.48,-778.76 5687.24,-803.14 5816,-756 5841.04,-746.83 5841.57,-734.42 5864,-720 5892.1,-701.93 5901.9,-702.07 5930,-684 5952.43,-669.58 5954.35,-660.31 5978,-648 6023.63,-624.25 6040.22,-631.05 6088,-612 6122.72,-598.16 6210.71,-563.22 6240,-540 6288.08,-501.88 6276.14,-467.76 6326,-432 6354.05,-411.88 6390.53,-398.67 6420.14,-390.47"/>
+<polygon fill="black" stroke="black" points="6420.88,-393.89 6429.65,-387.95 6419.09,-387.12 6420.88,-393.89"/>
+</g>
+<!-- iproute&#45;&gt;network -->
+<g id="edge237" class="edge">
+<title>iproute&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M2470.45,-879.3C2335.06,-872.98 1849.32,-850.05 1449,-828 1368.08,-823.54 1274.18,-817.79 1217.47,-814.25"/>
+<polygon fill="black" stroke="black" points="1218.01,-810.77 1207.81,-813.64 1217.57,-817.76 1218.01,-810.77"/>
+</g>
+<!-- mime&#45;types&#45;&gt;bytestring -->
+<g id="edge289" class="edge">
+<title>mime&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M4335.31,-579.43C4286.05,-559.58 4189.47,-522.93 4104,-504 3652.9,-404.08 3092.39,-383.93 2912.46,-379.96"/>
+<polygon fill="black" stroke="black" points="2912.75,-376.46 2902.68,-379.75 2912.61,-383.46 2912.75,-376.46"/>
+</g>
+<!-- mime&#45;types&#45;&gt;containers -->
+<g id="edge290" class="edge">
+<title>mime&#45;types&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M4407.12,-581.42C4513.53,-550.5 4817.63,-466.07 5077,-432 5144.09,-423.19 6155.34,-389.45 6413.41,-380.95"/>
+<polygon fill="black" stroke="black" points="6413.37,-384.46 6423.25,-380.63 6413.14,-377.46 6413.37,-384.46"/>
+</g>
+<!-- mime&#45;types&#45;&gt;text -->
+<g id="edge291" class="edge">
+<title>mime&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M4326.32,-582.44C4317.63,-580.27 4308.52,-578.04 4300,-576 4231.06,-559.51 4150.33,-541.32 4104.57,-531.11"/>
+<polygon fill="black" stroke="black" points="4105.44,-527.72 4094.92,-528.96 4103.92,-534.55 4105.44,-527.72"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;stm -->
+<g id="edge378" class="edge">
+<title>streaming&#45;commons&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M1550.75,-870.95C1530.27,-868.3 1507.76,-865.71 1487,-864 1270.25,-846.19 721.76,-873.05 509,-828 271.58,-777.73 114,-693.68 114,-451 114,-451 114,-451 114,-161 114,-114.73 145.76,-68.94 168.22,-42.35"/>
+<polygon fill="black" stroke="black" points="170.77,-44.75 174.71,-34.91 165.5,-40.14 170.77,-44.75"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;Win32 -->
+<g id="edge370" class="edge">
+<title>streaming&#45;commons&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1640.32,-864.07C1664.91,-842.12 1705.01,-801.24 1721,-756 1729.43,-732.15 1715.25,-662.68 1706,-623.23"/>
+<polygon fill="black" stroke="black" points="1709.46,-622.65 1703.73,-613.74 1702.65,-624.28 1709.46,-622.65"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;bytestring -->
+<g id="edge372" class="edge">
+<title>streaming&#45;commons&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1682.24,-869.2C1693.14,-867.32 1704.38,-865.51 1715,-864 1866.32,-842.52 1919.22,-894.16 2057,-828 2280.24,-720.8 2227.13,-542.01 2449,-432 2508.68,-402.41 2698.87,-387.71 2795.88,-381.98"/>
+<polygon fill="black" stroke="black" points="2795.94,-385.48 2805.73,-381.41 2795.54,-378.49 2795.94,-385.48"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;directory -->
+<g id="edge373" class="edge">
+<title>streaming&#45;commons&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1625.89,-863.59C1634.06,-839.4 1648.95,-795.36 1658.65,-766.65"/>
+<polygon fill="black" stroke="black" points="1661.84,-768.14 1661.73,-757.54 1655.21,-765.9 1661.84,-768.14"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;filepath -->
+<g id="edge374" class="edge">
+<title>streaming&#45;commons&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1556.71,-869.5C1513.63,-860.23 1462.14,-845.83 1449,-828 1411.13,-776.62 1342.54,-862.26 1502,-576 1508.28,-564.74 1517.59,-554.18 1526.6,-545.5"/>
+<polygon fill="black" stroke="black" points="1528.9,-548.14 1533.93,-538.82 1524.18,-542.97 1528.9,-548.14"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;process -->
+<g id="edge376" class="edge">
+<title>streaming&#45;commons&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M1608.13,-863.7C1602.59,-855.61 1595.87,-845.81 1589.74,-836.87"/>
+<polygon fill="black" stroke="black" points="1592.8,-835.14 1584.25,-828.87 1587.02,-839.1 1592.8,-835.14"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;text -->
+<g id="edge379" class="edge">
+<title>streaming&#45;commons&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1680.91,-868.96C1692.2,-867.05 1703.93,-865.28 1715,-864 2009.01,-829.87 2084.79,-849.44 2380,-828 2555.82,-815.23 2599.38,-807.32 2775,-792 2870.97,-783.63 3120.62,-798.64 3207,-756 3210.63,-754.21 3301.38,-649.81 3305,-648 3458.72,-571.15 3533.49,-682.99 3690,-612 3711.19,-602.39 3707.12,-586.26 3728,-576 3754.8,-562.84 3947.09,-537.91 4030.06,-527.62"/>
+<polygon fill="black" stroke="black" points="4030.47,-531.1 4039.97,-526.4 4029.62,-524.15 4030.47,-531.1"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;random -->
+<g id="edge377" class="edge">
+<title>streaming&#45;commons&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M1681.17,-868.97C1692.39,-867.08 1704.02,-865.31 1715,-864 1976.74,-832.73 2049.03,-882.16 2307,-828 2442.83,-799.48 2468.57,-764.58 2600,-720 2702.24,-685.32 2727.24,-674.12 2832,-648 2912.17,-628.01 3006.93,-611.48 3062.83,-602.45"/>
+<polygon fill="black" stroke="black" points="3063.34,-605.91 3072.66,-600.87 3062.23,-599 3063.34,-605.91"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;async -->
+<g id="edge371" class="edge">
+<title>streaming&#45;commons&#45;&gt;async</title>
+<path fill="none" stroke="black" d="M1552.76,-870.44C1490.83,-860.01 1404.02,-843.44 1373,-828 1340.61,-811.87 1310.11,-783.19 1290.84,-762.75"/>
+<polygon fill="black" stroke="black" points="1293.66,-760.65 1284.32,-755.67 1288.51,-765.4 1293.66,-760.65"/>
+</g>
+<!-- streaming&#45;commons&#45;&gt;network -->
+<g id="edge375" class="edge">
+<title>streaming&#45;commons&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M1552.52,-870.6C1460.16,-856.36 1296.56,-831.13 1215.03,-818.56"/>
+<polygon fill="black" stroke="black" points="1215.99,-815.17 1205.58,-817.1 1214.93,-822.09 1215.99,-815.17"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;bytestring -->
+<g id="edge204" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2739.6,-1022.66C2657.93,-1016.04 2511,-991.3 2434,-900 2382.25,-838.63 2402.97,-798.66 2419,-720 2446.72,-583.96 2430.31,-517.11 2540,-432 2545.12,-428.03 2711.24,-401.43 2799.73,-387.49"/>
+<polygon fill="black" stroke="black" points="2800.07,-390.98 2809.4,-385.97 2798.98,-384.07 2800.07,-390.98"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;containers -->
+<g id="edge206" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2856.5,-1022.8C2945.69,-1019.47 3121.05,-1013 3270,-1008 4342.47,-971.97 4616.16,-1024.36 5682,-900 5727.61,-894.68 6056.17,-860.11 6089,-828 6147.33,-770.96 6067.25,-705.63 6125,-648 6183.37,-589.76 6230.66,-643.15 6307,-612 6361.1,-589.92 6381.04,-586.05 6417,-540 6448.12,-500.15 6462.64,-441.78 6468.86,-407.36"/>
+<polygon fill="black" stroke="black" points="6472.27,-408.19 6470.48,-397.74 6465.37,-407.03 6472.27,-408.19"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;text -->
+<g id="edge216" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2837.46,-1012.28C2902.86,-991.87 3038.18,-952.42 3156,-936 3215.51,-927.71 4195.22,-943.19 4237,-900 4295.34,-839.68 4246.72,-770.89 4180,-720 4141.77,-690.85 4113.68,-716.22 4078,-684 4040.65,-650.27 4033.38,-625.19 4044,-576 4045.96,-566.94 4049.59,-557.56 4053.46,-549.26"/>
+<polygon fill="black" stroke="black" points="4056.53,-550.95 4057.87,-540.44 4050.26,-547.82 4056.53,-550.95"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;exceptions -->
+<g id="edge210" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M2738.74,-1024.33C2428.88,-1020.71 1001.72,-1002.51 807,-972 581.48,-936.67 484.98,-979.24 314,-828 250.62,-771.94 208.81,-720.76 252,-648 269.06,-619.27 293.8,-635.04 318,-612 358.74,-573.21 353.73,-551.41 384,-504 404.7,-471.59 406.83,-461.08 432,-432 441.13,-421.45 452.28,-410.95 462.41,-402.11"/>
+<polygon fill="black" stroke="black" points="464.48,-404.94 469.83,-395.8 459.95,-399.61 464.48,-404.94"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;network&#45;uri -->
+<g id="edge215" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;network&#45;uri</title>
+<path fill="none" stroke="black" d="M2848.95,-1016.71C2962.46,-998.6 3244.86,-955.59 3483,-936 3939.07,-898.48 4058.71,-962.76 4512,-900 4571.89,-891.71 4737.45,-847.89 4821.95,-824.98"/>
+<polygon fill="black" stroke="black" points="4822.63,-828.42 4831.36,-822.43 4820.8,-821.67 4822.63,-828.42"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;data&#45;default -->
+<g id="edge209" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M2856.29,-1022.38C3096.59,-1011.58 4034.05,-969.54 4805,-936 4898.77,-931.92 5562.56,-936.6 5649,-900 5670.42,-890.93 5666.02,-874.06 5687,-864 5793.38,-812.98 5833.89,-848.9 5950,-828 5957.16,-826.71 5964.66,-825.21 5972.05,-823.65"/>
+<polygon fill="black" stroke="black" points="5972.61,-827.11 5981.64,-821.57 5971.13,-820.27 5972.61,-827.11"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;http&#45;client -->
+<g id="edge211" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;http&#45;client</title>
+<path fill="none" stroke="black" d="M2766.76,-1010.33C2744.02,-999.64 2713.04,-985.08 2688.56,-973.59"/>
+<polygon fill="black" stroke="black" points="2690.08,-970.43 2679.54,-969.35 2687.1,-976.77 2690.08,-970.43"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;http&#45;types -->
+<g id="edge212" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M2835.06,-1011.65C2860.45,-1001.94 2894.55,-987.77 2923,-972 2958.5,-952.32 2996.22,-924.96 3021.25,-905.79"/>
+<polygon fill="black" stroke="black" points="3023.22,-908.68 3028.99,-899.8 3018.94,-903.15 3023.22,-908.68"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;case&#45;insensitive -->
+<g id="edge205" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M2833.91,-1011.37C2852.81,-1002.62 2875.1,-989.57 2890,-972 2922,-934.27 2939.27,-908.18 2917,-864 2891.53,-813.49 2834.95,-778.32 2794.26,-758.43"/>
+<polygon fill="black" stroke="black" points="2795.94,-755.35 2785.4,-754.23 2792.94,-761.67 2795.94,-755.35"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;crypton -->
+<g id="edge207" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M2738.75,-1025.18C2429.46,-1025.9 1011.46,-1026.23 937,-972 894.83,-941.28 883.7,-876.73 880.86,-839.37"/>
+<polygon fill="black" stroke="black" points="884.38,-839.56 880.3,-829.78 877.39,-839.97 884.38,-839.56"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;memory -->
+<g id="edge213" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M2738.91,-1024.32C2427.94,-1020.62 991.97,-1001.96 903,-972 798.85,-936.93 762.2,-919.94 702,-828 690.29,-810.11 685.65,-786.26 683.88,-767.75"/>
+<polygon fill="black" stroke="black" points="687.38,-767.71 683.19,-757.98 680.4,-768.21 687.38,-767.71"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;crypton&#45;connection -->
+<g id="edge208" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;crypton&#45;connection</title>
+<path fill="none" stroke="black" d="M2798,-1007.7C2798,-1000.41 2798,-991.73 2798,-983.54"/>
+<polygon fill="black" stroke="black" points="2801.5,-983.62 2798,-973.62 2794.5,-983.62 2801.5,-983.62"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;network -->
+<g id="edge214" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;network</title>
+<path fill="none" stroke="black" d="M2739.04,-1023.72C2524.01,-1018.88 1782.23,-1000.46 1547,-972 1385.88,-952.51 1306.84,-1011.6 1189,-900 1172.78,-884.64 1167.42,-859.48 1165.9,-839.82"/>
+<polygon fill="black" stroke="black" points="1169.4,-839.77 1165.45,-829.94 1162.41,-840.09 1169.4,-839.77"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;tls -->
+<g id="edge217" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;tls</title>
+<path fill="none" stroke="black" d="M2739.66,-1022.52C2499.39,-1011.95 1585.9,-968 1306,-900 1303.01,-899.27 1299.96,-898.36 1296.94,-897.34"/>
+<polygon fill="black" stroke="black" points="1298.29,-894.11 1287.7,-893.82 1295.8,-900.65 1298.29,-894.11"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;OneTuple -->
+<g id="edge222" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;OneTuple</title>
+<path fill="none" stroke="black" d="M6969.71,-719.69C6955.25,-676.48 6925.12,-563.15 6983,-504 7019.24,-466.96 7397.16,-478.02 7448,-468 7533.03,-451.24 7628.5,-416.78 7681.93,-396"/>
+<polygon fill="black" stroke="black" points="7682.91,-399.37 7690.94,-392.46 7680.36,-392.86 7682.91,-399.37"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;indexed&#45;traversable -->
+<g id="edge223" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M7019.27,-720.89C7036.33,-712.42 7054.56,-700.34 7066,-684 7094,-644.01 7074.08,-623.34 7086,-576 7088.09,-567.72 7090.76,-558.84 7093.36,-550.77"/>
+<polygon fill="black" stroke="black" points="7096.62,-552.06 7096.45,-541.46 7089.98,-549.85 7096.62,-552.06"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;tagged -->
+<g id="edge224" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M6981.16,-719.96C6984.12,-709.63 6987.7,-696.16 6990,-684 7004.99,-604.86 6952.76,-559.64 7011,-504 7017.4,-497.88 7552.18,-464.03 7714.68,-453.88"/>
+<polygon fill="black" stroke="black" points="7714.9,-457.37 7724.66,-453.26 7714.46,-450.39 7714.9,-457.37"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;unordered&#45;containers -->
+<g id="edge225" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M6875.31,-727.97C6759.79,-717.57 6564.7,-699.87 6397,-684 6369.77,-681.42 6340.14,-678.55 6313.19,-675.92"/>
+<polygon fill="black" stroke="black" points="6313.61,-672.44 6303.32,-674.95 6312.93,-679.41 6313.61,-672.44"/>
+</g>
+<!-- indexed&#45;traversable&#45;instances&#45;&gt;vector -->
+<g id="edge226" class="edge">
+<title>indexed&#45;traversable&#45;instances&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M6951.79,-720.05C6937.76,-710.23 6919.99,-697.79 6905.18,-687.43"/>
+<polygon fill="black" stroke="black" points="6907.39,-684.7 6897.19,-681.83 6903.38,-690.44 6907.39,-684.7"/>
+</g>
+<!-- kan&#45;extensions -->
+<g id="node90" class="node">
+<title>kan&#45;extensions</title>
+<ellipse fill="none" stroke="black" cx="8212" cy="-882" rx="65.53" ry="18"/>
+<text text-anchor="middle" x="8212" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">kan&#45;extensions</text>
+</g>
+<!-- kan&#45;extensions&#45;&gt;contravariant -->
+<g id="edge240" class="edge">
+<title>kan&#45;extensions&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M8265.49,-871.29C8429.78,-839.94 8916,-735.33 8916,-595 8916,-595 8916,-595 8916,-161 8916,-119.69 8899.46,-74.3 8887.13,-46.22"/>
+<polygon fill="black" stroke="black" points="8890.44,-45.05 8883.12,-37.39 8884.07,-47.94 8890.44,-45.05"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;mtl -->
+<g id="edge243" class="edge">
+<title>kan&#45;extensions&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M8146.44,-880.57C7417.51,-875.75 854.82,-832.29 831,-828 784.92,-819.71 662.73,-792.17 633,-756 587.02,-700.06 608,-667.41 608,-595 608,-595 608,-595 608,-161 608,-119.95 593,-74.43 581.85,-46.26"/>
+<polygon fill="black" stroke="black" points="585.11,-44.99 578.08,-37.06 578.63,-47.64 585.11,-44.99"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;containers -->
+<g id="edge239" class="edge">
+<title>kan&#45;extensions&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M8147.16,-878.96C7979.31,-873.31 7539.53,-855.99 7480,-828 7399.78,-790.29 7400.75,-750.38 7342,-684 7333.44,-674.33 7206.13,-510.54 7195,-504 7115.98,-457.62 7081.34,-488.34 6992,-468 6933.96,-454.79 6921.29,-444.04 6863,-432 6746.36,-407.92 6607.76,-392.06 6531.17,-384.39"/>
+<polygon fill="black" stroke="black" points="6531.68,-380.92 6521.38,-383.42 6530.99,-387.89 6531.68,-380.92"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;tagged -->
+<g id="edge246" class="edge">
+<title>kan&#45;extensions&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M8213.47,-863.56C8216.85,-811.05 8219.1,-653.27 8133,-576 8086.15,-533.95 8055.93,-559.29 7996,-540 7953.41,-526.29 7943.83,-519.87 7902,-504 7867.36,-490.85 7827.87,-476.02 7799.51,-465.4"/>
+<polygon fill="black" stroke="black" points="7800.85,-462.17 7790.26,-461.94 7798.4,-468.72 7800.85,-462.17"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;comonad -->
+<g id="edge238" class="edge">
+<title>kan&#45;extensions&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M8208.92,-863.73C8201.14,-823.39 8177.98,-720.89 8132,-648 8125.15,-637.14 8115.66,-626.84 8106.54,-618.27"/>
+<polygon fill="black" stroke="black" points="8108.91,-615.7 8099.13,-611.62 8104.24,-620.9 8108.91,-615.7"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;distributive -->
+<g id="edge241" class="edge">
+<title>kan&#45;extensions&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M8243.33,-866C8262.25,-856.31 8286.4,-842.77 8306,-828 8342.39,-800.57 8361.42,-798.04 8379,-756 8385.17,-741.24 8379.33,-736 8379,-720 8378.33,-687.98 8385.31,-678.64 8376,-648 8365.09,-612.12 8360.22,-600.7 8332,-576 8312.1,-558.58 8285.57,-546.06 8262.51,-537.58"/>
+<polygon fill="black" stroke="black" points="8263.88,-534.35 8253.29,-534.35 8261.57,-540.96 8263.88,-534.35"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;free -->
+<g id="edge242" class="edge">
+<title>kan&#45;extensions&#45;&gt;free</title>
+<path fill="none" stroke="black" d="M8151.15,-874.88C8011.03,-860.79 7668.87,-826.37 7554.18,-814.84"/>
+<polygon fill="black" stroke="black" points="7554.68,-811.37 7544.38,-813.85 7553.98,-818.34 7554.68,-811.37"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;profunctors -->
+<g id="edge244" class="edge">
+<title>kan&#45;extensions&#45;&gt;profunctors</title>
+<path fill="none" stroke="black" d="M8240.93,-865.39C8255.6,-856.2 8272.66,-843.36 8284,-828 8297.29,-809.99 8305.23,-785.81 8309.74,-767.2"/>
+<polygon fill="black" stroke="black" points="8313.11,-768.16 8311.85,-757.64 8306.28,-766.65 8313.11,-768.16"/>
+</g>
+<!-- kan&#45;extensions&#45;&gt;semigroupoids -->
+<g id="edge245" class="edge">
+<title>kan&#45;extensions&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M8182.37,-865.65C8144.83,-846.61 8077.82,-814 8018,-792 7975.71,-776.44 7926.67,-762.76 7889.28,-753.19"/>
+<polygon fill="black" stroke="black" points="7890.59,-749.91 7880.03,-750.85 7888.87,-756.7 7890.59,-749.91"/>
+</g>
+<!-- lens&#45;&gt;contravariant -->
+<g id="edge253" class="edge">
+<title>lens&#45;&gt;contravariant</title>
+<path fill="none" stroke="black" d="M7188.4,-952.79C7389.96,-951.12 8639.91,-939.25 8803,-900 8893.27,-878.27 8992,-903.85 8992,-811 8992,-811 8992,-811 8992,-161 8992,-108.7 8944.07,-65.39 8909.3,-40.85"/>
+<polygon fill="black" stroke="black" points="8911.38,-38.03 8901.15,-35.28 8907.44,-43.81 8911.38,-38.03"/>
+</g>
+<!-- lens&#45;&gt;ghc&#45;prim -->
+<g id="edge258" class="edge">
+<title>lens&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M7180.38,-940.88C7184.42,-938.89 7188.74,-937.11 7193,-936 7525.68,-848.99 8405.51,-979.77 8740,-900 8876.77,-867.38 8954,-807.61 8954,-667 8954,-667 8954,-667 8954,-593 8954,-316.69 8787.95,-225.69 8524,-144 8356.71,-92.22 2512.54,-90.99 1940.02,-91"/>
+<polygon fill="black" stroke="black" points="1940.09,-87.5 1930.09,-91 1940.09,-94.5 1940.09,-87.5"/>
+</g>
+<!-- lens&#45;&gt;mtl -->
+<g id="edge263" class="edge">
+<title>lens&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M7133.83,-952.93C6726.2,-951.78 1859.35,-937.37 1229,-900 1210.73,-898.92 590.39,-836.15 574,-828 534.59,-808.39 522.26,-796.9 506,-756 500.09,-741.13 505.34,-735.99 506,-720 508.67,-655.83 509.53,-639.66 518,-576 528.72,-495.38 541.6,-476.79 551,-396 566.05,-266.62 569.19,-110.9 569.83,-47.72"/>
+<polygon fill="black" stroke="black" points="573.33,-47.9 569.92,-37.87 566.33,-47.83 573.33,-47.9"/>
+</g>
+<!-- lens&#45;&gt;template&#45;haskell -->
+<g id="edge270" class="edge">
+<title>lens&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M7134.73,-949.49C7077.29,-941.7 6936.24,-921.89 6819,-900 6671.86,-872.53 6617.16,-906.97 6490,-828 6402.97,-773.95 6421.26,-717.51 6346,-648 6199.3,-512.5 6125.17,-526.49 5974,-396 5957.57,-381.82 5959.59,-371.2 5941,-360 5898.41,-334.35 5843.53,-320.99 5801.58,-314.1"/>
+<polygon fill="black" stroke="black" points="5802.29,-310.67 5791.88,-312.59 5801.22,-317.58 5802.29,-310.67"/>
+</g>
+<!-- lens&#45;&gt;bytestring -->
+<g id="edge249" class="edge">
+<title>lens&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M7133.87,-952.91C6814.81,-951.8 3787.52,-940.27 3706,-900 3642.03,-868.39 3569.24,-682.89 3507,-648 3389.86,-582.34 3321.54,-682.1 3207,-612 3124.78,-561.68 3165.46,-486.57 3086,-432 3034.34,-396.52 2962.45,-384.48 2912.44,-380.56"/>
+<polygon fill="black" stroke="black" points="2912.9,-377.08 2902.68,-379.88 2912.42,-384.06 2912.9,-377.08"/>
+</g>
+<!-- lens&#45;&gt;containers -->
+<g id="edge252" class="edge">
+<title>lens&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M7187.78,-949.93C7280.77,-938.54 7584,-894.95 7584,-811 7584,-811 7584,-811 7584,-665 7584,-558 7504.13,-544.29 7405,-504 7307.34,-464.31 7282.49,-452.08 7179,-432 6943.17,-386.24 6655.93,-379.46 6533.23,-378.81"/>
+<polygon fill="black" stroke="black" points="6533.41,-375.31 6523.39,-378.77 6533.38,-382.31 6533.41,-375.31"/>
+</g>
+<!-- lens&#45;&gt;filepath -->
+<g id="edge256" class="edge">
+<title>lens&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M7133.69,-952.88C6713.86,-951.05 1594.61,-928.12 1525,-900 1503.43,-891.29 1506.59,-876.54 1487,-864 1450.72,-840.77 1421.15,-863.67 1397,-828 1387.73,-814.31 1398.79,-741.94 1405,-720 1424.71,-650.37 1432.45,-629.66 1481,-576 1492.58,-563.2 1507.73,-551.59 1521.22,-542.53"/>
+<polygon fill="black" stroke="black" points="1522.92,-545.6 1529.41,-537.22 1519.11,-539.72 1522.92,-545.6"/>
+</g>
+<!-- lens&#45;&gt;text -->
+<g id="edge271" class="edge">
+<title>lens&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M7133.69,-953.05C6942.63,-953.24 5803.69,-952.14 5462,-900 5226.2,-864.02 5174.08,-822.45 4945,-756 4785.39,-709.7 4746.31,-695.34 4587,-648 4532.4,-631.77 4512.36,-642.1 4464,-612 4445.57,-600.53 4450.37,-585.8 4431,-576 4298.97,-509.17 4241.44,-583.5 4100,-540 4099.34,-539.8 4098.68,-539.58 4098.02,-539.35"/>
+<polygon fill="black" stroke="black" points="4099.43,-536.15 4088.86,-535.43 4096.67,-542.58 4099.43,-536.15"/>
+</g>
+<!-- lens&#45;&gt;exceptions -->
+<g id="edge255" class="edge">
+<title>lens&#45;&gt;exceptions</title>
+<path fill="none" stroke="black" d="M7133.82,-952.92C6723.52,-951.69 1796.15,-936.22 1158,-900 851.93,-882.63 717.84,-1011.15 472,-828 381.55,-760.62 428.29,-687.95 442,-576 449.53,-514.5 469.83,-444.56 481.81,-406.77"/>
+<polygon fill="black" stroke="black" points="485.04,-408.16 484.77,-397.57 478.37,-406.01 485.04,-408.16"/>
+</g>
+<!-- lens&#45;&gt;hashable -->
+<g id="edge259" class="edge">
+<title>lens&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M7133.92,-952.92C6870.95,-951.94 4775.59,-940.66 4525,-828 4461.05,-799.25 4462.97,-765.94 4410,-720 4390.65,-703.22 4376.1,-707.08 4365,-684 4358.07,-669.58 4354.83,-660.36 4365,-648 4391.85,-615.37 4510.52,-602.53 4581.29,-597.71"/>
+<polygon fill="black" stroke="black" points="4581.37,-601.21 4591.13,-597.07 4580.92,-594.22 4581.37,-601.21"/>
+</g>
+<!-- lens&#45;&gt;indexed&#45;traversable -->
+<g id="edge260" class="edge">
+<title>lens&#45;&gt;indexed&#45;traversable</title>
+<path fill="none" stroke="black" d="M7166.1,-935.83C7176.93,-897.36 7200.72,-801.23 7194,-720 7191.32,-687.67 7190.59,-679.28 7182,-648 7172.91,-614.89 7172.49,-604.93 7154,-576 7147.5,-565.83 7138.85,-555.95 7130.53,-547.52"/>
+<polygon fill="black" stroke="black" points="7133.09,-545.14 7123.48,-540.69 7128.22,-550.16 7133.09,-545.14"/>
+</g>
+<!-- lens&#45;&gt;strict -->
+<g id="edge268" class="edge">
+<title>lens&#45;&gt;strict</title>
+<path fill="none" stroke="black" d="M7133.65,-952.97C7003.83,-952.57 6449.14,-948.04 6284,-900 6188.87,-872.33 6183.92,-820.39 6089,-792 5885.74,-731.2 5822.85,-787.24 5613,-756 5600.43,-754.13 5586.85,-751.34 5574.69,-748.56"/>
+<polygon fill="black" stroke="black" points="5575.56,-745.17 5565.03,-746.28 5573.95,-751.98 5575.56,-745.17"/>
+</g>
+<!-- lens&#45;&gt;tagged -->
+<g id="edge269" class="edge">
+<title>lens&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M7188.24,-952.56C7272.65,-950.76 7528.34,-941.9 7598,-900 7639.31,-875.15 7660,-859.21 7660,-811 7660,-811 7660,-811 7660,-737 7660,-636.43 7716.21,-526.74 7744.77,-477.51"/>
+<polygon fill="black" stroke="black" points="7747.73,-479.37 7749.8,-468.98 7741.7,-475.81 7747.73,-479.37"/>
+</g>
+<!-- lens&#45;&gt;th&#45;abstraction -->
+<g id="edge272" class="edge">
+<title>lens&#45;&gt;th&#45;abstraction</title>
+<path fill="none" stroke="black" d="M7182.58,-942.72C7201.61,-933.11 7229.57,-917.62 7251,-900 7344.73,-822.93 7358.77,-789.91 7418,-684 7429.02,-664.3 7438.94,-640.77 7445.88,-622.85"/>
+<polygon fill="black" stroke="black" points="7449.09,-624.25 7449.36,-613.66 7442.54,-621.77 7449.09,-624.25"/>
+</g>
+<!-- lens&#45;&gt;these -->
+<g id="edge273" class="edge">
+<title>lens&#45;&gt;these</title>
+<path fill="none" stroke="black" d="M7133.58,-953.14C6922.24,-954.09 5558.69,-957.93 5496,-900 5437.12,-845.58 5439.64,-786.79 5484,-720 5502.89,-691.55 5540.36,-678.34 5569.55,-672.22"/>
+<polygon fill="black" stroke="black" points="5570,-675.7 5579.18,-670.42 5568.71,-668.82 5570,-675.7"/>
+</g>
+<!-- lens&#45;&gt;unordered&#45;containers -->
+<g id="edge275" class="edge">
+<title>lens&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M7133.78,-952.7C7001.24,-951.02 6427.09,-941.38 6360,-900 6283.67,-852.92 6244.95,-746.28 6230.23,-695.24"/>
+<polygon fill="black" stroke="black" points="6233.67,-694.55 6227.63,-685.84 6226.92,-696.42 6233.67,-694.55"/>
+</g>
+<!-- lens&#45;&gt;vector -->
+<g id="edge276" class="edge">
+<title>lens&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M7134.97,-948.67C7055.12,-934.83 6816.4,-888.9 6772,-828 6748,-795.07 6805.07,-721.14 6806,-720 6816.57,-706.99 6830.97,-695.37 6843.97,-686.36"/>
+<polygon fill="black" stroke="black" points="6845.89,-689.28 6852.28,-680.83 6842.02,-683.45 6845.89,-689.28"/>
+</g>
+<!-- lens&#45;&gt;transformers&#45;compat -->
+<g id="edge274" class="edge">
+<title>lens&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M7188.27,-952.93C7355.53,-952.35 8239.11,-947.08 8349,-900 8518.89,-827.21 8576.53,-782.03 8649,-612 8657.11,-592.97 8656.47,-569.5 8654,-551.44"/>
+<polygon fill="black" stroke="black" points="8657.47,-550.98 8652.39,-541.68 8650.57,-552.12 8657.47,-550.98"/>
+</g>
+<!-- lens&#45;&gt;base&#45;orphans -->
+<g id="edge247" class="edge">
+<title>lens&#45;&gt;base&#45;orphans</title>
+<path fill="none" stroke="black" d="M7188.4,-952.57C7347.63,-949.93 8155.28,-935.02 8401,-900 8565.45,-876.56 8764,-977.11 8764,-811 8764,-811 8764,-811 8764,-593 8764,-552.55 8775.45,-530.62 8745,-504 8705.48,-469.46 8326.25,-472.94 8274,-468 8246.32,-465.38 8215.83,-462.04 8189.55,-459.01"/>
+<polygon fill="black" stroke="black" points="8190.01,-455.54 8179.68,-457.87 8189.21,-462.5 8190.01,-455.54"/>
+</g>
+<!-- lens&#45;&gt;bifunctors -->
+<g id="edge248" class="edge">
+<title>lens&#45;&gt;bifunctors</title>
+<path fill="none" stroke="black" d="M7188.26,-951.78C7288.73,-947.08 7634.55,-928.91 7674,-900 7682.87,-893.5 7739.33,-755.44 7763.76,-694.97"/>
+<polygon fill="black" stroke="black" points="7767,-696.28 7767.49,-685.7 7760.51,-693.67 7767,-696.28"/>
+</g>
+<!-- lens&#45;&gt;comonad -->
+<g id="edge251" class="edge">
+<title>lens&#45;&gt;comonad</title>
+<path fill="none" stroke="black" d="M7188.1,-951.91C7343.84,-945.32 8118,-907.68 8118,-811 8118,-811 8118,-811 8118,-737 8118,-695.85 8102.24,-650.42 8090.51,-622.29"/>
+<polygon fill="black" stroke="black" points="8093.87,-621.24 8086.69,-613.44 8087.44,-624.01 8093.87,-621.24"/>
+</g>
+<!-- lens&#45;&gt;call&#45;stack -->
+<g id="edge250" class="edge">
+<title>lens&#45;&gt;call&#45;stack</title>
+<path fill="none" stroke="black" d="M7133.75,-952.96C6722.48,-952.25 1790.74,-942.93 1492,-900 1487.04,-899.29 1481.92,-898.28 1476.85,-897.1"/>
+<polygon fill="black" stroke="black" points="1477.95,-893.77 1467.39,-894.68 1476.22,-900.55 1477.95,-893.77"/>
+</g>
+<!-- lens&#45;&gt;distributive -->
+<g id="edge254" class="edge">
+<title>lens&#45;&gt;distributive</title>
+<path fill="none" stroke="black" d="M7188.17,-952.49C7357.61,-949.24 8263.57,-930.46 8313,-900 8412.93,-838.43 8417.29,-762.62 8392,-648 8384.49,-613.98 8386.42,-599.82 8361,-576 8336.11,-552.67 8300.28,-539.51 8270,-532.13"/>
+<polygon fill="black" stroke="black" points="8271.13,-528.8 8260.6,-530 8269.58,-535.62 8271.13,-528.8"/>
+</g>
+<!-- lens&#45;&gt;free -->
+<g id="edge257" class="edge">
+<title>lens&#45;&gt;free</title>
+<path fill="none" stroke="black" d="M7188.05,-951.05C7234.16,-946.87 7330.09,-934.45 7403,-900 7438.13,-883.4 7472.29,-854.11 7493.69,-833.68"/>
+<polygon fill="black" stroke="black" points="7495.97,-836.34 7500.69,-826.86 7491.09,-831.33 7495.97,-836.34"/>
+</g>
+<!-- lens&#45;&gt;profunctors -->
+<g id="edge265" class="edge">
+<title>lens&#45;&gt;profunctors</title>
+<path fill="none" stroke="black" d="M7188.21,-952.62C7355.87,-950.19 8242.91,-935.64 8287,-900 8325.72,-868.69 8324.51,-804.64 8319.92,-767.46"/>
+<polygon fill="black" stroke="black" points="8323.44,-767.31 8318.57,-757.9 8316.5,-768.29 8323.44,-767.31"/>
+</g>
+<!-- lens&#45;&gt;semigroupoids -->
+<g id="edge267" class="edge">
+<title>lens&#45;&gt;semigroupoids</title>
+<path fill="none" stroke="black" d="M7188.47,-953.27C7286.94,-953.8 7621.15,-951.67 7712,-900 7765.46,-869.59 7801.51,-803.96 7818.6,-766.57"/>
+<polygon fill="black" stroke="black" points="7821.65,-768.32 7822.49,-757.76 7815.24,-765.49 7821.65,-768.32"/>
+</g>
+<!-- lens&#45;&gt;indexed&#45;traversable&#45;instances -->
+<g id="edge261" class="edge">
+<title>lens&#45;&gt;indexed&#45;traversable&#45;instances</title>
+<path fill="none" stroke="black" d="M7147.99,-937.95C7116.75,-901.82 7037.21,-809.8 6998.22,-764.7"/>
+<polygon fill="black" stroke="black" points="7000.95,-762.51 6991.76,-757.23 6995.65,-767.08 7000.95,-762.51"/>
+</g>
+<!-- lens&#45;&gt;kan&#45;extensions -->
+<g id="edge262" class="edge">
+<title>lens&#45;&gt;kan&#45;extensions</title>
+<path fill="none" stroke="black" d="M7188.17,-953.05C7303.1,-952.96 7760.46,-949.31 8132,-900 8138.74,-899.11 8145.76,-897.95 8152.72,-896.66"/>
+<polygon fill="black" stroke="black" points="8152.93,-900.19 8162.07,-894.84 8151.59,-893.32 8152.93,-900.19"/>
+</g>
+<!-- parallel -->
+<g id="node92" class="node">
+<title>parallel</title>
+<ellipse fill="none" stroke="black" cx="8353" cy="-450" rx="36.59" ry="18"/>
+<text text-anchor="middle" x="8353" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">parallel</text>
+</g>
+<!-- lens&#45;&gt;parallel -->
+<g id="edge264" class="edge">
+<title>lens&#45;&gt;parallel</title>
+<path fill="none" stroke="black" d="M7188.28,-952.96C7361.11,-952.59 8305.78,-948.32 8590,-900 8722.08,-877.55 8878,-944.97 8878,-811 8878,-811 8878,-811 8878,-593 8878,-544.79 8857.39,-528.71 8816,-504 8746.85,-462.72 8505.26,-453.59 8401.24,-451.57"/>
+<polygon fill="black" stroke="black" points="8401.42,-448.08 8391.35,-451.4 8401.29,-455.07 8401.42,-448.08"/>
+</g>
+<!-- reflection -->
+<g id="node93" class="node">
+<title>reflection</title>
+<ellipse fill="none" stroke="black" cx="5887" cy="-378" rx="45.08" ry="18"/>
+<text text-anchor="middle" x="5887" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">reflection</text>
+</g>
+<!-- lens&#45;&gt;reflection -->
+<g id="edge266" class="edge">
+<title>lens&#45;&gt;reflection</title>
+<path fill="none" stroke="black" d="M7133.58,-952.91C7003.98,-952.23 6456.59,-946.59 6398,-900 6306.34,-827.11 6399.75,-734.68 6321,-648 6253.68,-573.9 5970.96,-545.84 5908,-468 5894.26,-451.01 5889.22,-426.56 5887.5,-407.59"/>
+<polygon fill="black" stroke="black" points="5891.01,-407.59 5886.9,-397.83 5884.02,-408.03 5891.01,-407.59"/>
+</g>
+<!-- parallel&#45;&gt;ghc&#45;prim -->
+<g id="edge310" class="edge">
+<title>parallel&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M8355.23,-431.55C8358.44,-404.79 8364,-352 8364,-307 8364,-307 8364,-307 8364,-233 8364,-96.45 7892.14,-154.53 7756,-144 7141.96,-96.5 2447.75,-91.44 1939.57,-91.03"/>
+<polygon fill="black" stroke="black" points="1939.86,-87.53 1929.86,-91.02 1939.86,-94.53 1939.86,-87.53"/>
+</g>
+<!-- parallel&#45;&gt;containers -->
+<g id="edge308" class="edge">
+<title>parallel&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M8317.79,-444.49C8285.42,-440.53 8236.06,-434.95 8193,-432 7543.68,-387.56 6753.9,-380.38 6532.94,-379.22"/>
+<polygon fill="black" stroke="black" points="6533.16,-375.72 6523.15,-379.17 6533.13,-382.72 6533.16,-375.72"/>
+</g>
+<!-- parallel&#45;&gt;deepseq -->
+<g id="edge309" class="edge">
+<title>parallel&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M8347.12,-432.09C8339.5,-412.39 8324.47,-380.02 8302,-360 8180.68,-251.94 8124.91,-249.82 7966,-216 7782.4,-176.92 4808.56,-164.76 4373.06,-163.18"/>
+<polygon fill="black" stroke="black" points="4373.31,-159.68 4363.3,-163.15 4373.29,-166.68 4373.31,-159.68"/>
+</g>
+<!-- reflection&#45;&gt;template&#45;haskell -->
+<g id="edge340" class="edge">
+<title>reflection&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M5858.62,-363.67C5837.96,-353.96 5809.48,-340.58 5785.39,-329.26"/>
+<polygon fill="black" stroke="black" points="5786.93,-326.12 5776.39,-325.03 5783.95,-332.45 5786.93,-326.12"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;bytestring -->
+<g id="edge278" class="edge">
+<title>lens&#45;aeson&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M5221.34,-1023.88C5023.48,-1018.82 4272.49,-994.14 3663,-900 3523.64,-878.47 3155.94,-843.04 3045,-756 2926.86,-663.31 2875.54,-477.87 2859.71,-407.22"/>
+<polygon fill="black" stroke="black" points="2863.17,-406.67 2857.63,-397.63 2856.33,-408.15 2863.17,-406.67"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;text -->
+<g id="edge281" class="edge">
+<title>lens&#45;aeson&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M5221.52,-1023.36C5071.8,-1015.99 4616.59,-975.71 4334,-756 4315.63,-741.72 4314.81,-733.68 4296,-720 4268.98,-700.35 4257.39,-703.14 4230,-684 4190.25,-656.22 4182.49,-646.09 4148,-612 4126.64,-590.88 4103.89,-565.23 4088.13,-546.9"/>
+<polygon fill="black" stroke="black" points="4090.92,-544.78 4081.77,-539.45 4085.6,-549.33 4090.92,-544.78"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;aeson -->
+<g id="edge277" class="edge">
+<title>lens&#45;aeson&#45;&gt;aeson</title>
+<path fill="none" stroke="black" d="M5297.97,-1010.6C5347.13,-984.36 5451.13,-928.84 5504.26,-900.48"/>
+<polygon fill="black" stroke="black" points="5505.67,-903.69 5512.84,-895.9 5502.37,-897.52 5505.67,-903.69"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;scientific -->
+<g id="edge280" class="edge">
+<title>lens&#45;aeson&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M5267.16,-1007.61C5261.6,-980.94 5252,-928.27 5252,-883 5252,-883 5252,-883 5252,-809 5252,-767.69 5268.54,-722.3 5280.87,-694.22"/>
+<polygon fill="black" stroke="black" points="5283.93,-695.94 5284.88,-685.39 5277.56,-693.05 5283.93,-695.94"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;text&#45;short -->
+<g id="edge282" class="edge">
+<title>lens&#45;aeson&#45;&gt;text&#45;short</title>
+<path fill="none" stroke="black" d="M5278.17,-1007.89C5297.9,-961.14 5355.17,-827.58 5410,-720 5414.39,-711.39 5419.47,-702.17 5424.19,-693.88"/>
+<polygon fill="black" stroke="black" points="5427.17,-695.7 5429.13,-685.29 5421.11,-692.21 5427.17,-695.7"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;unordered&#45;containers -->
+<g id="edge283" class="edge">
+<title>lens&#45;aeson&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M5317.91,-1019.74C5477.5,-1001 5996.43,-933.01 6122,-828 6166.08,-791.14 6196.93,-729.92 6212.15,-694.54"/>
+<polygon fill="black" stroke="black" points="6215.33,-696 6215.95,-685.43 6208.87,-693.31 6215.33,-696"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;vector -->
+<g id="edge284" class="edge">
+<title>lens&#45;aeson&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M5320.68,-1024.85C5499.31,-1022.82 6123.5,-1002.87 6598,-828 6685.9,-795.61 6697.66,-766.47 6779,-720 6800.09,-707.95 6824.03,-694.86 6842.86,-684.71"/>
+<polygon fill="black" stroke="black" points="6844.26,-687.93 6851.4,-680.11 6840.94,-681.76 6844.26,-687.93"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;lens -->
+<g id="edge279" class="edge">
+<title>lens&#45;aeson&#45;&gt;lens</title>
+<path fill="none" stroke="black" d="M5320.1,-1023.18C5589.22,-1013.21 6882.02,-965.33 7122.46,-956.43"/>
+<polygon fill="black" stroke="black" points="7122.36,-959.93 7132.22,-956.07 7122.1,-952.94 7122.36,-959.93"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;process -->
+<g id="edge301" class="edge">
+<title>optparse&#45;applicative&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M3715.27,-878.95C3394.02,-871.13 2250.82,-842.85 1887,-828 1793.95,-824.2 1685.54,-817.95 1623.22,-814.18"/>
+<polygon fill="black" stroke="black" points="1623.47,-810.69 1613.28,-813.57 1623.04,-817.67 1623.47,-810.69"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;text -->
+<g id="edge302" class="edge">
+<title>optparse&#45;applicative&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3774.76,-864.51C3763.05,-855.32 3750.35,-842.75 3744,-828 3737.67,-813.3 3740.71,-807.66 3744,-792 3765.57,-689.37 3758.25,-642.91 3839,-576 3867.81,-552.13 3972.84,-535.26 4030.12,-527.61"/>
+<polygon fill="black" stroke="black" points="4030.27,-531.12 4039.73,-526.36 4029.36,-524.18 4030.27,-531.12"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;transformers&#45;compat -->
+<g id="edge303" class="edge">
+<title>optparse&#45;applicative&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M3859.46,-868.68C3870.88,-866.76 3882.77,-865.06 3894,-864 4703.31,-787.39 6740.02,-867.28 7552,-828 7920.51,-810.17 8018.11,-832.66 8379,-756 8475.1,-735.59 8517.67,-752.6 8588,-684 8624.93,-647.98 8639.35,-587.15 8644.81,-551.47"/>
+<polygon fill="black" stroke="black" points="8648.23,-552.29 8646.14,-541.9 8641.3,-551.33 8648.23,-552.29"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;prettyprinter -->
+<g id="edge299" class="edge">
+<title>optparse&#45;applicative&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M3863.2,-869.64C3906.62,-860.4 3958.73,-845.97 3972,-828 3981.5,-815.13 3980.01,-805.85 3972,-792 3962.6,-775.74 3946.12,-764.03 3929.68,-755.82"/>
+<polygon fill="black" stroke="black" points="3931.43,-752.78 3920.88,-751.79 3928.51,-759.14 3931.43,-752.78"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;prettyprinter&#45;ansi&#45;terminal -->
+<g id="edge300" class="edge">
+<title>optparse&#45;applicative&#45;&gt;prettyprinter&#45;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M3814.04,-864.05C3820.78,-855.92 3829,-846 3836.5,-836.94"/>
+<polygon fill="black" stroke="black" points="3839.04,-839.37 3842.72,-829.44 3833.65,-834.91 3839.04,-839.37"/>
+</g>
+<!-- prettyprinter&#45;&gt;text -->
+<g id="edge316" class="edge">
+<title>prettyprinter&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3875.16,-719.63C3867.3,-687.33 3855.86,-617.54 3890,-576 3929.97,-527.36 3967.34,-560.1 4027,-540 4029.75,-539.07 4032.57,-538.05 4035.39,-536.99"/>
+<polygon fill="black" stroke="black" points="4036.68,-540.24 4044.67,-533.29 4034.09,-533.74 4036.68,-540.24"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;text -->
+<g id="edge318" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3838.96,-791.84C3829.82,-782.3 3819.83,-769.62 3815,-756 3792.51,-692.58 3848.32,-593.92 3868,-576 3912.65,-535.35 3984.89,-525.23 4029.24,-523.08"/>
+<polygon fill="black" stroke="black" points="4029.31,-526.58 4039.18,-522.72 4029.06,-519.58 4029.31,-526.58"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;prettyprinter -->
+<g id="edge317" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M3863.44,-791.7C3865.78,-784.24 3868.58,-775.32 3871.21,-766.97"/>
+<polygon fill="black" stroke="black" points="3874.51,-768.14 3874.17,-757.55 3867.83,-766.04 3874.51,-768.14"/>
+</g>
+<!-- psqueues&#45;&gt;ghc&#45;prim -->
+<g id="edge335" class="edge">
+<title>psqueues&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M3595.59,-658.91C3569.98,-655.38 3536.66,-651.05 3507,-648 3296.39,-626.37 3237.18,-664.19 3032,-612 2573.16,-495.3 2071.1,-199.44 1932.31,-114.27"/>
+<polygon fill="black" stroke="black" points="1934.22,-111.33 1923.87,-109.07 1930.55,-117.29 1934.22,-111.33"/>
+</g>
+<!-- psqueues&#45;&gt;deepseq -->
+<g id="edge334" class="edge">
+<title>psqueues&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3598.34,-656.91C3557.09,-647.59 3496.65,-631.09 3483,-612 3473.69,-598.98 3474.83,-589.75 3483,-576 3529.79,-497.27 3845,-470.58 3845,-379 3845,-379 3845,-379 3845,-305 3845,-217.45 4144.97,-179.37 4268.15,-167.43"/>
+<polygon fill="black" stroke="black" points="4268.37,-170.92 4277.99,-166.5 4267.71,-163.95 4268.37,-170.92"/>
+</g>
+<!-- psqueues&#45;&gt;hashable -->
+<g id="edge336" class="edge">
+<title>psqueues&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M3682.73,-662.27C3803.49,-654.84 4146.18,-633.38 4431,-612 4482.4,-608.14 4541.03,-603.2 4582.21,-599.64"/>
+<polygon fill="black" stroke="black" points="4582.43,-603.13 4592.09,-598.78 4581.83,-596.16 4582.43,-603.13"/>
+</g>
+<!-- tagsoup&#45;&gt;bytestring -->
+<g id="edge389" class="edge">
+<title>tagsoup&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3514.16,-577.58C3474.79,-544.52 3376.24,-466.99 3279,-432 3154.04,-387.04 2996.58,-379.02 2912.79,-378.27"/>
+<polygon fill="black" stroke="black" points="2913,-374.78 2902.98,-378.22 2912.96,-381.78 2913,-374.78"/>
+</g>
+<!-- tagsoup&#45;&gt;containers -->
+<g id="edge390" class="edge">
+<title>tagsoup&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3563.2,-582.34C3570.61,-580.03 3578.54,-577.77 3586,-576 3781.38,-529.73 3832.74,-528.69 4032,-504 4399.46,-458.46 4492.39,-454.1 4862,-432 4901.46,-429.64 6126.71,-390.14 6413.41,-380.92"/>
+<polygon fill="black" stroke="black" points="6413.39,-384.42 6423.27,-380.6 6413.17,-377.42 6413.39,-384.42"/>
+</g>
+<!-- tagsoup&#45;&gt;text -->
+<g id="edge391" class="edge">
+<title>tagsoup&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3562.82,-582C3570.32,-579.68 3578.38,-577.49 3586,-576 3778.99,-538.24 3835.86,-586.22 4027,-540 4029.99,-539.28 4033.04,-538.37 4036.06,-537.35"/>
+<polygon fill="black" stroke="black" points="4037.2,-540.66 4045.3,-533.83 4034.71,-534.11 4037.2,-540.66"/>
+</g>
+<!-- time&#45;locale&#45;compat&#45;&gt;time -->
+<g id="edge423" class="edge">
+<title>time&#45;locale&#45;compat&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M3374.13,-1008.01C3404.66,-967.32 3479.78,-859.91 3506,-756 3509.91,-740.49 3510.6,-735.32 3506,-720 3502.91,-709.72 3497.11,-699.59 3491.11,-690.99"/>
+<polygon fill="black" stroke="black" points="3494.08,-689.12 3485.28,-683.21 3488.47,-693.31 3494.08,-689.12"/>
+</g>
+</g>
+</svg>
diff --git a/doc/img/dot_command/wreq-example5.svg b/doc/img/dot_command/wreq-example5.svg
new file mode 100644
index 0000000000..ff54025103
--- /dev/null
+++ b/doc/img/dot_command/wreq-example5.svg
@@ -0,0 +1,1861 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 12.0.0 (20240704.0754)
+ -->
+<!-- Title: deps Pages: 1 -->
+<svg width="4346pt" height="1268pt"
+ viewBox="0.00 0.00 4346.01 1268.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1264)">
+<title>deps</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-1264 4342.01,-1264 4342.01,4 -4,4"/>
+<!-- wreq -->
+<g id="node1" class="node">
+<title>wreq</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="2291" cy="-1242" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="2291" y="-1236.58" font-family="Times New Roman,serif" font-size="14.00">wreq</text>
+</g>
+<!-- ghc&#45;prim -->
+<g id="node5" class="node">
+<title>ghc&#45;prim</title>
+<polygon fill="none" stroke="black" points="666.12,-108 599.88,-108 599.88,-72 666.12,-72 666.12,-108"/>
+<text text-anchor="middle" x="633" y="-84.58" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;prim</text>
+</g>
+<!-- wreq&#45;&gt;ghc&#45;prim -->
+<g id="edge230" class="edge">
+<title>wreq&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2261.55,-1240.92C2012.02,-1240.19 258.27,-1233.45 158,-1188 109.01,-1165.8 76,-1152.79 76,-1099 76,-1099 76,-1099 76,-305 76,-208.1 137.04,-188.72 223,-144 285.82,-111.32 495.36,-97.53 588.14,-92.93"/>
+<polygon fill="black" stroke="black" points="588.05,-96.44 597.87,-92.46 587.71,-89.44 588.05,-96.44"/>
+</g>
+<!-- template&#45;haskell -->
+<g id="node9" class="node">
+<title>template&#45;haskell</title>
+<polygon fill="none" stroke="black" points="2871.25,-324 2766.75,-324 2766.75,-288 2871.25,-288 2871.25,-324"/>
+<text text-anchor="middle" x="2819" y="-300.57" font-family="Times New Roman,serif" font-size="14.00">template&#45;haskell</text>
+</g>
+<!-- wreq&#45;&gt;template&#45;haskell -->
+<g id="edge237" class="edge">
+<title>wreq&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M2291,-1223.51C2291,-1196.71 2291,-1143.87 2291,-1099 2291,-1099 2291,-1099 2291,-881 2291,-777.06 2238.13,-746.6 2271,-648 2298.17,-566.48 2329.19,-552.68 2400,-504 2517.56,-423.19 2673.49,-359.74 2758.09,-328.43"/>
+<polygon fill="black" stroke="black" points="2759.2,-331.75 2767.38,-325.02 2756.78,-325.18 2759.2,-331.75"/>
+</g>
+<!-- Cabal -->
+<g id="node10" class="node">
+<title>Cabal</title>
+<ellipse fill="none" stroke="black" cx="1090" cy="-882" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="1090" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">Cabal</text>
+</g>
+<!-- wreq&#45;&gt;Cabal -->
+<g id="edge221" class="edge">
+<title>wreq&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M2261.54,-1240.51C2075.57,-1237.13 1069.16,-1214.36 980,-1116 921.31,-1051.26 1016.24,-949.65 1064.51,-905.14"/>
+<polygon fill="black" stroke="black" points="1066.75,-907.84 1071.82,-898.53 1062.05,-902.65 1066.75,-907.84"/>
+</g>
+<!-- bytestring -->
+<g id="node13" class="node">
+<title>bytestring</title>
+<ellipse fill="none" stroke="black" cx="1916" cy="-378" rx="47.07" ry="18"/>
+<text text-anchor="middle" x="1916" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">bytestring</text>
+</g>
+<!-- wreq&#45;&gt;bytestring -->
+<g id="edge225" class="edge">
+<title>wreq&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2261.54,-1240.92C2049.4,-1240.21 761.21,-1234 694,-1188 658.51,-1163.71 656,-1142.01 656,-1099 656,-1099 656,-1099 656,-809 656,-765.07 673.56,-755.81 699,-720 777.63,-609.33 801.18,-578 915,-504 989.67,-455.46 1015.02,-451.11 1102,-432 1246.36,-400.28 1696.5,-385.05 1857.78,-380.51"/>
+<polygon fill="black" stroke="black" points="1857.47,-384.02 1867.37,-380.24 1857.28,-377.02 1857.47,-384.02"/>
+</g>
+<!-- containers -->
+<g id="node14" class="node">
+<title>containers</title>
+<ellipse fill="none" stroke="black" cx="3179" cy="-378" rx="48.57" ry="18"/>
+<text text-anchor="middle" x="3179" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">containers</text>
+</g>
+<!-- wreq&#45;&gt;containers -->
+<g id="edge228" class="edge">
+<title>wreq&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2320.48,-1240.51C2477.62,-1237.79 3217.92,-1223.25 3444,-1188 3594.09,-1164.6 3774,-1250.91 3774,-1099 3774,-1099 3774,-1099 3774,-665 3774,-611.52 3736.33,-607.36 3693,-576 3691.02,-574.56 3534.26,-504.96 3532,-504 3492.33,-487.2 3481.57,-485.03 3442,-468 3406.93,-452.9 3399.86,-445.1 3364,-432 3307.29,-411.28 3290.92,-413.07 3233,-396 3230.63,-395.3 3228.2,-394.57 3225.74,-393.83"/>
+<polygon fill="black" stroke="black" points="3227,-390.56 3216.41,-390.97 3224.94,-397.25 3227,-390.56"/>
+</g>
+<!-- time -->
+<g id="node21" class="node">
+<title>time</title>
+<ellipse fill="none" stroke="black" cx="927" cy="-666" rx="27" ry="18"/>
+<text text-anchor="middle" x="927" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">time</text>
+</g>
+<!-- wreq&#45;&gt;time -->
+<g id="edge239" class="edge">
+<title>wreq&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M2261.51,-1241.01C2053.29,-1240.93 811.11,-1238.36 751,-1188 720,-1162.02 732,-1139.45 732,-1099 732,-1099 732,-1099 732,-881 732,-801.49 753.06,-775.49 810,-720 832.44,-698.14 865.48,-684.31 890.74,-676.28"/>
+<polygon fill="black" stroke="black" points="891.7,-679.65 900.27,-673.43 889.69,-672.94 891.7,-679.65"/>
+</g>
+<!-- text -->
+<g id="node23" class="node">
+<title>text</title>
+<ellipse fill="none" stroke="black" cx="2912" cy="-522" rx="27" ry="18"/>
+<text text-anchor="middle" x="2912" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">text</text>
+</g>
+<!-- wreq&#45;&gt;text -->
+<g id="edge238" class="edge">
+<title>wreq&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2320.33,-1240.11C2487.92,-1234.66 3317,-1202.45 3317,-1099 3317,-1099 3317,-1099 3317,-881 3317,-740.09 3221.83,-722.14 3102,-648 3053.2,-617.81 3025.11,-644.76 2978,-612 2974.74,-609.74 2948.29,-573.45 2929.88,-547.92"/>
+<polygon fill="black" stroke="black" points="2932.85,-546.05 2924.17,-539.98 2927.17,-550.14 2932.85,-546.05"/>
+</g>
+<!-- memory -->
+<g id="node33" class="node">
+<title>memory</title>
+<ellipse fill="none" stroke="black" cx="511" cy="-738" rx="41.08" ry="18"/>
+<text text-anchor="middle" x="511" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">memory</text>
+</g>
+<!-- wreq&#45;&gt;memory -->
+<g id="edge234" class="edge">
+<title>wreq&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M2261.74,-1240.74C2065.9,-1238.87 942.94,-1226.62 603,-1188 400,-1164.94 152,-1303.31 152,-1099 152,-1099 152,-1099 152,-881 152,-815.08 363.97,-766.62 462.15,-747.71"/>
+<polygon fill="black" stroke="black" points="462.6,-751.19 471.77,-745.89 461.3,-744.31 462.6,-751.19"/>
+</g>
+<!-- attoparsec -->
+<g id="node34" class="node">
+<title>attoparsec</title>
+<ellipse fill="none" stroke="black" cx="3470" cy="-738" rx="49.07" ry="18"/>
+<text text-anchor="middle" x="3470" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">attoparsec</text>
+</g>
+<!-- wreq&#45;&gt;attoparsec -->
+<g id="edge222" class="edge">
+<title>wreq&#45;&gt;attoparsec</title>
+<path fill="none" stroke="black" d="M2320.44,-1241.13C2487.2,-1241.66 3309.24,-1241.55 3407,-1188 3449.5,-1164.72 3470,-1147.46 3470,-1099 3470,-1099 3470,-1099 3470,-881 3470,-841.74 3470,-796.38 3470,-767.69"/>
+<polygon fill="black" stroke="black" points="3473.5,-768 3470,-758 3466.5,-768 3473.5,-768"/>
+</g>
+<!-- authenticate&#45;oauth -->
+<g id="node36" class="node">
+<title>authenticate&#45;oauth</title>
+<ellipse fill="none" stroke="black" cx="2061" cy="-1170" rx="77.51" ry="18"/>
+<text text-anchor="middle" x="2061" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">authenticate&#45;oauth</text>
+</g>
+<!-- wreq&#45;&gt;authenticate&#45;oauth -->
+<g id="edge223" class="edge">
+<title>wreq&#45;&gt;authenticate&#45;oauth</title>
+<path fill="none" stroke="black" d="M2265.06,-1233.11C2229.5,-1222.28 2164.65,-1202.55 2117.58,-1188.22"/>
+<polygon fill="black" stroke="black" points="2118.66,-1184.89 2108.07,-1185.33 2116.62,-1191.59 2118.66,-1184.89"/>
+</g>
+<!-- http&#45;types -->
+<g id="node40" class="node">
+<title>http&#45;types</title>
+<ellipse fill="none" stroke="black" cx="2590" cy="-738" rx="48.07" ry="18"/>
+<text text-anchor="middle" x="2590" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">http&#45;types</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;types -->
+<g id="edge232" class="edge">
+<title>wreq&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M2319.47,-1237.76C2375.14,-1230.92 2495.79,-1213.54 2528,-1188 2562.42,-1160.71 2571,-1142.93 2571,-1099 2571,-1099 2571,-1099 2571,-881 2571,-841.39 2578.35,-796.11 2583.91,-767.54"/>
+<polygon fill="black" stroke="black" points="2587.31,-768.37 2585.86,-757.87 2580.45,-766.98 2587.31,-768.37"/>
+</g>
+<!-- base16&#45;bytestring -->
+<g id="node43" class="node">
+<title>base16&#45;bytestring</title>
+<ellipse fill="none" stroke="black" cx="1000" cy="-522" rx="76.01" ry="18"/>
+<text text-anchor="middle" x="1000" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">base16&#45;bytestring</text>
+</g>
+<!-- wreq&#45;&gt;base16&#45;bytestring -->
+<g id="edge224" class="edge">
+<title>wreq&#45;&gt;base16&#45;bytestring</title>
+<path fill="none" stroke="black" d="M2261.77,-1240.94C2052.67,-1240.37 790.47,-1234.98 726,-1188 692.03,-1163.24 694,-1141.03 694,-1099 694,-1099 694,-1099 694,-809 694,-718.41 753.18,-710.25 819,-648 863.45,-605.97 923.14,-567.59 961.59,-544.76"/>
+<polygon fill="black" stroke="black" points="963.21,-547.87 970.06,-539.78 959.67,-541.83 963.21,-547.87"/>
+</g>
+<!-- cabal&#45;doctest -->
+<g id="node45" class="node">
+<title>cabal&#45;doctest</title>
+<ellipse fill="none" stroke="black" cx="1340" cy="-954" rx="60.54" ry="18"/>
+<text text-anchor="middle" x="1340" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">cabal&#45;doctest</text>
+</g>
+<!-- wreq&#45;&gt;cabal&#45;doctest -->
+<g id="edge226" class="edge">
+<title>wreq&#45;&gt;cabal&#45;doctest</title>
+<path fill="none" stroke="black" d="M2261.95,-1239.56C2165.54,-1233.97 1848.59,-1209.19 1607,-1116 1514.63,-1080.37 1417.96,-1013.47 1370.28,-978.17"/>
+<polygon fill="black" stroke="black" points="1372.46,-975.43 1362.36,-972.25 1368.28,-981.04 1372.46,-975.43"/>
+</g>
+<!-- case&#45;insensitive -->
+<g id="node46" class="node">
+<title>case&#45;insensitive</title>
+<ellipse fill="none" stroke="black" cx="2769" cy="-666" rx="68.03" ry="18"/>
+<text text-anchor="middle" x="2769" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">case&#45;insensitive</text>
+</g>
+<!-- wreq&#45;&gt;case&#45;insensitive -->
+<g id="edge227" class="edge">
+<title>wreq&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M2320.24,-1239.22C2370.67,-1235.28 2476.42,-1223.2 2558,-1188 2620.62,-1160.98 2683,-1167.2 2683,-1099 2683,-1099 2683,-1099 2683,-953 2683,-854.42 2730.43,-744.52 2754.85,-694.49"/>
+<polygon fill="black" stroke="black" points="2757.97,-696.06 2759.29,-685.55 2751.7,-692.95 2757.97,-696.06"/>
+</g>
+<!-- hashable -->
+<g id="node47" class="node">
+<title>hashable</title>
+<ellipse fill="none" stroke="black" cx="2513" cy="-594" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="2513" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">hashable</text>
+</g>
+<!-- wreq&#45;&gt;hashable -->
+<g id="edge231" class="edge">
+<title>wreq&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M2312.12,-1229.14C2327.11,-1219.74 2346.69,-1205.33 2359,-1188 2422.34,-1098.87 2438,-1064.35 2438,-955 2438,-955 2438,-955 2438,-737 2438,-691.61 2468.33,-646.52 2490.42,-619.71"/>
+<polygon fill="black" stroke="black" points="2493.02,-622.05 2496.84,-612.17 2487.69,-617.51 2493.02,-622.05"/>
+</g>
+<!-- crypton -->
+<g id="node51" class="node">
+<title>crypton</title>
+<ellipse fill="none" stroke="black" cx="580" cy="-810" rx="39.59" ry="18"/>
+<text text-anchor="middle" x="580" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">crypton</text>
+</g>
+<!-- wreq&#45;&gt;crypton -->
+<g id="edge229" class="edge">
+<title>wreq&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M2261.65,-1240.92C2045.96,-1240.2 712.62,-1233.91 642,-1188 605.17,-1164.06 599,-1142.93 599,-1099 599,-1099 599,-1099 599,-953 599,-913.39 591.65,-868.11 586.09,-839.54"/>
+<polygon fill="black" stroke="black" points="589.55,-838.98 584.14,-829.87 582.69,-840.37 589.55,-838.98"/>
+</g>
+<!-- lens&#45;aeson -->
+<g id="node54" class="node">
+<title>lens&#45;aeson</title>
+<ellipse fill="none" stroke="black" cx="2807" cy="-1098" rx="49.57" ry="18"/>
+<text text-anchor="middle" x="2807" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">lens&#45;aeson</text>
+</g>
+<!-- wreq&#45;&gt;lens&#45;aeson -->
+<g id="edge233" class="edge">
+<title>wreq&#45;&gt;lens&#45;aeson</title>
+<path fill="none" stroke="black" d="M2320.13,-1239.26C2401.32,-1234.07 2628.73,-1217.27 2697,-1188 2731.53,-1173.2 2764.06,-1144.32 2784.66,-1123.46"/>
+<polygon fill="black" stroke="black" points="2787,-1126.08 2791.41,-1116.45 2781.96,-1121.22 2787,-1126.08"/>
+</g>
+<!-- unordered&#45;containers -->
+<g id="node56" class="node">
+<title>unordered&#45;containers</title>
+<ellipse fill="none" stroke="black" cx="2593" cy="-666" rx="89.49" ry="18"/>
+<text text-anchor="middle" x="2593" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">unordered&#45;containers</text>
+</g>
+<!-- wreq&#45;&gt;unordered&#45;containers -->
+<g id="edge241" class="edge">
+<title>wreq&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M2319.56,-1237.87C2354.99,-1232.73 2415.74,-1219.7 2457,-1188 2494.25,-1159.38 2514,-1145.97 2514,-1099 2514,-1099 2514,-1099 2514,-809 2514,-768.55 2512.59,-754.92 2533,-720 2539.5,-708.88 2549.15,-698.87 2558.82,-690.62"/>
+<polygon fill="black" stroke="black" points="2560.83,-693.49 2566.44,-684.51 2556.45,-688.04 2560.83,-693.49"/>
+</g>
+<!-- mime&#45;types -->
+<g id="node58" class="node">
+<title>mime&#45;types</title>
+<ellipse fill="none" stroke="black" cx="3236" cy="-594" rx="53.56" ry="18"/>
+<text text-anchor="middle" x="3236" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">mime&#45;types</text>
+</g>
+<!-- wreq&#45;&gt;mime&#45;types -->
+<g id="edge235" class="edge">
+<title>wreq&#45;&gt;mime&#45;types</title>
+<path fill="none" stroke="black" d="M2320.51,-1241.03C2480.55,-1241 3240.55,-1238.2 3331,-1188 3373.15,-1164.61 3393,-1147.21 3393,-1099 3393,-1099 3393,-1099 3393,-737 3393,-676.14 3327.3,-634.6 3280.91,-612.85"/>
+<polygon fill="black" stroke="black" points="3282.39,-609.68 3271.83,-608.75 3279.51,-616.06 3282.39,-609.68"/>
+</g>
+<!-- psqueues -->
+<g id="node63" class="node">
+<title>psqueues</title>
+<ellipse fill="none" stroke="black" cx="2326" cy="-666" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="2326" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">psqueues</text>
+</g>
+<!-- wreq&#45;&gt;psqueues -->
+<g id="edge236" class="edge">
+<title>wreq&#45;&gt;psqueues</title>
+<path fill="none" stroke="black" d="M2305.3,-1226.23C2327.31,-1201.85 2367,-1150.73 2367,-1099 2367,-1099 2367,-1099 2367,-809 2367,-767.77 2350.85,-722.36 2338.82,-694.26"/>
+<polygon fill="black" stroke="black" points="2342.16,-693.14 2334.91,-685.41 2335.75,-695.97 2342.16,-693.14"/>
+</g>
+<!-- time&#45;locale&#45;compat -->
+<g id="node66" class="node">
+<title>time&#45;locale&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="842" cy="-1170" rx="81.5" ry="18"/>
+<text text-anchor="middle" x="842" y="-1164.58" font-family="Times New Roman,serif" font-size="14.00">time&#45;locale&#45;compat</text>
+</g>
+<!-- wreq&#45;&gt;time&#45;locale&#45;compat -->
+<g id="edge240" class="edge">
+<title>wreq&#45;&gt;time&#45;locale&#45;compat</title>
+<path fill="none" stroke="black" d="M2261.85,-1241.32C2117.71,-1242.62 1466.81,-1244.91 938,-1188 929.69,-1187.11 921.02,-1185.92 912.43,-1184.6"/>
+<polygon fill="black" stroke="black" points="913.15,-1181.17 902.72,-1183.03 912.03,-1188.08 913.15,-1181.17"/>
+</g>
+<!-- ansi&#45;terminal&#45;types -->
+<g id="node2" class="node">
+<title>ansi&#45;terminal&#45;types</title>
+<ellipse fill="none" stroke="black" cx="4258" cy="-18" rx="80.01" ry="18"/>
+<text text-anchor="middle" x="4258" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">ansi&#45;terminal&#45;types</text>
+</g>
+<!-- ghc&#45;bignum -->
+<g id="node3" class="node">
+<title>ghc&#45;bignum</title>
+<polygon fill="none" stroke="black" points="472,-180 390,-180 390,-144 472,-144 472,-180"/>
+<text text-anchor="middle" x="431" y="-156.57" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;bignum</text>
+</g>
+<!-- ghc&#45;bignum&#45;&gt;ghc&#45;prim -->
+<g id="edge111" class="edge">
+<title>ghc&#45;bignum&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M472.37,-146.67C506.21,-134.94 553.99,-118.38 588.63,-106.38"/>
+<polygon fill="black" stroke="black" points="589.65,-109.73 597.95,-103.15 587.36,-103.11 589.65,-109.73"/>
+</g>
+<!-- ghc&#45;internal -->
+<g id="node4" class="node">
+<title>ghc&#45;internal</title>
+<polygon fill="none" stroke="black" points="298.25,-252 217.75,-252 217.75,-216 298.25,-216 298.25,-252"/>
+<text text-anchor="middle" x="258" y="-228.57" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;internal</text>
+</g>
+<!-- ghc&#45;internal&#45;&gt;ghc&#45;bignum -->
+<g id="edge112" class="edge">
+<title>ghc&#45;internal&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M298.56,-216.59C322.7,-206.82 353.56,-194.33 379.42,-183.87"/>
+<polygon fill="black" stroke="black" points="380.43,-187.24 388.39,-180.24 377.81,-180.75 380.43,-187.24"/>
+</g>
+<!-- ghc&#45;internal&#45;&gt;ghc&#45;prim -->
+<g id="edge113" class="edge">
+<title>ghc&#45;internal&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M263.05,-215.81C270.05,-195.22 284.78,-161.34 310,-144 354.43,-113.45 510.46,-99.07 588.24,-93.67"/>
+<polygon fill="black" stroke="black" points="588.32,-97.18 598.06,-93.01 587.85,-90.19 588.32,-97.18"/>
+</g>
+<!-- rts -->
+<g id="node7" class="node">
+<title>rts</title>
+<polygon fill="none" stroke="black" points="458,-36 404,-36 404,0 458,0 458,-36"/>
+<text text-anchor="middle" x="431" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">rts</text>
+</g>
+<!-- ghc&#45;internal&#45;&gt;rts -->
+<g id="edge114" class="edge">
+<title>ghc&#45;internal&#45;&gt;rts</title>
+<path fill="none" stroke="black" d="M257.84,-215.69C258.42,-196.78 261.61,-166.24 275,-144 303.72,-96.31 357.7,-59.3 394.01,-38.32"/>
+<polygon fill="black" stroke="black" points="395.43,-41.53 402.43,-33.57 392,-35.43 395.43,-41.53"/>
+</g>
+<!-- ghc&#45;prim&#45;&gt;rts -->
+<g id="edge115" class="edge">
+<title>ghc&#45;prim&#45;&gt;rts</title>
+<path fill="none" stroke="black" d="M599.64,-77.44C563.64,-64.96 506.42,-45.13 468.78,-32.09"/>
+<polygon fill="black" stroke="black" points="470.27,-28.9 459.68,-28.94 467.98,-35.52 470.27,-28.9"/>
+</g>
+<!-- mtl -->
+<g id="node6" class="node">
+<title>mtl</title>
+<ellipse fill="none" stroke="black" cx="62" cy="-18" rx="27" ry="18"/>
+<text text-anchor="middle" x="62" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">mtl</text>
+</g>
+<!-- stm -->
+<g id="node8" class="node">
+<title>stm</title>
+<ellipse fill="none" stroke="black" cx="4078" cy="-18" rx="27" ry="18"/>
+<text text-anchor="middle" x="4078" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">stm</text>
+</g>
+<!-- template&#45;haskell&#45;&gt;ghc&#45;prim -->
+<g id="edge194" class="edge">
+<title>template&#45;haskell&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2784.13,-287.59C2711.87,-252.52 2539.6,-174.17 2385,-144 2213.19,-110.47 934.83,-94.4 677.9,-91.49"/>
+<polygon fill="black" stroke="black" points="678,-87.99 667.96,-91.38 677.92,-94.99 678,-87.99"/>
+</g>
+<!-- pretty -->
+<g id="node19" class="node">
+<title>pretty</title>
+<ellipse fill="none" stroke="black" cx="652" cy="-234" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="652" y="-228.57" font-family="Times New Roman,serif" font-size="14.00">pretty</text>
+</g>
+<!-- template&#45;haskell&#45;&gt;pretty -->
+<g id="edge195" class="edge">
+<title>template&#45;haskell&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M2766.6,-304.99C2484.35,-304.77 1142.6,-301.07 731,-252 718.09,-250.46 704.18,-247.81 691.69,-245.05"/>
+<polygon fill="black" stroke="black" points="692.68,-241.69 682.15,-242.86 691.11,-248.51 692.68,-241.69"/>
+</g>
+<!-- Cabal&#45;&gt;mtl -->
+<g id="edge8" class="edge">
+<title>Cabal&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M1057.59,-880.6C912.83,-878.59 329.36,-868.03 259,-828 9.03,-685.78 0,-522.6 0,-235 0,-235 0,-235 0,-161 0,-116.92 25.41,-71.08 43.69,-43.81"/>
+<polygon fill="black" stroke="black" points="46.37,-46.09 49.18,-35.88 40.61,-42.1 46.37,-46.09"/>
+</g>
+<!-- Cabal&#45;syntax -->
+<g id="node11" class="node">
+<title>Cabal&#45;syntax</title>
+<ellipse fill="none" stroke="black" cx="1177" cy="-810" rx="59.05" ry="18"/>
+<text text-anchor="middle" x="1177" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">Cabal&#45;syntax</text>
+</g>
+<!-- Cabal&#45;&gt;Cabal&#45;syntax -->
+<g id="edge1" class="edge">
+<title>Cabal&#45;&gt;Cabal&#45;syntax</title>
+<path fill="none" stroke="black" d="M1107.61,-866.83C1119.14,-857.55 1134.5,-845.19 1147.84,-834.46"/>
+<polygon fill="black" stroke="black" points="1149.9,-837.3 1155.5,-828.3 1145.51,-831.84 1149.9,-837.3"/>
+</g>
+<!-- Win32 -->
+<g id="node12" class="node">
+<title>Win32</title>
+<ellipse fill="none" stroke="black" cx="1523" cy="-594" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="1523" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">Win32</text>
+</g>
+<!-- Cabal&#45;&gt;Win32 -->
+<g id="edge2" class="edge">
+<title>Cabal&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1122.15,-879.98C1194.35,-875.91 1370.42,-855.7 1465,-756 1500.27,-718.82 1514.34,-658.64 1519.77,-623.34"/>
+<polygon fill="black" stroke="black" points="1523.17,-624.28 1521.09,-613.9 1516.24,-623.32 1523.17,-624.28"/>
+</g>
+<!-- Cabal&#45;&gt;bytestring -->
+<g id="edge3" class="edge">
+<title>Cabal&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1074.79,-865.65C1065.85,-855.72 1055.15,-842.07 1049,-828 1016.95,-754.62 1003.94,-718.99 1041,-648 1053.01,-624.99 1067.33,-628.95 1087,-612 1104.62,-596.81 1106.47,-590.07 1125,-576 1149.77,-557.19 1158.41,-556.13 1185,-540 1263.46,-492.39 1273.96,-461.11 1361,-432 1451.93,-401.59 1734.49,-386.5 1857.64,-381.24"/>
+<polygon fill="black" stroke="black" points="1857.69,-384.74 1867.54,-380.82 1857.4,-377.75 1857.69,-384.74"/>
+</g>
+<!-- Cabal&#45;&gt;containers -->
+<g id="edge4" class="edge">
+<title>Cabal&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1122.45,-881.06C1295.41,-880.9 2125.84,-873.72 2791,-756 2858.09,-744.13 2872.75,-730.91 2940,-720 3033.56,-704.83 3286.26,-736.76 3365,-684 3431.49,-639.45 3427.75,-559.4 3370,-504 3338.61,-473.89 3316.03,-490.81 3279,-468 3276.92,-466.72 3234.22,-428.54 3205.3,-402.61"/>
+<polygon fill="black" stroke="black" points="3207.73,-400.09 3197.95,-396.02 3203.06,-405.3 3207.73,-400.09"/>
+</g>
+<!-- deepseq -->
+<g id="node15" class="node">
+<title>deepseq</title>
+<ellipse fill="none" stroke="black" cx="2334" cy="-162" rx="41.58" ry="18"/>
+<text text-anchor="middle" x="2334" y="-156.57" font-family="Times New Roman,serif" font-size="14.00">deepseq</text>
+</g>
+<!-- Cabal&#45;&gt;deepseq -->
+<g id="edge5" class="edge">
+<title>Cabal&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1060.14,-874.79C986.88,-859.66 792.28,-820.05 629,-792 576.06,-782.91 425.04,-796.71 390,-756 348.59,-707.88 366.5,-677.06 455,-576 634.64,-370.86 757.03,-414.5 976,-252 995.47,-237.55 994.48,-225 1017,-216 1135.58,-168.58 2048.88,-163.56 2280.65,-163.05"/>
+<polygon fill="black" stroke="black" points="2280.61,-166.55 2290.61,-163.03 2280.6,-159.55 2280.61,-166.55"/>
+</g>
+<!-- directory -->
+<g id="node16" class="node">
+<title>directory</title>
+<ellipse fill="none" stroke="black" cx="1412" cy="-738" rx="44.08" ry="18"/>
+<text text-anchor="middle" x="1412" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">directory</text>
+</g>
+<!-- Cabal&#45;&gt;directory -->
+<g id="edge6" class="edge">
+<title>Cabal&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1118.23,-872.84C1149.69,-863.4 1201.83,-846.74 1245,-828 1292.66,-807.31 1345.16,-778.22 1378.34,-759"/>
+<polygon fill="black" stroke="black" points="1379.81,-762.2 1386.68,-754.14 1376.28,-756.15 1379.81,-762.2"/>
+</g>
+<!-- filepath -->
+<g id="node17" class="node">
+<title>filepath</title>
+<ellipse fill="none" stroke="black" cx="1398" cy="-522" rx="37.59" ry="18"/>
+<text text-anchor="middle" x="1398" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">filepath</text>
+</g>
+<!-- Cabal&#45;&gt;filepath -->
+<g id="edge7" class="edge">
+<title>Cabal&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1091.95,-863.78C1094.41,-845.48 1099.52,-815.95 1109,-792 1136.52,-722.47 1147.02,-704.5 1196,-648 1229.1,-609.82 1241.2,-602.86 1284,-576 1307.67,-561.14 1336.18,-547.89 1358.77,-538.35"/>
+<polygon fill="black" stroke="black" points="1360.04,-541.62 1367.94,-534.56 1357.36,-535.15 1360.04,-541.62"/>
+</g>
+<!-- parsec -->
+<g id="node18" class="node">
+<title>parsec</title>
+<ellipse fill="none" stroke="black" cx="1169" cy="-594" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="1169" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">parsec</text>
+</g>
+<!-- Cabal&#45;&gt;parsec -->
+<g id="edge9" class="edge">
+<title>Cabal&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M1081.18,-864.5C1060.9,-824.09 1015.98,-718.36 1060,-648 1068.08,-635.09 1101.88,-619.83 1129.73,-609.01"/>
+<polygon fill="black" stroke="black" points="1130.91,-612.3 1139.02,-605.48 1128.43,-605.76 1130.91,-612.3"/>
+</g>
+<!-- Cabal&#45;&gt;pretty -->
+<g id="edge10" class="edge">
+<title>Cabal&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M1057.55,-881.08C931.2,-881.03 472.44,-877.37 337,-828 285.88,-809.37 262.69,-804.48 238,-756 186.44,-654.75 205.98,-589.33 281,-504 384.69,-386.08 549.01,-290.09 618.85,-252.31"/>
+<polygon fill="black" stroke="black" points="620.34,-255.48 627.5,-247.67 617.03,-249.31 620.34,-255.48"/>
+</g>
+<!-- process -->
+<g id="node20" class="node">
+<title>process</title>
+<ellipse fill="none" stroke="black" cx="1551" cy="-810" rx="40.09" ry="18"/>
+<text text-anchor="middle" x="1551" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">process</text>
+</g>
+<!-- Cabal&#45;&gt;process -->
+<g id="edge11" class="edge">
+<title>Cabal&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M1120.96,-876.3C1199.45,-864.38 1406.7,-832.91 1501.91,-818.45"/>
+<polygon fill="black" stroke="black" points="1502.36,-821.93 1511.72,-816.96 1501.31,-815.01 1502.36,-821.93"/>
+</g>
+<!-- Cabal&#45;&gt;time -->
+<g id="edge12" class="edge">
+<title>Cabal&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M1061.51,-873.32C1037.75,-865.54 1004.57,-851.28 984,-828 950.37,-789.94 936.22,-730.72 930.54,-695.71"/>
+<polygon fill="black" stroke="black" points="934.02,-695.28 929.09,-685.9 927.1,-696.31 934.02,-695.28"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;mtl -->
+<g id="edge19" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M1118.85,-806.12C950.01,-797.57 469.77,-771.99 440,-756 375.58,-721.41 38,-308.12 38,-235 38,-235 38,-235 38,-161 38,-120.96 47.39,-75.46 54.42,-46.99"/>
+<polygon fill="black" stroke="black" points="57.8,-47.91 56.88,-37.36 51.02,-46.18 57.8,-47.91"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;bytestring -->
+<g id="edge14" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1175.31,-791.92C1173.05,-761.27 1171.79,-695.68 1196,-648 1206.64,-627.04 1332.16,-518.06 1351,-504 1376.23,-485.18 1385.81,-485.47 1412,-468 1434.18,-453.2 1435.23,-441.88 1460,-432 1531.08,-403.64 1752.15,-388 1858.16,-381.96"/>
+<polygon fill="black" stroke="black" points="1858.28,-385.46 1868.07,-381.41 1857.89,-378.47 1858.28,-385.46"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;containers -->
+<g id="edge15" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1234.81,-805.61C1299.79,-801.89 1408.43,-795.92 1502,-792 2010.69,-770.7 2139.68,-798.98 2647,-756 2763.24,-746.15 2791.07,-732.97 2907,-720 3000.31,-709.56 3245.11,-728.11 3328,-684 3376.1,-658.41 3401.28,-628.3 3386,-576 3375.35,-539.55 3369.63,-527.74 3340,-504 3303.46,-474.72 3278.11,-496.54 3241,-468 3219.71,-451.63 3202.91,-425.88 3192.19,-406.29"/>
+<polygon fill="black" stroke="black" points="3195.31,-404.71 3187.58,-397.47 3189.11,-407.95 3195.31,-404.71"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;deepseq -->
+<g id="edge16" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1134.31,-797.23C1101.8,-787.68 1056.28,-773.04 1018,-756 958.72,-729.62 929.93,-735.91 891,-684 871.27,-657.7 877.8,-644.66 874,-612 850.88,-413.5 905.82,-300.34 1087,-216 1196.22,-165.16 2056.78,-162.65 2280.83,-162.87"/>
+<polygon fill="black" stroke="black" points="2280.72,-166.37 2290.72,-162.88 2280.72,-159.37 2280.72,-166.37"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;directory -->
+<g id="edge17" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1218.2,-796.73C1259.53,-784.42 1323.04,-765.5 1365.99,-752.71"/>
+<polygon fill="black" stroke="black" points="1366.95,-756.07 1375.53,-749.86 1364.95,-749.36 1366.95,-756.07"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;filepath -->
+<g id="edge18" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1186.93,-791.92C1192.32,-781.81 1198.57,-768.56 1202,-756 1214.7,-709.5 1184.79,-687.79 1212,-648 1232.19,-618.47 1253.75,-631.1 1284,-612 1292.95,-606.35 1339.54,-569.55 1370.32,-545.08"/>
+<polygon fill="black" stroke="black" points="1372.48,-547.83 1378.12,-538.87 1368.12,-542.36 1372.48,-547.83"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;parsec -->
+<g id="edge20" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M1166.7,-791.99C1150.19,-762.53 1121.1,-700.14 1136,-648 1138.75,-638.37 1143.82,-628.78 1149.17,-620.47"/>
+<polygon fill="black" stroke="black" points="1152.03,-622.49 1154.84,-612.28 1146.27,-618.51 1152.03,-622.49"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;pretty -->
+<g id="edge21" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M1119.14,-805.76C950.77,-796.21 472.18,-768.04 461,-756 386.45,-675.72 564.85,-384.88 616,-288 620.93,-278.67 627.15,-268.97 633.02,-260.47"/>
+<polygon fill="black" stroke="black" points="635.85,-262.53 638.79,-252.35 630.15,-258.48 635.85,-262.53"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;time -->
+<g id="edge23" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M1150.25,-793.8C1103.21,-767.09 1006.02,-711.88 956.87,-683.96"/>
+<polygon fill="black" stroke="black" points="958.88,-681.08 948.46,-679.19 955.42,-687.17 958.88,-681.08"/>
+</g>
+<!-- binary -->
+<g id="node22" class="node">
+<title>binary</title>
+<ellipse fill="none" stroke="black" cx="2640" cy="-450" rx="33.6" ry="18"/>
+<text text-anchor="middle" x="2640" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">binary</text>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;binary -->
+<g id="edge13" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M1204.72,-793.64C1239.85,-774.59 1302.63,-741.97 1359,-720 1673.46,-597.45 1755.7,-568.4 2087,-504 2273.35,-467.78 2500.06,-455.92 2594.9,-452.38"/>
+<polygon fill="black" stroke="black" points="2594.95,-455.88 2604.82,-452.02 2594.7,-448.88 2594.95,-455.88"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;text -->
+<g id="edge22" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1226.53,-799.92C1454.93,-758.07 2398.01,-585.41 2461,-576 2613.6,-553.21 2796.45,-534.29 2874.12,-526.64"/>
+<polygon fill="black" stroke="black" points="2874.12,-530.16 2883.73,-525.7 2873.44,-523.19 2874.12,-530.16"/>
+</g>
+<!-- Win32&#45;&gt;filepath -->
+<g id="edge31" class="edge">
+<title>Win32&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1499.78,-580C1480.52,-569.21 1452.89,-553.74 1431.28,-541.64"/>
+<polygon fill="black" stroke="black" points="1433.27,-538.74 1422.84,-536.91 1429.85,-544.85 1433.27,-538.74"/>
+</g>
+<!-- os&#45;string -->
+<g id="node28" class="node">
+<title>os&#45;string</title>
+<ellipse fill="none" stroke="black" cx="1555" cy="-450" rx="43.08" ry="18"/>
+<text text-anchor="middle" x="1555" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">os&#45;string</text>
+</g>
+<!-- Win32&#45;&gt;os&#45;string -->
+<g id="edge32" class="edge">
+<title>Win32&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M1526.86,-575.87C1532.27,-551.88 1542.16,-507.99 1548.65,-479.16"/>
+<polygon fill="black" stroke="black" points="1552.01,-480.19 1550.79,-469.67 1545.18,-478.65 1552.01,-480.19"/>
+</g>
+<!-- bytestring&#45;&gt;ghc&#45;prim -->
+<g id="edge68" class="edge">
+<title>bytestring&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1876.2,-368.13C1686.78,-325.9 877.62,-145.53 677.76,-100.98"/>
+<polygon fill="black" stroke="black" points="678.56,-97.57 668.03,-98.81 677.03,-104.4 678.56,-97.57"/>
+</g>
+<!-- bytestring&#45;&gt;template&#45;haskell -->
+<g id="edge69" class="edge">
+<title>bytestring&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M1962.02,-373.43C2111.34,-361.86 2582.59,-325.33 2755,-311.96"/>
+<polygon fill="black" stroke="black" points="2755.2,-315.46 2764.9,-311.19 2754.66,-308.48 2755.2,-315.46"/>
+</g>
+<!-- bytestring&#45;&gt;deepseq -->
+<g id="edge67" class="edge">
+<title>bytestring&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1943.43,-362.96C2016.42,-325.59 2215.46,-223.69 2297.7,-181.58"/>
+<polygon fill="black" stroke="black" points="2299.17,-184.76 2306.48,-177.09 2295.98,-178.53 2299.17,-184.76"/>
+</g>
+<!-- containers&#45;&gt;template&#45;haskell -->
+<g id="edge81" class="edge">
+<title>containers&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M3136.64,-368.76C3073.88,-356.56 2955.75,-333.59 2882.57,-319.36"/>
+<polygon fill="black" stroke="black" points="2883.64,-316 2873.16,-317.53 2882.31,-322.88 2883.64,-316"/>
+</g>
+<!-- containers&#45;&gt;deepseq -->
+<g id="edge80" class="edge">
+<title>containers&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3170.32,-359.98C3151.78,-325.64 3104.64,-248.57 3040,-216 2982.16,-186.86 2541.04,-169.78 2386.93,-164.65"/>
+<polygon fill="black" stroke="black" points="2387.11,-161.15 2377,-164.32 2386.88,-168.15 2387.11,-161.15"/>
+</g>
+<!-- deepseq&#45;&gt;ghc&#45;prim -->
+<g id="edge96" class="edge">
+<title>deepseq&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2292.37,-159.29C2059.4,-149.7 918.94,-102.77 677.83,-92.84"/>
+<polygon fill="black" stroke="black" points="678.04,-89.35 667.9,-92.44 677.75,-96.34 678.04,-89.35"/>
+</g>
+<!-- directory&#45;&gt;Win32 -->
+<g id="edge97" class="edge">
+<title>directory&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1423.85,-720.35C1436.81,-702.28 1458.38,-672.71 1478,-648 1485.66,-638.36 1494.35,-627.98 1502.05,-618.99"/>
+<polygon fill="black" stroke="black" points="1504.47,-621.55 1508.35,-611.69 1499.17,-616.98 1504.47,-621.55"/>
+</g>
+<!-- directory&#45;&gt;filepath -->
+<g id="edge98" class="edge">
+<title>directory&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1392.29,-721.62C1381.72,-712.08 1369.72,-698.83 1364,-684 1358.24,-669.07 1358.09,-662.87 1364,-648 1372.13,-627.55 1389.87,-632.45 1398,-612 1405.64,-592.78 1405.29,-569.32 1403.22,-551.31"/>
+<polygon fill="black" stroke="black" points="1406.71,-551.01 1401.84,-541.6 1399.78,-551.99 1406.71,-551.01"/>
+</g>
+<!-- directory&#45;&gt;time -->
+<g id="edge100" class="edge">
+<title>directory&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M1371.07,-731.09C1278.4,-717.72 1053.69,-685.28 964.44,-672.4"/>
+<polygon fill="black" stroke="black" points="965.16,-668.97 954.76,-671.01 964.16,-675.9 965.16,-668.97"/>
+</g>
+<!-- directory&#45;&gt;os&#45;string -->
+<g id="edge99" class="edge">
+<title>directory&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M1418.79,-719.89C1425.94,-701.94 1437.6,-672.92 1448,-648 1461.42,-615.85 1463.02,-606.96 1479,-576 1497.22,-540.69 1521.56,-501.86 1537.73,-476.99"/>
+<polygon fill="black" stroke="black" points="1540.53,-479.1 1543.08,-468.82 1534.67,-475.27 1540.53,-479.1"/>
+</g>
+<!-- filepath&#45;&gt;template&#45;haskell -->
+<g id="edge110" class="edge">
+<title>filepath&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M1405.08,-503.91C1414.3,-483.73 1432.35,-450.58 1458,-432 1553.02,-363.16 1596.2,-378.93 1712,-360 1914.92,-326.83 2550.6,-312.1 2755.01,-308.14"/>
+<polygon fill="black" stroke="black" points="2754.98,-311.65 2764.91,-307.96 2754.84,-304.65 2754.98,-311.65"/>
+</g>
+<!-- filepath&#45;&gt;bytestring -->
+<g id="edge107" class="edge">
+<title>filepath&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1415.55,-506.02C1445.09,-480.81 1501.71,-432.57 1503,-432 1565.37,-404.49 1759.97,-388.75 1858.14,-382.37"/>
+<polygon fill="black" stroke="black" points="1858.35,-385.86 1868.1,-381.73 1857.9,-378.88 1858.35,-385.86"/>
+</g>
+<!-- filepath&#45;&gt;deepseq -->
+<g id="edge108" class="edge">
+<title>filepath&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1384.96,-505.08C1365.73,-479.93 1332,-428.75 1332,-379 1332,-379 1332,-379 1332,-305 1332,-208.21 2074.34,-172.84 2281.11,-164.86"/>
+<polygon fill="black" stroke="black" points="2281.16,-168.36 2291.02,-164.49 2280.9,-161.37 2281.16,-168.36"/>
+</g>
+<!-- filepath&#45;&gt;os&#45;string -->
+<g id="edge109" class="edge">
+<title>filepath&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M1424.99,-508.97C1450.02,-497.81 1487.57,-481.07 1515.88,-468.44"/>
+<polygon fill="black" stroke="black" points="1517.15,-471.71 1524.86,-464.44 1514.3,-465.32 1517.15,-471.71"/>
+</g>
+<!-- parsec&#45;&gt;mtl -->
+<g id="edge156" class="edge">
+<title>parsec&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M1158.38,-576.6C1144.23,-556.16 1117.18,-521.77 1085,-504 722.93,-304.09 496.73,-580.13 172,-324 84.16,-254.72 66.41,-109.17 62.86,-47.54"/>
+<polygon fill="black" stroke="black" points="66.38,-47.72 62.4,-37.9 59.38,-48.05 66.38,-47.72"/>
+</g>
+<!-- parsec&#45;&gt;bytestring -->
+<g id="edge155" class="edge">
+<title>parsec&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1194.11,-581.22C1214.93,-571.13 1245.05,-555.76 1270,-540 1292.55,-525.76 1296.04,-519.13 1318,-504 1367.34,-469.99 1375.43,-451.77 1432,-432 1509.36,-404.97 1747.17,-388.48 1858.01,-382.07"/>
+<polygon fill="black" stroke="black" points="1858,-385.58 1867.78,-381.52 1857.6,-378.59 1858,-385.58"/>
+</g>
+<!-- parsec&#45;&gt;text -->
+<g id="edge157" class="edge">
+<title>parsec&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1203.86,-590.89C1261.22,-587.45 1379.12,-580.59 1479,-576 2032.45,-550.59 2706.59,-529.31 2873.33,-524.18"/>
+<polygon fill="black" stroke="black" points="2873.27,-527.68 2883.16,-523.88 2873.06,-520.68 2873.27,-527.68"/>
+</g>
+<!-- pretty&#45;&gt;ghc&#45;prim -->
+<g id="edge159" class="edge">
+<title>pretty&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M649.67,-215.59C646.46,-191.61 640.65,-148.14 636.8,-119.42"/>
+<polygon fill="black" stroke="black" points="640.29,-119.06 635.49,-109.61 633.35,-119.99 640.29,-119.06"/>
+</g>
+<!-- pretty&#45;&gt;deepseq -->
+<g id="edge158" class="edge">
+<title>pretty&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M680.68,-225.53C695.58,-221.99 714.15,-218.07 731,-216 1041.15,-177.81 2039.67,-165.85 2281.09,-163.48"/>
+<polygon fill="black" stroke="black" points="2280.86,-166.98 2290.82,-163.38 2280.79,-159.98 2280.86,-166.98"/>
+</g>
+<!-- process&#45;&gt;Win32 -->
+<g id="edge166" class="edge">
+<title>process&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1548.76,-791.85C1543.95,-755.14 1532.64,-668.66 1526.73,-623.53"/>
+<polygon fill="black" stroke="black" points="1530.22,-623.19 1525.45,-613.73 1523.28,-624.1 1530.22,-623.19"/>
+</g>
+<!-- process&#45;&gt;deepseq -->
+<g id="edge167" class="edge">
+<title>process&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1539.74,-792.32C1525.04,-771.91 1497.34,-737.89 1465,-720 1261.49,-607.44 1099.5,-792.62 953,-612 942.92,-599.57 943.29,-588.72 953,-576 989.91,-527.67 1034.57,-573.98 1085,-540 1114.19,-520.33 1253.31,-314.04 1277,-288 1308.75,-253.1 1311.54,-234.36 1355,-216 1440.38,-179.93 2089.19,-166.87 2280.85,-163.78"/>
+<polygon fill="black" stroke="black" points="2280.82,-167.28 2290.77,-163.62 2280.71,-160.28 2280.82,-167.28"/>
+</g>
+<!-- process&#45;&gt;directory -->
+<g id="edge168" class="edge">
+<title>process&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1525.18,-796C1503.84,-785.25 1473.27,-769.85 1449.27,-757.77"/>
+<polygon fill="black" stroke="black" points="1450.96,-754.7 1440.46,-753.33 1447.81,-760.95 1450.96,-754.7"/>
+</g>
+<!-- process&#45;&gt;filepath -->
+<g id="edge169" class="edge">
+<title>process&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1558.91,-792.01C1576.92,-750.51 1615.84,-642.5 1567,-576 1539.75,-538.89 1486.57,-527.06 1447.11,-523.63"/>
+<polygon fill="black" stroke="black" points="1447.59,-520.16 1437.37,-522.95 1447.1,-527.14 1447.59,-520.16"/>
+</g>
+<!-- time&#45;&gt;Win32 -->
+<g id="edge208" class="edge">
+<title>time&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M953.77,-661.86C1047.26,-650.88 1359.95,-614.15 1477.67,-600.32"/>
+<polygon fill="black" stroke="black" points="1477.74,-603.84 1487.26,-599.2 1476.92,-596.89 1477.74,-603.84"/>
+</g>
+<!-- time&#45;&gt;deepseq -->
+<g id="edge209" class="edge">
+<title>time&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M910.79,-651.57C900.37,-641.82 887.74,-627.64 882,-612 876.48,-596.98 878.59,-591.63 882,-576 914.21,-428.44 1089.91,-240.01 1136,-216 1238.32,-162.7 2061.69,-161.97 2280.67,-162.73"/>
+<polygon fill="black" stroke="black" points="2280.61,-166.23 2290.62,-162.77 2280.64,-159.23 2280.61,-166.23"/>
+</g>
+<!-- binary&#45;&gt;bytestring -->
+<g id="edge61" class="edge">
+<title>binary&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2613.7,-438.29C2606.75,-435.85 2599.18,-433.52 2592,-432 2367.45,-384.3 2092.75,-378.52 1974.59,-378.47"/>
+<polygon fill="black" stroke="black" points="1974.83,-374.97 1964.83,-378.48 1974.84,-381.97 1974.83,-374.97"/>
+</g>
+<!-- binary&#45;&gt;containers -->
+<g id="edge62" class="edge">
+<title>binary&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2672.5,-444.78C2761.51,-433.22 3010.04,-400.94 3122.48,-386.34"/>
+<polygon fill="black" stroke="black" points="3122.6,-389.85 3132.07,-385.1 3121.7,-382.91 3122.6,-389.85"/>
+</g>
+<!-- text&#45;&gt;ghc&#45;prim -->
+<g id="edge199" class="edge">
+<title>text&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2938.99,-520.06C3070.21,-515.35 3636.34,-493.61 3663,-468 3721.05,-412.24 3706.55,-337.4 3643,-288 3398.34,-97.83 1033.12,-90.91 677.63,-90.95"/>
+<polygon fill="black" stroke="black" points="677.82,-87.45 667.82,-90.95 677.82,-94.45 677.82,-87.45"/>
+</g>
+<!-- text&#45;&gt;template&#45;haskell -->
+<g id="edge200" class="edge">
+<title>text&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M2904.7,-504.21C2888.75,-467.51 2850.66,-379.85 2831.08,-334.79"/>
+<polygon fill="black" stroke="black" points="2834.32,-333.47 2827.13,-325.7 2827.9,-336.26 2834.32,-333.47"/>
+</g>
+<!-- text&#45;&gt;bytestring -->
+<g id="edge197" class="edge">
+<title>text&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2890.9,-510.29C2851.31,-490.78 2762.72,-449.81 2683,-432 2547.97,-401.83 2128.64,-385.77 1974.02,-380.75"/>
+<polygon fill="black" stroke="black" points="1974.54,-377.26 1964.44,-380.44 1974.32,-384.26 1974.54,-377.26"/>
+</g>
+<!-- text&#45;&gt;deepseq -->
+<g id="edge198" class="edge">
+<title>text&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2938.92,-520.05C3067.27,-515.37 3611.79,-494.05 3636,-468 3658.5,-443.79 3692.22,-434.11 3622,-288 3602.12,-246.64 3590.13,-234.19 3548,-216 3440.56,-169.6 2607.22,-163.82 2387.15,-163.1"/>
+<polygon fill="black" stroke="black" points="2387.46,-159.6 2377.45,-163.07 2387.44,-166.6 2387.46,-159.6"/>
+</g>
+<!-- text&#45;&gt;binary -->
+<g id="edge196" class="edge">
+<title>text&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M2886.9,-514.54C2839.9,-502.44 2738.22,-476.28 2681.09,-461.58"/>
+<polygon fill="black" stroke="black" points="2681.97,-458.19 2671.42,-459.09 2680.23,-464.97 2681.97,-458.19"/>
+</g>
+<!-- RSA -->
+<g id="node24" class="node">
+<title>RSA</title>
+<ellipse fill="none" stroke="black" cx="2090" cy="-1098" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="2090" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">RSA</text>
+</g>
+<!-- RSA&#45;&gt;bytestring -->
+<g id="edge26" class="edge">
+<title>RSA&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2061.4,-1093.59C2031.74,-1088.4 1986.62,-1075.53 1964,-1044 1926.49,-991.71 1917.93,-528.46 1916.33,-407.69"/>
+<polygon fill="black" stroke="black" points="1919.83,-407.66 1916.2,-397.7 1912.83,-407.74 1919.83,-407.66"/>
+</g>
+<!-- RSA&#45;&gt;binary -->
+<g id="edge25" class="edge">
+<title>RSA&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M2114.5,-1087.62C2134.27,-1078.96 2161.55,-1064.34 2179,-1044 2206.78,-1011.61 2215,-997.67 2215,-955 2215,-955 2215,-955 2215,-881 2215,-774.5 2205.86,-732.26 2271,-648 2356.52,-537.39 2522.12,-481.73 2598.97,-460.93"/>
+<polygon fill="black" stroke="black" points="2599.41,-464.43 2608.18,-458.49 2597.62,-457.66 2599.41,-464.43"/>
+</g>
+<!-- SHA -->
+<g id="node25" class="node">
+<title>SHA</title>
+<ellipse fill="none" stroke="black" cx="2125" cy="-522" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="2125" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">SHA</text>
+</g>
+<!-- RSA&#45;&gt;SHA -->
+<g id="edge24" class="edge">
+<title>RSA&#45;&gt;SHA</title>
+<path fill="none" stroke="black" d="M2111.73,-1085.55C2127.03,-1076.35 2146.72,-1062.01 2158,-1044 2179.47,-1009.72 2177,-995.45 2177,-955 2177,-955 2177,-955 2177,-881 2177,-790.33 2137.77,-773.62 2124,-684 2116.71,-636.56 2123.55,-624 2124,-576 2124.07,-568.06 2124.21,-559.44 2124.36,-551.51"/>
+<polygon fill="black" stroke="black" points="2127.86,-551.77 2124.56,-541.7 2120.86,-551.62 2127.86,-551.77"/>
+</g>
+<!-- crypto&#45;api -->
+<g id="node26" class="node">
+<title>crypto&#45;api</title>
+<ellipse fill="none" stroke="black" cx="1868" cy="-1026" rx="49.07" ry="18"/>
+<text text-anchor="middle" x="1868" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">crypto&#45;api</text>
+</g>
+<!-- RSA&#45;&gt;crypto&#45;api -->
+<g id="edge27" class="edge">
+<title>RSA&#45;&gt;crypto&#45;api</title>
+<path fill="none" stroke="black" d="M2064.53,-1088.97C2028.13,-1077.49 1960.58,-1056.19 1914.96,-1041.81"/>
+<polygon fill="black" stroke="black" points="1916.19,-1038.52 1905.6,-1038.86 1914.08,-1045.2 1916.19,-1038.52"/>
+</g>
+<!-- crypto&#45;pubkey&#45;types -->
+<g id="node27" class="node">
+<title>crypto&#45;pubkey&#45;types</title>
+<ellipse fill="none" stroke="black" cx="2061" cy="-1026" rx="88.49" ry="18"/>
+<text text-anchor="middle" x="2061" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">crypto&#45;pubkey&#45;types</text>
+</g>
+<!-- RSA&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge28" class="edge">
+<title>RSA&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M2082.98,-1080.05C2079.82,-1072.43 2076.01,-1063.23 2072.46,-1054.65"/>
+<polygon fill="black" stroke="black" points="2075.8,-1053.57 2068.74,-1045.67 2069.33,-1056.25 2075.8,-1053.57"/>
+</g>
+<!-- SHA&#45;&gt;bytestring -->
+<g id="edge30" class="edge">
+<title>SHA&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2107.7,-507.11C2084.92,-489.05 2043.37,-456.87 2006,-432 1988.62,-420.44 1968.68,-408.56 1951.99,-398.98"/>
+<polygon fill="black" stroke="black" points="1953.8,-395.99 1943.38,-394.09 1950.34,-402.08 1953.8,-395.99"/>
+</g>
+<!-- SHA&#45;&gt;binary -->
+<g id="edge29" class="edge">
+<title>SHA&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M2153.42,-517.14C2238.8,-505.53 2493.44,-470.92 2596.24,-456.95"/>
+<polygon fill="black" stroke="black" points="2596.49,-460.45 2605.93,-455.63 2595.55,-453.51 2596.49,-460.45"/>
+</g>
+<!-- crypto&#45;api&#45;&gt;bytestring -->
+<g id="edge82" class="edge">
+<title>crypto&#45;api&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1875.49,-1007.89C1886.3,-981.58 1905,-929.37 1905,-883 1905,-883 1905,-883 1905,-809 1905,-641.44 1880.42,-598.17 1902,-432 1903.07,-423.76 1905.04,-414.97 1907.17,-406.97"/>
+<polygon fill="black" stroke="black" points="1910.52,-407.99 1909.91,-397.42 1903.79,-406.07 1910.52,-407.99"/>
+</g>
+<!-- cereal -->
+<g id="node48" class="node">
+<title>cereal</title>
+<ellipse fill="none" stroke="black" cx="1818" cy="-450" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="1818" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">cereal</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;cereal -->
+<g id="edge83" class="edge">
+<title>crypto&#45;api&#45;&gt;cereal</title>
+<path fill="none" stroke="black" d="M1867.8,-1007.51C1867.51,-980.71 1867,-927.87 1867,-883 1867,-883 1867,-883 1867,-809 1867,-685.17 1837.87,-539.45 1824.53,-479.22"/>
+<polygon fill="black" stroke="black" points="1827.95,-478.49 1822.34,-469.5 1821.12,-480.03 1827.95,-478.49"/>
+</g>
+<!-- entropy -->
+<g id="node49" class="node">
+<title>entropy</title>
+<ellipse fill="none" stroke="black" cx="1551" cy="-954" rx="39.09" ry="18"/>
+<text text-anchor="middle" x="1551" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">entropy</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;entropy -->
+<g id="edge84" class="edge">
+<title>crypto&#45;api&#45;&gt;entropy</title>
+<path fill="none" stroke="black" d="M1831.31,-1013.74C1824.26,-1011.73 1816.92,-1009.72 1810,-1008 1736.7,-989.79 1650.62,-973.09 1598.48,-963.49"/>
+<polygon fill="black" stroke="black" points="1599.2,-960.06 1588.74,-961.7 1597.94,-966.95 1599.2,-960.06"/>
+</g>
+<!-- tagged -->
+<g id="node50" class="node">
+<title>tagged</title>
+<ellipse fill="none" stroke="black" cx="3438" cy="-378" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="3438" y="-372.57" font-family="Times New Roman,serif" font-size="14.00">tagged</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;tagged -->
+<g id="edge85" class="edge">
+<title>crypto&#45;api&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M1910.42,-1016.74C1927.08,-1013.69 1946.39,-1010.4 1964,-1008 2461.7,-940.15 2597.36,-1002.91 3089,-900 3289.98,-857.93 3340.63,-840.01 3528,-756 3627.03,-711.6 3751.93,-667.13 3693,-576 3671.83,-543.26 3645.54,-561.47 3613,-540 3551.64,-499.51 3490.96,-437.44 3459.71,-403.41"/>
+<polygon fill="black" stroke="black" points="3462.39,-401.16 3453.08,-396.11 3457.22,-405.87 3462.39,-401.16"/>
+</g>
+<!-- asn1&#45;encoding -->
+<g id="node30" class="node">
+<title>asn1&#45;encoding</title>
+<ellipse fill="none" stroke="black" cx="2036" cy="-882" rx="64.54" ry="18"/>
+<text text-anchor="middle" x="2036" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;encoding</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;encoding -->
+<g id="edge86" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M2057.93,-1007.59C2053.71,-983.61 2046.06,-940.14 2041,-911.42"/>
+<polygon fill="black" stroke="black" points="2044.46,-910.84 2039.27,-901.6 2037.56,-912.06 2044.46,-910.84"/>
+</g>
+<!-- asn1&#45;types -->
+<g id="node31" class="node">
+<title>asn1&#45;types</title>
+<ellipse fill="none" stroke="black" cx="2098" cy="-810" rx="50.56" ry="18"/>
+<text text-anchor="middle" x="2098" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;types</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;types -->
+<g id="edge87" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M2070.13,-1007.82C2082.08,-984.28 2102.38,-940.31 2110,-900 2113.83,-879.74 2110.5,-856.66 2106.38,-839.08"/>
+<polygon fill="black" stroke="black" points="2109.83,-838.42 2103.94,-829.61 2103.05,-840.17 2109.83,-838.42"/>
+</g>
+<!-- os&#45;string&#45;&gt;template&#45;haskell -->
+<g id="edge154" class="edge">
+<title>os&#45;string&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M1586.06,-437.36C1640.59,-417.51 1757.52,-377.55 1860,-360 2032.87,-330.4 2569.19,-313.66 2754.92,-308.63"/>
+<polygon fill="black" stroke="black" points="2754.96,-312.13 2764.86,-308.36 2754.77,-305.13 2754.96,-312.13"/>
+</g>
+<!-- os&#45;string&#45;&gt;bytestring -->
+<g id="edge152" class="edge">
+<title>os&#45;string&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1593.63,-441.51C1658.64,-428.9 1789.96,-403.44 1863.34,-389.21"/>
+<polygon fill="black" stroke="black" points="1863.97,-392.65 1873.12,-387.31 1862.64,-385.78 1863.97,-392.65"/>
+</g>
+<!-- os&#45;string&#45;&gt;deepseq -->
+<g id="edge153" class="edge">
+<title>os&#45;string&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1577.65,-434.22C1607.5,-415.19 1662.1,-381.96 1712,-360 1919.06,-268.86 2181.62,-200.02 2287.06,-174.16"/>
+<polygon fill="black" stroke="black" points="2287.59,-177.63 2296.48,-171.87 2285.93,-170.83 2287.59,-177.63"/>
+</g>
+<!-- ansi&#45;terminal -->
+<g id="node29" class="node">
+<title>ansi&#45;terminal</title>
+<ellipse fill="none" stroke="black" cx="4087" cy="-738" rx="57.05" ry="18"/>
+<text text-anchor="middle" x="4087" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">ansi&#45;terminal</text>
+</g>
+<!-- ansi&#45;terminal&#45;&gt;ansi&#45;terminal&#45;types -->
+<g id="edge33" class="edge">
+<title>ansi&#45;terminal&#45;&gt;ansi&#45;terminal&#45;types</title>
+<path fill="none" stroke="black" d="M4097.44,-719.94C4134.57,-657.59 4258,-435.25 4258,-235 4258,-235 4258,-235 4258,-161 4258,-121.74 4258,-76.38 4258,-47.69"/>
+<polygon fill="black" stroke="black" points="4261.5,-48 4258,-38 4254.5,-48 4261.5,-48"/>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;bytestring -->
+<g id="edge35" class="edge">
+<title>asn1&#45;encoding&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2030.59,-863.72C2023.18,-839.69 2009.67,-794.79 2000,-756 1980.23,-676.66 1979.31,-655.91 1962,-576 1948.12,-511.93 1945.49,-495.71 1930,-432 1928.04,-423.92 1925.78,-415.19 1923.67,-407.18"/>
+<polygon fill="black" stroke="black" points="1927.07,-406.36 1921.1,-397.6 1920.31,-408.17 1927.07,-406.36"/>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;asn1&#45;types -->
+<g id="edge34" class="edge">
+<title>asn1&#45;encoding&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M2051.01,-864.05C2058.5,-855.59 2067.72,-845.19 2075.99,-835.84"/>
+<polygon fill="black" stroke="black" points="2078.54,-838.25 2082.55,-828.44 2073.3,-833.61 2078.54,-838.25"/>
+</g>
+<!-- hourglass -->
+<g id="node32" class="node">
+<title>hourglass</title>
+<ellipse fill="none" stroke="black" cx="2055" cy="-738" rx="46.07" ry="18"/>
+<text text-anchor="middle" x="2055" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">hourglass</text>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;hourglass -->
+<g id="edge36" class="edge">
+<title>asn1&#45;encoding&#45;&gt;hourglass</title>
+<path fill="none" stroke="black" d="M2034.93,-863.8C2034.15,-845.77 2033.85,-816.69 2038,-792 2039.41,-783.58 2041.88,-774.66 2044.5,-766.58"/>
+<polygon fill="black" stroke="black" points="2047.75,-767.9 2047.72,-757.31 2041.13,-765.61 2047.75,-767.9"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;bytestring -->
+<g id="edge37" class="edge">
+<title>asn1&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2104.52,-791.93C2110.49,-773.75 2117.36,-744.32 2110,-720 2104.43,-701.6 2095.56,-700.69 2086,-684 2050.63,-622.25 2046.01,-604.52 2016,-540 1993.85,-492.37 1997.53,-475.44 1968,-432 1960.86,-421.5 1951.52,-411.23 1942.72,-402.57"/>
+<polygon fill="black" stroke="black" points="1945.3,-400.2 1935.64,-395.85 1940.48,-405.27 1945.3,-400.2"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;hourglass -->
+<g id="edge38" class="edge">
+<title>asn1&#45;types&#45;&gt;hourglass</title>
+<path fill="none" stroke="black" d="M2087.59,-792.05C2082.68,-784.06 2076.7,-774.33 2071.22,-765.4"/>
+<polygon fill="black" stroke="black" points="2074.32,-763.77 2066.11,-757.08 2068.36,-767.43 2074.32,-763.77"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;memory -->
+<g id="edge39" class="edge">
+<title>asn1&#45;types&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M2047.88,-806.79C1810.98,-796.34 804.89,-751.96 563.31,-741.31"/>
+<polygon fill="black" stroke="black" points="563.72,-737.82 553.57,-740.88 563.41,-744.82 563.72,-737.82"/>
+</g>
+<!-- hourglass&#45;&gt;Win32 -->
+<g id="edge124" class="edge">
+<title>hourglass&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M2017.59,-727.01C1921.26,-701.3 1665.2,-632.95 1564.5,-606.08"/>
+<polygon fill="black" stroke="black" points="1565.6,-602.75 1555.03,-603.55 1563.79,-609.51 1565.6,-602.75"/>
+</g>
+<!-- hourglass&#45;&gt;deepseq -->
+<g id="edge125" class="edge">
+<title>hourglass&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2053.03,-719.73C2049.25,-678.95 2044.73,-574.83 2087,-504 2135.24,-423.16 2258,-473.14 2258,-379 2258,-379 2258,-379 2258,-305 2258,-259.48 2288.74,-214.42 2311.12,-187.66"/>
+<polygon fill="black" stroke="black" points="2313.74,-189.98 2317.63,-180.12 2308.44,-185.4 2313.74,-189.98"/>
+</g>
+<!-- memory&#45;&gt;ghc&#45;prim -->
+<g id="edge143" class="edge">
+<title>memory&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M503.72,-720.05C466.84,-633.04 305.45,-237.09 381,-144 406.65,-112.4 523.28,-98.94 588.5,-93.8"/>
+<polygon fill="black" stroke="black" points="588.45,-97.32 598.16,-93.08 587.92,-90.33 588.45,-97.32"/>
+</g>
+<!-- memory&#45;&gt;bytestring -->
+<g id="edge141" class="edge">
+<title>memory&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M521.64,-720.18C533.65,-701.72 554.23,-671.55 575,-648 694.67,-512.33 742.98,-469.3 920,-432 1100.81,-393.9 1672.39,-382.49 1857.52,-379.75"/>
+<polygon fill="black" stroke="black" points="1857.42,-383.25 1867.37,-379.61 1857.32,-376.25 1857.42,-383.25"/>
+</g>
+<!-- memory&#45;&gt;deepseq -->
+<g id="edge142" class="edge">
+<title>memory&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M514.94,-719.79C519.64,-701.23 528.6,-671.25 542,-648 563.09,-611.42 575.38,-607.05 604,-576 634.46,-542.95 642.78,-535.33 675,-504 691.83,-487.64 962.34,-225.02 984,-216 1105.1,-165.55 2045.58,-162.8 2280.81,-162.91"/>
+<polygon fill="black" stroke="black" points="2280.59,-166.41 2290.6,-162.92 2280.6,-159.41 2280.59,-166.41"/>
+</g>
+<!-- basement -->
+<g id="node44" class="node">
+<title>basement</title>
+<ellipse fill="none" stroke="black" cx="630" cy="-666" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="630" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">basement</text>
+</g>
+<!-- memory&#45;&gt;basement -->
+<g id="edge140" class="edge">
+<title>memory&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M534.8,-723C552.24,-712.74 576.18,-698.66 595.69,-687.18"/>
+<polygon fill="black" stroke="black" points="597.28,-690.31 604.12,-682.22 593.73,-684.28 597.28,-690.31"/>
+</g>
+<!-- attoparsec&#45;&gt;ghc&#45;prim -->
+<g id="edge43" class="edge">
+<title>attoparsec&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M3515.69,-730.99C3562.92,-723.74 3638.13,-709.26 3699,-684 3897.54,-601.6 4002,-521.97 4002,-307 4002,-307 4002,-307 4002,-233 4002,-89.19 3504.37,-155.31 3361,-144 2808.51,-100.43 986.9,-92.23 677.77,-91.14"/>
+<polygon fill="black" stroke="black" points="678.13,-87.64 668.12,-91.11 678.1,-94.64 678.13,-87.64"/>
+</g>
+<!-- attoparsec&#45;&gt;bytestring -->
+<g id="edge40" class="edge">
+<title>attoparsec&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3421.19,-734.8C3226.7,-725.99 2516.5,-693.23 2495,-684 2420.03,-651.82 2301.02,-468.39 2228,-432 2146.47,-391.37 2039.68,-381.13 1974.55,-378.97"/>
+<polygon fill="black" stroke="black" points="1974.88,-375.48 1964.79,-378.7 1974.69,-382.47 1974.88,-375.48"/>
+</g>
+<!-- attoparsec&#45;&gt;containers -->
+<g id="edge41" class="edge">
+<title>attoparsec&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3507.77,-726.02C3580.33,-703.03 3727.54,-646.1 3674,-576 3637.09,-527.67 3596.63,-566.72 3542,-540 3518.04,-528.28 3517.49,-516.62 3494,-504 3452.02,-481.45 3437.44,-485.21 3393,-468 3354.36,-453.04 3345.25,-447.93 3307,-432 3278.37,-420.08 3246.12,-406.73 3221.15,-396.4"/>
+<polygon fill="black" stroke="black" points="3222.55,-393.2 3211.97,-392.61 3219.88,-399.67 3222.55,-393.2"/>
+</g>
+<!-- attoparsec&#45;&gt;deepseq -->
+<g id="edge42" class="edge">
+<title>attoparsec&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3513.82,-729.46C3551.93,-721.72 3607.8,-707.43 3652,-684 3773.92,-619.38 3834.38,-599.87 3875,-468 3912.04,-347.75 3860.78,-267.55 3746,-216 3620.43,-159.61 2629.65,-161.36 2387.33,-162.65"/>
+<polygon fill="black" stroke="black" points="2387.53,-159.15 2377.55,-162.7 2387.57,-166.15 2387.53,-159.15"/>
+</g>
+<!-- attoparsec&#45;&gt;text -->
+<g id="edge45" class="edge">
+<title>attoparsec&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3422.08,-733.65C3370.42,-728.5 3286.9,-715.65 3222,-684 3199.6,-673.07 3201.35,-659.03 3179,-648 3113.25,-615.55 3083.16,-645.62 3018,-612 2996.75,-601.03 2996.22,-591.49 2978,-576 2964.98,-564.92 2950.16,-552.97 2937.87,-543.22"/>
+<polygon fill="black" stroke="black" points="2940.24,-540.63 2930.22,-537.19 2935.9,-546.13 2940.24,-540.63"/>
+</g>
+<!-- scientific -->
+<g id="node35" class="node">
+<title>scientific</title>
+<ellipse fill="none" stroke="black" cx="3275" cy="-666" rx="43.58" ry="18"/>
+<text text-anchor="middle" x="3275" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">scientific</text>
+</g>
+<!-- attoparsec&#45;&gt;scientific -->
+<g id="edge44" class="edge">
+<title>attoparsec&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M3436.03,-724.81C3403.2,-713.02 3353.35,-695.12 3317.82,-682.37"/>
+<polygon fill="black" stroke="black" points="3319.3,-679.18 3308.71,-679.1 3316.94,-685.77 3319.3,-679.18"/>
+</g>
+<!-- scientific&#45;&gt;template&#45;haskell -->
+<g id="edge184" class="edge">
+<title>scientific&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M3286.79,-648.23C3298.35,-629.54 3312.43,-598.92 3299,-576 3250.88,-493.88 2986.82,-376.61 2872.16,-328.67"/>
+<polygon fill="black" stroke="black" points="2873.85,-325.58 2863.27,-324.97 2871.16,-332.04 2873.85,-325.58"/>
+</g>
+<!-- scientific&#45;&gt;bytestring -->
+<g id="edge178" class="edge">
+<title>scientific&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3247.17,-651.81C3226.34,-641.64 3197.37,-626.84 3173,-612 3149.3,-597.57 3145.33,-591.02 3122,-576 3068.74,-541.7 3057.19,-529.02 2999,-504 2972.64,-492.67 2779.27,-436.94 2751,-432 2463.19,-381.72 2112.18,-377.73 1974.96,-378.33"/>
+<polygon fill="black" stroke="black" points="1975,-374.83 1965.02,-378.39 1975.04,-381.83 1975,-374.83"/>
+</g>
+<!-- scientific&#45;&gt;containers -->
+<g id="edge179" class="edge">
+<title>scientific&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3310.43,-655.23C3331.76,-647.32 3357.19,-633.82 3370,-612 3378.1,-598.2 3375.8,-590.91 3370,-576 3354.26,-535.54 3340.18,-527.99 3304,-504 3264.29,-477.66 3235.34,-503 3203,-468 3187.96,-451.72 3182.17,-427.02 3180.02,-407.76"/>
+<polygon fill="black" stroke="black" points="3183.51,-407.51 3179.21,-397.83 3176.54,-408.08 3183.51,-407.51"/>
+</g>
+<!-- scientific&#45;&gt;deepseq -->
+<g id="edge180" class="edge">
+<title>scientific&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3314.7,-658.26C3436.39,-636.66 3799.5,-564.88 3859,-468 3893.05,-412.56 3768.49,-244.49 3710,-216 3649.57,-186.57 2632.97,-167.94 2387.18,-163.85"/>
+<polygon fill="black" stroke="black" points="2387.3,-160.35 2377.24,-163.69 2387.18,-167.35 2387.3,-160.35"/>
+</g>
+<!-- scientific&#45;&gt;binary -->
+<g id="edge177" class="edge">
+<title>scientific&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M3242.56,-653.7C3214.87,-643.71 3174.23,-628.25 3140,-612 3051.55,-570.01 3040.26,-536.78 2948,-504 2857.7,-471.92 2745.4,-458.88 2684.43,-453.87"/>
+<polygon fill="black" stroke="black" points="2685.06,-450.41 2674.81,-453.12 2684.51,-457.39 2685.06,-450.41"/>
+</g>
+<!-- scientific&#45;&gt;text -->
+<g id="edge185" class="edge">
+<title>scientific&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3240.24,-654.64C3193.59,-640.69 3115.04,-617.02 3102,-612 3044.46,-589.83 2979.93,-558.07 2942.82,-539.09"/>
+<polygon fill="black" stroke="black" points="2944.51,-536.02 2934.01,-534.55 2941.3,-542.24 2944.51,-536.02"/>
+</g>
+<!-- scientific&#45;&gt;hashable -->
+<g id="edge181" class="edge">
+<title>scientific&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M3232.67,-661.11C3102.51,-649.15 2708.36,-612.95 2565.46,-599.82"/>
+<polygon fill="black" stroke="black" points="2566.2,-596.37 2555.92,-598.94 2565.56,-603.34 2566.2,-596.37"/>
+</g>
+<!-- integer&#45;logarithms -->
+<g id="node53" class="node">
+<title>integer&#45;logarithms</title>
+<ellipse fill="none" stroke="black" cx="817" cy="-234" rx="76.51" ry="18"/>
+<text text-anchor="middle" x="817" y="-228.57" font-family="Times New Roman,serif" font-size="14.00">integer&#45;logarithms</text>
+</g>
+<!-- scientific&#45;&gt;integer&#45;logarithms -->
+<g id="edge182" class="edge">
+<title>scientific&#45;&gt;integer&#45;logarithms</title>
+<path fill="none" stroke="black" d="M3231.94,-662.22C3170.67,-658.38 3054.8,-651.52 2956,-648 2900.39,-646.02 1000.4,-641.16 953,-612 830.62,-536.7 817.18,-337.57 816.56,-263.39"/>
+<polygon fill="black" stroke="black" points="820.06,-263.71 816.56,-253.71 813.06,-263.71 820.06,-263.71"/>
+</g>
+<!-- primitive -->
+<g id="node62" class="node">
+<title>primitive</title>
+<ellipse fill="none" stroke="black" cx="3665" cy="-522" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="3665" y="-516.58" font-family="Times New Roman,serif" font-size="14.00">primitive</text>
+</g>
+<!-- scientific&#45;&gt;primitive -->
+<g id="edge183" class="edge">
+<title>scientific&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M3310.33,-655.01C3345.11,-644.95 3399.61,-628.58 3446,-612 3509.77,-589.21 3582.32,-558.82 3625.84,-540.1"/>
+<polygon fill="black" stroke="black" points="3627.07,-543.38 3634.87,-536.2 3624.3,-536.95 3627.07,-543.38"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;bytestring -->
+<g id="edge50" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1996.9,-1159.65C1889.71,-1142.52 1681.67,-1102.43 1640,-1044 1630.71,-1030.97 1638.47,-1023.93 1640,-1008 1657.86,-821.89 1720,-781.97 1720,-595 1720,-595 1720,-595 1720,-521 1720,-478.81 1722.57,-461.22 1753,-432 1781.67,-404.48 1824.78,-391.25 1859.47,-384.89"/>
+<polygon fill="black" stroke="black" points="1859.63,-388.41 1868.92,-383.3 1858.47,-381.51 1859.63,-388.41"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;time -->
+<g id="edge55" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M1985.25,-1166.01C1894.26,-1161.09 1737.56,-1148.33 1607,-1116 1348.87,-1052.07 1280.56,-1030.77 1049,-900 1003.48,-874.3 986.5,-870.45 956,-828 927.68,-788.59 924.25,-730.07 925.09,-695.51"/>
+<polygon fill="black" stroke="black" points="928.58,-695.99 925.48,-685.86 921.58,-695.71 928.58,-695.99"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;RSA -->
+<g id="edge46" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;RSA</title>
+<path fill="none" stroke="black" d="M2068.17,-1151.7C2071.38,-1143.95 2075.23,-1134.64 2078.81,-1126.02"/>
+<polygon fill="black" stroke="black" points="2081.94,-1127.6 2082.53,-1117.02 2075.47,-1124.92 2081.94,-1127.6"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;SHA -->
+<g id="edge47" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;SHA</title>
+<path fill="none" stroke="black" d="M2110.44,-1155.88C2167.33,-1137.44 2253,-1097.9 2253,-1027 2253,-1027 2253,-1027 2253,-881 2253,-784.55 2193.19,-775.26 2162,-684 2146.54,-638.76 2135.52,-584.17 2129.72,-551.59"/>
+<polygon fill="black" stroke="black" points="2133.17,-550.99 2128.01,-541.74 2126.27,-552.19 2133.17,-550.99"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge51" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M2057.35,-1151.91C2055.32,-1141.57 2053.02,-1128.09 2052,-1116 2050.66,-1100.06 2050.66,-1095.94 2052,-1080 2052.68,-1071.97 2053.92,-1063.33 2055.27,-1055.4"/>
+<polygon fill="black" stroke="black" points="2058.71,-1056.05 2057.07,-1045.58 2051.83,-1054.79 2058.71,-1056.05"/>
+</g>
+<!-- base64&#45;bytestring -->
+<g id="node37" class="node">
+<title>base64&#45;bytestring</title>
+<ellipse fill="none" stroke="black" cx="1725" cy="-1026" rx="76.01" ry="18"/>
+<text text-anchor="middle" x="1725" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">base64&#45;bytestring</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;base64&#45;bytestring -->
+<g id="edge48" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;base64&#45;bytestring</title>
+<path fill="none" stroke="black" d="M2024.72,-1153.67C1963.35,-1127.73 1839.14,-1075.24 1771.48,-1046.64"/>
+<polygon fill="black" stroke="black" points="1773.09,-1043.53 1762.52,-1042.86 1770.37,-1049.97 1773.09,-1043.53"/>
+</g>
+<!-- blaze&#45;builder -->
+<g id="node38" class="node">
+<title>blaze&#45;builder</title>
+<ellipse fill="none" stroke="black" cx="1020" cy="-594" rx="58.05" ry="18"/>
+<text text-anchor="middle" x="1020" y="-588.58" font-family="Times New Roman,serif" font-size="14.00">blaze&#45;builder</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;blaze&#45;builder -->
+<g id="edge49" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;blaze&#45;builder</title>
+<path fill="none" stroke="black" d="M1983.79,-1168.08C1869.15,-1165.38 1647.71,-1155.05 1464,-1116 1367.49,-1095.49 1345.05,-1082.02 1254,-1044 1036.95,-953.36 910.13,-968.84 810,-756 774.89,-681.37 892.31,-632.23 965.59,-609.54"/>
+<polygon fill="black" stroke="black" points="966.48,-612.92 975.05,-606.69 964.46,-606.22 966.48,-612.92"/>
+</g>
+<!-- data&#45;default -->
+<g id="node39" class="node">
+<title>data&#45;default</title>
+<ellipse fill="none" stroke="black" cx="3063" cy="-1098" rx="54.06" ry="18"/>
+<text text-anchor="middle" x="3063" y="-1092.58" font-family="Times New Roman,serif" font-size="14.00">data&#45;default</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;data&#45;default -->
+<g id="edge52" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M2135.39,-1164.61C2277.46,-1156.11 2597.16,-1136.45 2866,-1116 2910.86,-1112.59 2961.42,-1108.21 3000.09,-1104.76"/>
+<polygon fill="black" stroke="black" points="3000.02,-1108.28 3009.67,-1103.9 2999.4,-1101.31 3000.02,-1108.28"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;http&#45;types -->
+<g id="edge53" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M2134.24,-1163.88C2253.38,-1151.14 2476,-1106.99 2476,-955 2476,-955 2476,-955 2476,-881 2476,-828.84 2523.35,-784.93 2557.02,-760.3"/>
+<polygon fill="black" stroke="black" points="2558.72,-763.38 2564.87,-754.75 2554.68,-757.67 2558.72,-763.38"/>
+</g>
+<!-- random -->
+<g id="node41" class="node">
+<title>random</title>
+<ellipse fill="none" stroke="black" cx="3588" cy="-450" rx="39.09" ry="18"/>
+<text text-anchor="middle" x="3588" y="-444.57" font-family="Times New Roman,serif" font-size="14.00">random</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;random -->
+<g id="edge54" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M2138.98,-1169.64C2352.06,-1170.68 2940.54,-1168.55 3126,-1116 3342.63,-1054.61 3653.14,-759.42 3699,-684 3740.77,-615.3 3761.76,-570.79 3717,-504 3699.21,-477.46 3665.47,-464.19 3636.97,-457.57"/>
+<polygon fill="black" stroke="black" points="3637.92,-454.2 3627.42,-455.58 3636.49,-461.05 3637.92,-454.2"/>
+</g>
+<!-- transformers&#45;compat -->
+<g id="node42" class="node">
+<title>transformers&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="434" cy="-810" rx="88.49" ry="18"/>
+<text text-anchor="middle" x="434" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">transformers&#45;compat</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;transformers&#45;compat -->
+<g id="edge56" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M1984.04,-1167.53C1747.46,-1162.71 1040.95,-1145.96 942,-1116 889.9,-1100.22 576.65,-902.02 469.73,-833.85"/>
+<polygon fill="black" stroke="black" points="471.63,-830.91 461.32,-828.48 467.87,-836.81 471.63,-830.91"/>
+</g>
+<!-- base64&#45;bytestring&#45;&gt;bytestring -->
+<g id="edge58" class="edge">
+<title>base64&#45;bytestring&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1748.34,-1008.43C1779,-984.53 1829,-937.24 1829,-883 1829,-883 1829,-883 1829,-809 1829,-639.86 1681.04,-571.29 1777,-432 1795.51,-405.13 1829.62,-391.87 1859.41,-385.33"/>
+<polygon fill="black" stroke="black" points="1859.95,-388.79 1869.09,-383.44 1858.6,-381.93 1859.95,-388.79"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;ghc&#45;prim -->
+<g id="edge65" class="edge">
+<title>blaze&#45;builder&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M985.54,-579.11C898.49,-541.83 671,-430.14 591,-252 585.84,-240.52 583.24,-169.06 592,-144 595.36,-134.37 601.24,-125.12 607.5,-117.12"/>
+<polygon fill="black" stroke="black" points="610.15,-119.4 613.93,-109.51 604.8,-114.88 610.15,-119.4"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;bytestring -->
+<g id="edge63" class="edge">
+<title>blaze&#45;builder&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1064.6,-582.08C1092.68,-573.72 1128.66,-560.14 1156,-540 1205.4,-503.61 1187.81,-460.79 1242,-432 1295.67,-403.49 1703.62,-386.42 1857.5,-380.94"/>
+<polygon fill="black" stroke="black" points="1857.62,-384.44 1867.49,-380.59 1857.37,-377.44 1857.62,-384.44"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;deepseq -->
+<g id="edge64" class="edge">
+<title>blaze&#45;builder&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1053.94,-578.97C1073.89,-569.72 1098.86,-556.31 1118,-540 1164.08,-500.74 1163.46,-479.5 1201,-432 1252.13,-367.3 1256.33,-342.74 1318,-288 1362.82,-248.22 1374.95,-234.34 1432,-216 1591.41,-164.76 2112.23,-162.12 2280.82,-162.66"/>
+<polygon fill="black" stroke="black" points="2280.58,-166.16 2290.6,-162.7 2280.61,-159.16 2280.58,-166.16"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;text -->
+<g id="edge66" class="edge">
+<title>blaze&#45;builder&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1068.71,-583.75C1086.37,-580.76 1106.52,-577.76 1125,-576 1304.37,-558.89 2628.58,-529.21 2873.2,-523.85"/>
+<polygon fill="black" stroke="black" points="2873.22,-527.35 2883.14,-523.63 2873.07,-520.35 2873.22,-527.35"/>
+</g>
+<!-- data&#45;default&#45;&gt;containers -->
+<g id="edge95" class="edge">
+<title>data&#45;default&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3109.07,-1088.18C3172.51,-1073.06 3279,-1035.67 3279,-955 3279,-955 3279,-955 3279,-881 3279,-730.33 3455.67,-723.92 3427,-576 3420.44,-542.13 3422.47,-528.32 3398,-504 3367.15,-473.34 3343.19,-492.13 3307,-468 3288.43,-455.62 3289.65,-445.66 3272,-432 3255.29,-419.07 3235.08,-407.17 3217.78,-397.94"/>
+<polygon fill="black" stroke="black" points="3219.8,-395.04 3209.31,-393.52 3216.56,-401.25 3219.8,-395.04"/>
+</g>
+<!-- http&#45;types&#45;&gt;bytestring -->
+<g id="edge126" class="edge">
+<title>http&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2557.68,-724.24C2531.66,-713.83 2494.24,-698.5 2462,-684 2445.32,-676.5 2327.73,-624.08 2314,-612 2242.19,-548.81 2275.55,-485.12 2196,-432 2160.24,-408.12 2043.95,-392.23 1972.98,-384.5"/>
+<polygon fill="black" stroke="black" points="1973.39,-381.02 1963.07,-383.44 1972.65,-387.98 1973.39,-381.02"/>
+</g>
+<!-- http&#45;types&#45;&gt;text -->
+<g id="edge128" class="edge">
+<title>http&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2637.14,-733.58C2731.29,-726.26 2935.38,-707.82 2956,-684 2966.47,-671.9 2965.98,-660.51 2956,-648 2911.08,-591.7 2842.92,-668.3 2798,-612 2788.02,-599.49 2789.4,-589.49 2798,-576 2800.4,-572.24 2846.24,-551.66 2879.05,-537.28"/>
+<polygon fill="black" stroke="black" points="2880.45,-540.49 2888.21,-533.28 2877.65,-534.08 2880.45,-540.49"/>
+</g>
+<!-- http&#45;types&#45;&gt;case&#45;insensitive -->
+<g id="edge127" class="edge">
+<title>http&#45;types&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M2622.42,-724.32C2649.99,-713.54 2689.98,-697.9 2721.23,-685.68"/>
+<polygon fill="black" stroke="black" points="2722.43,-688.97 2730.47,-682.07 2719.88,-682.45 2722.43,-688.97"/>
+</g>
+<!-- random&#45;&gt;mtl -->
+<g id="edge175" class="edge">
+<title>random&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M3554.67,-440.07C3473.3,-418.34 3268.83,-364.17 3237,-360 3153.81,-349.11 287.45,-369.56 217,-324 113.31,-256.95 162.25,-178.64 100,-72 94.3,-62.23 87.26,-52.02 80.8,-43.2"/>
+<polygon fill="black" stroke="black" points="83.81,-41.37 75.01,-35.46 78.2,-45.57 83.81,-41.37"/>
+</g>
+<!-- random&#45;&gt;bytestring -->
+<g id="edge173" class="edge">
+<title>random&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3549.13,-447.37C3328.94,-438.15 2238.64,-392.51 1973.96,-381.43"/>
+<polygon fill="black" stroke="black" points="1974.36,-377.94 1964.22,-381.02 1974.07,-384.93 1974.36,-377.94"/>
+</g>
+<!-- random&#45;&gt;deepseq -->
+<g id="edge174" class="edge">
+<title>random&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3579.17,-432.3C3554.39,-387.46 3479.32,-264.52 3377,-216 3287.25,-173.44 2586.92,-164.91 2387.07,-163.33"/>
+<polygon fill="black" stroke="black" points="2387.28,-159.83 2377.25,-163.26 2387.22,-166.83 2387.28,-159.83"/>
+</g>
+<!-- splitmix -->
+<g id="node64" class="node">
+<title>splitmix</title>
+<ellipse fill="none" stroke="black" cx="3573" cy="-306" rx="39.59" ry="18"/>
+<text text-anchor="middle" x="3573" y="-300.57" font-family="Times New Roman,serif" font-size="14.00">splitmix</text>
+</g>
+<!-- random&#45;&gt;splitmix -->
+<g id="edge176" class="edge">
+<title>random&#45;&gt;splitmix</title>
+<path fill="none" stroke="black" d="M3586.16,-431.59C3583.63,-407.61 3579.04,-364.14 3576,-335.42"/>
+<polygon fill="black" stroke="black" points="3579.5,-335.19 3574.97,-325.62 3572.54,-335.93 3579.5,-335.19"/>
+</g>
+<!-- transformers&#45;compat&#45;&gt;ghc&#45;prim -->
+<g id="edge211" class="edge">
+<title>transformers&#45;compat&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M358.05,-800.56C330.07,-793.35 301.06,-780.13 284,-756 274.76,-742.94 281.34,-735.78 284,-720 331.31,-439.51 375.62,-358.01 563,-144 572.41,-133.25 584.32,-123.26 595.63,-114.93"/>
+<polygon fill="black" stroke="black" points="597.56,-117.85 603.69,-109.21 593.51,-112.14 597.56,-117.85"/>
+</g>
+<!-- base16&#45;bytestring&#45;&gt;bytestring -->
+<g id="edge57" class="edge">
+<title>base16&#45;bytestring&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1028.3,-504.97C1066.73,-484.08 1138.18,-448.31 1204,-432 1327.44,-401.42 1710.43,-385.81 1857.58,-380.82"/>
+<polygon fill="black" stroke="black" points="1857.62,-384.32 1867.5,-380.49 1857.39,-377.33 1857.62,-384.32"/>
+</g>
+<!-- basement&#45;&gt;ghc&#45;prim -->
+<g id="edge60" class="edge">
+<title>basement&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M620.53,-648.29C607.89,-624.93 586.15,-580.8 578,-540 556.55,-432.61 373.04,-654.31 582,-144 586.24,-133.65 593.54,-124.18 601.32,-116.2"/>
+<polygon fill="black" stroke="black" points="603.55,-118.91 608.4,-109.48 598.73,-113.83 603.55,-118.91"/>
+</g>
+<!-- basement&#45;&gt;Win32 -->
+<g id="edge59" class="edge">
+<title>basement&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M674.59,-661.5C826.57,-649.59 1323.39,-610.65 1477.2,-598.59"/>
+<polygon fill="black" stroke="black" points="1477.3,-602.09 1487,-597.82 1476.75,-595.11 1477.3,-602.09"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;Cabal -->
+<g id="edge70" class="edge">
+<title>cabal&#45;doctest&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M1297.02,-940.97C1249.92,-927.78 1174.99,-906.8 1129.37,-894.02"/>
+<polygon fill="black" stroke="black" points="1130.47,-890.7 1119.89,-891.37 1128.58,-897.44 1130.47,-890.7"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;directory -->
+<g id="edge71" class="edge">
+<title>cabal&#45;doctest&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1345.77,-935.85C1358.17,-898.99 1387.47,-811.92 1402.59,-766.96"/>
+<polygon fill="black" stroke="black" points="1405.85,-768.26 1405.72,-757.67 1399.21,-766.03 1405.85,-768.26"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;filepath -->
+<g id="edge72" class="edge">
+<title>cabal&#45;doctest&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1331.44,-935.93C1303.58,-879.36 1219.09,-698.66 1250,-648 1268.22,-618.14 1292.43,-633.53 1320,-612 1343.41,-593.72 1365.25,-567.7 1379.84,-548.51"/>
+<polygon fill="black" stroke="black" points="1382.52,-550.77 1385.68,-540.66 1376.9,-546.6 1382.52,-550.77"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;bytestring -->
+<g id="edge73" class="edge">
+<title>case&#45;insensitive&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2718.74,-653.59C2709.53,-651.63 2699.99,-649.68 2691,-648 2640.15,-638.49 2498.44,-647.7 2461,-612 2401.89,-555.64 2484.53,-486.83 2424,-432 2391.18,-402.27 2100.25,-386.67 1974.02,-381.25"/>
+<polygon fill="black" stroke="black" points="1974.34,-377.76 1964.21,-380.83 1974.05,-384.75 1974.34,-377.76"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;deepseq -->
+<g id="edge74" class="edge">
+<title>case&#45;insensitive&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2818.1,-653.1C2827.33,-651.17 2836.93,-649.36 2846,-648 3045.75,-618.16 3102.26,-657.65 3299,-612 3341.37,-602.17 3636.6,-502.56 3663,-468 3692.22,-429.75 3679.87,-407.31 3671,-360 3657.38,-287.4 3653.52,-250.11 3588,-216 3502.38,-171.43 2816.44,-184.12 2720,-180 2600.88,-174.91 2461.1,-168.69 2386.77,-165.37"/>
+<polygon fill="black" stroke="black" points="2387.07,-161.88 2376.92,-164.93 2386.76,-168.87 2387.07,-161.88"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;text -->
+<g id="edge76" class="edge">
+<title>case&#45;insensitive&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2757.69,-647.89C2746.5,-628.6 2733.16,-597.18 2749,-576 2782.85,-530.72 2817.7,-558.85 2871,-540 2873.73,-539.03 2876.55,-537.98 2879.36,-536.9"/>
+<polygon fill="black" stroke="black" points="2880.66,-540.15 2888.63,-533.17 2878.05,-533.65 2880.66,-540.15"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;hashable -->
+<g id="edge75" class="edge">
+<title>case&#45;insensitive&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M2721.45,-652.76C2681.06,-642.26 2621.61,-626.57 2570,-612 2566.04,-610.88 2561.93,-609.7 2557.82,-608.5"/>
+<polygon fill="black" stroke="black" points="2559.04,-605.22 2548.46,-605.75 2557.07,-611.93 2559.04,-605.22"/>
+</g>
+<!-- hashable&#45;&gt;ghc&#45;bignum -->
+<g id="edge120" class="edge">
+<title>hashable&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M2471.42,-589.43C2396.64,-582.46 2242.9,-565.45 2196,-540 2176.92,-529.65 2182.62,-513.28 2163,-504 2030.21,-441.21 1648.74,-486.28 1503,-468 1175.31,-426.9 1090.94,-416.83 774,-324 690.12,-299.43 670.03,-289.33 591,-252 548.34,-231.85 501.36,-205.15 469.41,-186.26"/>
+<polygon fill="black" stroke="black" points="471.27,-183.3 460.89,-181.2 467.7,-189.32 471.27,-183.3"/>
+</g>
+<!-- hashable&#45;&gt;ghc&#45;prim -->
+<g id="edge121" class="edge">
+<title>hashable&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2555.09,-590.26C2614.42,-585.37 2725.28,-572.4 2814,-540 2843.93,-529.07 2845.44,-513.01 2876,-504 2957.09,-480.09 3570.27,-521.16 3636,-468 3699.57,-416.58 3719.3,-356.07 3674,-288 3574.91,-139.09 3200.44,-163.05 2952,-144 2486.14,-108.29 959.54,-93.77 677.89,-91.37"/>
+<polygon fill="black" stroke="black" points="678.07,-87.87 668.04,-91.28 678.01,-94.87 678.07,-87.87"/>
+</g>
+<!-- hashable&#45;&gt;bytestring -->
+<g id="edge116" class="edge">
+<title>hashable&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2517.88,-575.79C2526.07,-542.81 2538.18,-470.56 2500,-432 2463.51,-395.15 2115.1,-383.38 1974.45,-380.12"/>
+<polygon fill="black" stroke="black" points="1974.68,-376.62 1964.6,-379.89 1974.52,-383.62 1974.68,-376.62"/>
+</g>
+<!-- hashable&#45;&gt;containers -->
+<g id="edge117" class="edge">
+<title>hashable&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M2552.45,-586.72C2601.18,-578.44 2686.3,-562.27 2757,-540 2796.52,-527.55 2804.46,-519.23 2843,-504 2946.69,-463.03 3069.79,-418.19 3134.36,-394.96"/>
+<polygon fill="black" stroke="black" points="3135.31,-398.34 3143.54,-391.66 3132.95,-391.75 3135.31,-398.34"/>
+</g>
+<!-- hashable&#45;&gt;deepseq -->
+<g id="edge118" class="edge">
+<title>hashable&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2546.77,-582.75C2656.7,-547.75 2991.01,-427.3 2880,-288 2818.43,-210.74 2510.61,-177.37 2386.25,-166.9"/>
+<polygon fill="black" stroke="black" points="2386.56,-163.41 2376.31,-166.08 2385.99,-170.39 2386.56,-163.41"/>
+</g>
+<!-- hashable&#45;&gt;filepath -->
+<g id="edge119" class="edge">
+<title>hashable&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M2470.99,-590.36C2296.86,-579.43 1632.26,-537.71 1446.49,-526.04"/>
+<polygon fill="black" stroke="black" points="1446.92,-522.56 1436.72,-525.43 1446.48,-529.55 1446.92,-522.56"/>
+</g>
+<!-- hashable&#45;&gt;text -->
+<g id="edge123" class="edge">
+<title>hashable&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2545.91,-582.14C2553.74,-579.85 2562.11,-577.64 2570,-576 2701.93,-548.65 2740.66,-574.12 2871,-540 2873.8,-539.27 2876.67,-538.38 2879.52,-537.4"/>
+<polygon fill="black" stroke="black" points="2880.74,-540.68 2888.84,-533.85 2878.25,-534.14 2880.74,-540.68"/>
+</g>
+<!-- hashable&#45;&gt;os&#45;string -->
+<g id="edge122" class="edge">
+<title>hashable&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M2481.07,-581.84C2424.44,-562.53 2302.33,-523.14 2196,-504 2167.25,-498.82 1757.05,-466.69 1608.35,-455.13"/>
+<polygon fill="black" stroke="black" points="1609.02,-451.67 1598.78,-454.39 1608.48,-458.65 1609.02,-451.67"/>
+</g>
+<!-- cereal&#45;&gt;ghc&#45;prim -->
+<g id="edge79" class="edge">
+<title>cereal&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1786.89,-444.49C1599.74,-417.27 630.87,-275.38 611,-252 579.21,-214.6 600.8,-153.66 617.89,-118.46"/>
+<polygon fill="black" stroke="black" points="620.9,-120.27 622.3,-109.77 614.65,-117.1 620.9,-120.27"/>
+</g>
+<!-- cereal&#45;&gt;bytestring -->
+<g id="edge77" class="edge">
+<title>cereal&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1837.36,-435.17C1851.04,-425.4 1869.64,-412.11 1885.32,-400.91"/>
+<polygon fill="black" stroke="black" points="1887.3,-403.8 1893.41,-395.14 1883.23,-398.1 1887.3,-403.8"/>
+</g>
+<!-- cereal&#45;&gt;containers -->
+<g id="edge78" class="edge">
+<title>cereal&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1849.97,-447.36C2026.76,-438.26 2885.19,-394.11 3119.7,-382.05"/>
+<polygon fill="black" stroke="black" points="3119.72,-385.55 3129.53,-381.54 3119.36,-378.56 3119.72,-385.55"/>
+</g>
+<!-- entropy&#45;&gt;Cabal -->
+<g id="edge101" class="edge">
+<title>entropy&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M1514.05,-947.39C1429.4,-934.54 1221.82,-903.02 1132.27,-889.42"/>
+<polygon fill="black" stroke="black" points="1132.85,-885.97 1122.43,-887.92 1131.8,-892.89 1132.85,-885.97"/>
+</g>
+<!-- entropy&#45;&gt;Win32 -->
+<g id="edge102" class="edge">
+<title>entropy&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1561.61,-936.4C1578.78,-907.54 1609.8,-846.05 1600,-792 1588.43,-728.2 1556.19,-658.69 1537.3,-621.7"/>
+<polygon fill="black" stroke="black" points="1540.53,-620.34 1532.82,-613.08 1534.32,-623.57 1540.53,-620.34"/>
+</g>
+<!-- entropy&#45;&gt;bytestring -->
+<g id="edge103" class="edge">
+<title>entropy&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1569.11,-938.01C1579.84,-928.22 1592.88,-914.59 1601,-900 1669.22,-777.45 1682,-735.25 1682,-595 1682,-595 1682,-595 1682,-521 1682,-480.03 1676.8,-460.73 1706,-432 1727.71,-410.64 1806.02,-395.09 1860.61,-386.55"/>
+<polygon fill="black" stroke="black" points="1861.02,-390.03 1870.38,-385.07 1859.96,-383.11 1861.02,-390.03"/>
+</g>
+<!-- entropy&#45;&gt;directory -->
+<g id="edge104" class="edge">
+<title>entropy&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1540.32,-936.56C1516.38,-899.7 1458.22,-810.15 1429.14,-765.39"/>
+<polygon fill="black" stroke="black" points="1432.11,-763.54 1423.73,-757.06 1426.24,-767.35 1432.11,-763.54"/>
+</g>
+<!-- entropy&#45;&gt;filepath -->
+<g id="edge105" class="edge">
+<title>entropy&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1528.61,-938.76C1486.05,-910.2 1394.55,-841.3 1359,-756 1329.69,-685.68 1363.45,-594.73 1384.18,-550.12"/>
+<polygon fill="black" stroke="black" points="1387.3,-551.71 1388.47,-541.18 1380.99,-548.68 1387.3,-551.71"/>
+</g>
+<!-- entropy&#45;&gt;process -->
+<g id="edge106" class="edge">
+<title>entropy&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M1551,-935.59C1551,-911.61 1551,-868.14 1551,-839.42"/>
+<polygon fill="black" stroke="black" points="1554.5,-839.62 1551,-829.62 1547.5,-839.62 1554.5,-839.62"/>
+</g>
+<!-- tagged&#45;&gt;template&#45;haskell -->
+<g id="edge188" class="edge">
+<title>tagged&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M3409.46,-366.96C3401.03,-364.32 3391.72,-361.74 3383,-360 3204.04,-324.33 2988.22,-312.53 2882.98,-308.73"/>
+<polygon fill="black" stroke="black" points="2883.25,-305.24 2873.13,-308.39 2883,-312.23 2883.25,-305.24"/>
+</g>
+<!-- tagged&#45;&gt;deepseq -->
+<g id="edge187" class="edge">
+<title>tagged&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3433.89,-359.8C3424.67,-325.48 3398.81,-248.97 3345,-216 3263.12,-165.84 2584.29,-162.69 2387.36,-162.85"/>
+<polygon fill="black" stroke="black" points="2387.41,-159.35 2377.42,-162.86 2387.42,-166.35 2387.41,-159.35"/>
+</g>
+<!-- crypton&#45;&gt;ghc&#45;prim -->
+<g id="edge92" class="edge">
+<title>crypton&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M550.21,-797.66C543.93,-795.55 537.3,-793.54 531,-792 423.22,-765.7 372.01,-823.53 284,-756 91.76,-608.5 121.16,-441.82 209,-216 224.74,-175.54 236.66,-164.35 275,-144 328.48,-115.62 504.34,-99.93 588,-93.91"/>
+<polygon fill="black" stroke="black" points="588.18,-97.41 597.91,-93.21 587.68,-90.42 588.18,-97.41"/>
+</g>
+<!-- crypton&#45;&gt;Win32 -->
+<g id="edge88" class="edge">
+<title>crypton&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M614.96,-801.07C760.81,-767.97 1320.54,-640.95 1480.24,-604.7"/>
+<polygon fill="black" stroke="black" points="1481.01,-608.12 1489.99,-602.49 1479.46,-601.29 1481.01,-608.12"/>
+</g>
+<!-- crypton&#45;&gt;bytestring -->
+<g id="edge90" class="edge">
+<title>crypton&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M589.78,-792.28C601.09,-773.64 620.9,-743.06 642,-720 642.13,-719.86 727.85,-648.12 728,-648 809.79,-582.32 823.55,-555.38 915,-504 992.64,-460.38 1015.02,-451.11 1102,-432 1246.36,-400.28 1696.5,-385.05 1857.78,-380.51"/>
+<polygon fill="black" stroke="black" points="1857.47,-384.02 1867.37,-380.24 1857.28,-377.02 1857.47,-384.02"/>
+</g>
+<!-- crypton&#45;&gt;deepseq -->
+<g id="edge91" class="edge">
+<title>crypton&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M549.88,-797.83C543.68,-795.74 537.17,-793.68 531,-792 452.71,-770.65 403.41,-818.78 352,-756 301.31,-694.11 330.72,-653.12 352,-576 373.49,-498.1 396.36,-477.7 463,-432 637.25,-312.5 728.75,-371.5 903,-252 921.15,-239.55 916.96,-225.09 937,-216 1060.95,-159.76 2040.37,-161.39 2280.83,-162.65"/>
+<polygon fill="black" stroke="black" points="2280.51,-166.15 2290.53,-162.7 2280.55,-159.15 2280.51,-166.15"/>
+</g>
+<!-- crypton&#45;&gt;memory -->
+<g id="edge94" class="edge">
+<title>crypton&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M564.34,-793.12C555.52,-784.17 544.33,-772.81 534.47,-762.81"/>
+<polygon fill="black" stroke="black" points="537.17,-760.56 527.66,-755.9 532.19,-765.48 537.17,-760.56"/>
+</g>
+<!-- crypton&#45;&gt;basement -->
+<g id="edge89" class="edge">
+<title>crypton&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M583.64,-791.63C587.69,-773.46 594.87,-744.27 604,-720 607.26,-711.33 611.46,-702.17 615.53,-693.96"/>
+<polygon fill="black" stroke="black" points="618.59,-695.66 620.02,-685.16 612.36,-692.47 618.59,-695.66"/>
+</g>
+<!-- integer&#45;gmp -->
+<g id="node52" class="node">
+<title>integer&#45;gmp</title>
+<ellipse fill="none" stroke="black" cx="281" cy="-306" rx="54.56" ry="18"/>
+<text text-anchor="middle" x="281" y="-300.57" font-family="Times New Roman,serif" font-size="14.00">integer&#45;gmp</text>
+</g>
+<!-- crypton&#45;&gt;integer&#45;gmp -->
+<g id="edge93" class="edge">
+<title>crypton&#45;&gt;integer&#45;gmp</title>
+<path fill="none" stroke="black" d="M550.19,-797.76C543.91,-795.64 537.28,-793.6 531,-792 483.63,-779.95 346.96,-792.1 314,-756 203.98,-635.48 251.47,-412.9 272.73,-334.89"/>
+<polygon fill="black" stroke="black" points="276.03,-336.08 275.36,-325.51 269.29,-334.19 276.03,-336.08"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;bignum -->
+<g id="edge129" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M299.52,-288.73C311.24,-278.34 326.64,-264.52 340,-252 362.65,-230.77 387.84,-206.04 405.97,-188.04"/>
+<polygon fill="black" stroke="black" points="408.07,-190.89 412.69,-181.35 403.14,-185.92 408.07,-190.89"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;internal -->
+<g id="edge130" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;internal</title>
+<path fill="none" stroke="black" d="M275.31,-287.7C272.86,-280.24 269.93,-271.32 267.19,-262.97"/>
+<polygon fill="black" stroke="black" points="270.54,-261.95 264.09,-253.54 263.89,-264.14 270.54,-261.95"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;prim -->
+<g id="edge131" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M289.84,-288C295.07,-277.7 301.7,-264.22 307,-252 327.44,-204.9 308.6,-176.92 348,-144 383.86,-114.05 517.61,-99.66 588.4,-94.02"/>
+<polygon fill="black" stroke="black" points="588.4,-97.53 598.1,-93.27 587.86,-90.55 588.4,-97.53"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;ghc&#45;bignum -->
+<g id="edge132" class="edge">
+<title>integer&#45;logarithms&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M757.95,-222.29C682.98,-208.7 554.79,-185.45 483.22,-172.47"/>
+<polygon fill="black" stroke="black" points="484.19,-169.09 473.73,-170.75 482.94,-175.98 484.19,-169.09"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;ghc&#45;prim -->
+<g id="edge133" class="edge">
+<title>integer&#45;logarithms&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M802.03,-215.92C784.86,-196.95 755.29,-166.09 726,-144 710.64,-132.42 692.5,-121.54 676.33,-112.68"/>
+<polygon fill="black" stroke="black" points="678.37,-109.8 667.9,-108.16 675.06,-115.97 678.37,-109.8"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;bytestring -->
+<g id="edge134" class="edge">
+<title>lens&#45;aeson&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2758.98,-1093.03C2637.76,-1081.69 2329,-1044.06 2329,-955 2329,-955 2329,-955 2329,-881 2329,-755.79 2196.46,-540.47 2163,-504 2108.59,-444.69 2019.67,-409.49 1964.67,-392.23"/>
+<polygon fill="black" stroke="black" points="1965.84,-388.93 1955.26,-389.36 1963.8,-395.63 1965.84,-388.93"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;text -->
+<g id="edge136" class="edge">
+<title>lens&#45;aeson&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2816.31,-1080.09C2829.75,-1054.04 2853,-1002.16 2853,-955 2853,-955 2853,-955 2853,-881 2853,-799.67 2892.44,-785.98 2940,-720 2952.69,-702.39 2965.13,-704.23 2973,-684 2978.8,-669.09 2982.39,-660.95 2973,-648 2942.81,-606.35 2893.19,-653.65 2863,-612 2847.13,-590.11 2867.84,-562.52 2887.01,-543.9"/>
+<polygon fill="black" stroke="black" points="2889.2,-546.65 2894.18,-537.3 2884.46,-541.5 2889.2,-546.65"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;scientific -->
+<g id="edge135" class="edge">
+<title>lens&#45;aeson&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M2852.43,-1090.56C2956.44,-1074.53 3203,-1028.77 3203,-955 3203,-955 3203,-955 3203,-809 3203,-764 3232.12,-718.81 3253.32,-691.86"/>
+<polygon fill="black" stroke="black" points="3255.88,-694.27 3259.47,-684.3 3250.45,-689.85 3255.88,-694.27"/>
+</g>
+<!-- text&#45;short -->
+<g id="node55" class="node">
+<title>text&#45;short</title>
+<ellipse fill="none" stroke="black" cx="2901" cy="-666" rx="46.07" ry="18"/>
+<text text-anchor="middle" x="2901" y="-660.58" font-family="Times New Roman,serif" font-size="14.00">text&#45;short</text>
+</g>
+<!-- lens&#45;aeson&#45;&gt;text&#45;short -->
+<g id="edge137" class="edge">
+<title>lens&#45;aeson&#45;&gt;text&#45;short</title>
+<path fill="none" stroke="black" d="M2807,-1079.51C2807,-1052.71 2807,-999.87 2807,-955 2807,-955 2807,-955 2807,-809 2807,-760.5 2845.59,-715.86 2873.32,-690.04"/>
+<polygon fill="black" stroke="black" points="2875.31,-692.95 2880.4,-683.66 2870.63,-687.75 2875.31,-692.95"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;unordered&#45;containers -->
+<g id="edge138" class="edge">
+<title>lens&#45;aeson&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M2802.3,-1079.65C2786.66,-1023.87 2732.47,-845.45 2647,-720 2639.99,-709.72 2630.78,-699.79 2621.95,-691.36"/>
+<polygon fill="black" stroke="black" points="2624.53,-688.98 2614.8,-684.79 2619.8,-694.14 2624.53,-688.98"/>
+</g>
+<!-- vector -->
+<g id="node57" class="node">
+<title>vector</title>
+<ellipse fill="none" stroke="black" cx="4087" cy="-1026" rx="34.1" ry="18"/>
+<text text-anchor="middle" x="4087" y="-1020.58" font-family="Times New Roman,serif" font-size="14.00">vector</text>
+</g>
+<!-- lens&#45;aeson&#45;&gt;vector -->
+<g id="edge139" class="edge">
+<title>lens&#45;aeson&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M2854.55,-1092.29C2893.59,-1088.55 2950.33,-1083.4 3000,-1080 3403.3,-1052.42 3891.75,-1033.92 4041.31,-1028.59"/>
+<polygon fill="black" stroke="black" points="4041.32,-1032.09 4051.19,-1028.24 4041.07,-1025.09 4041.32,-1032.09"/>
+</g>
+<!-- text&#45;short&#45;&gt;ghc&#45;prim -->
+<g id="edge204" class="edge">
+<title>text&#45;short&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2946.42,-662.11C3097.57,-651.86 3581.69,-613.86 3717,-540 3832.62,-476.88 3952.04,-393.37 3873,-288 3819.16,-216.23 3289.84,-151.2 3216,-144 2695.07,-93.22 977.21,-90.98 677.73,-90.98"/>
+<polygon fill="black" stroke="black" points="678,-87.48 668,-90.98 678,-94.48 678,-87.48"/>
+</g>
+<!-- text&#45;short&#45;&gt;template&#45;haskell -->
+<g id="edge206" class="edge">
+<title>text&#45;short&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M2866.04,-653.94C2822.27,-639.92 2752.54,-616.98 2749,-612 2686.82,-524.47 2762.37,-390.31 2800.05,-333.68"/>
+<polygon fill="black" stroke="black" points="2802.81,-335.84 2805.54,-325.6 2797.02,-331.91 2802.81,-335.84"/>
+</g>
+<!-- text&#45;short&#45;&gt;bytestring -->
+<g id="edge202" class="edge">
+<title>text&#45;short&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M2866.55,-653.7C2859.77,-651.66 2852.69,-649.66 2846,-648 2762.59,-627.28 2728.78,-657.72 2656,-612 2571.77,-559.09 2609.77,-480.63 2523,-432 2475.82,-405.56 2116.67,-387.54 1974.08,-381.36"/>
+<polygon fill="black" stroke="black" points="1974.23,-377.87 1964.09,-380.93 1973.93,-384.86 1974.23,-377.87"/>
+</g>
+<!-- text&#45;short&#45;&gt;deepseq -->
+<g id="edge203" class="edge">
+<title>text&#45;short&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2947.28,-665.57C3041.42,-665.71 3250.41,-660.39 3299,-612 3373.06,-538.24 3331,-483.53 3331,-379 3331,-379 3331,-379 3331,-305 3331,-185.8 3194.71,-240.23 3078,-216 2945.6,-188.51 2534.07,-170.6 2386.96,-164.93"/>
+<polygon fill="black" stroke="black" points="2387.23,-161.44 2377.11,-164.56 2386.97,-168.44 2387.23,-161.44"/>
+</g>
+<!-- text&#45;short&#45;&gt;binary -->
+<g id="edge201" class="edge">
+<title>text&#45;short&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M2866.21,-653.78C2859.53,-651.76 2852.57,-649.74 2846,-648 2774.71,-629.09 2737.39,-662.88 2684,-612 2647.63,-577.34 2640.34,-515.77 2639.43,-479.64"/>
+<polygon fill="black" stroke="black" points="2642.93,-479.92 2639.34,-469.96 2635.93,-479.99 2642.93,-479.92"/>
+</g>
+<!-- text&#45;short&#45;&gt;text -->
+<g id="edge207" class="edge">
+<title>text&#45;short&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M2865.75,-654.06C2826.08,-641.39 2766.31,-621.11 2760,-612 2750.89,-598.85 2750.59,-588.94 2760,-576 2790.5,-534.05 2822.34,-557.95 2871,-540 2873.66,-539.02 2876.4,-537.97 2879.14,-536.89"/>
+<polygon fill="black" stroke="black" points="2880.21,-540.24 2888.17,-533.24 2877.58,-533.75 2880.21,-540.24"/>
+</g>
+<!-- text&#45;short&#45;&gt;hashable -->
+<g id="edge205" class="edge">
+<title>text&#45;short&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M2866.89,-653.59C2860.02,-651.54 2852.82,-649.56 2846,-648 2741.71,-624.14 2713.55,-629.42 2608,-612 2593.11,-609.54 2576.95,-606.71 2562.24,-604.07"/>
+<polygon fill="black" stroke="black" points="2563.28,-600.7 2552.81,-602.37 2562.03,-607.59 2563.28,-600.7"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;template&#45;haskell -->
+<g id="edge214" class="edge">
+<title>unordered&#45;containers&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M2524.91,-653.96C2500.58,-646.38 2475.59,-633.58 2461,-612 2452.04,-598.75 2452.51,-589.56 2461,-576 2519.19,-482.98 2599.23,-538.86 2683,-468 2728.01,-429.93 2720.73,-403.96 2760,-360 2768.78,-350.17 2779.24,-340.29 2788.9,-331.76"/>
+<polygon fill="black" stroke="black" points="2791.05,-334.53 2796.33,-325.34 2786.47,-329.23 2791.05,-334.53"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;deepseq -->
+<g id="edge212" class="edge">
+<title>unordered&#45;containers&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2656.45,-652.94C2731.13,-636.54 2856.54,-601.88 2948,-540 2991.56,-510.52 3026,-503.6 3026,-451 3026,-451 3026,-451 3026,-305 3026,-192.07 2897.77,-242.52 2788,-216 2645.63,-181.61 2472.56,-169.26 2387.06,-165.04"/>
+<polygon fill="black" stroke="black" points="2387.26,-161.55 2377.1,-164.57 2386.93,-168.54 2387.26,-161.55"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;hashable -->
+<g id="edge213" class="edge">
+<title>unordered&#45;containers&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M2573.63,-648.05C2563.34,-639.05 2550.55,-627.85 2539.36,-618.07"/>
+<polygon fill="black" stroke="black" points="2541.79,-615.54 2531.96,-611.59 2537.18,-620.81 2541.79,-615.54"/>
+</g>
+<!-- vector&#45;&gt;deepseq -->
+<g id="edge215" class="edge">
+<title>vector&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M4109.85,-1012.39C4145.42,-990.88 4210,-943.5 4210,-883 4210,-883 4210,-883 4210,-665 4210,-392.05 4044.63,-316.85 3791,-216 3658.73,-163.41 2634,-162.32 2387.29,-162.83"/>
+<polygon fill="black" stroke="black" points="2387.31,-159.33 2377.32,-162.85 2387.33,-166.33 2387.31,-159.33"/>
+</g>
+<!-- vector&#45;&gt;random -->
+<g id="edge217" class="edge">
+<title>vector&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M4103.39,-1010.17C4128.09,-986.1 4172,-935.87 4172,-883 4172,-883 4172,-883 4172,-809 4172,-558.57 3776.85,-477.9 3636.63,-457.16"/>
+<polygon fill="black" stroke="black" points="3637.31,-453.72 3626.92,-455.77 3636.32,-460.65 3637.31,-453.72"/>
+</g>
+<!-- vector&#45;&gt;primitive -->
+<g id="edge216" class="edge">
+<title>vector&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M4054.05,-1020.75C3988.93,-1010.31 3850,-977.01 3850,-883 3850,-883 3850,-883 3850,-665 3850,-595.11 3765.9,-554.91 3711.1,-536.14"/>
+<polygon fill="black" stroke="black" points="3712.26,-532.84 3701.67,-533.03 3710.07,-539.49 3712.26,-532.84"/>
+</g>
+<!-- tasty -->
+<g id="node65" class="node">
+<title>tasty</title>
+<ellipse fill="none" stroke="black" cx="3983" cy="-954" rx="28.11" ry="18"/>
+<text text-anchor="middle" x="3983" y="-948.58" font-family="Times New Roman,serif" font-size="14.00">tasty</text>
+</g>
+<!-- vector&#45;&gt;tasty -->
+<g id="edge218" class="edge">
+<title>vector&#45;&gt;tasty</title>
+<path fill="none" stroke="black" d="M4066.45,-1011.17C4050.57,-1000.48 4028.42,-985.57 4010.92,-973.8"/>
+<polygon fill="black" stroke="black" points="4013.26,-971.15 4003.01,-968.47 4009.35,-976.96 4013.26,-971.15"/>
+</g>
+<!-- vector&#45;stream -->
+<g id="node67" class="node">
+<title>vector&#45;stream</title>
+<ellipse fill="none" stroke="black" cx="4168" cy="-306" rx="61.54" ry="18"/>
+<text text-anchor="middle" x="4168" y="-300.57" font-family="Times New Roman,serif" font-size="14.00">vector&#45;stream</text>
+</g>
+<!-- vector&#45;&gt;vector&#45;stream -->
+<g id="edge219" class="edge">
+<title>vector&#45;&gt;vector&#45;stream</title>
+<path fill="none" stroke="black" d="M4120.01,-1020.82C4151.18,-1015.13 4197.05,-1001.96 4224,-972 4251.4,-941.54 4248,-923.97 4248,-883 4248,-883 4248,-883 4248,-449 4248,-403.24 4216.08,-358.63 4192.56,-331.97"/>
+<polygon fill="black" stroke="black" points="4195.31,-329.8 4185.99,-324.77 4190.14,-334.51 4195.31,-329.8"/>
+</g>
+<!-- mime&#45;types&#45;&gt;bytestring -->
+<g id="edge144" class="edge">
+<title>mime&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M3212.44,-577.47C3158.09,-542.73 3018.58,-459.61 2888,-432 2712.05,-394.8 2156.85,-382.82 1974.6,-379.84"/>
+<polygon fill="black" stroke="black" points="1974.71,-376.34 1964.65,-379.68 1974.6,-383.34 1974.71,-376.34"/>
+</g>
+<!-- mime&#45;types&#45;&gt;containers -->
+<g id="edge145" class="edge">
+<title>mime&#45;types&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3222.82,-576.45C3205.57,-553.62 3176.22,-510.47 3165,-468 3159.69,-447.9 3163.67,-424.69 3168.72,-407.01"/>
+<polygon fill="black" stroke="black" points="3171.98,-408.31 3171.65,-397.72 3165.3,-406.2 3171.98,-408.31"/>
+</g>
+<!-- mime&#45;types&#45;&gt;text -->
+<g id="edge146" class="edge">
+<title>mime&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3191.97,-583.49C3127.57,-569.57 3008.86,-543.93 2948.82,-530.96"/>
+<polygon fill="black" stroke="black" points="2949.62,-527.55 2939.11,-528.86 2948.15,-534.39 2949.62,-527.55"/>
+</g>
+<!-- optparse&#45;applicative -->
+<g id="node59" class="node">
+<title>optparse&#45;applicative</title>
+<ellipse fill="none" stroke="black" cx="2995" cy="-882" rx="85.49" ry="18"/>
+<text text-anchor="middle" x="2995" y="-876.58" font-family="Times New Roman,serif" font-size="14.00">optparse&#45;applicative</text>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;process -->
+<g id="edge149" class="edge">
+<title>optparse&#45;applicative&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M2912.44,-877C2646.46,-864.1 1816.81,-823.89 1602.13,-813.48"/>
+<polygon fill="black" stroke="black" points="1602.58,-810 1592.42,-813.01 1602.24,-816.99 1602.58,-810"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;text -->
+<g id="edge150" class="edge">
+<title>optparse&#45;applicative&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3066.75,-871.87C3093.66,-864.57 3121.67,-851.47 3138,-828 3147.14,-814.87 3141.41,-807.63 3138,-792 3122.99,-723.22 3125.21,-694.1 3072,-648 3029.27,-610.98 2992.24,-649.58 2950,-612 2932.35,-596.3 2922.62,-570.99 2917.44,-551.37"/>
+<polygon fill="black" stroke="black" points="2920.88,-550.71 2915.18,-541.78 2914.07,-552.32 2920.88,-550.71"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;transformers&#45;compat -->
+<g id="edge151" class="edge">
+<title>optparse&#45;applicative&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M2909.98,-879.35C2483.1,-871.03 591.43,-833.91 531,-828 523.19,-827.24 515.07,-826.2 506.99,-825.01"/>
+<polygon fill="black" stroke="black" points="507.56,-821.56 497.14,-823.48 506.48,-828.48 507.56,-821.56"/>
+</g>
+<!-- prettyprinter -->
+<g id="node60" class="node">
+<title>prettyprinter</title>
+<ellipse fill="none" stroke="black" cx="3005" cy="-738" rx="56.05" ry="18"/>
+<text text-anchor="middle" x="3005" y="-732.58" font-family="Times New Roman,serif" font-size="14.00">prettyprinter</text>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;prettyprinter -->
+<g id="edge147" class="edge">
+<title>optparse&#45;applicative&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M2953.99,-865.95C2937.21,-857.52 2919.54,-845.18 2910,-828 2902.24,-814.01 2901.9,-805.8 2910,-792 2919.91,-775.12 2937.37,-763.22 2954.64,-755.03"/>
+<polygon fill="black" stroke="black" points="2955.58,-758.45 2963.35,-751.24 2952.78,-752.03 2955.58,-758.45"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal -->
+<g id="node61" class="node">
+<title>prettyprinter&#45;ansi&#45;terminal</title>
+<ellipse fill="none" stroke="black" cx="3024" cy="-810" rx="105.45" ry="18"/>
+<text text-anchor="middle" x="3024" y="-804.58" font-family="Times New Roman,serif" font-size="14.00">prettyprinter&#45;ansi&#45;terminal</text>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;prettyprinter&#45;ansi&#45;terminal -->
+<g id="edge148" class="edge">
+<title>optparse&#45;applicative&#45;&gt;prettyprinter&#45;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M3002.17,-863.7C3005.29,-856.15 3009.04,-847.12 3012.53,-838.68"/>
+<polygon fill="black" stroke="black" points="3015.74,-840.08 3016.33,-829.5 3009.27,-837.4 3015.74,-840.08"/>
+</g>
+<!-- prettyprinter&#45;&gt;text -->
+<g id="edge160" class="edge">
+<title>prettyprinter&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3016.9,-720.11C3028.94,-700.74 3043.6,-668.96 3027,-648 2983.63,-593.24 2917.37,-666.76 2874,-612 2858.4,-592.31 2873.99,-565.25 2889.66,-546.16"/>
+<polygon fill="black" stroke="black" points="2892.28,-548.47 2896.22,-538.63 2887.01,-543.87 2892.28,-548.47"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;text -->
+<g id="edge163" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M3044.34,-792.08C3054.11,-782.61 3064.8,-769.92 3070,-756 3087.27,-709.75 3080.28,-681.48 3044,-648 2999.31,-606.76 2948.91,-660.33 2912,-612 2898.95,-594.92 2900.09,-570.12 2903.84,-551.03"/>
+<polygon fill="black" stroke="black" points="2907.21,-552.01 2906.07,-541.48 2900.39,-550.42 2907.21,-552.01"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;ansi&#45;terminal -->
+<g id="edge161" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M3120.68,-802.63C3333.5,-788.62 3838.03,-755.39 4020.06,-743.41"/>
+<polygon fill="black" stroke="black" points="4020.06,-746.92 4029.81,-742.77 4019.6,-739.93 4020.06,-746.92"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;prettyprinter -->
+<g id="edge162" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M3019.3,-791.7C3017.28,-784.24 3014.86,-775.32 3012.59,-766.97"/>
+<polygon fill="black" stroke="black" points="3016.04,-766.3 3010.04,-757.57 3009.28,-768.13 3016.04,-766.3"/>
+</g>
+<!-- primitive&#45;&gt;template&#45;haskell -->
+<g id="edge165" class="edge">
+<title>primitive&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M3635.16,-508.73C3551.84,-474.64 3317.52,-379.96 3237,-360 3113.88,-329.48 2965.76,-315.99 2883,-310.46"/>
+<polygon fill="black" stroke="black" points="2883.24,-306.97 2873.04,-309.82 2882.79,-313.95 2883.24,-306.97"/>
+</g>
+<!-- primitive&#45;&gt;deepseq -->
+<g id="edge164" class="edge">
+<title>primitive&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3695.8,-509.38C3713.65,-500.86 3734.6,-487.37 3745,-468 3800.05,-365.49 3771.58,-279.39 3674,-216 3619.19,-180.4 2629.36,-166.47 2387.15,-163.59"/>
+<polygon fill="black" stroke="black" points="2387.41,-160.09 2377.37,-163.48 2387.33,-167.09 2387.41,-160.09"/>
+</g>
+<!-- psqueues&#45;&gt;ghc&#45;prim -->
+<g id="edge171" class="edge">
+<title>psqueues&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M2280.19,-665.02C2051.44,-664.87 1038.69,-661.42 908,-612 766.2,-558.38 708.92,-533 644,-396 634.15,-375.21 649.64,-296.33 654,-288 664.93,-267.1 683.54,-273.61 693,-252 699.42,-237.34 696.55,-231.6 693,-216 684.82,-180.06 664.96,-142.39 650.32,-117.92"/>
+<polygon fill="black" stroke="black" points="653.41,-116.27 645.2,-109.58 647.44,-119.93 653.41,-116.27"/>
+</g>
+<!-- psqueues&#45;&gt;deepseq -->
+<g id="edge170" class="edge">
+<title>psqueues&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M2327.1,-647.53C2329.29,-611.04 2334,-524.06 2334,-451 2334,-451 2334,-451 2334,-305 2334,-265.74 2334,-220.38 2334,-191.69"/>
+<polygon fill="black" stroke="black" points="2337.5,-192 2334,-182 2330.5,-192 2337.5,-192"/>
+</g>
+<!-- psqueues&#45;&gt;hashable -->
+<g id="edge172" class="edge">
+<title>psqueues&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M2358.15,-652.97C2389.43,-641.26 2437.12,-623.4 2471.31,-610.61"/>
+<polygon fill="black" stroke="black" points="2472.34,-613.96 2480.48,-607.17 2469.88,-607.4 2472.34,-613.96"/>
+</g>
+<!-- splitmix&#45;&gt;deepseq -->
+<g id="edge186" class="edge">
+<title>splitmix&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M3567.95,-288.02C3560.69,-266.96 3545.1,-231.91 3518,-216 3468.68,-187.03 2611.49,-168.4 2387.3,-164"/>
+<polygon fill="black" stroke="black" points="2387.46,-160.51 2377.39,-163.81 2387.32,-167.5 2387.46,-160.51"/>
+</g>
+<!-- tasty&#45;&gt;stm -->
+<g id="edge192" class="edge">
+<title>tasty&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M3984.24,-935.69C3987.39,-896.53 3997.19,-798.44 4021,-720 4038.74,-661.57 4078,-656.06 4078,-595 4078,-595 4078,-595 4078,-161 4078,-121.74 4078,-76.38 4078,-47.69"/>
+<polygon fill="black" stroke="black" points="4081.5,-48 4078,-38 4074.5,-48 4081.5,-48"/>
+</g>
+<!-- tasty&#45;&gt;containers -->
+<g id="edge190" class="edge">
+<title>tasty&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M3972.01,-937.22C3955.45,-911.85 3926,-859.88 3926,-811 3926,-811 3926,-811 3926,-737 3926,-653 3885.55,-636.23 3827,-576 3786.27,-534.1 3771.04,-526.22 3717,-504 3642.75,-473.47 3617.84,-487.64 3540,-468 3486.42,-454.48 3474.65,-445.21 3421,-432 3338.39,-411.66 3315.49,-416.81 3233,-396 3230.43,-395.35 3227.8,-394.65 3225.15,-393.91"/>
+<polygon fill="black" stroke="black" points="3226.3,-390.61 3215.72,-391.17 3224.35,-397.33 3226.3,-390.61"/>
+</g>
+<!-- tasty&#45;&gt;ansi&#45;terminal -->
+<g id="edge189" class="edge">
+<title>tasty&#45;&gt;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M3993.72,-937.11C4000.49,-926.76 4009.21,-912.84 4016,-900 4040,-854.58 4063.11,-799.35 4076.14,-766.81"/>
+<polygon fill="black" stroke="black" points="4079.32,-768.29 4079.75,-757.7 4072.81,-765.71 4079.32,-768.29"/>
+</g>
+<!-- tasty&#45;&gt;tagged -->
+<g id="edge193" class="edge">
+<title>tasty&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M3979.25,-936.05C3973.71,-909.52 3964,-856.52 3964,-811 3964,-811 3964,-811 3964,-593 3964,-489.27 3608.59,-411.48 3482.07,-387.07"/>
+<polygon fill="black" stroke="black" points="3482.87,-383.66 3472.39,-385.22 3481.56,-390.53 3482.87,-383.66"/>
+</g>
+<!-- tasty&#45;&gt;optparse&#45;applicative -->
+<g id="edge191" class="edge">
+<title>tasty&#45;&gt;optparse&#45;applicative</title>
+<path fill="none" stroke="black" d="M3955.02,-951.02C3827.76,-942 3300.52,-904.65 3086.2,-889.46"/>
+<polygon fill="black" stroke="black" points="3086.73,-885.99 3076.51,-888.78 3086.24,-892.97 3086.73,-885.99"/>
+</g>
+<!-- time&#45;locale&#45;compat&#45;&gt;time -->
+<g id="edge210" class="edge">
+<title>time&#45;locale&#45;compat&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M835.72,-1151.95C813.7,-1089.11 745.93,-866.57 832,-720 844.79,-698.23 870.13,-684.74 891.42,-676.82"/>
+<polygon fill="black" stroke="black" points="892.34,-680.21 900.67,-673.67 890.08,-673.58 892.34,-680.21"/>
+</g>
+<!-- vector&#45;stream&#45;&gt;ghc&#45;prim -->
+<g id="edge220" class="edge">
+<title>vector&#45;stream&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M4158.39,-287.89C4137.69,-253.01 4085.13,-174.45 4016,-144 3935.92,-108.73 1072.52,-93.19 677.92,-91.22"/>
+<polygon fill="black" stroke="black" points="677.98,-87.72 667.97,-91.17 677.95,-94.72 677.98,-87.72"/>
+</g>
+</g>
+</svg>
diff --git a/doc/img/dot_command/wreq-example6.svg b/doc/img/dot_command/wreq-example6.svg
new file mode 100644
index 0000000000..45d0129511
--- /dev/null
+++ b/doc/img/dot_command/wreq-example6.svg
@@ -0,0 +1,1861 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 12.0.0 (20240704.0754)
+ -->
+<!-- Title: deps Pages: 1 -->
+<svg width="1943pt" height="1701pt"
+ viewBox="0.00 0.00 1942.71 1701.45" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1697.45)">
+<title>deps</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-1697.45 1938.71,-1697.45 1938.71,4 -4,4"/>
+<!-- wreq -->
+<g id="node1" class="node">
+<title>wreq</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="932.76" cy="-904.53" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="932.76" y="-899.11" font-family="Times New Roman,serif" font-size="14.00">wreq</text>
+</g>
+<!-- ghc&#45;prim -->
+<g id="node5" class="node">
+<title>ghc&#45;prim</title>
+<polygon fill="none" stroke="black" points="1058.09,-992.33 991.84,-992.33 991.84,-956.33 1058.09,-956.33 1058.09,-992.33"/>
+<text text-anchor="middle" x="1024.96" y="-968.9" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;prim</text>
+</g>
+<!-- wreq&#45;&gt;ghc&#45;prim -->
+<g id="edge230" class="edge">
+<title>wreq&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M951.41,-918.66C962.96,-927.39 978.11,-938.87 991.66,-949.12"/>
+<polygon fill="black" stroke="black" points="989.43,-951.82 999.52,-955.07 993.66,-946.24 989.43,-951.82"/>
+</g>
+<!-- template&#45;haskell -->
+<g id="node9" class="node">
+<title>template&#45;haskell</title>
+<polygon fill="none" stroke="black" points="906.22,-1099.24 801.72,-1099.24 801.72,-1063.24 906.22,-1063.24 906.22,-1099.24"/>
+<text text-anchor="middle" x="853.97" y="-1075.82" font-family="Times New Roman,serif" font-size="14.00">template&#45;haskell</text>
+</g>
+<!-- wreq&#45;&gt;template&#45;haskell -->
+<g id="edge237" class="edge">
+<title>wreq&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M924.91,-922.12C911.28,-952.71 883.08,-1015.96 866.64,-1052.84"/>
+<polygon fill="black" stroke="black" points="863.63,-1050.99 862.75,-1061.55 870.02,-1053.84 863.63,-1050.99"/>
+</g>
+<!-- Cabal -->
+<g id="node10" class="node">
+<title>Cabal</title>
+<ellipse fill="none" stroke="black" cx="812.43" cy="-950.31" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="812.43" y="-944.89" font-family="Times New Roman,serif" font-size="14.00">Cabal</text>
+</g>
+<!-- wreq&#45;&gt;Cabal -->
+<g id="edge221" class="edge">
+<title>wreq&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M907.53,-914.13C890.83,-920.48 868.62,-928.93 849.87,-936.07"/>
+<polygon fill="black" stroke="black" points="848.81,-932.73 840.71,-939.55 851.3,-939.27 848.81,-932.73"/>
+</g>
+<!-- bytestring -->
+<g id="node13" class="node">
+<title>bytestring</title>
+<ellipse fill="none" stroke="black" cx="731.63" cy="-846.57" rx="47.07" ry="18"/>
+<text text-anchor="middle" x="731.63" y="-841.14" font-family="Times New Roman,serif" font-size="14.00">bytestring</text>
+</g>
+<!-- wreq&#45;&gt;bytestring -->
+<g id="edge225" class="edge">
+<title>wreq&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M906.05,-896.83C874.18,-887.65 820.25,-872.11 780.78,-860.73"/>
+<polygon fill="black" stroke="black" points="781.83,-857.39 771.25,-857.99 779.89,-864.12 781.83,-857.39"/>
+</g>
+<!-- containers -->
+<g id="node14" class="node">
+<title>containers</title>
+<ellipse fill="none" stroke="black" cx="839" cy="-795.09" rx="48.57" ry="18"/>
+<text text-anchor="middle" x="839" y="-789.66" font-family="Times New Roman,serif" font-size="14.00">containers</text>
+</g>
+<!-- wreq&#45;&gt;containers -->
+<g id="edge228" class="edge">
+<title>wreq&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M918.92,-888.38C903.75,-870.67 879.17,-841.98 861.28,-821.09"/>
+<polygon fill="black" stroke="black" points="863.97,-818.86 854.81,-813.54 858.65,-823.41 863.97,-818.86"/>
+</g>
+<!-- time -->
+<g id="node21" class="node">
+<title>time</title>
+<ellipse fill="none" stroke="black" cx="844.78" cy="-661.34" rx="27" ry="18"/>
+<text text-anchor="middle" x="844.78" y="-655.91" font-family="Times New Roman,serif" font-size="14.00">time</text>
+</g>
+<!-- wreq&#45;&gt;time -->
+<g id="edge239" class="edge">
+<title>wreq&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M926.29,-886.65C911.16,-844.84 873.38,-740.4 855.07,-689.76"/>
+<polygon fill="black" stroke="black" points="858.47,-688.88 851.78,-680.67 851.89,-691.27 858.47,-688.88"/>
+</g>
+<!-- text -->
+<g id="node23" class="node">
+<title>text</title>
+<ellipse fill="none" stroke="black" cx="958.13" cy="-768.72" rx="27" ry="18"/>
+<text text-anchor="middle" x="958.13" y="-763.3" font-family="Times New Roman,serif" font-size="14.00">text</text>
+</g>
+<!-- wreq&#45;&gt;text -->
+<g id="edge238" class="edge">
+<title>wreq&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M936.18,-886.22C940.42,-863.51 947.7,-824.54 952.71,-797.75"/>
+<polygon fill="black" stroke="black" points="956.09,-798.71 954.49,-788.24 949.21,-797.42 956.09,-798.71"/>
+</g>
+<!-- memory -->
+<g id="node33" class="node">
+<title>memory</title>
+<ellipse fill="none" stroke="black" cx="915.34" cy="-523.74" rx="41.08" ry="18"/>
+<text text-anchor="middle" x="915.34" y="-518.32" font-family="Times New Roman,serif" font-size="14.00">memory</text>
+</g>
+<!-- wreq&#45;&gt;memory -->
+<g id="edge234" class="edge">
+<title>wreq&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M931.92,-886.17C929.12,-825.09 920.13,-628.43 916.69,-553.3"/>
+<polygon fill="black" stroke="black" points="920.19,-553.26 916.24,-543.43 913.2,-553.58 920.19,-553.26"/>
+</g>
+<!-- attoparsec -->
+<g id="node34" class="node">
+<title>attoparsec</title>
+<ellipse fill="none" stroke="black" cx="1084.17" cy="-405.89" rx="49.07" ry="18"/>
+<text text-anchor="middle" x="1084.17" y="-400.46" font-family="Times New Roman,serif" font-size="14.00">attoparsec</text>
+</g>
+<!-- wreq&#45;&gt;attoparsec -->
+<g id="edge222" class="edge">
+<title>wreq&#45;&gt;attoparsec</title>
+<path fill="none" stroke="black" d="M938.23,-886.49C960.88,-811.9 1047.34,-527.16 1075.35,-434.92"/>
+<polygon fill="black" stroke="black" points="1078.62,-436.2 1078.18,-425.62 1071.92,-434.17 1078.62,-436.2"/>
+</g>
+<!-- authenticate&#45;oauth -->
+<g id="node36" class="node">
+<title>authenticate&#45;oauth</title>
+<ellipse fill="none" stroke="black" cx="1010.5" cy="-652.02" rx="77.51" ry="18"/>
+<text text-anchor="middle" x="1010.5" y="-646.59" font-family="Times New Roman,serif" font-size="14.00">authenticate&#45;oauth</text>
+</g>
+<!-- wreq&#45;&gt;authenticate&#45;oauth -->
+<g id="edge223" class="edge">
+<title>wreq&#45;&gt;authenticate&#45;oauth</title>
+<path fill="none" stroke="black" d="M938.35,-886.37C951.65,-843.16 985.28,-733.92 1001.49,-681.27"/>
+<polygon fill="black" stroke="black" points="1004.81,-682.39 1004.41,-671.8 998.12,-680.33 1004.81,-682.39"/>
+</g>
+<!-- http&#45;types -->
+<g id="node40" class="node">
+<title>http&#45;types</title>
+<ellipse fill="none" stroke="black" cx="1068.51" cy="-826.63" rx="48.07" ry="18"/>
+<text text-anchor="middle" x="1068.51" y="-821.21" font-family="Times New Roman,serif" font-size="14.00">http&#45;types</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;types -->
+<g id="edge232" class="edge">
+<title>wreq&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M954.27,-892.19C975.16,-880.2 1007.29,-861.76 1032.16,-847.49"/>
+<polygon fill="black" stroke="black" points="1033.73,-850.62 1040.66,-842.61 1030.25,-844.55 1033.73,-850.62"/>
+</g>
+<!-- base16&#45;bytestring -->
+<g id="node43" class="node">
+<title>base16&#45;bytestring</title>
+<ellipse fill="none" stroke="black" cx="1138.75" cy="-565.91" rx="76.01" ry="18"/>
+<text text-anchor="middle" x="1138.75" y="-560.48" font-family="Times New Roman,serif" font-size="14.00">base16&#45;bytestring</text>
+</g>
+<!-- wreq&#45;&gt;base16&#45;bytestring -->
+<g id="edge224" class="edge">
+<title>wreq&#45;&gt;base16&#45;bytestring</title>
+<path fill="none" stroke="black" d="M943.25,-887.27C976.71,-832.28 1081.01,-660.82 1121.98,-593.47"/>
+<polygon fill="black" stroke="black" points="1124.78,-595.6 1126.99,-585.24 1118.8,-591.97 1124.78,-595.6"/>
+</g>
+<!-- cabal&#45;doctest -->
+<g id="node45" class="node">
+<title>cabal&#45;doctest</title>
+<ellipse fill="none" stroke="black" cx="1259.89" cy="-365.86" rx="60.54" ry="18"/>
+<text text-anchor="middle" x="1259.89" y="-360.43" font-family="Times New Roman,serif" font-size="14.00">cabal&#45;doctest</text>
+</g>
+<!-- wreq&#45;&gt;cabal&#45;doctest -->
+<g id="edge226" class="edge">
+<title>wreq&#45;&gt;cabal&#45;doctest</title>
+<path fill="none" stroke="black" d="M943.09,-887.52C990.14,-810.05 1184.37,-490.21 1243.03,-393.61"/>
+<polygon fill="black" stroke="black" points="1245.91,-395.62 1248.11,-385.25 1239.92,-391.98 1245.91,-395.62"/>
+</g>
+<!-- case&#45;insensitive -->
+<g id="node46" class="node">
+<title>case&#45;insensitive</title>
+<ellipse fill="none" stroke="black" cx="1506.11" cy="-393.47" rx="68.03" ry="18"/>
+<text text-anchor="middle" x="1506.11" y="-388.04" font-family="Times New Roman,serif" font-size="14.00">case&#45;insensitive</text>
+</g>
+<!-- wreq&#45;&gt;case&#45;insensitive -->
+<g id="edge227" class="edge">
+<title>wreq&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M949.6,-889.51C1030.13,-817.73 1376.08,-509.37 1477.85,-418.66"/>
+<polygon fill="black" stroke="black" points="1480.11,-421.33 1485.25,-412.06 1475.46,-416.1 1480.11,-421.33"/>
+</g>
+<!-- hashable -->
+<g id="node47" class="node">
+<title>hashable</title>
+<ellipse fill="none" stroke="black" cx="1315.21" cy="-607.55" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="1315.21" y="-602.13" font-family="Times New Roman,serif" font-size="14.00">hashable</text>
+</g>
+<!-- wreq&#45;&gt;hashable -->
+<g id="edge231" class="edge">
+<title>wreq&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M951.2,-890.21C1012.59,-842.54 1210.35,-688.98 1285.69,-630.48"/>
+<polygon fill="black" stroke="black" points="1287.71,-633.34 1293.47,-624.44 1283.42,-627.81 1287.71,-633.34"/>
+</g>
+<!-- crypton -->
+<g id="node51" class="node">
+<title>crypton</title>
+<ellipse fill="none" stroke="black" cx="1148.02" cy="-713.63" rx="39.59" ry="18"/>
+<text text-anchor="middle" x="1148.02" y="-708.21" font-family="Times New Roman,serif" font-size="14.00">crypton</text>
+</g>
+<!-- wreq&#45;&gt;crypton -->
+<g id="edge229" class="edge">
+<title>wreq&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M949.65,-889.55C986.91,-856.51 1076.4,-777.15 1121.33,-737.3"/>
+<polygon fill="black" stroke="black" points="1123.41,-740.14 1128.57,-730.89 1118.76,-734.9 1123.41,-740.14"/>
+</g>
+<!-- lens&#45;aeson -->
+<g id="node54" class="node">
+<title>lens&#45;aeson</title>
+<ellipse fill="none" stroke="black" cx="1159.52" cy="-923.32" rx="49.57" ry="18"/>
+<text text-anchor="middle" x="1159.52" y="-917.9" font-family="Times New Roman,serif" font-size="14.00">lens&#45;aeson</text>
+</g>
+<!-- wreq&#45;&gt;lens&#45;aeson -->
+<g id="edge233" class="edge">
+<title>wreq&#45;&gt;lens&#45;aeson</title>
+<path fill="none" stroke="black" d="M961.94,-906.95C996.6,-909.82 1055.32,-914.69 1099.76,-918.37"/>
+<polygon fill="black" stroke="black" points="1099.25,-921.84 1109.51,-919.18 1099.83,-914.87 1099.25,-921.84"/>
+</g>
+<!-- unordered&#45;containers -->
+<g id="node56" class="node">
+<title>unordered&#45;containers</title>
+<ellipse fill="none" stroke="black" cx="1256.24" cy="-797.37" rx="89.49" ry="18"/>
+<text text-anchor="middle" x="1256.24" y="-791.94" font-family="Times New Roman,serif" font-size="14.00">unordered&#45;containers</text>
+</g>
+<!-- wreq&#45;&gt;unordered&#45;containers -->
+<g id="edge241" class="edge">
+<title>wreq&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M958.68,-895.94C1010.38,-878.82 1127.39,-840.05 1198.31,-816.56"/>
+<polygon fill="black" stroke="black" points="1199.02,-820.01 1207.41,-813.54 1196.82,-813.36 1199.02,-820.01"/>
+</g>
+<!-- mime&#45;types -->
+<g id="node58" class="node">
+<title>mime&#45;types</title>
+<ellipse fill="none" stroke="black" cx="1547.64" cy="-652.07" rx="53.56" ry="18"/>
+<text text-anchor="middle" x="1547.64" y="-646.65" font-family="Times New Roman,serif" font-size="14.00">mime&#45;types</text>
+</g>
+<!-- wreq&#45;&gt;mime&#45;types -->
+<g id="edge235" class="edge">
+<title>wreq&#45;&gt;mime&#45;types</title>
+<path fill="none" stroke="black" d="M957.24,-894.48C1050.15,-856.33 1381.76,-720.18 1502.91,-670.44"/>
+<polygon fill="black" stroke="black" points="1503.97,-673.79 1511.89,-666.75 1501.31,-667.31 1503.97,-673.79"/>
+</g>
+<!-- psqueues -->
+<g id="node63" class="node">
+<title>psqueues</title>
+<ellipse fill="none" stroke="black" cx="1432.55" cy="-803.69" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="1432.55" y="-798.27" font-family="Times New Roman,serif" font-size="14.00">psqueues</text>
+</g>
+<!-- wreq&#45;&gt;psqueues -->
+<g id="edge236" class="edge">
+<title>wreq&#45;&gt;psqueues</title>
+<path fill="none" stroke="black" d="M960.7,-898.89C1041.34,-882.62 1275.41,-835.4 1380.46,-814.2"/>
+<polygon fill="black" stroke="black" points="1381.12,-817.64 1390.23,-812.23 1379.73,-810.78 1381.12,-817.64"/>
+</g>
+<!-- time&#45;locale&#45;compat -->
+<g id="node66" class="node">
+<title>time&#45;locale&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="1330.51" cy="-958.55" rx="81.5" ry="18"/>
+<text text-anchor="middle" x="1330.51" y="-953.13" font-family="Times New Roman,serif" font-size="14.00">time&#45;locale&#45;compat</text>
+</g>
+<!-- wreq&#45;&gt;time&#45;locale&#45;compat -->
+<g id="edge240" class="edge">
+<title>wreq&#45;&gt;time&#45;locale&#45;compat</title>
+<path fill="none" stroke="black" d="M961.68,-908.46C1021.34,-916.56 1159.93,-935.38 1249.2,-947.51"/>
+<polygon fill="black" stroke="black" points="1248.5,-950.95 1258.88,-948.82 1249.44,-944.01 1248.5,-950.95"/>
+</g>
+<!-- ansi&#45;terminal&#45;types -->
+<g id="node2" class="node">
+<title>ansi&#45;terminal&#45;types</title>
+<ellipse fill="none" stroke="black" cx="156.89" cy="-34.95" rx="80.01" ry="18"/>
+<text text-anchor="middle" x="156.89" y="-29.52" font-family="Times New Roman,serif" font-size="14.00">ansi&#45;terminal&#45;types</text>
+</g>
+<!-- ghc&#45;bignum -->
+<g id="node3" class="node">
+<title>ghc&#45;bignum</title>
+<polygon fill="none" stroke="black" points="1905.49,-821.28 1823.49,-821.28 1823.49,-785.28 1905.49,-785.28 1905.49,-821.28"/>
+<text text-anchor="middle" x="1864.49" y="-797.85" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;bignum</text>
+</g>
+<!-- ghc&#45;bignum&#45;&gt;ghc&#45;prim -->
+<g id="edge111" class="edge">
+<title>ghc&#45;bignum&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1823.15,-811.7C1681.44,-840.57 1216.06,-935.39 1069.54,-965.25"/>
+<polygon fill="black" stroke="black" points="1068.94,-961.8 1059.84,-967.22 1070.34,-968.66 1068.94,-961.8"/>
+</g>
+<!-- ghc&#45;internal -->
+<g id="node4" class="node">
+<title>ghc&#45;internal</title>
+<polygon fill="none" stroke="black" points="1589.22,-989.87 1508.72,-989.87 1508.72,-953.87 1589.22,-953.87 1589.22,-989.87"/>
+<text text-anchor="middle" x="1548.97" y="-966.45" font-family="Times New Roman,serif" font-size="14.00">ghc&#45;internal</text>
+</g>
+<!-- ghc&#45;internal&#45;&gt;ghc&#45;bignum -->
+<g id="edge112" class="edge">
+<title>ghc&#45;internal&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M1583.33,-953.51C1640.83,-922.79 1756.45,-861.01 1820.05,-827.02"/>
+<polygon fill="black" stroke="black" points="1821.66,-830.13 1828.83,-822.33 1818.36,-823.96 1821.66,-830.13"/>
+</g>
+<!-- ghc&#45;internal&#45;&gt;ghc&#45;prim -->
+<g id="edge113" class="edge">
+<title>ghc&#45;internal&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1508.29,-972.06C1411.83,-972.52 1169.86,-973.65 1069.58,-974.12"/>
+<polygon fill="black" stroke="black" points="1069.85,-970.62 1059.86,-974.17 1069.88,-977.62 1069.85,-970.62"/>
+</g>
+<!-- rts -->
+<g id="node7" class="node">
+<title>rts</title>
+<polygon fill="none" stroke="black" points="1906.71,-506.47 1852.71,-506.47 1852.71,-470.47 1906.71,-470.47 1906.71,-506.47"/>
+<text text-anchor="middle" x="1879.71" y="-483.05" font-family="Times New Roman,serif" font-size="14.00">rts</text>
+</g>
+<!-- ghc&#45;internal&#45;&gt;rts -->
+<g id="edge114" class="edge">
+<title>ghc&#45;internal&#45;&gt;rts</title>
+<path fill="none" stroke="black" d="M1561.53,-953.51C1611.97,-879.78 1800.02,-604.94 1860.7,-516.25"/>
+<polygon fill="black" stroke="black" points="1863.52,-518.33 1866.28,-508.1 1857.74,-514.38 1863.52,-518.33"/>
+</g>
+<!-- ghc&#45;prim&#45;&gt;rts -->
+<g id="edge115" class="edge">
+<title>ghc&#45;prim&#45;&gt;rts</title>
+<path fill="none" stroke="black" d="M1057.43,-955.88C1191.3,-879.78 1700.15,-590.54 1842.5,-509.62"/>
+<polygon fill="black" stroke="black" points="1844.21,-512.67 1851.17,-504.69 1840.75,-506.59 1844.21,-512.67"/>
+</g>
+<!-- mtl -->
+<g id="node6" class="node">
+<title>mtl</title>
+<ellipse fill="none" stroke="black" cx="694.6" cy="-1078.89" rx="27" ry="18"/>
+<text text-anchor="middle" x="694.6" y="-1073.47" font-family="Times New Roman,serif" font-size="14.00">mtl</text>
+</g>
+<!-- stm -->
+<g id="node8" class="node">
+<title>stm</title>
+<ellipse fill="none" stroke="black" cx="81.76" cy="-389.23" rx="27" ry="18"/>
+<text text-anchor="middle" x="81.76" y="-383.8" font-family="Times New Roman,serif" font-size="14.00">stm</text>
+</g>
+<!-- template&#45;haskell&#45;&gt;ghc&#45;prim -->
+<g id="edge194" class="edge">
+<title>template&#45;haskell&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M883.37,-1062.86C911.63,-1045.19 954.53,-1018.37 985.7,-998.88"/>
+<polygon fill="black" stroke="black" points="987.47,-1001.9 994.1,-993.63 983.76,-995.96 987.47,-1001.9"/>
+</g>
+<!-- pretty -->
+<g id="node19" class="node">
+<title>pretty</title>
+<ellipse fill="none" stroke="black" cx="1358.78" cy="-1167.96" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="1358.78" y="-1162.53" font-family="Times New Roman,serif" font-size="14.00">pretty</text>
+</g>
+<!-- template&#45;haskell&#45;&gt;pretty -->
+<g id="edge195" class="edge">
+<title>template&#45;haskell&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M906.57,-1090.28C1007.09,-1107.54 1224.63,-1144.91 1316.49,-1160.69"/>
+<polygon fill="black" stroke="black" points="1315.88,-1164.14 1326.33,-1162.38 1317.07,-1157.24 1315.88,-1164.14"/>
+</g>
+<!-- Cabal&#45;&gt;mtl -->
+<g id="edge8" class="edge">
+<title>Cabal&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M797.51,-966.6C777.01,-988.96 740.01,-1029.34 716.41,-1055.1"/>
+<polygon fill="black" stroke="black" points="713.87,-1052.69 709.7,-1062.43 719.03,-1057.42 713.87,-1052.69"/>
+</g>
+<!-- Cabal&#45;syntax -->
+<g id="node11" class="node">
+<title>Cabal&#45;syntax</title>
+<ellipse fill="none" stroke="black" cx="561.37" cy="-1256.86" rx="59.05" ry="18"/>
+<text text-anchor="middle" x="561.37" y="-1251.44" font-family="Times New Roman,serif" font-size="14.00">Cabal&#45;syntax</text>
+</g>
+<!-- Cabal&#45;&gt;Cabal&#45;syntax -->
+<g id="edge1" class="edge">
+<title>Cabal&#45;&gt;Cabal&#45;syntax</title>
+<path fill="none" stroke="black" d="M798.93,-966.79C757.76,-1017.07 633.51,-1168.78 583.04,-1230.41"/>
+<polygon fill="black" stroke="black" points="580.46,-1228.03 576.83,-1237.99 585.87,-1232.47 580.46,-1228.03"/>
+</g>
+<!-- Win32 -->
+<g id="node12" class="node">
+<title>Win32</title>
+<ellipse fill="none" stroke="black" cx="460.36" cy="-1616.93" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="460.36" y="-1611.51" font-family="Times New Roman,serif" font-size="14.00">Win32</text>
+</g>
+<!-- Cabal&#45;&gt;Win32 -->
+<g id="edge2" class="edge">
+<title>Cabal&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M803.2,-967.8C755.21,-1058.65 534.32,-1476.91 475.04,-1589.15"/>
+<polygon fill="black" stroke="black" points="471.95,-1587.5 470.37,-1597.98 478.14,-1590.77 471.95,-1587.5"/>
+</g>
+<!-- Cabal&#45;&gt;bytestring -->
+<g id="edge3" class="edge">
+<title>Cabal&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M799.45,-933.64C786.78,-917.38 767.3,-892.36 752.46,-873.31"/>
+<polygon fill="black" stroke="black" points="755.22,-871.17 746.32,-865.43 749.7,-875.47 755.22,-871.17"/>
+</g>
+<!-- Cabal&#45;&gt;containers -->
+<g id="edge4" class="edge">
+<title>Cabal&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M815.53,-932.2C820.07,-905.68 828.58,-855.99 834.01,-824.27"/>
+<polygon fill="black" stroke="black" points="837.43,-825.02 835.66,-814.58 830.53,-823.84 837.43,-825.02"/>
+</g>
+<!-- deepseq -->
+<g id="node15" class="node">
+<title>deepseq</title>
+<ellipse fill="none" stroke="black" cx="1557.53" cy="-1251.11" rx="41.58" ry="18"/>
+<text text-anchor="middle" x="1557.53" y="-1245.68" font-family="Times New Roman,serif" font-size="14.00">deepseq</text>
+</g>
+<!-- Cabal&#45;&gt;deepseq -->
+<g id="edge5" class="edge">
+<title>Cabal&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M838.95,-961.02C950.39,-1006 1381.21,-1179.93 1516.58,-1234.58"/>
+<polygon fill="black" stroke="black" points="1514.93,-1237.68 1525.52,-1238.18 1517.55,-1231.19 1514.93,-1237.68"/>
+</g>
+<!-- directory -->
+<g id="node16" class="node">
+<title>directory</title>
+<ellipse fill="none" stroke="black" cx="96.09" cy="-1576.32" rx="44.08" ry="18"/>
+<text text-anchor="middle" x="96.09" y="-1570.9" font-family="Times New Roman,serif" font-size="14.00">directory</text>
+</g>
+<!-- Cabal&#45;&gt;directory -->
+<g id="edge6" class="edge">
+<title>Cabal&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M794.73,-965.79C698.76,-1049.65 241.07,-1449.63 123.61,-1552.27"/>
+<polygon fill="black" stroke="black" points="121.5,-1549.47 116.28,-1558.68 126.11,-1554.74 121.5,-1549.47"/>
+</g>
+<!-- filepath -->
+<g id="node17" class="node">
+<title>filepath</title>
+<ellipse fill="none" stroke="black" cx="894.52" cy="-1294.14" rx="37.59" ry="18"/>
+<text text-anchor="middle" x="894.52" y="-1288.72" font-family="Times New Roman,serif" font-size="14.00">filepath</text>
+</g>
+<!-- Cabal&#45;&gt;filepath -->
+<g id="edge7" class="edge">
+<title>Cabal&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M816.73,-968.31C830.11,-1024.35 871.09,-1196.03 887.56,-1265.01"/>
+<polygon fill="black" stroke="black" points="884.09,-1265.52 889.81,-1274.43 890.89,-1263.89 884.09,-1265.52"/>
+</g>
+<!-- parsec -->
+<g id="node18" class="node">
+<title>parsec</title>
+<ellipse fill="none" stroke="black" cx="327.98" cy="-1250.93" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="327.98" y="-1245.51" font-family="Times New Roman,serif" font-size="14.00">parsec</text>
+</g>
+<!-- Cabal&#45;&gt;parsec -->
+<g id="edge9" class="edge">
+<title>Cabal&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M790.68,-963.81C713.48,-1011.72 452.43,-1173.71 360.41,-1230.81"/>
+<polygon fill="black" stroke="black" points="358.73,-1227.73 352.08,-1235.98 362.42,-1233.68 358.73,-1227.73"/>
+</g>
+<!-- Cabal&#45;&gt;pretty -->
+<g id="edge10" class="edge">
+<title>Cabal&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M838.78,-960.81C927.94,-996.33 1218.45,-1112.05 1321.83,-1153.24"/>
+<polygon fill="black" stroke="black" points="1320.38,-1156.43 1330.96,-1156.88 1322.97,-1149.92 1320.38,-1156.43"/>
+</g>
+<!-- process -->
+<g id="node20" class="node">
+<title>process</title>
+<ellipse fill="none" stroke="black" cx="484" cy="-1041.18" rx="40.09" ry="18"/>
+<text text-anchor="middle" x="484" y="-1035.75" font-family="Times New Roman,serif" font-size="14.00">process</text>
+</g>
+<!-- Cabal&#45;&gt;process -->
+<g id="edge11" class="edge">
+<title>Cabal&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M783.29,-958.38C725.88,-974.26 597.83,-1009.68 529.31,-1028.64"/>
+<polygon fill="black" stroke="black" points="528.61,-1025.2 519.9,-1031.24 530.47,-1031.95 528.61,-1025.2"/>
+</g>
+<!-- Cabal&#45;&gt;time -->
+<g id="edge12" class="edge">
+<title>Cabal&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M814.46,-932.24C819.88,-883.8 834.77,-750.74 841.46,-691.03"/>
+<polygon fill="black" stroke="black" points="844.92,-691.61 842.55,-681.29 837.96,-690.83 844.92,-691.61"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;mtl -->
+<g id="edge19" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M574.64,-1239.15C598.38,-1207.43 648.23,-1140.85 675.6,-1104.28"/>
+<polygon fill="black" stroke="black" points="678.27,-1106.56 681.46,-1096.45 672.67,-1102.36 678.27,-1106.56"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;bytestring -->
+<g id="edge14" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M568.91,-1238.7C595.77,-1173.96 687.01,-954.09 719.78,-875.11"/>
+<polygon fill="black" stroke="black" points="723,-876.49 723.6,-865.91 716.53,-873.81 723,-876.49"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;containers -->
+<g id="edge15" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M572.26,-1238.76C614.89,-1167.85 770.72,-908.65 822.3,-822.87"/>
+<polygon fill="black" stroke="black" points="825.26,-824.74 827.41,-814.36 819.26,-821.13 825.26,-824.74"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;deepseq -->
+<g id="edge16" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M620.7,-1256.52C799.85,-1255.48 1333.43,-1252.4 1504.28,-1251.41"/>
+<polygon fill="black" stroke="black" points="1504.21,-1254.91 1514.19,-1251.36 1504.17,-1247.91 1504.21,-1254.91"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;directory -->
+<g id="edge17" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M537.01,-1273.59C459.16,-1327.04 216.31,-1493.78 128.33,-1554.19"/>
+<polygon fill="black" stroke="black" points="126.62,-1551.12 120.35,-1559.66 130.58,-1556.89 126.62,-1551.12"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;filepath -->
+<g id="edge18" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M617.13,-1263.1C681.35,-1270.29 785.76,-1281.97 846.51,-1288.77"/>
+<polygon fill="black" stroke="black" points="845.85,-1292.22 856.18,-1289.85 846.63,-1285.26 845.85,-1292.22"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;parsec -->
+<g id="edge20" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;parsec</title>
+<path fill="none" stroke="black" d="M502.18,-1255.36C462.69,-1254.35 411.5,-1253.05 374.85,-1252.12"/>
+<polygon fill="black" stroke="black" points="375.09,-1248.63 365.01,-1251.87 374.91,-1255.63 375.09,-1248.63"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;pretty -->
+<g id="edge21" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;pretty</title>
+<path fill="none" stroke="black" d="M617.13,-1250.64C767.9,-1233.83 1181.35,-1187.74 1315.87,-1172.74"/>
+<polygon fill="black" stroke="black" points="1315.85,-1176.26 1325.4,-1171.68 1315.08,-1169.31 1315.85,-1176.26"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;time -->
+<g id="edge23" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M570.01,-1238.71C610.6,-1153.42 782.49,-792.23 831.62,-689"/>
+<polygon fill="black" stroke="black" points="834.7,-690.67 835.84,-680.13 828.38,-687.66 834.7,-690.67"/>
+</g>
+<!-- binary -->
+<g id="node22" class="node">
+<title>binary</title>
+<ellipse fill="none" stroke="black" cx="636.04" cy="-932.57" rx="33.6" ry="18"/>
+<text text-anchor="middle" x="636.04" y="-927.14" font-family="Times New Roman,serif" font-size="14.00">binary</text>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;binary -->
+<g id="edge13" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M565.6,-1238.5C577.97,-1184.76 614.18,-1027.51 629.29,-961.88"/>
+<polygon fill="black" stroke="black" points="632.69,-962.74 631.52,-952.21 625.86,-961.17 632.69,-962.74"/>
+</g>
+<!-- Cabal&#45;syntax&#45;&gt;text -->
+<g id="edge22" class="edge">
+<title>Cabal&#45;syntax&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M575.73,-1239.2C635.85,-1165.23 867.55,-880.16 937.82,-793.72"/>
+<polygon fill="black" stroke="black" points="940.48,-796 944.07,-786.03 935.04,-791.58 940.48,-796"/>
+</g>
+<!-- Win32&#45;&gt;filepath -->
+<g id="edge31" class="edge">
+<title>Win32&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M480.72,-1601.8C550.71,-1549.76 781.67,-1378.04 864.57,-1316.41"/>
+<polygon fill="black" stroke="black" points="866.55,-1319.3 872.48,-1310.52 862.37,-1313.68 866.55,-1319.3"/>
+</g>
+<!-- os&#45;string -->
+<g id="node28" class="node">
+<title>os&#45;string</title>
+<ellipse fill="none" stroke="black" cx="989.77" cy="-1544.53" rx="43.08" ry="18"/>
+<text text-anchor="middle" x="989.77" y="-1539.1" font-family="Times New Roman,serif" font-size="14.00">os&#45;string</text>
+</g>
+<!-- Win32&#45;&gt;os&#45;string -->
+<g id="edge32" class="edge">
+<title>Win32&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M494.69,-1612.24C584.89,-1599.9 829.06,-1566.51 937.11,-1551.73"/>
+<polygon fill="black" stroke="black" points="937.43,-1555.22 946.86,-1550.4 936.48,-1548.28 937.43,-1555.22"/>
+</g>
+<!-- bytestring&#45;&gt;ghc&#45;prim -->
+<g id="edge68" class="edge">
+<title>bytestring&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M763.3,-860.36C815.98,-883.31 921.73,-929.37 981.4,-955.36"/>
+<polygon fill="black" stroke="black" points="979.68,-958.42 990.24,-959.21 982.47,-952 979.68,-958.42"/>
+</g>
+<!-- bytestring&#45;&gt;template&#45;haskell -->
+<g id="edge69" class="edge">
+<title>bytestring&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M741.02,-864.59C762.19,-905.19 813.73,-1004.04 839.21,-1052.92"/>
+<polygon fill="black" stroke="black" points="835.95,-1054.24 843.67,-1061.49 842.16,-1051.01 835.95,-1054.24"/>
+</g>
+<!-- bytestring&#45;&gt;deepseq -->
+<g id="edge67" class="edge">
+<title>bytestring&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M761.02,-860.96C886.63,-922.49 1378.31,-1163.32 1519.46,-1232.46"/>
+<polygon fill="black" stroke="black" points="1517.88,-1235.58 1528.4,-1236.84 1520.96,-1229.3 1517.88,-1235.58"/>
+</g>
+<!-- containers&#45;&gt;template&#45;haskell -->
+<g id="edge81" class="edge">
+<title>containers&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M839.96,-813.42C842.48,-861.68 849.33,-992.53 852.42,-1051.6"/>
+<polygon fill="black" stroke="black" points="848.92,-1051.74 852.94,-1061.55 855.91,-1051.38 848.92,-1051.74"/>
+</g>
+<!-- containers&#45;&gt;deepseq -->
+<g id="edge80" class="edge">
+<title>containers&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M863.73,-810.79C971.5,-879.18 1400.2,-1151.26 1523.94,-1229.79"/>
+<polygon fill="black" stroke="black" points="1522.04,-1232.73 1532.36,-1235.13 1525.79,-1226.82 1522.04,-1232.73"/>
+</g>
+<!-- deepseq&#45;&gt;ghc&#45;prim -->
+<g id="edge96" class="edge">
+<title>deepseq&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1530.39,-1237C1443.92,-1192.06 1174.41,-1052 1068.41,-996.91"/>
+<polygon fill="black" stroke="black" points="1070.21,-993.9 1059.72,-992.39 1066.98,-1000.11 1070.21,-993.9"/>
+</g>
+<!-- directory&#45;&gt;Win32 -->
+<g id="edge97" class="edge">
+<title>directory&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M138.95,-1581.1C208.07,-1588.8 343.58,-1603.91 414.55,-1611.82"/>
+<polygon fill="black" stroke="black" points="413.95,-1615.28 424.28,-1612.91 414.72,-1608.32 413.95,-1615.28"/>
+</g>
+<!-- directory&#45;&gt;filepath -->
+<g id="edge98" class="edge">
+<title>directory&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M129.89,-1564.38C257.91,-1519.13 712.87,-1358.34 853.08,-1308.79"/>
+<polygon fill="black" stroke="black" points="854.07,-1312.15 862.34,-1305.52 851.74,-1305.55 854.07,-1312.15"/>
+</g>
+<!-- directory&#45;&gt;time -->
+<g id="edge100" class="edge">
+<title>directory&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M110.38,-1558.86C202.77,-1445.94 715.4,-819.47 824.4,-686.25"/>
+<polygon fill="black" stroke="black" points="826.96,-688.65 830.58,-678.69 821.54,-684.22 826.96,-688.65"/>
+</g>
+<!-- directory&#45;&gt;os&#45;string -->
+<g id="edge99" class="edge">
+<title>directory&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M140.41,-1574.74C289.43,-1569.44 772.17,-1552.27 935.32,-1546.46"/>
+<polygon fill="black" stroke="black" points="935.12,-1549.97 944.99,-1546.12 934.87,-1542.98 935.12,-1549.97"/>
+</g>
+<!-- filepath&#45;&gt;template&#45;haskell -->
+<g id="edge110" class="edge">
+<title>filepath&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M891.06,-1275.99C884.06,-1239.24 868.16,-1155.72 859.63,-1110.93"/>
+<polygon fill="black" stroke="black" points="863.07,-1110.31 857.76,-1101.14 856.19,-1111.62 863.07,-1110.31"/>
+</g>
+<!-- filepath&#45;&gt;bytestring -->
+<g id="edge107" class="edge">
+<title>filepath&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M887.93,-1276.04C862.78,-1206.93 772.67,-959.35 741.96,-874.97"/>
+<polygon fill="black" stroke="black" points="745.34,-874.02 738.63,-865.82 738.77,-876.42 745.34,-874.02"/>
+</g>
+<!-- filepath&#45;&gt;deepseq -->
+<g id="edge108" class="edge">
+<title>filepath&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M932.06,-1291.71C1044.01,-1284.44 1375.73,-1262.91 1505.06,-1254.51"/>
+<polygon fill="black" stroke="black" points="1504.94,-1258.03 1514.7,-1253.89 1504.49,-1251.04 1504.94,-1258.03"/>
+</g>
+<!-- filepath&#45;&gt;os&#45;string -->
+<g id="edge109" class="edge">
+<title>filepath&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M901.37,-1312.15C917.7,-1355.08 959.05,-1463.77 978.86,-1515.85"/>
+<polygon fill="black" stroke="black" points="975.49,-1516.83 982.32,-1524.93 982.04,-1514.34 975.49,-1516.83"/>
+</g>
+<!-- parsec&#45;&gt;mtl -->
+<g id="edge156" class="edge">
+<title>parsec&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M354.35,-1238.56C419.94,-1207.78 590.32,-1127.83 662.04,-1094.18"/>
+<polygon fill="black" stroke="black" points="663.34,-1097.43 670.9,-1090.02 660.36,-1091.1 663.34,-1097.43"/>
+</g>
+<!-- parsec&#45;&gt;bytestring -->
+<g id="edge155" class="edge">
+<title>parsec&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M344.3,-1234.58C406.79,-1171.98 631.08,-947.3 706.6,-871.64"/>
+<polygon fill="black" stroke="black" points="709,-874.19 713.58,-864.64 704.04,-869.25 709,-874.19"/>
+</g>
+<!-- parsec&#45;&gt;text -->
+<g id="edge157" class="edge">
+<title>parsec&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M347.88,-1235.71C439.98,-1165.22 824.9,-870.67 930.97,-789.51"/>
+<polygon fill="black" stroke="black" points="933.05,-792.32 938.87,-783.46 928.8,-786.76 933.05,-792.32"/>
+</g>
+<!-- pretty&#45;&gt;ghc&#45;prim -->
+<g id="edge159" class="edge">
+<title>pretty&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1336.1,-1154.8C1280.59,-1122.61 1137.31,-1039.5 1066.22,-998.26"/>
+<polygon fill="black" stroke="black" points="1068.4,-995.48 1058,-993.49 1064.89,-1001.54 1068.4,-995.48"/>
+</g>
+<!-- pretty&#45;&gt;deepseq -->
+<g id="edge158" class="edge">
+<title>pretty&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1384.76,-1178.83C1418.33,-1192.87 1477.14,-1217.47 1516.7,-1234.03"/>
+<polygon fill="black" stroke="black" points="1515.34,-1237.25 1525.92,-1237.88 1518.04,-1230.79 1515.34,-1237.25"/>
+</g>
+<!-- process&#45;&gt;Win32 -->
+<g id="edge166" class="edge">
+<title>process&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M483.25,-1059.36C479.86,-1142.11 465.84,-1483.53 461.59,-1587.05"/>
+<polygon fill="black" stroke="black" points="458.1,-1586.81 461.19,-1596.94 465.09,-1587.1 458.1,-1586.81"/>
+</g>
+<!-- process&#45;&gt;deepseq -->
+<g id="edge167" class="edge">
+<title>process&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M521.26,-1048.46C682.96,-1080.08 1323.9,-1205.42 1507.9,-1241.4"/>
+<polygon fill="black" stroke="black" points="1507.13,-1244.82 1517.61,-1243.3 1508.47,-1237.95 1507.13,-1244.82"/>
+</g>
+<!-- process&#45;&gt;directory -->
+<g id="edge168" class="edge">
+<title>process&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M471.31,-1058.68C414.63,-1136.88 184.3,-1454.63 115.55,-1549.47"/>
+<polygon fill="black" stroke="black" points="112.8,-1547.31 109.77,-1557.46 118.47,-1551.41 112.8,-1547.31"/>
+</g>
+<!-- process&#45;&gt;filepath -->
+<g id="edge169" class="edge">
+<title>process&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M507.84,-1055.87C577.59,-1098.85 781.32,-1224.39 861.52,-1273.81"/>
+<polygon fill="black" stroke="black" points="859.48,-1276.66 869.83,-1278.93 863.15,-1270.7 859.48,-1276.66"/>
+</g>
+<!-- time&#45;&gt;Win32 -->
+<g id="edge208" class="edge">
+<title>time&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M837.62,-679.16C790.93,-795.2 530.19,-1443.35 471.92,-1588.21"/>
+<polygon fill="black" stroke="black" points="468.69,-1586.87 468.2,-1597.45 475.18,-1589.48 468.69,-1586.87"/>
+</g>
+<!-- time&#45;&gt;deepseq -->
+<g id="edge209" class="edge">
+<title>time&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M862.05,-675.63C956.53,-753.8 1411,-1129.86 1529.32,-1227.76"/>
+<polygon fill="black" stroke="black" points="1526.77,-1230.19 1536.7,-1233.87 1531.23,-1224.8 1526.77,-1230.19"/>
+</g>
+<!-- binary&#45;&gt;bytestring -->
+<g id="edge61" class="edge">
+<title>binary&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M653.57,-916.79C667.89,-903.91 688.37,-885.49 704.76,-870.74"/>
+<polygon fill="black" stroke="black" points="706.68,-873.72 711.77,-864.43 702,-868.52 706.68,-873.72"/>
+</g>
+<!-- binary&#45;&gt;containers -->
+<g id="edge62" class="edge">
+<title>binary&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M657,-918.37C692.33,-894.44 764,-845.89 806.09,-817.38"/>
+<polygon fill="black" stroke="black" points="807.79,-820.46 814.11,-811.95 803.86,-814.66 807.79,-820.46"/>
+</g>
+<!-- text&#45;&gt;ghc&#45;prim -->
+<g id="edge199" class="edge">
+<title>text&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M963.95,-786.61C975.49,-822.14 1001.42,-901.9 1015.47,-945.13"/>
+<polygon fill="black" stroke="black" points="1012.13,-946.18 1018.55,-954.6 1018.79,-944.01 1012.13,-946.18"/>
+</g>
+<!-- text&#45;&gt;template&#45;haskell -->
+<g id="edge200" class="edge">
+<title>text&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M952.23,-786.42C935.06,-837.96 884.94,-988.33 863.68,-1052.1"/>
+<polygon fill="black" stroke="black" points="860.39,-1050.93 860.54,-1061.52 867.03,-1053.14 860.39,-1050.93"/>
+</g>
+<!-- text&#45;&gt;bytestring -->
+<g id="edge197" class="edge">
+<title>text&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M933.89,-777.05C896.81,-789.8 825.32,-814.37 778.04,-830.62"/>
+<polygon fill="black" stroke="black" points="776.92,-827.3 768.6,-833.86 779.19,-833.92 776.92,-827.3"/>
+</g>
+<!-- text&#45;&gt;deepseq -->
+<g id="edge198" class="edge">
+<title>text&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M975.75,-782.9C1060.12,-850.8 1423.21,-1143.01 1528.69,-1227.9"/>
+<polygon fill="black" stroke="black" points="1526.36,-1230.51 1536.34,-1234.06 1530.75,-1225.06 1526.36,-1230.51"/>
+</g>
+<!-- text&#45;&gt;binary -->
+<g id="edge196" class="edge">
+<title>text&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M936.25,-779.86C881.28,-807.82 737.06,-881.18 670.55,-915.01"/>
+<polygon fill="black" stroke="black" points="669.24,-911.75 661.92,-919.4 672.42,-917.99 669.24,-911.75"/>
+</g>
+<!-- RSA -->
+<g id="node24" class="node">
+<title>RSA</title>
+<ellipse fill="none" stroke="black" cx="323.59" cy="-903.05" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="323.59" y="-897.63" font-family="Times New Roman,serif" font-size="14.00">RSA</text>
+</g>
+<!-- RSA&#45;&gt;bytestring -->
+<g id="edge26" class="edge">
+<title>RSA&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M352.28,-899.08C419.38,-889.79 587.52,-866.52 675.69,-854.31"/>
+<polygon fill="black" stroke="black" points="676.14,-857.78 685.56,-852.94 675.18,-850.85 676.14,-857.78"/>
+</g>
+<!-- RSA&#45;&gt;binary -->
+<g id="edge25" class="edge">
+<title>RSA&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M352.7,-905.8C407.58,-910.99 526.64,-922.23 591.59,-928.37"/>
+<polygon fill="black" stroke="black" points="590.88,-931.82 601.17,-929.27 591.54,-924.85 590.88,-931.82"/>
+</g>
+<!-- SHA -->
+<g id="node25" class="node">
+<title>SHA</title>
+<ellipse fill="none" stroke="black" cx="503.51" cy="-813.61" rx="29.11" ry="18"/>
+<text text-anchor="middle" x="503.51" y="-808.19" font-family="Times New Roman,serif" font-size="14.00">SHA</text>
+</g>
+<!-- RSA&#45;&gt;SHA -->
+<g id="edge24" class="edge">
+<title>RSA&#45;&gt;SHA</title>
+<path fill="none" stroke="black" d="M346.74,-891.54C378.18,-875.91 434.57,-847.88 470.46,-830.04"/>
+<polygon fill="black" stroke="black" points="471.69,-833.34 479.09,-825.75 468.58,-827.07 471.69,-833.34"/>
+</g>
+<!-- crypto&#45;api -->
+<g id="node26" class="node">
+<title>crypto&#45;api</title>
+<ellipse fill="none" stroke="black" cx="49.07" cy="-750.9" rx="49.07" ry="18"/>
+<text text-anchor="middle" x="49.07" y="-745.47" font-family="Times New Roman,serif" font-size="14.00">crypto&#45;api</text>
+</g>
+<!-- RSA&#45;&gt;crypto&#45;api -->
+<g id="edge27" class="edge">
+<title>RSA&#45;&gt;crypto&#45;api</title>
+<path fill="none" stroke="black" d="M301.59,-890.86C254.66,-864.85 144.29,-803.67 86.24,-771.5"/>
+<polygon fill="black" stroke="black" points="88.14,-768.55 77.7,-766.77 84.75,-774.68 88.14,-768.55"/>
+</g>
+<!-- crypto&#45;pubkey&#45;types -->
+<g id="node27" class="node">
+<title>crypto&#45;pubkey&#45;types</title>
+<ellipse fill="none" stroke="black" cx="1417.9" cy="-36.02" rx="88.49" ry="18"/>
+<text text-anchor="middle" x="1417.9" y="-30.6" font-family="Times New Roman,serif" font-size="14.00">crypto&#45;pubkey&#45;types</text>
+</g>
+<!-- RSA&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge28" class="edge">
+<title>RSA&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M341.67,-888.73C468.49,-788.24 1224.3,-189.41 1387.04,-60.47"/>
+<polygon fill="black" stroke="black" points="1388.77,-63.57 1394.44,-54.61 1384.43,-58.08 1388.77,-63.57"/>
+</g>
+<!-- SHA&#45;&gt;bytestring -->
+<g id="edge30" class="edge">
+<title>SHA&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M531.94,-817.72C567.83,-822.9 630.39,-831.94 675.94,-838.52"/>
+<polygon fill="black" stroke="black" points="675.23,-841.96 685.63,-839.92 676.23,-835.03 675.23,-841.96"/>
+</g>
+<!-- SHA&#45;&gt;binary -->
+<g id="edge29" class="edge">
+<title>SHA&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M520.29,-828.68C542.95,-849.01 583.53,-885.43 610.12,-909.3"/>
+<polygon fill="black" stroke="black" points="607.64,-911.78 617.42,-915.86 612.32,-906.57 607.64,-911.78"/>
+</g>
+<!-- crypto&#45;api&#45;&gt;bytestring -->
+<g id="edge82" class="edge">
+<title>crypto&#45;api&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M95.45,-757.4C216.9,-774.42 543.95,-820.26 675.6,-838.71"/>
+<polygon fill="black" stroke="black" points="675.08,-842.18 685.47,-840.1 676.05,-835.24 675.08,-842.18"/>
+</g>
+<!-- cereal -->
+<g id="node48" class="node">
+<title>cereal</title>
+<ellipse fill="none" stroke="black" cx="1209.41" cy="-1263.01" rx="32.1" ry="18"/>
+<text text-anchor="middle" x="1209.41" y="-1257.58" font-family="Times New Roman,serif" font-size="14.00">cereal</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;cereal -->
+<g id="edge83" class="edge">
+<title>crypto&#45;api&#45;&gt;cereal</title>
+<path fill="none" stroke="black" d="M81.01,-764.99C245.93,-837.78 1000.06,-1170.61 1173.69,-1247.24"/>
+<polygon fill="black" stroke="black" points="1172.1,-1250.37 1182.66,-1251.2 1174.93,-1243.96 1172.1,-1250.37"/>
+</g>
+<!-- entropy -->
+<g id="node49" class="node">
+<title>entropy</title>
+<ellipse fill="none" stroke="black" cx="52.57" cy="-1108.75" rx="39.09" ry="18"/>
+<text text-anchor="middle" x="52.57" y="-1103.32" font-family="Times New Roman,serif" font-size="14.00">entropy</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;entropy -->
+<g id="edge84" class="edge">
+<title>crypto&#45;api&#45;&gt;entropy</title>
+<path fill="none" stroke="black" d="M49.25,-769.13C49.81,-827.16 51.58,-1007.89 52.28,-1079.3"/>
+<polygon fill="black" stroke="black" points="48.78,-1079.07 52.38,-1089.04 55.78,-1079 48.78,-1079.07"/>
+</g>
+<!-- tagged -->
+<g id="node50" class="node">
+<title>tagged</title>
+<ellipse fill="none" stroke="black" cx="743.16" cy="-1276.2" rx="35.1" ry="18"/>
+<text text-anchor="middle" x="743.16" y="-1270.77" font-family="Times New Roman,serif" font-size="14.00">tagged</text>
+</g>
+<!-- crypto&#45;api&#45;&gt;tagged -->
+<g id="edge85" class="edge">
+<title>crypto&#45;api&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M70.99,-767.49C172.74,-844.5 598.97,-1167.08 714.29,-1254.35"/>
+<polygon fill="black" stroke="black" points="711.97,-1256.98 722.05,-1260.23 716.19,-1251.4 711.97,-1256.98"/>
+</g>
+<!-- asn1&#45;encoding -->
+<g id="node30" class="node">
+<title>asn1&#45;encoding</title>
+<ellipse fill="none" stroke="black" cx="298.46" cy="-597.67" rx="64.54" ry="18"/>
+<text text-anchor="middle" x="298.46" y="-592.24" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;encoding</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;encoding -->
+<g id="edge86" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M1384.09,-52.99C1221.48,-134.57 520.28,-486.37 340.56,-576.54"/>
+<polygon fill="black" stroke="black" points="339.17,-573.32 331.8,-580.94 342.31,-579.58 339.17,-573.32"/>
+</g>
+<!-- asn1&#45;types -->
+<g id="node31" class="node">
+<title>asn1&#45;types</title>
+<ellipse fill="none" stroke="black" cx="506.57" cy="-631.64" rx="50.56" ry="18"/>
+<text text-anchor="middle" x="506.57" y="-626.21" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;types</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;types -->
+<g id="edge87" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M1391.12,-53.53C1260.06,-139.18 686.73,-513.89 540.57,-609.41"/>
+<polygon fill="black" stroke="black" points="538.91,-606.32 532.45,-614.72 542.74,-612.18 538.91,-606.32"/>
+</g>
+<!-- os&#45;string&#45;&gt;template&#45;haskell -->
+<g id="edge154" class="edge">
+<title>os&#45;string&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M984.45,-1526.37C963.7,-1455.59 888.16,-1197.87 862.54,-1110.47"/>
+<polygon fill="black" stroke="black" points="865.93,-1109.59 859.76,-1100.98 859.21,-1111.56 865.93,-1109.59"/>
+</g>
+<!-- os&#45;string&#45;&gt;bytestring -->
+<g id="edge152" class="edge">
+<title>os&#45;string&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M983.13,-1526.57C948.19,-1432.1 785.6,-992.51 742.27,-875.33"/>
+<polygon fill="black" stroke="black" points="745.62,-874.31 738.87,-866.14 739.05,-876.74 745.62,-874.31"/>
+</g>
+<!-- os&#45;string&#45;&gt;deepseq -->
+<g id="edge153" class="edge">
+<title>os&#45;string&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1017.16,-1530.37C1110.19,-1482.29 1414.23,-1325.16 1520.48,-1270.25"/>
+<polygon fill="black" stroke="black" points="1521.8,-1273.51 1529.08,-1265.81 1518.58,-1267.29 1521.8,-1273.51"/>
+</g>
+<!-- ansi&#45;terminal -->
+<g id="node29" class="node">
+<title>ansi&#45;terminal</title>
+<ellipse fill="none" stroke="black" cx="858.47" cy="-18" rx="57.05" ry="18"/>
+<text text-anchor="middle" x="858.47" y="-12.57" font-family="Times New Roman,serif" font-size="14.00">ansi&#45;terminal</text>
+</g>
+<!-- ansi&#45;terminal&#45;&gt;ansi&#45;terminal&#45;types -->
+<g id="edge33" class="edge">
+<title>ansi&#45;terminal&#45;&gt;ansi&#45;terminal&#45;types</title>
+<path fill="none" stroke="black" d="M801.35,-19.38C679.87,-22.31 394.96,-29.2 248.06,-32.74"/>
+<polygon fill="black" stroke="black" points="248.29,-29.24 238.37,-32.98 248.46,-36.24 248.29,-29.24"/>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;bytestring -->
+<g id="edge35" class="edge">
+<title>asn1&#45;encoding&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M327.21,-614.19C403.49,-658.02 610.87,-777.18 695.21,-825.64"/>
+<polygon fill="black" stroke="black" points="693.38,-828.63 703.8,-830.57 696.87,-822.56 693.38,-828.63"/>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;asn1&#45;types -->
+<g id="edge34" class="edge">
+<title>asn1&#45;encoding&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M354.77,-606.86C383.89,-611.61 419.38,-617.4 448.71,-622.19"/>
+<polygon fill="black" stroke="black" points="448.12,-625.64 458.55,-623.8 449.24,-618.73 448.12,-625.64"/>
+</g>
+<!-- hourglass -->
+<g id="node32" class="node">
+<title>hourglass</title>
+<ellipse fill="none" stroke="black" cx="1888.64" cy="-1117.33" rx="46.07" ry="18"/>
+<text text-anchor="middle" x="1888.64" y="-1111.9" font-family="Times New Roman,serif" font-size="14.00">hourglass</text>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;hourglass -->
+<g id="edge36" class="edge">
+<title>asn1&#45;encoding&#45;&gt;hourglass</title>
+<path fill="none" stroke="black" d="M340.99,-611.57C565.14,-684.82 1607.82,-1025.56 1841.9,-1102.06"/>
+<polygon fill="black" stroke="black" points="1840.72,-1105.35 1851.31,-1105.13 1842.89,-1098.7 1840.72,-1105.35"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;bytestring -->
+<g id="edge37" class="edge">
+<title>asn1&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M524.6,-648.86C564.29,-686.76 659.32,-777.51 705.52,-821.63"/>
+<polygon fill="black" stroke="black" points="703.07,-824.14 712.72,-828.51 707.91,-819.07 703.07,-824.14"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;hourglass -->
+<g id="edge38" class="edge">
+<title>asn1&#45;types&#45;&gt;hourglass</title>
+<path fill="none" stroke="black" d="M543.18,-644.5C735.78,-712.19 1630.86,-1026.74 1843.32,-1101.4"/>
+<polygon fill="black" stroke="black" points="1842.03,-1104.66 1852.63,-1104.68 1844.35,-1098.06 1842.03,-1104.66"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;memory -->
+<g id="edge39" class="edge">
+<title>asn1&#45;types&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M547.63,-620.8C624.21,-600.59 788.3,-557.27 868.82,-536.02"/>
+<polygon fill="black" stroke="black" points="869.38,-539.49 878.15,-533.56 867.59,-532.72 869.38,-539.49"/>
+</g>
+<!-- hourglass&#45;&gt;Win32 -->
+<g id="edge124" class="edge">
+<title>hourglass&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1853.68,-1129.56C1658.88,-1197.7 708.44,-1530.16 500.58,-1602.86"/>
+<polygon fill="black" stroke="black" points="499.58,-1599.51 491.3,-1606.11 501.89,-1606.11 499.58,-1599.51"/>
+</g>
+<!-- hourglass&#45;&gt;deepseq -->
+<g id="edge125" class="edge">
+<title>hourglass&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1856.28,-1130.4C1795.71,-1154.88 1665.28,-1207.57 1598.6,-1234.51"/>
+<polygon fill="black" stroke="black" points="1597.44,-1231.2 1589.48,-1238.2 1600.07,-1237.69 1597.44,-1231.2"/>
+</g>
+<!-- memory&#45;&gt;ghc&#45;prim -->
+<g id="edge143" class="edge">
+<title>memory&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M919.77,-541.96C936.64,-611.31 996.94,-859.16 1017.8,-944.89"/>
+<polygon fill="black" stroke="black" points="1014.35,-945.52 1020.12,-954.41 1021.15,-943.87 1014.35,-945.52"/>
+</g>
+<!-- memory&#45;&gt;bytestring -->
+<g id="edge141" class="edge">
+<title>memory&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M905.2,-541.56C874.77,-595.02 784.09,-754.37 747.35,-818.94"/>
+<polygon fill="black" stroke="black" points="744.39,-817.07 742.48,-827.49 750.47,-820.53 744.39,-817.07"/>
+</g>
+<!-- memory&#45;&gt;deepseq -->
+<g id="edge142" class="edge">
+<title>memory&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M930.27,-540.65C1014.79,-636.38 1433.11,-1110.19 1535.08,-1225.69"/>
+<polygon fill="black" stroke="black" points="1532.16,-1227.65 1541.4,-1232.83 1537.4,-1223.02 1532.16,-1227.65"/>
+</g>
+<!-- basement -->
+<g id="node44" class="node">
+<title>basement</title>
+<ellipse fill="none" stroke="black" cx="1301.53" cy="-1430.54" rx="45.57" ry="18"/>
+<text text-anchor="middle" x="1301.53" y="-1425.12" font-family="Times New Roman,serif" font-size="14.00">basement</text>
+</g>
+<!-- memory&#45;&gt;basement -->
+<g id="edge140" class="edge">
+<title>memory&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M923.05,-541.85C971.18,-654.87 1230.13,-1262.89 1289.43,-1402.13"/>
+<polygon fill="black" stroke="black" points="1286.07,-1403.17 1293.21,-1411 1292.51,-1400.42 1286.07,-1403.17"/>
+</g>
+<!-- attoparsec&#45;&gt;ghc&#45;prim -->
+<g id="edge43" class="edge">
+<title>attoparsec&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1082.26,-424.16C1073.7,-506.33 1038.73,-842.14 1028.06,-944.54"/>
+<polygon fill="black" stroke="black" points="1024.6,-944.03 1027.04,-954.34 1031.56,-944.75 1024.6,-944.03"/>
+</g>
+<!-- attoparsec&#45;&gt;bytestring -->
+<g id="edge40" class="edge">
+<title>attoparsec&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1070.13,-423.44C1015.62,-491.57 817.84,-738.8 752.64,-820.3"/>
+<polygon fill="black" stroke="black" points="750.16,-817.79 746.65,-827.79 755.63,-822.17 750.16,-817.79"/>
+</g>
+<!-- attoparsec&#45;&gt;containers -->
+<g id="edge41" class="edge">
+<title>attoparsec&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1072.83,-423.88C1033.62,-486.13 903.52,-692.67 856.31,-767.61"/>
+<polygon fill="black" stroke="black" points="853.39,-765.68 851.02,-776.01 859.31,-769.41 853.39,-765.68"/>
+</g>
+<!-- attoparsec&#45;&gt;deepseq -->
+<g id="edge42" class="edge">
+<title>attoparsec&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1094.27,-423.93C1154.74,-531.9 1468.51,-1092.15 1542.08,-1223.52"/>
+<polygon fill="black" stroke="black" points="1538.84,-1224.9 1546.78,-1231.91 1544.95,-1221.47 1538.84,-1224.9"/>
+</g>
+<!-- attoparsec&#45;&gt;text -->
+<g id="edge45" class="edge">
+<title>attoparsec&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1077.92,-423.88C1057.54,-482.53 992.94,-668.52 968.05,-740.18"/>
+<polygon fill="black" stroke="black" points="964.74,-739.02 964.77,-749.62 971.36,-741.32 964.74,-739.02"/>
+</g>
+<!-- scientific -->
+<g id="node35" class="node">
+<title>scientific</title>
+<ellipse fill="none" stroke="black" cx="836.97" cy="-1656.4" rx="43.58" ry="18"/>
+<text text-anchor="middle" x="836.97" y="-1650.97" font-family="Times New Roman,serif" font-size="14.00">scientific</text>
+</g>
+<!-- attoparsec&#45;&gt;scientific -->
+<g id="edge44" class="edge">
+<title>attoparsec&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M1080.58,-424.05C1053.17,-562.71 877.13,-1453.23 842.78,-1627.02"/>
+<polygon fill="black" stroke="black" points="839.4,-1626.09 840.89,-1636.57 846.27,-1627.44 839.4,-1626.09"/>
+</g>
+<!-- scientific&#45;&gt;template&#45;haskell -->
+<g id="edge184" class="edge">
+<title>scientific&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M837.52,-1637.91C839.98,-1554.68 850.04,-1214.24 853.09,-1111.03"/>
+<polygon fill="black" stroke="black" points="856.59,-1111.27 853.38,-1101.17 849.59,-1111.06 856.59,-1111.27"/>
+</g>
+<!-- scientific&#45;&gt;bytestring -->
+<g id="edge178" class="edge">
+<title>scientific&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M834.58,-1637.96C820.87,-1532.6 752.47,-1006.79 735.46,-876.04"/>
+<polygon fill="black" stroke="black" points="738.98,-875.94 734.22,-866.47 732.04,-876.84 738.98,-875.94"/>
+</g>
+<!-- scientific&#45;&gt;containers -->
+<g id="edge179" class="edge">
+<title>scientific&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M837.02,-1638.01C837.28,-1528.32 838.61,-960.5 838.93,-824.42"/>
+<polygon fill="black" stroke="black" points="842.43,-824.83 838.95,-814.82 835.43,-824.81 842.43,-824.83"/>
+</g>
+<!-- scientific&#45;&gt;deepseq -->
+<g id="edge180" class="edge">
+<title>scientific&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M863.04,-1641.73C972.62,-1580.1 1395.98,-1341.97 1521.96,-1271.11"/>
+<polygon fill="black" stroke="black" points="1523.55,-1274.23 1530.55,-1266.28 1520.12,-1268.13 1523.55,-1274.23"/>
+</g>
+<!-- scientific&#45;&gt;binary -->
+<g id="edge177" class="edge">
+<title>scientific&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M831.91,-1638.14C804.87,-1540.75 677.58,-1082.22 644.12,-961.67"/>
+<polygon fill="black" stroke="black" points="647.55,-960.93 641.5,-952.23 640.8,-962.8 647.55,-960.93"/>
+</g>
+<!-- scientific&#45;&gt;text -->
+<g id="edge185" class="edge">
+<title>scientific&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M839.45,-1638.26C854.63,-1527.04 935.12,-937.35 954.11,-798.17"/>
+<polygon fill="black" stroke="black" points="957.57,-798.71 955.46,-788.33 950.64,-797.76 957.57,-798.71"/>
+</g>
+<!-- scientific&#45;&gt;hashable -->
+<g id="edge181" class="edge">
+<title>scientific&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M845.07,-1638.63C901.23,-1515.46 1232.48,-789 1302.3,-635.88"/>
+<polygon fill="black" stroke="black" points="1305.45,-637.41 1306.41,-626.85 1299.08,-634.5 1305.45,-637.41"/>
+</g>
+<!-- integer&#45;logarithms -->
+<g id="node53" class="node">
+<title>integer&#45;logarithms</title>
+<ellipse fill="none" stroke="black" cx="1102.18" cy="-1103.7" rx="76.51" ry="18"/>
+<text text-anchor="middle" x="1102.18" y="-1098.27" font-family="Times New Roman,serif" font-size="14.00">integer&#45;logarithms</text>
+</g>
+<!-- scientific&#45;&gt;integer&#45;logarithms -->
+<g id="edge182" class="edge">
+<title>scientific&#45;&gt;integer&#45;logarithms</title>
+<path fill="none" stroke="black" d="M845.65,-1638.32C884.32,-1557.72 1041.24,-1230.7 1088.59,-1132.02"/>
+<polygon fill="black" stroke="black" points="1091.62,-1133.81 1092.79,-1123.28 1085.3,-1130.78 1091.62,-1133.81"/>
+</g>
+<!-- primitive -->
+<g id="node62" class="node">
+<title>primitive</title>
+<ellipse fill="none" stroke="black" cx="672.6" cy="-1577.28" rx="42.58" ry="18"/>
+<text text-anchor="middle" x="672.6" y="-1571.86" font-family="Times New Roman,serif" font-size="14.00">primitive</text>
+</g>
+<!-- scientific&#45;&gt;primitive -->
+<g id="edge183" class="edge">
+<title>scientific&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M808.34,-1642.62C781.44,-1629.67 740.97,-1610.19 711.22,-1595.87"/>
+<polygon fill="black" stroke="black" points="713.07,-1592.88 702.54,-1591.69 710.04,-1599.18 713.07,-1592.88"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;bytestring -->
+<g id="edge50" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M985.75,-669.28C935.22,-704.53 820.21,-784.77 763.9,-824.05"/>
+<polygon fill="black" stroke="black" points="762.18,-820.98 755.98,-829.57 766.19,-826.72 762.18,-820.98"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;time -->
+<g id="edge55" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M934.91,-656.27C916.96,-657.28 898.54,-658.32 883.07,-659.19"/>
+<polygon fill="black" stroke="black" points="883.17,-655.67 873.39,-659.73 883.57,-662.66 883.17,-655.67"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;RSA -->
+<g id="edge46" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;RSA</title>
+<path fill="none" stroke="black" d="M968.05,-667.53C842.79,-713.31 476.21,-847.27 359.63,-889.88"/>
+<polygon fill="black" stroke="black" points="358.45,-886.59 350.25,-893.31 360.85,-893.16 358.45,-886.59"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;SHA -->
+<g id="edge47" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;SHA</title>
+<path fill="none" stroke="black" d="M964.16,-666.79C864.42,-698.58 631.07,-772.95 540.43,-801.84"/>
+<polygon fill="black" stroke="black" points="539.51,-798.46 531.05,-804.83 541.64,-805.13 539.51,-798.46"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge51" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M1022.47,-633.92C1080.21,-546.61 1330,-168.92 1399.75,-63.46"/>
+<polygon fill="black" stroke="black" points="1402.49,-65.66 1405.09,-55.39 1396.66,-61.8 1402.49,-65.66"/>
+</g>
+<!-- base64&#45;bytestring -->
+<g id="node37" class="node">
+<title>base64&#45;bytestring</title>
+<ellipse fill="none" stroke="black" cx="676.3" cy="-725.96" rx="76.01" ry="18"/>
+<text text-anchor="middle" x="676.3" y="-720.53" font-family="Times New Roman,serif" font-size="14.00">base64&#45;bytestring</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;base64&#45;bytestring -->
+<g id="edge48" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;base64&#45;bytestring</title>
+<path fill="none" stroke="black" d="M953.81,-664.56C895.78,-677.4 805.59,-697.35 743.89,-711.01"/>
+<polygon fill="black" stroke="black" points="743.2,-707.57 734.19,-713.15 744.71,-714.41 743.2,-707.57"/>
+</g>
+<!-- blaze&#45;builder -->
+<g id="node38" class="node">
+<title>blaze&#45;builder</title>
+<ellipse fill="none" stroke="black" cx="1223.05" cy="-1062.26" rx="58.05" ry="18"/>
+<text text-anchor="middle" x="1223.05" y="-1056.84" font-family="Times New Roman,serif" font-size="14.00">blaze&#45;builder</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;blaze&#45;builder -->
+<g id="edge49" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;blaze&#45;builder</title>
+<path fill="none" stroke="black" d="M1019.91,-670.17C1053.51,-735.04 1167.81,-955.65 1208.51,-1034.2"/>
+<polygon fill="black" stroke="black" points="1205.35,-1035.7 1213.06,-1042.97 1211.56,-1032.48 1205.35,-1035.7"/>
+</g>
+<!-- data&#45;default -->
+<g id="node39" class="node">
+<title>data&#45;default</title>
+<ellipse fill="none" stroke="black" cx="492.45" cy="-385.82" rx="54.06" ry="18"/>
+<text text-anchor="middle" x="492.45" y="-380.39" font-family="Times New Roman,serif" font-size="14.00">data&#45;default</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;data&#45;default -->
+<g id="edge52" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;data&#45;default</title>
+<path fill="none" stroke="black" d="M978.09,-635.37C887.47,-588.8 631.62,-457.33 532.43,-406.36"/>
+<polygon fill="black" stroke="black" points="534.07,-403.27 523.58,-401.81 530.87,-409.5 534.07,-403.27"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;http&#45;types -->
+<g id="edge53" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;http&#45;types</title>
+<path fill="none" stroke="black" d="M1016.6,-670.37C1026.68,-700.71 1046.89,-761.55 1058.91,-797.72"/>
+<polygon fill="black" stroke="black" points="1055.54,-798.7 1062.02,-807.08 1062.19,-796.49 1055.54,-798.7"/>
+</g>
+<!-- random -->
+<g id="node41" class="node">
+<title>random</title>
+<ellipse fill="none" stroke="black" cx="705.92" cy="-559.77" rx="39.09" ry="18"/>
+<text text-anchor="middle" x="705.92" y="-554.34" font-family="Times New Roman,serif" font-size="14.00">random</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;random -->
+<g id="edge54" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M962.57,-637.5C904.15,-619.81 806.24,-590.15 749.74,-573.04"/>
+<polygon fill="black" stroke="black" points="751.05,-569.78 740.46,-570.23 749.02,-576.48 751.05,-569.78"/>
+</g>
+<!-- transformers&#45;compat -->
+<g id="node42" class="node">
+<title>transformers&#45;compat</title>
+<ellipse fill="none" stroke="black" cx="1503.66" cy="-1637.21" rx="88.49" ry="18"/>
+<text text-anchor="middle" x="1503.66" y="-1631.78" font-family="Times New Roman,serif" font-size="14.00">transformers&#45;compat</text>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;transformers&#45;compat -->
+<g id="edge56" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M1019.69,-670.39C1079.77,-790.4 1416.14,-1462.37 1489.52,-1608.96"/>
+<polygon fill="black" stroke="black" points="1486.24,-1610.23 1493.85,-1617.61 1492.5,-1607.1 1486.24,-1610.23"/>
+</g>
+<!-- base64&#45;bytestring&#45;&gt;bytestring -->
+<g id="edge58" class="edge">
+<title>base64&#45;bytestring&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M684.7,-744.28C693.69,-763.87 708.07,-795.21 718.54,-818.04"/>
+<polygon fill="black" stroke="black" points="715.34,-819.47 722.69,-827.1 721.71,-816.55 715.34,-819.47"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;ghc&#45;prim -->
+<g id="edge65" class="edge">
+<title>blaze&#45;builder&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1189.45,-1047.35C1156.19,-1032.58 1105.13,-1009.91 1068.72,-993.75"/>
+<polygon fill="black" stroke="black" points="1070.34,-990.64 1059.78,-989.79 1067.5,-997.04 1070.34,-990.64"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;bytestring -->
+<g id="edge63" class="edge">
+<title>blaze&#45;builder&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1188.89,-1047.27C1101.28,-1008.81 868.84,-906.79 773.41,-864.91"/>
+<polygon fill="black" stroke="black" points="774.95,-861.76 764.39,-860.95 772.14,-868.17 774.95,-861.76"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;deepseq -->
+<g id="edge64" class="edge">
+<title>blaze&#45;builder&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1251.57,-1078.36C1312.58,-1112.81 1455.61,-1193.57 1522.23,-1231.18"/>
+<polygon fill="black" stroke="black" points="1520.12,-1234 1530.55,-1235.87 1523.56,-1227.91 1520.12,-1234"/>
+</g>
+<!-- blaze&#45;builder&#45;&gt;text -->
+<g id="edge66" class="edge">
+<title>blaze&#45;builder&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1207.27,-1044.78C1162.02,-994.64 1031.72,-850.26 979.83,-792.76"/>
+<polygon fill="black" stroke="black" points="982.51,-790.51 973.21,-785.43 977.32,-795.2 982.51,-790.51"/>
+</g>
+<!-- data&#45;default&#45;&gt;containers -->
+<g id="edge95" class="edge">
+<title>data&#45;default&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M507.34,-403.4C561.99,-467.95 751.74,-692.03 816.86,-768.94"/>
+<polygon fill="black" stroke="black" points="814.05,-771.04 823.19,-776.41 819.4,-766.52 814.05,-771.04"/>
+</g>
+<!-- http&#45;types&#45;&gt;bytestring -->
+<g id="edge126" class="edge">
+<title>http&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1020.6,-829.47C959.85,-833.06 855.18,-839.26 789.88,-843.12"/>
+<polygon fill="black" stroke="black" points="789.84,-839.62 780.07,-843.7 790.26,-846.6 789.84,-839.62"/>
+</g>
+<!-- http&#45;types&#45;&gt;text -->
+<g id="edge128" class="edge">
+<title>http&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1040.09,-811.72C1024.58,-803.58 1005.35,-793.49 989.41,-785.13"/>
+<polygon fill="black" stroke="black" points="991.31,-782.18 980.83,-780.63 988.06,-788.37 991.31,-782.18"/>
+</g>
+<!-- http&#45;types&#45;&gt;case&#45;insensitive -->
+<g id="edge127" class="edge">
+<title>http&#45;types&#45;&gt;case&#45;insensitive</title>
+<path fill="none" stroke="black" d="M1085.94,-809.38C1153.57,-742.43 1398.98,-499.51 1479.97,-419.34"/>
+<polygon fill="black" stroke="black" points="1482.43,-421.83 1487.08,-412.31 1477.51,-416.85 1482.43,-421.83"/>
+</g>
+<!-- random&#45;&gt;mtl -->
+<g id="edge175" class="edge">
+<title>random&#45;&gt;mtl</title>
+<path fill="none" stroke="black" d="M705.52,-578.24C703.83,-655.59 697.33,-953.78 695.25,-1049.28"/>
+<polygon fill="black" stroke="black" points="691.75,-1049.05 695.04,-1059.13 698.75,-1049.2 691.75,-1049.05"/>
+</g>
+<!-- random&#45;&gt;bytestring -->
+<g id="edge173" class="edge">
+<title>random&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M707.57,-578.14C711.91,-626.61 723.71,-758.2 729,-817.23"/>
+<polygon fill="black" stroke="black" points="725.48,-817.19 729.86,-826.84 732.45,-816.56 725.48,-817.19"/>
+</g>
+<!-- random&#45;&gt;deepseq -->
+<g id="edge174" class="edge">
+<title>random&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M725.31,-575.51C836.77,-665.99 1395.65,-1119.69 1528.95,-1227.9"/>
+<polygon fill="black" stroke="black" points="1526.65,-1230.55 1536.62,-1234.14 1531.07,-1225.12 1526.65,-1230.55"/>
+</g>
+<!-- splitmix -->
+<g id="node64" class="node">
+<title>splitmix</title>
+<ellipse fill="none" stroke="black" cx="1875.51" cy="-1558.33" rx="39.59" ry="18"/>
+<text text-anchor="middle" x="1875.51" y="-1552.9" font-family="Times New Roman,serif" font-size="14.00">splitmix</text>
+</g>
+<!-- random&#45;&gt;splitmix -->
+<g id="edge176" class="edge">
+<title>random&#45;&gt;splitmix</title>
+<path fill="none" stroke="black" d="M724.76,-575.86C860.44,-691.7 1687.42,-1397.74 1848.37,-1535.16"/>
+<polygon fill="black" stroke="black" points="1845.75,-1537.52 1855.63,-1541.35 1850.29,-1532.2 1845.75,-1537.52"/>
+</g>
+<!-- transformers&#45;compat&#45;&gt;ghc&#45;prim -->
+<g id="edge211" class="edge">
+<title>transformers&#45;compat&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1490.61,-1619.13C1424.35,-1527.38 1125.26,-1113.22 1044.89,-1001.93"/>
+<polygon fill="black" stroke="black" points="1047.81,-999.98 1039.11,-993.93 1042.13,-1004.08 1047.81,-999.98"/>
+</g>
+<!-- base16&#45;bytestring&#45;&gt;bytestring -->
+<g id="edge57" class="edge">
+<title>base16&#45;bytestring&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1113.59,-583.25C1042.93,-631.96 842.73,-769.98 764,-824.25"/>
+<polygon fill="black" stroke="black" points="762.07,-821.33 755.83,-829.88 766.05,-827.09 762.07,-821.33"/>
+</g>
+<!-- basement&#45;&gt;ghc&#45;prim -->
+<g id="edge60" class="edge">
+<title>basement&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1290.69,-1412.66C1248.32,-1342.76 1093.68,-1087.68 1041.95,-1002.35"/>
+<polygon fill="black" stroke="black" points="1044.99,-1000.62 1036.81,-993.88 1039.01,-1004.25 1044.99,-1000.62"/>
+</g>
+<!-- basement&#45;&gt;Win32 -->
+<g id="edge59" class="edge">
+<title>basement&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1261.25,-1439.47C1120.38,-1470.69 650.51,-1574.8 504.23,-1607.21"/>
+<polygon fill="black" stroke="black" points="503.55,-1603.78 494.55,-1609.36 505.07,-1610.61 503.55,-1603.78"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;Cabal -->
+<g id="edge70" class="edge">
+<title>cabal&#45;doctest&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M1246.25,-383.67C1181.9,-467.72 908.53,-824.8 832.26,-924.41"/>
+<polygon fill="black" stroke="black" points="829.53,-922.22 826.23,-932.29 835.09,-926.47 829.53,-922.22"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;directory -->
+<g id="edge71" class="edge">
+<title>cabal&#45;doctest&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M1242.99,-383.43C1112.96,-518.68 272.49,-1392.85 119.85,-1551.61"/>
+<polygon fill="black" stroke="black" points="117.78,-1548.71 113.38,-1558.34 122.83,-1553.56 117.78,-1548.71"/>
+</g>
+<!-- cabal&#45;doctest&#45;&gt;filepath -->
+<g id="edge72" class="edge">
+<title>cabal&#45;doctest&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1252.75,-383.98C1207.55,-498.82 961.15,-1124.86 905.63,-1265.91"/>
+<polygon fill="black" stroke="black" points="902.51,-1264.28 902.1,-1274.87 909.02,-1266.85 902.51,-1264.28"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;bytestring -->
+<g id="edge73" class="edge">
+<title>case&#45;insensitive&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1477.63,-410.13C1358.47,-479.84 900.02,-748.05 767.62,-825.51"/>
+<polygon fill="black" stroke="black" points="766.12,-822.33 759.26,-830.4 769.66,-828.37 766.12,-822.33"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;deepseq -->
+<g id="edge74" class="edge">
+<title>case&#45;insensitive&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1507.21,-411.78C1513.75,-520.89 1547.59,-1085.26 1555.75,-1221.49"/>
+<polygon fill="black" stroke="black" points="1552.26,-1221.68 1556.35,-1231.46 1559.25,-1221.27 1552.26,-1221.68"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;text -->
+<g id="edge76" class="edge">
+<title>case&#45;insensitive&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1481.14,-410.57C1390.95,-472.33 1082.32,-683.68 986.65,-749.2"/>
+<polygon fill="black" stroke="black" points="984.83,-746.2 978.56,-754.74 988.79,-751.97 984.83,-746.2"/>
+</g>
+<!-- case&#45;insensitive&#45;&gt;hashable -->
+<g id="edge75" class="edge">
+<title>case&#45;insensitive&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M1490.16,-411.35C1456.29,-449.34 1377.09,-538.16 1337.94,-582.06"/>
+<polygon fill="black" stroke="black" points="1335.5,-579.54 1331.45,-589.34 1340.72,-584.2 1335.5,-579.54"/>
+</g>
+<!-- hashable&#45;&gt;ghc&#45;bignum -->
+<g id="edge120" class="edge">
+<title>hashable&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M1348.33,-619.36C1440.59,-652.23 1701.02,-745.03 1812.64,-784.8"/>
+<polygon fill="black" stroke="black" points="1811.27,-788.03 1821.86,-788.09 1813.62,-781.43 1811.27,-788.03"/>
+</g>
+<!-- hashable&#45;&gt;ghc&#45;prim -->
+<g id="edge121" class="edge">
+<title>hashable&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1301.6,-624.75C1255.26,-683.31 1103.38,-875.24 1046.62,-946.96"/>
+<polygon fill="black" stroke="black" points="1043.97,-944.67 1040.51,-954.69 1049.46,-949.02 1043.97,-944.67"/>
+</g>
+<!-- hashable&#45;&gt;bytestring -->
+<g id="edge116" class="edge">
+<title>hashable&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1284.25,-620.23C1186.98,-660.07 887.39,-782.77 774.9,-828.84"/>
+<polygon fill="black" stroke="black" points="773.63,-825.58 765.7,-832.61 776.28,-832.06 773.63,-825.58"/>
+</g>
+<!-- hashable&#45;&gt;containers -->
+<g id="edge117" class="edge">
+<title>hashable&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1283.6,-620C1200.99,-652.54 978.49,-740.16 883.25,-777.66"/>
+<polygon fill="black" stroke="black" points="882.25,-774.3 874.22,-781.22 884.81,-780.81 882.25,-774.3"/>
+</g>
+<!-- hashable&#45;&gt;deepseq -->
+<g id="edge118" class="edge">
+<title>hashable&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1322.07,-625.78C1355.92,-715.67 1505.12,-1111.92 1546.72,-1222.41"/>
+<polygon fill="black" stroke="black" points="1543.39,-1223.5 1550.19,-1231.63 1549.95,-1221.03 1543.39,-1223.5"/>
+</g>
+<!-- hashable&#45;&gt;filepath -->
+<g id="edge119" class="edge">
+<title>hashable&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M1304.39,-625.21C1247.27,-718.44 980.83,-1153.28 911.2,-1266.91"/>
+<polygon fill="black" stroke="black" points="908.3,-1264.95 906.06,-1275.31 914.27,-1268.61 908.3,-1264.95"/>
+</g>
+<!-- hashable&#45;&gt;text -->
+<g id="edge123" class="edge">
+<title>hashable&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1285.69,-620.88C1219.55,-650.73 1059.9,-722.79 990.86,-753.95"/>
+<polygon fill="black" stroke="black" points="989.64,-750.66 981.96,-757.97 992.52,-757.04 989.64,-750.66"/>
+</g>
+<!-- hashable&#45;&gt;os&#45;string -->
+<g id="edge122" class="edge">
+<title>hashable&#45;&gt;os&#45;string</title>
+<path fill="none" stroke="black" d="M1308.86,-625.85C1268.6,-741.76 1049.12,-1373.66 999.67,-1516.03"/>
+<polygon fill="black" stroke="black" points="996.51,-1514.47 996.53,-1525.07 1003.12,-1516.77 996.51,-1514.47"/>
+</g>
+<!-- cereal&#45;&gt;ghc&#45;prim -->
+<g id="edge79" class="edge">
+<title>cereal&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1198.42,-1245.81C1167.63,-1197.62 1080.29,-1060.92 1042.61,-1001.96"/>
+<polygon fill="black" stroke="black" points="1045.74,-1000.36 1037.41,-993.81 1039.85,-1004.12 1045.74,-1000.36"/>
+</g>
+<!-- cereal&#45;&gt;bytestring -->
+<g id="edge77" class="edge">
+<title>cereal&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1191.84,-1247.69C1119.89,-1184.99 847.46,-947.53 759.32,-870.71"/>
+<polygon fill="black" stroke="black" points="761.89,-868.3 752.05,-864.37 757.29,-873.58 761.89,-868.3"/>
+</g>
+<!-- cereal&#45;&gt;containers -->
+<g id="edge78" class="edge">
+<title>cereal&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1196.22,-1246.35C1140.95,-1176.52 927.58,-906.99 859.8,-821.36"/>
+<polygon fill="black" stroke="black" points="862.7,-819.38 853.74,-813.71 857.21,-823.73 862.7,-819.38"/>
+</g>
+<!-- entropy&#45;&gt;Cabal -->
+<g id="edge101" class="edge">
+<title>entropy&#45;&gt;Cabal</title>
+<path fill="none" stroke="black" d="M88.71,-1101.21C215.1,-1074.86 636.87,-986.92 771.06,-958.94"/>
+<polygon fill="black" stroke="black" points="771.49,-962.43 780.56,-956.96 770.06,-955.57 771.49,-962.43"/>
+</g>
+<!-- entropy&#45;&gt;Win32 -->
+<g id="edge102" class="edge">
+<title>entropy&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M66.37,-1125.95C126.71,-1201.14 367.48,-1501.18 439.75,-1591.24"/>
+<polygon fill="black" stroke="black" points="436.84,-1593.21 445.83,-1598.81 442.3,-1588.83 436.84,-1593.21"/>
+</g>
+<!-- entropy&#45;&gt;bytestring -->
+<g id="edge103" class="edge">
+<title>entropy&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M83.07,-1096.98C191.65,-1055.05 559.73,-912.93 687.5,-863.6"/>
+<polygon fill="black" stroke="black" points="688.57,-866.94 696.64,-860.08 686.05,-860.41 688.57,-866.94"/>
+</g>
+<!-- entropy&#45;&gt;directory -->
+<g id="edge104" class="edge">
+<title>entropy&#45;&gt;directory</title>
+<path fill="none" stroke="black" d="M54.28,-1127.08C60.92,-1198.44 85.09,-1458.08 93.32,-1546.55"/>
+<polygon fill="black" stroke="black" points="89.82,-1546.72 94.24,-1556.36 96.79,-1546.08 89.82,-1546.72"/>
+</g>
+<!-- entropy&#45;&gt;filepath -->
+<g id="edge105" class="edge">
+<title>entropy&#45;&gt;filepath</title>
+<path fill="none" stroke="black" d="M88.21,-1116.6C222.74,-1146.22 699.6,-1251.22 849.25,-1284.17"/>
+<polygon fill="black" stroke="black" points="848.27,-1287.54 858.79,-1286.27 849.77,-1280.71 848.27,-1287.54"/>
+</g>
+<!-- entropy&#45;&gt;process -->
+<g id="edge106" class="edge">
+<title>entropy&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M90.1,-1102.87C167.99,-1090.67 347.19,-1062.6 434.45,-1048.94"/>
+<polygon fill="black" stroke="black" points="434.8,-1052.43 444.13,-1047.42 433.71,-1045.51 434.8,-1052.43"/>
+</g>
+<!-- tagged&#45;&gt;template&#45;haskell -->
+<g id="edge188" class="edge">
+<title>tagged&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M753.19,-1258.55C772.45,-1224.67 814.76,-1150.23 837.97,-1109.4"/>
+<polygon fill="black" stroke="black" points="840.92,-1111.29 842.82,-1100.87 834.83,-1107.84 840.92,-1111.29"/>
+</g>
+<!-- tagged&#45;&gt;deepseq -->
+<g id="edge187" class="edge">
+<title>tagged&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M778.67,-1275.1C907.42,-1271.14 1350.13,-1257.5 1504.18,-1252.75"/>
+<polygon fill="black" stroke="black" points="1504.22,-1256.25 1514.11,-1252.44 1504,-1249.25 1504.22,-1256.25"/>
+</g>
+<!-- crypton&#45;&gt;ghc&#45;prim -->
+<g id="edge92" class="edge">
+<title>crypton&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1139.56,-731.55C1118.58,-776 1064,-891.62 1038.48,-945.68"/>
+<polygon fill="black" stroke="black" points="1035.39,-944.03 1034.29,-954.57 1041.72,-947.02 1035.39,-944.03"/>
+</g>
+<!-- crypton&#45;&gt;Win32 -->
+<g id="edge88" class="edge">
+<title>crypton&#45;&gt;Win32</title>
+<path fill="none" stroke="black" d="M1134.9,-730.87C1050.31,-841.99 582.22,-1456.86 480.06,-1591.06"/>
+<polygon fill="black" stroke="black" points="477.54,-1588.6 474.26,-1598.67 483.11,-1592.84 477.54,-1588.6"/>
+</g>
+<!-- crypton&#45;&gt;bytestring -->
+<g id="edge90" class="edge">
+<title>crypton&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1115.35,-724.06C1042.14,-747.44 864.69,-804.09 779.21,-831.38"/>
+<polygon fill="black" stroke="black" points="778.17,-828.03 769.71,-834.41 780.3,-834.7 778.17,-828.03"/>
+</g>
+<!-- crypton&#45;&gt;deepseq -->
+<g id="edge91" class="edge">
+<title>crypton&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1161.18,-730.91C1220.74,-809.08 1465.26,-1130 1537.4,-1224.69"/>
+<polygon fill="black" stroke="black" points="1534.45,-1226.59 1543.29,-1232.42 1540.02,-1222.35 1534.45,-1226.59"/>
+</g>
+<!-- crypton&#45;&gt;memory -->
+<g id="edge94" class="edge">
+<title>crypton&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M1128.58,-697.77C1087.54,-664.27 991.87,-586.2 943.87,-547.03"/>
+<polygon fill="black" stroke="black" points="946.35,-544.53 936.39,-540.92 941.92,-549.95 946.35,-544.53"/>
+</g>
+<!-- crypton&#45;&gt;basement -->
+<g id="edge89" class="edge">
+<title>crypton&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M1151.89,-731.71C1172.51,-827.98 1269.39,-1280.41 1295.2,-1400.97"/>
+<polygon fill="black" stroke="black" points="1291.77,-1401.66 1297.29,-1410.71 1298.61,-1400.2 1291.77,-1401.66"/>
+</g>
+<!-- integer&#45;gmp -->
+<g id="node52" class="node">
+<title>integer&#45;gmp</title>
+<ellipse fill="none" stroke="black" cx="1167.72" cy="-1675.45" rx="54.56" ry="18"/>
+<text text-anchor="middle" x="1167.72" y="-1670.03" font-family="Times New Roman,serif" font-size="14.00">integer&#45;gmp</text>
+</g>
+<!-- crypton&#45;&gt;integer&#45;gmp -->
+<g id="edge93" class="edge">
+<title>crypton&#45;&gt;integer&#45;gmp</title>
+<path fill="none" stroke="black" d="M1148.4,-731.99C1150.81,-849.83 1164.12,-1499.79 1167.12,-1646.17"/>
+<polygon fill="black" stroke="black" points="1163.61,-1645.86 1167.32,-1655.78 1170.61,-1645.71 1163.61,-1645.86"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;bignum -->
+<g id="edge129" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M1181.95,-1657.64C1269.69,-1547.82 1736.72,-963.21 1842.97,-830.21"/>
+<polygon fill="black" stroke="black" points="1845.54,-832.61 1849.04,-822.61 1840.07,-828.24 1845.54,-832.61"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;internal -->
+<g id="edge130" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;internal</title>
+<path fill="none" stroke="black" d="M1177.53,-1657.36C1229.24,-1561.93 1470.22,-1117.2 1533.64,-1000.16"/>
+<polygon fill="black" stroke="black" points="1536.64,-1001.97 1538.33,-991.51 1530.49,-998.63 1536.64,-1001.97"/>
+</g>
+<!-- integer&#45;gmp&#45;&gt;ghc&#45;prim -->
+<g id="edge131" class="edge">
+<title>integer&#45;gmp&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1163.98,-1657.06C1144.52,-1561.5 1054.93,-1121.52 1030.91,-1003.52"/>
+<polygon fill="black" stroke="black" points="1034.39,-1003.11 1028.97,-994.01 1027.54,-1004.51 1034.39,-1003.11"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;ghc&#45;bignum -->
+<g id="edge132" class="edge">
+<title>integer&#45;logarithms&#45;&gt;ghc&#45;bignum</title>
+<path fill="none" stroke="black" d="M1142.09,-1087.97C1269.88,-1037.61 1668.95,-880.34 1812.44,-823.79"/>
+<polygon fill="black" stroke="black" points="1813.7,-827.06 1821.72,-820.13 1811.13,-820.54 1813.7,-827.06"/>
+</g>
+<!-- integer&#45;logarithms&#45;&gt;ghc&#45;prim -->
+<g id="edge133" class="edge">
+<title>integer&#45;logarithms&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1091.28,-1085.43C1078.35,-1063.77 1056.64,-1027.4 1041.6,-1002.21"/>
+<polygon fill="black" stroke="black" points="1044.71,-1000.59 1036.58,-993.8 1038.7,-1004.18 1044.71,-1000.59"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;bytestring -->
+<g id="edge134" class="edge">
+<title>lens&#45;aeson&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1114.54,-915.26C1035.35,-901.05 871.39,-871.64 786,-856.32"/>
+<polygon fill="black" stroke="black" points="786.69,-852.89 776.22,-854.57 785.45,-859.78 786.69,-852.89"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;text -->
+<g id="edge136" class="edge">
+<title>lens&#45;aeson&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1137.97,-906.78C1100.96,-878.37 1025.41,-820.37 985.01,-789.36"/>
+<polygon fill="black" stroke="black" points="987.28,-786.69 977.22,-783.37 983.02,-792.24 987.28,-786.69"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;scientific -->
+<g id="edge135" class="edge">
+<title>lens&#45;aeson&#45;&gt;scientific</title>
+<path fill="none" stroke="black" d="M1151.55,-941.45C1108.37,-1039.58 902.52,-1507.42 849.47,-1628"/>
+<polygon fill="black" stroke="black" points="846.39,-1626.31 845.57,-1636.87 852.8,-1629.13 846.39,-1626.31"/>
+</g>
+<!-- text&#45;short -->
+<g id="node55" class="node">
+<title>text&#45;short</title>
+<ellipse fill="none" stroke="black" cx="974.26" cy="-1115.25" rx="46.07" ry="18"/>
+<text text-anchor="middle" x="974.26" y="-1109.82" font-family="Times New Roman,serif" font-size="14.00">text&#45;short</text>
+</g>
+<!-- lens&#45;aeson&#45;&gt;text&#45;short -->
+<g id="edge137" class="edge">
+<title>lens&#45;aeson&#45;&gt;text&#45;short</title>
+<path fill="none" stroke="black" d="M1142.76,-940.7C1109.82,-974.81 1036.6,-1050.67 998.44,-1090.2"/>
+<polygon fill="black" stroke="black" points="996.33,-1087.34 991.9,-1096.97 1001.37,-1092.2 996.33,-1087.34"/>
+</g>
+<!-- lens&#45;aeson&#45;&gt;unordered&#45;containers -->
+<g id="edge138" class="edge">
+<title>lens&#45;aeson&#45;&gt;unordered&#45;containers</title>
+<path fill="none" stroke="black" d="M1173.18,-905.55C1189.43,-884.38 1216.74,-848.82 1235.58,-824.28"/>
+<polygon fill="black" stroke="black" points="1238.11,-826.73 1241.43,-816.66 1232.56,-822.46 1238.11,-826.73"/>
+</g>
+<!-- vector -->
+<g id="node57" class="node">
+<title>vector</title>
+<ellipse fill="none" stroke="black" cx="1838.79" cy="-73" rx="34.1" ry="18"/>
+<text text-anchor="middle" x="1838.79" y="-67.58" font-family="Times New Roman,serif" font-size="14.00">vector</text>
+</g>
+<!-- lens&#45;aeson&#45;&gt;vector -->
+<g id="edge139" class="edge">
+<title>lens&#45;aeson&#45;&gt;vector</title>
+<path fill="none" stroke="black" d="M1173.4,-905.95C1259.03,-798.76 1715.28,-227.61 1818.17,-98.82"/>
+<polygon fill="black" stroke="black" points="1820.77,-101.18 1824.28,-91.18 1815.3,-96.81 1820.77,-101.18"/>
+</g>
+<!-- text&#45;short&#45;&gt;ghc&#45;prim -->
+<g id="edge204" class="edge">
+<title>text&#45;short&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M980.78,-1097.11C989.34,-1073.33 1004.45,-1031.33 1014.59,-1003.16"/>
+<polygon fill="black" stroke="black" points="1017.86,-1004.41 1017.95,-993.82 1011.27,-1002.04 1017.86,-1004.41"/>
+</g>
+<!-- text&#45;short&#45;&gt;template&#45;haskell -->
+<g id="edge206" class="edge">
+<title>text&#45;short&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M936.53,-1104.58C930.44,-1102.86 923.99,-1101.04 917.49,-1099.2"/>
+<polygon fill="black" stroke="black" points="918.58,-1095.87 908.01,-1096.52 916.68,-1102.61 918.58,-1095.87"/>
+</g>
+<!-- text&#45;short&#45;&gt;bytestring -->
+<g id="edge202" class="edge">
+<title>text&#45;short&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M958.71,-1098.03C917.3,-1052.17 804.12,-926.85 754.95,-872.4"/>
+<polygon fill="black" stroke="black" points="757.67,-870.19 748.37,-865.11 752.48,-874.88 757.67,-870.19"/>
+</g>
+<!-- text&#45;short&#45;&gt;deepseq -->
+<g id="edge203" class="edge">
+<title>text&#45;short&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1014.35,-1124.59C1118.48,-1148.84 1397.24,-1213.77 1509.6,-1239.94"/>
+<polygon fill="black" stroke="black" points="1508.57,-1243.3 1519.1,-1242.16 1510.16,-1236.48 1508.57,-1243.3"/>
+</g>
+<!-- text&#45;short&#45;&gt;binary -->
+<g id="edge201" class="edge">
+<title>text&#45;short&#45;&gt;binary</title>
+<path fill="none" stroke="black" d="M946.86,-1100.45C885.51,-1067.31 737.19,-987.2 670.06,-950.94"/>
+<polygon fill="black" stroke="black" points="671.8,-947.91 661.34,-946.23 668.48,-954.07 671.8,-947.91"/>
+</g>
+<!-- text&#45;short&#45;&gt;text -->
+<g id="edge207" class="edge">
+<title>text&#45;short&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M973.41,-1097.1C970.79,-1040.75 962.77,-868.32 959.52,-798.52"/>
+<polygon fill="black" stroke="black" points="963.02,-798.44 959.06,-788.62 956.03,-798.77 963.02,-798.44"/>
+</g>
+<!-- text&#45;short&#45;&gt;hashable -->
+<g id="edge205" class="edge">
+<title>text&#45;short&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M986.19,-1097.48C1037.03,-1021.78 1235.72,-725.92 1297.07,-634.57"/>
+<polygon fill="black" stroke="black" points="1299.86,-636.69 1302.53,-626.44 1294.05,-632.79 1299.86,-636.69"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;template&#45;haskell -->
+<g id="edge214" class="edge">
+<title>unordered&#45;containers&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M1231.08,-815.12C1161.99,-863.88 969.21,-999.92 889.33,-1056.29"/>
+<polygon fill="black" stroke="black" points="887.56,-1053.26 881.4,-1061.88 891.59,-1058.98 887.56,-1053.26"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;deepseq -->
+<g id="edge212" class="edge">
+<title>unordered&#45;containers&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1268.24,-815.43C1314.83,-885.6 1483.93,-1140.26 1539.61,-1224.12"/>
+<polygon fill="black" stroke="black" points="1536.54,-1225.82 1544.99,-1232.22 1542.37,-1221.95 1536.54,-1225.82"/>
+</g>
+<!-- unordered&#45;containers&#45;&gt;hashable -->
+<g id="edge213" class="edge">
+<title>unordered&#45;containers&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M1261.9,-779.17C1272.16,-746.14 1293.91,-676.12 1306.22,-636.48"/>
+<polygon fill="black" stroke="black" points="1309.5,-637.73 1309.12,-627.14 1302.82,-635.65 1309.5,-637.73"/>
+</g>
+<!-- vector&#45;&gt;deepseq -->
+<g id="edge215" class="edge">
+<title>vector&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1834.49,-91.04C1802.68,-224.27 1604.28,-1055.27 1564.48,-1222"/>
+<polygon fill="black" stroke="black" points="1561.11,-1221.03 1562.19,-1231.57 1567.92,-1222.65 1561.11,-1221.03"/>
+</g>
+<!-- vector&#45;&gt;random -->
+<g id="edge217" class="edge">
+<title>vector&#45;&gt;random</title>
+<path fill="none" stroke="black" d="M1811.91,-84.56C1661.51,-149.18 924.81,-465.72 745.38,-542.81"/>
+<polygon fill="black" stroke="black" points="744.05,-539.58 736.24,-546.74 746.81,-546.01 744.05,-539.58"/>
+</g>
+<!-- vector&#45;&gt;primitive -->
+<g id="edge216" class="edge">
+<title>vector&#45;&gt;primitive</title>
+<path fill="none" stroke="black" d="M1825.7,-89.9C1708.25,-241.39 837.18,-1364.99 692.84,-1551.18"/>
+<polygon fill="black" stroke="black" points="690.26,-1548.79 686.9,-1558.83 695.79,-1553.08 690.26,-1548.79"/>
+</g>
+<!-- tasty -->
+<g id="node65" class="node">
+<title>tasty</title>
+<ellipse fill="none" stroke="black" cx="570.74" cy="-47.69" rx="28.11" ry="18"/>
+<text text-anchor="middle" x="570.74" y="-42.26" font-family="Times New Roman,serif" font-size="14.00">tasty</text>
+</g>
+<!-- vector&#45;&gt;tasty -->
+<g id="edge218" class="edge">
+<title>vector&#45;&gt;tasty</title>
+<path fill="none" stroke="black" d="M1804.55,-72.32C1626,-68.76 802.66,-52.32 610.78,-48.49"/>
+<polygon fill="black" stroke="black" points="610.9,-44.99 600.84,-48.29 610.76,-51.99 610.9,-44.99"/>
+</g>
+<!-- vector&#45;stream -->
+<g id="node67" class="node">
+<title>vector&#45;stream</title>
+<ellipse fill="none" stroke="black" cx="1056" cy="-1307.01" rx="61.54" ry="18"/>
+<text text-anchor="middle" x="1056" y="-1301.58" font-family="Times New Roman,serif" font-size="14.00">vector&#45;stream</text>
+</g>
+<!-- vector&#45;&gt;vector&#45;stream -->
+<g id="edge219" class="edge">
+<title>vector&#45;&gt;vector&#45;stream</title>
+<path fill="none" stroke="black" d="M1827.73,-90.45C1741.72,-226.03 1180.64,-1110.53 1073.62,-1279.23"/>
+<polygon fill="black" stroke="black" points="1070.71,-1277.28 1068.31,-1287.59 1076.63,-1281.02 1070.71,-1277.28"/>
+</g>
+<!-- mime&#45;types&#45;&gt;bytestring -->
+<g id="edge144" class="edge">
+<title>mime&#45;types&#45;&gt;bytestring</title>
+<path fill="none" stroke="black" d="M1503.48,-662.6C1363.78,-695.9 931.89,-798.83 782.83,-834.36"/>
+<polygon fill="black" stroke="black" points="782.16,-830.92 773.24,-836.65 783.78,-837.73 782.16,-830.92"/>
+</g>
+<!-- mime&#45;types&#45;&gt;containers -->
+<g id="edge145" class="edge">
+<title>mime&#45;types&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M1501.15,-661.46C1375.18,-686.88 1027.81,-756.98 893.24,-784.14"/>
+<polygon fill="black" stroke="black" points="892.62,-780.7 883.51,-786.1 894.01,-787.56 892.62,-780.7"/>
+</g>
+<!-- mime&#45;types&#45;&gt;text -->
+<g id="edge146" class="edge">
+<title>mime&#45;types&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1500.89,-661.32C1387.35,-683.79 1098.81,-740.88 995.58,-761.31"/>
+<polygon fill="black" stroke="black" points="995.1,-757.84 985.97,-763.21 996.46,-764.71 995.1,-757.84"/>
+</g>
+<!-- optparse&#45;applicative -->
+<g id="node59" class="node">
+<title>optparse&#45;applicative</title>
+<ellipse fill="none" stroke="black" cx="744.51" cy="-358.69" rx="85.49" ry="18"/>
+<text text-anchor="middle" x="744.51" y="-353.27" font-family="Times New Roman,serif" font-size="14.00">optparse&#45;applicative</text>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;process -->
+<g id="edge149" class="edge">
+<title>optparse&#45;applicative&#45;&gt;process</title>
+<path fill="none" stroke="black" d="M737.55,-376.95C701.79,-470.61 538.94,-897.25 494.97,-1012.44"/>
+<polygon fill="black" stroke="black" points="491.7,-1011.18 491.41,-1021.77 498.24,-1013.67 491.7,-1011.18"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;text -->
+<g id="edge150" class="edge">
+<title>optparse&#45;applicative&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M753.97,-376.84C787.9,-441.97 903.67,-664.18 944.08,-741.75"/>
+<polygon fill="black" stroke="black" points="940.84,-743.11 948.56,-750.36 947.05,-739.87 940.84,-743.11"/>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;transformers&#45;compat -->
+<g id="edge151" class="edge">
+<title>optparse&#45;applicative&#45;&gt;transformers&#45;compat</title>
+<path fill="none" stroke="black" d="M755.25,-376.77C838.74,-517.38 1383.94,-1435.58 1486.9,-1608.98"/>
+<polygon fill="black" stroke="black" points="1483.89,-1610.77 1492,-1617.58 1489.91,-1607.19 1483.89,-1610.77"/>
+</g>
+<!-- prettyprinter -->
+<g id="node60" class="node">
+<title>prettyprinter</title>
+<ellipse fill="none" stroke="black" cx="943.9" cy="-317.39" rx="56.05" ry="18"/>
+<text text-anchor="middle" x="943.9" y="-311.97" font-family="Times New Roman,serif" font-size="14.00">prettyprinter</text>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;prettyprinter -->
+<g id="edge147" class="edge">
+<title>optparse&#45;applicative&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M806.23,-345.91C831.43,-340.69 860.42,-334.68 885.28,-329.53"/>
+<polygon fill="black" stroke="black" points="885.82,-333 894.91,-327.54 884.4,-326.14 885.82,-333"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal -->
+<g id="node61" class="node">
+<title>prettyprinter&#45;ansi&#45;terminal</title>
+<ellipse fill="none" stroke="black" cx="1123.92" cy="-42.84" rx="105.45" ry="18"/>
+<text text-anchor="middle" x="1123.92" y="-37.41" font-family="Times New Roman,serif" font-size="14.00">prettyprinter&#45;ansi&#45;terminal</text>
+</g>
+<!-- optparse&#45;applicative&#45;&gt;prettyprinter&#45;ansi&#45;terminal -->
+<g id="edge148" class="edge">
+<title>optparse&#45;applicative&#45;&gt;prettyprinter&#45;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M766,-340.81C830.02,-287.51 1019.64,-129.65 1093.75,-67.95"/>
+<polygon fill="black" stroke="black" points="1095.59,-70.97 1101.04,-61.89 1091.12,-65.59 1095.59,-70.97"/>
+</g>
+<!-- prettyprinter&#45;&gt;text -->
+<g id="edge160" class="edge">
+<title>prettyprinter&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M944.47,-335.64C946.66,-405.03 954.48,-652.85 957.19,-738.97"/>
+<polygon fill="black" stroke="black" points="953.69,-738.85 957.5,-748.73 960.68,-738.63 953.69,-738.85"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;text -->
+<g id="edge163" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;text</title>
+<path fill="none" stroke="black" d="M1119.74,-61.14C1097.43,-158.81 992.41,-618.64 964.8,-739.54"/>
+<polygon fill="black" stroke="black" points="961.45,-738.46 962.64,-748.99 968.28,-740.02 961.45,-738.46"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;ansi&#45;terminal -->
+<g id="edge161" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M1030.71,-34.11C995.85,-30.85 956.99,-27.22 925.01,-24.23"/>
+<polygon fill="black" stroke="black" points="925.35,-20.74 915.07,-23.3 924.7,-27.71 925.35,-20.74"/>
+</g>
+<!-- prettyprinter&#45;ansi&#45;terminal&#45;&gt;prettyprinter -->
+<g id="edge162" class="edge">
+<title>prettyprinter&#45;ansi&#45;terminal&#45;&gt;prettyprinter</title>
+<path fill="none" stroke="black" d="M1112.11,-60.85C1081.34,-107.78 998.55,-234.04 961.84,-290.02"/>
+<polygon fill="black" stroke="black" points="959.14,-287.76 956.58,-298.04 964.99,-291.6 959.14,-287.76"/>
+</g>
+<!-- primitive&#45;&gt;template&#45;haskell -->
+<g id="edge165" class="edge">
+<title>primitive&#45;&gt;template&#45;haskell</title>
+<path fill="none" stroke="black" d="M679.27,-1559.04C706.54,-1484.45 809.72,-1202.27 843.32,-1110.37"/>
+<polygon fill="black" stroke="black" points="846.57,-1111.67 846.72,-1101.07 840,-1109.26 846.57,-1111.67"/>
+</g>
+<!-- primitive&#45;&gt;deepseq -->
+<g id="edge164" class="edge">
+<title>primitive&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M705.14,-1565.29C840.96,-1515.23 1362.53,-1322.98 1515.27,-1266.68"/>
+<polygon fill="black" stroke="black" points="1516.03,-1270.13 1524.2,-1263.39 1513.61,-1263.56 1516.03,-1270.13"/>
+</g>
+<!-- psqueues&#45;&gt;ghc&#45;prim -->
+<g id="edge171" class="edge">
+<title>psqueues&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1400.91,-816.94C1328.77,-847.14 1151.98,-921.15 1069.15,-955.83"/>
+<polygon fill="black" stroke="black" points="1067.84,-952.58 1059.97,-959.67 1070.55,-959.04 1067.84,-952.58"/>
+</g>
+<!-- psqueues&#45;&gt;deepseq -->
+<g id="edge170" class="edge">
+<title>psqueues&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1437.68,-822.07C1457.03,-891.32 1525.65,-1136.98 1549.38,-1221.94"/>
+<polygon fill="black" stroke="black" points="1545.95,-1222.68 1552.02,-1231.37 1552.7,-1220.8 1545.95,-1222.68"/>
+</g>
+<!-- psqueues&#45;&gt;hashable -->
+<g id="edge172" class="edge">
+<title>psqueues&#45;&gt;hashable</title>
+<path fill="none" stroke="black" d="M1421.93,-785.94C1401.43,-751.67 1356.28,-676.2 1331.79,-635.26"/>
+<polygon fill="black" stroke="black" points="1334.81,-633.49 1326.67,-626.7 1328.8,-637.08 1334.81,-633.49"/>
+</g>
+<!-- splitmix&#45;&gt;deepseq -->
+<g id="edge186" class="edge">
+<title>splitmix&#45;&gt;deepseq</title>
+<path fill="none" stroke="black" d="M1858.41,-1541.81C1805.68,-1490.86 1645.36,-1335.97 1582.86,-1275.58"/>
+<polygon fill="black" stroke="black" points="1585.42,-1273.19 1575.8,-1268.76 1580.56,-1278.22 1585.42,-1273.19"/>
+</g>
+<!-- tasty&#45;&gt;stm -->
+<g id="edge192" class="edge">
+<title>tasty&#45;&gt;stm</title>
+<path fill="none" stroke="black" d="M551.57,-61.08C476.17,-113.74 199.78,-306.8 110.08,-369.45"/>
+<polygon fill="black" stroke="black" points="108.23,-366.47 102.04,-375.07 112.24,-372.21 108.23,-366.47"/>
+</g>
+<!-- tasty&#45;&gt;containers -->
+<g id="edge190" class="edge">
+<title>tasty&#45;&gt;containers</title>
+<path fill="none" stroke="black" d="M577.1,-65.43C612.42,-163.83 784.29,-642.67 828.58,-766.04"/>
+<polygon fill="black" stroke="black" points="825.27,-767.2 831.94,-775.43 831.86,-764.83 825.27,-767.2"/>
+</g>
+<!-- tasty&#45;&gt;ansi&#45;terminal -->
+<g id="edge189" class="edge">
+<title>tasty&#45;&gt;ansi&#45;terminal</title>
+<path fill="none" stroke="black" d="M598.85,-44.79C643.44,-40.19 731.6,-31.09 792.74,-24.78"/>
+<polygon fill="black" stroke="black" points="792.73,-28.3 802.32,-23.79 792.01,-21.34 792.73,-28.3"/>
+</g>
+<!-- tasty&#45;&gt;tagged -->
+<g id="edge193" class="edge">
+<title>tasty&#45;&gt;tagged</title>
+<path fill="none" stroke="black" d="M573.31,-66.01C592.62,-203.59 714.82,-1074.29 739,-1246.59"/>
+<polygon fill="black" stroke="black" points="735.5,-1246.86 740.36,-1256.27 742.44,-1245.88 735.5,-1246.86"/>
+</g>
+<!-- tasty&#45;&gt;optparse&#45;applicative -->
+<g id="edge191" class="edge">
+<title>tasty&#45;&gt;optparse&#45;applicative</title>
+<path fill="none" stroke="black" d="M580.33,-64.85C608.9,-116 693.68,-267.72 728.9,-330.75"/>
+<polygon fill="black" stroke="black" points="725.63,-332.08 733.57,-339.1 731.74,-328.66 725.63,-332.08"/>
+</g>
+<!-- time&#45;locale&#45;compat&#45;&gt;time -->
+<g id="edge210" class="edge">
+<title>time&#45;locale&#45;compat&#45;&gt;time</title>
+<path fill="none" stroke="black" d="M1302.3,-941.29C1216.9,-889.03 961.7,-732.88 874.43,-679.48"/>
+<polygon fill="black" stroke="black" points="876.52,-676.66 866.16,-674.42 872.87,-682.63 876.52,-676.66"/>
+</g>
+<!-- vector&#45;stream&#45;&gt;ghc&#45;prim -->
+<g id="edge220" class="edge">
+<title>vector&#45;stream&#45;&gt;ghc&#45;prim</title>
+<path fill="none" stroke="black" d="M1054.29,-1288.65C1049.18,-1233.89 1034.01,-1071.37 1027.73,-1004.05"/>
+<polygon fill="black" stroke="black" points="1031.22,-1003.77 1026.81,-994.14 1024.25,-1004.42 1031.22,-1003.77"/>
+</g>
+</g>
+</svg>
diff --git a/doc/img/dot_command/wreq-example7.svg b/doc/img/dot_command/wreq-example7.svg
new file mode 100644
index 0000000000..d78d538314
--- /dev/null
+++ b/doc/img/dot_command/wreq-example7.svg
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 14.1.2 (20260124.0452)
+ -->
+<!-- Title: deps Pages: 1 -->
+<svg width="1083pt" height="908pt"
+ viewBox="0.00 0.00 1083.00 908.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 904)">
+<title>deps</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-904 1079,-904 1079,4 -4,4"/>
+<!-- wreq -->
+<g id="node1" class="node">
+<title>wreq</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="784" cy="-810" rx="29.34" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="784" y="-804.95" font-family="Times New Roman,serif" font-size="14.00">wreq</text>
+</g>
+<!-- memory -->
+<g id="node9" class="node">
+<title>memory</title>
+<ellipse fill="none" stroke="black" cx="560" cy="-90" rx="42.65" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="560" y="-84.95" font-family="Times New Roman,serif" font-size="14.00">memory</text>
+</g>
+<!-- wreq&#45;&gt;memory -->
+<g id="edge54" class="edge">
+<title>wreq&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M813.5,-808.09C887.48,-804.08 1075,-782.52 1075,-667 1075,-667 1075,-667 1075,-233 1075,-172.5 1027.24,-168.68 972,-144 908.97,-115.83 709.76,-100.15 613.33,-94.04"/>
+<polygon fill="black" stroke="black" points="613.8,-90.56 603.6,-93.43 613.37,-97.55 613.8,-90.56"/>
+</g>
+<!-- authenticate&#45;oauth -->
+<g id="node10" class="node">
+<title>authenticate&#45;oauth</title>
+<ellipse fill="none" stroke="black" cx="797" cy="-450" rx="78.99" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="797" y="-444.95" font-family="Times New Roman,serif" font-size="14.00">authenticate&#45;oauth</text>
+</g>
+<!-- wreq&#45;&gt;authenticate&#45;oauth -->
+<g id="edge51" class="edge">
+<title>wreq&#45;&gt;authenticate&#45;oauth</title>
+<path fill="none" stroke="black" d="M812.11,-804.08C870.39,-792.08 999,-755.57 999,-667 999,-667 999,-667 999,-593 999,-524.5 920.29,-486.18 861.13,-467.06"/>
+<polygon fill="black" stroke="black" points="862.37,-463.78 851.78,-464.16 860.3,-470.47 862.37,-463.78"/>
+</g>
+<!-- crypton -->
+<g id="node11" class="node">
+<title>crypton</title>
+<ellipse fill="none" stroke="black" cx="106" cy="-306" rx="39.07" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="106" y="-300.95" font-family="Times New Roman,serif" font-size="14.00">crypton</text>
+</g>
+<!-- wreq&#45;&gt;crypton -->
+<g id="edge52" class="edge">
+<title>wreq&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M754.7,-806.86C612.37,-796.1 0,-745.24 0,-667 0,-667 0,-667 0,-449 0,-397.9 44.63,-353.33 75.97,-328.33"/>
+<polygon fill="black" stroke="black" points="77.83,-331.31 83.61,-322.43 73.55,-325.77 77.83,-331.31"/>
+</g>
+<!-- http&#45;client&#45;tls -->
+<g id="node19" class="node">
+<title>http&#45;client&#45;tls</title>
+<ellipse fill="none" stroke="black" cx="512" cy="-738" rx="60.56" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="512" y="-732.95" font-family="Times New Roman,serif" font-size="14.00">http&#45;client&#45;tls</text>
+</g>
+<!-- wreq&#45;&gt;http&#45;client&#45;tls -->
+<g id="edge53" class="edge">
+<title>wreq&#45;&gt;http&#45;client&#45;tls</title>
+<path fill="none" stroke="black" d="M757.42,-802.16C713.6,-790.88 625.26,-768.15 567.39,-753.25"/>
+<polygon fill="black" stroke="black" points="568.62,-749.96 558.07,-750.86 566.88,-756.74 568.62,-749.96"/>
+</g>
+<!-- wreq&#45;examples -->
+<g id="node2" class="node">
+<title>wreq&#45;examples</title>
+<ellipse fill="none" stroke="black" stroke-dasharray="5,2" cx="784" cy="-882" rx="67.73" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="784" y="-876.95" font-family="Times New Roman,serif" font-size="14.00">wreq&#45;examples</text>
+</g>
+<!-- wreq&#45;examples&#45;&gt;wreq -->
+<g id="edge55" class="edge">
+<title>wreq&#45;examples&#45;&gt;wreq</title>
+<path fill="none" stroke="black" d="M784,-863.7C784,-856.41 784,-847.73 784,-839.54"/>
+<polygon fill="black" stroke="black" points="787.5,-839.62 784,-829.62 780.5,-839.62 787.5,-839.62"/>
+</g>
+<!-- basement -->
+<g id="node3" class="node">
+<title>basement</title>
+<ellipse fill="none" stroke="black" cx="138" cy="-18" rx="46.23" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="138" y="-12.95" font-family="Times New Roman,serif" font-size="14.00">basement</text>
+</g>
+<!-- RSA -->
+<g id="node4" class="node">
+<title>RSA</title>
+<ellipse fill="none" stroke="black" cx="768" cy="-378" rx="28.83" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="768" y="-372.95" font-family="Times New Roman,serif" font-size="14.00">RSA</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types -->
+<g id="node5" class="node">
+<title>crypto&#45;pubkey&#45;types</title>
+<ellipse fill="none" stroke="black" cx="789" cy="-306" rx="87.18" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="789" y="-300.95" font-family="Times New Roman,serif" font-size="14.00">crypto&#45;pubkey&#45;types</text>
+</g>
+<!-- RSA&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge1" class="edge">
+<title>RSA&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M773.08,-360.05C775.32,-352.6 778.01,-343.64 780.53,-335.22"/>
+<polygon fill="black" stroke="black" points="783.86,-336.31 783.38,-325.73 777.16,-334.3 783.86,-336.31"/>
+</g>
+<!-- asn1&#45;encoding -->
+<g id="node6" class="node">
+<title>asn1&#45;encoding</title>
+<ellipse fill="none" stroke="black" cx="560" cy="-234" rx="64.66" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="560" y="-228.95" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;encoding</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;encoding -->
+<g id="edge8" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M741.55,-290.5C704.07,-279.04 651.79,-263.06 612.95,-251.19"/>
+<polygon fill="black" stroke="black" points="614.41,-247.97 603.82,-248.4 612.36,-254.67 614.41,-247.97"/>
+</g>
+<!-- asn1&#45;types -->
+<g id="node7" class="node">
+<title>asn1&#45;types</title>
+<ellipse fill="none" stroke="black" cx="560" cy="-162" rx="50.33" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="560" y="-156.95" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;types</text>
+</g>
+<!-- crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;types -->
+<g id="edge9" class="edge">
+<title>crypto&#45;pubkey&#45;types&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M773.21,-288.04C754.4,-268.61 721.32,-236.77 688,-216 662.93,-200.37 632.45,-187.54 607.53,-178.42"/>
+<polygon fill="black" stroke="black" points="608.88,-175.19 598.29,-175.12 606.53,-181.78 608.88,-175.19"/>
+</g>
+<!-- asn1&#45;encoding&#45;&gt;asn1&#45;types -->
+<g id="edge2" class="edge">
+<title>asn1&#45;encoding&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M560,-215.7C560,-208.41 560,-199.73 560,-191.54"/>
+<polygon fill="black" stroke="black" points="563.5,-191.62 560,-181.62 556.5,-191.62 563.5,-191.62"/>
+</g>
+<!-- asn1&#45;types&#45;&gt;memory -->
+<g id="edge5" class="edge">
+<title>asn1&#45;types&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M560,-143.7C560,-136.41 560,-127.73 560,-119.54"/>
+<polygon fill="black" stroke="black" points="563.5,-119.62 560,-109.62 556.5,-119.62 563.5,-119.62"/>
+</g>
+<!-- asn1&#45;parse -->
+<g id="node8" class="node">
+<title>asn1&#45;parse</title>
+<ellipse fill="none" stroke="black" cx="406" cy="-306" rx="50.33" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="406" y="-300.95" font-family="Times New Roman,serif" font-size="14.00">asn1&#45;parse</text>
+</g>
+<!-- asn1&#45;parse&#45;&gt;asn1&#45;encoding -->
+<g id="edge3" class="edge">
+<title>asn1&#45;parse&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M436.06,-291.34C459.06,-280.88 491.1,-266.32 516.84,-254.62"/>
+<polygon fill="black" stroke="black" points="518.05,-257.91 525.71,-250.59 515.16,-251.54 518.05,-257.91"/>
+</g>
+<!-- asn1&#45;parse&#45;&gt;asn1&#45;types -->
+<g id="edge4" class="edge">
+<title>asn1&#45;parse&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M419.18,-288.26C434.29,-269.59 460.3,-239 486,-216 498.6,-204.72 513.6,-193.61 526.79,-184.5"/>
+<polygon fill="black" stroke="black" points="528.45,-187.6 534.76,-179.09 524.52,-181.81 528.45,-187.6"/>
+</g>
+<!-- memory&#45;&gt;basement -->
+<g id="edge41" class="edge">
+<title>memory&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M520.68,-82.48C444.58,-69.85 277.12,-42.08 191.18,-27.82"/>
+<polygon fill="black" stroke="black" points="191.8,-24.38 181.36,-26.19 190.65,-31.28 191.8,-24.38"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;RSA -->
+<g id="edge6" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;RSA</title>
+<path fill="none" stroke="black" d="M789.83,-431.7C786.62,-423.95 782.77,-414.64 779.19,-406.02"/>
+<polygon fill="black" stroke="black" points="782.53,-404.92 775.47,-397.02 776.06,-407.6 782.53,-404.92"/>
+</g>
+<!-- authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types -->
+<g id="edge7" class="edge">
+<title>authenticate&#45;oauth&#45;&gt;crypto&#45;pubkey&#45;types</title>
+<path fill="none" stroke="black" d="M801.4,-431.53C805.31,-413.54 809.86,-384.7 806,-360 804.72,-351.79 802.38,-343.11 799.83,-335.21"/>
+<polygon fill="black" stroke="black" points="803.14,-334.07 796.56,-325.77 796.53,-336.36 803.14,-334.07"/>
+</g>
+<!-- crypton&#45;&gt;basement -->
+<g id="edge10" class="edge">
+<title>crypton&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M106.27,-287.62C107.11,-248.73 110.49,-151.81 124,-72 125.39,-63.8 127.46,-55.03 129.58,-47.03"/>
+<polygon fill="black" stroke="black" points="132.93,-48.04 132.26,-37.47 126.19,-46.16 132.93,-48.04"/>
+</g>
+<!-- crypton&#45;&gt;memory -->
+<g id="edge11" class="edge">
+<title>crypton&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M114.48,-288.2C132.4,-254.6 177.56,-179.34 239,-144 283.68,-118.3 427.83,-102.3 506.89,-95.24"/>
+<polygon fill="black" stroke="black" points="506.9,-98.75 516.56,-94.39 506.29,-91.78 506.9,-98.75"/>
+</g>
+<!-- crypton&#45;connection -->
+<g id="node12" class="node">
+<title>crypton&#45;connection</title>
+<ellipse fill="none" stroke="black" cx="398" cy="-666" rx="82.57" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="398" y="-660.95" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;connection</text>
+</g>
+<!-- crypton&#45;x509&#45;store -->
+<g id="node13" class="node">
+<title>crypton&#45;x509&#45;store</title>
+<ellipse fill="none" stroke="black" cx="262" cy="-450" rx="81.55" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="262" y="-444.95" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;x509&#45;store</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;crypton&#45;x509&#45;store -->
+<g id="edge12" class="edge">
+<title>crypton&#45;connection&#45;&gt;crypton&#45;x509&#45;store</title>
+<path fill="none" stroke="black" d="M357.8,-649.97C314.77,-631.45 248.82,-595.45 220,-540 212.62,-525.8 214.74,-519.11 220,-504 223.48,-494.01 229.71,-484.49 236.33,-476.34"/>
+<polygon fill="black" stroke="black" points="238.88,-478.74 242.84,-468.91 233.61,-474.13 238.88,-478.74"/>
+</g>
+<!-- crypton&#45;x509&#45;system -->
+<g id="node14" class="node">
+<title>crypton&#45;x509&#45;system</title>
+<ellipse fill="none" stroke="black" cx="330" cy="-522" rx="89.74" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="330" y="-516.95" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;x509&#45;system</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;crypton&#45;x509&#45;system -->
+<g id="edge13" class="edge">
+<title>crypton&#45;connection&#45;&gt;crypton&#45;x509&#45;system</title>
+<path fill="none" stroke="black" d="M389.8,-647.87C378.21,-623.67 356.92,-579.21 343.12,-550.39"/>
+<polygon fill="black" stroke="black" points="346.36,-549.06 338.89,-541.55 340.05,-552.09 346.36,-549.06"/>
+</g>
+<!-- tls -->
+<g id="node15" class="node">
+<title>tls</title>
+<ellipse fill="none" stroke="black" cx="512" cy="-594" rx="27" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="512" y="-588.95" font-family="Times New Roman,serif" font-size="14.00">tls</text>
+</g>
+<!-- crypton&#45;connection&#45;&gt;tls -->
+<g id="edge14" class="edge">
+<title>crypton&#45;connection&#45;&gt;tls</title>
+<path fill="none" stroke="black" d="M424.73,-648.59C442.19,-637.86 465,-623.86 482.92,-612.86"/>
+<polygon fill="black" stroke="black" points="484.59,-615.94 491.28,-607.72 480.92,-609.97 484.59,-615.94"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;asn1&#45;encoding -->
+<g id="edge21" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M338.45,-443.34C379.65,-437.01 429.39,-423.73 466,-396 511.05,-361.88 538.37,-299.41 551.2,-263.13"/>
+<polygon fill="black" stroke="black" points="554.47,-264.37 554.37,-253.77 547.84,-262.12 554.47,-264.37"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;asn1&#45;types -->
+<g id="edge22" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M265,-431.68C273.42,-388.45 301.34,-275.07 371,-216 406.8,-185.64 458.78,-172.61 499.18,-167.05"/>
+<polygon fill="black" stroke="black" points="499.51,-170.53 509,-165.82 498.65,-163.59 499.51,-170.53"/>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;crypton -->
+<g id="edge23" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M243.49,-432.15C215.61,-406.77 162.74,-358.65 131.31,-330.04"/>
+<polygon fill="black" stroke="black" points="133.93,-327.69 124.17,-323.54 129.21,-332.86 133.93,-327.69"/>
+</g>
+<!-- crypton&#45;x509 -->
+<g id="node16" class="node">
+<title>crypton&#45;x509</title>
+<ellipse fill="none" stroke="black" cx="396" cy="-378" rx="60.56" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="396" y="-372.95" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;x509</text>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;crypton&#45;x509 -->
+<g id="edge24" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;crypton&#45;x509</title>
+<path fill="none" stroke="black" d="M292.74,-432.94C311.91,-422.93 336.75,-409.95 357.26,-399.24"/>
+<polygon fill="black" stroke="black" points="358.65,-402.46 365.89,-394.73 355.41,-396.26 358.65,-402.46"/>
+</g>
+<!-- pem -->
+<g id="node17" class="node">
+<title>pem</title>
+<ellipse fill="none" stroke="black" cx="197" cy="-306" rx="27.3" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="197" y="-300.95" font-family="Times New Roman,serif" font-size="14.00">pem</text>
+</g>
+<!-- crypton&#45;x509&#45;store&#45;&gt;pem -->
+<g id="edge25" class="edge">
+<title>crypton&#45;x509&#45;store&#45;&gt;pem</title>
+<path fill="none" stroke="black" d="M254.03,-431.59C242.85,-407.16 222.4,-362.49 209.27,-333.81"/>
+<polygon fill="black" stroke="black" points="212.61,-332.68 205.26,-325.05 206.24,-335.6 212.61,-332.68"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;asn1&#45;encoding -->
+<g id="edge26" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M357.87,-504.48C393.19,-482.66 454.69,-441.61 498,-396 524.48,-368.11 532.02,-359.83 546,-324 553.53,-304.7 557.02,-281.55 558.63,-263.7"/>
+<polygon fill="black" stroke="black" points="562.11,-264.04 559.36,-253.81 555.13,-263.52 562.11,-264.04"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;crypton&#45;x509&#45;store -->
+<g id="edge28" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;crypton&#45;x509&#45;store</title>
+<path fill="none" stroke="black" d="M313.54,-504.05C305.35,-495.63 295.3,-485.28 286.25,-475.97"/>
+<polygon fill="black" stroke="black" points="288.84,-473.61 279.36,-468.87 283.82,-478.49 288.84,-473.61"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;crypton&#45;x509 -->
+<g id="edge27" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;crypton&#45;x509</title>
+<path fill="none" stroke="black" d="M338.09,-503.59C349.39,-479.29 369.98,-434.97 383.32,-406.27"/>
+<polygon fill="black" stroke="black" points="386.37,-408.03 387.41,-397.48 380.02,-405.08 386.37,-408.03"/>
+</g>
+<!-- crypton&#45;x509&#45;system&#45;&gt;pem -->
+<g id="edge29" class="edge">
+<title>crypton&#45;x509&#45;system&#45;&gt;pem</title>
+<path fill="none" stroke="black" d="M249.61,-513.71C219.97,-506.66 189.2,-493.26 171,-468 142.02,-427.79 164.83,-367.29 182.15,-333.05"/>
+<polygon fill="black" stroke="black" points="185.22,-334.73 186.8,-324.25 179.04,-331.46 185.22,-334.73"/>
+</g>
+<!-- tls&#45;&gt;asn1&#45;encoding -->
+<g id="edge44" class="edge">
+<title>tls&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M539.47,-593.79C579.11,-593.24 651.29,-585.59 685,-540 752.83,-448.28 639.24,-314.47 585.63,-259.73"/>
+<polygon fill="black" stroke="black" points="588.18,-257.34 578.65,-252.72 583.22,-262.27 588.18,-257.34"/>
+</g>
+<!-- tls&#45;&gt;asn1&#45;types -->
+<g id="edge45" class="edge">
+<title>tls&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M539.22,-592.2C633.75,-587.83 942,-559.74 942,-379 942,-379 942,-379 942,-305 942,-236.48 723.32,-190.36 616.87,-171.96"/>
+<polygon fill="black" stroke="black" points="617.64,-168.54 607.19,-170.32 616.46,-175.44 617.64,-168.54"/>
+</g>
+<!-- tls&#45;&gt;memory -->
+<g id="edge50" class="edge">
+<title>tls&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M539.2,-593.82C599.1,-594.57 745.68,-590.62 854,-540 936.32,-501.53 980,-469.86 980,-379 980,-379 980,-379 980,-233 980,-156.15 724.46,-112.79 612.03,-97.44"/>
+<polygon fill="black" stroke="black" points="612.53,-93.97 602.15,-96.11 611.6,-100.91 612.53,-93.97"/>
+</g>
+<!-- tls&#45;&gt;crypton -->
+<g id="edge46" class="edge">
+<title>tls&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M484.77,-592.78C431.35,-591.37 310.13,-583.21 220,-540 147.38,-505.18 126.15,-474.9 110,-396 105.94,-376.15 104.99,-353.31 105.02,-335.74"/>
+<polygon fill="black" stroke="black" points="108.52,-335.82 105.17,-325.77 101.52,-335.72 108.52,-335.82"/>
+</g>
+<!-- tls&#45;&gt;crypton&#45;x509&#45;store -->
+<g id="edge48" class="edge">
+<title>tls&#45;&gt;crypton&#45;x509&#45;store</title>
+<path fill="none" stroke="black" d="M484.99,-592.11C421.01,-589.39 263.16,-578.79 231,-540 216.08,-522 227.47,-496.38 240.45,-477.24"/>
+<polygon fill="black" stroke="black" points="243.1,-479.54 246.15,-469.39 237.44,-475.42 243.1,-479.54"/>
+</g>
+<!-- tls&#45;&gt;crypton&#45;x509 -->
+<g id="edge47" class="edge">
+<title>tls&#45;&gt;crypton&#45;x509</title>
+<path fill="none" stroke="black" d="M497.77,-578.6C488.23,-568.41 475.84,-554.12 467,-540 439.58,-496.23 417.41,-440.05 405.52,-406.95"/>
+<polygon fill="black" stroke="black" points="408.88,-405.95 402.25,-397.68 402.27,-408.28 408.88,-405.95"/>
+</g>
+<!-- crypton&#45;x509&#45;validation -->
+<g id="node18" class="node">
+<title>crypton&#45;x509&#45;validation</title>
+<ellipse fill="none" stroke="black" cx="576" cy="-522" rx="100.48" ry="18"/>
+<text xml:space="preserve" text-anchor="middle" x="576" y="-516.95" font-family="Times New Roman,serif" font-size="14.00">crypton&#45;x509&#45;validation</text>
+</g>
+<!-- tls&#45;&gt;crypton&#45;x509&#45;validation -->
+<g id="edge49" class="edge">
+<title>tls&#45;&gt;crypton&#45;x509&#45;validation</title>
+<path fill="none" stroke="black" d="M525.57,-578.15C533.46,-569.53 543.62,-558.42 552.75,-548.43"/>
+<polygon fill="black" stroke="black" points="555.23,-550.9 559.4,-541.16 550.07,-546.18 555.23,-550.9"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;asn1&#45;encoding -->
+<g id="edge15" class="edge">
+<title>crypton&#45;x509&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M418.18,-360.82C431.93,-350.59 449.8,-336.9 465,-324 489.65,-303.07 516.42,-277.73 535.25,-259.45"/>
+<polygon fill="black" stroke="black" points="537.5,-262.14 542.22,-252.65 532.61,-257.13 537.5,-262.14"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;asn1&#45;types -->
+<g id="edge17" class="edge">
+<title>crypton&#45;x509&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M374.87,-360.8C364.34,-351.36 352.66,-338.47 347,-324 341.17,-309.1 339.71,-302.24 347,-288 378.75,-226.01 455.97,-192.36 508.17,-176.04"/>
+<polygon fill="black" stroke="black" points="508.89,-179.48 517.46,-173.26 506.87,-172.78 508.89,-179.48"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;asn1&#45;parse -->
+<g id="edge16" class="edge">
+<title>crypton&#45;x509&#45;&gt;asn1&#45;parse</title>
+<path fill="none" stroke="black" d="M398.47,-359.7C399.53,-352.32 400.78,-343.52 401.96,-335.25"/>
+<polygon fill="black" stroke="black" points="405.39,-336 403.34,-325.6 398.46,-335.01 405.39,-336"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;memory -->
+<g id="edge19" class="edge">
+<title>crypton&#45;x509&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M370.78,-361.38C358.42,-352.19 344.77,-339.35 338,-324 317.75,-278.07 338.36,-254.12 371,-216 413.13,-166.79 479.26,-129.17 521.08,-108.59"/>
+<polygon fill="black" stroke="black" points="522.57,-111.76 530.06,-104.26 519.53,-105.45 522.57,-111.76"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;crypton -->
+<g id="edge18" class="edge">
+<title>crypton&#45;x509&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M347.12,-367.14C299.4,-357.23 224.85,-341.04 161,-324 156.78,-322.87 152.39,-321.63 148.02,-320.36"/>
+<polygon fill="black" stroke="black" points="149.32,-317.09 138.74,-317.57 147.31,-323.8 149.32,-317.09"/>
+</g>
+<!-- crypton&#45;x509&#45;&gt;pem -->
+<g id="edge20" class="edge">
+<title>crypton&#45;x509&#45;&gt;pem</title>
+<path fill="none" stroke="black" d="M358.1,-363.67C321.57,-350.82 266.78,-331.54 231.45,-319.12"/>
+<polygon fill="black" stroke="black" points="232.74,-315.86 222.14,-315.84 230.41,-322.46 232.74,-315.86"/>
+</g>
+<!-- pem&#45;&gt;basement -->
+<g id="edge42" class="edge">
+<title>pem&#45;&gt;basement</title>
+<path fill="none" stroke="black" d="M193.49,-287.97C183.69,-240.49 156.01,-106.31 143.85,-47.36"/>
+<polygon fill="black" stroke="black" points="147.32,-46.88 141.88,-37.79 140.47,-48.29 147.32,-46.88"/>
+</g>
+<!-- pem&#45;&gt;memory -->
+<g id="edge43" class="edge">
+<title>pem&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M200.05,-287.81C206.97,-254.19 227.24,-179.91 276,-144 311.99,-117.49 435.5,-102.21 507.24,-95.36"/>
+<polygon fill="black" stroke="black" points="507.15,-98.89 516.78,-94.48 506.5,-91.92 507.15,-98.89"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;asn1&#45;encoding -->
+<g id="edge30" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;asn1&#45;encoding</title>
+<path fill="none" stroke="black" d="M577.32,-503.65C579.95,-464.81 584.74,-367.99 574,-288 572.89,-279.76 570.91,-270.97 568.78,-262.97"/>
+<polygon fill="black" stroke="black" points="572.17,-262.08 566.06,-253.42 565.44,-264 572.17,-262.08"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;asn1&#45;types -->
+<g id="edge31" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;asn1&#45;types</title>
+<path fill="none" stroke="black" d="M586.55,-503.72C614.59,-455.41 685.36,-315.96 634,-216 626.68,-201.75 613.55,-190.47 600.36,-182.05"/>
+<polygon fill="black" stroke="black" points="602.52,-179.26 592.13,-177.19 598.96,-185.29 602.52,-179.26"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;memory -->
+<g id="edge35" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M671.62,-516.14C750.8,-510.1 855.02,-496.79 885,-468 914.17,-439.98 904,-419.45 904,-379 904,-379 904,-379 904,-233 904,-170.06 704.75,-120.67 609.54,-100.67"/>
+<polygon fill="black" stroke="black" points="610.44,-97.28 599.94,-98.68 609.02,-104.14 610.44,-97.28"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;crypton -->
+<g id="edge32" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M493.72,-511.28C377.17,-497.37 177.34,-472.91 171,-468 129.27,-435.71 114.22,-372.3 108.87,-335.42"/>
+<polygon fill="black" stroke="black" points="112.4,-335.43 107.65,-325.96 105.46,-336.33 112.4,-335.43"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;crypton&#45;x509&#45;store -->
+<g id="edge34" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;crypton&#45;x509&#45;store</title>
+<path fill="none" stroke="black" d="M514.71,-507.34C461.28,-495.43 383.93,-478.18 328.91,-465.92"/>
+<polygon fill="black" stroke="black" points="329.86,-462.54 319.34,-463.78 328.34,-469.38 329.86,-462.54"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;crypton&#45;x509 -->
+<g id="edge33" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;crypton&#45;x509</title>
+<path fill="none" stroke="black" d="M554.64,-504.15C522.54,-478.82 461.73,-430.85 425.44,-402.22"/>
+<polygon fill="black" stroke="black" points="427.98,-399.77 417.96,-396.32 423.64,-405.27 427.98,-399.77"/>
+</g>
+<!-- crypton&#45;x509&#45;validation&#45;&gt;pem -->
+<g id="edge36" class="edge">
+<title>crypton&#45;x509&#45;validation&#45;&gt;pem</title>
+<path fill="none" stroke="black" d="M539.49,-504.83C516.75,-494.59 486.99,-480.91 461,-468 400.1,-437.76 384.08,-431.37 326,-396 289.53,-373.79 249.29,-345.36 223.61,-326.69"/>
+<polygon fill="black" stroke="black" points="225.88,-324.01 215.74,-320.93 221.75,-329.66 225.88,-324.01"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;memory -->
+<g id="edge39" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;memory</title>
+<path fill="none" stroke="black" d="M570.19,-732.39C706.88,-718.08 1037,-661.7 1037,-451 1037,-451 1037,-451 1037,-233 1037,-162.61 971.51,-169.74 906,-144 807.82,-105.42 683.7,-94.79 613.96,-91.95"/>
+<polygon fill="black" stroke="black" points="614.47,-88.46 604.35,-91.6 614.21,-95.46 614.47,-88.46"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;crypton -->
+<g id="edge37" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;crypton</title>
+<path fill="none" stroke="black" d="M454.35,-731.97C328.03,-719.35 38,-681.01 38,-595 38,-595 38,-595 38,-449 38,-404.69 65.26,-359.57 85.26,-332.42"/>
+<polygon fill="black" stroke="black" points="88.04,-334.54 91.32,-324.47 82.48,-330.3 88.04,-334.54"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;crypton&#45;connection -->
+<g id="edge38" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;crypton&#45;connection</title>
+<path fill="none" stroke="black" d="M486.42,-721.29C471.05,-711.86 451.26,-699.7 434.29,-689.29"/>
+<polygon fill="black" stroke="black" points="436.33,-686.43 425.98,-684.18 432.67,-692.39 436.33,-686.43"/>
+</g>
+<!-- http&#45;client&#45;tls&#45;&gt;tls -->
+<g id="edge40" class="edge">
+<title>http&#45;client&#45;tls&#45;&gt;tls</title>
+<path fill="none" stroke="black" d="M512,-719.59C512,-695.61 512,-652.14 512,-623.42"/>
+<polygon fill="black" stroke="black" points="515.5,-623.62 512,-613.62 508.5,-623.62 515.5,-623.62"/>
+</g>
+</g>
+</svg>
diff --git a/doc/img/manageHLS.png b/doc/img/manageHLS.png
new file mode 100644
index 0000000000..d6589d593a
Binary files /dev/null and b/doc/img/manageHLS.png differ
diff --git a/doc/img/stack-favicon.svg b/doc/img/stack-favicon.svg
new file mode 100644
index 0000000000..cf1049d03a
--- /dev/null
+++ b/doc/img/stack-favicon.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0.0 0.0 512.0 512.0"
+   width="512"
+   height="512"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <path
+     d="M 512,448 V 64 C 512,28.6538 483.3462,0 448,0 H 64 C 28.6538,0 0,28.6538 0,64 v 384 c 0,35.3462 28.6538,64 64,64 h 384 c 35.3462,0 64,-28.6538 64,-64 z"
+     id="background"
+     style="fill:#7e56c2;fill-opacity:1;stroke:none" />
+  <path
+     d="M 74.6667,446.2222 H 437.3334"
+     id="stackline3"
+     style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="M 74.6667,392.8889 H 437.3334"
+     id="stackline2"
+     style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="M 74.6667,339.5556 H 437.3334"
+     id="stackline1"
+     style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="m 366.2222,227.5556 -28.4444,-42.6667 h 99.5556 v 42.6667 z"
+     id="equalsbottom"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  <path
+     d="m 323.5556,163.5556 -28.4444,-42.6667 h 142.2222 v 42.6667 z"
+     id="equalstop"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  <path
+     d="m 160,302.2222 85.3333,-128 -85.3333,-128 h 64 l 170.6667,256 h -64 l -53.3333,-80 -53.3333,80 z"
+     id="lambda"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  <path
+     d="m 74.6667,302.2222 85.3333,-128 -85.3333,-128 h 64 l 85.3333,128 -85.3333,128 z"
+     id="arrow"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/doc/img/stack-logo-white.svg b/doc/img/stack-logo-white.svg
new file mode 100644
index 0000000000..da33a9f595
--- /dev/null
+++ b/doc/img/stack-logo-white.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 416 416"
+   width="416"
+   height="416"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <path
+     d="m 26.66665,400 h 362.6667"
+     id="stackline3"
+     style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="m 26.66665,346.6667 h 362.6667"
+     id="stackline2"
+     style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="m 26.66665,293.3334 h 362.6667"
+     id="stackline1"
+     style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="m 318.22215,181.3334 -28.4444,-42.6667 h 99.5556 v 42.6667 z"
+     id="equalsbottom"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  <path
+     d="m 275.55555,117.3334 -28.4444,-42.6667 h 142.2222 v 42.6667 z"
+     id="equalstop"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  <path
+     d="M 111.99995,256 197.33325,128 111.99995,0 h 64 l 170.6667,256 h -64 l -53.3333,-80 -53.3333,80 z"
+     id="lambda"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  <path
+     d="M 26.66665,256 111.99995,128 26.66665,0 h 64 l 85.3333,128 -85.3333,128 z"
+     id="arrow"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/doc/img/stack-open-graph.png b/doc/img/stack-open-graph.png
new file mode 100644
index 0000000000..a329f5ab45
Binary files /dev/null and b/doc/img/stack-open-graph.png differ
diff --git a/doc/img/stack-open-graph.svg b/doc/img/stack-open-graph.svg
new file mode 100644
index 0000000000..497940d734
--- /dev/null
+++ b/doc/img/stack-open-graph.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 1280 640"
+   width="1280"
+   height="640"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <rect
+     style="fill:#7e56c2;stroke-width:0.1;stroke-linecap:round;stroke:none;fill-opacity:1"
+     id="rect1"
+     width="1280"
+     height="640"
+     x="0"
+     y="0" />
+  <path
+     d="M 98.461538,541.53846 H 516.92313"
+     id="stackline3"
+     style="fill:none;stroke:#ffffff;stroke-width:36.9231;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="M 98.461538,480.00004 H 516.92313"
+     id="stackline2"
+     style="fill:none;stroke:#ffffff;stroke-width:36.9231;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="M 98.461538,418.46162 H 516.92313"
+     id="stackline1"
+     style="fill:none;stroke:#ffffff;stroke-width:36.9231;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     d="m 434.87173,289.23085 -32.82046,-49.23081 h 114.87186 v 49.23081 z"
+     id="equalsbottom"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.15385" />
+  <path
+     d="m 385.64105,215.38469 -32.82047,-49.23081 h 164.10254 v 49.23081 z"
+     id="equalstop"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.15385" />
+  <path
+     d="M 196.92304,375.38462 295.38454,227.69231 196.92304,80 h 73.84615 l 196.92312,295.38462 h -73.84616 l -61.53842,-92.3077 -61.53842,92.3077 z"
+     id="lambda"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.15385" />
+  <path
+     d="M 98.461538,375.38462 196.92304,227.69231 98.461538,80 h 73.846152 l 98.4615,147.69231 -98.4615,147.69231 z"
+     id="arrow"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.15385" />
+  <g
+     id="g3"
+     transform="translate(0,100.75713)">
+    <text
+       xml:space="preserve"
+       style="font-size:69.2469px;line-height:1.25;font-family:'Bravura Text';-inkscape-font-specification:'Bravura Text';fill:#ffffff;stroke-width:1.73117"
+       x="639.3075"
+       y="130.55026"
+       id="text1"><tspan
+         id="tspan1"
+         x="639.3075"
+         y="130.55026"
+         style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';fill:#ffffff;stroke-width:1.73117">The Haskell Tool</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:174.891px;line-height:1.25;font-family:'Bravura Text';-inkscape-font-specification:'Bravura Text';fill:#ffffff;stroke-width:4.37227"
+       x="643.29163"
+       y="283.573"
+       id="text2"><tspan
+         id="tspan2"
+         x="643.29163"
+         y="283.573"
+         style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';fill:#ffffff;stroke-width:4.37227">STACK</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:39.2686px;line-height:1.25;font-family:'Bravura Text';-inkscape-font-specification:'Bravura Text';fill:#ffffff;stroke-width:0.981716"
+       x="636.26105"
+       y="350.0491"
+       id="text3"><tspan
+         id="tspan3"
+         x="636.26105"
+         y="350.0491"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';fill:#ffffff;stroke-width:0.981716">https://haskellstack.org</tspan></text>
+  </g>
+</svg>
diff --git a/doc/img/stack-welcome.gif b/doc/img/stack-welcome.gif
new file mode 100644
index 0000000000..c6a2c8bb86
Binary files /dev/null and b/doc/img/stack-welcome.gif differ
diff --git a/doc/install_and_upgrade.md b/doc/install_and_upgrade.md
index 67f2fdff90..d900db1118 100644
--- a/doc/install_and_upgrade.md
+++ b/doc/install_and_upgrade.md
@@ -1,583 +1,882 @@
 <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
-# Install or upgrade
+# Setting up
 
-## Install Stack
+The goal of setting up is a `stack` executable file on the PATH. When Stack is
+used, it sets other things up as needed.
 
-Stack can be installed on most Linux distributions, macOS and Windows.
+*[PATH]: An environment variable that specifies a list of directories searched for executable files.
 
-Stack is open to supporting more operating systems. To request support for an
-operating system, please submit an
-[issue](https://github.com/commercialhaskell/stack/issues/new) at Stack's
-GitHub repository.
+??? question "How do I know if Stack is on the PATH?"
 
-!!! info
+    Command `stack`. If Stack is available, that should output information about
+    how to use it.
 
-    In addition to the methods described below, Stack can also be installed
-    using the separate [GHCup](https://www.haskell.org/ghcup/) installer for
-    Haskell-related tools. GHCup provides Stack for some combinations of machine
-    architecture and operating system not provided elsewhere. Unlike Stack,
-    other build tools do not automatically install GHC. GHCup can be used to
-    install GHC for those other tools. By default, the script to install GHCup
-    (which can be run more than once) also configures Stack so that if Stack
-    needs a version of GHC, GHCup takes over obtaining and installing that
-    version.
+??? question "How do I find where Stack is located?"
 
-!!! info "Releases on GitHub"
+    === "Unix-like"
 
-    Stack executables are also available on the
-    [releases](https://github.com/commercialhaskell/stack/releases) page of
-    Stack's GitHub repository.
+        Command `which -a stack`.
 
-!!! info "`https://get.haskellstack.org/stable` URLs"
+    === "Windows"
 
-    URLs with the format
-    `https://get.haskellstack.org/stable/<PLATFORM>.<EXTENSION>` point to the
-    latest stable release. See the manual download links for examples.
+        Command `where.exe stack`.
 
-=== "Linux"
+??? question "How do I find what version of Stack is available?"
 
-    For most Linux distributions, the easiest way to install Stack is to
-    command:
+    Command `stack --version` or `stack --numeric-version`.
 
-    ~~~text
-    curl -sSL https://get.haskellstack.org/ | sh
-    ~~~
+??? question "If I do not use GHCup, is there a preferred location for Stack?"
 
-    or:
+    You can put the `stack` executable file anywhere on your PATH. However, a
+    good location is the directory where Stack itself will install executables.
+    That location depends on the operating system:
 
-    ~~~text
-    wget -qO- https://get.haskellstack.org/ | sh
-    ~~~
+    === "Unix-like"
+
+        Stack installs executables to:
+
+        ~~~text
+        $HOME/.local/bin
+        ~~~
+
+        If you do not have that directory in your PATH, you may need to update
+        your PATH. That can be done by editing the `~/.bashrc` file.
+
+    === "Windows"
+
+        Stack installs executables to:
+
+        ~~~text
+        $Env:APPDATA\local\bin
+        ~~~
+
+        For example: `C:\Users\<user-name>\AppData\Roaming\local\bin`.
+
+        If you do not have that directory in your PATH, you may need to update
+        your PATH. That can be done by searching for 'Edit Environment variables
+        for your account' under Start.
+
+    === "Windows (Command Prompt)"
+
+        Stack installs executables to:
+
+        ~~~text
+        %APPDATA%\local\bin
+        ~~~
+
+        For example: `C:\Users\<user-name>\AppData\Roaming\local\bin`.
+
+        If you do not have that directory in your PATH, you may need to update
+        your PATH. That can be done by searching for 'Edit Environment variables
+        for your account' under Start.
 
     !!! note
 
-        The script at [get.haskellstack.org](https://get.haskellstack.org/) will
-        ask for root access using `sudo`. It needs such access in order to use
-        your platform's package manager to install dependencies and to install
-        to `/usr/local/bin`. If you prefer more control, follow the manual
-        installation instructions for your platform below.
+        If you used GHCup to install Stack, GHCup puts executable files in the
+        `bin` directory in the GHCup root directory.
 
-    ### Manual download
+To get and use Stack, some other things need to be in place first:
 
-    Manual download for Linux distributions depends on your machine
-    architecture, x86_64 or AArch64/ARM64.
+<div class="grid cards" markdown>
 
-    === "x86_64"
+-   :material-laptop:{ .lg .middle } __A computer__
 
-        * Click
-          [:material-cloud-download-outline:](https://get.haskellstack.org/stable/linux-x86_64.tar.gz)
-          to download an archive file with the latest release.
+    ---
 
-        * Extract the archive and place the `stack` executable somewhere on your
-          PATH (see the [Path](#path) section below).
+    Stack will need at least about 5 GB of disk space[^1]. It will help to know
+    what platform your computer provides.
 
-        * Ensure you have the required system dependencies installed. These
-          include GCC, GNU Make, xz, perl, libgmp, libffi, and zlib. We also
-          recommend Git and GPG.
+    [^1]:
+        About 3 GB for a single version of GHC and about 2 GB for a local copy
+        of the Hackage package index.
 
-        The installation of system dependencies will depend on the package
-        manager for your Linux distribution. Notes are provided for Arch Linux,
-        CentOS, Debian, Fedora, Gentoo and Ubuntu.
+    *[platform]: Machine architecture (eg x86_64, AArch64) and operating system (eg Linux distribution, macOS, Windows).
 
-        === "Arch Linux"
+-   :material-wifi:{ .lg .middle } __Access to the Internet__
 
-            ~~~text
-            sudo pacman -S make gcc ncurses git gnupg xz zlib gmp libffi zlib
-            ~~~
+    ---
 
-        === "CentOS"
+    Stack will need to fetch files from remote locations.
 
-            ~~~text
-            sudo yum install perl make automake gcc gmp-devel libffi zlib zlib-devel xz tar git gnupg
-            ~~~
+-   :octicons-terminal-24:{ .lg .middle } __Terminal software__
 
-        === "Debian"
+    ---
 
-            ~~~text
-            sudo apt-get install g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg netbase
-            ~~~
+    Stack is used at the command line. Your operating system likely provides
+    terminal software and alternatives may be available.
 
-        === "Fedora"
+-   :material-text-box-edit-outline:{ .lg .middle } __A code editor__
 
-            ~~~text
-            sudo dnf install perl make automake gcc gmp-devel libffi zlib zlib-devel xz tar git gnupg
-            ~~~
+    ---
 
-        === "Gentoo"
+    You can use any editor program that can edit text files but code editors
+    with extensions for Haskell code files are recommended.
 
-            Ensure you have the `ncurses` package with `USE=tinfo`. Without it,
-            Stack will not be able to install GHC.
+</div>
 
-        === "Ubuntu"
+## Install Stack
 
-            ~~~text
-            sudo apt-get install g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg netbase
-            ~~~
+Stack can be installed on most Linux distributions, macOS and Windows.
+
+??? question "What about other operating systems?"
+
+    Stack is open to supporting more operating systems. To request support for
+    an operating system, please submit an
+    [issue](https://github.com/commercialhaskell/stack/issues/new) at Stack's
+    GitHub repository.
+
+Stack can be installed directly or by using the GHCup tool.
 
-    ### Linux packages
+=== "Directly"
 
-    Some Linux distributions have official or unofficial packages for Stack,
-    including Arch Linux, Debian, Fedora, NixOS, openSUSE/SUSE Linux Enterprise,
-    and Ubuntu.
+    Stack can be installed on various operating systems.
 
-    !!! info "Linux packages that lag behind Stack's current version"
+    ??? question "Where can binary distributions for Stack be found?"
 
-        The Stack version available as a Linux package may lag behind Stack's
-        current version. If so, using `stack upgrade --binary-only` is
-        recommended after installing it. For Stack versions before 1.3.0 which
-        do not support `--binary-only`, just `stack upgrade` may work too.
+        Stack executables are available on the
+        [releases](https://github.com/commercialhaskell/stack/releases) page of
+        Stack's GitHub repository.
 
-    === "Arch Linux"
+        URLs with the format
+        `https://get.haskellstack.org/stable/<PLATFORM>.<EXTENSION>` point to
+        the latest stable release. The manual download links use those URLs.
 
-        The Arch community package repository provides an official
-        [package](https://www.archlinux.org/packages/community/x86_64/stack/).
-        You can install it with the command:
+    ??? question "Does the `sh` installation script have flags and options?"
+
+        The `sh` installation script recognises the following optional flags and
+        options: `-q` suppresses output and specifies non-intervention (likely a
+        prerequisite for the use of the script in CI environments); `-f` forces
+        installation, even if an existing Stack executable is detected; and
+        `-d <directory>` specifies a destination directory for the Stack
+        executable.
+
+    === "Linux"
+
+        For most Linux distributions, on x86_64 or AArch64 machine
+        architectures, the easiest way to install Stack is to command either:
 
         ~~~text
-        sudo pacman -S stack
+        curl -sSL https://get.haskellstack.org/ | sh
         ~~~
 
-        This version may slightly lag behind, but it should be updated within
-        the day. The package is also always rebuilt and updated when one of its
-        dependencies gets an update.
+        or:
 
-        The Arch User Repository (AUR) also provides a
-        [package](https://aur.archlinux.org/packages/haskell-stack-git).
-        However, its Stack version lags behind, so running
-        `stack upgrade --binary-only` is recommended after installing it. For
-        older Stack versions which do not support `--binary-only`, just
-        `stack upgrade` may work too.
+        ~~~text
+        wget -qO- https://get.haskellstack.org/ | sh
+        ~~~
 
-        To use `stack setup` with versions of GHC before 7.10.3 or on a
-        32-bit system, you may need the AUR
-        [ncurses5-compat-libs](https://aur.archlinux.org/packages/ncurses5-compat-libs/)
-        package installed.
+        These commands download a script file and run it using `sh`.
 
-    === "Debian"
+        ??? question "Will the installation script need root access?"
 
-        There are Debian
-        [packages](https://packages.debian.org/search?keywords=haskell-stack&searchon=names&suite=all&section=all)
-        for Stretch and up. However, the distribution's Stack version lags
-        behind.
+            The script at [get.haskellstack.org](https://get.haskellstack.org/)
+            will ask for root access using `sudo`. It needs such access in order
+            to use your platform's package manager to install dependencies and
+            to install to `/usr/local/bin`. If you prefer more control, follow
+            the manual installation instructions for your platform below.
 
-    === "Fedora"
+        ??? question "Can I download Stack manually?"
 
-        Fedora includes Stack, but its Stack version may lag behind.
+            Yes. Manual download for Linux distributions depends on your machine
+            architecture, x86_64 or AArch64/ARM64.
 
-    === "NixOS"
+            === "x86_64"
 
-        Users who follow the `nixos-unstable` channel or the Nixpkgs `master`
-        branch can install the latest Stack release into their profile with the
-        command:
+                * Click
+                  [:material-cloud-download-outline:](https://get.haskellstack.org/stable/linux-x86_64.tar.gz)
+                  to download an archive file with the latest release.
 
-        ~~~text
-        nix-env -f "<nixpkgs>" -iA stack
-        ~~~
+                * Extract the archive and place the `stack` executable file
+                  somewhere on your PATH.
 
-        Alternatively, the package can be built from source as follows.
+                * Ensure you have the required system dependencies installed.
+                  These include GCC, GNU Make, xz, perl, libgmp, libffi, and
+                  zlib. We also recommend Git and GPG.
 
-        1.  Clone the git repo, with the command:
+                The installation of system dependencies will depend on the
+                package manager for your Linux distribution. Notes are provided
+                for Arch Linux, CentOS, Debian, Fedora, Gentoo and Ubuntu.
 
-            ~~~text
-            git clone https://github.com/commercialhaskell/stack.git
-            ~~~
+                === "Arch Linux"
 
-        2.  Create a `shell.nix` file with the command:
+                    ~~~text
+                    sudo pacman -S make gcc ncurses git gnupg xz zlib gmp libffi zlib
+                    ~~~
 
-            ~~~text
-            cabal2nix --shell ./. --no-check --no-haddock > shell.nix
-            ~~~
+                === "CentOS"
 
-            Note that the tests fail on NixOS, so disable them with
-            `--no-check`. Also, Haddock currently doesn't work for Stack, so
-            `--no-haddock` disables it.
+                    ~~~text
+                    sudo yum install perl make automake gcc gmp-devel libffi zlib zlib-devel xz tar git gnupg
+                    ~~~
 
-        3.  Install Stack to your user profile with the command:
+                === "Debian"
 
-            ~~~text
-            nix-env -i -f shell.nix
-            ~~~
+                    ~~~text
+                    sudo apt-get install g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg netbase
+                    ~~~
+
+                === "Fedora"
+
+                    ~~~text
+                    sudo dnf install perl make automake gcc gmp-devel libffi zlib zlib-devel xz tar git gnupg
+                    ~~~
+
+                === "Gentoo"
+
+                    Ensure you have the `ncurses` package with `USE=tinfo`. Without
+                    it, Stack will not be able to install GHC.
+
+                === "Ubuntu"
+
+                    ~~~text
+                    sudo apt-get install g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg netbase
+                    ~~~
+
+            === "AArch64"
+
+                * Click
+                  [:material-cloud-download-outline:](https://get.haskellstack.org/stable/linux-aarch64.tar.gz)
+                  to download an archive file with the latest release.
+
+                * Extract the archive and place the `stack` executable file
+                  somewhere on your PATH.
+
+                * Ensure you have the required system dependencies installed.
+                  These include GCC, GNU Make, xz, perl, libgmp, libffi, and
+                  zlib. We also recommend Git and GPG.
+
+                The installation of system dependencies will depend on the
+                package manager for your Linux distribution. Notes are provided
+                for Arch Linux, CentOS, Debian, Fedora, Gentoo and Ubuntu.
+
+                === "Arch Linux"
+
+                    ~~~text
+                    sudo pacman -S make gcc ncurses git gnupg xz zlib gmp libffi zlib
+                    ~~~
+
+                === "CentOS"
+
+                    ~~~text
+                    sudo yum install perl make automake gcc gmp-devel libffi zlib zlib-devel xz tar git gnupg
+                    ~~~
+
+                === "Debian"
+
+                    ~~~text
+                    sudo apt-get install g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg netbase
+                    ~~~
+
+                === "Fedora"
+
+                    ~~~text
+                    sudo dnf install perl make automake gcc gmp-devel libffi zlib zlib-devel xz tar git gnupg
+                    ~~~
+
+                === "Gentoo"
+
+                    Ensure you have the `ncurses` package with `USE=tinfo`. Without it,
+                    Stack will not be able to install GHC.
+
+                === "Ubuntu"
+
+                    ~~~text
+                    sudo apt-get install g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg netbase
+                    ~~~
+
+        ??? question "Can I use a Linux package to get Stack?"
+
+            Some Linux distributions have official or unofficial packages for
+            Stack, including Arch Linux, Debian, Fedora, NixOS, openSUSE/SUSE
+            Linux Enterprise, and Ubuntu. However, the Stack version available
+            as a Linux package may lag behind Stack's current version and, in
+            some cases, the lag may be significant.
+
+            !!! info "Linux packages that lag behind Stack's current version"
+
+                If Stack version available as a Linux package lags behind
+                Stack's current version, using `stack upgrade --binary-only` is
+                recommended after installing it.
+
+            === "Arch Linux"
+
+                The Arch extra package repository provides an official x86_64
+                [package](https://www.archlinux.org/packages/extra/x86_64/stack/).
+                You can install it with the command:
+
+                ~~~text
+                sudo pacman -S stack
+                ~~~
+
+                The Arch User Repository (AUR) also provides:
+
+                *   a [`stack-bin` package](https://aur.archlinux.org/packages/stack-bin);
+                    and
+
+                *   a [`stack-static` package](https://aur.archlinux.org/packages/stack-static)
+
+            === "Debian"
+
+                There are Debian
+                [packages](https://packages.debian.org/search?keywords=haskell-stack&searchon=names&suite=all&section=all)
+                for Buster and up. However, the distribution's Stack version
+                lags behind.
+
+            === "Fedora"
+
+                Fedora includes Stack, but its Stack version may lag behind.
+
+            === "NixOS"
+
+                Users who follow the `nixos-unstable` channel or the Nixpkgs
+                `master` branch can install the latest Stack release into their
+                profile with the command:
+
+                ~~~text
+                nix-env -f "<nixpkgs>" -iA stack
+                ~~~
+
+                Alternatively, the package can be built from source as follows.
+
+                1.  Clone the git repo, with the command:
+
+                    ~~~text
+                    git clone https://github.com/commercialhaskell/stack.git
+                    ~~~
+
+                2.  Create a `shell.nix` file with the command:
+
+                    ~~~text
+                    cabal2nix --shell ./. --no-check --no-haddock > shell.nix
+                    ~~~
+
+                    Note that the tests fail on NixOS, so disable them with
+                    `--no-check`. Also, Haddock currently does not work for
+                    Stack, so `--no-haddock` disables it.
+
+                3.  Install Stack to your user profile with the command:
+
+                    ~~~text
+                    nix-env -i -f shell.nix
+                    ~~~
 
-        For more information on using Stack together with Nix, please see the
-        [NixOS manual section on Stack](http://nixos.org/nixpkgs/manual/#how-to-build-a-haskell-project-using-stack).
+                For more information on using Stack together with Nix, please
+                see the
+                [NixOS manual section on Stack](http://nixos.org/nixpkgs/manual/#how-to-build-a-haskell-project-using-stack).
 
-    === "SUSE"
+            === "SUSE"
 
-        There is also an unofficial package for openSUSE or SUSE Linux
-        Enterprise. Its Stack version may lag behind. To install it:
+                There is also an unofficial package for openSUSE or SUSE Linux
+                Enterprise. Its Stack version may lag behind. To install it:
 
-        === openSUSE Tumbleweed
+                === "openSUSE Tumbleweed"
 
+                    ~~~text
+                    sudo zypper in stack
+                    ~~~
+
+                === "openSUSE Leap"
+
+                    ~~~text
+                    sudo zypper ar http://download.opensuse.org/repositories/devel:/languages:/haskell/openSUSE_Leap_42.1/devel:languages:haskell.repo
+                    sudo zypper in stack
+                    ~~~
+
+                === "SUSE Linux Enterprise 12"
+
+                    ~~~text
+                    sudo zypper ar http://download.opensuse.org/repositories/devel:/languages:/haskell/SLE_12/devel:languages:haskell.repo
+                    sudo zypper in stack
+                    ~~~
+
+            === "Ubuntu"
+
+                There are Ubuntu
+                [packages](http://packages.ubuntu.com/search?keywords=haskell-stack&searchon=names&suite=all&section=all)
+                for Ubuntu 20.04 and up.
+
+        ??? question "Can I set up auto-completion of Stack commands?"
+
+            Yes. For further information, see the
+            [shell auto-completion](topics/shell_autocompletion.md)
+            documentation.
+
+    === "macOS"
+
+        Most users of Stack on macOS will also have up to date tools for
+        software development.
+
+        ??? question "What if I am not sure that I have those tools?"
+
+            macOS does not come with all the tools required for software
+            development but a collection of useful tools, known as the Xcode
+            Command Line Tools, is readily available. A version of that
+            collection is provided with each version of Xcode (Apple’s
+            integrated development environment) and can also be obtained from
+            Apple separately from Xcode. The collection also includes the macOS
+            SDK (software development kit). The macOS SDK provides header files
+            for macOS APIs.
+
+            If you use a command that refers to a common Xcode Command Line Tool
+            and the Xcode Command Line Tools are not installed, macOS may prompt
+            you to install the tools.
+
+            macOS also comes with a command line tool, `xcode-select`, that can
+            be used to obtain the Xcode Command Line Tools. Command
+            `xcode-select --print-path` to print the path to the currently
+            selected (active) developer directory. If the directory does not
+            exist, or is empty, then the Xcode Command Line Tools are not
+            installed.
+
+            If the Xcode Command Line Tools are not installed, command
+            `xcode-select --install` to open a user interface dialog to request
+            automatic installation of the tools.
+
+            An upgrade of macOS may sometimes require the existing Xcode Command
+            Line Tools to be uninstalled and an updated version of the tools to
+            be installed. The existing tools can be uninstalled by deleting the
+            directory reported by `xcode-select --print-path`.
+
+            If, after the installation of Stack, running `stack setup` fails
+            with:
             ~~~text
-            sudo zypper in stack
+            configure: error: cannot run C compiled programs.
             ~~~
 
-        === openSUSE Leap
+            that indicates that the Xcode Command Line Tools are not installed.
+
+            If building fails with messages that `*.h` files are not found, that
+            may also indicate that Xcode Command Line Tools are not up to date.
+
+            Xcode 10 provided an SDK for macOS 10.14 (Mojave) and
+            [changed the location](https://developer.apple.com/documentation/xcode-release-notes/xcode-10-release-notes#Command-Line-Tools)
+            of the macOS system headers. As a workaround, an extra package was
+            provided by Apple which installed the headers to the base system
+            under `/usr/include`.
+
+        ??? question "What versions of the LLVM compiler and toolchain are supported?"
+
+            The documentation for each version of GHC identifies the versions of
+            LLVM that are supported. That is summarised in the table below for
+            recent versions of GHC:
+
+            |GHC version|LLVM versions|
+            |-----------|-------------|
+            |9.12.2     |11 to 15     |
+            |9.10.3     |11 to 15     |
+            |9.8.4      |11 to 15     |
+            |9.6.7      |11 to 15     |
+            |9.4.8      |10 to 14     |
+            |9.2.8      |9 to 12      |
+            |9.0.2      |9, 10 or 12  |
+            |8.10.7     |9 to 12      |
+            |8.8.4      |7            |
+            |8.6.5      |6            |
+            |8.4.4      |5            |
+
+        From late 2020, Apple began a transition from Mac computers with Intel
+        processors (Intel-based Mac) to
+        [Mac computers with Apple silicon](https://support.apple.com/en-gb/HT211814).
+
+        === "Intel-based"
+
+            Intel-based Mac computers have processors with x86_64 architectures.
+            For most Intel-based Mac computers, the easiest way to install Stack
+            is to command either:
 
             ~~~text
-            sudo zypper ar http://download.opensuse.org/repositories/devel:/languages:/haskell/openSUSE_Leap_42.1/devel:languages:haskell.repo
-            sudo zypper in stack
+            curl -sSL https://get.haskellstack.org/ | sh
             ~~~
 
-        === SUSE Linux Enterprise 12
+            or:
 
             ~~~text
-            sudo zypper ar http://download.opensuse.org/repositories/devel:/languages:/haskell/SLE_12/devel:languages:haskell.repo
-            sude zypper in stack
+            wget -qO- https://get.haskellstack.org/ | sh
             ~~~
 
-    === "Ubuntu"
+            These commands download a script file and run it using `sh`.
 
-        There are Ubuntu
-        [packages](http://packages.ubuntu.com/search?keywords=haskell-stack&searchon=names&suite=all&section=all)
-        for Ubuntu 18.04 and up. However, the distribution's Stack version lags
-        behind.
+            ??? question "Will the installation script need root access?"
 
-    It is possible to set up auto-completion of Stack commands. For further
-    information, see the [shell auto-completion](shell_autocompletion.md)
-    documentation.
+                The script at
+                [get.haskellstack.org](https://get.haskellstack.org/)
+                will ask for root access using `sudo`. It needs such access in
+                order to use your platform's package manager to install
+                dependencies and to install to `/usr/local/bin`. If you prefer
+                more control, follow the manual installation instructions below.
 
-=== "macOS"
+            ??? question "Can I download Stack manually?"
 
-    The easiest way to install Stack is to command:
+                Yes:
 
-    ~~~text
-    curl -sSL https://get.haskellstack.org/ | sh
-    ~~~
+                * Click
+                  [:material-cloud-download-outline:](https://get.haskellstack.org/stable/osx-x86_64.tar.gz)
+                  to download an archive file with the latest release for x86_64
+                  architectures.
 
-    or:
+                * Extract the archive and place `stack` somewhere on your PATH.
 
-    ~~~text
-    wget -qO- https://get.haskellstack.org/ | sh
-    ~~~
+                Now you can run Stack from the command line in a terminal.
 
-    !!! note
+        === "Apple silicon"
 
-        The script at [get.haskellstack.org](https://get.haskellstack.org/) will
-        ask for root access using `sudo`. It needs such access in order to use
-        your platform's package manager to install dependencies and to install
-        to `/usr/local/bin`. If you prefer more control, follow the manual
-        installation instructions below.
+            Mac computers with Apple silicon have an M series chip. These chips
+            use an architecture known as ARM64 or AArch64.
 
-    !!! info
+            For Mac computers with Apple silicon, the easiest way to install
+            Stack is to command either:
 
-        We generally test on the current version of macOS and do our best to
-        keep it compatible with the three most recent major versions. Stack may
-        also work on older versions.
+            ~~~text
+            curl -sSL https://get.haskellstack.org/ | sh
+            ~~~
 
-    ### Manual download
+            or:
 
-    * Click
-      [:material-cloud-download-outline:](https://get.haskellstack.org/stable/osx-x86_64.tar.gz)
-      to download an archive file with the latest release for x86_64
-      architectures.
+            ~~~text
+            wget -qO- https://get.haskellstack.org/ | sh
+            ~~~
 
-    * Extract the archive and place `stack` somewhere on your PATH (see the
-      [Path](#path) section below).
+            These commands download a script file and run it using `sh`.
 
-    * Now you can run Stack from the command line in a terminal.
+            ??? question "Will the installation script need root access?"
 
-    ### Using Homebrew
+                The script at
+                [get.haskellstack.org](https://get.haskellstack.org/)
+                will ask for root access using `sudo`. It needs such access in
+                order to use your platform's package manager to install
+                dependencies and to install to `/usr/local/bin`. If you prefer
+                more control, follow the manual installation instructions below.
 
-    [Homebrew](https://brew.sh/) is a popular package manager for macOS. If you
-    have its `brew` tool installed, you can just command:
+            ??? question "What if I get error `C compiler cannot build executables`?"
 
-    ~~~text
-    brew install haskell-stack
-    ~~~
+                The installation of Stack or some packages (e.g. `network`)
+                requiring C source compilation might fail with:
 
-    * The Homebrew formula and bottles are **unofficial** and lag slightly
-      behind new Stack releases, but tend to be updated within a day or two.
+                ~~~text
+                configure: error: C compiler cannot build executables
+                ~~~
 
-    * Normally, Homebrew will install from a pre-built binary (aka "pour from a
-      bottle"), but if it starts trying to build everything from source (which
-      will take hours), see
-      [their FAQ on the topic](https://github.com/Homebrew/brew/blob/master/docs/FAQ.md#why-do-you-compile-everything).
+                In that case you should pass `-arch arm64` as part of the
+                `CFLAGS` environment variable. This setting will be picked up by
+                the C compiler of your choice.
 
-    ### Notes
+                ~~~bash
+                # Assuming BASH below
 
-    After installation, running `stack setup` might fail with
-    `configure: error: cannot run C compiled programs.` in which case you should
-    command:
+                # passing CFLAGS in-line with the command giving rise to the error
+                CFLAGS="-arch arm64 ${CFLAGS:-}" some_command_to_install_stack
+                CFLAGS="-arch arm64 ${CFLAGS:-}" stack [build|install]
 
-    ~~~text
-    xcode-select --install
-    ~~~
+                # -- OR --
 
-    Starting with macOs 10.14 (Mojave) running `xcode-select --install`
-    [might not be enough](https://forums.developer.apple.com/thread/104296). You
-    will need to install additional headers with commands:
+                # ~/.bash_profile
+                # NOTE: only do this if you do not have to cross-compile, or remember to unset
+                # CFLAGS when needed
+                export CFLAGS="-arch arm64 ${CFLAGS:-}"
+                ~~~
 
-    ~~~text
-    cd /Library/Developer/CommandLineTools/Packages/
-    open macOS_SDK_headers_for_macOS_10.14.pkg
-    ~~~
+                The setting instructs the C compiler to compile objects for
+                ARM64. These can then be linked with libraries built for ARM64.
+                Without the instruction, the C compiler, invoked by Cabal
+                running in x86-64, would compile x86-64 objects and attempt to
+                link them with existing ARM64 libraries, resulting in the error
+                above.
 
-    If you are on OS X 10.11 (El Capitan) and encounter either of these problems,
-    see the linked FAQ entries:
+            ??? question "Can I download Stack manually?"
 
-    * [GHC 7.8.4 fails with `/usr/bin/ar: permission denied`](faq.md#usr-bin-ar-permission-denied)
-    * [DYLD_LIBRARY_PATH is ignored](faq.md#dyld-library-path-ignored)
+                Yes:
 
-    If you are on macOS 10.12 (Sierra) and encounter GHC panic while building, see
-    this [issue](https://github.com/commercialhaskell/stack/issues/2577)
+                * Click
+                  [:material-cloud-download-outline:](https://get.haskellstack.org/stable/osx-aarch64.tar.gz)
+                  to download an archive file with the latest release for
+                  AArch64 architectures.
 
-    On Apple silicon chip (AArch64/ARM64) architectures, the installation of
-    Stack or some packages (e.g. `network`) requiring C source compilation might
-    fail with `configure: error: C compiler cannot build executables`. In that
-    case you should pass `-arch arm64` as part of the `CFLAGS` environment
-    variable. This setting will be picked up by the C compiler of your choice.
+                * Extract the archive and place `stack` somewhere on your PATH.
 
-    ~~~bash
-    # Assuming BASH below
+                Now you can run Stack from the command line in a terminal.
 
-    # passing CFLAGS in-line with the command giving rise to the error
-    CFLAGS="-arch arm64 ${CFLAGS:-}" some_command_to_install_stack
-    CFLAGS="-arch arm64 ${CFLAGS:-}" stack [build|install]
+        ??? question "Can I use the Homebrew package manager to get Stack?"
 
-    # -- OR --
+            [Homebrew](https://brew.sh/) is a popular package manager for macOS.
+            If you have its `brew` tool installed, you can just command:
 
-    # ~/.bash_profile
-    # NOTE: only do this if you do not have to cross-compile, or remember to unset
-    # CFLAGS when needed
-    export CFLAGS="-arch arm64 ${CFLAGS:-}"
-    ~~~
+            ~~~text
+            brew install haskell-stack
+            ~~~
 
-    The setting instructs the C compiler to compile objects for ARM64. These can
-    then be linked with libraries built for ARM64. Without the instruction, the C
-    compiler, invoked by Cabal running in x86-64, would compile x86-64 objects and
-    attempt to link them with existing ARM64 libraries, resulting in the error
-    above.
+            * The Homebrew formula and bottles are **unofficial** and lag
+              slightly behind new Stack releases, but tend to be updated within
+              a day or two.
 
-    It is possible to set up auto-completion of Stack commands. For further
-    information, see the [shell auto-completion](shell_autocompletion.md)
-    documentation.
+            * Normally, Homebrew will install from a pre-built binary (aka "pour
+              from a bottle"), but if it starts trying to build everything from
+              source (which will take hours), see
+              [their FAQ on the topic](https://github.com/Homebrew/brew/blob/master/docs/FAQ.md#why-do-you-compile-everything).
 
-=== "Windows"
+        ??? question "Can I set up auto-completion of Stack commands?"
 
-    On 64-bit Windows, you can download and install the
-    [Windows installer](https://get.haskellstack.org/stable/windows-x86_64-installer.exe).
+            Yes. For further information, see the
+            [shell auto-completion](topics/shell_autocompletion.md)
+            documentation.
 
-    !!! note "Anti-virus software"
+    === "Windows"
 
-        Systems with antivirus software may need to add Stack to the list of
-        'trusted' applications.
+        Most computers using Windows have a x86_64 machine architecture. More
+        recently, Microsoft has provided Windows on Arm that runs on other
+        processors.
 
-        You may see a "Windows Defender SmartScreen prevented an unrecognized
-        app from starting" warning when you try to run the installer. If so,
-        click on **More info**, and then click on the **Run anyway** button that
-        appears.
+        === "x86_64"
 
-    We recommend installing to the default location with the installer, as that
-    will make `stack install` and `stack upgrade` work correctly out of the box.
+            On 64-bit Windows, the easiest way to install Stack is to download
+            and use the
+            [Windows installer](https://get.haskellstack.org/stable/windows-x86_64-installer.exe).
 
-    ### Manual download
+            !!! info "Stack root"
 
-    * Click
-      [:material-cloud-download-outline:](https://get.haskellstack.org/stable/windows-x86_64.zip)
-      to download an archive file with the latest release.
+                By default, the Windows installer will set the
+                [Stack root](topics/stack_root.md) by setting the `STACK_ROOT`
+                environment variable to `C:\sr`.
 
-    * Unpack the archive and place `stack.exe` somewhere on your PATH (see the
-      [Path](#path) section below).
+            !!! note "Anti-virus software"
 
-    * Now you can run Stack from the command line in a terminal.
+                Systems with antivirus software may need to add Stack to the
+                list of 'trusted' applications.
 
-## Path
+                You may see a "Windows Defender SmartScreen prevented an
+                unrecognized app from starting" warning when you try to run the
+                installer. If so, click on **More info**, and then click on the
+                **Run anyway** button that appears.
 
-You can install Stack by copying the executable file anywhere on your PATH. A
-good place to install is the same directory where Stack itself will install
-executables, which depends on the operating system:
+            ??? warning "I have a Windows username with a space in it"
 
-=== "Unix-like"
+                GHC 9.4.1 and later have a bug which means they do not work if
+                the path to the `ghc` executable has a space character in it.
+                The default location for Stack's 'programs' directory will have
+                a space in the path if the value of the `USERNAME` environment
+                variable includes a space.
 
-    Stack installs executables to:
+                A solution is to configure Stack to use a different location for
+                its 'programs' directory. For further information, see the
+                [`local-programs-path`](configure/yaml/non-project.md#local-programs-path)
+                non-project specific configuration option documentation.
 
-    ~~~text
-    $HOME/.local/bin
-    ~~~
+            ??? warning "Stack 2.9.1, 2.9.3 and 2.11.1: Long user PATH environment variable"
 
-    If you don't have that directory in your PATH, you may need to update your
-    PATH. That can be done by editing the `~/.bashrc` file.
+                The Windows installer for Stack 2.9.1, 2.9.3 and 2.11.1 (only)
+                will replace the user `PATH` environment variable (rather than
+                append to it) if a 1024 character limit is exceeded. If the
+                content of your existing user `PATH` is long, preserve it before
+                running the installer.
 
-=== "Windows"
+            We recommend installing to the default location with the installer,
+            as that will make `stack install` and `stack upgrade` work correctly
+            out of the box.
 
-    Stack installs executables to:
+            ??? question "Can I download Stack manually?"
 
-    ~~~text
-    %APPDATA%\local\bin
-    ~~~
+                Yes:
 
-    For example: `C:\Users\<user-name>\AppData\Roaming\local\bin`.
-
-    If you don't have that directory in your PATH, you may need to update your
-    PATH. That can be done by searching for 'Edit Environment variables for your
-    account' under Start.
-
-!!! note
-
-    If you used [GHCup](https://www.haskell.org/ghcup/) to install Stack, GHCup
-    puts executable files in the `bin` directory in the GHCup root directory.
-
-## China-based users
-
-If you're attempting to install Stack from within China:
-
-* As of 24 February 2020, the download link has limited connectivity from within
-  mainland China. If this is the case, please proceed by manually downloading
-  (ideally via a VPN) and installing Stack per the instructions found on this
-  page pertinent to your operating system.
-
-* After installation, your `config.yaml` file will need to be configured before
-  Stack can download large files consistently from within China (without
-  reliance on a VPN). Please add the following to the bottom of the
-  `config.yaml` file:
-
-~~~yaml
-###ADD THIS IF YOU LIVE IN CHINA
-setup-info-locations:
-- "http://mirrors.tuna.tsinghua.edu.cn/stackage/stack-setup.yaml"
-urls:
-  latest-snapshot: http://mirrors.tuna.tsinghua.edu.cn/stackage/snapshots.json
-
-package-indices:
-  - download-prefix: http://mirrors.tuna.tsinghua.edu.cn/hackage/
-    hackage-security:
-        keyids:
-        - 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d
-        - 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42
-        - 280b10153a522681163658cb49f632cde3f38d768b736ddbc901d99a1a772833
-        - 2a96b1889dc221c17296fcc2bb34b908ca9734376f0f361660200935916ef201
-        - 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3
-        - 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921
-        - 772e9f4c7db33d251d5c6e357199c819e569d130857dc225549b40845ff0890d
-        - aa315286e6ad281ad61182235533c41e806e5a787e0b6d1e7eef3f09d137d2e9
-        - fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0
-        key-threshold: 3
-        ignore-expiry: no
-~~~
-
-## Using an HTTP proxy
-
-To use Stack behind a HTTP proxy with IP address *IP* and port *PORT*, first set
-up an environment variable `http_proxy` and then run the Stack command. For
-example:
-
-=== "Unix-like"
-
-    ~~~text
-    export http_proxy=IP:PORT
-    stack install
-    ~~~
+                * Click
+                  [:material-cloud-download-outline:](https://get.haskellstack.org/stable/windows-x86_64.zip)
+                  to download an archive file with the latest release.
 
-    On most operating systems, it is not mandatory for programs to follow the
-    "system-wide" HTTP proxy. Some programs, such as browsers, do honor this
-    "system-wide" HTTP proxy setting, while other programs, including Bash, do
-    not. That means configuring "http proxy setting" in your System Preferences
-    (macOS) would not result in Stack traffic going through the proxy.
+                * Unpack the archive and place `stack.exe` somewhere on your
+                  PATH.
 
-=== "Windows"
+                Now you can run Stack from the command line in a terminal.
 
-    ~~~text
-    $Env:http_proxy=IP:PORT
-    stack install
-    ~~~
+        === "Windows on Arm"
 
-    It is not mandatory for programs to follow the "system-wide" HTTP proxy.
-    Some programs, such as browsers, do honor this "system-wide" HTTP proxy
-    setting, while other programs do not. That means configuring
-    "http proxy setting" in your Control Panel would not result in Stack traffic
-    going through the proxy.
+            The GHC project does not yet provide a version of GHC that runs on
+            Windows on Arm.
 
-## Upgrade Stack
+    ??? note "China-based users: download"
+
+        As of 24 February 2020, the download link has limited connectivity from
+        within mainland China. If you experience this, please proceed by
+        manually downloading (ideally via a VPN) and installing Stack following
+        the instructions on this page that apply to your operating system.
 
-There are different approaches to upgrading Stack, which vary as between
-Unix-like operating systems (including macOS) and Windows.
+=== "GHCup"
 
-!!! note
+    The separate [GHCup](https://www.haskell.org/ghcup/) project provides a tool
+    that can be used to install Stack and other Haskell-related tools, including
+    GHC and
+    [Haskell Language Server](https://github.com/haskell/haskell-language-server)
+    (HLS). HLS is a program that is used by Haskell extensions for popular code
+    editors.
 
-    If you used [GHCup](https://www.haskell.org/ghcup/) to install Stack, you
-    should also use GHCup to upgrade Stack. GHCup uses an executable named
-    `stack` to manage versions of Stack, through a file `stack.shim`. Stack will
-    likely overwrite the executable on upgrade.
+    GHCup provides Stack for some combinations of machine architecture and
+    operating system not provided elsewhere.
 
-=== "Unix-like"
+    By default, the script to install GHCup (which can be run more than once)
+    also configures Stack so that if Stack needs a version of GHC, GHCup takes
+    over obtaining and installing that version.
 
-    There are essentially four different approaches:
+??? note "China-based users: configuration"
 
-    1.  The `stack upgrade` command, which downloads a Stack executable, or
-        builds it from source, and installs it to Stack's 'local-bin' directory
-        (see `stack path --local-bin`). If different and permitted, it also
-        installs a copy in the directory of the current Stack executable. (If
-        copying is not permitted, copy `stack` from Stack's 'local-bin'
-        directory to the system location afterward.) You can use `stack upgrade`
-        to get the latest official release, and `stack upgrade --git` to install
-        from GitHub and live on the bleeding edge. Make sure the location of the
-        Stack executable is on the PATH. See the [Path](#Path) section above.
+    After installation, Stack will need to be configured before it can download
+    large files consistently from within China (without reliance on a VPN).
+    Please add the following to the bottom of the
+    [global configuration file](configure/yaml/index.md) (`config.yaml`):
 
-    2.  If you're using a package manager and are happy with sticking with the
-        officially released binaries from the distribution (which may the lag
-        behind the latest version of Stack significantly), simply follow your
-        normal package manager strategies for upgrading. For example:
+    ~~~yaml
+    ###ADD THIS IF YOU LIVE IN CHINA
+    setup-info-locations:
+    - "http://mirrors.tuna.tsinghua.edu.cn/stackage/stack-setup.yaml"
+    urls:
+      latest-snapshot: http://mirrors.tuna.tsinghua.edu.cn/stackage/snapshots.json
+
+    package-index:
+      download-prefix: http://mirrors.tuna.tsinghua.edu.cn/hackage/
+    ~~~
+
+??? question "What if I am using an HTTP proxy?"
+
+    To use Stack behind a HTTP proxy with IP address *IP* and port *PORT*, first
+    set up an environment variable `http_proxy` and then run the Stack command.
+    For example:
+
+    === "Unix-like"
 
         ~~~text
-        apt-get update
-        apt-get upgrade
+        export http_proxy=IP:PORT
+        stack install
         ~~~
 
-    3.  The `get.haskellstack.org` script supports the `-f` argument to
-        over-write the current Stack executable. For example, command:
+        On most operating systems, it is not mandatory for programs to follow
+        the 'system-wide' HTTP proxy. Some programs, such as browsers, do honor
+        this 'system-wide' HTTP proxy setting, while other programs, including
+        Bash, do not. That means configuring 'http proxy setting' in your System
+        Preferences (macOS) would not result in Stack traffic going through the
+        proxy.
+
+    === "Windows"
 
         ~~~text
-        curl -sSL https://get.haskellstack.org/ | sh -s - -f
+        $Env:http_proxy=IP:PORT
+        stack install
         ~~~
 
-        or:
+        It is not mandatory for programs to follow the 'system-wide' HTTP proxy.
+        Some programs, such as browsers, do honor this 'system-wide' HTTP proxy
+        setting, while other programs do not. That means configuring
+        'http proxy setting' in your Control Panel would not result in Stack
+        traffic going through the proxy.
+
+    === "Windows (Command Prompt)"
 
         ~~~text
-        wget -qO- https://get.haskellstack.org/ | sh -s - -f
+        set http_proxy=IP:PORT
+        stack install
         ~~~
 
-    4.  Manually follow the steps above to download the newest executable from
-        the GitHub releases page and replace the old executable.
-
-=== "Windows"
-
-    There are essentially two different approaches:
-
-    1.  The `stack upgrade` command, which downloads a Stack executable, or
-        builds it from source, and installs it to Stack's 'local-bin' directory
-        (see `stack path --local-bin`). If different and permitted, it also
-        installs a copy in the directory of the current Stack executable. (If
-        copying is not permitted, copy `stack` from Stack's 'local-bin'
-        directory to the system location afterward.) You can use `stack upgrade`
-        to get the latest official release, and `stack upgrade --git` to install
-        from GitHub and live on the bleeding edge. Make sure the location of the
-        Stack executable is on the PATH. See the [Path](#Path) section above.
-
-    2.  Manually follow the steps above to download the newest executable from
-        the GitHub releases page and replace the old executable.
-
-## Install earlier versions
-
-To install a specific version of Stack, navigate to the desired version on the
-[GitHub release page](https://github.com/commercialhaskell/stack/releases), and
-click the appropriate link under its "Assets" drop-down menu.
-
-Alternatively, use the URL
-`https://github.com/commercialhaskell/stack/releases/download/vVERSION/stack-VERSION-PLATFORM.EXTENSION`.
-For example, the tarball for Stack version 2.1.0.1, osx-x86_64 is at
-`https://github.com/commercialhaskell/stack/releases/download/v2.1.0.1/stack-2.1.0.1-osx-x86_64.tar.gz`.
-
-Here's a snippet for `appveyor.yml` files, borrowed from `dhall`'s
-[`appveyor.yml`](https://github.com/dhall-lang/dhall-haskell/blob/1079b7a3a7a6922f72a373e47daf6f1b74f128b1/appveyor.yml).
-Change the values of PATH and VERSION as needed.
-
-~~~yaml
-install:
-  - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
-  - curl --silent --show-error --output stack.zip --location "https://github.com/commercialhaskell/stack/releases/download/v%STACK_VERSION%/stack-%STACK_VERSION%-windows-x86_64.zip"
-  - 7z x stack.zip stack.exe
-  - stack setup > nul
-  - git submodule update --init --recursive
-~~~
+        It is not mandatory for programs to follow the 'system-wide' HTTP proxy.
+        Some programs, such as browsers, do honor this 'system-wide' HTTP proxy
+        setting, while other programs do not. That means configuring
+        'http proxy setting' in your Control Panel would not result in Stack
+        traffic going through the proxy.
+
+## Upgrade Stack
+
+The Stack project recommends the use of the latest released version of Stack.
+
+If Stack is already installed, upgrading it depends on whether you are using
+Stack or GHCup to manage versions of Stack.
+
+=== "Stack"
+
+    ??? warning "If you use GHCup to manage versions of Stack, use it consistently"
+
+        If you used GHCup to install Stack, you should also use GHCup to upgrade
+        Stack.
+
+        GHCup uses an executable named `stack` to manage versions of Stack,
+        through a file `stack.shim`. Stack will likely overwrite the executable
+        on upgrade.
+
+    There are different approaches to upgrading Stack, which vary as between
+    Unix-like operating systems (including macOS) and Windows.
+
+    === "Unix-like"
+
+        There are essentially four different approaches:
+
+        <div class="grid cards" markdown>
+
+        -   __Use the `stack upgrade` command__
+
+            ---
+
+            For further information, see the
+            [`stack upgrade`](commands/upgrade_command.md) documentation.
+
+        -   __Manual download__
+
+            ---
+
+            Follow the steps above to download manually the newest executable
+            and replace the old executable.
+
+        -   __Use the `sh` installation script__
+
+            ---
+
+            Use the `get.haskellstack.org` script with its `-f` flag to
+            overwrite the current Stack executable. For example, command
+            either:
+
+            ~~~text
+            curl -sSL https://get.haskellstack.org/ | sh -s - -f
+            ~~~
+
+            or:
+
+            ~~~text
+            wget -qO- https://get.haskellstack.org/ | sh -s - -f
+            ~~~
+
+        -   __Use a package manager__
+
+            ---
+
+            Follow your normal package manager approach to upgrading. For
+            example:
+
+            ~~~text
+            apt-get update
+            apt-get upgrade
+            ~~~
+
+            Be aware that officially released binaries from the distribution may
+            lag behind the latest version of Stack significantly.
+
+        </div>
+
+    === "Windows"
+
+        There are essentially two different approaches:
+
+        <div class="grid cards" markdown>
+
+        -   __Use the `stack upgrade` command__
+
+            ---
+
+            For further information, see the
+            [`stack upgrade`](commands/upgrade_command.md) documentation.
+
+        -   __Manual download__
+
+            ---
+
+            Follow the steps above to download manually the newest executable
+            and replace the old executable.
+
+        </div>
+
+=== "GHCup"
+
+    The separate [GHCup](https://www.haskell.org/ghcup/) project provides
+    guidance about how to use GHCup to manage versions of tools such as Stack.
diff --git a/doc/lock_files.md b/doc/lock_files.md
deleted file mode 100644
index 8587833747..0000000000
--- a/doc/lock_files.md
+++ /dev/null
@@ -1,174 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# Lock Files
-
-Stack attempts to provide reproducible build plans. This involves reproducibly
-getting the exact same contents of source packages and configuration options
-(like Cabal flags and GHC options) for a given set of input files. There are a
-few problems with making this work:
-
-* Entering all of the information to fully provide reproducibility is tedious.
-  This would include things like Hackage revisions, hashes of remote tarballs,
-  etc. Users don't want to enter this information.
-* Many operations in Stack rely upon a "snapshot hash," which transitively
-  includes the completed information for all of these dependencies. If any of
-  that information is missing when parsing the `stack.yaml` file or snapshot
-  files, it could be expensive for Stack to calculate it.
-
-To address this, we follow the (fairly standard) approach of having a
-_lock file_. The goal of the lock file is to cache completed locations of
-project, snapshot packages and snapshots themselves so that:
-
-* These files can be stored in source control
-* Users on other machines can reuse these lock files and get identical build
-  plans given that the used local packages and local snapshots are the same on
-  those machines
-* Rerunning `stack build` in the future is deterministic in the build plan, not
-  depending on mutable state in the world like Hackage revisions
-
-    !!! note
-
-        If, for example, a tarball available remotely is deleted or the hash
-        changes, it will not be possible for Stack to perform the build.
-        However, by deterministic, we mean it either performs the same build or
-        fails, never accidentally doing something different.
-
-This document explains the contents of a lock file, how they are used, and how
-they are created and updated.
-
-## stack.yaml and snapshot files
-
-Relevant to this discussion, Stack's project-level configuration file
-(`stack.yaml`) specifies:
-
-* the parent snapshot (`resolver` or `snapshot`)
-* extra-deps
-
-Some of this information can be incomplete. Consider this `stack.yaml` file:
-
-~~~yaml
-resolver: lts-19.22
-packages:
-- .
-extra-deps:
-- acme-missiles-0.3
-~~~
-
-This information is _incomplete_. For example, the extra-deps may change in the
-future. Instead, you could specify enough information in the `stack.yaml` file
-to fully resolve that package. That looks like:
-
-~~~yaml
-extra-deps:
-- hackage: acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1,613
-  pantry-tree:
-    size: 226
-    sha256: 614bc0cca76937507ea0a5ccc17a504c997ce458d7f2f9e43b15a10c8eaeb033
-~~~
-
-The `lts-19.22` information is also incomplete. While we assume in general that
-Haskell LTS snapshots never change, there's nothing that prohibits that from
-happening. Instead, the complete version of that key is:
-
-~~~yaml
-resolver:
-- url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/22.yaml
-  size: 619399
-  sha256: 5098594e71bdefe0c13e9e6236f12e3414ef91a2b89b029fd30e8fc8087f3a07
-~~~
-
-Users don't particularly feel like writing all of that. Therefore, it's common
-to see _incomplete_ information in a `stack.yaml` file.
-
-## Recursive snapshot layers
-
-Snapshot files can be _recursive_, where `stack.yaml` refers to `foo.yaml`,
-which refers to `bar.yaml`, which refers to `baz.yaml`. A local snapshot file
-can refer to a remote snapshot file (available via an HTTP(S) URL).
-
-We need to encode information from _all_ of these snapshot layers and the
-`stack.yaml` file in the lock file, to ensure that we can detect if anything
-changes.
-
-## Performance
-
-In addition to acting as a pure correctness mechanism, the design of a lock file
-given here also works as a performance improvement. Instead of requiring that
-all snapshot files be fully parsed on each Stack invocation, we can store
-information in the lock file and bypass parsing of the additional files in the
-common case of no changes.
-
-## Lock file contents
-
-The lock file contains the following information:
-
-* Completed package locations for extra deps and packages in snapshot files
-
-    !!! note
-
-        This only applies to _immutable_ packages. Mutable packages are not
-        included in the lock file.
-
-* Completed information for the snapshot locations
-
-It looks like the following:
-
-~~~yaml
-# Lock file, some message about the file being auto-generated
-snapshots:
-  # Starts with the snapshot specified in stack.yaml,
-  # then continues with the snapshot specified in each
-  # subsequent snapshot file
-  - original:
-      foo.yaml # raw content specified in a snapshot file
-    completed:
-      file: foo.yaml
-      sha256: XXXX
-      size: XXXX
-  - original:
-      lts-13.9
-    completed:
-      size: 496662
-      url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/9.yaml
-      sha256: 83de9017d911cf7795f19353dba4d04bd24cd40622b7567ff61fc3f7223aa3ea
-
-packages:
-- original: https://hackage.haskell.org/package/acme-missiles-0.3.tar.gz
-  completed:
-    size: 1442
-    url: https://hackage.haskell.org/package/acme-missiles-0.3.tar.gz
-    name: acme-missiles
-    version: '0.3'
-    sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b
-    pantry-tree:
-      size: 226
-      sha256: 614bc0cca76937507ea0a5ccc17a504c997ce458d7f2f9e43b15a10c8eaeb033
-~~~
-
-## Creation
-
-Whenever a project-level configuration file (`stack.yaml`) is loaded, Stack
-checks for a lock file in the same file path, with a `.lock` extension added.
-For example, if you command:
-
-~~~text
-stack build --stack-yaml my-stack.yaml
-~~~
-
-Stack will use a lock file in the location `my-stack.yaml.lock`. For the rest of
-this document, we'll assume that the files are simply `stack.yaml` and
-`stack.yaml.lock`.
-
-If the lock file does not exist, it will be created by:
-
-* Loading the `stack.yaml`
-* Loading all snapshot files
-* Completing all missing information
-* Writing out the new `stack.yaml.lock` file
-
-## Update procedure
-
-When loading a Stack project all completed package or snapshot locations (even
-when they were completed using information from a lock file) get collected to
-form a new lock file in memory and compare against the one on disk, writing if
-there are any differences.
diff --git a/doc/maintainers/7zip.md b/doc/maintainers/7zip.md
index 9a27b17da4..19d1149b2f 100644
--- a/doc/maintainers/7zip.md
+++ b/doc/maintainers/7zip.md
@@ -79,7 +79,7 @@ need to be updated frequently. On 10 September 2022, it was updated from 7-Zip
     * executing the command:
 
         ~~~text
-        stack --resolver <snapshot> setup --setup-info-yaml <path to local copy of stack-setup-2.yaml>
+        stack --snapshot <snapshot> setup --setup-info-yaml <path to local copy of stack-setup-2.yaml>
         ~~~
 
       where `<snapshot>` requires the missing version of GHC.
diff --git a/doc/maintainers/docker.md b/doc/maintainers/archive/docker.md
similarity index 97%
rename from doc/maintainers/docker.md
rename to doc/maintainers/archive/docker.md
index 9848c378bf..5550b38956 100644
--- a/doc/maintainers/docker.md
+++ b/doc/maintainers/archive/docker.md
@@ -67,7 +67,7 @@ with the previous minor LTS snapshot version.
 - Test the new image. For example, command:
 
     ~~~text
-    stack --resolver=lts-<N>.<M> new image-test
+    stack --snapshot=lts-<N>.<M> new image-test
     cd image-test
     stack --docker build
     ~~~
@@ -136,7 +136,7 @@ major LTS snapshot version.
 - Try building a test package with the new image. Command:
 
     ~~~text
-    stack --resolver=nightly new image-test`
+    stack --snapshot=nightly new image-test`
     cd image-test
     stack --docker --docker-image=local/stack-build build
     ~~~
@@ -152,7 +152,7 @@ major LTS snapshot version.
 - Try building a test package with the new small image. Command:
 
     ~~~text
-    stack --resolver=nightly new small-image-test
+    stack --snapshot=nightly new small-image-test
     cd small-image-test
     stack --docker --docker-image=local/stack-build-small build
     ~~~
diff --git a/doc/maintainers/archive/docker_images.md b/doc/maintainers/archive/docker_images.md
new file mode 100644
index 0000000000..e5f9a933b9
--- /dev/null
+++ b/doc/maintainers/archive/docker_images.md
@@ -0,0 +1,34 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Docker images
+
+Docker Hub includes Docker images under
+[`fpco/stack-build'](https://hub.docker.com/r/fpco/stack-build).
+
+To update those images with a new version of Stack:
+
+1.  Under
+    [commercialhaskell/stackage/automated/dockerfiles](https://github.com/commercialhaskell/stackage/tree/master/automated/dockerfiles/),
+    add `lts-X.Y/Dockerfile` (where `X.Y` is the latest Stackage Haskell LTS
+    version), containing (where `X.Z` is the previous Haskell LTS version,
+    and `X.Y.Z` is the newly released Stack version):
+
+    ~~~dockerfile
+    FROM $DOCKER_REPO:lts-X.Z
+    ARG STACK_VERSION=X.Y.Z
+    RUN wget -qO- https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C /usr/local/bin '*/stack'
+    ~~~
+
+2.  Run `./build.sh lts-X.Y`. Then test that the new image has the new
+    version of Stack. For example, command:
+
+    ~~~text
+    docker run --rm fpco/stack-build:lts stack --version
+    ~~~
+
+3.  Use the following commands to push the new image to the registry:
+
+    ~~~text
+    ./build.sh --push lts-X.Y
+    ./build.sh --push --small lts-X.Y
+    ~~~
diff --git a/doc/maintainers/archive/releases.md b/doc/maintainers/archive/releases.md
index 92c84a4caf..5cc3e0b936 100644
--- a/doc/maintainers/archive/releases.md
+++ b/doc/maintainers/archive/releases.md
@@ -33,7 +33,7 @@ any Linux distribution.
 - Check out Stack commit to be released to `~/stack-release` (or elsewhere, in
   which case adjust following instructions)
 
-- `rm -f ~/stack-release/*.cabal`, to ensure it's regenerated
+- `rm -f ~/stack-release/*.cabal`, to ensure it is regenerated
 
 - clone https://github.com/nh2/static-haskell-nix recursively (last known to
   work with commit 725ceb2479637b3b3ab29298a1bc0e48c54984c9)
@@ -233,7 +233,7 @@ Now continue to the **General Windows setup** subsection below.
    git config --global user.name "Emanuel Borsboom"
    ~~~
 
-10. Install build tools and dependencies packages
+10. Install tools used during building and dependencies packages
 
     ~~~text
     sudo apt-get install -y g++ gcc libc6-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg
diff --git a/doc/maintainers/ghc.md b/doc/maintainers/ghc.md
index de17ad1362..30ed59cc52 100644
--- a/doc/maintainers/ghc.md
+++ b/doc/maintainers/ghc.md
@@ -40,7 +40,7 @@
   Before committing, test using a command like:
 
     ~~~text
-    stack --resolver=ghc-X.Y.Z setup --setup-info-yaml=path/to/stackage-content/stack/stack-setup-2.yaml
+    stack --snapshot=ghc-X.Y.Z setup --setup-info-yaml=path/to/stackage-content/stack/stack-setup-2.yaml
     ~~~
 
 * In [stackage-content](https://github.com/fpco/stackage-content), command:
diff --git a/doc/maintainers/haskellstack.org.md b/doc/maintainers/haskellstack.org.md
index 5cf3bee193..4062d85e52 100644
--- a/doc/maintainers/haskellstack.org.md
+++ b/doc/maintainers/haskellstack.org.md
@@ -40,25 +40,23 @@ page using the flyout.
 Stack moved from MkDocs 0.17.3 to MkDocs 1.3.1 after publishing the
 documentation for Stack 2.7.5.
 
-A YAML configuration file, `.readthedocs.yaml` is included in the repository
-root directory. See https://docs.readthedocs.io/en/stable/config-file/v2.html.
-It specifies a Python requirements file in `doc/requirements.txt`.
+A configuration file, `.readthedocs.yaml` is included in the repository root
+directory. See https://docs.readthedocs.io/en/stable/config-file/v2.html. It
+specifies a Python requirements file in `doc/requirements.txt`.
 
 ## MkDocs
 
 The `doc/requirements.txt` file pins the version of MkDocs. As at
-2 September 2021 it is set to:
+13 April 2025 it is set to:
 
-    mkdocs==1.3.1
+    mkdocs==1.6.0
 
-A YAML configuration file, `mkdocs.yml` is included in the repository root
-directory. See https://www.mkdocs.org/user-guide/configuration/.
+A configuration file, `mkdocs.yml` is included in the repository root directory.
+See https://www.mkdocs.org/user-guide/configuration/.
 
 `site_dir: _site` specifies the directory where the output HTML and other files
 are created. This directory is added to the `.gitignore` file.
 
-MkDocs 1.3.0 replaced the `pages:` key with the `nav:` key.
-
 ## Material for MkDocs
 
 Stack moved from the default `readthedocs` theme to Material for MkDocs after
@@ -77,8 +75,16 @@ theme:
   palette:
     primary: 'deep purple'
     accent: 'deep purple'
-  icon:
-    logo: material/language-haskell
+  logo: img/stack-logo-white.svg
+  favicon: img/stack-favicon.svg
+  features:
+  - content.code.annotate
+  - content.code.copy
+  - content.code.select
+  - content.tabs.link
+  - navigation.indexes
+  - navigation.tabs
+  - navigation.top
 ~~~
 
 Read the Docs requires [JQuery](https://jquery.com/) for its JavaScript code to
@@ -137,6 +143,8 @@ Other extensions to the basic Markdown syntax used include:
         The `octicons-tag-24` icon (:octicons-tag-24:) is used to refer to
         versions of Stack. The `material-cloud-download-outline` icon
         (:material-cloud-download-outline:) is used to signify a download link.
+        The `octicons-beaker-24` icon (:octicons-beaker-24:) is used with
+        'Experimental' to signify that a feature is experimental.
 
 ## Testing online documentation
 
diff --git a/doc/maintainers/msys.md b/doc/maintainers/msys.md
index 22d9e1eeac..7e184860ff 100644
--- a/doc/maintainers/msys.md
+++ b/doc/maintainers/msys.md
@@ -17,26 +17,55 @@ the steps required to upgrade the MSYS2 version used by Stack.
     64 bit version; the location for the 32 bit version was `C:\msys32`). Do not
     use the installed version; it will create a `.bash_history` file if you do.
 
-3.  Create a tarball for each relevant directory (eg `C:\msys64`). That requires
-    a version of [`tar`](https://www.gnu.org/software/tar/tar.html) that
-    supports the compression option `--xz`. The version of `tar` that is
-    supplied with Windows (`C:\Windows\System32\tar.exe`) does not support that
-    option, but MSYS2 can supply a [version](https://packages.msys2.org/package/tar)
-    that does (using its `pacman` tool). Using the existing Stack-supplied
-    MSYS2, in PowerShell and located in a folder with write permissions (so the
-    `.tar.xz` file can be created), command:
+3.  Create an `.tar.xz` archive file for each relevant directory (eg
+    `C:\msys64`). That is best done using the same `7z` executable in Stack's
+    'programs' directory (`stack path --programs`) that will be used to extract
+    files from the archive. That can be done in two steps: the first to create a
+    `.tar` archive, and the second to create a `.tar.xz` archive. If the current
+    working directory is Stack's 'programs' directory:
 
     ~~~text
-    stack exec -- pacman -S tar
-    stack exec -- tar cJf msys2-YYYYMMDD-x86_64.tar.xz C:\msys64
+    ./7z a msys2-YYYYMMDD-x86_64.tar C:\msys64
+    ./7z a msys2-YYYYMMDD-x86_64.tar.xz msys2-YYYYMMDD-x86_64.tar
+    rm msys2-YYYYMMDD-x86_64.tar # Tidy up
     ~~~
 
-4.  Create a new release tagged and named `msys2-YYYYMMDD` in the `master`
+    !!! note
+
+        Previously, the advice was that creating the archive file required a
+        version of [`tar`](https://www.gnu.org/software/tar/tar.html) that
+        supported the compression option `--xz`. The version of `tar` that is
+        supplied with Windows (`C:\Windows\System32\tar.exe`) does not support
+        that option, but MSYS2 can supply a
+        [version](https://packages.msys2.org/package/tar) that does (using its
+        `pacman` tool). Using the existing Stack-supplied MSYS2, in PowerShell
+        and located in a folder with write permissions (so the `.tar.xz` file
+        can be created), it was advised to command:
+
+        ~~~text
+        stack exec -- pacman -S tar
+        stack exec -- tar cJf msys2-YYYYMMDD-x86_64.tar.xz C:\msys64
+        ~~~
+
+        However, in the case of `msys2-20220503` that resulted in an archive
+        that could not extracted on a terminal that did not have elevated rights
+        ('Run as administrator') due to errors
+        `ERROR: Cannot create symbolic link : A required privilege is not held by the client`.
+
+4.  Test that the Stack-supplied `7z` executable can extract the files in the
+    archive that has been created without error:
+
+    ~~~test
+    ./7z x msys2-YYYYMMDD-x86_64.tar.xz
+    ./7z x msys2-YYYYMMDD-x86_64.tar
+    ~~~
+
+5.  Create a new release tagged and named `msys2-YYYYMMDD` in the `master`
     branch of the
     [commercialhaskell/stackage-content](https://github.com/commercialhaskell/stackage-content)
     GitHub repository, uploading the tarball file(s) into that release.
 
-5.  Changes need to be made to the
+6.  Changes need to be made to the
     [stackage-content/stack/stack-setup-2.yaml](https://github.com/commercialhaskell/stackage-content/blob/master/stack/stack-setup-2.yaml)
     file, to switch over to using the newly uploaded files. For example
     (extract):
@@ -66,7 +95,7 @@ the steps required to upgrade the MSYS2 version used by Stack.
 
     The `sha256:` key only accepts lowercase hash results as values.
 
-6.  The changed `stack-setup-2.yaml` file should be tested locally. This can be
+7.  The changed `stack-setup-2.yaml` file should be tested locally. This can be
     done by:
 
     * temporarily disabling the existing local copy of MSYS2 by changing the
@@ -82,5 +111,5 @@ the steps required to upgrade the MSYS2 version used by Stack.
     If all is well, the command should proceed to download the updated version
     of MSYS2 that has been specified.
 
-7.  Raise a pull request on `commercialhaskell/stackage-contents` for the
+8.  Raise a pull request on `commercialhaskell/stackage-contents` for the
     changes to the locally-tested `stack-setup-2.yaml` file.
diff --git a/doc/maintainers/releases.md b/doc/maintainers/releases.md
index d2e3baf4e2..b2226078dd 100644
--- a/doc/maintainers/releases.md
+++ b/doc/maintainers/releases.md
@@ -2,79 +2,47 @@
 
 # Releases
 
-!!! todo "To do - Simplify the branch or version structure"
-
-    Just release from the `master` branch (but keep the `stable` branch
-    tracking the latest stable release plus updates to documentation).
-
-!!! todo "To do - Remove the `-static` version"
-
-    At some point (a couple of major releases after Stack 2.3.1), remove the
-    `-static` version from
-    https://github.com/commercialhaskell/stackage-content/blob/master/stack/releases.yaml.
-    People still using that will get an error, and we'll add a release note to
-    switch over to https://get.haskellstack.org/stable/linux-x86_64.tar.gz
-    instead (and note that www.stackage.org/stack is deprecated).
-
-## Version scheme
-
-A Stack package or executable may have a version with three or four components:
-X.Y.Z or X.Y.Z.A.
-
-### Development or stable versions
-
-* Versions with an _even_ 'Y' component are development versions (the `master`
-  branch)
-* Versions with an _odd_ 'Y' component are stable versions (the `stable` branch,
-  or in a `rc/vX.Y` release candidate branch for not-yet-released versions)
-
-### Unreleased or released versions
-
-* Versions with an _even_ 'Z' component are unreleased versions (including
-  release candidates)
-* Versions with an _odd_ 'Z' component are released versions
-* Except for the `release` branch (which matches exactly the most recent
-  release), all branches must have an even 'Z' component
-* Branches other than `stable`, `release`, and a `rc/vX.Y` release candidate
-  will always have a `0` 'Z' component
-
-### Use of a fourth component
-
-* Release candidate binaries will be released with an odd 'A' component
-* Hackage-only dependency compatibility patch releases add a 'A' component
-  (e.g. v1.7.3.1, in the `release` branch)
-* Pre-release unstable binaries will be released with the date as the 'A'
-  component (e.g. 2.10.0.20220920)
-
-Examples:
-
-* `1.7.0.0`: v1.7.x series pre-release branch (`v1.7` branch)
-* `1.7.0.1`: release candidate for first release of v1.7.x series (`v1.7`
-  branch)
-* `1.7.0.2`: continuing development on pre-release branch
-* `1.7.0.3`: second release candidate for first release of v1.7.x series (`v1.7`
-  branch)
-* `1.7.1`: first release of the 1.7.x series (`release` branch)
-* `1.7.2.0`: development for second release of 1.7.x series (`stable` branch)
-* `1.7.2.1`: release candidate for second release of 1.7.x series (`stable`
-  branch)
-* `1.7.3`: second release of 1.7.x series (`release` branch)
-* `1.7.3.1`: first Hackage-only patch of 1.7.3 (`release` branch)
-* `1.7.3.2`: second Hackage-only patch of 1.7.3 (`release` branch)
-* `1.8.0`: unstable development code (`master` branch)
-* `1.8.0.20181004`: pre-release snapshot of unstable version (`master` branch)
+## Branches
+
+* The `release` branch is intended to preserve the most recent release
+  (including, if applicable, Hackage-only dependency compatibility patch
+  releases).
+
+* The `stable` branch is intended to be a copy of the `release` branch together
+  with any subsequent commits that (only) revise the documentation for the most
+  recent release. That documentation is presented at <https://haskellstack.org>.
+
+* The `master` branch is the current development branch. It is intended that a
+  working version of Stack can be built from the branch. The release process
+  begins with a copy of the branch.
+
+* A `rc/vX.Y` branch (named after a release in the Stack X.Y.* series) is
+  intended to be for release candidates and final releases. It begins as a copy
+  of the `master` branch.
 
 ## Pre-release checks
 
-1.  Check for any P0 and P1 issues that should be dealt with before release.
-2.  Check for un-merged pull requests that should be merged before release.
-3.  Ensure the `release` and `stable` branches are merged to the `master`
+1.  Check that Stack is built against the most recent version of `hpack`
+    released on Hackage. If not, create an issue and/or raise a pull request
+    accordingly.
+
+2.  Check for any important issues that should be dealt with before release.
+
+3.  Check for un-merged pull requests that should be merged before release.
+
+4.  Ensure the `release` and `stable` branches are merged to the `master`
     branch.
-4.  Check the copyright dates, and update if needed.
-5.  Ensure CI matrices in docs (travis-complex, appveyor, azure) have current
+
+5.  Check the copyright dates, and update if needed.
+
+6.  Check the backwards compatibility section of `CONTRIBUTING.md` is up to
+    date.
+
+7.  Ensure CI matrices in docs (travis-complex, appveyor, azure) have current
     stackage snapshots and GHC versions (e.g.
     https://github.com/commercialhaskell/stack/pull/4565/files)
-6.  Update the `stack-*.yaml` that uses a `nightly` snapshot to the latest
+
+8.  Update any `stack-*.yaml` that uses a `nightly` snapshot to the latest
     nightly (go over the extra-deps too) and ensure the project builds and tests
     pass. For example, command:
 
@@ -82,44 +50,70 @@ Examples:
     stack build --stack-yaml=… --haddock --test --bench --no-run-benchmarks
     ~~~
 
-7.  Ensure the integration tests pass on Linux, macOS and Windows.
+9.  The Windows installer is built using an
+    [NSIS compiler](https://nsis.sourceforge.io/Main_Page). Check that the NSIS
+    compiler that will be used is capable of handling
+    [large strings](https://nsis.sourceforge.io/Special_Builds).
+
+10. Ensure the integration tests pass on Linux, macOS and Windows.
+
+11. Some people prefer, or need, to build Stack with Cabal (the tool). Check
+    that `cabal.project` is up to date (the specified `with-compiler:`). Check
+    that `cabal.config` is up to date and is not missing dependencies relevant
+    on Windows and non-Windows operating systems, following the instructions in
+    `cabal.project`.
 
 ## Release preparation
 
 ### A: In the `master` branch
 
-* `package.yaml`: bump to the next release candidate version (bump the second
-  component to the next odd number, ensure the third component is `0`, and add
-  patchlevel `0`; e.g. from `1.8.0` to `1.9.0.0`).
+1.  `package.yaml`: bump to the next release candidate version (bump the second
+    component to the next odd number, ensure the third component is `0`, and add
+    patchlevel `0`; e.g. from `4.0.0` to `4.1.0.0`).
 
     !!! attention
 
         Be sure to update also `stack.cabal` (for example by using
         `stack build --dry-run`).
 
-* `ChangeLog.md`: Check for any entries that snuck into the previous version's
-  changes due to merges (`git diff origin/stable HEAD ChangeLog.md`)
+2.  `cabal.config`: Ensure the `stack` constraint is set to the same version as
+    in the `package.yaml`.
+
+3.  `ChangeLog.md`: Check for any entries that snuck into the previous version's
+    changes due to merges (`git diff origin/stable HEAD ChangeLog.md`)
+
+4.  Commit the changes to the `master` branch.
 
 ### B: Create a new release candidate branch
 
-Cut a new release candidate (RC) branch named `rc/vX.Y` from the `master`
-branch.
+From the `master` branch, checkout a new release candidate (RC) branch named
+`rc/vX.Y` (replacing `X.Y` with the first and second components of the release
+version).
+
+~~~text
+git checkout -b rc/vX.Y
+~~~
 
 ### C: Return to the `master` branch
 
-* `package.yaml`: bump version to the next unstable version (bump the second
-  component to the next even number, ensure the third component is `0`; e.g.
-  from `1.9.0` to `1.10.0`).
+1.  `package.yaml`: bump version to the next unstable version (bump the second
+    component to the next even number, ensure the third component is `0`; e.g.
+    from `4.1.0` to `4.2.0`).
 
     !!! attention
 
         Be sure to update also `stack.cabal` (for example by using
         `stack build --dry-run`).
 
-* `Changelog.md`:
-    * Change the title of the existing **Unreleased changes** section to what
-      will be the next final (non-RC) release (e.g. `v2.1.1`).
-    * Add new "Unreleased changes" section:
+2.  `cabal.config`: Ensure the `stack` constraint is set to the same version as
+    in the `package.yaml`.
+
+3.  `Changelog.md`:
+
+    *   Change the title of the existing **Unreleased changes** section to what
+        will be the next final (non-RC) release (e.g. `v4.1.1`).
+
+    *   Add new "Unreleased changes" section:
 
         ~~~markdown
         ## Unreleased changes
@@ -137,90 +131,92 @@ branch.
         Bug fixes:
         ~~~
 
-### D: In the release candidate branch
+4.  Commit the changes to the `master` branch.
 
-Review documentation for any changes that need to be made:
+### D: For each release candidate, in the release candidate branch
 
-* Ensure all the documentation pages are listed in the `mkdocs.yaml` file. Use
-  `git diff --stat origin/stable..HEAD doc/` to look for new or deleted files.
-* Any new documentation pages should have the "may not be correct for
-  the released version of Stack" warning at the top.
-* Search for old Stack version, unstable Stack version, and the next "obvious"
-  possible versions in sequence, and `UNRELEASED` and replace with next release
-  version (`X.Y.1`, where Y is odd).
+1.  Review documentation for any changes that need to be made:
 
-    !!! attention
+    *   Ensure all the documentation pages are listed in the `mkdocs.yaml` file.
+        Use `git diff --stat origin/stable..HEAD doc/` to look for new or
+        deleted files.
 
-        Do **NOT** update the Dockerfiles in
-        [stackage/automated/dockerfiles](https://github.com/commercialhaskell/stackage/tree/master/automated/dockerfiles/)
-        yet. That step will come later.
+    *   Any new documentation pages should have the "may not be correct for the
+        released version of Stack" warning at the top.
 
-    !!! attention
+    *   Search for old Stack version, unstable Stack version, and the next
+        "obvious" possible versions in sequence, and `UNRELEASED` and replace
+        with next release version (`X.Y.1`, where Y is odd).
 
-        Do **NOT** update the repository's issue and pull request templates (in
-        the `.github` directory)to point at the new release version yet!
+        !!! attention
 
-* Search for old resolvers, set to latest resolver (e.g. in `doc/GUIDE.md` where
-  it references the "currently the latest LTS")
-* Look for any links to "latest" (`latest/`) documentation, replace with
-  version tag
+            Do **NOT** update the repository's issue and pull request templates
+            (in the `.github` directory) to point at the new release version
+            yet!
 
-Check for any platform entries that need to be added to (or removed from):
+    *   Search for old snapshots, set to latest snapshot (e.g. in documentation
+        where it references the "currently the latest LTS")
 
-* [releases.yaml](https://github.com/fpco/stackage-content/blob/master/stack/releases.yaml),
-* [install_and_upgrade.md](https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md),
-* [get-stack.sh](https://github.com/commercialhaskell/stack/blob/master/etc/scripts/get-stack.sh),
-* [doc/README.md](https://github.com/commercialhaskell/stack/blob/master/doc/README.md),
-  and
-* `get.haskellstack.org` redirects.
+    *   Look for any links to "latest" (`latest/`) documentation, replace with
+        version tag
 
-### E: For the first release candidate
+2.  Check for any platform entries that need to be added to (or removed from):
 
-1. Re-do the pre-release checks (see the section above).
-2. `package.yaml`: bump to first odd patchlevel version (e.g. `X.Y.0.1`).
+    * [releases.yaml](https://github.com/fpco/stackage-content/blob/master/stack/releases.yaml),
 
-    !!! attention
+    * [install_and_upgrade.md](https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md),
 
-        Be sure to update also `stack.cabal` (for example by using
-        `stack build --dry-run`).
+    * [get-stack.sh](https://github.com/commercialhaskell/stack/blob/master/etc/scripts/get-stack.sh),
 
-3. `ChangeLog.md`: Rename the “Unreleased changes” section to the same version
-   as `package.yaml`, and mark it clearly as a release candidate (e.g.
-   `vX.Y.0.1 (release candidate)`). Remove any empty sections.
-4. Follow the steps in the *Release process* section below that apply to a
-   release candidate.
+    * [doc/README.md](https://github.com/commercialhaskell/stack/blob/master/doc/README.md),
+      and
 
-### F: For any subsequent release candidates
+    * `get.haskellstack.org` redirects.
 
-1. Re-do the pre-release checks (see the section above).
-2. `package.yaml`: bump to next odd patchlevel version (e.g. `X.Y.0.3`).
+3.  Re-do the pre-release checks (see the section above).
 
-    !!! attention
+4.  Update `package.yaml` and `ChangeLog.md`. This step differs between a first,
+    second etc release candidate and a final release.
 
-        Be sure to update also `stack.cabal` (for example by using
-        `stack build --dry-run`).
+    === "First RC"
+
+        *   `package.yaml`: bump to first odd patchlevel version (e.g.
+            `X.Y.0.1`).
+
+        *   `ChangeLog.md`: Rename the “Unreleased changes” section to the same
+            version as `package.yaml`, and mark it clearly as a release
+            candidate (e.g. `vX.Y.0.1 (release candidate)`). Remove any empty
+            sections.
+
+    === "Second, third etc RC"
+
+        *   `package.yaml`: bump to next odd patchlevel version (e.g.
+            `X.Y.0.3`).
 
-3. `ChangeLog.md`: Rename the "Unreleased changes" section to the new version,
-   clearly marked as a release candidate (e.g. `vX.Y.0.3 (release candidate)`).
-   Remove any empty sections.
-4. Follow the steps in the *Release process* section below that apply to a
-   release candidate.
+        *   `ChangeLog.md`: Rename the “Unreleased changes” section to the same
+            version as `package.yaml`, and mark it clearly as a release
+            candidate (e.g. `vX.Y.0.3 (release candidate)`). Remove any empty
+            sections.
 
-### G: For the final release
+    === "Final Release"
 
-1. Re-do the pre-release checks (see the section above).
-2. `package.yaml`: bump version to odd last component and no patchlevel
-   (e.g. from `X.Y.0.2` to `X.Y.1`).
+        *   `package.yaml`: bump version to odd last component and no patchlevel
+            (e.g. from `X.Y.0.2` to `X.Y.1`).
+
+        *   `ChangeLog.md`: consolidate all the release candidate changes into a
+            single section for the final release version.
 
     !!! attention
 
-        Be sure to update also `stack.cabal` (for example by using
-        `stack build --dry-run`).
+        After updating `package.yaml`, be sure to update also `stack.cabal` (for
+        example by using `stack build --dry-run`).
+
+5.  Ensure the `stack ==` constraint in `cabal.config` is set to be equal to the
+    same version as `package.yaml`.
 
-3. `ChangeLog.md`: consolidate all the release candidate changes into a single
-   section for the final release version.
-4. Follow all of the steps in the *Release process* section below that apply to
-   a final release.
+6.  Commit the changes to the release candidate branch.
+
+7.  Follow the steps in the *Release process* section below that apply.
 
 ## Release process
 
@@ -261,22 +257,89 @@ final release.
 
     * Add `(release candidate)` to the name field and ensure that
       *This is a pre-release* is checked.
+
     * Add the ChangeLog to the description.
 
     Publish the GitHub release.
 
-    ### D: Update versions and `ChangeLog.md` for 'unreleased'
+    ### D: Consider adding other platforms to the GitHub release
+
+    The
+    [Integration Tests workflow](https://github.com/commercialhaskell/stack/actions?query=workflow%3A%22Integration+tests%22)
+    is limited to the platforms supported by the GitHub-hosted runners
+    (currently, x86_64 and macOS/AArch64) and any self-hosted runners
+    (currently, only Linux/AArch64). However, it is possible to edit the GitHub
+    release to include binary distributions for other platforms. The
+    prerequisites are:
+
+    * a computer with that platform (operating system, machine architecture);
+
+    * a sufficiently-recent existing version of Stack for that platform;
+
+    * a tool to print SHA checksums, such as `shasum` on Linux and macOS; and
+
+    * the GNU Privacy Guard tool (`gpg`), which has had imported the private key
+      used to sign Stack executables (see further below).
+
+    The steps are similar to those in the workflow:
+
+    1.  Change to the root directory of the Stack project.
+
+    2.  `stack etc/scripts/release.hs check`, to check before building.
+
+    3.  `stack etc/scripts/release.hs build`, to build. The output 'assets'
+        (`stack-<version>-<os>-<architecture> ...`) will be in
+        the `_release` directory in the root directory of the Stack project.
+
+    4.  For each of the output assets, create a corresponding SHA 256 file with
+        a `.sha256` extension. For example (where `<asset>` is the name of the
+        file):
+
+        ~~~text
+        shasum -a 256 <asset> > <asset>.sha256
+        ~~~
+
+    5.  For each of the output assets, create a corresponding ASCII-armored
+        signature file with an `.asc` extension using `gpg`. For example (where
+        `<asset>` is the name of the file):
+
+        ~~~text
+        gpg --digest-algo=sha512 --detach-sig --armor -u 0x575159689BEFB442 <asset>
+        ~~~
+
+    6.  Edit the GitHub release to include the output assets and their
+        corresponding `.sha256` and `.asc` files.
+
+    The private key used to sign Stack executables can be exported from a
+    version of `gpg` to which it has previously been imported with:
+
+    ~~~text
+    gpg --armor --export-secret-key 0x575159689BEFB442
+    ~~~
+
+    The private key, so obtained, can be imported into `gpg` by:
+
+    1.  Commanding `gpg --import`.
+
+    2.  Pasting the private key.
+
+    3.  Entering Ctrl+D and Enter.
+
+    ### E: Update versions and `ChangeLog.md` for 'unreleased'
 
     In the `rc/vX.Y` branch:
 
     * `package.yaml`: bump the version number. Bump the fourth component to an
-       even number (e.g. from 1.7.0.1 to 1.7.0.2).
+       even number (e.g. from `4.1.0.1` to `4.1.0.2`).
 
         !!! attention
 
             Be sure to update also `stack.cabal` (for example by using
             `stack build --dry-run`).
 
+    * `cabal.config`: Ensure the `stack` constraint is set to the same version
+      as in the `package.yaml`.
+
     * `ChangeLog.md`: Add an “Unreleased changes” section (update the “changes
       since” version):
 
@@ -296,51 +359,46 @@ final release.
         Bug fixes:
         ~~~
 
-    ### E: Announce the release candidate
-
-    Announce the release candidate to the following mailing lists
-
-    * haskell-cafe@haskell.org
-
-        !!! note
-
-            You have to be a member of the mailing list to post to it. See the
-            list's
-            [interface](https://mail.haskell.org/cgi-bin/mailman/listinfo/haskell-cafe)
+    ### F: Request update of GHCup's metadata
 
-    * haskell-stack@googlegroups.com
+    Raise a pull request at the
+    [`haskell/ghcup-metadata`](https://github.com/haskell/ghcup-metadata) GitHub
+    repository to request an addition to GHCup's latest metadata configuration
+    file for prereleases, tagged as the latest prerelease. In the metadata,
+    change the tags for any past Stack prereleases to indicate that they are no
+    longer the latest prerelease.
 
-        !!! note
+    ### G: Announce the release candidate
 
-            Members of the group can post but posts from new members are held
-            for moderation.
+    Announce the release candidate:
 
-    * commercialhaskell@googlegroups.com
+    * on the
+      [Haskell Community](https://discourse.haskell.org/c/announcements/10/l/latest)
+      forum;
 
-        !!! note
+    * in the Haskell Foundation's
+      [general](https://matrix.to/#/#haskell-foundation-general:matrix.org) room
+      (address `#haskell-foundation-general:matrix.org`) on
+      [Matrix](https://matrix.org/);
 
-            Members of the group can post but posts from new members are held
-            for moderation.
+    * in the Haskell
+      [Stack and Stackage](https://matrix.to/#/#haskell-stack:matrix.org) room
+      (address `#haskell-stack:matrix.org`) on [Matrix](https://matrix.org/);
+      and
 
-    Announce the release candidate on the
-    [Haskell Community](https://discourse.haskell.org/c/announcements/10/l/latest).
-
-    Announce the release candidate in the `#stack-users` channel of the Haskell
-    Foundation's Slack workspace.
-
-    Announce the release candidate in Reddit's
-    [Haskell](https://www.reddit.com/r/haskell/) community.
+    * in Reddit's [Haskell](https://www.reddit.com/r/haskell/) community.
 
     In each case, use the subject (change 'first' to 'second' etc for subsequent
     release candidates):
 
-    * `ANN: first release candidate for stack-X.Y.Z`
+    * `[ANN] First release candidate for Stack X.Y.Z`
 
     In the message, include:
 
     * a link to the release on GitHub
       (`https://github.com/commercialhaskell/stack/releases/tag/rc/vX.Y.Z.A`) to
       download it
+
     * the release description from Github.
 
 === "Final Release"
@@ -385,15 +443,80 @@ final release.
             git shortlog -s origin/release..HEAD|sed 's/^[0-9 \t]*/* /'|LC_ALL=C sort -f
             ~~~
 
-        === "Windows (with PowerShell)"
+        === "Windows"
 
             ~~~text
             (git shortlog -s origin/release..HEAD) -Replace '^[0-9 \t]*', '* ' | Sort-Object
             ~~~
 
+            in PowerShell.
+
     Publish the GitHub release.
 
-    ### D: Upload to Hackage and reset branches
+    ### D: Consider adding other platforms to the GitHub release
+
+    The
+    [Integration Tests workflow](https://github.com/commercialhaskell/stack/actions?query=workflow%3A%22Integration+tests%22)
+    is limited to the platforms supported by the GitHub-hosted runners
+    (currently, x86_64 and macOS/AArch64) and any self-hosted runners
+    (currently, only Linux/AArch64). However, it is possible to edit the GitHub
+    release to include binary distributions for other platforms. The
+    prerequisites are:
+
+    * a computer with that platform (operating system, machine architecture);
+
+    * a sufficiently-recent existing version of Stack for that platform;
+
+    * a tool to print SHA checksums, such as `shasum` on Linux and macOS; and
+
+    * the GNU Privacy Guard tool (`gpg`), which has had imported the private key
+      used to sign Stack executables (see further below).
+
+    The steps are similar to those in the workflow:
+
+    1.  Change to the root directory of the Stack project.
+
+    2.  `stack etc/scripts/release.hs check`, to check before building.
+
+    3.  `stack etc/scripts/release.hs build`, to build. The output 'assets'
+        (`stack-<version>-<os>-<architecture> ...`) will be in
+        the `_release` directory in the root directory of the Stack project.
+
+    4.  For each of the output assets, create a corresponding SHA 256 file with
+        a `.sha256` extension. For example (where `<asset>` is the name of the
+        file):
+
+        ~~~text
+        shasum -a 256 <asset> > <asset>.sha256
+        ~~~
+
+    5.  For each of the output assets, create a corresponding ASCII-armored
+        signature file with an `.asc` extension using `gpg`. For example (where
+        `<asset>` is the name of the file):
+
+        ~~~text
+        gpg --digest-algo=sha512 --detach-sig --armor -u 0x575159689BEFB442 <asset>
+        ~~~
+
+    6.  Edit the GitHub release to include the output assets and their
+        corresponding `.sha256` and `.asc` files.
+
+    The private key used to sign Stack executables can be exported from a
+    version of `gpg` to which it has previously been imported with:
+
+    ~~~text
+    gpg --armor --export-secret-key 0x575159689BEFB442
+    ~~~
+
+    The private key, so obtained, can be imported into `gpg` by:
+
+    1.  Commanding `gpg --import`.
+
+    2.  Pasting the private key.
+
+    3.  Entering Ctrl+D and Enter.
+
+    ### E: Upload to Hackage and reset branches
 
     Upload the `stack` package to Hackage with the command:
 
@@ -430,17 +553,17 @@ final release.
 
     ~~~text
     git branch -d rc/vX.Y
-    git push origin :rc/vX.Y`
+    git push origin :rc/vX.Y
     ~~~
 
-    ### E: Activate the version on Read The Docs
+    ### F: Activate the version on Read The Docs
 
     Activate the version for new release tag, on
     [readthedocs.org](https://readthedocs.org/projects/stack/versions/).
 
     Ensure that the `stable` documentation has updated.
 
-    ### F: Update get.haskellstack.org redirects
+    ### G: Update get.haskellstack.org redirects
 
     Update the https://get.haskellstack.org redirects by updating the
     `_redirects` file in the root of the
@@ -460,7 +583,7 @@ final release.
         curl -vL https://get.haskellstack.org/upgrade/linux-x86_64.tar.gz >/dev/null
         ~~~
 
-    === "Windows (with PowerShell)"
+    === "Windows"
 
         ~~~text
         curl -vL https://get.haskellstack.org/stable/linux-x86_64.tar.gz >NUL
@@ -469,113 +592,59 @@ final release.
 
     and make sure it redirects to the new version.
 
-    ### G: Update versions and `ChangeLog.md` for 'unreleased'
+    ### H: Update versions and `ChangeLog.md` for 'unreleased'
 
     In the `stable` branch:
 
     * `package.yaml`: bump the version number. Bump the third component to an
-      even number (e.g. from `1.6.1` to `1.6.2`).
+      even number (e.g. from `4.1.1` to `4.1.2`).
 
         !!! attention
 
             Be sure to update also `stack.cabal` (for example by using
             `stack build --dry-run`).
 
-    * `ChangeLog.md`: Add an “Unreleased changes” section (update the “changes
-      since” version):
+    * `cabal.config`: Ensure the `stack` constraint is set to the same version
+      as in the `package.yaml`.
 
-        ~~~markdown
-        ## Unreleased changes
-
-        Release notes:
-
-        **Changes since vX.Y.Z:**
-
-        Major changes:
-
-        Behavior changes:
-
-        Other enhancements:
-
-        Bug fixes:
-        ~~~
-
-    ### H: Update the repository's issue and pull request templates
+    ### I: Update the repository's issue and pull request templates
 
     The repository's issue and pull request templates are the `.github`
     directory. Update them to refer to the new release version (`X.Y.Z`).
 
-    ### I: Announce the release
-
-    Announce the release to the following mailing lists
-
-    * haskell-cafe@haskell.org
-
-        !!! note
-
-            You have to be a member of the mailing list to post to it. See the
-            list's
-            [interface](https://mail.haskell.org/cgi-bin/mailman/listinfo/haskell-cafe)
+    ### J: Request update of GHCup's metadata
 
-    * haskell-stack@googlegroups.com
+    Raise a pull request at the
+    [`haskell/ghcup-metadata`](https://github.com/haskell/ghcup-metadata) GitHub
+    repository to request an addition to GHCup's latest metadata configuration
+    files for releases and 'vanilla' releases, tagged as the latest release.
+    (The GHCup project will decide whether, and when, to recommend the release.)
+    In the metadata, change the tags for any past Stack releases to indicate
+    that they are no longer the latest release.
 
-        !!! note
+    ### K: Announce the release
 
-            Members of the group can post but posts from new members are held
-            for moderation.
+    Announce the release:
 
-    * commercialhaskell@googlegroups.com
+    * on the
+      [Haskell Community](https://discourse.haskell.org/c/announcements/10/l/latest)
+      forum.
 
-        !!! note
+    * in the Haskell Foundation's
+      [general](https://matrix.to/#/#haskell-foundation-general:matrix.org)
+      room (address `#haskell-foundation-general:matrix.org`) on
+      [Matrix](https://matrix.org/).
 
-            Members of the group can post but posts from new members are held
-            for moderation.
+    * in the Haskell
+      [Stack and Stackage](https://matrix.to/#/#haskell-stack:matrix.org) room
+      (address `#haskell-stack:matrix.org`) on [Matrix](https://matrix.org/).
 
-    Announce the release on the
-    [Haskell Community](https://discourse.haskell.org/c/announcements/10/l/latest).
-
-    Announce the release in the `#stack-users` channel of the Haskell
-    Foundation's Slack workspace.
-
-    Announce the release in Reddit's
-    [Haskell](https://www.reddit.com/r/haskell/) community.
+    * in Reddit's [Haskell](https://www.reddit.com/r/haskell/) community.
 
     In each case, use the subject:
-    * `ANN: stack-X.Y.Z`
+
+    * `[ANN] Stack X.Y.Z`
 
     In the message, include:
 
     * the release description from Github.
-
-    ### J: Update Docker images
-
-    Docker Hub includes Docker images under
-    [`fpco/stack-build'](https://hub.docker.com/r/fpco/stack-build).
-
-    Update those images with a new version:
-
-    1.  Under
-        [commercialhaskell/stackage/automated/dockerfiles](https://github.com/commercialhaskell/stackage/tree/master/automated/dockerfiles/),
-        add `lts-X.Y/Dockerfile` (where `X.Y` is the latest Stackage Haskell LTS
-        version), containing (where `X.Z` is the previous Haskell LTS version,
-        and `X.Y.Z` is the newly released Stack version):
-
-        ~~~dockerfile
-        FROM $DOCKER_REPO:lts-X.Z
-        ARG STACK_VERSION=X.Y.Z
-        RUN wget -qO- https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C /usr/local/bin '*/stack'
-        ~~~
-
-    2.  Run `./build.sh lts-X.Y`. Then test that the new image has the new
-        version of Stack. For example, command:
-
-        ~~~text
-        docker run --rm fpco/stack-build:lts stack --version
-        ~~~
-
-    3.  Use the following commands to push the new image to the registry:
-
-        ~~~text
-        ./build.sh --push lts-X.Y
-        ./build.sh --push --small lts-X.Y
-        ~~~
diff --git a/doc/maintainers/self-hosted_runners.md b/doc/maintainers/self-hosted_runners.md
new file mode 100644
index 0000000000..7b11eb1d59
--- /dev/null
+++ b/doc/maintainers/self-hosted_runners.md
@@ -0,0 +1,111 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Self-hosted runners
+
+[GitHub Actions](https://docs.github.com/en/actions) is used to do CI on Stack.
+
+In the case of the Linux/AArch64 platform, since 8 February 2025, that is done
+with a GitHub-hosted runner (currently in public preview). Previously, that was
+done in a separate `linux-arm64` job of the `integration-tests.yml` workflow
+that ran on a self-hosted runner for Linux and ARM64. Given that the
+GitHub-hosted runner is only in preview, the documentation of the self-hosted
+runner is being preserved for the time being.
+
+## Introduction
+
+The current basic setup was:
+
+* FP Complete has an Oracle Cloud account that provides a free tier that
+  includes a really powerful ARM64 machine;
+* within Oracle Cloud, FP Complete are running an Ubuntu/ARM64 instance; and
+* on that instance, FP Complete are running the GitHub Runner software.
+
+The runner name is `stack-github-action3` and the machine name is
+`stack-github-action3`.
+
+Occasionally Oracle will turn off the machine because:
+
+* Oracle thinks it is not being used (because of the free tier); and/or
+* other things, like disk space filling up.
+
+The disk space can fill up due to obsolete Docker images, versions of GHC
+installed by Stack or obsolete snapshots created by Stack.
+
+## Managing the `stack-github-action3` runner
+
+With the appropriate authority installed on the server, a maintainer can manage
+the runner remotely using SSH, with command
+`ssh ubuntu@arm-runner.stackage.org`.
+
+!!! info
+
+    The authority is the addition of the maintainer's SSH public key to the end
+    of file `~/.ssh/authorized_keys` on the server.
+
+This is best done using [`tmux`](https://github.com/tmux/tmux/wiki), a terminal
+multiplexer, as follows:
+~~~sh
+$ # In a shell, command tmux to create a new session with a single window with a
+$ # single pane (a pseudo terminal). The session will be displayed on the screen
+$ # by a client:
+$ tmux new-session
+$ # Send the following command to that pseudo terminal, to connect to the
+$ # remote host:
+$ ssh ubuntu@arm-runner.stackage.org
+$ # In the remote host, change to the actions-runner directory:
+$ cd actions-runner
+$ # In the remote host, start the runner:
+$ ./run.sh
+$ # Detach the current client from the session by the key combination of
+$ # 'C-b' 'd' (where 'C-b' is CTRL+b). The session will continue to run in the
+$ # background:
+$ C-b d
+~~~
+
+The available disk space can be queried with command `df -h`; the relevant entry
+is for filesystem `/dev/sda1`.
+
+If the available space is low, that may be due to unncessary GHC versions
+installed in Stack's `programs` directory.
+
+## Re-configuring a removed `stack-github-action3` runner
+
+A self-hosted runner is automatically removed from GitHub if it has not
+connected to GitHub Actions for more than 14 days.
+
+Re-adding a self-hosted runner to GitHub requires it to be configured, and
+GitHub will suggest a configuration command like:
+
+~~~text
+./config.sh --url https://github.com/commercialhaskell/stack --token <token_value>
+~~~
+
+However, to re-use and configure the runner machine, you have first to delete
+the `.runner` file inside the `actions-runner` directory. This allows the runner
+to be registered without having to re-download the self-hosted runner
+application.
+
+## The `ghc-arm-5` runner
+
+From 9 February 2024, the Haskell Foundation sought to provide an alternative
+runner named `ghc-arm-5` but that was based on NixOS and proved to be
+incompatible.
+
+## Alternatives to the self-hosted runners
+
+One alternative to the self-hosted runners is to build statically-linked Stack
+executables for Linux/AArch64 on macOS/AArch64. This can be done thanks to
+the multi-architecture Docker images built and published by Olivier Benz, at
+https://gitlab.com/benz0li/ghc-musl.
+
+GitHub provides a GitHub-hosted macOS/AArch64 runner (`macOS-14`).
+Unfortunately, that is macOS/M1 and the M1 machine architecture does not support
+nested virtualisation. This rules out using Docker, as the runner is itself a
+virtual machine.
+
+However, this solution can be applied locally and the build outputs for the
+Linux/AArch64 platform added manually to the result of the GitHub workflow.
+
+The experimental Haskell script `etc/scripts/release-linux-aarch64.hs` is
+intended to facilitate the building of statically-linked Stack executables for
+Linux/AArch64 on macOS/AArch64.
diff --git a/doc/maintainers/stack_errors.md b/doc/maintainers/stack_errors.md
new file mode 100644
index 0000000000..5210b05d24
--- /dev/null
+++ b/doc/maintainers/stack_errors.md
@@ -0,0 +1,703 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+## Stack's errors
+
+In connection with considering Stack's support of the
+[Haskell Error Index](https://errors.haskell.org/) initiative, this page seeks
+to take stock of the errors that Stack itself can raise, by reference to the
+`master` branch of the Stack repository. Last updated: 2026-07-07.
+
+*   `Stack.main`: catches exceptions from action `commandLineHandler`.
+
+    -   `ExitCode`
+    -   `throwIO`
+
+*   `Stack.main`: catches exceptions from action `run`:
+
+    -   `ExitCode` (`exitWith`)
+    -   `PrettyException` (`exitFailure`)
+    -   `SomeException` (`exitFailure`)
+
+    The following types are instances of `Control.Exception.Exception` and
+    `Show`. Some are instances of `Stack.Prelude.PrettyException`. Some data
+    constructors have strict fields but that is not documented below:
+
+    -   `Control.Concurrent.ExecuteException`
+
+        ~~~haskell
+        [S-2816] = InconsistentDependenciesBug
+        ~~~
+
+    -   `Options.Applicative.Builder.Extra.OptionsApplicativeExtraException`
+
+        ~~~haskell
+        [S-2797] = FlagNotFoundBug
+        ~~~
+
+    -   `Stack.Build.CabalVersionPrettyException`
+
+        ~~~haskell
+        [S-5973] = CabalVersionNotSupported Version
+        ~~~
+
+    -   `Stack.Build.ConstructPlan.NotOnlyLocal`
+
+        ~~~haskell
+        [S-1727] = NotOnlyLocal [PackageName] [Text]
+        ~~~
+
+    -   `Stack.Build.ExecutePackage`
+
+        `[S-4541]` used in `copyPreCompiled`
+
+    -   `Stack.BuildPlan.BuildPlanException`
+
+        ~~~haskell
+        [S-7571] = UnknownPackages (Path Abs File) (Map PackageName (Maybe Version, Set PackageName)) (Map PackageName (Set PackageIdentifier))
+        [S-2045] | SnapshotNotFound SnapName
+        [S-8559] | NeitherCompilerOrSnapshotSpecified Text
+        [S-5743] | DuplicatePackagesBug
+        ~~~
+
+    -   `Stack.CLI.CliPrettyException`
+
+        ~~~haskell
+        [S-4639] = NoArgumentsBug
+        ~~~
+
+    -   `Stack.Clean.CleanPrettyException`
+
+        ~~~haskell
+        [S-9463] = NonLocalPackages [PackageName]
+        [S-6321] | DeletionFailures [(Path Abs Dir, SomeException)]
+        ~~~
+
+    -   `Stack.Config.Docker.ConfigDockerException`
+
+        ~~~haskell
+        [S-8575] = SnapshotNotSupportedException (Maybe Project) (Maybe AbstractSnapshot)
+        ~~~
+
+    -   `Stack.Config.Nix.ConfigNixPrettyException`
+
+        ~~~haskell
+        [S-2726] = NixCannotUseShellFileAndPackagesException FilePath [Text]
+        [S-9317] | GHCMajorVersionUnspecified
+        [S-8605] | OnlyGHCSupported
+        ~~~
+
+    -   `Stack.ConfigCmd.ConfigCmdPrettyException`
+
+        ~~~haskell
+        [S-3136] = NoProjectConfigAvailable
+        [S-6088] | ConfigFileContainsIncludes (Path Abs File)
+        ~~~
+
+    -   `Stack.Constants.ConstantsException`
+
+        ~~~haskell
+        [S-6057] = WiredInPackagesNotParsedBug
+        ~~~
+
+    -   `Stack.Coverage.CoveragePrettyException`
+
+        ~~~haskell
+        [S-6361] = NonTestSuiteTarget PackageName
+        [S-2321] | NoTargetsOrTixSpecified
+        [S-9975] | NotLocalPackage PackageName
+        ~~~
+
+    -   `Stack.DependencyGraph.DependencyGraphException`
+
+        ~~~haskell
+        [S-7071] = DependencyNotFoundBug GhcPkgId
+        ~~~
+
+    -   `Stack.DependencyGraph.DependencyGraphPrettyException`
+
+        ~~~haskell
+        [S-7151] | PackageNotFound PackageName
+        ~~~
+
+    -   `Stack.Exec.ExecException`
+
+        ~~~haskell
+        [S-1541] = InvalidPathForExec FilePath
+        ~~~
+
+    -   `Stack.Exec.ExecPrettyException`
+
+        ~~~haskell
+        [S-8251] = PackageIdNotFoundBug String
+        [S-2483] | ExecutableToRunNotFound
+        [S-8600] | NoPackageIdReportedBug
+        [S-7371] | InvalidExecTargets [Text]
+        ~~~
+
+    -   `Stack.GhcPkg`
+
+        `[S-6716]` used in `unregisterGhcPkgIds`
+
+    -   `Stack.Ghci.GhciPrettyException`
+
+        ~~~haskell
+        [S-6948] = GhciTargetParseException [StyleDoc]
+        [S-1939] | CandidatesIndexOutOfRangeBug
+        [S-6716] | InvalidPackageOption String
+        [S-3600] | FileTargetIsInvalidAbsFile String
+        [S-9906] | Can'tSpecifyFilesAndTargets
+        [S-5188] | Can'tSpecifyFilesAndMainIs
+        ~~~
+
+    -   `Stack.Hoogle.HoogleException`
+
+        ~~~haskell
+        [S-9669] = HoogleOnPathNotFoundBug
+        ~~~
+
+    -   `Stack.Hoogle.HooglePrettyException`
+
+        ~~~haskell
+        [S-1329] = HoogleNotFound StyleDoc
+        [S-3025] | HoogleDatabaseNotFound
+        ~~~
+
+    -   `Stack.Init.InitException`
+
+        ~~~haskell
+        [S-2747] | NoPackagesToIgnoreBug
+        ~~~
+
+    -   `Stack.Init.InitPrettyException`
+
+        ~~~haskell
+        [S-8332] = SnapshotDownloadFailure SomeException
+        [S-8009] | ConfigFileAlreadyExists FilePath
+        [S-5267] | PackageNameInvalid [FilePath]
+        [S-1833] | NoMatchingSnapshot (NonEmpty SnapName)
+        [S-6395] | SnapshotMismatch RawSnapshotLocation String
+        [S-2422] | SnapshotPartial RawSnapshotLocation String
+        ~~~
+
+    -   `Stack.List.ListPrettyException`
+
+        ~~~haskell
+        [S-4926] = CouldNotParsePackageSelectors [StyleDoc]
+        ~~~
+
+    -   `Stack.Lock.LockPrettyException`
+
+        ~~~haskell
+        [S-1353] = WritingLockFileError (Path Abs File) Locked
+        ~~~
+
+    -   `Stack.Ls.LsPrettyException`
+
+        ~~~haskell
+        [S-3421] = ParseFailure [Value]
+        [S-9131] | ParseRecentSnapshotsUrlFailed HttpException
+        ~~~
+
+    -   `Stack.New.NewPrettyException`
+
+        ~~~haskell
+        [S-2135] = ProjectDirAlreadyExists String (Path Abs Dir)
+        [S-1688] | DownloadTemplateFailed Text String VerifiedDownloadException
+        [S-3650] | LoadTemplateFailed TemplateName FilePath
+        [S-9582] | ExtractTemplateFailed TemplateName FilePath String
+        [S-9490] | TemplateInvalid TemplateName StyleDoc
+        [S-5682] | MagicPackageNameInvalid String
+        [S-3113] | AttemptedOverwrites [Path Abs File]
+        ~~~
+
+    -   `Stack.Nix.NixPrettyException`
+
+        ~~~haskell
+        [S-7384] = CannotDetermineProjectRoot
+        [S-1264] | NixInstantiateCommandFailure [String] ByteString
+        [S-3220] | NixInstantiateCommandNoDerivationPath
+        [S-5924] | NixInstantiateCommandNoSingleDerivationPath [String] [S8.ByteString]
+        [S-1537] | NixInstantiateCommandInvalidDerivationPath [String] String
+
+        ~~~
+
+    -   `Stack.PackageDump.PackageDumpException`
+
+        ~~~haskell
+        [S-4257] = MissingSingleField Text (Map Text [Line])
+        [S-2016] | Couldn'tParseField Text [Line]
+        ~~~
+
+    -   `Stack.Query.QueryException`
+
+        ~~~haskell
+        [S-4419] = SelectorNotFound [Text]
+        [S-8422] | IndexOutOfRange [Text]
+        [S-4360] | NoNumericSelector [Text]
+        [S-1711] | CannotApplySelector Value [Text]
+        ~~~
+
+    -   `Stack.Runners.RunnersException`
+
+        ~~~haskell
+        [S-7144] = CommandInvalid
+        [S-8314] | DockerAndNixInvalid
+        [S-8641] | NixWithinDockerInvalid
+        [S-5107] | DockerWithinNixInvalid
+        ~~~
+
+    -   `Stack.SDist.SDistPrettyException`
+
+        ~~~haskell
+        [S-6439] = CheckException (NonEmpty PackageCheck)
+        [S-9595] | CabalFilePathsInconsistentBug (Path Abs File) (Path Abs File)
+        [S-7875] | ToTarPathException
+        ~~~
+
+    -   `Stack.Script.ScriptException`
+
+        ~~~haskell
+        [S-4994] = MutableDependenciesForScript [PackageName]
+        [S-1691] | AmbiguousModuleName ModuleName [PackageName]
+        [S-5067] | ArgumentsWithNoRunInvalid
+        [S-9469] | NoRunWithoutCompilationInvalid
+        [S-5055] | FailedToParseScriptFileAsDirBug (Path Rel File)
+        [S-9464] | FailedToParseFileAsDirBug (Path Abs Dir)
+        ~~~
+
+    -   `Stack.Setup.PerformPathCheckingException`
+
+        ~~~haskell
+        [S-1991] = ProcessExited ExitCode String [String]
+        ~~~
+
+    -   `Stack.Setup.SetupException`
+
+        ~~~haskell
+        [S-2076] = WorkingDirectoryInvalidBug
+        [S-3967] | StackBinaryArchiveZipUnsupportedBug
+        ~~~
+
+    -   `Stack.Setup.SetupPrettyException`
+
+        ~~~haskell
+        [S-7441] = GHCInstallFailed SomeException StyleDoc String [String] (Path Abs Dir) (Path Abs Dir) (Path Abs Dir)
+        [S-2476] | InvalidGhcAt (Path Abs File) SomeException
+        [S-4764] | ExecutableNotFound [Path Abs File]
+        [S-9953] | SandboxedCompilerNotFound [String] [Path Abs Dir]
+        [S-1852] | UnsupportedSetupCombo OS Arch
+        [S-2126] | MissingDependencies [String]
+        [S-9443] | UnknownCompilerVersion (Set Text) WantedCompiler (Set ActualCompiler)
+        [S-6810] | UnknownOSKey Text
+        [S-5159] | GHCSanityCheckCompileFailed SomeException (Path Abs File)
+        [S-8948] | RequireCustomGHCVariant
+        [S-2905] | ProblemWhileDecompressing (Path Abs File)
+        [S-9561] | SetupInfoMissingSevenz
+        [S-7748] | UnsupportedSetupConfiguration
+        [S-5308] | MSYS2NotFound Text
+        [S-5127] | UnwantedCompilerVersion
+        [S-1540] | UnwantedArchitecture
+        [S-8668] | GHCInfoNotValidUTF8 UnicodeException
+        [S-4878] | GHCInfoNotListOfPairs
+        [S-2965] | GHCInfoMissingGlobalPackageDB
+        [S-5219] | GHCInfoMissingTargetPlatform
+        [S-8299] | GHCInfoTargetPlatformInvalid String
+        [S-2574] | CabalNotFound (Path Abs File)
+        [S-8488] | GhcBootScriptNotFound
+        [S-1128] | HadrianScriptNotFound
+        [S-1906] | URLInvalid String
+        [S-1648] | UnknownArchiveExtension String
+        [S-4509] | Unsupported7z
+        [S-3158] | TarballInvalid String
+        [S-5252] | TarballFileInvalid String (Path Abs File)
+        [S-1827] | UnknownArchiveStructure (Path Abs File)
+        [S-9476] | StackReleaseInfoNotFound String
+        [S-4461] | StackBinaryArchiveNotFound [String]
+        [S-6617] | HadrianBindistNotFound
+        [S-7227] | DownloadAndInstallCompilerError
+        [S-6636] | StackBinaryArchiveUnsupported Text
+        [S-7871] | StackBinaryNotInArchive String Text
+        [S-5046] | FileTypeInArchiveInvalid Entry Text
+        [S-4132] | BinaryUpgradeOnOSUnsupported OS
+        [S-3249] | BinaryUpgradeOnArchUnsupported Arch
+        [S-4230] | ExistingMSYS2NotDeleted (Path Abs Dir) IOException
+        ~~~
+
+    -   `Stack.StackException`
+
+        ~~~haskell
+        [S-2186] = InvalidReExecVersion String String
+        ~~~
+
+    -   `Stack.Storage.User.StorageUserException`
+
+        ~~~haskell
+        [S-8196] = CompilerFileMetadataMismatch
+        [S-5378] | GlobalPackageCacheFileMetadataMismatch
+        [S-2673] | GlobalDumpParseFailure
+        [S-8441] | CompilerCacheArchitectureInvalid Text
+        ~~~
+
+    -   `Stack.Templates.TemplatesPrettyException`
+
+        ~~~haskell
+        [S-8143] = DownloadTemplatesHelpFailed HttpException
+        [S-6670] | TemplatesHelpEncodingInvalid String UnicodeException
+        ~~~
+
+    -   `Stack.Types.Build.BuildException`
+
+        ~~~haskell
+        [S-7178] = Couldn'tFindPkgId PackageName
+        [S-3127] | Couldn'tParseTargets [Text]
+        [S-2154] | UnknownTargets (Set PackageName) (Map PackageName Version) (Path Abs File)
+        [S-1995] | TestSuiteFailure PackageIdentifier (Map Text (Maybe ExitCode)) (Maybe (Path Abs File)) ByteString
+        [S-3819] | TestSuiteTypeUnsupported TestSuiteInterface
+        [S-5797] | LocalPackageDoesn'tMatchTarget PackageName Version Version
+        [S-3118] | NoSetupHsFound (Path Abs Dir)
+        [S-4925] | InvalidGhcOptionsSpecification [PackageName]
+        [S-5510] | LocalPackagesPresent [PackageIdentifier]
+        [S-7168] | CouldNotLockDistDir (Path Abs File)
+        [S-7868] | TaskCycleBug PackageIdentifier
+        [S-8923] | PackageIdMissingBug PackageIdentifier
+        [S-7371] | AllInOneBuildBug
+        [S-6739] | MultipleResultsBug PackageName [DumpPackage]
+        [S-3121] | TemplateHaskellNotFoundBug
+        [S-6901] | HaddockIndexNotFound
+        [S-5452] | ShowBuildErrorBug
+        [S-2696] | CallStackEmptyBug
+        ~~~
+
+    -   `Stack.Types.Build.BuildPrettyException`
+
+        ~~~haskell
+        [S-4804] = ConstructPlanFailed [ConstructPlanException] (Path Abs File) (Path Abs Dir) ParentMap (Set PackageName) (Map PackageName [PackageName])
+        [S-7282] | ExecutionFailure [SomeException]
+        [S-7011] | CabalExitedUnsuccessfully ExitCode PackageIdentifier (Path Abs File) [String] (Maybe (Path Abs File)) [Text]
+        [S-6374] | SetupHsBuildFailure ExitCode (Maybe PackageIdentifier) (Path Abs File) [String] (Maybe (Path Abs File)) [Text]
+        [S-8506] | TargetParseException [StyleDoc]
+        [S-7086] | SomeTargetsNotBuildable [(PackageName, NamedComponent)]
+        [S-8664] | InvalidFlagSpecification [UnusedFlags]
+        [S-8100] | GHCProfOptionInvalid
+        [S-1727] | NotOnlyLocal [PackageName] [Text]
+        [S-6362] | CompilerVersionMismatch (Maybe (ActualCompiler, Arch)) (WantedCompiler, Arch) GHCVariant CompilerBuild VersionCheck WantedCompilerSetter Text
+        [S-4660] | ActionNotFilteredBug StyleDoc
+        [S-7987] | TestSuiteExeMissing Bool String PackageName StackUnqualCompName
+        [S-8027] | CabalCopyFailed Bool BuildPrettyException
+        ~~~
+
+    -   `Stack.Types.Compiler.CompilerException`
+
+        ~~~haskell
+        [S-7903] = GhcjsNotSupported
+        [S-7972] | PantryException PantryException
+        ~~~
+
+    -   `Stack.Types.Config.Exception.ConfigException`
+
+        ~~~haskell
+        [S-8981] | ParseCustomSnapshotException Text ParseException
+        [S-2206] | NoProjectConfigFound (Path Abs Dir) (Maybe Text)
+        [S-4964] | UnexpectedArchiveContents [Path Abs Dir] [Path Abs File]
+        [S-2040] | UnableToExtractArchive Text (Path Abs File)
+        [S-1641] | BadStackVersionException VersionRange
+        [S-8773] | NoSuchDirectory FilePath
+        [S-4335] | NoSuchFile FilePath
+        [S-3938] | ParseGHCVariantException String
+        [S-8530] | BadStackRoot (Path Abs Dir)
+        [S-7613] | Won'tCreateStackRootInDirectoryOwnedByDifferentUser (Path Abs Dir) (Path Abs Dir)
+        [S-8707] | UserDoesn'tOwnDirectory (Path Abs Dir)
+        [S-3605] | ManualGHCVariantSettingsAreIncompatibleWithSystemGHC
+        [S-6816] | NixRequiresSystemGhc
+        [S-5027] | NoSnapshotWhenUsingNoProject
+        [S-3803] | NoLTSWithMajorVersion Int
+        [S-5472] | NoLTSFound
+        ~~~
+
+    -   `Stack.Types.Config.Exception.ConfigPrettyException`
+
+        ~~~haskell
+        [S-6602] = ParseConfigFileException (Path Abs File) ParseException
+        [S-7462] | StackWorkEnvNotRelativeDir String
+        [S-5470] | DuplicateLocalPackageNames [(PackageName, [PackageLocation])]
+        [S-6854] | BadMsysEnvironment MsysEnvironment Arch
+        [S-5006] | NoDefaultMsysEnvironmentBug
+        [S-8398] | ConfigFileNotProjectLevelBug
+        [S-6890] | NoExecutablePath String
+        ~~~
+
+    -   `Stack.Types.Config.ParseAbsolutePathException`
+
+        ~~~haskell
+        [S-9437] = ParseAbsolutePathException String String
+        ~~~
+
+    -   `Stack.Types.Docker.DockerException`
+
+        ~~~haskell
+        [S-3223] = DockerMustBeEnabledException
+        [S-9779] | OnlyOnHostException
+        [S-9105] | InspectFailedException String
+        [S-6626] | NotPulledException String
+        [S-5841] | InvalidImagesOutputException String
+        [S-9608] | InvalidPSOutputException String
+        [S-2240] | InvalidInspectOutputException String
+        [S-6092] | PullFailedException String
+        [S-6218] | DockerTooOldException Version Version
+        [S-8252] | DockerVersionProhibitedException [Version] Version
+        [S-6170] | BadDockerVersionException VersionRange Version
+        [S-5827] | InvalidVersionOutputException
+        [S-7112] | HostStackTooOldException Version (Maybe Version)
+        [S-5832] | ContainerStackTooOldException Version Version
+        [S-4078] | CannotDetermineProjectRootException
+        [S-7058] | DockerNotInstalledException
+        [S-6894] | UnsupportedStackExeHostPlatformException
+        [S-1512] | DockerStackExeParseException String
+        ~~~
+
+    -   `Stack.Types.GhcPkgExe`
+
+        ~~~haskell
+        [S-6512] = CannotParse String String String
+        [S-3384] | CannotOpenDBForModification FilePath IOException
+        [S-1430] | SingleFileDBUnsupported FilePath
+        [S-5996] | ParsePackageInfoExceptions String
+        [S-3189] | CannotFindPackage PackageArg (Maybe FilePath)
+        [S-9323] | CannotParseRelFileBug String
+        [S-7651] | CannotParseDirectoryWithDBug String
+        [S-6590] | CannotRecacheAfterUnregister (Path Abs Dir) SomeException
+        ~~~
+
+    -   `Stack.Types.GhcPkgId.GhcPkgIdParseFail`
+
+        ~~~haskell
+        [S-5359] = GhcPkgIdParseFail Text
+        ~~~
+
+    -   `Stack.Types.Package.PackageException`
+
+        ~~~haskell
+        [S-8072] = PackageInvalidCabalFile (Either PackageIdentifierRevision (Path Abs File)) (Maybe Version) [PError] [PWarning]
+        [S-5394] | MismatchedCabalIdentifier PackageIdentifierRevision PackageIdentifier
+        [S-2203] | CabalFileNameParseFail FilePath
+        [S-8854] | CabalFileNameInvalidPackageName FilePath
+        [S-4623] | ComponentNotParsedBug
+        ~~~
+
+    -   `Stack.Types.Snapshot.TypesSnapshotException`
+
+        ~~~haskell
+        [S-8787] = ParseSnapshotException Text
+        [S-4865] | FilepathInDownloadedSnapshot Text
+        ~~~
+
+    -   `Stack.Types.Storage.StoragePrettyException`
+
+        ~~~haskell
+        [S-8835] = StorageMigrationFailure Text (Path Abs File) SomeException
+        ~~~
+
+    -   `Stack.Types.TemplateName.TypesTemplateNameException`
+
+        ~~~haskell
+        [S-7410] = DefaultTemplateNameNotParsedBug String
+        ~~~
+
+    -   `Stack.Unpack.UnpackPrettyException`
+
+        ~~~haskell
+        [S-3515] = UnpackDirectoryAlreadyExists (Set (Path Abs Dir))
+        [S-2628] | CouldNotParsePackageSelectors [String]
+        ~~~
+
+    -   `Stack.Upgrade.UpgradePrettyException`
+
+        ~~~haskell
+        [S-8761] = SnapshotOptionInvalid
+        [S-3642] | NeitherBinaryOrSourceSpecified
+        [S-8716] | ExecutableFailure
+        [S-7114] | CommitsNotFound String String
+        [S-9668] | StackInPackageIndexNotFound
+        [S-6648] | VersionWithNoRevision
+        ~~~
+
+    -   `Stack.Upload.UploadPrettyException`
+
+        ~~~haskell
+        [S-2256] = AuthenticationFailure
+        [S-6108] | ArchiveUploadFailure Int [String] String
+        [S-2837] | DocsTarballInvalid [(String, Path Abs File)]
+        [S-3179] | ItemsInvalid [FilePath]
+        [S-3030] | NoItemSpecified String
+        [S-5908] | PackageDirectoryInvalid [FilePath]
+        [S-7274] | PackageIdNotSpecifiedForDocsUploadBug
+        [S-5860] | PackageIdSpecifiedForPackageUploadBug
+        [S-5955] | TarGzFileNameInvalidBug String
+        ~~~
+
+    -   `System.Process.Pager.PagerException`
+
+        ~~~haskell
+        [S-9392] = PagerExitFailure CmdSpec Int
+        ~~~
+
+    \* The instance of `Show` is derived.
+
+*   `Stack.Build.Execute.singleBuild`: catches exceptions in `cabal ...`
+
+    `throwM`
+
+*   `Stack.Build.Source.getFileDigestMaybe`: catches exceptions in
+    `liftM Just . withSourceFile fp $ getDigest`
+
+    `throwM`
+
+*   `Stack.Config.configFromConfigMonoid`:
+
+    Presented as a warning rather than as an error:
+
+    ~~~text
+    [S-8432]
+    Stack's 'programs' path is <path>. It contains a space character. This will
+    prevent building with GHC 9.4.1 or later. It also has has no alternative
+    short ('8 dot 3') name. This will cause problems with packages that use the
+    GNU project's 'configure' shell script.
+
+    To avoid such problems, use the local-programs-path non-project specific
+    configuration option to specify an alternative space-free path.
+    ~~~
+
+    or
+
+    ~~~text
+    [S-8432]
+    Stack's 'programs' path is <path>. It contains a space character. This will
+    prevent building with GHC 9.4.1 or later.
+
+    To avoid such problems, use the local-programs-path non-project specific
+    configuration option to specify an alternative space-free path.
+    ~~~
+
+*   `Stack.Coverage.generateHpcReport`: catches exceptions from
+    `findPackageFieldForBuiltPackage`
+
+    ~~~text
+    <exception>
+    ~~~
+
+*   `Stack.Coverage.generateHpcReportInternal`:
+
+    ~~~text
+    [S-4634] Didn't find .tix for <report> - expected to find it at <path>.
+    ~~~
+
+*   `Stack.Coverage.generateHpcReportInternal`:
+
+    ~~~text
+    [S-8215] <exception>
+    Error occurred while producing <report>"
+    ~~~
+
+*   `Stack.Coverage.generateHpcReportInternal`:
+
+    ~~~text
+    [S-6829] Error: The <report> did not consider any code. One possible cause of this is
+    if your test-suite builds the library code (see Stack issue #1008). It may
+    also indicate a bug in Stack or the hpc program. Please report this issue if
+    you think your coverage report should have meaningful results.
+    ~~~
+
+*   `Stack.Coverage.readTixOrlog`:
+
+    ~~~text
+    [S-3521] Error while reading tix: <exeception>
+    ~~~
+
+*   `Stack.Coverage.readTixOrlog`:
+
+    ~~~text
+    [S-7786] Failed to read tix file <path>
+    ~~~
+
+*   `Stack.Coverage.updateTixFile`:
+
+    ~~~text
+    [S-2887] Failed to read <file>
+    ~~~
+
+*   `Stack.Ghci.buildDepsAndInitialSteps`: catches exeception from
+    `buildLocalTargets`
+
+    ~~~text
+    <exception>
+    ~~~
+
+*   `Stack.GhcPkg.createDatabase`:
+
+    ~~~text
+    [S-9735] Unable to create package database at <path>
+    ~~~
+
+*   `Stack.Lock.loadYamlThrow`:
+
+    `Data.Yaml.AesonException`
+
+    `throwIO`
+
+*   `Stack.Package.resolveGlobFiles`:
+
+    `Control.Exception.Base.IOException`
+
+    `throwIO`
+
+*   `Stack.Runners.withConfig`:
+
+    ~~~text
+    [S-7353] Error when running shouldUpgradeCheck: <exception>
+    ~~~
+
+*   `Stack.Script.scriptCmd`:
+
+    Error used because warnings are surpressed.
+
+    ~~~text
+    Ignoring override stack.yaml file for script command: <path>
+    ~~~
+
+*   `Stack.Script.scriptCmd`:
+
+    Error used because warnings are surpressed.
+
+    ~~~text
+    Ignoring SYLGlobalProject for script command
+    ~~~
+
+*   `Stack.SDist.getSDistTarball`:
+
+    ~~~text
+    [S-8399] Error building custom-setup dependencies: <exception>
+    ~~~
+
+*   `Stack.Setup.downloadStackExe`: catches exceptions from `performPathChecking`
+
+    ~~~text
+    <exception>
+    ~~~
+
+*   `Stack.Upload.uploadBytes`:
+
+    ~~~text
+    [S-2804] forbidden upload
+    Usually means: you have already uploaded this package/version combination
+    Ignoring error and continuing, full message from Hackage below:
+    <Hackage_message>
+    ~~~
+
+*   `Stack.Upload.uploadBytes`:
+
+    ~~~text
+    [S-4444] service unavailable
+    This error some times gets sent even though the upload succeeded
+    Check on Hackage to see if your package is present
+    <Hackage_message>
+    ~~~
diff --git a/doc/maintainers/team_process.md b/doc/maintainers/team_process.md
index 9975e2c718..65c7325df4 100644
--- a/doc/maintainers/team_process.md
+++ b/doc/maintainers/team_process.md
@@ -5,7 +5,7 @@
 ## Purpose of this document
 
 This guide is intended to formalize the process by which the `Stack` maintainer
-team operates. We expect it'll evolve over time as experience makes clearer
+team operates. We expect it will evolve over time as experience makes clearer
 what works best in practice.
 
 Having a well-documented set of processes and responsibilities has been
@@ -15,7 +15,6 @@ distributed team
 ](https://github.com/commercialhaskell/stackage/blob/master/CURATORS.md))
 and we hope to replicate that success here.
 
-
 ## Goals
 
 The goals of the `Stack` maintainer team are to:
@@ -39,11 +38,10 @@ The goals of the `Stack` maintainer team are to:
 The sections below detail various activities by the `Stack` team to realize
 these goals.
 
-
 ## Issue triage
 
 The maintainer team provides ongoing review and responses to newly-filed GitHub
-issues and pull requests. From experience, we find it's easiest to have a
+issues and pull requests. From experience, we find it is easiest to have a
 single person "on call" at any given time. Therefore, the team rotates shifts
 on a weekly basis. The "on call" triager is responsible for:
 
@@ -65,7 +63,6 @@ This is one path to getting a lot of experience with the codebase, plus great
 interaction with the rest of the maintainer team, without necessarily taking on
 major coding tasks.
 
-
 ## Time commitment
 
 Someone considering joining the issue triager team may be wondering:
@@ -86,7 +83,6 @@ process, but for now we anticipate growing the team to about eight members
 (which is the size of the `Stackage` team as well), each of whom is likely to
 spend about two hours in total on upkeep work every eight weeks.
 
-
 ## Issue and pull request interaction guidelines
 
 These guidelines apply to all members of the maintainer team.
@@ -103,7 +99,6 @@ These guidelines apply to all members of the maintainer team.
 - If you know you’ll be unable to answer for a significant period of time, say
   so. Even better: ask someone else to take over from you.
 
-
 ## Assessing feature requests and enhancement PRs
 
 **NB: this section is very likely to evolve over time as well.**
@@ -123,20 +118,20 @@ Oftentimes though, the request is larger and more far-reaching in nature.
 Perhaps the requester is unaware of the extent to which his or her change would
 impact other people's workflows or related components in the code. Conversely,
 they may have a deep understanding of its implications and feel strongly that
-it would be a valuable improvement, whereas it's not so clear to the triager.
+it would be a valuable improvement, whereas it is not so clear to the triager.
 
 Discerning which requests should be considered "small" and which warrant
 broader collaboration is admittedly an inexact science. Use your best judgment
-and don't sweat the occasional mistake if you approve something you thought was
-small but ultimately wasn't.
+and do not sweat the occasional mistake if you approve something you thought was
+small but ultimately was not.
 
-In the case of medium-to-large sized feature requests, it's best to solicit
+In the case of medium-to-large sized feature requests, it is best to solicit
 feedback from at least one or two of the core `Stack` developers. You may use
 GitHub @mentions to draw the relevant contributors' attention to the issue in
-question. If you're not sure who's best to consult you should ask on
+question. If you are not sure who's best to consult you should ask on
 `#stack-collaborators`.
 
-Try to be clear to the requester that you're opening the discussion up to more
+Try to be clear to the requester that you are opening the discussion up to more
 participants and that the proposal will require thoughtful consideration
 (probably a majority vote) before any decision is made.
 
@@ -158,14 +153,12 @@ With respect to assessing a PR's code, @snoyberg has outlined some
 into his projects which may be helpful to `Stack` triagers when performing
 reviews, as well.
 
-
 ## Real-time communications
 
 At present, the maintainer team mostly communicates via a rather quiet channel
-called [`#stack-collaborators`](../CONTRIBUTING/#slack-channel) on FP
-Complete's Slack workspace, although we may migrate to some other platform in
-the near future.
-
+called [`#stack-collaborators`](../CONTRIBUTING.md#slack-channel) in the
+Haskell Foundation's Slack workspace, although we may migrate to some other
+platform in the future.
 
 ## Dealing with support issues
 
@@ -177,7 +170,6 @@ maintainers team makes no guarantees about regularly checking them.
 *We may decide to offload support questions elsewhere in the future, but for
 now the most important thing is to direct users to a single destination.*
 
-
 ## Issue vs pull request
 
 Sometimes it is ambiguous whether something should be opened as an issue to
@@ -188,7 +180,6 @@ open a PR, it will _definitely_ take less time than opening an issue and
 describing the change you'd like to make. This logic can sometimes apply to
 minor code changes. Use your best judgement.
 
-
 ## Issue closing policy
 
 We need to strike a balance in issue handling between keeping a maintainable
@@ -198,7 +189,7 @@ of this is: any open issue indicates "this deserves attention in the near
 future." Before this policy existed, issues actually meant "maybe someone will
 deal with this someday."
 
-The policy for closing an issue depends entirely on the type of issue we're
+The policy for closing an issue depends entirely on the type of issue we are
 looking at.
 
 When closing an issue, please provide a brief explanation for why the issue was
@@ -210,7 +201,7 @@ etc.
     The following sections establish rules under which a bug report will be
     closed by the maintainer team. The goal is to avoid a situation where issues
     linger in an indeterminate state. The maintainer team is allowed to
-    disregard these "rules" at any point. In other words: the goal isn't to
+    disregard these "rules" at any point. In other words: the goal is not to
     allow people to "lawyer" issues.
 
 ### Discussion
diff --git a/doc/maintainers/version_scheme.md b/doc/maintainers/version_scheme.md
new file mode 100644
index 0000000000..16009751e8
--- /dev/null
+++ b/doc/maintainers/version_scheme.md
@@ -0,0 +1,63 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Version scheme
+
+A Stack package or executable may have a version with three or four components:
+`X.Y.Z` or `X.Y.Z.A`.
+
+## Development or stable versions
+
+* Versions with an _even_ `Y` component are development versions (the `master`
+  branch)
+
+* Versions with an _odd_ `Y` component are stable versions (the `stable` branch,
+  or in a `rc/vX.Y` release candidate branch for not-yet-released versions)
+
+## Unreleased or released versions
+
+* Versions with an _even_ `Z` component are unreleased versions (including
+  release candidates)
+
+* Versions with an _odd_ `Z` component are released versions
+
+* Except for the `release` branch, all branches must have an even `Z` component
+
+* Except for the `release`, `stable` and `rc/vX.Y` release candidate branches,
+  all branches will have a `0` `Z` component
+
+## Use of a fourth component
+
+* Release candidate binaries will be released with an odd `A` component
+
+* Hackage-only dependency compatibility patch releases add a `A` component
+  (e.g. `v2.5.1.1`, in the `release` branch)
+
+* Pre-release unstable binaries will be released with the date as the `A`
+  component (e.g. `4.2.0.20260821`)
+
+## Examples
+
+* `4.1.0.0`: `v4.1.*` series pre-release branch (`rc/v4.1` branch)
+
+* `4.1.0.1`: first release candidate for first release of `v4.1.*` series
+  (`rc/v4.1` branch)
+
+* `4.1.0.2`: continuing development on pre-release branch
+
+* `4.1.0.3`: second release candidate for first release of `v4.1.*` series
+  (`rc/v4.1` branch)
+
+* `4.1.1`: first release of the `4.1.*` series (`release` branch)
+
+* `4.1.2.1`: first release candidate for second release of `4.1.*` series
+  (`rc/v4.1` branch)
+
+* `4.1.3`: second release of `4.1.*` series (`release` branch)
+
+* `4.1.3.1`: first Hackage-only patch of `4.1.3` (`release` branch)
+
+* `4.1.3.2`: second Hackage-only patch of `4.1.3` (`release` branch)
+
+* `4.2.0`: unstable development code (`master` branch)
+
+* `4.2.0.20260821`: pre-release snapshot of unstable version (`master` branch)
diff --git a/doc/nix_integration.md b/doc/nix_integration.md
deleted file mode 100644
index bbf48977fd..0000000000
--- a/doc/nix_integration.md
+++ /dev/null
@@ -1,411 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# Nix integration
-
-[:octicons-tag-24: 0.1.10.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.10.0)
-
-[Nix](https://nixos.org/) is a purely functional package manager. Stack can be
-configured to integrate with Nix.
-
-The Nix package manager is a pre-requisite for integration. On Linux (including
-Windows Subsystem for Linux) and macOS, it can be downloaded and installed from
-the [Nix download page](https://nixos.org/download.html).
-
-When integrated with Nix, Stack handles Haskell dependencies as it usually does
-and the Nix package manager handles the _non-Haskell_ dependencies needed by the
-Haskell packages.
-
-Stack downloads Haskell packages from [Stackage](https://www.stackage.org/lts)
-and builds them locally. Stack uses Nix to download
-[Nix packages][nix-search-packages]. These provide the GHC compiler and external
-C libraries that you would normally install manually.
-
-Nix's `nix-shell` starts an interactive shell based on a Nix expression. Stack
-can automatically create a Nix build environment in the background using
-`nix-shell`. There are two alternative options to create such a build
-environment:
-
-1. provide a list of [Nix packages][nix-search-packages]
-2. provide a `shell.nix` file that gives you more control over the libraries and
-   tools available inside the shell.
-
-A `shell.nix` file requires writing code in Nix's
-[custom language][nix-language]. Use this option only if you know Nix and have
-special requirements, such as using custom Nix packages that override the
-standard ones or using system libraries with special requirements.
-
-### Checking the Nix installation
-
-Once Nix is installed, the Nix commands (`nix-shell` etc) should be available.
-If they are not, it could be because the file
-`$HOME/.nix-profile/etc/profile.d/nix.sh` is not sourced by your shell.
-
-You should either:
-
-1. run `source ~/.nix-profile/etc/profile.d/nix.sh` each time you open a
-   terminal and need Nix; or
-2. add the command `source ~/.nix-profile/etc/profile.d/nix.sh` to your
-   `~/.bashrc` or `~/.bash_profile` file.
-
-### Enable Nix integration
-
-To enable Nix integration, add the following section to your Stack YAML
-configuration file (`stack.yaml` or `config.yaml`):
-
-~~~yaml
-nix:
-  enable: true  # false by default
-~~~
-
-The equivalent command line flag (which will prevail) is `--[no-]nix`. Passing
-any `--nix-*` option on the command line will imply the `--nix` option.
-
-With Nix integration enabled, `stack build` and `stack exec` will automatically
-launch themselves in a local build environment (using `nix-shell` behind the
-scenes). It is not necessary to run `stack setup`, unless you want to cache a
-GHC installation before running a build.
-
-**Known limitation on macOS:** currently, `stack --nix ghci` fails on macOS, due
-to a bug in GHCi when working with external shared libraries.
-
-### Supporting both Nix and non-Nix developers
-
-With Nix integration enabled in Stack's YAML configuration file, every developer
-of your project needs to have Nix installed, but the developer also gets all
-external libraries automatically.
-
-Julien Debon of Tweag has published a [blog post][tweag-blog-post] on
-*Smooth, non-invasive Haskell Stack and Nix shell integration* (2 June 2022).
-The post explains how to set things up so that both Nix and non-Nix developers
-can work together on the same project. The `tweag/haskell-stack-nix-example`
-[GitHub repository][tweag-example] provides an example of working Stack and Nix
-shell integration to accompany the post.
-
-Nix 2.4 (released 1 November 2021) introduced a new and experimental format to
-package Nix-based projects, known as 'flakes'.
-
-The example below adapts and extends the example accompanying the blog post
-above to use Nix flakes. The `flake.nix` file is:
-
-~~~nix
-{
-  description = "my project description";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-
-        hPkgs =
-          pkgs.haskell.packages."ghc8107"; # need to match Stackage LTS version
-                                           # from stack.yaml resolver
-
-        myDevTools = [
-          hPkgs.ghc # GHC compiler in the desired version (will be available on PATH)
-          hPkgs.ghcid # Continuous terminal Haskell compile checker
-          hPkgs.ormolu # Haskell formatter
-          hPkgs.hlint # Haskell codestyle checker
-          hPkgs.hoogle # Lookup Haskell documentation
-          hPkgs.haskell-language-server # LSP server for editor
-          hPkgs.implicit-hie # auto generate LSP hie.yaml file from cabal
-          hPkgs.retrie # Haskell refactoring tool
-          # hPkgs.cabal-install
-          stack-wrapped
-          pkgs.zlib # External C library needed by some Haskell packages
-        ];
-
-        # Wrap Stack to work with our Nix integration. We don't want to modify
-        # stack.yaml so non-Nix users don't notice anything.
-        # - no-nix: We don't want Stack's way of integrating Nix.
-        # --system-ghc    # Use the existing GHC on PATH (will come from this Nix file)
-        # --no-install-ghc  # Don't try to install GHC if no matching GHC found on PATH
-        stack-wrapped = pkgs.symlinkJoin {
-          name = "stack"; # will be available as the usual `stack` in terminal
-          paths = [ pkgs.stack ];
-          buildInputs = [ pkgs.makeWrapper ];
-          postBuild = ''
-            wrapProgram $out/bin/stack \
-              --add-flags "\
-                --no-nix \
-                --system-ghc \
-                --no-install-ghc \
-              "
-          '';
-        };
-      in {
-        devShells.default = pkgs.mkShell {
-          buildInputs = myDevTools;
-
-          # Make external Nix c libraries like zlib known to GHC, like
-          # pkgs.haskell.lib.buildStackProject does
-          # https://github.com/NixOS/nixpkgs/blob/d64780ea0e22b5f61cd6012a456869c702a72f20/pkgs/development/haskell-modules/generic-stack-builder.nix#L38
-          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath myDevTools;
-        };
-      });
-}
-~~~
-
-Check-in this `flake.nix` to your project's repository. Run the `nix develop`
-command (it searches for `flake.nix` by default) and you'll find a new
-`flake.lock` file. That file that pins the precise nixpkgs package set. Check-in
-that `flake.lock` file as well, and every Nix developer of your project will use
-precisely the same package set.
-
-### GHC through Nix packages
-
-Nix integration will instruct Stack to build inside a local build environment.
-That environment will also download and use a
-[GHC Nix package](https://search.nixos.org/packages?query=haskell.compiler.ghc)
-matching the required version of the configured
-[Stack resolver](yaml_configuration.md#resolver-or-snapshot).
-
-Enabling Nix integration means that packages will always be built using the
-local GHC from Nix inside your shell, rather than your globally installed system
-GHC (if any).
-
-Stack can use only GHC versions that are in the Nix package repository. The
-[Nixpkgs master branch](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/haskell-modules)
-usually picks up new versions quickly, but it takes two or three days before
-those updates arrive in the `unstable` channel. Release channels, like
-`nixos-22.05`, receive those updates only occasionally -- say, every two or
-three months --, so you should not expect them to have the latest compiler
-available. Fresh NixOS installs use a release version by default.
-
-To identify whether a given compiler is available, you can use the following Nix
-command:
-
-~~~sh
-nix-env -f "<nixpkgs>" -qaP -A haskell.compiler.ghc924
-haskell.compiler.ghc924  ghc-9.2.4
-~~~
-
-If Nix doesn't know that version of GHC, you'll see the following error message:
-
-~~~sh
-nix-env -f "<nixpkgs>" -qaP -A haskell.compiler.ghc999
-error: attribute ‘ghc999’ in selection path ‘haskell.compiler.ghc999’ not found
-~~~
-
-You can list all known Haskell compilers in Nix with the following:
-
-~~~sh
-nix-instantiate --eval -E "with import <nixpkgs> {}; lib.attrNames haskell.compiler"
-~~~
-
-Alternatively, use `nix repl`, a convenient tool to explore nixpkgs:
-
-~~~sh
-nix repl
-~~~
-
-In the REPL, load nixpkgs and get the same information through autocomplete:
-
-~~~sh
-nix-repl> :l <nixpkgs>
-nix-repl> haskell.compiler.ghc<Tab>
-~~~
-
-You can type and evaluate any Nix expression in the Nix REPL, such as the one we
-gave to `nix-instantiate` earlier.
-
-### External C libraries through Nix packages
-
-To let Nix manage external C libraries, add (for example) the following section
-to your Stack YAML configuration file:
-
-~~~yaml
-nix:
-  enable: true
-  packages: [zlib, glpk, pcre]
-~~~
-
-The equivalent command line option is `--nix-packages "zlib glpk pcre"`.
-
-The `packages` key and the `shell-file` key (see further below) are
-alternatives. Specifying both results in an error.
-
-The example above will instruct Stack to build inside a local build environment
-that will have the Nix packages
-[zlib](https://search.nixos.org/packages?query=zlib),
-[glpk](https://search.nixos.org/packages?query=glpk) and
-[pcre](https://search.nixos.org/packages?query=pcre)
-installed, which provide the C libraries of the same names.
-
-**Note:** currently, Stack only discovers dynamic and static libraries in the
-`lib/` folder of any Nix package, and likewise header files in the `include/`
-folder. If you're dealing with a package that doesn't follow this standard
-layout, you'll have to deal with that using a custom `shell.nix` file (see further below).
-
-### External C libraries through a `shell.nix` file
-
-In Nix, a 'derivation' is a description of a build action and its result is a
-Nix store object. Nix's [custom language][nix-language] can provide a fully
-customized derivation as an environment to use. To specify such a `shell.nix`
-file, add the following section to your Stack YAML configuration file:
-
-~~~yaml
-nix:
-  enable: true
-  shell-file: shell.nix
-~~~
-
-The equivalent command line option (which will prevail) is
-`--nix-shell-file shell.nix`.
-
-The `packages` and `shell-file` keys are alternatives. Specifying both results
-in an error.
-
-Defining a `shell.nix` file allow you to override some Nix derivations, for
-instance to change some build options of the libraries you use, or to set
-additional environment variables. For further information, see the
-[Nix manual][nix-manual-exprs].
-
-The `shell.nix` file that is the equivalent of the
-`packages: [zlib, glpk, pcre]` example above is:
-
-~~~nix
-{ghc}:
-with (import <nixpkgs> {});
-
-haskell.lib.buildStackProject {
-  inherit ghc;
-  name = "myEnv";
-  buildInputs = [ zlib glpk pcre ];
-}
-~~~
-
-The `buildStackProject` utility function is documented in the
-[Nixpkgs manual][nixpkgs-manual-haskell].
-
-Stack expects the `shell.nix` file to define a function of with one argument
-called `ghc` (arguments are not positional), which you should give to
-function `buildStackProject`. This argument is a GHC Nix package in the
-version as defined in the resolver you set in Stack's project-level
-configuration file (`stack.yaml`).
-
-### Pure and impure Nix shells
-
-By default, Stack will run the build in a *pure* Nix build environment (or
-*shell*), which means two important things:
-
-1. basically **no environment variable will be forwarded** from your user
-   session to the nix-shell (variables like `HTTP_PROXY` or `PATH` notably will
-   not be available); and
-2. the build should fail if you haven't specified all the dependencies in the
-   `packages:` section of the Stack YAML configuration file, even if these
-   dependencies are installed elsewhere on your system. This behaviour enforces
-   a complete description of the build environment to facilitate
-   reproducibility.
-
-To override this behaviour, add the following section to your Stack YAML
-configuration file:
-
-~~~yaml
-nix:
-  enable: true
-  pure: false
-~~~
-
-The equivalent command line flag (which will prevail) is `--[no-]-nix-pure`.
-
-**Note:** On macOS, shells are non-pure by default currently. This is due soon
-to be resolved locale issues. So on macOS you'll need to be a bit more careful
-to check that you really have listed all dependencies.
-
-### Nix package sources
-
-Nix organizes its packages in snapshots of packages (each snapshot being a
-"package set") similar to how Stackage organizes Haskell packages.  By default,
-`nix-shell` will look for the "nixpkgs" package set located by your `NIX_PATH`
-environment variable. This package set can be different depending on when you
-installed Nix and which nixpkgs channel you're using (similar to the LTS channel
-for stable packages and the nightly channel for bleeding edge packages in
-[Stackage](https://www.stackage.org/)). This is bad for reproducibility so that
-nixpkgs should be pinned, i.e., set to the same package set for every developer
-of your project.
-
-To set or override the Nix package set, add the following section to your Stack
-YAML configuration file:
-
-~~~yaml
-nix:
-  path: [nixpkgs=<path_to_my_own_nixpkgs_clone>]
-~~~
-
-The equivalent command line option is
-`--nix-path <path_to_my_own_nixpkgs_clone>`.
-
-By this means, you can ask Nix to use your own local checkout of the nixpkgs
-repository. You could in this way use a bleeding edge nixpkgs, cloned from the
-`NixOS/nixpkgs` [repository](http://www.github.com/NixOS/nixpkgs) `master`
-branch, or edit the Nix descriptions of some packages.
-
-The Tweag example [repository][tweag-example] shows how you can pin a package
-set.
-
-## Configuration options
-
-Below is a summary of the Stack YAML configuration file settings, identifying
-default values:
-
-~~~yaml
-nix:
-
-  # false by default. Must be present and set to `true` to enable Nix, except on
-  # NixOS where it is enabled by default (see #3938).  You can set it in
-  # your `$HOME/.stack/config.yaml` to enable Nix for all your projects without
-  # having to repeat it
-  enable: true
-
-  # true by default. Tells Nix whether to run in a pure shell or not.
-  pure: true
-
-  # Empty by default. The list of packages you want to be
-  # available in the nix-shell at build time (with `stack
-  # build`) and run time (with `stack exec`).
-  packages: []
-
-  # Unset by default. You cannot set this option if `packages:`
-  # is already present and not empty.
-  shell-file: shell.nix
-
-  # A list of strings, empty by default. Additional options that
-  # will be passed verbatim to the `nix-shell` command.
-  nix-shell-options: []
-
-  # A list of strings, empty by default, such as
-  # `[nixpkgs=/my/local/nixpkgs/clone]` that will be used to override
-  # NIX_PATH.
-  path: []
-
-  # false by default. Whether to add your Nix dependencies as Nix garbage
-  # collection roots. This way, calling nix-collect-garbage will not remove
-  # those packages from the Nix store, saving you some time when running
-  # stack build again with Nix support activated.
-  # This creates a `nix-gc-symlinks` directory in the project `.stack-work`.
-  # To revert that, just delete this `nix-gc-symlinks` directory.
-  add-gc-roots: false
-~~~
-
-`stack --nix-help` will list the equivalent command line flags and options.
-
-## Stack and developer tools on NixOS
-
-NixOS is a Linux distribution based on Nix, that is composed using modules and
-packages defined in the Nixpkgs project.
-
-When using Stack on NixOS, you must use Stack's Nix integration to install GHC.
-That is because external C libraries in NixOS are not installed in the usual
-distribution directories. GHC installed through Stack (without Nix) can't find
-those libraries and, therefore, can't build most projects. However, GHC provided
-through Nix can be modified to find the external C libraries provided through
-Nix.
-
-[nix-language]: https://nixos.wiki/wiki/Overview_of_the_Nix_Language
-[nix-manual-exprs]: http://nixos.org/manual/nix/stable/expressions/writing-nix-expressions.html
-[nix-search-packages]: https://search.nixos.org/packages
-[nixpkgs-manual-haskell]: https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html?highlight=buildStackProject#how-to-build-a-haskell-project-using-stack
-[tweag-blog-post]: https://www.tweag.io/blog/2022-06-02-haskell-stack-nix-shell/
-[tweag-example]: https://github.com/tweag/haskell-stack-nix-example/
diff --git a/doc/other_resources.md b/doc/other_resources.md
new file mode 100644
index 0000000000..31887f32b3
--- /dev/null
+++ b/doc/other_resources.md
@@ -0,0 +1,26 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Other resources
+
+There are lots of resources available for learning more about Stack:
+
+* `stack`, `stack --help` (or `-h`) — lists Stack's commands, and flags and
+  options common to those commands
+* `stack <command> --help` (or `-h`) — provides help on the particular Stack
+  command, including flags and options specific to the command
+* `stack --version` — identify the version and Git hash of the Stack executable
+* `--verbose` (or `-v`) — much more info about internal operations (useful for
+  bug reports)
+* The [home page](http://haskellstack.org)
+* The [Stack mailing list](https://groups.google.com/d/forum/haskell-stack)
+* The [FAQ](faq.md)
+* The [haskell-stack tag on Stack Overflow](http://stackoverflow.com/questions/tagged/haskell-stack)
+* [Another getting started with Stack tutorial](http://seanhess.github.io/2015/08/04/practical-haskell-getting-started.html)
+* [Why is Stack not Cabal?](https://www.fpcomplete.com/blog/2015/06/why-is-stack-not-cabal)
+
+Package description format specifications supported by Stack:
+
+* Cabal's: a
+  [Cabal file](https://cabal.readthedocs.io/en/stable/cabal-package-description-file.html)
+* Hpack's: a
+  [`package.yaml` file](https://github.com/sol/hpack?tab=readme-ov-file#documentation)
diff --git a/doc/pantry.md b/doc/pantry.md
deleted file mode 100644
index 0e9ba43af8..0000000000
--- a/doc/pantry.md
+++ /dev/null
@@ -1,252 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
-
-# Snapshot and package location
-
-[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
-
-This document describes:
-
-* the specification of a snapshot location (in the `resolver` key)
-* the specification of a package location (in the `extra-deps` key and in a
-  snapshot)
-
-!!! info
-
-    Stack uses the [Pantry](https://hackage.haskell.org/package/pantry) to
-    specify the location of snapshots and packages. Pantry is geared towards
-    reproducible build plans with cryptographically secure specification of
-    snapshots and packages.
-
-## Snapshot location
-
-There are essentially four different ways of specifying a snapshot location:
-
-1.  Via a compiler version, which is a "compiler only" snapshot. This could be,
-    for example:
-
-    ~~~yaml
-    resolver: ghc-8.6.5`
-    ~~~
-
-2.  Via a URL pointing to a snapshot configuration file, for example:
-
-    ~~~yaml
-    resolver: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2018/8/21.yaml`
-    ~~~
-
-3.  Via a local file path pointing to a snapshot configuration file, for
-    example:
-
-    ~~~yaml
-    resolver: my-local-snapshot.yaml
-    ~~~
-
-4.  Via a _convenience synonym_, which provides a short form for some common
-    URLs. These are:
-
-    * GitHub: `github:user/repo:path` is treated as:
-
-        ~~~text
-        https://raw.githubusercontent.com/user/repo/master/path
-        ~~~
-
-    * LTS Haskell: `lts-X.Y` is treated (by default) as:
-
-        ~~~text
-        github:commercialhaskell/stackage-snapshots:lts/X/Y.yaml
-        ~~~
-
-    * Stackage Nightly: `nightly-YYYY-MM-DD` is treated (by default) as:
-
-        ~~~text
-        github:commercialhaskell/stackage-snapshots:nightly/YYYY/M/D.yaml
-        ~~~
-
-!!! info
-
-    By default, LTS Haskell and Stackage Nightly snapshot configurations are
-    retrieved from the `stackage-snapshots` GitHub repository of user
-    `commercialhaskell`. The
-    [snapshot-location-base](yaml_configuration.md#snapshot-location-base)
-    option allows a custom location to be set.
-
-For safer, more reproducible builds, you can optionally specify a URL
-together with a cryptographic hash of its content. For example:
-
-~~~yaml
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/12/0.yaml
-  size: 499143
-  sha256: 781ea577595dff08b9c8794761ba1321020e3e1ec3297fb833fe951cce1bee11
-~~~
-
-`size` is the number of bytes in the file and `sha256` is the file's SHA256
-hash. If not provided, the information will automatically be generated and
-stored in a [lock file](lock_files.md).
-
-## Package location
-
-There are three types of package locations:
-
-1.  Hackage packages
-2.  Git and Mecurial repositories
-3.  Local or remote archives
-
-All three types support optional tree metadata to be added, which can be used
-for reproducibility and faster downloads. This information can automatically be
-generated in a [lock file](lock_file.md).
-
-### Hackage packages
-
-Packages can be stated by a name-version combination. The basic syntax for this
-is:
-
-~~~yaml
-extra-deps:
-- acme-missiles-0.3
-~~~
-
-Using this syntax, the most recent Cabal file revision available will
-be used.
-
-You can specify a specific revision number, with `0` being the original file,
-like this:
-
-~~~yaml
-extra-deps:
-- acme-missiles-0.3@rev:0
-~~~
-
-For safer, more reproducible builds, you can optionally specify the SHA256 hash
-of the Cabal file's contents, like this:
-
-~~~yaml
-extra-deps:
-- acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1
-~~~
-
-You can optionally also specify the size of the Cabal file in bytes, like this:
-
-~~~yaml
-extra-deps:
-- acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1,631
-~~~
-
-!!! note
-
-    Specifying package using SHA256 is slightly more resilient in that it does
-    not rely on correct ordering in the package index, while revision number is
-    likely simpler to use. In practice, both should guarantee equally
-    reproducible build plans.
-
-You can also include the Pantry tree information. The following would be
-generated and stored in the lock file:
-
-~~~yaml
-- hackage: acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1,613
-  pantry-tree:
-    size: 226
-    sha256: 614bc0cca76937507ea0a5ccc17a504c997ce458d7f2f9e43b15a10c8eaeb033
-~~~
-
-### Git and Mercurial repositories
-
-You can give a Git or Mercurial repository at a specific commit, and Stack will
-clone that repository. For example:
-
-~~~yaml
-extra-deps:
-- git: git@github.com:commercialhaskell/stack.git
-  commit: 6a86ee32e5b869a877151f74064572225e1a0398
-- git: git@github.com:snoyberg/http-client.git
-  commit: "a5f4f3"
-- hg: https://example.com/hg/repo
-  commit: da39a3ee5e6b4b0d3255bfef95601890afd80709
-~~~
-
-!!! note
-
-    It is highly recommended that you only use SHA1 values for a Git or
-    Mercurial commit. Other values may work, but they are not officially
-    supported, and may result in unexpected behavior (namely, Stack will not
-    automatically pull to update to new versions). Another problem with this is
-    that your build will not be deterministic, because when someone else tries
-    to build the project they can get a different checkout of the package.
-
-A common practice in the Haskell world is to use "megarepos", or repositories
-with multiple packages in various subdirectories. Some common examples include
-[wai](https://github.com/yesodweb/wai/) and
-[digestive-functors](https://github.com/jaspervdj/digestive-functors). To
-support this, you may also specify `subdirs` for repositories. For example:
-
-~~~yaml
-extra-deps:
-- git: git@github.com:yesodweb/wai
-  commit: 2f8a8e1b771829f4a8a77c0111352ce45a14c30f
-  subdirs:
-  - auto-update
-  - wai
-~~~
-
-If unspecified, `subdirs` defaults to `['.']` meaning looking for a package in
-the root of the repository. If you specify a value of `subdirs`, then `'.'` is
-_not_ included by default and needs to be explicitly specified if a required
-package is found in the top-level directory of the repository.
-
-#### GitHub
-
-[:octicons-tag-24: 1.7.1](https://github.com/commercialhaskell/stack/releases/tag/v1.7.1)
-
-You can specify packages from GitHub repository name using `github`. For
-example:
-
-~~~yaml
-extra-deps:
-- github: snoyberg/http-client
-  commit: a5f4f30f01366738f913968163d856366d7e0342
-~~~
-
-#### git-annex
-
-[git-annex](https://git-annex.branchable.com) is not supported. This is because
-`git archive` does not handle symbolic links outside the work tree. It is still
-possible to use repositories which use git-annex but do not require the annex
-files for the package to be built.
-
-To do so, ensure that any files or directories stored by git-annex are marked
-[export-ignore](https://git-scm.com/docs/git-archive#Documentation/git-archive.txt-export-ignore)
-in the `.gitattributes` file in the repository. For further information, see
-issue [#4579](https://github.com/commercialhaskell/stack/issues/4579).
-
-For example, if the directory `fonts/` is controlled by git-annex, use the
-following line:
-
-~~~gitattributes
-fonts export-ignore
-~~~
-
-### Local or remote archives
-
-You can use filepaths referring to local archive files or HTTP or HTTPS URLs
-referring to remote archive files, either tarballs or ZIP files.
-
-!!! note
-
-    Stack assumes that these archive files never change after downloading to
-    avoid needing to make an HTTP request on each build.
-
-For safer, more reproducible builds, you can optionally specify a cryptographic
-hash of the archive file.
-
-For example:
-
-~~~yaml
-extra-deps:
-- https://example.com/foo/bar/baz-0.0.2.tar.gz
-- archive: http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip
-  subdirs:
-  - wai
-  - warp
-- archive: ../acme-missiles-0.3.tar.gz
-  sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b
-~~~
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 20de03ceb2..b904b68ee2 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -9,6 +9,12 @@
 # The pip guide to its requirements file format:
 # https://pip.pypa.io/en/stable/reference/requirements-file-format/
 #
-# Current version as at 31 August 2022
-mkdocs==1.3.1
-mkdocs-material
+# Current version as at 20 July 2024
+mkdocs==1.6.0
+# Added as the structure of the online documentation was reorganised around the
+# time of the release of Stack 3.1.1. See:
+#
+# https://github.com/mkdocs/catalog?tab=readme-ov-file#-links--references
+# https://github.com/mkdocs/mkdocs-redirects
+mkdocs-redirects
+mkdocs-material[imaging]
diff --git a/doc/appveyor.yml b/doc/resources/appveyor.yml
similarity index 100%
rename from doc/appveyor.yml
rename to doc/resources/appveyor.yml
diff --git a/doc/resources/stack-and-stackage-avatar.svg b/doc/resources/stack-and-stackage-avatar.svg
new file mode 100644
index 0000000000..7dd3165eb9
--- /dev/null
+++ b/doc/resources/stack-and-stackage-avatar.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="60.000004mm"
+   height="60.000004mm"
+   viewBox="0 0 60.000004 60.000004"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1"><linearGradient
+       id="swatch2"><stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop2" /></linearGradient></defs><g
+     id="layer1"
+     transform="translate(-74.833342,-131.57918)"><g
+       id="g6"
+       mask="none"><path
+         id="rect3"
+         style="fill:#7e56c2;stroke-width:0.264583"
+         d="M 104.83358 131.57918 A 30.000002 30.000002 0 0 0 74.833342 161.57942 A 30.000002 30.000002 0 0 0 74.839543 161.66675 L 134.8271 161.66675 A 30.000002 30.000002 0 0 0 134.8333 161.57942 A 30.000002 30.000002 0 0 0 104.83358 131.57918 z " /><path
+         id="rect2"
+         style="fill:#0981c3;stroke-width:0.264583"
+         d="M 74.839543 161.66675 A 30.000002 30.000002 0 0 0 104.83358 191.57914 A 30.000002 30.000002 0 0 0 134.8271 161.66675 L 74.839543 161.66675 z " /><g
+         id="g5"
+         transform="translate(0,22.182071)"
+         mask="none"><path
+           style="fill:#ffffff;stroke-width:2.13964"
+           d="m 129.26321,150.36944 v -1.47135 h -3.06389 -3.06396 l 1.03438,-0.53033 1.03433,-0.53033 0.67417,-0.78577 0.67417,-0.78576 0.37634,-0.9776 0.37624,-0.97757 0.007,-1.99065 0.007,-1.99073 -0.39981,-0.90741 -0.39975,-0.9073 -0.6761,-0.62667 -0.67608,-0.62671 -1.05237,-0.50523 -1.05238,-0.50522 -1.49925,-0.35891 -1.49929,-0.35884 -1.62788,-0.39932 -1.62787,-0.3993 -0.43045,-0.28938 -0.43042,-0.28933 -0.19071,-0.59271 -0.19075,-0.59274 0.30861,-0.6481 0.30872,-0.64813 0.67113,-0.33604 0.67118,-0.33598 1.35346,-0.0731 1.35355,-0.0731 1.51846,0.29223 1.51851,0.29232 1.2654,0.50492 1.2654,0.5049 0.13141,7.7e-4 0.1314,7.7e-4 -0.0463,-2.38015 -0.0463,-2.38014 -1.85594,-0.40199 -1.8559,-0.40231 -2.69956,-0.0917 -2.69956,-0.0917 -1.14247,0.27567 -1.14245,0.27568 -0.71348,0.37275 -0.71349,0.37283 -0.53899,0.42125 -0.53912,0.42102 -0.50698,0.81059 -0.50706,0.81065 -0.2615,1.03006 -0.2615,1.03008 v 0.87925 0.87937 l 0.2545,1.00273 0.25464,1.00281 0.50956,0.75975 0.50936,0.75976 0.73527,0.51896 0.73529,0.51905 0.89483,0.36185 0.89481,0.36188 2.11917,0.51307 2.11917,0.51304 0.77714,0.26108 0.7772,0.2612 0.38122,0.41635 0.38122,0.41629 0.084,0.76168 0.084,0.76171 -0.52268,0.61081 -0.5227,0.61076 -0.76081,0.21854 -0.7608,0.21854 -1.81456,-0.0872 -1.81454,-0.0871 -1.4341,-0.47508 -1.4341,-0.47506 -0.96543,-0.49902 -0.96521,-0.49896 h -0.17371 -0.17349 v 2.41789 2.41785 l 1.47641,0.45545 1.47633,0.45541 0.16872,0.0571 0.16875,0.0571 -2.82608,0.0126 -2.82605,0.0126 v 1.47138 1.47144 h 10.46071 10.46075 z"
+           id="path5" /><g
+           id="g1"
+           transform="matrix(0.06042167,0,0,0.06042167,79.959067,126.7038)"><path
+             d="m 26.66665,400 h 362.6667"
+             id="stackline3"
+             style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" /><path
+             d="m 26.66665,346.6667 h 362.6667"
+             id="stackline2"
+             style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" /><path
+             d="m 26.66665,293.3334 h 362.6667"
+             id="stackline1"
+             style="fill:none;stroke:#ffffff;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" /><path
+             d="m 318.22215,181.3334 -28.4444,-42.6667 h 99.5556 v 42.6667 z"
+             id="equalsbottom"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+             d="m 275.55555,117.3334 -28.4444,-42.6667 h 142.2222 v 42.6667 z"
+             id="equalstop"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+             d="M 111.99995,256 197.33325,128 111.99995,0 h 64 l 170.6667,256 h -64 l -53.3333,-80 -53.3333,80 z"
+             id="lambda"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+             d="M 26.66665,256 111.99995,128 26.66665,0 h 64 l 85.3333,128 -85.3333,128 z"
+             id="arrow"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></g></g></g></svg>
diff --git a/doc/travis-complex.yml b/doc/resources/travis-complex.yml
similarity index 100%
rename from doc/travis-complex.yml
rename to doc/resources/travis-complex.yml
diff --git a/doc/travis-simple.yml b/doc/resources/travis-simple.yml
similarity index 100%
rename from doc/travis-simple.yml
rename to doc/resources/travis-simple.yml
diff --git a/doc/stack_yaml_vs_cabal_package_file.md b/doc/stack_yaml_vs_cabal_package_file.md
deleted file mode 100644
index f89561d843..0000000000
--- a/doc/stack_yaml_vs_cabal_package_file.md
+++ /dev/null
@@ -1,160 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# stack.yaml versus package.yaml versus a Cabal file
-
-What is the difference between a `stack.yaml` file, a `package.yaml` file and a
-Cabal file (named `<package_name>.cabal`)? This page aims to make that clear.
-
-In short:
-
-* `stack.yaml` contains project-level configuration for Stack, and may contain
-  project-specific options and non-project-specific options.
-
-* `package.yaml` contains a description of a package in the
-  [Hpack](https://github.com/sol/hpack) format. Hpack, including Stack's
-  built-in version, uses the file to create a Cabal file.
-
-* a Cabal file also contains a description of a package, but in the format used
-  by Cabal.
-
-## package.yaml versus a Cabal file
-
-Why two different formats to describe packages? Hpack is considered to have some
-advantages over the underlying Cabal format, which are explained its project
-repository. They include that the Hpack format supports YAML syntax and the
-automatic generation of the lists of `exposed-modules` used in the Cabal format.
-
-The remainder of this page will focus on the difference between a `stack.yaml`
-file and a package description file.
-
-## Package versus project
-
-Stack is a build tool and it uses Cabal, a build system. Cabal defines the
-concept of a _package_. A package has:
-
-* A name and version
-* optionally, one library
-* optionally, one or more executables
-* A Cabal file (or, as mentioned above, an [Hpack](https://github.com/sol/hpack)
-  `package.yaml` file that generates a Cabal file)
-* And a bunch more
-
-There is a one-to-one correspondence between a package and a Cabal file.
-
-Stack defines a new concept called a _project_. A project has:
-
-* A _resolver_, which tells it about a snapshot (more on this later)
-* Extra dependencies on top of the snapshot
-* Optionally, one or more local Cabal packages
-* Flag and GHC options configurations
-* And a bunch more Stack configuration
-
-Often you will have a project that defines only one local Cabal package that you
-are working on. If you need to specify an extra dependency, a source of
-confusion can be why you need to specify it both in the `stack.yaml` file _and_
-in the Cabal file. To explain, let's take a quick detour to talk about snapshots
-and how Stack resolves dependencies.
-
-## Resolvers and snapshots
-
-Stack follows a rule that says, for any projects, there is precisely one version
-of each package available. Obviously, for many packages there are _many_
-versions available in the world. But when resolving a `stack.yaml` file, Stack
-requires that you have chosen a specific version for each package available.
-
-The most common means by which this set of packages is defined is via a
-snapshot provided by Stackage. For example, if you go to the page
-<https://www.stackage.org/lts-19.17>, you will see a list of 2,910 packages at
-specific version numbers. When you then specify `resolver: lts-19.17`, you're
-telling Stack to use those package versions in resolving dependencies down to
-specific versions of packages.
-
-Sometimes a snapshot doesn't have all of the packages that you want. Or you want
-a different version of a package. Or you want to work on a local modification of
-a package. In all of those cases, you can add more configuration data to your
-`stack.yaml` file to override the values it received from your `resolver`
-setting. At the end of the day, each of your projects will end up with some way
-of resolving a package name into a specific version of that package.
-
-## Why specify dependencies twice?
-
-The package `acme-missiles` is not included in any Stackage snapshots. When you
-add something like this to your `stack.yaml` file:
-
-~~~yaml
-extra-deps:
-- acme-missiles-0.3
-~~~
-
-what you're saying to Stack is: "if at any point you find that you need to build
-the `acme-missiles` package, please use version `0.3`". You are _not_ saying
-"please build `acme-missiles` now." You are also not saying "my package depends
-on `acme-missiles`." You are simply making it available should the need arise.
-
-When you add to your `package.yaml` file:
-
-~~~yaml
-dependencies:
-- acme-missiles
-~~~
-
-or, alternatively, you add directly to your Cabal file:
-
-~~~yaml
-build-depends: acme-missiles
-~~~
-
-you're saying "this package requires that `acme-missiles` be available." Since
-`acme-missiles` doesn't appear in your snapshot, without also modifying your
-`stack.yaml` to mention it via `extra-deps`, Stack will complain about the
-dependency being unavailable.
-
-You may challenge: but why go through all of that annoyance? Stack knows what
-package I want, why not just go grab it? The answer is that, if Stack just
-grabbed `acme-missiles` for you without it being specified in the `stack.yaml`
-somehow, you'd lose reproducibility. How would Stack know which version to use?
-It may elect to use the newest version, but if a new version is available in
-the future, will it automatically switch to that?
-
-Stack's core philosophy is that build plans are always reproducible. The
-purpose of the `stack.yaml` file is to define an immutable set of packages. No
-matter when in time you use it, and no matter how many new release happen in
-the interim, the build plan generated should be the same.
-
-(There is, however, at least one hole in this theory today, which is Hackage
-revisions. When you specify `extra-deps: [acme-missiles-0.3]`, it doesn't
-specify which revision of the Cabal file to use, and Stack will just choose the
-latest. Stack has the ability to specify exact revisions of Cabal files, but
-this isn't enforced as a requirement, because it is so different from the way
-most people work with packages.)
-
-And now, how about the other side: why doesn't Stack automatically add
-`acme-missiles` to `build-depends` in your Cabal file if you add it as an
-extra-dep? There are a surprising number reasons for this:
-
-* The Cabal specification doesn't support anything like that
-* There can be multiple packages in a project, and how do we know which package
-  actually needs the dependency?
-* There can be multiple components (libraries, executable, etc) in a package,
-  and how do we know which of those actually needs the dependency?
-* The dependency may only be conditionally needed, based on flags, operating
-  system, or architecture. As an extreme example, we wouldn't want a Linux-only
-  package to be built by force on Windows.
-
-While for simple use cases it seems like automatically adding dependencies from
-the Cabal file to the `stack.yaml` file or vice-versa would be a good thing, it
-breaks down immediately for any semi-difficult case. Therefore, Stack requires
-you to add it to both places.
-
-And a final note, in case it wasn't clear. The example above used
-`acme-missiles`, which is not in Stackage snapshots. If, however, you want to
-depend on a package already present in the snapshot you've selected, there's no
-need to add it explicitly to your `stack.yaml` file: it's already there
-implicitly via the `resolver` setting. This is what you do the majority of the
-time, such as when you add `vector` or `mtl` as a `build-depends` value.
-
-## Should I check-in automatically generated Cabal files?
-
-Yes, you should. This recommendation was changed in
-[issue #5210](https://github.com/commercialhaskell/stack/issues/5210). Please
-see the discussion there.
diff --git a/doc/topics/CI.md b/doc/topics/CI.md
new file mode 100644
index 0000000000..5ab088ee64
--- /dev/null
+++ b/doc/topics/CI.md
@@ -0,0 +1,17 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Continuous integration (CI)
+
+## GitHub Actions
+
+The Stack repository uses GitHub Actions for its own CI. For further
+information, see the guide to
+[contributing](../CONTRIBUTING.md#continuous-integration-ci).
+
+## Azure
+
+For further information, see the [Azure CI](azure_ci.md) documentation.
+
+## Travis
+
+For further information, see the [Travis CI](travis_ci.md) documentation.
diff --git a/doc/topics/GHC_from_source.md b/doc/topics/GHC_from_source.md
new file mode 100644
index 0000000000..c693e48166
--- /dev/null
+++ b/doc/topics/GHC_from_source.md
@@ -0,0 +1,237 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Building GHC from source
+
+:octicons-beaker-24: Experimental
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+Stack supports building the GHC compiler from source, using
+[Hadrian](https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/README.md) (the
+build system for GHC). The GHC version to be built and used is defined by a
+Git commit ID and a Hadrian "flavour", with the following syntax in a YAML
+configuration file:
+
+~~~yaml
+compiler: ghc-git-<commit_id>-<Hadrian_flavour>
+~~~
+
+In the following example the commit ID is "5be7ad..." and the flavour is
+"quick":
+
+~~~yaml
+compiler: ghc-git-5be7ad7861c8d39f60b7101fd8d8e816ff50353a-quick
+~~~
+
+The [`-j`, `--jobs` option](../configure/global_flags.md#-jobs-or-j-option) at
+the command line or the [`jobs`](../configure/yaml/non-project.md#jobs) option
+in a YAML configuraton file can be used to specify Hadrian's `-j[<n>]` flag.
+
+By default, the code is retrieved from the main GHC repository. If you want to
+select another repository, use the `compiler-repository` option in a YAML
+configuration file:
+
+~~~yaml
+compiler-repository: git://my/ghc/repository
+# default
+# compiler-repository: https://gitlab.haskell.org/ghc/ghc.git
+~~~
+
+By default, the Hadrian build target is `reloc-binary-dist` on Windows and
+`binary-dist` on other operating systems. If you want to specify another
+Hadrian build target, use the `compiler-target` option in a YAML configuration
+file:
+
+~~~yaml
+compiler-target: binary-dist
+# default (Windows)
+# compiler-target: reloc-binary-dist
+# default (non-Windows)
+# compiler-target: binary-dist
+~~~
+
+By default, Stack assumes that the path to the binary distribution built by
+Hadrian is `_build/reloc-bindist` on Windows and `_build/bindist` on other
+operating systems. If you want to specify another path, use the
+`compiler-bindist-path` option in a YAML configuration file:
+
+~~~yaml
+compiler-bindist-path: _build/bindist
+# default (Windows)
+# compiler-bindist-path: _build/reloc-bindist
+# default (non-Windows)
+# compiler-bindist-path: _build/bindist
+~~~
+
+!!! note
+
+    The Hadrian build target `reloc-binary-dist` was introduced with Git commit
+    id
+    [`fe23629b147d419053052e6e881f6e8ddfbf3bae`](https://gitlab.haskell.org/ghc/ghc/-/commit/fe23629b147d419053052e6e881f6e8ddfbf3bae).
+
+    Once introduced, the target must be used on Windows.
+
+Stack does not check the compiler version when it uses a compiler built from
+source. It is assumed that the built compiler is recent enough as Stack does not
+enable any known workaround to make older compilers work.
+
+Building the compiler can take a very long time (more than one hour). For faster
+build times, use Hadrian flavours that disable documentation generation.
+
+!!! note
+
+    The building of the compiler can require the creation of symbolic links
+    (symlinks). On Windows, symlinks can only be created by processes with
+    Administrator privileges unless Windows' Developer Mode has been set.
+
+### Bootstrap compiler
+
+Building GHC from source requires a working GHC (known as the bootstrap
+compiler). As we use a Stack based version of Hadrian (`hadrian/build-stack` in
+GHC sources), the bootstrap compiler is configured into `hadrian/stack.yaml` and
+fully managed by Stack.
+
+!!! note
+
+    For some commit IDs, the snapshot specified in `hadrian/stack.yaml`
+    specifies a version of GHC that cannot be used to build GHC. This results in
+    GHC's `configure` script reporting messages similar to the following before
+    aborting:
+
+    ~~~text
+    checking version of ghc... 9.0.2
+    configure: error: GHC version 9.2 or later is required to compile GHC.
+    ~~~
+
+    The resolution is:
+
+    1.  to specify an alternative snapshot (one that specifies a sufficiently
+        recent version of GHC) on the command line, using Stack's option
+        `--snapshot <snapshot>`. Stack will use that snapshot when running GHC's
+        `configure` script; and
+
+    2.  to set the contents of the `STACK` environment variable to be
+        `stack --snapshot <snapshot>`. If `<snapshot>` is a path to a local YAML
+        file, it needs to be an absolute one. Hadrian's `build-stack` script
+        will refer to that environment variable for the Stack command it uses.
+
+### Hadrian prerequisites
+
+The Hadrian build system has certain
+[prerequisites](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/preparation).
+It requires certain versions of the `happy` and `alex` executables on the PATH.
+Stack will build and install `happy` and `alex`, if not already on the PATH.
+
+!!! note
+
+    If `happy` and/or `alex` is already on the PATH, it may not be a version
+    that Hadrian supports. In that case, you may wish to remove that version
+    from the PATH and ensure that the package version specified by
+    `hadrian/stack.yaml` or, if applicable, via the contents of the `STACK` environment variable is an appropriate one.
+
+!!! note
+
+    `alex-3.5.0.0` removed `-v` as an alias for `--version` and added `-v` as an
+    alias for `--verbose` (a flag that is not implemented as of `alex-3.5.4.0`).
+
+    Hadrian may expect `-v` to be an alias for `--version`.
+
+=== "macOS"
+
+    Hadrian requires, or case use, certain tools or Python packages that do not
+    come with macOS by default and that need to be installed using `brew` or
+    `pip3` (Python). Hadrian's LaTeX documentation also requires the
+    [DejaVu fonts](https://dejavu-fonts.github.io/) to be installed.
+
+    ~~~zsh
+    brew install python@3.11
+    # GHC uses a Python script named `boot`.
+    brew install automake
+    # Tool for generating GNU Standards-compliant Makefiles.
+    brew install texinfo
+    # Official documentation format of the GNU project.
+    pip3 install -U sphinx
+    # Sphinx is the Python documentation generator.
+    brew install --cask mactex
+    # MacTeX: Full TeX Live distribution with GUI applications
+    ~~~
+
+=== "Windows"
+
+    Hadrian requires, or can use, certain MSYS2 or Python packages that do not
+    come with the Stack-supplied MSYS2 by default and need to be installed
+    using `pacman` (MSYS2) or `pip` (Python). Hadrian's LaTeX documentation also
+    requires the [DejaVu fonts](https://dejavu-fonts.github.io/) to be
+    installed.
+
+    ~~~pwsh
+    stack exec -- pacman --sync --refresh
+    # Synchronize MSYS2 package databases
+    stack exec -- pacman --sync mingw-w64-clang-x86_64-python-pip
+    # The PyPA recommended tool (pip) for installing Python packages. Also
+    # installs Python as a dependency. GHC uses a Python script named `boot`.
+    # The package must be the one from the `clang64` MSYS2 repository, as Python
+    # from the `msys` repository cannot interpret Windows file paths correctly.
+    stack exec -- pacman --sync mingw-w64-clang-x86_64-autotools
+    # The GNU autotools build system, including `autoreconf`, `aclocal`
+    # and `make`. GHC uses a sh script named `configure` which is itself created
+    # from a file named `configure.ac`.
+    stack exec -- pacman --sync patch
+    # A utility to apply patch files to original sources.
+    stack exec -- pacman --sync mingw-w64-clang-x86_64-texinfo
+    # Utilities to work with and produce manuals, ASCII text, and on-line
+    # documentation from a single source file, including `makeinfo`.
+    stack exec -- pacman --sync mingw-w64-clang-x86_64-ca-certificates
+    # Common CA (certificate authority) certificates.
+    stack exec -- pacman -sync mingw-w64-clang-x86_64-python-sphinx
+    # Sphinx is the Python documentation generator.
+    stack exec -- pacman -sync mingw-w64-clang-x86_64-texlive-full
+    # The TeX Live distribution.
+    ~~~
+
+    Hadrian may require certain LaTeX packages and may prompt for these to be
+    installed duing the build process.
+
+    !!! note
+
+        Before commit
+        [cdddeb0f1280b40cc194028bbaef36e127175c4c](https://gitlab.haskell.org/ghc/ghc/-/commit/cdddeb0f1280b40cc194028bbaef36e127175c4c)
+        the GHC project did not support `autoconf >= 2.72`.
+
+        MSYS2 can be
+        [configured](https://www.msys2.org/docs/autotools/#autoconf-wrapper) to
+        use an earlier version of `autoconf` than the latest version.
+
+### Global packages
+
+The GHC compiler you build from sources may depend on unreleased versions of
+some global packages (e.g. Cabal). It may be an issue if a package you try to
+build with this compiler depends on such global packages because Stack may not
+be able to find versions of those packages (on Hackage, etc.) that are
+compatible with the compiler.
+
+The easiest way to deal with this issue is to use the
+[`drop-packages`](../configure/yaml/project.md#drop-packages)
+project-specific configuration option to drop the offending packages as follows.
+Instead of using the packages specified in the snapshot, the global packages
+bundled with GHC will be used.
+
+~~~yaml
+drop-packages:
+- Cabal
+- ...
+~~~
+
+Another way to deal with this issue is to add the relevant packages as
+[`extra-deps`](../configure/yaml/project.md#extra-deps) built from source. To
+avoid mismatching versions, you can use exactly the same commit id you used to
+build GHC as follows:
+
+~~~
+extra-deps:
+- git: https://gitlab.haskell.org/ghc/ghc.git
+  commit: '5be7ad7861c8d39f60b7101fd8d8e816ff50353a'
+  subdirs:
+    - libraries/Cabal/Cabal
+    - libraries/...
+~~~
diff --git a/doc/topics/Stack_and_VS_Code.md b/doc/topics/Stack_and_VS_Code.md
new file mode 100644
index 0000000000..31897632c9
--- /dev/null
+++ b/doc/topics/Stack_and_VS_Code.md
@@ -0,0 +1,180 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Stack and Visual Studio Code
+
+[Visual Studio Code](https://code.visualstudio.com/) (VS Code) is a popular
+source code editor, and
+['Haskell'](https://marketplace.visualstudio.com/items?itemName=haskell.haskell)
+is an extension for VS Code that is popular with Haskell coders.
+
+The 'Haskell' extension can be used with Stack but there are some things to be
+aware of, set out below.
+
+## GHCup
+
+The separate [GHCup](https://www.haskell.org/ghcup/) project provides a tool
+that can be used to install various tools useful for developing Haskell
+projects. Those tools include:
+
+* GHC,
+* HLS (see further below),
+* MSYS2 (on Windows; see the developing on Windows
+  [documentation](developing_on_windows.md)),
+* Stack, and
+* Cabal (the tool).
+
+Stack itself can be used to install GHC and MSYS2. Stack can also be used to
+upgrade, or downgrade, Stack.
+
+GHCup can configure Stack so that if Stack needs a version of GHC, GHCup takes
+over obtaining and installing that version. By default, the script to install
+GHCup (which can be run more than once) configures Stack in that way. For
+further information about how GHCup configures Stack, see the GHC installation
+customisation
+[documentation](../configure/customisation_scripts.md#ghc-installation-customisation).
+
+On Windows, GHCup has the capability of using the Stack-supplied MSYS2 rather
+than installing a duplicate copy.
+
+## HLS
+
+The VS Code extension makes use of
+[HLS](https://github.com/haskell/haskell-language-server) (the Haskell Language
+Server). To work, HLS has to be built with the same version of GHC that it will
+support. That is, a version of HLS is required for each version of GHC in use.
+It is possible that the most recent versions of GHC are not supported by HLS.
+
+VS Code with the 'Haskell' extension can be configured in a number of ways:
+
+=== "GHCup manages HLS"
+
+    The VS Code extension's settings (under 'Haskell: Manage HLS') allow a
+    user to specify that the extension should use GHCup, to download and install
+    the versions of HLS that it needs.
+
+    If GHCup manages versions of HLS, versions of GHC can be managed in a number
+    of ways:
+
+    === "Stack manages GHC using GHCup"
+
+        As identified above, GHCup can configure Stack to use GHCup to manage
+        versions of GHC.
+
+    === "Stack manages GHC directly"
+
+        It is possible to install GHCup so that it is 'empty' except for the
+        current version of HLS, allow the VS Code extension to use GHCup to
+        manage HLS requirements only, and to disable messages from the extension
+        on start-up that installation of GHC, Cabal (the tool)
+        and/or Stack are also necessary (they are not, if only Stack is being
+        used).
+
+        To install a version of GHCup that is 'empty' is a little more
+        complicated than a default installation of GHCup.
+
+        === "Unix-like"
+
+            The following environment variable must be set before GHCup's
+            installation `sh` script is run: `BOOTSTRAP_HASKELL_MINIMAL`.
+
+        === "Windows"
+
+            The second argument to the PowerShell script must be set to
+            `$false`, namely:
+
+                Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true,$false
+
+        There is the possibility of false messages from the extension on
+        start-up that need to be ignored. Those messages can be disabled by
+        [setting the following](https://github.com/haskell/vscode-haskell#setting-a-specific-toolchain)
+        for the VS Code extension:
+
+        ~~~yaml
+        "haskell.toolchain": {
+          "ghc": null,
+          "cabal": null,
+          "stack": null
+        }
+        ~~~
+
+        There can be no differences between the version of GHC that the
+        GHCup-supplied HLS was built with and the version that Stack has
+        installed.
+
+        For the most part, the versions of HLS provided by GHCup are built with
+        the same versions of GHC that Stack downloads from its default
+        `setup-info` dictionary (see the
+        [`setup-info`](../configure/yaml/non-project.md#setup-info) non-project
+        specific configuration option documentation). Stack's default is to
+        mirror the 'official' binary distributions published by GHC.
+
+        However, in some cases, it is possible that a GHCup-supplied and
+        GHCup-selected HLS has been built with a different binary distribution
+        of GHC than the one which Stack has installed.
+
+        ??? question "When have the GHCup- and Stack-supplied GHCs differed?"
+
+            An example occurred with the release of GHC 9.0.2. For some Linux
+            users (Debian 9 and Fedora 27), the version of GHC 9.0.2 linked on
+            GHC’s download
+            [web page](https://www.haskell.org/ghc/download_ghc_9_0_2.html) was
+            broken. The GHC developers made alternative ‘9.0.2a’ versions
+            available. For a while, Stack referred to the versions published by
+            GHC on its download web page while the GHCup-supplied versions of
+            HLS were built using alternative versions. This incompatibility led
+            to problems.
+
+            It was resolved by Stack's default also being changed to refer to
+            the '9.0.2a' versions. Where Stack has already installed GHC 9.0.2,
+            it is necessary to delete GHC 9.0.2 from the `stack path --programs`
+            directory. This will cause Stack to reinstall the alternative
+            version, when it first needs GHC 9.0.2. Stack should distinguish
+            what it builds with the alternative from what it has built, and
+            cached, with the original GHC 9.0.2.
+
+    === "Stack uses a GHCup-supplied GHC"
+
+        GHCup is used to manage versions of GHC and Stack is configured to use
+        the version of GHC on the PATH.
+
+        That is, GHCup is used to install a version of GHC on the PATH. Stack is
+        configured to make use of that version, by making use of Stack's
+        `install-ghc` option (which needs to be disabled) and Stack's
+        `system-ghc` option (which needs to be enabled).
+
+        For further information about these options, see the
+        [`install-ghc`](../configure/yaml/non-project.md#install-ghc)
+        documentation and the
+        [`system-ghc`](../configure/yaml/non-project.md#system-ghc)
+        documentation.
+
+        Each time that a snapshot is used that references a different version of
+        GHC, then GHCup must be used to install it (if GHCup has not already
+        installed that version). For example, to use `snapshot: lts-24.55`
+        (GHC 9.10.3), the command `ghcup install ghc 9.10.3` must have been used
+        to install GHC 9.10.3. That may be a minor inconvenience for some people,
+        as one the primary benefits of Stack over other tools for building
+        Haskell code has been that Stack automatically ensures that the
+        necessary version of GHC is available.
+
+=== "User manages HLS"
+
+    By default, the VS Code extension uses tools that are in the PATH.
+
+    If the VS Code extension is set not to use GHCup, its user needs to ensure
+    that each version of HLS that the extension needs is on the PATH.
+
+### Cradle
+
+HLS may need a 'cradle' - an
+[`hie.yaml` file](https://hackage.haskell.org/package/hie-bios#stack) - in the
+project's root directory in order to work well.
+
+The [`gen-hie` tool](https://hackage.haskell.org/package/implicit-hie) can help
+generate such a cradle.
+
+### Tips
+
+It has been suggested that a project must have been successfully built before
+the VS code extension (and HLS) is first activated on the project, for HLS to
+work reliably.
diff --git a/doc/azure_ci.md b/doc/topics/azure_ci.md
similarity index 91%
rename from doc/azure_ci.md
rename to doc/topics/azure_ci.md
index 2e20a69b45..412df8df03 100644
--- a/doc/azure_ci.md
+++ b/doc/topics/azure_ci.md
@@ -28,7 +28,7 @@ We provide two fully baked configuration ready to be used on your projects:
 * The complex Azure configuration is intended for projects that need to support
   multiple GHC versions and multiple operating systems, such as open source
   libraries to be released to Hackage. It tests against Stack for different
-  resolvers on Linux, macOS and Windows. These are the files for the complex
+  snapshots on Linux, macOS and Windows. These are the files for the complex
   configuration:
   - [azure-pipelines.yml](https://raw.githubusercontent.com/commercialhaskell/stack/stable/doc/azure/azure-pipelines.yml)
     : This is the starter file used by the Azure CI.
@@ -44,8 +44,8 @@ We provide two fully baked configuration ready to be used on your projects:
       It is likely going to be necessary to modify this configuration to match
       the needs of your project, such as tweaking the build matrix to alter
       which GHC versions you test against, or to specify GHC-version-specific
-      `stack.yaml` files if necessary. Don't be surprised if it doesn't work the
-      first time around. See the multiple GHC section below for more
+      `stack.yaml` files if necessary. Do not be surprised if it does not work
+      the first time around. See the multiple GHC section below for more
       information.
 
 ## Creating Azure Pipelines
@@ -131,26 +131,26 @@ But we only use the first method of using Stack to download GHC.
 ### Multiple GHC - parametrised builds
 
 For different GHC versions, you probably want to use different project-level
-configuration files (`stack.yaml`). If you don't want to put a specific
-`stack.yaml` for a particular resolver and still want to test it, you have
-specify your resolver argument in `ARGS` environment variable (you will see an
-example below).
+configuration files (`stack.yaml`, by default). If you do not want to put a
+specific `stack.yaml` for a particular snapshot and still want to test it, you
+have specify your snapshot argument in `ARGS` environment variable (you will see
+an example below).
 
 ~~~yaml
 strategy:
   matrix:
     GHC 8.0:
-      ARGS: "--resolver lts-9"
+      ARGS: "--snapshot lts-9"
     GHC 8.2:
-      ARGS: "--resolver lts-11"
+      ARGS: "--snapshot lts-11"
     GHC 8.4:
-      ARGS: "--resolver lts-12"
+      ARGS: "--snapshot lts-12"
     GHC 8.6:
-      ARGS: "--resolver lts-14"
+      ARGS: "--snapshot lts-14"
     GHC 8.8:
-      ARGS: "--resolver lts-15"
+      ARGS: "--snapsht lts-15"
     nightly:
-      ARGS: "--resolver nightly"
+      ARGS: "--snapshot nightly"
 ~~~
 
 ## Running tests
diff --git a/doc/topics/backpack.md b/doc/topics/backpack.md
new file mode 100644
index 0000000000..768b2a3d65
--- /dev/null
+++ b/doc/topics/backpack.md
@@ -0,0 +1,367 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Backpack support
+
+Backpack is an extension to Haskell's module system, supported by GHC since
+GHC 8.2.1 and Cabal (the library) since Cabal-2.0.0.2. It lets you write a
+library that depends on an abstract interface (a *signature*) instead of a
+concrete implementation. The consumer of that library then decides which
+implementation to plug in. The compiler recompiles the library for each
+implementation, so there is no runtime cost.
+
+Stack supports cross-package Backpack from Stack UNRELASED.
+
+## What Backpack gives you
+
+### Signatures
+
+A *signature file* (`.hsig`) declares the types and functions that an
+implementation must provide, without supplying any code. For example, a
+signature for an abstract string type:
+
+~~~haskell
+-- Str.hsig
+signature Str where
+
+data Str
+
+empty  :: Str
+append :: Str -> Str -> Str
+~~~
+
+The package lists its signatures in the `signatures` field of the library
+stanza:
+
+=== "package.yaml"
+
+    ~~~yaml
+    library:
+      signatures:
+      - Str
+    ~~~
+
+=== "Cabal file"
+
+    ~~~cabal
+    library
+      build-depends: base
+      signatures:    Str
+      exposed-modules: MyModule
+    ~~~
+
+Any module inside this library can `import Str` and use it as if it were a
+normal module. The compiler will type-check the code against the signature
+without needing an actual implementation.
+
+A package that has at least one unfilled signature is called *indefinite*.
+
+### Mixin linking
+
+Backpack fills a signature through *mixin linking*: when a module with the same
+name as a signature is brought into scope, the compiler treats that module as
+the implementation.
+
+With Stack, you must declare this expressly using a mixin:
+
+=== "package.yaml"
+
+    ~~~yaml
+    library:
+      dependencies:
+      - str-string # exposes module "Str"
+      - name: my-indefinite-pkg # has signature "Str"
+        mixin:
+        - requires (Str as Str)
+    ~~~
+
+=== "Cabal file"
+
+    ~~~cabal
+    library
+      build-depends:
+        , base
+        , str-string          -- exposes module "Str"
+        , my-indefinite-pkg   -- has signature "Str"
+      mixins:
+        my-indefinite-pkg requires (Str as Str)
+    ~~~
+
+!!! note
+
+    Cabal (the library) supports an implicit form of mixin linking (by name,
+    without a `mixins` field). However, Stack's instantiation planner only takes
+    into account express mixin declarations and a mixin must always be added
+    for cross-package Backpack.
+
+### Renaming
+
+When the signature name and the implementation module name differ, a mixin lets
+you rename one or the other.
+
+Suppose the indefinite package has signature `Str`, and a separate package
+exposes the same declarations under the module name `MyStr`:
+
+=== "package.yaml"
+
+    Rename the requirement to match the implementation:
+
+    ~~~yaml
+    dependencies:
+    - name: my-indefinite-pkg
+      mixin:
+      - requires (Str as MyStr)
+    ~~~
+
+    or rename the implementation to match the requirement:
+
+    ~~~yaml
+    dependencies:
+    - name: my-impl-pkg
+      mixin:
+      - (MyStr as Str)
+    ~~~
+
+=== "Cabal file"
+
+    Rename the requirement to match the implementation:
+
+    ~~~cabal
+    mixins: my-indefinite-pkg requires (Str as MyStr)
+    ~~~
+
+    or rename the implementation to match the requirement:
+
+    ~~~cabal
+    mixins: my-impl-pkg (MyStr as Str)
+    ~~~
+
+Both achieve the same result: the `Str` signature is filled by `MyStr`.
+
+Note that mixin renaming is module-level: the implementation module must
+already export the same identifiers (types, functions) that the signature
+declares. Renaming only changes which module name fills which signature; it
+does not bridge mismatched contents.
+
+A mixin also supports `hiding` on the `requires` side. This tells the compiler
+*not* to fill the listed signatures through mixin linking for this dependency —
+they remain as holes and propagate to the consumer.
+
+### Multiple instantiations
+
+You can instantiate the same indefinite package more than once with different
+implementations. Each instantiation gets its own renaming as a mixin:
+
+=== "package.yaml"
+
+    ~~~yaml
+    dependencies:
+    - name: my-indefinite-pkg
+      mixin:
+      - (MyModule as MyModule.Text) requires (Str as TextStr)
+      - (MyModule as MyModule.BS) requires (Str as BSStr)
+    ~~~
+
+=== "Cabal file"
+
+    ~~~cabal
+    mixins:
+      my-indefinite-pkg
+        (MyModule as MyModule.Text)
+        requires (Str as TextStr),
+      my-indefinite-pkg
+        (MyModule as MyModule.BS)
+        requires (Str as BSStr)
+    ~~~
+
+Where `TextStr` and `BSStr` are modules from implementation package dependencies
+that export the identifiers the `Str` signature declares. This produces two
+copies of `MyModule` — one backed by `TextStr`, the other by `BSStr` —
+each with a distinct module name so they do not clash.
+
+### Sublibraries
+
+Backpack projects tend to involve several small libraries (a signature library,
+one or more implementation libraries, and a consumer library). A single Haskell
+package can include all of these by using sublibraries:
+
+=== "package.yaml"
+
+    ~~~yaml
+    spec-version: 0.36.0
+
+    name: myPackage
+
+    dependencies:
+    - base
+
+    library:
+      dependencies:
+      - name: str-sig
+        mixin:
+        - requires (Str as Str)
+      - str-text
+
+    internal-libraries:
+      str-sig:
+        signatures: Str
+      str-text:
+        dependencies:
+        - text
+    ~~~
+
+=== "Cabal file"
+
+    ~~~cabal
+    cabal-version: 2.2
+    name: myPackage
+
+    library
+      build-depends: base, str-sig, str-text
+      mixins: str-sig requires (Str as Str)
+      exposed-modules: MyModule
+
+    library str-sig
+      build-depends: base
+      signatures: Str
+
+    library str-text
+      build-depends: base, text
+      exposed-modules: Str
+    ~~~
+
+This is purely an organizational convenience — the semantics are identical to
+having three separate packages.
+
+!!! note
+
+    Implementation modules that fill a signature cannot live in the same
+    component that has the dependency on the signature package. They must be in
+    a separate package or sublibrary.
+
+### Reexported modules
+
+The `reexported-modules` key or field lets you expose an instantiated module
+under a public name. This is useful when you want to use Backpack as an internal
+implementation detail while presenting a straightforward API to users who do not
+need to know about Backpack:
+
+=== "package.yaml"
+
+    ~~~yaml
+    library:
+      dependencies:
+      - name: regex-indef
+        mixin:
+        - requires (Str as Str)
+      - str-bytestring
+      reexported-modules:
+      - Regex as Regex.ByteString
+    ~~~
+
+=== "Cabal file"
+
+    ~~~cabal
+    library
+      build-depends: base, regex-indef, str-bytestring
+      mixins: regex-indef requires (Str as Str)
+      reexported-modules: Regex as Regex.ByteString
+    ~~~
+
+### Template Haskell
+
+GHC cannot run Template Haskell splices from an indefinite package because
+indefinite code is type-checked but not compiled — there is no object code to
+execute at splice time. Splicing TH code *from a definite package into* an
+indefinite one works fine. This is a GHC limitation, not a Stack limitation.
+
+## Backpack in Stack
+
+### Private Backpack
+
+When all signatures and their implementations live inside the same package (for
+example using sublibraries), no special build orchestration is needed. This has
+always worked in Stack without any extra configuration.
+
+### Cross-package Backpack
+
+When a signature is defined in one package and filled by a module from a
+different package, Stack needs to perform an extra build step: after building
+the indefinite package and the implementing package, it creates an
+*instantiation task* that compiles the indefinite package against the concrete
+implementation.
+
+Stack handles this automatically. There is nothing you need to add to
+`stack.yaml` beyond listing the packages as usual:
+
+~~~yaml
+packages:
+- sig-pkg
+- impl-pkg
+- consumer-pkg
+~~~
+
+As long as the package description files set up the signatures, dependencies,
+and mixins correctly, `stack build` does the rest.
+
+### What happens during a build
+
+When Stack encounters a cross-package Backpack setup, the build output shows the
+extra instantiation step:
+
+~~~text
+sig-pkg   > configure (lib)
+sig-pkg   > build (lib)
+impl-pkg  > configure (lib)
+impl-pkg  > build (lib)
+sig-pkg   > build (inst:941095d7: Str = impl-pkg)
+consumer  > configure (lib)
+consumer  > build (lib)
+~~~
+
+The line marked `inst:` is the instantiation task. The hash identifies the
+particular combination of signature-to-implementation mappings. The output also
+shows which signatures are filled and by which packages.
+
+### Supported features
+
+Stack supports the full set of Backpack features that Cabal (the library)
+exposes:
+
+* Signature modules and indefinite packages
+* Mixin linking (filling signatures by bringing a same-named module into scope)
+* Explicit renaming in `mixins` (`requires (Sig as Impl)`)
+* Multiple instantiations of the same indefinite package with different
+  implementations
+* Sub-library signatures and implementations
+* Transitive Backpack chains (an indefinite package depending on another
+  indefinite package — all inherited signatures are filled)
+* Indefinite packages from Hackage or Stackage snapshots (not just local
+  packages)
+* Haddock generation for instantiated packages
+* Precompiled caching of instantiation results
+
+### Limitations
+
+**`requires hiding` with partial instantiation.** If a mixin uses
+`requires hiding (SomeSig)` to leave a signature unfilled, Stack will not create
+an instantiation task for that mixin. Cabal (the library) requires all
+signatures to be filled in a single instantiation — partial instantiation is not
+possible. This means the indefinite package remains indefinite for the hidden
+signatures and a higher-level consumer must fill them. When `hiding` hides
+nothing (i.e. `requires hiding ()`) it is equivalent to `DefaultRenaming` and
+works normally.
+
+**Template Haskell in indefinite packages.** As described above, this is a GHC
+restriction, not specific to Stack.
+
+## Further reading
+
+* [Using GHC - Filenames and separate compilation - Module signatures](https://downloads.haskell.org/ghc/latest/docs/users_guide/separate_compilation.html#module-signatures)
+  in the GHC User's Guide
+* [How to use Backpack modules](https://cabal.readthedocs.io/en/latest/how-to-use-backpack.html)
+  in the Cabal project's documentation
+* [Backpack: Retrofitting Haskell with Interfaces](https://plv.mpi-sws.org/backpack/)
+  — the original paper
+* [Try Backpack: Cabal packages](http://blog.ezyang.com/2017/01/try-backpack-cabal-packages/)
+  — a practical walkthrough by Edward Z. Yang
+* [GHC wiki: Backpack](https://gitlab.haskell.org/ghc/ghc/-/wikis/backpack)
diff --git a/doc/topics/custom_snapshot.md b/doc/topics/custom_snapshot.md
new file mode 100644
index 0000000000..7e44fba289
--- /dev/null
+++ b/doc/topics/custom_snapshot.md
@@ -0,0 +1,156 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+## Snapshot specification
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+A snapshot specifies: (a) a version of GHC and, implicitly, its boot packages;
+(b) usually, directly, specific versions of a list of packages; (c) sometimes,
+Cabal flags for certain packages; and (d) sometimes, GHC options.
+
+!!! info
+
+    Stackage snapshots are not expected to include directly any boot packages
+    but some such snapshots may include directly some boot packages.  In
+    particular, some snapshots include directly `Win32` (which is a boot package
+    on Windows) while most do not.
+
+Snapshots may extend any other snapshot that can be specified in a
+[`snapshot`](../configure/yaml/project.md#snapshot) key. The packages specified
+follow the same syntax for dependencies in Stack's project-level configuration
+files. Unlike the `extra-deps` key, however, no support for local directories is
+available in snapshots to ensure reproducibility.
+
+!!! info
+
+    Stack uses the [Pantry](https://hackage.haskell.org/package/pantry) library
+    for snapshot specification.
+
+~~~yaml
+# Inherits a specific GHC version and, implicitly, its boot packages and
+# specific versions of a set of other packages:
+snapshot: lts-24.55
+# Overwrites the version of GHC (and, implicitly, its boot packages) specified
+# in the snapshot (optional):
+compiler: ghc-9.10.2
+
+# Additional packages, follows extra-deps syntax
+packages:
+- unordered-containers-0.2.7.1
+- hashable-1.2.4.0
+- text-1.2.2.1
+
+# Packages from the parent snapshot to ignore
+drop-packages:
+- wai-extra
+
+# Packages which should be hidden
+hidden:
+  wai: true
+  warp: false
+
+# Set GHC options for specific packages
+ghc-options:
+  warp:
+  - -O2
+
+# Override flags, can also override flags in the parent snapshot
+flags:
+  unordered-containers:
+    debug: true
+~~~
+
+If you put this in a `snapshot.yaml` file in the same directory as your project,
+you can now use the snapshot like this:
+
+~~~yaml
+snapshot: snapshot.yaml
+~~~
+
+This is an example of a custom snapshot stored in the filesystem. They are
+assumed to be mutable, so you are free to modify it. We detect that the snapshot
+has changed by hashing the contents of the involved files, and using it to
+identify the snapshot internally. It is often reasonably efficient to modify a
+custom snapshot, due to Stack sharing snapshot packages whenever possible.
+
+!!! note "Cyclic snapshot locations"
+
+    If Stack detects that snapshot locations form a cycle, it will report an
+    error.
+
+### Overriding the compiler
+
+The following snapshot specification will be identical to `lts-24.55`, but
+instead use `ghc-9.10.2` and its boot packages instead of `ghc-9.10.3` and its
+boot packages:
+
+~~~yaml
+snapshot: lts-24.55 # GHC 9.10.3
+compiler: ghc-9.10.2
+~~~
+
+### Dropping packages
+
+The following snapshot specification will be identical to `lts-24.55`, but
+without the `text` package in our snapshot. Removing this package will cause all
+the packages that depend on `text` to be unbuildable, but they will still be
+present in the snapshot.
+
+~~~yaml
+snapshot: lts-24.55
+drop-packages:
+- text
+~~~
+
+### Hiding packages
+
+The following snapshot specification will be identical to `lts-24.55`, but the
+`text` package will be hidden when registering. This will affect, for example,
+the import parser in the script command.
+
+~~~yaml
+snapshot: lts-24.55
+hidden:
+- text
+~~~
+
+### Specifying GHC options
+
+In order to specify GHC options for a package, you use the same syntax as the
+[ghc-options](../configure/yaml/non-project.md#ghc-options) key for build
+configuration.
+
+The following snapshot specification will be identical to `lts-24.55`, but
+provides `-O1` as a ghc-option for `text`:
+
+~~~yaml
+snapshot: lts-24.55
+packages:
+- text-2.1.2
+ghc-options:
+  text: -O1
+~~~
+
+This works somewhat differently than the stack.yaml `ghc-options` key, in that
+options can only be specified for packages that are mentioned in the custom
+snapshot's `packages` list. It sets the ghc-options, rather than extending those
+specified in the snapshot being extended.
+
+Another difference is that the `*` entry for `ghc-options` applies to all
+packages in the `packages` list, rather than all packages in the snapshot.
+
+### Specifying Cabal flags
+
+In order to specify Cabal flags for a package, you use the same syntax as the
+[flags](../configure/yaml/project.md#flags) key for build configuration. The
+following snapshot specification will be identical to `lts-24.55`, but
+it enables the `developer` Cabal flag:
+
+~~~yaml
+snapshot: lts-24.55
+packages:
+- text-2.1.2
+flags:
+  text:
+    developer: true
+~~~
diff --git a/doc/topics/debugging.md b/doc/topics/debugging.md
new file mode 100644
index 0000000000..de75b76116
--- /dev/null
+++ b/doc/topics/debugging.md
@@ -0,0 +1,96 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Debugging
+
+To profile a component of the current project, pass the
+[`--profile` flag](../commands/build_command.md#-profile-flag) to `stack build`.
+
+The flag:
+
+* for project packages, turns on the Cabal flag
+  [`--enable-profiling`](https://cabal.readthedocs.io/en/stable/setup-commands.html#cmdoption-runhaskell-Setup.hs-configure-enable-profiling);
+* turns on the Cabal flag
+  [`--enable-library-profiling`](https://cabal.readthedocs.io/en/stable/setup-commands.html#cmdoption-runhaskell-Setup.hs-configure-enable-library-profiling); and
+* passes GHC's
+  [`+RTS -p` runtime options](https://downloads.haskell.org/ghc/latest/docs/users_guide/profiling.html#rts-flag--p)
+  to any test suites and benchmarks.
+
+For example the following command will build the `my-tests` testsuite with
+profiling options and create a `my-tests.prof` file in the current directory
+as a result of the test run.
+
+~~~text
+stack test --profile my-tests
+~~~
+
+The `my-tests.prof` file now contains time and allocation info for the test run.
+
+To create a profiling report for an executable, e.g. `my-exe`, you can command:
+
+~~~text
+stack exec --profile -- my-exe +RTS -p
+~~~
+
+For more fine-grained control of compilation options there are the
+[`--library-profiling` flag](../commands/build_command.md#-no-library-profiling-flag)
+and
+[`--executable-profiling` flag](../commands/build_command.md#-no-executable-profiling-flag).
+
+The `--library-profiling` flag:
+
+* turns on the Cabal flag
+  [`--enable-library-profiling`](https://cabal.readthedocs.io/en/stable/setup-commands.html#cmdoption-runhaskell-Setup.hs-configure-enable-library-profiling); and
+* passes GHC's
+  [`+RTS -p` runtime options](https://downloads.haskell.org/ghc/latest/docs/users_guide/profiling.html#rts-flag--p)
+  to any test suites and benchmarks.
+
+The `--executable-profiling` flag:
+
+* for project packages, turns on the Cabal flag
+  [`--enable-profiling`](https://cabal.readthedocs.io/en/stable/setup-commands.html#cmdoption-runhaskell-Setup.hs-configure-enable-profiling);
+* turns on the Cabal flag
+  [`--enable-library-profiling`](https://cabal.readthedocs.io/en/stable/setup-commands.html#cmdoption-runhaskell-Setup.hs-configure-enable-library-profiling); and
+* passes GHC's
+  [`+RTS -p` runtime options](https://downloads.haskell.org/ghc/latest/docs/users_guide/profiling.html#rts-flag--p)
+  to any test suites and benchmarks.
+
+To enable compilation with profiling options by default you can add the
+following to a project-level or global configuration file:
+
+~~~yaml
+build:
+  library-profiling: true
+  executable-profiling: true
+~~~
+
+## Further reading
+
+For more commands and uses, see the
+[official GHC chapter on profiling](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/profiling.html),
+the [Haskell wiki](https://wiki.haskell.org/How_to_profile_a_Haskell_program),
+and the
+[chapter on profiling in Real World Haskell](http://book.realworldhaskell.org/read/profiling-and-optimization.html).
+
+## Tracing
+
+To generate a backtrace in case of exceptions during a test or benchmarks run,
+use the `--trace` flag. Like `--profile` this compiles with profiling options,
+but adds the `+RTS -xc` runtime option.
+
+## Debugging symbols
+
+Building with debugging symbols in the
+[DWARF information](https://ghc.haskell.org/trac/ghc/wiki/DWARF) is supported by
+Stack. This can be done by passing the flag `--ghc-options="-g"` and also to
+override the default behaviour of stripping executables of debugging symbols by
+passing either one of the following flags: `--no-strip`,
+`--no-library-stripping` or `--no-executable-stripping`.
+
+In Windows, GDB can be installed to debug an executable with
+`stack exec -- pacman -S gdb`. Windows' Visual Studio compiler's debugging
+format PDB is not supported at the moment. This might be possible by
+[separating](https://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target)
+debugging symbols and
+[converting](https://github.com/rainers/cv2pdb) their format. Or as an option
+when
+[using the LLVM backend](http://blog.llvm.org/2017/08/llvm-on-windows-now-supports-pdb-debug.html).
diff --git a/doc/topics/developing_on_windows.md b/doc/topics/developing_on_windows.md
new file mode 100644
index 0000000000..b71ca19dd4
--- /dev/null
+++ b/doc/topics/developing_on_windows.md
@@ -0,0 +1,85 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Developing on Windows #
+
+On Windows, Stack comes with an installation of [MSYS2](https://www.msys2.org/).
+An environment of MSYS2 (by default, `CLANG64` on 64-bit Windows) will be used
+by Stack to provide a Unix-like shell and environment for Stack. This may be
+necessary for installing some Haskell packages, such as those which use
+`configure` scripts, or if your project needs some additional tools during the
+build phase.
+
+No matter which terminal software you choose (Windows Terminal, Console Windows
+Host, Command Prompt, PowerShell, Git bash or any other) you can use this
+environment too by executing all programs through
+`stack exec -- <program_name>`.
+
+Executables and libraries can be installed with the MSYS2 package manager
+`pacman`. All tools can be found in the [index](https://packages.msys2.org) to
+MSYS2 packages. A [guide](https://www.msys2.org/docs/package-management/) to
+package management with `pacman` is also available. `pacman` &mdash; like all
+other tools in the [Stack environment](stack_environment.md) &mdash; should be
+started with `stack exec -- pacman`. Help about `pacman` commands (operations)
+can be obtained by `stack exec -- pacman --help`. Help about a specific `pacman`
+operation can be obtained by using `--help` (or `-h`) with an operation. For
+example, help about the operation `--sync` (or `-S`) can be obtained with
+`stack exec -- pacman --sync --help` or, equivalently,
+`stack exec -- pacman -Sh`.
+
+Command `stack path --bin-path` to see the PATH in the
+[Stack environment](stack_environment.md). If the relevant MSYS2 environment is
+`CLANG64`, on Windows, it includes the `\clang64\bin`, `\usr\local\bin` and
+`\usr\bin` directories of the Stack-supplied MSYS2. (It includes the
+corresponding directory if the relevant MSYS2 environment is other than
+`CLANG64`.) If your executable depends on files (for example, dynamic-link
+libraries) in those directories and you want to run it outside of the Stack
+environment, you will need to ensure copies of those files are on the PATH.
+
+Command `stack path --extra-include-dirs` and `stack path --extra-library-dirs`
+to see the extra directories searched for C header files or system libraries
+files in the Stack environment. If the relevant MSYS2 environment is `CLANG64`,
+on Windows, it includes the `\clang64\include` (include) and the `\clang64\lib`
+and `\clang64\bin` directories (library) of the Stack-supplied MSYS2. (It
+includes the corresponding directories if the relevant MSYS2 environment is
+other than `CLANG64`.)
+
+For further information about configuring the relevant MSYS2 environment, see
+Stack's [`msys-environment`](../configure/yaml/non-project.md#msys-environment)
+non-project specific configuration option documentation.
+
+## Updating the Stack-supplied MSYS2 ##
+
+The Stack-supplied MSYS2 can itself be updated with the Stack-supplied `pacman`.
+See the MSYS2 guide [Updating MSYS2](https://www.msys2.org/docs/updating/). If
+the Stack-supplied `pacman` has a version that is 5.0.1.6403 or greater (see
+`stack exec -- pacman --version`) then the command to update is simply:
+
+    stack exec -- pacman -Suy
+
+This command may need to be run more than once, until everything is reported by
+`pacman` as 'up to date' and 'nothing to do'.
+
+## Setup.hs ##
+
+`Setup.hs` is automatically run inside the Stack environment. So when you need
+to launch another tool you do not need to prefix the command with
+`stack exec --` within the custom `Setup.hs` file.
+
+## Pacman packages to install for common Haskell packages ##
+
+The following lists MSYS2 packages known to allow the installation of some
+common Haskell packages on Windows. Feel free to submit additional entries via a
+pull request.
+
+*   For [text-icu](https://hackage.haskell.org/package/text-icu) install
+    `mingw-w64-clang-x86_64-icu`.
+
+*   For [zlib >= 0.7](https://hackage.haskell.org/package/zlib) the default
+    Cabal flag `pkg-config` is `true` and requires executable `pkg-config` on
+    the PATH. MSYS2 [defaults](https://www.msys2.org/docs/pkgconfig/) to
+    [`pkgconf`](https://packages.msys2.org/package/pkgconf?repo=msys&variant=x86_64)
+    as its `pkg-config` implementation. Installation:
+
+        stack exec -- pacman -S pkgconf
+
+    Alternatively, build with `--flag zlib:-pkg-config`.
diff --git a/doc/docker_integration.md b/doc/topics/docker_integration.md
similarity index 93%
rename from doc/docker_integration.md
rename to doc/topics/docker_integration.md
index 970daa64a2..73e062c233 100644
--- a/doc/docker_integration.md
+++ b/doc/topics/docker_integration.md
@@ -39,9 +39,9 @@ supported way to use Docker integration on macOS (the older Docker Machine
 with host volume mounting that make Stack nearly unusable for anything but the
 most trivial projects).
 
-Other Un*xen are not officially supported but there are ways to get them working.
-See [#194](https://github.com/commercialhaskell/stack/issues/194) for details
-and workarounds.
+Other Un*xen are not officially supported but there are ways to get them
+working. See [#194](https://github.com/commercialhaskell/stack/issues/194) for
+details and workarounds.
 
 Note: you may want to use set the `mount-mode` option to `delegated`, since
 this can dramatically improve performance on macOS (see
@@ -93,7 +93,7 @@ in the Docker container by default. To use a compiler installed by stack, add
 
     system-ghc: false
 
-(see [`system-ghc`](yaml_configuration.md#system-ghc)).
+(see [`system-ghc`](../configure/yaml/non-project.md#system-ghc)).
 
 ### Use stack as normal
 
@@ -105,7 +105,7 @@ container).
 
 The first time you run a command with a new image, you will be prompted to run
 `stack docker pull` to pull the image first. This will pull a Docker
-image with a tag that matches your resolver. Only LTS resolvers are supported
+image with a tag that matches your snapshot. Only LTS snapshots are supported
 (we do not generate images for nightly snapshots).  Not every LTS version is
 guaranteed to have an image existing, and new LTS images tend to lag behind
 the LTS snapshot being published on stackage.org.  Be warned: these images are
@@ -262,7 +262,7 @@ Image Repositories
 
 FP Complete provides the following public image repositories on Docker Hub:
 
-- [fpco/stack-build](https://registry.hub.docker.com/u/fpco/stack-build/) (the
+- [fpco/stack-build](https://registry.hub.docker.com/r/fpco/stack-build/) (the
   default) - GHC (patched), tools (Stack, Cabal (the tool), happy, alex, etc.),
   and system developer libraries required to build all Stackage packages.
 
@@ -307,10 +307,11 @@ Additional notes
 ### Volume-mounts and ephemeral containers
 
 Since filesystem changes outside of the volume-mounted project directory are not
-persisted across runs, this means that if you `stack exec sudo apt-get install some-ubuntu-package`,
-that package will be installed but then the container it's
-installed in will disappear, thus causing it to have no effect. If you wish to
-make this kind of change permanent, see later instructions for how to create a
+persisted across runs, this means that if you
+`stack exec sudo apt-get install some-ubuntu-package`, that package will be
+installed but then the container it is installed in will disappear, thus causing
+it to have no effect. If you wish to make this kind of change permanent, see 
+later instructions for how to create a
 [derivative Docker image](#derivative-image).
 
 Inside the container, your home directory is a special location that volume-
@@ -339,8 +340,8 @@ If you do want to do all your work, including editing, in the container, it
 might be better to use a persistent container in which you can install Ubuntu
 packages. You could get that by running something like
 `stack --docker-container-name=NAME --docker-persist exec bash`. This
-means when the container exits, it won't be deleted. You can then restart it
-using `docker start -a -i NAME`. It's also possible to detach from a container
+means when the container exits, it will not be deleted. You can then restart it
+using `docker start -a -i NAME`. It is also possible to detach from a container
 while it continues running in the background using by pressing Ctrl-P Ctrl-Q,
 and then reattach to it using `docker attach NAME`.
 
@@ -354,7 +355,7 @@ information about managing Docker containers.
 Creating your own custom derivative image can be useful if you need to install
 additional Ubuntu packages or make other changes to the operating system. Here
 is an example (replace `stack-build:custom` if you prefer a different name for
-your derived container, but it's best if the repo name matches what you're
+your derived container, but it is best if the repo name matches what you are
 deriving from, only with a different tag, to avoid recompilation):
 
     ;;; On host
@@ -369,9 +370,9 @@ deriving from, only with a different tag, to avoid recompilation):
     $ docker commit temp stack-build:custom
     $ docker rm temp
 
-Now you have a new Docker image named `stack-build:custom`. To use the new image, run
-a command such as the following or update the corresponding values in your
-`stack.yaml`:
+Now you have a new Docker image named `stack-build:custom`. To use the new
+image, run a command such as the following or update the corresponding values in
+your `stack.yaml`:
 
     stack --docker-image=stack-build:custom <COMMAND>
 
@@ -384,7 +385,7 @@ on creating Docker images.
 
 The easiest way to create your own custom image us by extending FP Complete's
 images, but if you prefer to start from scratch, most images that include the
-basics for building code with GHC will work. The image doesn't even, strictly
+basics for building code with GHC will work. The image does not even, strictly
 speaking, need to include GHC, but it does need to have libraries and tools that
 GHC requires (e.g., libgmp, gcc, etc.).
 
@@ -392,7 +393,7 @@ There are also a few ways to set up images that tightens the integration:
 
 * Create a user and group named `stack`, and create a `~/.stack` directory for
   it. Any build plans and caches from it will be copied from the image by Stack,
-  meaning they don't need to be downloaded separately.
+  meaning they do not need to be downloaded separately.
 * Any packages in GHC's global package database will be available. This can be
   used to add private libraries to the image, or the make available a set of
   packages from an LTS release.
@@ -403,14 +404,14 @@ Troubleshooting
 ### "No Space Left on Device", but 'df' shows plenty of disk space
 
 This is likely due to the storage driver Docker is using, in combination with
-the large size and number of files in these images. Use `docker info|grep 'Storage Driver'`
-to determine the current storage driver.
+the large size and number of files in these images. Use
+`docker info|grep 'Storage Driver'` to determine the current storage driver.
 
 We recommend using either the `overlay` or `aufs` storage driver for stack, as
 they are least likely to give you trouble.  On Ubuntu, `aufs` is the default for
 new installations, but older installations sometimes used `devicemapper`.
 
-The `devicemapper` storage driver's doesn't work well with large filesystems,
+The `devicemapper` storage driver's does not work well with large filesystems,
 and we have experienced other instabilities with it as well. We recommend
 against its use.
 
@@ -430,7 +431,7 @@ for this condition.  Unfortunately, the number of inodes is set when creating
 the filesystem, so fixing this requires reformatting and passing the `-N`
 argument to mkfs.ext4.
 
-### Name resolution doesn't work from within container
+### Name resolution does not work from within container
 
 On Ubuntu 12.04, by default `NetworkManager` runs `dnsmasq` service, which sets
 `127.0.0.1` as your DNS server. Since Docker containers cannot access this
diff --git a/doc/topics/editor_integration.md b/doc/topics/editor_integration.md
new file mode 100644
index 0000000000..952b2a58b5
--- /dev/null
+++ b/doc/topics/editor_integration.md
@@ -0,0 +1,20 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Editor integration
+
+## Visual Studio Code
+
+For further information, see the [Stack and Visual Code](Stack_and_VS_Code.md)
+documentation.
+
+## Shell auto-completion
+
+Love tab-completion of commands? You are not alone. If you are on bash, just run
+the following command (or add it to `.bashrc`):
+
+~~~text
+eval "$(stack --bash-completion-script stack)"
+~~~
+
+For more information and other shells, see the
+[shell auto-completion](shell_autocompletion.md) documentation.
diff --git a/doc/topics/haskell_and_c_code.md b/doc/topics/haskell_and_c_code.md
new file mode 100644
index 0000000000..0f79aef76e
--- /dev/null
+++ b/doc/topics/haskell_and_c_code.md
@@ -0,0 +1,231 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Haskell and C code
+
+## Haskell packages with C code
+
+A Haskell package can include C source code. For example, consider a simple
+one-package Stack project named `c-example`, created by `stack new c-example`
+but with these changes:
+
+A C header file `my-library.h` added in new directory `include`:
+~~~c
+#ifndef MY_LIBRARY_HEADER
+#define MY_LIBRARY_HEADER
+int max(int, int);
+#endif
+~~~
+
+A C source code file `my-library.c` added in new directory `c-source`:
+~~~c
+#include "my-library.h"
+
+/* Function returning the larger of two integers */
+int max(int x1, int x2) {
+  if (x1 > x2)
+    return x1;
+  else
+    return x2;
+}
+~~~
+
+A different Haskell module in source file `src/Lib.hs`, including a Haskell
+foreign import declaration making use of the C `max` function:
+~~~haskell
+module Lib ( c_max ) where
+
+foreign import ccall "max" c_max :: Int -> Int -> Int
+~~~
+
+A different Haskell module in source file `app/Main.hs`, making use of the
+Haskell function `c_max` exported from module `Lib`:
+~~~haskell
+module Main ( main ) where
+
+import Lib ( c_max )
+
+main :: IO ()
+main = print $ c_max 10 100
+~~~
+
+The package's `package.yaml` file (simplied), used to create the package's
+Cabal file, might look like this:
+~~~yaml
+spec-version: 0.36.0
+
+name: c-example
+version: 0.1.0.0
+
+extra-source-files:
+- include/my-library.h
+
+dependencies:
+- base >= 4.7 && < 5
+
+library:
+  source-dirs: src
+  include-dirs: # Where to look for C header files?
+  - include
+  c-sources: # What C source code files to be compiled and linked?
+  - c-source/my-library.c
+
+executables:
+  c-example-exe:
+    main: Main.hs
+    source-dirs: app
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - c-example
+~~~
+
+The project's `stack.yaml` file only needs to identify a snapshot:
+~~~yaml
+snapshot: lts-24.55 # GHC 9.10.3
+~~~
+
+This example project can be built with Stack in the normal way (`stack build`),
+and the built executable can then be executed in the
+[Stack environment](stack_environment.md) in the normal way
+(`stack exec c-example-exe`).
+
+## Haskell packages with C `main` function
+
+A Haskell package can include an executable which has a `main` function written
+in C. For example, consider a simple one-package Stack project named
+`c-example`, with:
+
+A `package.yaml` describing a library and two executables, named `haskell-exe`
+and `c-exe`:
+
+~~~yaml
+spec-version: 0.36.0
+
+name: c-example
+version: 0.1.0.0
+
+dependencies: base
+
+library:
+  source-dirs: src
+  # The Lib_stub.h header must be put by GHC somewhere where Cabal can find it.
+  # This tells GHC to put it in the autogen-stubs directory of the project
+  # directory.
+  ghc-options:
+  - -stubdir autogen-stubs
+
+executables:
+  haskell-exe:
+    main: Main.hs
+    source-dirs: app
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies: c-example
+  c-exe:
+    main: main.c
+    source-dirs: c-app
+    ghc-options: -no-hs-main
+    # This specifies that directory autogen-stubs should be searched for header
+    # files.
+    include-dirs: autogen-stubs
+    dependencies: c-example
+~~~
+
+!!! warning
+
+    `Cabal-3.12.0.0`, a boot package of GHC 9.10.1, ignores `source-dirs` when
+    the `main` file is not a Haskell source code file. This was a regression and
+    fixed in subsequent versions of Cabal (the library).
+
+A Haskell module souce file named `Lib.hs` in directory `src`:
+~~~haskell
+module Lib
+  ( myMax -- Exported only for the use of the 'Haskell' executable
+  ) where
+
+myMax :: Int -> Int -> Int
+myMax x1 x2 = if x1 > x2 then x1 else x2
+
+foreign export ccall myMax :: Int -> Int -> Int
+~~~
+
+A Haskell module source file named `Main.hs` in directory `app`:
+~~~haskell
+module Main ( main ) where
+
+import Lib ( myMax )
+
+main :: IO ()
+main = print $ myMax 10 100
+~~~
+
+A C source file named `main.c` in directory `c-app`:
+~~~c
+// Based in part on
+// https://downloads.haskell.org/ghc/latest/docs/users_guide/exts/ffi.html#using-your-own-main
+
+#include <stdio.h> // Provides printf()
+
+#include <HsFFI.h> // Provides hs_init() and hs_exit(). See the Haskell 2010
+                   // Report, 8.7.
+
+// Parts specific to GHC
+#ifdef __GLASGOW_HASKELL__
+#include "Lib_stub.h" // Automatically generated by GHC, given use of
+                      // foreign export ... in module Lib.hs ...
+#endif
+
+int main(int argc, char *argv[]) {
+  // Initialises the Haskell system and provides it with the available command
+  // line arguments
+  hs_init(&argc, &argv);
+
+  // Use our foreign export from module Lib.hs ...
+  printf("%lld\n", myMax(10,100));
+
+  // De-initialise the Haskell system
+  hs_exit();
+  return 0;
+}
+~~~
+
+The `foreign export` declaration in Haskell module `Lib` will cause GHC to
+generate a 'stub' C header file named `Lib_stub.h`. The GHC option `-stubdir`
+will cause GHC to put that file in the specified directory (`autogen-stubs`, in
+this example).
+
+!!! info
+
+    If GHC's `-stubdir` option is omitted, GHC will put the generated C header
+    file together with the other build artefacts for the module. However, that
+    location cannot be specified reliably using the `include-dirs` key.
+
+That generated C header file will have content like:
+~~~c
+#include <HsFFI.h>
+#if defined(__cplusplus)
+extern "C" {
+#endif
+extern HsInt myMax(HsInt a1, HsInt a2);
+#if defined(__cplusplus)
+}
+#endif
+~~~
+
+The `include-dirs` key will cause the specified directory (again,
+`autogen-stubs` in this example) to be searched for C header files.
+
+The project's `stack.yaml` file only needs to identify a snapshot:
+~~~yaml
+snapshot: lts-24.55 # GHC 9.10.3
+~~~
+
+This example project can be built with Stack in the normal way (`stack build`),
+and the built executables can then be executed in the
+[Stack environment](stack_environment.md) in the normal way
+(`stack exec haskell-exe` for the 'Haskell' executable and `stack exec c-exe`
+for the 'C' executable).
diff --git a/doc/topics/index.md b/doc/topics/index.md
new file mode 100644
index 0000000000..1c9dcc1fb9
--- /dev/null
+++ b/doc/topics/index.md
@@ -0,0 +1,101 @@
+---
+title: Topics
+---
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Topics (advanced)
+
+This part of the guide provides pages dedicated to specific topics.
+
+[Stack root](stack_root.md)
+
+:   The Stack root is a directory where Stack stores important information
+
+[Stack work directories](stack_work.md)
+
+:   Stack work directories are directories within a local project or package
+    directory in which Stack stores files created during the build process.
+
+[Stack environment](stack_environment.md)
+
+:   The Stack environment is the one used by Stack when it builds or it runs an
+    executable.
+
+[Snapshot location](snapshot_location.md)
+
+:   How to specify the location of snapshots.
+
+[Package location](package_location.md)
+
+:   How to specify the location of packages.
+
+[Snapshot specification](custom_snapshot.md)
+
+:   How to specify the contents of a snapshot.
+
+[`stack.yaml` vs a Cabal file](stack_yaml_vs_cabal_package_file.md)
+
+:   The difference between Stack's project-level configuration file and a
+    Cabal file describing a Haskell package.
+
+[Script interpreter](scripts.md)
+
+:   How to use Stack's script interpreter.
+
+[Docker integration](docker_integration.md)
+
+:   Stack has support for automatically performing builds inside a Docker
+    container.
+
+[Nix integration](nix_integration.md)
+
+:   Stack can be configured to integrate with Nix, a purely functional package
+    manager.
+
+[Non-standard project initialization](nonstandard_project_init.md)
+
+:   You may need to configure Stack to work with an existing project that has
+    one or more Cabal files but no Stack project-level configuration file.
+
+[Debugging](debugging.md)
+
+:   Advice on debugging using Stack.
+
+[Editor integration](editor_integration.md)
+
+:   Advice on intergrating Stack with code editors.
+
+[Stack and Visual Studio Code](Stack_and_VS_Code.md)
+
+:   Advice on using Stack with Visual Studio Code and its Haskell extension.
+
+[Developing on Windows](developing_on_windows.md)
+
+:   Advice on using Stack on Windows.
+
+[Shell auto-completion](shell_autocompletion.md)
+
+:   Adding support for the tab completion of standard Stack arguments to the
+    shell programs Bash, Zsh (the Z shell) and fish.
+
+[CI](CI.md)
+
+:   Advice on using Stack with CI.
+
+[Travis CI](travis_ci.md)
+
+:   Advice on using Stack on Travis CI.
+
+[Azure CI](azure_ci.md)
+
+:   Advice on using Stack on Azure CI.
+
+[Lock files](lock_files.md)
+
+:   The contents of Stack's lock files, how they are used, and how they are
+    created and updated.
+
+[Haskell and C code](haskell_and_c_code.md)
+
+:   Advice on using Stack with Haskell packages that include C source code,
+   including those with a C `main` function.
diff --git a/doc/topics/lock_files.md b/doc/topics/lock_files.md
new file mode 100644
index 0000000000..92518a1cbc
--- /dev/null
+++ b/doc/topics/lock_files.md
@@ -0,0 +1,185 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Lock Files
+
+Stack attempts to provide reproducible build plans. This involves reproducibly
+getting the exact same contents of source packages and configuration options
+(like Cabal flags and GHC options) for a given set of input files. There are a
+few problems with making this work:
+
+* Entering all of the information to fully provide reproducibility is tedious.
+  This would include things like Hackage revisions, hashes of remote tarballs,
+  etc. Users do not want to enter this information.
+
+* Many operations in Stack rely upon a "snapshot hash," which transitively
+  includes the completed information for all of these dependencies. If any of
+  that information is missing when parsing the `stack.yaml` file or snapshot
+  files, it could be expensive for Stack to calculate it.
+
+To address this, we follow the (fairly standard) approach of having a
+_lock file_. The goal of the lock file is to cache completed locations of
+project, snapshot packages and snapshots themselves so that:
+
+* These files can be stored in source control
+* Users on other machines can reuse these lock files and get identical build
+  plans given that the used project packages and local snapshots are the same on
+  those machines
+* Rerunning `stack build` in the future is deterministic in the build plan, not
+  depending on mutable state in the world like Hackage revisions
+
+    !!! note
+
+        If, for example, a tarball available remotely is deleted or the hash
+        changes, it will not be possible for Stack to perform the build.
+        However, by deterministic, we mean it either performs the same build or
+        fails, never accidentally doing something different.
+
+This document explains the contents of a lock file, how they are used, and how
+they are created and updated.
+
+## stack.yaml and snapshot files
+
+Relevant to this discussion, Stack's project-level configuration file
+(`stack.yaml`, by default) specifies:
+
+* the parent snapshot (the [`snapshot`](../configure/yaml/project.md#snapshot)
+  key)
+* extra-deps
+
+Some of this information can be incomplete. Consider this `stack.yaml` file:
+
+~~~yaml
+snapshot: lts-24.55
+extra-deps:
+- acme-missiles-0.3
+~~~
+
+This information is _incomplete_. For example, the extra-deps may change in the
+future. Instead, you could specify enough information in the `stack.yaml` file
+to fully resolve that package. That looks like:
+
+~~~yaml
+extra-deps:
+- hackage: acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1,613
+  pantry-tree:
+    size: 226
+    sha256: 614bc0cca76937507ea0a5ccc17a504c997ce458d7f2f9e43b15a10c8eaeb033
+~~~
+
+The `lts-24.55` information is also incomplete. While we assume in general that
+Haskell LTS snapshots never change, there is nothing that prohibits that from
+happening. Instead, the complete version of that key is:
+
+~~~yaml
+snapshots:
+- url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml
+  size: 729011
+  sha256: 3c412a7c13dba6d3d808455a458e0776c58b6cf99b8a7961a2f5e55589d6f1d6
+~~~
+
+Users do not particularly feel like writing all of that. Therefore, it is common
+to see _incomplete_ information in a `stack.yaml` file.
+
+## Recursive snapshot layers
+
+Snapshot files can be _recursive_, where `stack.yaml` refers to
+`mySnapshotA.yaml`, which refers to `mySnapshotB.yaml`, which refers to a remote
+snapshot file (available via an HTTP(S) URL).
+
+We need to encode information from _all_ of these snapshot layers and the
+`stack.yaml` file in the lock file, to ensure that we can detect if anything
+changes.
+
+## Performance
+
+In addition to acting as a pure correctness mechanism, the design of a lock file
+given here also works as a performance improvement. Instead of requiring that
+all snapshot files be fully parsed on each Stack invocation, we can store
+information in the lock file and bypass parsing of the additional files in the
+common case of no changes.
+
+## Lock file contents
+
+The lock file contains the following information:
+
+* Completed package locations for extra-deps and packages in snapshot files
+
+    !!! note
+
+        This only applies to _immutable_ packages. Mutable packages are not
+        included in the lock file.
+
+* Completed information for the snapshot locations
+
+It looks like the following:
+
+~~~yaml
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
+
+packages:
+# Listed in the order that they are encountered in the layers of snapshots,
+# starting at the lowest layer:
+- completed:
+    hackage: acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1,613
+    pantry-tree:
+      sha256: 614bc0cca76937507ea0a5ccc17a504c997ce458d7f2f9e43b15a10c8eaeb033
+      size: 226
+  original:
+    hackage: acme-missiles-0.3
+snapshots:
+- completed:
+    sha256: 3c412a7c13dba6d3d808455a458e0776c58b6cf99b8a7961a2f5e55589d6f1d6
+    size: 729011
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml
+  original: lts-24.55
+~~~
+
+## Creation procedure
+
+Whenever a project-level configuration file (`stack.yaml`, by default) is
+loaded, Stack checks for a lock file in the same file path, with a `.lock`
+extension added. For example, if you command:
+
+~~~text
+stack --stack-yaml my-stack.yaml build
+~~~
+
+or
+
+~~~text
+stack --stack-yaml my-stack.yaml build --dry-run
+~~~
+
+then Stack will use a lock file in the location `my-stack.yaml.lock`. For the
+rest of this document, we will assume that the files are simply `stack.yaml` and
+`stack.yaml.lock`.
+
+If the lock file does not exist, subject to Stack's
+[`--lock-file`](../configure/global_flags.md#-lock-file-option) option, it will
+be created by:
+
+* Loading the `stack.yaml`
+* Loading all snapshot files
+* Completing all missing information
+* Writing out the new `stack.yaml.lock` file to the disk
+
+## Update procedure
+
+Whenever a project-level configuration file (`stack.yaml`, by default) is
+loaded, all completed package or snapshot locations (even those completed using
+information from a lock file) get collected to form a new lock file in memory.
+Subject to Stack's
+[`--lock-file`](../configure/global_flags.md#-lock-file-option) option, that new
+lock file is compared against the one on disk and, if there are any differences,
+written out to the disk.
+
+## `stack config build-files` command
+
+The
+[`stack config build-files`](../commands/config_command.md#the-stack-config-build-files-command)
+loads a project-level configuration file (see above) without taking any other
+build steps (other than generating, when applicable, a Cabal file from a package
+description in the Hpack format).
diff --git a/doc/topics/nix_integration.md b/doc/topics/nix_integration.md
new file mode 100644
index 0000000000..019d7d82ba
--- /dev/null
+++ b/doc/topics/nix_integration.md
@@ -0,0 +1,479 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Nix integration
+
+[:octicons-tag-24: 0.1.10.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.10.0)
+
+[Nix](https://nixos.org/) is a purely functional package manager. Stack can be
+configured to integrate with Nix. Integration provides these benefits:
+
+* more reproducible builds. This is because fixed versions of any system
+  libraries and commands required to build the project are automatically built
+  using Nix and managed locally for each project. These system packages never
+  conflict with any existing versions of these libraries on your system. That
+  they are managed locally to the project means that you do not need to alter
+  your system in any way to build any odd project pulled from the Internet; and
+
+* implicit sharing of system packages between projects. This means you do not
+  have more copies on-disk than you need.
+
+The Nix package manager is a pre-requisite for integration. On Linux (including
+Windows Subsystem for Linux) and macOS, it can be downloaded and installed from
+the [Nix download page](https://nixos.org/download.html).
+
+When integrated with Nix, Stack handles Haskell dependencies as it usually does
+and the Nix package manager handles the _non-Haskell_ dependencies needed by the
+Haskell packages.
+
+Stack downloads Haskell packages from [Stackage](https://www.stackage.org/lts)
+and builds them locally. Stack uses Nix to download
+[Nix packages][nix-search-packages]. These provide the GHC compiler and external
+C libraries that you would normally install manually.
+
+Nix's `nix-shell` starts an interactive shell based on a Nix expression. Stack
+can automatically create a Nix build environment in the background using
+`nix-instantiate` to produce a store derivation and `nix-shell` with that store
+derivation. This two-step process (since Stack UNRELEASED) allows Stack to
+report separately any errors in producing the store derivation. There are two
+alternative options to create such a build environment:
+
+1. provide a list of [Nix packages][nix-search-packages]. To these, Stack will
+   add Nix packages for the GHC compiler, `git` (the distributed version control
+   system), `gcc` (the GNU compiler collection), `gmp` (the GNU multiple
+   precision arithmetic library) and `cacert` (a bundle of X.509 certificates of
+   public Certificate Authorities); and
+2. provide a `shell.nix` file that gives you more control over the libraries and
+   tools available inside the shell.
+
+A `shell.nix` file requires writing code in Nix's
+[custom language][nix-language]. Use this option only if you know Nix and have
+special requirements, such as using custom Nix packages that override the
+standard ones or using system libraries with special requirements.
+
+## Checking the Nix installation
+
+Once Nix is installed, the Nix commands (`nix-shell` etc) should be available.
+If they are not, it could be because the file
+`$HOME/.nix-profile/etc/profile.d/nix.sh` is not sourced by your shell.
+
+You should either:
+
+1. run `source ~/.nix-profile/etc/profile.d/nix.sh` each time you open a
+   terminal and need Nix; or
+2. add the command `source ~/.nix-profile/etc/profile.d/nix.sh` to your
+   `~/.bashrc` or `~/.bash_profile` file.
+
+A Nix path can be specified between angle brackets, e.g. `<nixpkgs>`, and the
+directories listed in the `NIX_PATH` environment variable will be searched for
+the given file or directory name. Stack makes use of path `<nixpkgs>`. From
+Nix 2.4, `NIX_PATH` is not set by `nix.sh`. If `NIX_PATH` is not set, Nix will
+fall back to (first) `$HOME/.nix-defexpr/channels` in impure and unrestricted
+evaluation mode. However, Stack may use a pure Nix mode (see further
+[below](#pure-and-impure-nix-shells)). That directory can be appended to
+`NIX_PATH` with
+`export NIX_PATH=${NIX_PATH:+$NIX_PATH:}$HOME/.nix-defexpr/channels`. For
+information about how Stack itself can configure `NIX_PATH`, see further
+[below](#nix-package-sources).
+
+## Enable Nix integration
+
+On NixOS, Nix integration is enabled by default; on other operating systems it
+is disabled. To enable Nix integration, add the following section to your Stack
+configuration file (`stack.yaml` or `config.yaml`):
+
+~~~yaml
+nix:
+  enable: true  # false by default, except on NixOS
+~~~
+
+The equivalent command line flag (which will prevail) is `--[no-]nix`. Passing
+any `--nix-*` option on the command line will imply the `--nix` option.
+
+If Nix integration is not enabled, Stack will notify the user if a `nix`
+executable is on the PATH. If that notification is unwanted, it can be muted by
+setting Stack's configuration option
+[`notify-if-nix-on-path`](../configure/yaml/non-project.md#notify-if-nix-on-path)
+to `false`.
+
+If Nix integration is enabled:
+
+* `stack build` and `stack exec` automatically launch themselves in a local
+  build environment (using `nix-shell`). It is not necessary to run
+  `stack setup`, unless you want to cache a GHC installation before  running a
+  build; and
+
+* [`system-ghc: true`](../configure/yaml/non-project.md#system-ghc) is implied.
+  ([`install-ghc: false`](../configure/yaml/non-project.md#install-ghc) is not
+  implied.)
+
+**Known limitation on macOS:** currently, `stack --nix ghci` fails on macOS, due
+to a bug in GHCi when working with external shared libraries.
+
+## Supporting both Nix and non-Nix developers
+
+With Nix integration enabled in Stack's configuration file, every developer of
+your project needs to have Nix installed, but the developer also gets all
+external libraries automatically.
+
+Julien Debon of Tweag has published a [blog post][tweag-blog-post] on
+*Smooth, non-invasive Haskell Stack and Nix shell integration* (2 June 2022).
+The post explains how to set things up so that both Nix and non-Nix developers
+can work together on the same project. The `tweag/haskell-stack-nix-example`
+[GitHub repository][tweag-example] provides an example of working Stack and Nix
+shell integration to accompany the post.
+
+Nix 2.4 (released 1 November 2021) introduced a new and experimental format to
+package Nix-based projects, known as 'flakes'.
+
+The example below adapts and extends the example accompanying the blog post
+above to use Nix flakes. The `flake.nix` file is:
+
+~~~nix
+{
+  description = "my project description";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+
+        hPkgs =
+          pkgs.haskell.packages."ghc8107"; # need to match Stackage LTS version
+                                           # from stack.yaml snapshot
+
+        myDevTools = [
+          hPkgs.ghc # GHC compiler in the desired version (will be available on PATH)
+          hPkgs.ghcid # Continuous terminal Haskell compile checker
+          hPkgs.ormolu # Haskell formatter
+          hPkgs.hlint # Haskell codestyle checker
+          hPkgs.hoogle # Lookup Haskell documentation
+          hPkgs.haskell-language-server # LSP server for editor
+          hPkgs.implicit-hie # auto generate LSP hie.yaml file from cabal
+          hPkgs.retrie # Haskell refactoring tool
+          # hPkgs.cabal-install
+          stack-wrapped
+          pkgs.zlib # External C library needed by some Haskell packages
+        ];
+
+        # Wrap Stack to work with our Nix integration. We do not want to modify
+        # stack.yaml so non-Nix users do not notice anything.
+        # - no-nix: We do not want Stack's way of integrating Nix.
+        # --system-ghc    # Use the existing GHC on PATH (will come from this Nix file)
+        # --no-install-ghc  # Do not try to install GHC if no matching GHC found on PATH
+        stack-wrapped = pkgs.symlinkJoin {
+          name = "stack"; # will be available as the usual `stack` in terminal
+          paths = [ pkgs.stack ];
+          buildInputs = [ pkgs.makeWrapper ];
+          postBuild = ''
+            wrapProgram $out/bin/stack \
+              --add-flags "\
+                --no-nix \
+                --system-ghc \
+                --no-install-ghc \
+              "
+          '';
+        };
+      in {
+        devShells.default = pkgs.mkShell {
+          buildInputs = myDevTools;
+
+          # Make external Nix c libraries like zlib known to GHC, like
+          # pkgs.haskell.lib.buildStackProject does
+          # https://github.com/NixOS/nixpkgs/blob/d64780ea0e22b5f61cd6012a456869c702a72f20/pkgs/development/haskell-modules/generic-stack-builder.nix#L38
+          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath myDevTools;
+        };
+      });
+}
+~~~
+
+Check-in this `flake.nix` to your project's repository. Run the `nix develop`
+command (it searches for `flake.nix` by default) and you WIll find a new
+`flake.lock` file. That file that pins the precise nixpkgs package set. Check-in
+that `flake.lock` file as well, and every Nix developer of your project will use
+precisely the same package set.
+
+## GHC through Nix packages
+
+Nix integration will instruct Stack to build inside a local build environment.
+That environment will also download and use a
+[GHC Nix package](https://search.nixos.org/packages?query=haskell.compiler.ghc)
+matching the required version of the configured Stack
+[snapshot](../configure/yaml/project.md#snapshot).
+
+Enabling Nix integration means that packages will always be built using the
+local GHC from Nix inside your shell, rather than your globally installed system
+GHC (if any).
+
+Stack can use only GHC versions that are in the Nix package repository. The
+[Nixpkgs master branch](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/haskell-modules)
+usually picks up new versions quickly, but it takes two or three days before
+those updates arrive in the `unstable` channel. Release channels, like
+`nixos-22.05`, receive those updates only occasionally -- say, every two or
+three months --, so you should not expect them to have the latest compiler
+available. Fresh NixOS installs use a release version by default.
+
+To identify whether a given compiler is available, you can use the following Nix
+command:
+
+~~~sh
+nix-env -f "<nixpkgs>" -qaP -A haskell.compiler.ghc924
+haskell.compiler.ghc924  ghc-9.2.4
+~~~
+
+If Nix does not know that version of GHC, you will see the following error
+message:
+
+~~~sh
+nix-env -f "<nixpkgs>" -qaP -A haskell.compiler.ghc999
+error: attribute ‘ghc999’ in selection path ‘haskell.compiler.ghc999’ not found
+~~~
+
+You can list all known Haskell compilers in Nix with the following:
+
+~~~sh
+nix-instantiate --eval -E "with import <nixpkgs> {}; lib.attrNames haskell.compiler"
+~~~
+
+Alternatively, use `nix repl`, a convenient tool to explore nixpkgs:
+
+~~~sh
+nix repl
+~~~
+
+In the REPL, load nixpkgs and get the same information through autocomplete:
+
+~~~sh
+nix-repl> :l <nixpkgs>
+nix-repl> haskell.compiler.ghc<Tab>
+~~~
+
+You can type and evaluate any Nix expression in the Nix REPL, such as the one we
+gave to `nix-instantiate` earlier.
+
+## External C libraries through Nix packages
+
+To let Nix manage external C libraries, add (for example) the following section
+to your Stack configuration file:
+
+~~~yaml
+nix:
+  enable: true
+  packages: [zlib, glpk, pcre]
+~~~
+
+The equivalent command line option is `--nix-packages "zlib glpk pcre"`.
+
+The `packages` key and the `shell-file` key (see further below) are
+alternatives. Specifying both results in an error.
+
+The example above will instruct Stack to build inside a local build environment
+that will have the Nix packages
+[zlib](https://search.nixos.org/packages?query=zlib),
+[glpk](https://search.nixos.org/packages?query=glpk) and
+[pcre](https://search.nixos.org/packages?query=pcre)
+installed, which provide the C libraries of the same names.
+
+**Note:** currently, Stack only discovers dynamic and static libraries in the
+`lib/` folder of any Nix package, and likewise header files in the `include/`
+folder. If you are dealing with a package that does not follow this standard
+layout, you will have to deal with that using a custom `shell.nix` file (see
+further below).
+
+## External C libraries through a `shell.nix` file
+
+In Nix, a 'derivation' is a description of a build action and its result is a
+Nix store object. Nix's [custom language][nix-language] can provide a fully
+customized derivation as an environment to use. To specify such a `shell.nix`
+file, add the following section to your Stack configuration file:
+
+~~~yaml
+nix:
+  enable: true
+  shell-file: shell.nix
+~~~
+
+The equivalent command line option (which will prevail) is
+`--nix-shell-file shell.nix`.
+
+The `packages` and `shell-file` keys are alternatives. Specifying both results
+in an error.
+
+Defining a `shell.nix` file allow you to override some Nix derivations, for
+instance to change some build options of the libraries you use, or to set
+additional environment variables. For further information, see the
+[Nix manual][nix-manual-exprs].
+
+The `shell.nix` file that is the equivalent of the
+`packages: [zlib, glpk, pcre]` example above is:
+
+~~~nix
+{ghc}:
+with (import <nixpkgs> {});
+
+haskell.lib.buildStackProject {
+  inherit ghc;
+  name = "myEnv";
+  buildInputs = [ zlib glpk pcre ];
+}
+~~~
+
+The `buildStackProject` utility function is documented in the
+[Nixpkgs manual][nixpkgs-manual-haskell].
+
+Stack expects the `shell.nix` file to define a function of with one argument
+called `ghc` (arguments are not positional), which you should give to
+function `buildStackProject`. This argument is a GHC Nix package in the
+version as defined in the snapshot you set in Stack's project-level
+configuration file (`stack.yaml`, by default).
+
+## Pure and impure Nix shells
+
+By default, Stack will run the build in a *pure* Nix build environment (or
+*shell*). Building in a pure Nix shell means:
+
+1. with limited exceptions, **no environment variable will be forwarded** from
+   your user session to the Nix shell (variables like `HTTP_PROXY`, `PATH`,
+   `STACK_XDG` and `STACK_ROOT` notably will not be available); and
+
+2. the build should fail if you have not specified all the dependencies in the
+   `packages:` section of the Stack configuration file, even if these
+   dependencies are installed elsewhere on your system. This behaviour enforces
+   a complete description of the build environment to facilitate
+   reproducibility.
+
+To override this behaviour, add the following section to your Stack YAML
+configuration file:
+
+~~~yaml
+nix:
+  enable: true
+  pure: false
+~~~
+
+The equivalent command line flag (which will prevail) is `--[no-]-nix-pure`.
+
+To run the build in a *pure* Nix shell but preserve specific environment
+variables use Nix's `nix-shell` command's `--keep` option. For example, to
+preserve the [`STACK_XDG`](../configure/environment_variables.md#stack_xdg)
+environment variable, add the following to your Stack YAML configuration file:
+
+~~~yaml
+nix:
+  nix-shell-options:
+  - --keep
+  - STACK_XDG
+~~~
+
+The equivalent command line option is:
+
+~~~text
+--nix-shell-options "--keep STACK_XDG"
+~~~
+
+**Note:** On macOS, shells are non-pure by default currently. This is due soon
+to be resolved locale issues. So on macOS you will need to be a bit more careful
+to check that you really have listed all dependencies.
+
+## Nix package sources
+
+Nix organizes its packages in snapshots of packages (each snapshot being a
+"package set") similar to how Stackage organizes Haskell packages.  By default,
+`nix-shell` will look for the "nixpkgs" package set located by your `NIX_PATH`
+environment variable. This package set can be different depending on when you
+installed Nix and which nixpkgs channel you are using (similar to the LTS channel
+for stable packages and the nightly channel for bleeding edge packages in
+[Stackage](https://www.stackage.org/)). This is bad for reproducibility so that
+nixpkgs should be pinned, i.e., set to the same package set for every developer
+of your project.
+
+To set or override the Nix package set, add the following section to your Stack
+configuration file:
+
+~~~yaml
+nix:
+  path: [nixpkgs=<path_to_my_own_nixpkgs_clone>]
+~~~
+
+The equivalent command line option is
+`--nix-path <path_to_my_own_nixpkgs_clone>`.
+
+By this means, you can ask Nix to use your own local checkout of the nixpkgs
+repository. You could in this way use a bleeding edge nixpkgs, cloned from the
+`NixOS/nixpkgs` [repository](http://www.github.com/NixOS/nixpkgs) `master`
+branch, or edit the Nix descriptions of some packages.
+
+The Tweag example [repository][tweag-example] shows how you can pin a package
+set.
+
+## Non-project specific configuration
+
+Below is a summary of the non-project specific configuration options and their
+default values. The options can be set in Stack's project-level configuration
+file (`stack.yaml`, by default) or its global configuration file
+(`config.yaml`).
+
+~~~yaml
+nix:
+
+  # false by default, except on NixOS. Is Nix integration enabled?
+  enable: true
+
+  # true by default. Should Nix run in a pure shell?
+  pure: true
+
+  # Empty by default. The list of packages you want to be available in the
+  # nix-shell at build time (with `stack build`) and run time (with
+  # `stack exec`).
+  packages: []
+
+  # Unset by default. You cannot set this option if `packages:`
+  # is already present and not empty.
+  shell-file: shell.nix
+
+  # A list of strings, empty by default. Additional options that will be passed
+  # verbatim to the `nix-instantiate` command.
+  #
+  # Since Stack UNRELEASED
+  nix-instantiate-options: []
+
+  # A list of strings, empty by default. Additional options that will be passed
+  # verbatim to the `nix-shell` command.
+  nix-shell-options: []
+
+  # A list of strings, empty by default, such as
+  # `[nixpkgs=/my/local/nixpkgs/clone]` that will be used to override
+  # NIX_PATH.
+  path: []
+
+  # false by default. Whether to add your Nix dependencies as Nix garbage
+  # collection roots. This way, calling nix-collect-garbage will not remove
+  # those packages from the Nix store, saving you some time when running
+  # stack build again with Nix support activated.
+  #
+  # This creates a `nix-gc-symlinks` directory in the project `.stack-work`.
+  # To revert that, just delete this `nix-gc-symlinks` directory.
+  add-gc-roots: false
+~~~
+
+`stack --nix-help` will list the equivalent command line flags and options.
+
+## Stack and developer tools on NixOS
+
+NixOS is a Linux distribution based on Nix, that is composed using modules and
+packages defined in the Nixpkgs project.
+
+When using Stack on NixOS, you must use Stack's Nix integration to install GHC.
+That is because external C libraries in NixOS are not installed in the usual
+distribution directories. GHC installed through Stack (without Nix) cannot find
+those libraries and, therefore, cannot build most projects. However, GHC
+provided through Nix can be modified to find the external C libraries provided
+through Nix.
+
+[nix-language]: https://wiki.nixos.org/wiki/Overview_of_the_Nix_Language
+[nix-manual-exprs]: http://nixos.org/manual/nix/stable/expressions/writing-nix-expressions.html
+[nix-search-packages]: https://search.nixos.org/packages
+[nixpkgs-manual-haskell]: https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html?highlight=buildStackProject#how-to-build-a-haskell-project-using-stack
+[tweag-blog-post]: https://www.tweag.io/blog/2022-06-02-haskell-stack-nix-shell/
+[tweag-example]: https://github.com/tweag/haskell-stack-nix-example/
diff --git a/doc/nonstandard_project_init.md b/doc/topics/nonstandard_project_init.md
similarity index 98%
rename from doc/nonstandard_project_init.md
rename to doc/topics/nonstandard_project_init.md
index 490aab27fc..3798dc95f8 100644
--- a/doc/nonstandard_project_init.md
+++ b/doc/topics/nonstandard_project_init.md
@@ -3,7 +3,8 @@
 # Non-standard project initialization
 
 You may need to configure Stack to work with an existing project that has one or
-more Cabal files but no Stack project-level configuration file (`stack.yaml`).
+more Cabal files but no Stack project-level configuration file (`stack.yaml`, by
+default).
 
 ## The `stack init` command
 
diff --git a/doc/topics/package_location.md b/doc/topics/package_location.md
new file mode 100644
index 0000000000..ec1383d675
--- /dev/null
+++ b/doc/topics/package_location.md
@@ -0,0 +1,225 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+
+# Package location
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+This document describes the specification of a package location (in the
+`extra-deps` key and in a snapshot).
+
+!!! info
+
+    Stack uses the [Pantry](https://hackage.haskell.org/package/pantry) to
+    specify the location of packages. Pantry is geared towards reproducible
+    build plans with cryptographically secure specification of packages.
+
+There are three types of package locations:
+
+1.  Hackage packages
+2.  Git and Mecurial repositories
+3.  Local or remote archives (such as GitHub archives)
+
+All three types support optional tree metadata to be added, which can be used
+for reproducibility and faster downloads. This information can automatically be
+generated in a [lock file](lock_files.md).
+
+## Hackage packages
+
+A package can be identified by its name, version and Cabal file revision
+number, with revision `0` being the original Cabal file. For example:
+
+~~~yaml
+extra-deps:
+- acme-missiles-0.3@rev:0
+~~~
+
+A package name and version only can be stated. Using this syntax, the most
+recent Cabal file revision available in the package index will be used. For
+example:
+
+~~~yaml
+extra-deps:
+- acme-missiles-0.3
+~~~
+
+This syntax is often used in practice, but may result in one build differing
+from another, if a new or further Cabal file revision is added to the package
+index between the builds.
+
+As an alternative to specifying the Cabal file revision number, you can specify
+the package name and version with the SHA256 hash of the contents of its Cabal
+file. Doing so is slightly more resilient than using the Cabal file revision
+number, as it does not rely on the correct ordering in the package index.
+For example:
+
+~~~yaml
+extra-deps:
+- acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1
+~~~
+
+Optionally, you can specify also the size of the Cabal file in bytes. For
+example (where the file size is `631` bytes):
+
+~~~yaml
+extra-deps:
+- acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1,613
+~~~
+
+Optionally, you can specify also the Pantry tree information. For example:
+
+~~~yaml
+- hackage: acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1,613
+  pantry-tree:
+    size: 226
+    sha256: 614bc0cca76937507ea0a5ccc17a504c997ce458d7f2f9e43b15a10c8eaeb033
+~~~
+
+A Pantry tree is a list of CAS (content-addressable storage)
+'SHA256 hash'-'size in bytes' keys for each of the files in a package.
+
+The SHA256 hash of the contents of the Cabal file and its size in bytes is
+provided in Stack's lock file. For further information, see the
+[lock files](lock_files.md) documentation. The SHA256 hash and file size
+alternative is also what Stack uses when it makes suggestions about missing
+packages.
+
+## Git and Mercurial repositories
+
+You can specify a Git or Mercurial repository at a specific commit, and Stack
+will clone that repository and, if it has submodules (Git), update the
+repository's submodules. For example:
+
+~~~yaml
+extra-deps:
+- git: git@github.com:commercialhaskell/stack.git
+  commit: '6a86ee32e5b869a877151f74064572225e1a0398'
+- git: git@github.com:snoyberg/http-client.git
+  commit: 'a5f4f3'
+- hg: https://example.com/hg/repo
+  commit: 'da39a3ee5e6b4b0d3255bfef95601890afd80709'
+~~~
+
+!!! note
+
+    It is highly recommended that you only use SHA1 values for a Git or
+    Mercurial commit. Other values may work, but they are not officially
+    supported, and may result in unexpected behavior (namely, Stack will not
+    automatically pull to update to new versions). Another problem with this is
+    that your build will not be deterministic, because when someone else tries
+    to build the project they can get a different checkout of the package.
+
+!!! note
+
+    The `commit:` key expects a YAML string. A commit hash, or partial hash,
+    comprised only of digits represents a YAML number, unless it is enclosed in
+    quotation marks.
+
+!!! warning
+
+    For the contents of a Git repository, Stack cannot handle filepaths or
+    symbolic link names that are longer than those supported by the `ustar`
+    (Unix Standard TAR) archive format defined by
+    [POSIX.1-1988](https://nvlpubs.nist.gov/nistpubs/Legacy/FIPS/fipspub151-1.pdf).
+
+    Stack uses `git archive` to convert the content of a Git repository to a
+    TAR archive, which it then seeks to consume. Git produces `pax` format
+    archives which use 'extended' headers for matters that the `ustar` format
+    cannot handle. Unfortunately, Stack cannot consume an extended header and
+    will silently discard the item.
+
+A common practice in the Haskell world is to use "megarepos", or repositories
+with multiple packages in various subdirectories. Some common examples include
+[wai](https://github.com/yesodweb/wai/) and
+[digestive-functors](https://github.com/jaspervdj/digestive-functors). To
+support this, you may also specify `subdirs` for repositories. For example:
+
+~~~yaml
+extra-deps:
+- git: git@github.com:yesodweb/wai
+  commit: '2f8a8e1b771829f4a8a77c0111352ce45a14c30f'
+  subdirs:
+  - auto-update
+  - wai
+~~~
+
+If unspecified, `subdirs` defaults to `['.']` meaning looking for a package in
+the root of the repository. If you specify a value of `subdirs`, then `'.'` is
+_not_ included by default and needs to be explicitly specified if a required
+package is found in the top-level directory of the repository.
+
+### git-annex
+
+[git-annex](https://git-annex.branchable.com) is not supported. This is because
+`git archive` does not handle symbolic links outside the work tree. It is still
+possible to use repositories which use git-annex but do not require the annex
+files for the package to be built.
+
+To do so, ensure that any files or directories stored by git-annex are marked
+[export-ignore](https://git-scm.com/docs/git-archive#Documentation/git-archive.txt-export-ignore)
+in the `.gitattributes` file in the repository. For further information, see
+issue [#4579](https://github.com/commercialhaskell/stack/issues/4579).
+
+For example, if the directory `fonts/` is controlled by git-annex, use the
+following line:
+
+~~~gitattributes
+fonts export-ignore
+~~~
+
+## Local or remote archives (such as GitHub archives)
+
+### Filepaths or URLs to archive files
+
+You can use filepaths referring to local archive files or HTTP or HTTPS URLs
+referring to remote archive files, either tarballs or ZIP files.
+
+!!! note
+
+    An example of a remote archive file is a Hackage package candidate, usually
+    located at (for example)
+    https://hackage.haskell.org/package/my-package-1.0.0/candidate/my-package-1.0.0.tar.gz.
+
+!!! warning
+
+    Stack assumes that these archive files never change after downloading to
+    avoid needing to make an HTTP request on each build.
+
+For safer, more reproducible builds, you can optionally specify a cryptographic
+hash of the archive file.
+
+For example:
+
+~~~yaml
+extra-deps:
+- https://example.com/foo/bar/baz-0.0.2.tar.gz
+- archive: http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip
+  subdirs:
+  - wai
+  - warp
+- archive: ../acme-missiles-0.3.tar.gz
+  sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b
+~~~
+
+### GitHub archive files
+
+[:octicons-tag-24: 1.7.1](https://github.com/commercialhaskell/stack/releases/tag/v1.7.1)
+
+You can specify a GitHub respository at a specific commit and Stack will obtain
+from GitHub an archive file of the files in the repository at that point in its
+history. For example:
+
+~~~yaml
+extra-deps:
+- github: snoyberg/http-client
+  commit: 'a5f4f30f01366738f913968163d856366d7e0342'
+~~~
+
+!!! note
+
+    An archive file of the files in a GitHub repository at a point in its
+    history is not the same as a clone of the repository (including its history)
+    and the updating of any submodules. If you need the latter, use the syntax
+    for a [Git repository](#git-and-mercurial-repositories).
+
+    If the package fails to build due to missing files, it may be that updated
+    submodules are required.
diff --git a/doc/topics/scripts.md b/doc/topics/scripts.md
new file mode 100644
index 0000000000..17715f1642
--- /dev/null
+++ b/doc/topics/scripts.md
@@ -0,0 +1,310 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Stack's script interpreter
+
+Stack offers a very useful feature for running files: a script interpreter. For
+too long have Haskellers felt shackled to bash or Python because it is just too
+hard to create reusable source-only Haskell scripts. Stack attempts to solve
+that.
+
+You can use `stack <file_name>` to execute a Haskell source file. Usually, the
+Stack command to be applied is specified using a special Haskell comment (the
+Stack interpreter options comment) at the start of the source file. That command
+is most often [`stack script`](../commands/script_command.md) but it can be, for
+example, [`stack runghc`](../commands/runghc_command.md). If there is no Stack
+interpreter options comment, Stack will warn that one was expected.
+
+An example will be easiest to understand. Consider the Haskell source file
+`turtle-example.hs` with contents:
+
+~~~haskell
+#!/usr/bin/env stack
+-- stack script --snapshot lts-24.55 --package turtle
+{-# LANGUAGE OverloadedStrings #-}
+import Turtle (echo)
+main = echo "Hello World!"
+~~~
+
+=== "Unix-like"
+
+    The first line beginning with the 'shebang' (`#!`) tells Unix to use Stack
+    as a script interpreter, if the file's permissions mark it as executable. A
+    shebang line is limited to a single argument, here `stack`.
+
+    The file's permissions can be set with command `chmod` and then it can be
+    run:
+
+    ~~~text
+    chmod +x turtle-example.hs
+    ./turtle-example.hs
+    ~~~
+
+    !!! note
+
+        On macOS:
+
+        - Avoid `{-# LANGUAGE CPP #-}` in Stack scripts; it breaks the shebang
+          line ([GHC #6132](https://gitlab.haskell.org/ghc/ghc/issues/6132))
+
+        - Use a compiled executable, not another script, in the shebang line.
+          Eg `#!/usr/bin/env runhaskell` will work but
+          `#!/usr/local/bin/runhaskell` would not.
+
+    Alternatively, the script can be run with command:
+
+    ~~~text
+    stack turtle-example.hs
+    ~~~
+
+=== "Windows"
+
+    The first line beginning with the 'shebang' (`#!`) has a meaning on
+    Unix-like operating systems but will be ignored by PowerShell. It can be
+    omitted on Windows. The script can be run with command:
+
+    ~~~text
+    stack turtle-example.hs
+    ~~~
+
+In both cases, the command yields:
+
+~~~text
+Hello World!
+~~~
+
+the first time after a little delay (as GHC is downloaded, if necessary, and
+dependencies are built) and subsequent times more promptly (as the runs are
+able to reuse everything already built).
+
+The second line of the source code is the Stack interpreter options comment. In
+this example, it specifies the [`stack script`](../commands/script_command.md)
+command with the options of a LTS Haskell 24.55 snapshot
+(`--snapshot lts-24.55`) and ensuring the
+[`turtle`](https://hackage.haskell.org/package/turtle) package is available
+(`--package turtle`). The version of the package will be that in the specified
+snapshot (`lts-24.55` provides `turtle-1.6.2`).
+
+## Arguments and interpreter options and arguments
+
+Arguments for the script can be specified on the command line after the file
+name: `stack <file_name> <arg1> <arg2> ...`.
+
+The Stack interpreter options comment must specify what would be a single valid
+Stack command at the command line if the file name were included as an argument,
+starting with `stack`. It can include `--` followed by arguments. In particular,
+the Stack command `stack <arg1> MyScript.hs <arg4>` with
+Stack interpreter options comment:
+
+~~~haskell
+-- stack <arg2> <command> <arg3> -- <arg5>
+~~~
+
+is equivalent to the following command at the command line:
+
+~~~text
+stack <arg1> <arg2> <command> <arg3> -- MyScript.hs <arg4> <arg5>
+~~~
+
+The Stack interpreter options comment must be the first line of the file, unless
+a shebang line is the first line, when the comment must be the second line. The
+comment must start in the first column of the line.
+
+When many options are needed, a block style comment that splits the command over
+more than one line may be more convenient and easier to read.
+
+For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`:
+
+~~~haskell
+#!/usr/bin/env stack
+{- stack script
+   --snapshot lts-24.55
+   --
+   +RTS -s -RTS
+-}
+import Data.List (intercalate)
+import System.Environment (getArgs)
+import Turtle (echo, fromString)
+
+main = do
+  args <- getArgs
+  echo $ fromString $ intercalate ", " args
+~~~
+
+is equivalent to the following command at the command line:
+
+~~~text
+stack script --snapshot lts-24.55 -- MyScript.hs arg1 arg2 +RTS -s -RTS
+~~~
+
+where `+RTS -s -RTS` are some of GHC's
+[runtime system (RTS) options](https://downloads.haskell.org/~ghc/latest/docs/users_guide/runtime_control.html).
+
+Arguments that include spaces can be quoted using double quotation marks.
+
+## Just-in-time compilation
+
+As with using [`stack script`](../commands/script_command.md) at the command
+line, you can pass the `--compile` flag to make Stack compile the script, and
+then run the compiled executable. Compilation is done quickly, without
+optimization. To compile with optimization, pass the `--optimize` flag instead.
+Compilation is done only if needed; if the executable already exists, and is
+newer than the script, Stack just runs the executable directly.
+
+This feature can be good for speed (your script runs faster) and also for
+durability (the executable remains runnable even if the script is disturbed, eg
+due to changes in your installed GHC/snapshots, changes to source files during
+git bisect, etc.)
+
+## Using multiple packages
+
+As with using [`stack script`](../commands/script_command.md) at the command
+line, you can also specify multiple packages, either with multiple `--package`
+options, or by providing a comma or space separated list. For example:
+
+~~~haskell
+#!/usr/bin/env stack
+{- stack script
+   --snapshot lts-24.55
+   --package turtle
+   --package "stm async"
+   --package http-client,http-conduit
+-}
+~~~
+
+## Using extra-deps
+
+As with using [`stack script`](../commands/script_command.md) at the command
+line, you can also specify one or more extra-deps using a valid YAML value for
+each. For example:
+
+~~~haskell
+#!/usr/bin/env stack
+{- stack script
+   --snapshot lts-24.55
+   --extra-dep acme-missiles-0.3@rev:0
+   --extra-dep "{git: git@github.com:yesodweb/wai, commit: '2f8a8e1b771829f4a8a77c0111352ce45a14c30f', subdirs: [auto-update, wai]}"
+-}
+~~~
+
+Relative paths to local archive files are assumed to be relative to the
+directory in which the script file is located.
+
+## Stack configuration for scripts
+
+When using the [`stack script`](../commands/script_command.md) command, as when
+using it at the command line, any project-level configuration file
+(`stack.yaml`, by default) (including in the `global-project` directory in the
+Stack root), including any specified by the options to the `stack script`
+command itself, is ignored.
+
+!!! info
+
+    Non-project level configuration options in global configuration files
+    (`config.yaml`), are not ignored by the
+    [`stack script`](../commands/script_command.md) command. Such options may be
+    useful if [`allow-newer`](../configure/yaml/non-project.md#allow-newer)
+    and/or
+    [`allow-newer-deps`](../configure/yaml/non-project.md#allow-newer-deps)
+    are required.
+
+When using the  [`stack runghc`](../commands/runghc_command.md) command, as when
+using it at the command line, if the current working directory is inside a
+project, then that project's project-level configuration file is effective when
+running the script. Otherwise the script uses the project-level configuration
+file in the `global-project` directory in the Stack root.
+
+## Testing scripts
+
+You can use the flag `--script-no-run-compile` on the command line to enable (it
+is disabled by default) the use of the `--no-run` option with
+[`stack script`](../commands/script_command.md) (and forcing the `--compile`
+option). The flag may help test that scripts compile in CI (continuous
+integration).
+
+For example, consider the following simple script, in a file named `Script.hs`,
+which makes use of the joke package
+[`acme-missiles`](https://hackage.haskell.org/package/acme-missiles):
+
+~~~haskell
+{- stack script
+   --snapshot lts-24.55
+   --package acme-missiles
+-}
+import Acme.Missiles (launchMissiles)
+
+main :: IO ()
+main = launchMissiles
+~~~
+
+The command `stack --script-no-run-compile Script.hs` then behaves as if the
+command
+`stack script --snapshot lts-24.55 --package acme-missiles --no-run --compile -- Script.hs`
+had been given. `Script.hs` is compiled (without optimisation) and the resulting
+executable is not run: no missiles are launched in the process!
+
+## Writing independent and reliable scripts
+
+The [`stack script`](../commands/script_command.md) command will automatically:
+
+* Install GHC and libraries, if missing.
+  [`stack script`](../commands/script_command.md) behaves as if the
+  `--install-ghc` flag had been passed at the command line.
+* Require that all packages used be explicitly stated on the command line.
+
+This ensures that your scripts are _independent_ of any prior deployment
+specific configuration, and are _reliable_ by using exactly the same version of
+all packages every time it runs so that the script does not break by
+accidentally using incompatible package versions.
+
+In earlier versions of Stack, the
+[`stack runghc`](../commands/runghc_command.md) command was used for scripts and
+can still be used in that way. In order to achieve the same effect with the
+[`stack runghc`](../commands/runghc_command.md) command, you can do the
+following:
+
+1. Use the `--install-ghc` option to install the compiler automatically
+2. Explicitly specify all packages required by the script using the `--package`
+   option. Use `-hide-all-packages` GHC option to force explicit specification
+   of all packages.
+3. Use the `--snapshot` Stack option to ensure a specific GHC version and
+   package set is used.
+
+It is possible for a project-level configuration file to affect
+[`stack runghc`](../commands/runghc_command.md). For that reason,
+[`stack script`](../commands/script_command.md) is strongly recommended. For
+those curious, here is an example with
+[`stack runghc`](../commands/runghc_command.md):
+
+~~~haskell
+#!/usr/bin/env stack
+{- stack
+  runghc
+  --install-ghc
+  --snapshot lts-24.55
+  --package base
+  --package turtle
+  --
+  -hide-all-packages
+  -}
+~~~
+
+The [`stack runghc`](../commands/runghc_command.md) command is still useful,
+especially when you are working on a project and want to access the package
+databases and configurations used by that project. See the next section for more
+information on configuration files.
+
+## Loading scripts in GHCi
+
+Sometimes you want to load your script in GHCi to play around with your program.
+In those cases, you can use `exec ghci` option in the script to achieve
+it. Here is an example:
+
+~~~haskell
+#!/usr/bin/env stack
+{- stack
+   exec ghci
+   --install-ghc
+   --snapshot lts-24.55
+   --package turtle
+-}
+~~~
diff --git a/doc/shell_autocompletion.md b/doc/topics/shell_autocompletion.md
similarity index 96%
rename from doc/shell_autocompletion.md
rename to doc/topics/shell_autocompletion.md
index 5499fa94f4..36aa72fd3e 100644
--- a/doc/shell_autocompletion.md
+++ b/doc/topics/shell_autocompletion.md
@@ -53,7 +53,7 @@ information, see issue
     stack --zsh-completion-script $(which stack)
     ~~~
 
-    You won't need to `source` this, but do update your `fpath`:
+    You will not need to `source` this, but do update your `fpath`:
 
     ~~~zsh
     fpath=($HOME/.config/zsh/completions $fpath)
diff --git a/doc/topics/snapshot_location.md b/doc/topics/snapshot_location.md
new file mode 100644
index 0000000000..efa62fbf13
--- /dev/null
+++ b/doc/topics/snapshot_location.md
@@ -0,0 +1,150 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+
+# Snapshot location
+
+[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
+
+This document describes the specification of a snapshot location:
+
+* **in YAML configuration files**, in the
+  [`snapshot`](../configure/yaml/project.md#snapshot) or
+  [`resolver`](../configure/yaml/project.md#resolver) (deprecated) key; or
+* **at the command line**, with the
+  [`--snapshot`](../configure/global_flags.md#-snapshot-option) or
+  [`--resolver`](../configure/global_flags.md#-resolver-option) (deprecated)
+  option.
+
+## In YAML configuration files
+
+!!! info
+
+    Stack uses the [Pantry](https://hackage.haskell.org/package/pantry) to
+    specify the location of snapshots. Pantry is geared towards reproducible
+    build plans with cryptographically secure specification of snapshots.
+
+There are four ways to specify a snapshot location:
+
+1.  Via a _convenience synonym_, which provides a short form for some common
+    URLs (see further below).
+
+    These are:
+
+    *   **Stackage LTS Haskell snapshots**, for example:
+
+        ~~~yaml
+        snapshot: lts-24.55
+        ~~~
+
+        ??? info "Expansion of `lts-X.Y`"
+
+            `lts-X.Y` is treated (by default) as:
+
+             ~~~text
+             github:commercialhaskell/stackage-snapshots:lts/X/Y.yaml
+             ~~~
+
+             and, consequently, expands to:
+
+             ~~~text
+             https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/X/Y.yaml
+             ~~~
+
+    *   **Stackage Nightly snapshots**, for example:
+
+        ~~~yaml
+        snapshot: nightly-2026-08-20
+        ~~~
+
+        ??? info "Expansion of `nightly-YYYY-MM-DD`"
+
+            `nightly-YYYY-MM-DD` is treated (by default) as:
+
+            ~~~text
+            github:commercialhaskell/stackage-snapshots:nightly/YYYY/M/D.yaml
+            ~~~
+
+            and, consequently (see below), expands to:
+
+            ~~~text
+            https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/YYYY/M/D.yaml
+            ~~~
+
+    *   **GitHub**: `github:user/repo:path` is treated as:
+
+        ~~~text
+        https://raw.githubusercontent.com/user/repo/master/path
+        ~~~
+
+    ??? info "Overriding the default snapshot location base"
+
+        By default, LTS Haskell and Stackage Nightly snapshot configurations are
+        retrieved from the `stackage-snapshots` GitHub repository of user
+        `commercialhaskell`. The
+        [snapshot-location-base](../configure/yaml/non-project.md#snapshot-location-base)
+        option allows a custom location to be set.
+
+2.  Via a **compiler version**, for example:
+
+    ~~~yaml
+    snapshot: ghc-9.10.3
+    ~~~
+
+    This snapshot specifies only a compiler version and, indirectly, its boot
+    packages.
+
+3.  Via a **URL** pointing to a snapshot configuration file, for example:
+
+    ~~~yaml
+    snapshot: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2026/5/29.yaml`
+    ~~~
+
+    For safer, more reproducible builds, you can optionally specify a URL
+    together with a cryptographic hash of its content. For example:
+
+    ~~~yaml
+    snapshot:
+      url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml
+      size:  729011
+      sha256: 3c412a7c13dba6d3d808455a458e0776c58b6cf99b8a7961a2f5e55589d6f1d6
+    ~~~
+
+    `size` is the number of bytes in the file and `sha256` is the file's SHA256
+    hash. If not provided, the information will automatically be generated and
+    stored in a [lock file](lock_files.md).
+
+4.  Via a relative or absolute **local file path** pointing to a snapshot
+    configuration file, for example:
+
+    ~~~yaml
+    snapshot: my-local-snapshot.yaml
+    ~~~
+
+    This can also be specified as:
+
+    ~~~yaml
+    snapshot:
+      filepath: my-local-snapshot.yaml
+    ~~~
+
+    This allows local file paths and covenience synonyms to be disambiguated.
+
+!!! note "Cyclic snapshot locations"
+
+    If Stack detects that snapshot locations form a cycle, it will report an
+    error.
+
+## At the command line
+
+As in YAML configuration files, a snapshot location can be specified via a
+convenience synoynm, a compiler version, a URL, or a local file path. In
+addition, at the command line only:
+
+*   `--snapshot lts-<major_version>` specifies the latest Stackage LTS Haskell
+    snapshot with the specified major version;
+*   `--snapshot lts` specifies, from those with the greatest major version, the
+    latest Stackage LTS Haskell snapshot;
+*   `--snapshot nightly` specifies the most recent Stackage Nightly snapshot;
+    and
+*   `--snapshot global` specifies the snapshot specified by the project-level
+    configuration file in the `global-project` directory in the
+    [Stack root](../topics/stack_root.md#global-project-directory).
diff --git a/doc/topics/stack_environment.md b/doc/topics/stack_environment.md
new file mode 100644
index 0000000000..d95eaaa79e
--- /dev/null
+++ b/doc/topics/stack_environment.md
@@ -0,0 +1,99 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+
+# Stack environment
+
+Command
+[`stack config env`](../commands/config_command.md#the-stack-config-env-command)
+or [`stack path --bin-path`](../commands/path_command.md) to see how the PATH is
+defined in the Stack environment.
+
+In that environment, Stack adds certain directories to the start of the PATH.
+The directories added are set out below, in order of search priority.
+
+!!! note
+
+    Stack does not automatically include its
+    [local binary directory](../configure/yaml/non-project.md#local-bin-path) on
+    the PATH in the Stack environment. Command
+    [`stack path --local-bin`](../commands/path_command.md) to see that
+    directory.
+
+## The project's `bin` directory
+
+The Stack [work directory](stack_work.md#project-stack-work-directory) for a
+project contains an `install` directory with a path to a directory (the local
+install root directory) containing a `bin` directory, containing built
+executable files. Command
+[`stack path --local-install-root`](../commands/path_command.md) to see the
+local install root directory.
+
+!!! info
+
+    Stack's [`build` command](../commands/build_command.md) installs built
+    executable files of project packages in this directory. Such files can be
+    executed using Stack's [`exec` command](../commands/exec_command.md).
+
+## The snapshot's `bin` directory
+
+The `bin` directory in the root directory for snapshot installation. Command
+[`stack path --snapshot-install-root`](../commands/path_command.md) to see that
+root directory.
+
+## The compiler tools directory
+
+When the directory is required or requested, Stack creates, in the
+[Stack root](stack_root.md#compiler-tools-directory-optional), a compiler tools
+directory for the specified compiler version. Command
+[`stack path --compiler-tools-bin`](../commands/path_command.md) to see that
+directory.
+
+!!! info
+
+    Stack's
+    [`build` command](../commands/build_command.md#-no-copy-compiler-tool-flag)
+    can be configured to install built executable files of project packages into
+    the
+    [compiler tools directory](stack_root.md#compiler-tools-directory-optional)
+    for the specified compiler version.
+
+!!! info
+
+    If you wish to override a tool that is co-located with the specified
+    compiler's executable file, put a copy of the alternative tool (or a link to
+    it) in the
+    [compiler tools directory](stack_root.md#compiler-tools-directory-optional)
+    for the specified compiler version. If that directory does not exist, it can
+    be created with Stack's
+    [`config compiler-tools` command](../commands/config_command.md#the-stack-config-compiler-tools-command).
+
+## The compiler binary's directory
+
+The directory in which the GHC executable file (binary) that will be used by
+Stack is located. Command
+[`stack path --compiler-bin`](../commands/path_command.md) to see that
+directory.
+
+## GHC's MinGW `bin` directory (Windows only)
+
+The GHC-supplied MinGW `bin` directory.
+
+## Stack-supplied MSYS2 environment `bin` directory (Windows only)
+
+The `bin` directory for the specified MSYS2 environment of the
+[Stack-supplied MSYS2](developing_on_windows.md).
+
+## Stack-supplied MSYS2 `usr\local\bin` directory (Windows only)
+
+The `usr\local\bin` directory for the
+[Stack-supplied MSYS2](developing_on_windows.md).
+
+## Stack-supplied MSYS2 `usr\bin` directory (Windows only)
+
+The `usr\bin` directory for the
+[Stack-supplied MSYS2](developing_on_windows.md).
+
+## Specified extra paths
+
+Any extra paths that have been configured using Stack's
+[`extra-paths`](../configure/yaml/non-project.md#extra-path) configuration
+option.
diff --git a/doc/topics/stack_root.md b/doc/topics/stack_root.md
new file mode 100644
index 0000000000..3192fa24d2
--- /dev/null
+++ b/doc/topics/stack_root.md
@@ -0,0 +1,332 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Stack root
+
+The Stack root is a directory where Stack stores important files.
+
+On Unix-like operating systems and Windows, Stack can be configured to follow
+the XDG Base Directory Specification if the environment variable `STACK_XDG` is
+set to any non-empty value. However, Stack will ignore that configuration if the
+Stack root location has been set on the command line or the `STACK_ROOT`
+environment variable exists.
+
+## Location
+
+The location of the Stack root depends on the operating system, whether Stack is
+configured to use the XDG Base Directory Specification, and/or whether an
+alternative location to Stack's default 'programs' directory has been specified.
+
+The location of the Stack root can be configured by setting the
+[`STACK_ROOT`](../configure/environment_variables.md#stack_root) environment
+variable or using Stack's
+[`--stack-root`](../configure/global_flags.md#-stack-root-option) option on the
+command line.
+
+=== "Unix-like"
+
+    The Stack root contains snapshot packages; (by default) tools such as GHC,
+    in a `programs` directory; Stack's global
+    [configuration](../configure/yaml/index.md) file (`config.yaml`); and
+    Stack's [`global-projects`](../configure/yaml/index.md) directory.
+
+    The default Stack root is `~/.stack`.
+
+=== "Windows"
+
+    The default Stack root is `$Env:APPDATA\stack`.
+
+    If the `LOCALAPPDATA` environment variable exists, then the default location
+    of tools is `$Env:LOCALAPPDATA\Programs\stack`. Otherwise, it is the
+    `programs` directory in the Stack root.
+
+    !!! warning
+
+        If there is a space character in the `$Env:LOCALAPPDATA` path (which may
+        be the case if the relevant user account name and its corresponding user
+        profile path have a space) this may cause problems with building
+        packages that make use of the GNU project's `autoconf` package and
+        `configure` shell script files. That may be the case particularly if
+        there is no corresponding short name ('8 dot 3' name) for the directory
+        in the path with the space (which may be the case if '8 dot 3' names
+        have been stripped or their creation not enabled by default). If there
+        are problems building, it will be necessary to override the default
+        location of Stack's 'programs' directory to specify an alternative path
+        that does not contain space characters. Examples of packages on
+        Hackage that make use of `configure` are `network` and `process`.
+
+    On Windows, the length of filepaths may be limited (to
+    [MAX_PATH](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd)),
+    and things can break when this limit is exceeded. Setting a Stack root with
+    a short path to its location (for example, `C:\sr`) can help.
+
+=== "Windows (Command Prompt)"
+
+    The default Stack root is `%APPDATA%\stack`.
+
+    If the `LOCALAPPDATA` environment variable exists, then the default location
+    of tools is `%LOCALAPPDATA%\Programs\stack`. Otherwise, it is the `programs`
+    directory in the Stack root.
+
+    !!! warning
+
+        If there is a space character in the `%LOCALAPPDATA%` path (which may be
+        the case if the relevant user account name and its corresponding user
+        profile path have a space) this may cause problems with building
+        packages that make use of the GNU project's `autoconf` package and
+        `configure` shell script files. That may be the case particularly if
+        there is no corresponding short name ('8 dot 3' name) for the directory
+        in the path with the space (which may be the case if '8 dot 3' names
+        have been stripped or their creation not enabled by default). If there
+        are problems building, it will be necessary to override the default
+        location of Stack's 'programs' directory to specify an alternative path
+        that does not contain space characters. Examples of packages on
+        Hackage that make use of `configure` are `network` and `process`.
+
+    On Windows, the length of filepaths may be limited (to
+    [MAX_PATH](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd)),
+    and things can break when this limit is exceeded. Setting a Stack root with
+    a short path to its location (for example, `C:\sr`) can help.
+
+=== "XDG Base Directory Specification"
+
+    The Stack root is `<XDG_DATA_HOME>/stack`. If the `XDG_DATA_HOME`
+    environment variable does not exist, the default is `~/.local/share/stack`
+    on Unix-like operating systems and `%APPDATA%\stack` on Windows.
+
+    The location of `config.yaml` is `<XDG_CONFIG_HOME>/stack`. If the
+    `XDG_CONFIG_HOME` environment variable does not exist, the default is
+    `~/.config/stack` on Unix-like operating systems and `%APPDATA%\stack` on
+    Windows.
+
+    This approach treats:
+
+    *   the project-level configuration file that is common to all projects
+        without another such file in their project directory or its ancestor
+        directories as _data_ rather than as part of Stack's own
+        _configuration_;
+
+    *   the snapshots database as essential data rather than as non-essential
+        data that would be part of a _cache_, notwithstanding that Stack will
+        rebuild that database as its contents are needed; and
+
+    *   the Pantry store as essential data rather than as non-essential data
+        that would be part of a _cache_, notwithstanding that Stack will
+        download the package index and rebuild the store if it is absent.
+
+An alternative to the default location of tools such as GHC can be specified
+with the
+[`local-programs-path`](../configure/yaml/non-project.md#local-programs-path)
+configuration option.
+
+The location of the Stack root is reported by command:
+
+~~~text
+stack path --stack-root
+~~~
+
+The full path of Stack's global configuration file is reported by command:
+
+~~~text
+stack path --global-config
+~~~
+
+The location of tools such as GHC for the current platform is reported by
+command:
+
+~~~text
+stack path --programs
+~~~
+
+## Contents
+
+The contents of the Stack root depend on the operating system, whether Stack is
+configured to use the XDG Base Directory Specification, and/or whether an
+alternative location to Stack's default 'programs' directory has been specified.
+
+=== "Unix-like"
+
+    The Stack root contains snapshot packages; (by default) tools such as GHC,
+    in a `programs` directory; Stack's global
+    [configuration](../configure/yaml/index.md) file (`config.yaml`); and
+    Stack's [`global-projects`](../configure/yaml/index.md) directory.
+
+=== "Windows"
+
+    The Stack root contains snapshot packages; Stack's global
+    [configuration](../configure/yaml/index.md) file (`config.yaml`); and
+    Stack's [`global-projects`](../configure/yaml/index.md) directory. The
+    default location of tools such as GHC and MSYS2 is outside of the Stack
+    root.
+
+=== "XDG Base Directory Specification"
+
+    If Stack is following the XDG Base Directory Specification, the Stack root
+    contains what it would otherwise contain for the operating system, but
+    Stack's global configuration file (`config.yaml`) may be located elsewhere.
+
+### `config.yaml`
+
+This is Stack's global configuration file. For further information, see the
+documentation for non-project specific
+[configuration](../configure/yaml/non-project.md#non-project-specific-configuration).
+
+If the file is deleted, and Stack needs to consult it, then Stack will create a
+file with default contents.
+
+### `stack.sqlite3`
+
+This is a 'user' database that Stack uses to cache certain information. The
+associated lock file is `stack.sqlite3.pantry-write-lock`.
+
+### `.stack-work` directory (optional)
+
+Stack can build when there is no project-level configuration file (including one
+in the `global-project` directory of the Stack root); for example, as a result
+of a [`stack script`](../commands/script_command.md) command (at the command
+line or in a [Stack interpreter options comment](scripts.md) in a Haskell script
+file). When it does so, the directory corresponding to a project directory is
+the Stack root. Stack will create its work directory, named `.stack-work` by
+default, in the Stack root.
+
+If the work directory is deleted, and Stack needs that work directory, then
+Stack will recreate it.
+
+### `compiler-tools` directory (optional)
+
+When it exists, this contains a directory for the platform. That directory
+contains (if it has been created) a directory for a compiler version
+that, in turn, contains a `bin` directory (the compiler tools directory for that
+compiler version).
+
+If the compiler tools directory for a specified compiler version does not exist,
+and Stack needs that directory, then Stack will create it. The directory can
+also be created using Stack's
+[`config compiler-tools` command](../commands/config_command.md#the-stack-config-compiler-tools-command)
+
+In the [Stack environment](stack_environment.md#the-compiler-tools-directory),
+the compiler tools directory for the specified compiler version is on the PATH.
+
+For further information see:
+
+* The [Stack environment](stack_environment.md#the-compiler-tools-directory);
+* Stack's [`path --compiler-tools-bin` command](../commands/path_command.md); and
+* Stack's
+  [`build --copy-compiler-tool` command](../commands/build_command.md#-no-copy-compiler-tool-flag).
+
+### `global-project` directory
+
+This contains:
+
+* an explanation of the directory (`README.txt`);
+* the project-level configuration file (`stack.yaml`) for the global project
+  and its associated lock file (`stack.yaml.lock`); and
+* if created, Stack's working directory (`.stack-work`) for the global project.
+
+If the project-level configuration file is deleted, and Stack needs to consult
+it, then Stack will recreate the contents of the directory.
+
+### `pantry\hackage` directory
+
+This contains a local cache of the package index. If the contents of the
+directory are deleted, and Stack needs to consult the package index, then Stack
+will seek to download the latest package index.
+
+!!! info
+
+    Stack depends on package `pantry` which, in turn, depends on package
+    `hackage-security`. The latter handles the local cache of the package index.
+    The type `CacheLayout` represents the location of the files that are cached.
+    `pantry` uses `cabalCacheLayout :: CacheLayout`, the layout that Cabal (the
+    tool) uses. That is what specifies the names of the files used to cache the
+    package index, including `00-index.tar` and `00-index.tar.gz`.
+
+### `pantry` directory
+
+This contains:
+
+* the Pantry database used by Stack (`pantry.sqlite3`) and its associated lock
+  file (`pantry.sqlite2.pantry-write-lock`). If the database is deleted, and
+  Stack needs to consult it, then Stack will seek to create and initialise it.
+  The database is initialised with information from the package index; and
+* a database of package versions that come with each version of GHC
+  (`global-hints-cache.yaml`).
+
+### `programs` directory
+
+This contains a directory for the platform. That directory contains for each
+installed Stack-supplied tool:
+
+* the archive file for the tool. This can be deleted;
+* a file indicating the tool is installed (`<tool_name>.installed`); and
+* a directory for the tool.
+
+To remove a Stack-supplied tool, delete all of the above. If Stack needs a
+Stack-supplied tool and it is unavailable, then Stack will seek to obtain it.
+
+### `scripts` directory (optional)
+
+If the `--compile` or `--optimize` and `--use-root` flags are used with the
+[`stack script`](../commands/script_command.md) command, then this contains:
+
+* script-specific locations, each containing all the compilation outputs
+  (inclduing the executable) generated by the command.
+
+If the `scripts` directory, or a script-specific location within it, is deleted,
+and Stack needs that directory, then Stack will recreate it.
+
+### `setup-exe-cache` directory
+
+This contains a directory for the platform. That directory contains, for each
+version of GHC (an associated version of Cabal (the library)) that Stack has
+used, an executable that Stack uses to access Cabal (the library).
+
+If the contents of the directory are deleted, and Stack needs the executable,
+then Stack will seek to rebuild it.
+
+### `setup-exe-src` directory
+
+See the documentation for the
+[`setup-exe-cache` directory](#setup-exe-cache-directory). This contains the two
+source files (`setup-<hash>.hs` and `setup-shim-<hash>.hs`) that Stack uses to
+build the executable.
+
+If the contents of the directory are deleted, and Stack needs the executable,
+then Stack will recreate them.
+
+The hash in the names of the source files is a hash of arguments passed to GHC
+when building the executable and the contents of the two source files.
+
+The content of the `setup-<hash>.hs` file is the familiar:
+
+~~~haskell
+import Distribution.Simple
+main = defaultMain
+~~~
+
+The content of the `setup-shim-<hash>.hs` file uses `main` except when the
+executable is called with arguments `repl` and `stack-initial-build-steps`. Then
+Stack uses Cabal (the library) to create the autogenerated files for every
+configured component. Stack's `stack ghci` or `stack repl` commands call the
+executable with those arguments.
+
+### `snapshots` directory
+
+This contains a directory for each snapshot that Stack creates when building
+immutable dependencies of projects.
+
+If the contents of the directory are deleted, and the snapshot is not available
+to Stack when it builds, then Stack will recreate the snapshot.
+
+### `templates` directory
+
+This contains a `.hsfile` for each project template that Stack has used. For
+further information, see the
+[`stack templates`](../commands/templates_command.md) command documentation.
+
+If the contents of the directory are deleted, an Stack needs a project template,
+then Stack will seek to download the template.
+
+### `upload` directory
+
+This may contain saved credentials for uploading packages to Hackage
+(`credentials.json`).
diff --git a/doc/topics/stack_work.md b/doc/topics/stack_work.md
new file mode 100644
index 0000000000..7f40180dbd
--- /dev/null
+++ b/doc/topics/stack_work.md
@@ -0,0 +1,153 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Stack work directories
+
+Stack work directories are directories within a local project or package
+directory in which Stack stores files created during the build process. Stack
+can be used without an understanding of the content of those directories. In
+particular, the [`stack exec`](../commands/exec_command.md) command sets up an
+environment where relevant subdirectories of the project Stack work directory
+are on the PATH.
+
+## Naming
+
+By default, Stack work directories are named `.stack-work`. The name can be
+overidden by:
+
+* the use of the
+  [`STACK_WORK` environment variable](../configure/environment_variables.md#stack_work);
+* the [`work-dir`](../configure/yaml/non-project.md#work-dir) non-project
+  specific configuration option; or
+* the [`--work-dir`](../configure/global_flags.md#-work-dir-option) command line
+  option.
+
+Given the location of Stack work directories, the name of the work directories
+must be a relative path to a directory.
+
+## Location
+
+If the work directory does not already exist, it will be created by the
+[`stack build`](../commands/build_command.md) command as a subdirectory of each
+project package directory and, if different, the project directory.
+
+## Project package Stack work directory
+
+The Stack work directory for a project package will contain a `dist` directory.
+This directory will contain a path to a directory containing:
+
+* a `build` directory;
+* a `package.conf.inplace` directory;
+* a `stack-build-caches` directory;
+* a `build-lock` file;
+* a `setup-config` file;
+* a `stack-cabal-mod` file. This file is used by Stack only for its modification
+  time;
+* a `stack-project-root` file. This file contains an absolute path to the
+  project root directory; and
+* a `stack-setup-config-mod` file. This file is used by Stack only for its
+  modification time.
+
+The directory, relative to the project package directory or the project
+directory, is the one reported by
+[`stack path --dist-dir`](../commands/path_command.md).
+
+=== "Unix-like"
+
+    On Unix-like operating systems, the path to the directory is a directory
+    named after the platform (including Stack's classification of variants of
+    Linux distributions) followed by a directory named after the GHC version.
+
+=== "Windows"
+
+    On Windows, the path to the directory is an eight-character hash of the
+    path that applies on Unix-like operating systems.
+
+## Project Stack work directory
+
+The Stack work directory for a project will contain:
+
+* a `stack.sqlite3` file (being a SQLite v3 database); and
+* a `stack.sqlite3.pantry-write-lock` file (used to ensure that only one
+  process is trying to write to the database at any time).
+
+The Stack work directory for a project will contain a `install` directory.
+This directory will contain a path to a directory containing:
+
+* a `bin` directory, containing built executable files;
+* a `doc` directory, containing a directory for each project package. This is
+  the directory reported by
+  [`stack path --local-doc-root`](../commands/path_command.md);
+* if the [`stack hpc`](../commands/hpc_command.md) command is used, a `hpc`
+  directory. This is the directory reported by
+  [`stack path --local-hpc-root`](../commands/path_command.md);
+* a `lib` directory, containing a directory named after the platform and the
+  GHC version and, within that, a directory for each project package; and
+* a `pkgdb` directory. This is the directory reported by
+  [`stack path --local-pkg-db`](../commands/path_command.md).
+
+The directory is the one reported by
+[`stack path --local-install-root`](../commands/path_command.md).
+
+=== "Unix-like"
+
+    On Unix-like operating systems, the path to the directory is a directory
+    named after the platform (including Stack's classification of variants of
+    Linux distributions) followed by a directory named after a SHA 256 hash
+    (see further below) followed by a directory named after the version number
+    of GHC.
+
+    The SHA 256 hash is a hash of the following information:
+
+    * the path to the specified compiler;
+    * the information about the compiler provided by `ghc --info`;
+    * the options that Stack passes to GHC for package that is not a project
+      package; and
+    * information about the immutable dependencies: their location, whether or
+      not Haddock documentation is to be built, their flags, their GHC options,
+      and their Cabal configuration options.
+
+    The options that Stack passes to GHC for a package that is not a project
+    package depend on:
+
+    * the specification of
+      [profiling](../commands/build_command.md#flags-affecting-ghcs-behaviour);
+    * the specification of
+      [stripping](../commands//build_command.md#flags-affecting-ghcs-behaviour);
+      and
+    * if
+      [`apply-ghc-options: everything`](../configure/yaml/non-project.md#apply-ghc-options)
+      is specified, any GHC command line options specified on the command line.
+
+    !!! note
+
+        As a consequence, the path reported by the following commands will
+        differ (and similarly for the paths established by the
+        [`stack exec`](../commands/exec_command.md) command):
+
+        ~~~text
+        stack path --local-install-root
+        stack --profile path --local-install-root
+        stack --no-strip path --local-install-root
+        stack --profile --no-strip path --local-install-root
+        ~~~
+
+=== "Windows"
+
+    On Windows, the path to the directory is an eight-character hash of the
+    path that applies on Unix-like operating systems.
+
+Following a `stack ghci` or `stack repl` command, the Stack work directory for
+a project will contain a `ghci` directory. This directory will contain paths to
+`cabal_macos.h` files that are generated automatically by Cabal.
+
+!!! note
+
+    Haskell Language Server makes use of the `stack ghci` command to obtain
+    information.
+
+If the [`stack hoogle`](../commands/hoogle_command.md) command is used, the
+Stack work directory for a project will contain a `hoogle` directory. This
+directory will contain a directory being the one reported by
+[`stack path --local-hoogle-root`](../commands/path_command.md). The naming of
+the path to the directory is same as for the path to the directory in the
+`install` directory.
diff --git a/doc/topics/stack_yaml_vs_cabal_package_file.md b/doc/topics/stack_yaml_vs_cabal_package_file.md
new file mode 100644
index 0000000000..16a5e39eb4
--- /dev/null
+++ b/doc/topics/stack_yaml_vs_cabal_package_file.md
@@ -0,0 +1,162 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# stack.yaml versus package.yaml versus a Cabal file
+
+What is the difference between a `stack.yaml` file, a `package.yaml` file and a
+Cabal file (named `<package_name>.cabal`)? This page aims to make that clear.
+
+In short:
+
+* `stack.yaml` contains project-level configuration for Stack, and may contain
+  project-specific options and non-project-specific options.
+
+* `package.yaml` contains a description of a package in the
+  [Hpack](https://github.com/sol/hpack) format. Hpack, including Stack's
+  built-in version, uses the file to create a Cabal file.
+
+* a Cabal file also contains a description of a package, but in the format used
+  by Cabal.
+
+## package.yaml versus a Cabal file
+
+Why two different formats to describe packages? Hpack is considered to have some
+advantages over the underlying Cabal format, which are explained its project
+repository. They include that the Hpack format supports YAML syntax and the
+automatic generation of the lists of `exposed-modules` used in the Cabal format.
+
+The remainder of this page will focus on the difference between a `stack.yaml`
+file and a package description file.
+
+## Package versus project
+
+Stack is a tool for building Haskell code and it uses Cabal, a build system.
+Cabal defines the concept of a _package_. A package has:
+
+* A name and version
+* optionally, one library
+* optionally, one or more executables
+* A Cabal file (or, as mentioned above, an [Hpack](https://github.com/sol/hpack)
+  `package.yaml` file that generates a Cabal file)
+* And a bunch more
+
+There is a one-to-one correspondence between a package and a Cabal file.
+
+Stack defines a new concept called a _project_. A project has:
+
+* A snapshot (more on this later)
+* Extra dependencies on top of the snapshot
+* Optionally, one or more local Cabal packages
+* Flag and GHC options configurations
+* And a bunch more Stack configuration
+
+Often you will have a project that defines only one local Cabal package that you
+are working on. If you need to specify a dependency, a source of confusion can
+be why you need to specify it both in the `stack.yaml` file _and_
+in the Cabal file. To explain, let us take a quick detour to talk about
+snapshots and how Stack resolves dependencies.
+
+## Snapshots
+
+Stack follows a rule that says, for any project, there is precisely one version
+of each package available. Obviously, for many packages there are _many_
+versions available in the world. But when resolving a `stack.yaml` file, Stack
+requires that you have chosen a specific version for each package available.
+
+The most common means by which this set of packages is defined is via a
+snapshot provided by Stackage. For example, if you go to the page
+<https://www.stackage.org/lts-24.55>, you will see a list of 3,442 packages at
+specific version numbers. When you then specify `snapshot: lts-24.55` you are
+telling Stack to use those package versions in resolving dependencies down to
+specific versions of packages.
+
+Sometimes a snapshot does not have all of the packages that you want. Or you
+want a different version of a package. Or you want to work on a local
+modification of a package. In all of those cases, you can add more configuration
+data to your `stack.yaml` file to override the values it received from your
+[`snapshot`](../configure/yaml/project.md#snapshot) setting. At the end of the
+day, each of your projects will end up with some way of resolving a package name
+into a specific version of that package.
+
+## Why specify dependencies twice?
+
+The package `acme-missiles` is not included in any Stackage snapshots. When you
+add something like this to your `stack.yaml` file:
+
+~~~yaml
+extra-deps:
+- acme-missiles-0.3
+~~~
+
+what you are saying to Stack is: "if at any point you find that you need to
+build the `acme-missiles` package, please use version `0.3`". You are _not_
+saying "please build `acme-missiles` now." You are also not saying "my package
+depends on `acme-missiles`." You are simply making it available should the need
+arise.
+
+When you add to your `package.yaml` file:
+
+~~~yaml
+dependencies:
+- acme-missiles
+~~~
+
+or, alternatively, you add directly to your Cabal file:
+
+~~~yaml
+build-depends: acme-missiles
+~~~
+
+you are saying "this package requires that `acme-missiles` be available." Since
+`acme-missiles` does not appear in your snapshot, without also modifying your
+`stack.yaml` to mention it via `extra-deps`, Stack will complain about the
+dependency being unavailable.
+
+You may challenge: but why go through all of that annoyance? Stack knows what
+package I want, why not just go grab it? The answer is that, if Stack just
+grabbed `acme-missiles` for you without it being specified in the `stack.yaml`
+somehow, you'd lose reproducibility. How would Stack know which version to use?
+It may elect to use the newest version, but if a new version is available in
+the future, will it automatically switch to that?
+
+Stack's core philosophy is that build plans are always reproducible. The
+purpose of the `stack.yaml` file is to define an immutable set of packages. No
+matter when in time you use it, and no matter how many new release happen in
+the interim, the build plan generated should be the same.
+
+(There is, however, at least one hole in this theory today, which is Hackage
+revisions. When you specify `extra-deps: [acme-missiles-0.3]`, it does not
+specify which revision of the Cabal file to use, and Stack will just choose the
+latest. Stack has the ability to specify exact revisions of Cabal files, but
+this is not enforced as a requirement, because it is so different from the way
+most people work with packages.)
+
+And now, how about the other side: why does Stack not automatically add
+`acme-missiles` to `build-depends` in your Cabal file if you add it as an
+extra-dep? There are a surprising number reasons for this:
+
+* The Cabal specification does not support anything like that
+* There can be multiple packages in a project, and how do we know which package
+  actually needs the dependency?
+* There can be multiple components (libraries, executable, etc) in a package,
+  and how do we know which of those actually needs the dependency?
+* The dependency may only be conditionally needed, based on flags, operating
+  system, or architecture. As an extreme example, we would not want a Linux-only
+  package to be built by force on Windows.
+
+While for simple use cases it seems like automatically adding dependencies from
+the Cabal file to the `stack.yaml` file or vice-versa would be a good thing, it
+breaks down immediately for any semi-difficult case. Therefore, Stack requires
+you to add it to both places.
+
+And a final note, in case it was not clear. The example above used
+`acme-missiles`, which is not in Stackage snapshots. If, however, you want to
+depend on a package already present in the snapshot you have selected, there is
+no need to add it explicitly to your `stack.yaml` file: it is already there
+implicitly via the `snapshot` setting. This is what you do the majority of the
+time, such as when you add `vector` or `mtl` as a `build-depends` value.
+
+## Should I check-in automatically generated Cabal files?
+
+Yes, you should. This recommendation was changed in
+[issue #5210](https://github.com/commercialhaskell/stack/issues/5210). Please
+see the discussion there.
diff --git a/doc/travis_ci.md b/doc/topics/travis_ci.md
similarity index 91%
rename from doc/travis_ci.md
rename to doc/topics/travis_ci.md
index c8ba59706a..0906bb5161 100644
--- a/doc/travis_ci.md
+++ b/doc/topics/travis_ci.md
@@ -7,11 +7,11 @@ This page documents how to use Stack on
 familiarity with Travis. We provide two fully baked example files
 ready to be used on your projects:
 
-* [The simple Travis configuration](https://raw.githubusercontent.com/commercialhaskell/stack/stable/doc/travis-simple.yml)
+* [The simple Travis configuration](https://raw.githubusercontent.com/commercialhaskell/stack/stable/doc/resources/travis-simple.yml)
   is intended for applications that do not require multiple GHC
   support or cross-platform support. It builds and tests your project
   with just the settings present in your `stack.yaml` file.
-* [The complex Travis configuration](https://raw.githubusercontent.com/commercialhaskell/stack/stable/doc/travis-complex.yml)
+* [The complex Travis configuration](https://raw.githubusercontent.com/commercialhaskell/stack/stable/doc/resources/travis-complex.yml)
   is intended for projects that need to support multiple GHC versions
   and multiple OSes, such as open source libraries to be released to
   Hackage. It tests against cabal-install, as well as Stack on Linux
@@ -22,19 +22,19 @@ ready to be used on your projects:
         It is likely going to be necessary to modify this configuration to match
         the needs of your project, such as tweaking the build matrix to alter
         which GHC versions you test against, or to specify GHC-version-specific
-        `stack.yaml` files if necessary. Don't be surprised if it doesn't work
+        `stack.yaml` files if necessary. Do not be surprised if it does not work
         the first time around. See the multiple GHC section below for more
         information.
 
 Each of these configurations is ready to be used immediately, just
 copy-paste the content into the `.travis.yml` file in the root or your
-repo, enable Travis on the repo, and you're good to go.
+repo, enable Travis on the repo, and you are good to go.
 
 You may also be interested in using AppVeyor, which supports Windows
-builds, for more cross-platform testing. There's a
+builds, for more cross-platform testing. There is a
 [short blog post available on how to do this](http://www.snoyman.com/blog/2016/08/appveyor-haskell-windows-ci),
 or just copy in
-[the appveyor.yml file](https://raw.githubusercontent.com/commercialhaskell/stack/stable/doc/appveyor.yml)
+[the appveyor.yml file](https://raw.githubusercontent.com/commercialhaskell/stack/stable/doc/resources/appveyor.yml)
 
 The rest of this document explains the details of common Travis
 configurations for those of you who want to tweak the above
@@ -105,7 +105,7 @@ addons:
 
 ### Multiple GHC - parametrised builds
 
-Travis apt plugin doesn't yet support installing apt packages dynamically
+Travis apt plugin does not yet support installing apt packages dynamically
 (https://github.com/travis-ci/travis-ci/issues/4291). That for we need to write
 a bit repetitive `.travis.yml`.
 
@@ -157,7 +157,7 @@ script:
   - stack --no-terminal --skip-ghc-check test
 ~~~
 
-In case you're wondering: we need `--no-terminal` because stack does some fancy
+In case you are wondering: we need `--no-terminal` because stack does some fancy
 sticky display on smart terminals to give nicer status and progress messages,
 and the terminal detection is broken on Travis.
 
diff --git a/doc/tutorial/building_existing_projects.md b/doc/tutorial/building_existing_projects.md
new file mode 100644
index 0000000000..6ffce44af2
--- /dev/null
+++ b/doc/tutorial/building_existing_projects.md
@@ -0,0 +1,151 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 5. Building existing projects
+
+So far, we have been building simple projects. Let us now take an open source
+package and try to build it. We will be ambitious and use
+[yackage](https://hackage.haskell.org/package/yackage), a local package server
+using [Yesod](http://www.yesodweb.com/). To get the code, we will use the
+`stack unpack` command run from the root directory for all our Haskell projects:
+
+~~~text
+stack unpack yackage
+Unpacked yackage-0.8.1 to <root_directory>/yackage-0.8.1/
+~~~
+
+You can also unpack to a directory of your liking instead of the current one
+by commanding:
+
+~~~text
+stack unpack yackage --to <desired_directory>
+~~~
+
+This will create a `yackage-0.8.1` directory inside `<desired_directory>`.
+
+We will change to that directory, with the command:
+
+~~~text
+cd yackage-0.8.1
+~~~
+
+## The `stack init` command
+
+This new directory does not have a `stack.yaml` file, so we need to make one
+first. We could do it by hand, but let us be lazy instead with the `stack init`
+command:
+
+~~~text
+stack init
+# init output ...
+~~~
+
+`stack init` does quite a few things for you behind the scenes:
+
+* Finds all of the Cabal files in your current directory and subdirectories
+  (unless you use `--ignore-subdirs`) and determines the packages and versions
+  they require
+* Finds the best combination of snapshot and package flags that allows
+  everything to compile with minimum external dependencies
+* It tries to look for the best matching snapshot from latest LTS, latest
+  nightly, other LTS versions in that order
+
+Assuming it finds a match, it will write your `stack.yaml` file, and everything
+will work.
+
+!!! note
+
+    The `yackage` package does not currently support Hpack, but you can also use
+    `hpack-convert` should you need to generate a `package.yaml` file.
+
+### Excluded Packages
+
+Sometimes multiple packages in your project may have conflicting requirements.
+In that case `stack init` will fail, so what do you do?
+
+You could manually create `stack.yaml` by omitting some packages to resolve the
+conflict. Alternatively you can ask `stack init` to do that for you by
+specifying `--omit-packages` flag on the command line. Let us see how that
+works.
+
+To simulate a conflict we will use `acme-missiles-0.3` in `yackage` and we will
+also copy `yackage.cabal` to another directory and change the name of the file
+and package to `yackage-test`. In this new package we will use
+`acme-missiles-0.2` instead. Let us see what happens when we command
+`stack init` again:
+
+~~~text
+stack init --force --omit-packages
+# init failure output ...
+~~~
+
+Looking at `stack.yaml`, you will see that the excluded packages have been
+commented out under the `packages` key. In case wrong packages are excluded
+you can uncomment the right one and comment the other one.
+
+Packages may get excluded due to conflicting requirements among user packages or
+due to conflicting requirements between a user package and the snapshot
+compiler. If all of the packages have a conflict with the compiler then all of
+them may get commented out.
+
+When packages are commented out you will see a warning every time you run a
+command which needs the configuration file. The warning can be disabled by
+editing the configuration file and removing it.
+
+### Using a specific snapshot
+
+Sometimes you may want to use a specific snapshot for your project instead of
+`stack init` picking one for you. You can do that by using
+`stack init --snapshot <snapshot>`.
+
+You can also init with a compiler snapshot if you do not want to use a
+Stackage snapshot. That will result in all of your project's dependencies being
+put under the `extra-deps` section.
+
+### Installing the compiler
+
+Stack will automatically install the compiler when you run `stack build` but you
+can manually specify the compiler by running `stack setup <GHC-VERSION>`.
+
+### Miscellaneous and diagnostics
+
+_Add selected packages_: If you want to use only selected packages from your
+project directory you can do so by explicitly specifying the package directories
+on the command line.
+
+_Duplicate package names_: If multiple packages under the directory tree have
+same name, `stack init` will report those and automatically ignore one of them.
+
+_Ignore subdirectories_: By default `stack init` searches all the subdirectories
+for Cabal files. If you do not want that then you can use `--ignore-subdirs`
+command line switch.
+
+_Cabal warnings_: `stack init` will show warnings if there were issues in
+reading a Cabal file. You may want to pay attention to the warnings as sometimes
+they may result in incomprehensible errors later on during dependency solving.
+
+_Package naming_: If the `name` field defined in a Cabal file does not match
+with the Cabal file name then `stack init` will refuse to continue.
+
+_User warnings_: When packages are excluded or external dependencies added Stack
+will show warnings every time the configuration file is loaded. You can suppress
+the warnings by editing the configuration file and removing the warnings from
+it. If you command:
+
+~~~text
+stack build
+~~~
+
+you may see something like this:
+
+~~~text
+Warning: Warnings (added by new or init): Some packages were found to be
+         incompatible with the snapshot and have been left commented out in the
+         packages section.
+
+         Warning (added by new or init): Specified snapshot could not satisfy
+         all dependencies. Some external packages have been added as
+         dependencies.
+
+        You can omit this message by removing it from the project-level
+        configuration file.
+~~~
diff --git a/doc/tutorial/building_your_project.md b/doc/tutorial/building_your_project.md
new file mode 100644
index 0000000000..7cf70edb81
--- /dev/null
+++ b/doc/tutorial/building_your_project.md
@@ -0,0 +1,346 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 4. Building your project
+
+The [`stack build`](../commands/build_command.md) command is the heart of Stack.
+It is the engine that powers building your code, testing it, getting
+dependencies, and more. Much of the remainder of this getting started guide will
+cover its features.
+
+!!! note
+
+    Using the `build` command twice with the same options and arguments should
+    generally do nothing (besides things like rerunning test suites), and
+    should, in general, produce a reproducible result between different runs.
+
+## Adding dependencies
+
+A Haskell package often depends on code exposed by other Haskell packages.
+
+Let us say we decide to modify our existing `helloworld` package source code to
+use a new library, the one provided by the
+[`text`](https://hackage.haskell.org/package/text) package.
+
+We can modify `src/Lib.hs` so that its contents are as follows (click
+:material-plus-circle: to learn more):
+
+~~~haskell
+{-# LANGUAGE OverloadedStrings #-} -- (1)!
+
+module Lib
+    ( someFunc
+    ) where
+
+import qualified Data.Text.IO as T -- (2)!
+
+someFunc :: IO ()
+someFunc = T.putStrLn "someFunc" --(3)!
+~~~
+
+1.  Enables overloaded string literals. String literals now have type
+    `(IsString a) => a`.
+
+2.  The module is exposed by the library of the `text` package.
+
+3.  `Data.Text.IO.putStrLn :: Text -> IO ()`.
+
+If we command:
+
+~~~text
+stack build
+~~~
+
+Stack will report Stack error [S-7282] during the build, with output like the
+following:
+
+~~~text
+...
+Building library for helloworld-0.1.0.0..
+[1 of 2] Compiling Lib [Source file changed]
+
+src\Lib.hs:7:1: error:
+    Could not load module ‘Data.Text.IO’
+    It is a member of the hidden package ‘text-2.0.2’.
+    Perhaps you need to add ‘text’ to the build-depends in your .cabal file.
+    Use -v (or `:set -v` in ghci) to see a list of the files searched for.
+  |
+7 | import qualified Data.Text.IO as T
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Error: [S-7282]
+       Stack failed to execute the build plan.
+
+       While executing the build plan, Stack encountered the error:
+
+       [S-7011]
+       While building package helloworld-0.1.0.0 (scroll up to its section to
+       see the error) using:
+       ...
+       Process exited with code: ExitFailure 1
+~~~
+
+The error `Could not load module ...` means that the package exposing the module
+in question is not available.
+
+To tell Stack that the `text` package is a dependency of the `helloworld`
+package, you need to update the package description file (`package.yaml`).
+Specifically, you need to add `text` under the `dependencies` key, like this:
+
+~~~yaml
+dependencies:
+- base >= 4.7 && < 5
+- text # added
+~~~
+
+Now, if we command:
+
+~~~text
+stack build
+~~~
+
+we should get a successful result.
+
+The output means that the `text` package was downloaded, configured, built, and
+locally installed. Once that was done, we moved on to building our project
+package (`helloworld`). At no point did we need to ask Stack to build
+dependencies — it does so automatically.
+
+## Listing dependencies
+
+Let us have Stack add a few more dependencies to our project. First, we will
+include two new packages in the `dependencies` section for our library in our
+`package.yaml`:
+
+~~~yaml
+dependencies:
+- base >= 4.7 && < 5
+- text
+- filepath # added
+- containers # added
+~~~
+
+After adding these two dependencies, we can again command:
+
+~~~text
+stack build
+~~~
+
+to have them downloaded, configured, built, and locally installed.
+
+To find out which versions of these packages Stack installed, we can command:
+
+~~~text
+stack ls dependencies
+~~~
+
+## Packages not in the snapshot
+
+The packages `text`, `filepath` and `containers` have something in common: they
+are all provided with GHC (referred to as GHC boot packages).
+
+Let us try a dependency on a more off-the-beaten-track package: the joke
+[acme-missiles](http://www.stackage.org/package/acme-missiles) package.
+
+We can further modify `src/Lib.hs` so that its contents are as follows:
+
+~~~haskell
+module Lib
+    ( someFunc
+    ) where
+
+import Acme.Missiles ( launchMissiles )
+
+someFunc :: IO ()
+someFunc = launchMissiles
+~~~
+
+As before, to tell Stack that the `acme-missiles` package is a dependency of the
+`helloworld` package, we must update the package description file
+(`package.yaml`). The relevant part of that file now looks like this:
+
+~~~yaml
+dependencies:
+- base >= 4.7 && < 5
+- text
+- filepath
+- containers
+- acme-missiles # added
+~~~
+
+However, if we command:
+
+~~~text
+stack build
+~~~
+
+Stack will report Stack error [S-4804] during the build, with output like the
+following:
+
+~~~text
+Error: [S-4804]
+       Stack failed to construct a build plan.
+
+       While constructing the build plan, Stack encountered the following
+       errors. The 'Stack configuration' refers to the set of package versions
+       specified by the snapshot (after any dropped packages, or pruned GHC boot
+       packages; if a boot package is replaced, Stack prunes all other such
+       packages that depend on it) and any extra-deps:
+
+       In the dependencies for helloworld-0.1.0.0:
+         * acme-missiles needed, but no version is in the Stack configuration
+           (latest matching version is 0.3).
+       The above is/are needed since helloworld is a build target.
+
+       Some different approaches to resolving some or all of this:
+
+         * Recommended action: try adding the following to your extra-deps in
+           ...\helloworld\stack.yaml (project-level configuration):
+
+           - acme-missiles-0.3@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a6
+87d45965778deb8694c5d1,613
+~~~
+
+The error message explains that Stack was unable to construct a build plan and
+why: the package `acme-missiles` was needed but no version of that package is
+in the set of package versions specified by the snapshot. Stack makes a
+suggestion to fix that.
+
+This brings us to the next major topic in using Stack.
+
+## Extending snapshots
+
+A snapshot specifies a version of GHC and a set of package versions chosen to
+work well together. However, sometimes you will want to use package versions
+that are not specified by the snapshot. That may be because the package is not
+in the snapshot or because a different version of the package is in the
+snapshot.
+
+Remember above when `stack new` selected some
+[LTS snapshot](https://github.com/commercialhaskell/lts-haskell#readme) for us?
+That defined our build plan and available packages. When we tried using the
+`text` package, it just worked, because it was part of the LTS *package set*.
+
+We have updated the description of the `helloworld` package (in `package.yaml`)
+to specify that it depends on the `acme-missiles` package, but `acme-missiles`
+is not a member of the set of package versions specified by the snapshot. So
+building failed.
+
+To add a version of `acme-missiles` to the available package versions, we will
+use the `extra-deps` key in Stack's project-level configuration file
+(`stack.yaml`). That key defines extra package versions, not present in the
+snapshot, that will be needed as dependencies. You can add this like so:
+
+~~~yaml
+extra-deps:
+- acme-missiles-0.3 # not in the LTS snapshot
+~~~
+
+Now, if we command:
+
+~~~text
+stack build
+~~~
+
+we should get a successful result.
+
+## Stackage snapshots
+
+With that out of the way, let us dig a little bit more into these snapshots. We
+mentioned the LTS snapshots, and you can get information about it at
+[https://www.stackage.org/lts](https://www.stackage.org/lts), including:
+
+* The appropriate value (`lts-24.55`, as is currently the latest LTS)
+* The GHC version used
+* A full list of all packages versions available in this snapshot
+* The ability to perform a Hoogle search on the packages in this snapshot
+* A [list of all modules](https://www.stackage.org/lts/docs) in a snapshot,
+  which can be useful when trying to determine which package to add to your
+  `package.yaml` file.
+
+You can also see a
+[list of all available snapshots](https://www.stackage.org/snapshots). You will
+notice two flavors: LTS (for "Long Term Support") and Nightly. You can read more
+about them on the
+[LTS Haskell GitHub page](https://github.com/commercialhaskell/lts-haskell#readme).
+If you are not sure which to use, start with LTS Haskell (which Stack will lean
+towards by default as well).
+
+## Snapshots and GHC versions
+
+As mentioned, a snapshot specifies a version of GHC as well as a set of package
+versions.
+
+??? question "I want to use a particular version of GHC. What snapshot should I use?"
+
+    For each supported version of GHC, the Stackage
+    [homepage](https://www.stackage.org/) lists the most recent Stackage
+    snapshot. In most cases, that is the snapshot you should use.
+
+??? question "Can I use a snapshot like `ghc-9.10.3`?"
+
+    Snapshot `ghc-9.10.3` specifies GHC 9.10.3 and, consequently, the GHC boot
+    packages that come with that compiler. However, the snapshot does not
+    include the many other package versions that will work with that compiler.
+    For a set of those package versions, see the snapshots published by the
+    [Stackage](https://www.stackage.org/) project.
+
+Let us try using an older Stackage LTS Haskell snapshot. We will use the LTS
+22.43 snapshot with the command:
+
+~~~text
+stack --snapshot lts-22.43 build
+~~~
+
+Stackage LTS Haskell 22.43 specifies GHC 9.6.6. If that version of GHC is not
+already available, Stack will try to fetch it and install it before starting the
+rest of the build.
+
+## Specifying a snapshot
+
+A snapshot must be specified in Stack's project-level configuration file
+(`stack.yaml`, by default). For further information, see the
+[`snapshot`](../configure/yaml/project.md#snapshot) project-specific
+configuration option documentation.
+
+As we have seen, a snapshot can also be specified on the command line. That can
+be useful in a Continuous Integration (CI) setting.
+
+When passed on the command line, you also get some additional "short-cut"
+versions of snapshots: `--snapshot nightly` will use the newest Nightly snapshot
+available, `--snapshot lts` will use the newest LTS, and `--snapshot lts-22`
+will use the newest LTS in the 22.x series. The reason these are only available
+on the command line and not in your `stack.yaml` file is that using them:
+
+1. Will slow down your build (since Stack then needs to download information on
+   the latest available LTS each time it builds)
+2. Produces unreliable results (since a build run today may proceed differently
+   tomorrow because of changes outside of your control)
+
+## Cleaning up your project
+
+Stack creates files during the build process and stores those files in
+directories within a local project or package directory known as
+[Stack work directories](../topics/stack_work.md). Stack can be used without an
+understanding of the content of those directories.
+
+if you wish, you can clean up files created during the build process for your
+project using the `stack clean` and `stack purge` commands.
+
+### The `stack clean` command
+
+`stack clean` deletes the local working directories containing compiler output.
+By default, that means the contents of directories in `.stack-work/dist`, for
+all the `.stack-work` directories within a project.
+
+Use `stack clean <specific-package>` to delete the output for the package
+_specific-package_ only.
+
+### The `stack purge` command
+
+`stack purge` deletes the local stack working directories, including extra-deps,
+git dependencies and the compiler output (including logs). It does not delete
+any snapshot packages, compilers or programs installed using `stack install`.
+This essentially reverts the project to a completely fresh state, as if it had
+never been built.
+
+`stack purge` is a shortcut for `stack clean --full`.
diff --git a/doc/tutorial/cabal_flags_and_ghc_options.md b/doc/tutorial/cabal_flags_and_ghc_options.md
new file mode 100644
index 0000000000..2878761f2e
--- /dev/null
+++ b/doc/tutorial/cabal_flags_and_ghc_options.md
@@ -0,0 +1,165 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 10. Cabal flags and GHC options
+
+There are two common ways to affect how a package will be built: with Cabal
+flags and with GHC options.
+
+## Cabal flags
+
+A package description may specify one or more Cabal flags:
+
+=== "Cabal file"
+
+    ~~~text
+    flag my-flag-name
+      description: My (optional) description of my flag.
+      default: false -- Optional: the default value is true
+      manual: true -- Optional: the default value is false
+    ~~~
+
+=== "`package.yaml` (Hpack)"
+
+    ~~~yaml
+    flags:
+      my-flag-name:
+        description: My (optional) description of my flag.
+        default: true # Required
+        manual: false # Required
+    ~~~
+
+??? question "How does `manual: false` affect Stack's builds?"
+
+    `manual: false` has different implications for Cabal and Stack. Cabal tries
+    to 'solve' dependencies using the flag’s default value and, if it can't,
+    tries again with the negated default value. Stack emphasises reproducible
+    builds. It only tries to build with the flag's default value and, if it
+    can't, reports that it can't.
+
+Cabal flags can be set or unset at the command line or as a project-specific
+Stack option.
+
+To set or unset a Cabal flag at the command line, we can use the `--flag`
+option. The `yackage` package has an `upload` flag that is enabled by default.
+We can command:
+
+~~~text
+stack build --flag yackage:-upload
+~~~
+
+This means: when compiling the `yackage` package, turn off the `upload` Cabal
+flag (thus the `-` in `-upload`). Unlike other tools, Stack is explicit about
+which package's flag you want to change. It does this for two reasons:
+
+1. There is no global meaning for Cabal flags, and therefore two packages can
+   use the same flag name for completely different things.
+
+2. By following this approach, we can avoid unnecessarily recompiling snapshot
+   packages that happen to use a Cabal flag that we are using.
+
+You can also change Cabal flag values on the command line for extra-dep and
+snapshot packages. If you do this, that package will automatically be promoted
+to an extra-dep, since the build plan is different than what the plan snapshot
+definition would entail.
+
+If you have Cabal flags that you will be setting regularly when building your
+packages, you can add them to your Stack project-level configuration file
+(`stack.yaml`). For more information, see the
+[flags](../configure/yaml/project.md#flags) project-specific configuration
+option documentation.
+
+## GHC options
+
+GHC options can be specified at the command line or as an non-project specific
+Stack option.
+
+At the command line, consider the command:
+
+~~~text
+stack build --ghc-options="-Wall -Werror"
+~~~
+
+or, equivalently:
+
+~~~text
+stack build --ghc-options=--pedantic
+~~~
+
+By default, this will set GHC's `-Wall` and `-Werror` options for all *project
+packages*. This will not, however, affect other packages at all. This design
+provides us with reproducible and fast builds.
+
+??? question "Can GHC options for other packages be specified at the command line?"
+
+    Yes, GHC options can be specified at the command line for all packages or
+    only project packages that are targets. For further information, see the
+    documentation for the
+    [apply-ghc-options](../configure/yaml/non-project.md#apply-ghc-options)
+    non-project specific configuration option.
+
+??? question "What if GHC options specified at the command line apply only to targets?"
+
+    By changing the default using the
+    [apply-ghc-options](../configure/yaml/non-project.md#apply-ghc-options)
+    configuration option, it is possble to specify that GHC options at the
+    command line apply only to project packages that are *targets*. If this is
+    done and you change your targets, the options will no longer apply to other
+    project packages.
+
+    Let us consider an example from the `wai` repository, which includes the
+    `wai` and `warp` packages, the latter depending on the former. If we
+    command:
+
+    ~~~text
+    stack build --ghc-options=-O0 wai
+    ~~~
+
+    Stack will build all of the dependencies of `wai` (inclduding `warp`) and then
+    build `wai` with all GHC optimizations disabled.
+
+    Now let us add `warp` as a target. If we command:
+
+    ~~~text
+    stack build --ghc-options=-O0 wai warp
+    ~~~
+
+    this builds the additional dependencies for `warp`, and then builds `warp`
+    with GHC optimizations disabled. Importantly, Stack does not rebuild `wai`,
+    since `wai`'s configuration has not been altered.
+
+    Now the surprising case. If we command:
+
+    ~~~text
+    stack build --ghc-options=-O0 warp
+    ~~~
+
+    you may expect this to do nothing, as neither `wai` nor `warp` has changed.
+    However, Stack will rebuild `wai` with GHC optimizations enabled again, and
+    then rebuild `warp` (with optimizations disabled) against this newly-built
+    `wai`. The reason is reproducible builds. If we had never built `wai` or
+    `warp` before, trying to build `warp` would require building all of its
+    dependencies, and it would do so with default GHC options (that is, GHC
+    optimizations enabled). These dependencies would include `wai`. So when we
+    command:
+
+    ~~~text
+    stack build --ghc-options=-O0 warp
+    ~~~
+
+    we want Stack's behavior to be unaffected by any previous build steps we
+    took.
+
+If you have GHC options that you will be applying regularly when building your
+packages, you can add them to your Stack project-level configuration file
+(`stack.yaml`) or (if applicable) to a
+[global Stack configuration file](../configure/yaml/index.md#project-level-and-global-configuration-files).
+For more information, see the
+[ghc-options](../configure/yaml/non-project.md#ghc-options) non-project specific
+configuration option documentation.
+
+??? question "Can Stack be configured to specify GHC options for specific packages?"
+
+    Yes, Stack can be configured to specify GHC options for specific packages,
+    either globally or at the project level. For more information, see the
+    [ghc-options](../configure/yaml/non-project.md#ghc-options) non-project
+    specific configuration option documentation.
diff --git a/doc/tutorial/executing_commands.md b/doc/tutorial/executing_commands.md
new file mode 100644
index 0000000000..6d7fb9c8b8
--- /dev/null
+++ b/doc/tutorial/executing_commands.md
@@ -0,0 +1,62 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 12. Executing commands
+
+We have already used `stack exec` multiple times in this guide. As you have
+likely already guessed, it allows you to run executables, but with a slightly
+modified environment.
+
+## The `stack exec` command
+
+In particular: `stack exec` looks for executables on Stack's bin
+paths, and sets a few additional environment variables (like adding those paths
+to the PATH, and setting `GHC_PACKAGE_PATH`, which tells GHC which package
+databases to use).
+
+If you want to see exactly what the modified environment looks like, try
+command:
+
+~~~text
+stack exec env
+~~~
+
+The only issue is how to distinguish flags to be passed to Stack versus those
+for the underlying program. Thanks to the `optparse-applicative` library, Stack
+follows the Unix convention of `--` to separate these. For example, command:
+
+~~~text
+stack exec --package stm -- echo I installed the stm package via --package stm
+~~~
+
+yields output like:
+
+~~~text
+Writing the configuration file for the implicit global project to:
+.../global-project/stack.yaml. Note: You can change the snapshot via the
+snapshot key there.
+Using the latest snapshot lts-24.55.
+I installed the stm package via --package stm
+~~~
+
+Flags worth mentioning:
+
+* `--package foo` can be used to force a package to be installed before running
+  the given command.
+* `--no-ghc-package-path` can be used to stop the `GHC_PACKAGE_PATH` environment
+  variable from being set. Some tools — notably Cabal (the tool) — do not behave
+  well with that variable set.
+
+You may also find it convenient to use `stack exec` to launch a subshell
+(substitute `bash` with your preferred shell) where your compiled executable is
+available at the front of your PATH. Command:
+
+~~~text
+stack exec bash
+~~~
+
+## The `stack ghc` and `stack runghc` commands
+
+You will sometimes want to just compile (or run) a single Haskell source file,
+instead of creating an entire Cabal package for it. You can use `stack exec ghc`
+or `stack exec runghc` for that. As simple helpers, we also provide the
+`stack ghc` and `stack runghc` commands, for these common cases.
diff --git a/doc/tutorial/hello_world_example.md b/doc/tutorial/hello_world_example.md
new file mode 100644
index 0000000000..722ba5afa3
--- /dev/null
+++ b/doc/tutorial/hello_world_example.md
@@ -0,0 +1,406 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 1. A Hello World example
+
+With Stack installed, we will create a new Stack project and walk through the
+most common Stack commands. First, let us look at other foundations for getting
+started with Haskell.
+
+## Foundations
+
+Although this guide starts with creating Stack projects using Stack, if you are
+relatively inexperienced in coding with Haskell, there are things you
+may wish to experience first. Examples are:
+
+* using GHC interactively to evaluate Haskell expressions and explore their
+  types. The [`stack ghci`](../commands/ghci_command.md) command can help do
+  that; and
+
+* developing simple Haskell programs where all your source code is in a single
+  file. The [`stack runghc`](../commands/runghc_command.md),
+  [`stack ghc`](../commands/ghc_command.md), and
+  [`stack script`](../commands/script_command.md) commands can all help with
+  that.
+
+By default, the `stack new` command introduced below creates a simple project.
+However, Stack projects can be even simpler than that.
+
+For example, imagine you already had the following simple Haskell program in a
+single source file named `MyMainModule.hs` in a directory named `my-project`.
+
+~~~haskell
+module Main ( main ) where
+
+main :: IO ()
+main = putStrLn "Hello, World!"
+~~~
+
+You could create a Haskell package from that source file by also creating
+manually a package description file named `package.yaml` in `my-project`, with
+the contents:
+
+~~~yaml
+name: my-package-name
+version: 1
+dependencies: base
+executable:
+  main: MyMainModule.hs
+~~~
+
+This description reflects the following:
+
+* all Haskell packages have a name and a version; and
+
+* the GHC boot package [`base`](https://hackage.haskell.org/package/base) is a
+  dependency of almost all other packages.
+
+You could then create a Stack project based on that single package by also
+creating manually a Stack project-level configuration file named `stack.yaml` in
+`my-project`, with the contents:
+
+~~~yaml
+snapshot: lts-24.55
+~~~
+
+By adding those two files (one to describe a package, the other to configure the
+project) manually, you would now have a valid single-package Stack project in
+the `my-project` directory. However, let us step through what Stack's commands
+provide, when it comes to creating new projects.
+
+In this guide, unless stated otherwise, the working directory is the project's
+root directory.
+
+## The `stack new` command
+
+We will start off with the [`stack new`](../commands/new_command.md) command to
+create a new Stack *project* from a project template.
+
+The project template `new-template` is used by default. However, in our example,
+we will use it by name.
+
+That template creates a project with a single package of the same name. So, we
+need to pick a name for the project that is also a valid package name. We will
+call our project `helloworld`.
+
+??? question "How do project packages relate to projects?"
+
+    A project can have one or more packages. Each project package has its own
+    root directory. In the case of a single-package project, the project
+    directory and the package directory can be the same directory.
+
+??? question "What is a valid package name?"
+
+    A valid package name consists of one or more alphanumeric words separated by
+    hyphens. Each word must contain at least one letter. That is, the word must
+    not be interpreted as a number.
+
+    The names of packages are intended to be unique.
+
+??? question "What is a valid package version number?"
+
+    A package version number is one or more natural numbers (including zero)
+    separated by dots (`.`). However, Haskell's Package Versioning Policy (PVP)
+    says that a version should have the form *A.B.C*, and may optionally have
+    any number of additional components.
+
+??? question "Are other project templates available?"
+
+    Yes. For further information about project templates, command:
+    ~~~text
+    stack templates
+    ~~~
+
+From the root directory for all our Haskell projects, we command:
+
+~~~text
+stack new helloworld new-template
+~~~
+
+For this first Stack command, Stack will do some setting up. For example, it
+will create the [Stack root](../topics/stack_root.md) directory.
+
+Other than any setting up, Stack will:
+
+* create the project directory;
+* download the project template;
+* attempt to populate the project template based on parameters; and
+* create and initialise Stack's project-level configuration file.
+
+Unless the parameters have been configured, Stack will note that parameters were
+needed by the template but not provided. That can be ignored for now.
+
+??? question "How can I configure project template paramaters?"
+
+    For further information, see the
+    [`templates`](../configure/yaml/non-project.md#templates) non-project
+    specific configuration option.
+
+    As noted in Stack's output, parameters to populate project templates can
+    also be set at the command line by using the options of the `stack new`
+    command.
+
+??? question "Can I create a new project in the current working directory?"
+
+    Yes. Pass the `--bare` flag to cause Stack to create the project in the
+    current working directory rather than in a new project directory.
+
+We now have a project in the `helloworld` directory! We will change to that
+directory, with command:
+
+~~~text
+cd helloworld
+~~~
+
+## The `stack build` command
+
+Next, we will run the most important Stack command,
+[`stack build`](../commands/build_command.md). We command:
+
+~~~text
+stack build
+~~~
+
+Stack needs a version of GHC and, on Windows, a version of MSYS2, in order to
+build your project. Stack will discover that you are missing it and will install
+it for you.
+
+You will get intermediate download percentage statistics while the download is
+occurring. This command may take some time, depending on download speeds.
+
+??? question "Where is the Stack-supplied GHC located?"
+
+    You can use the [`stack path`](../commands/path_command.md) command for path
+    information. To identify where GHC is installed, command:
+
+    === "Unix-like"
+
+        ~~~text
+        stack exec -- which ghc
+        /home/<user_name>/.stack/programs/x86_64-linux/ghc-9.6.5/bin/ghc
+        ~~~
+
+    === "Windows"
+
+        ~~~text
+        stack exec -- where.exe ghc
+        C:\Users\<user_name>\AppData\Local\Programs\stack\x86_64-windows\ghc-9.6.5\bin\ghc.exe
+        ~~~
+
+    As you can see from that path, the installation is placed to not interfere
+    with any other GHC installation, whether system-wide or different GHC
+    versions installed by Stack.
+
+??? question "Can I use that version of GHC by commanding `ghc`?"
+
+    No. GHC will be installed to the Stack programs directory, which is likely
+    not on the PATH, so commanding `ghc` will not work. However, that version of
+    GHC can be used in the [Stack environment](../topics/stack_environment.md).
+    For more information, see the
+    [`stack exec`](../commands/exec_command.md) command,
+    [`stack ghc`](../commands/ghc_command.md) command, and
+    [`stack runghc`](../commands/ghc_command.md) command documentation.
+
+Once a version of GHC and, on Windows, a version of MSYS2, is installed, Stack
+will then build your project. The end of the output should look similar to this:
+
+=== "Unix-like"
+
+    ~~~text
+    ...
+    helloworld> configure (lib + exe)
+    Configuring helloworld-0.1.0.0...
+    helloworld> build (lib + exe) with ghc-9.10.3
+    Preprocessing library for helloworld-0.1.0.0..
+    Building library for helloworld-0.1.0.0..
+    [1 of 2] Compiling Lib
+    [2 of 2] Compiling Paths_helloworld
+    Preprocessing executable 'helloworld-exe' for helloworld-0.1.0.0..
+    Building executable 'helloworld-exe' for helloworld-0.1.0.0..
+    [1 of 2] Compiling Main
+    [2 of 2] Compiling Paths_helloworld
+    [3 of 3] Linking .stack-work/dist/x86_64-linux-tinfo6/ghc-9.10.3/build/helloworld-exe/helloworld-exe
+    helloworld> copy/register
+    Installing library in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/lib/x86_64-linux-ghc-9.10.3/helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX
+    Installing executable helloworld-exe in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/bin
+    Registering library for helloworld-0.1.0.0..
+    ~~~
+
+=== "Windows"
+
+    ~~~text
+    ...
+    helloworld> configure (lib + exe)
+    Configuring helloworld-0.1.0.0...
+    helloworld> build (lib + exe) with ghc-9.10.3
+    Preprocessing library for helloworld-0.1.0.0..
+    Building library for helloworld-0.1.0.0..
+    [1 of 2] Compiling Lib
+    [2 of 2] Compiling Paths_helloworld
+    Preprocessing executable 'helloworld-exe' for helloworld-0.1.0.0..
+    Building executable 'helloworld-exe' for helloworld-0.1.0.0..
+    [1 of 2] Compiling Main
+    [2 of 2] Compiling Paths_helloworld
+    [3 of 3] Linking .stack-work\dist\effaccc7\build\helloworld-exe\helloworld-exe.exe
+    helloworld> copy/register
+    Installing library in ...\helloworld\.stack-work\install\c8c71a24\lib\x86_64-windows-ghc-9.10.3\helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX
+    Installing executable helloworld-exe in ...\helloworld\.stack-work\install\c8c71a24\bin
+    Registering library for helloworld-0.1.0.0..
+    ~~~
+
+    On Windows, Stack uses hashes of certain information to keep paths short.
+
+Stack aims not to rebuild unnecessarily. If we command `stack build` a second
+time, nothing happens.
+
+## The `stack exec` command
+
+The output of the previous command has three main steps. You can see, from the
+first two steps, that a library (lib) and an executable (exe) are being built
+and that the final step involved the installation of an executable named
+`helloworld-exe` (on Windows, the file is `helloworld-exe.exe`) (extract):
+
+~~~text
+helloworld> configure (lib + exe)
+...
+helloworld> build (lib + exe) with ghc-9.10.3
+...
+helloworld> copy/register
+...
+Installing executable helloworld-exe in .../helloworld/.stack-work/.../bin
+~~~
+
+The executable is installed in a location in the project's `.stack-work`
+directory.
+
+Now, let us use the [`stack exec`](../commands/exec_command.md) command to run
+our executable. We command:
+
+~~~text
+stack exec helloworld-exe
+~~~
+
+and the output is just:
+
+~~~text
+someFunc
+~~~
+
+??? question "Why is the output just `someFunc`?"
+
+    The code in the `new-template` project template is very simple. The package
+    has a Haskell module `Lib`:
+    ~~~haskell
+    module Lib
+        ( someFunc
+        ) where
+
+    someFunc :: IO ()
+    someFunc = putStrLn "someFunc"
+    ~~~
+
+    and a Haskell module `Main`:
+    ~~~haskell
+    module Main (main) where
+
+    import Lib
+
+    main :: IO ()
+    main = someFunc
+    ~~~
+
+    `putStrLn "someFunc"` is an action that, when executed, outputs the string
+    `someFunc` to the standard output channel.
+
+`stack exec` works by providing the same reproducible environment that was used
+to build your project to the command that you are running. Thus, it knew where
+to find `helloworld-exe` even though it is not on the PATH outside of that
+environment.
+
+??? question "How I can find the PATH used in the Stack environment?"
+
+    Command `stack path --bin-path` to see the PATH in the
+    [Stack environment](../topics/stack_environment.md).
+
+!!! info
+
+    On Windows, the [Stack environment](../topics/stack_environment.md) includes
+    the `\clang64\bin`, `\usr\bin` and `\usr\local\bin` directories of the
+    Stack-supplied MSYS2. If your executable depends on files (for example,
+    dynamic-link libraries) in those directories and you want ro run it outside
+    of the Stack environment, you will need to ensure copies of those files are
+    on the PATH.
+
+## The `stack test` command
+
+Finally, like all good software, `helloworld` actually has a test suite.
+
+Let us run it with the [`stack test`](../commands/test_command.md) command. We
+command:
+
+~~~text
+stack test
+~~~
+
+The start of the output should look similar to this:
+
+=== "Unix-like"
+
+    ~~~text
+    helloworld-0.1.0.0: unregistering (components added: test:helloworld-test)
+    helloworld> configure (lib + exe + test)
+    Configuring helloworld-0.1.0.0...
+    helloworld> build (lib + exe + test) with ghc-9.10.3
+    Preprocessing library for helloworld-0.1.0.0..
+    Building library for helloworld-0.1.0.0..
+    Preprocessing test suite 'helloworld-test' for helloworld-0.1.0.0..
+    Building test suite 'helloworld-test' for helloworld-0.1.0.0..
+    [1 of 2] Compiling Main
+    [2 of 2] Compiling Paths_helloworld
+    [3 of 3] Linking .stack-work/dist/x86_64-linux-tinfo6/ghc-9.10.3/build/helloworld-test/helloworld-test
+    Preprocessing executable 'helloworld-exe' for helloworld-0.1.0.0..
+    Building executable 'helloworld-exe' for helloworld-0.1.0.0..
+    helloworld> copy/register
+    Installing library in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/lib/x86_64-linux-ghc-9.10.3/helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX
+    Installing executable helloworld-exe in .../helloworld/.stack-work/install/x86_64-linux-tinfo6/a2caceceda039eb4f791856f85a68f9582d4daf3d0527344693ff3d1fcd92ba4/9.6.6/bin
+    Registering library for helloworld-0.1.0.0..
+    ~~~
+
+=== "Windows"
+
+    ~~~text
+    helloworld-0.1.0.0: unregistering (components added: test:helloworld-test)
+    helloworld> configure (lib + exe + test)
+    Configuring helloworld-0.1.0.0...
+    helloworld> build (lib + exe + test) with ghc-9.10.3
+    Preprocessing library for helloworld-0.1.0.0..
+    Building library for helloworld-0.1.0.0..
+    Preprocessing test suite 'helloworld-test' for helloworld-0.1.0.0..
+    Building test suite 'helloworld-test' for helloworld-0.1.0.0..
+    [1 of 2] Compiling Main
+    [2 of 2] Compiling Paths_helloworld
+    [3 of 3] Linking .stack-work\dist\effaccc7\build\helloworld-test\helloworld-test.exe
+    Preprocessing executable 'helloworld-exe' for helloworld-0.1.0.0..
+    Building executable 'helloworld-exe' for helloworld-0.1.0.0..
+    helloworld> copy/register
+    Installing library in ...\helloworld\.stack-work\install\0aa166fa\lib\x86_64-windows-ghc-9.10.3\helloworld-0.1.0.0-KFyX8zLxDvzLZURq3JaCVX
+    Installing executable helloworld-exe in ...\helloworld\.stack-work\install\0aa166fa\bin
+    Registering library for helloworld-0.1.0.0..
+    ~~~
+
+Again, Stack does not rebuild unnecessarily. Only the test suite component is
+compiled and linked.
+
+The output should then conclude:
+
+~~~text
+helloworld> test (suite: helloworld-test)
+
+Test suite not yet implemented
+
+
+
+helloworld> Test suite helloworld-test passed
+Completed 2 action(s).
+~~~
+
+Having build the test suite executable, Stack then automatically runs it.
diff --git a/doc/tutorial/index.md b/doc/tutorial/index.md
new file mode 100644
index 0000000000..a46fb1c563
--- /dev/null
+++ b/doc/tutorial/index.md
@@ -0,0 +1,221 @@
+---
+title: Getting started
+---
+
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# Getting started
+
+Stack is a program for developing [Haskell](https://www.haskell.org/) projects.
+
+You may be getting started with Haskell or you may only be getting started with
+Stack. If you are getting started with Haskell, you may already know other
+programming languages or you may be new to coding.
+
+This guide is aimed at people getting started with Stack. It takes a new Stack
+user through the ways that Stack is typically used. It requires no prior
+experience of Stack or other Haskell tools.
+
+This guide will not teach Haskell - other resources are better placed to do
+that - or involve much code. However, it does aim to be accessible to people who
+who are relatively inexperienced in coding with Haskell.
+
+Terms used in the guide will be explained as they are introduced and are also
+defined in the [glossary](../glossary.md).
+
+Some of Stack's features will not be needed regularly or by all users. Other
+parts of Stack's documentation include its [commands](../commands/index.md) and
+its [configuration](../configure/index.md).
+
+## Other Haskell tools
+
+First, simplifying greatly, let us briefly place Stack and other Haskell tools
+in the Haskell landscape.
+
+Haskell was specified in the
+[Haskell 98 Language and Library Reports](https://www.haskell.org/onlinereport/),
+first published in February 1999, and further specified in the
+[Haskell 2010 Language Report](https://www.haskell.org/onlinereport/haskell2010/),
+published in April 2010. Extensions to the language have been developed (see
+below).
+
+The Haskell compiler is **GHC** (the
+[Glasgow Haskell Compiler](https://www.haskell.org/ghc/)). It can compile
+Haskell code into executable and other binary files. GHC can also be used
+interactively (**GHCi**) and Stack supports such use.
+
+~~~mermaid
+flowchart LR
+  code@{ shape: docs, label: "Haskell code" }
+  ghc[GHC]
+  binaries@{ shape: docs, label: "Executable and other binary files" }
+  code --> ghc --> binaries
+~~~
+
+A lot of interesting things can be done using only what comes with GHC
+(including GHCi) but as Haskell code becomes more complex and there is a desire
+to reuse efficiently code developed by others it becomes necessary to organise
+code in a structured way.
+
+In that regard, Haskell code can be organised into *packages*. A Haskell package
+also includes a file that describes the package's contents. The most established
+description format is known as a
+[Cabal file](https://cabal.readthedocs.io/en/stable/file-format-changelog.html).
+The [**Hpack** project](https://github.com/sol/hpack) provides a modern
+alternative format (in a file named `package.yaml`) and a library and
+application that translates from that format to the legacy format. Stack has
+built-in support for Hpack. Other build tools (see below) do not.
+
+~~~mermaid
+flowchart LR
+  packageYaml@{ shape: doc, label: "package.yaml" }
+  hpack[Hpack]
+  cabalFile@{ shape: doc, label: "Cabal file" }
+  packageYaml --> hpack --> cabalFile
+~~~
+
+The code in a Haskell package is organised into *components*, including
+components known as *libraries*. Historically, a package had no more than one
+library component. The Cabal specification has developed to allow a package to
+have named *sub-library* components as well as a main library.
+
+The code in a Haskell package can depend on the libraries in the same package
+or in another package. These are known as its *dependencies*.
+
+GHC comes with the libraries of certain Haskell packages (known as
+*boot packages*) already installed in its global database of installed
+libraries. These include the library of the
+[package `base`](https://hackage.haskell.org/package/base), which
+is a dependency of almost all other packages, and the library of
+[package `Cabal`](https://hackage.haskell.org/package/Cabal), which provides
+code to build packages and components of packages using GHC.
+
+Two important public databases are **Hackage**
+[(the  Haskell Package Repository)](https://hackage.haskell.org/) and
+[**Stackage**](https://www.stackage.org/).
+
+~~~mermaid
+flowchart LR
+  hackage@{ shape: lin-cyl, label: "Hackage
+    (packages)" }
+  stackage@{ shape: lin-cyl, label: "Stackage
+    (snapshots)" }
+  hackage --> stackage
+~~~
+
+Hackage is a database of Haskell packages, each identified by a name and version
+number. There were over 17,000 package names on Hackage as at July 2025.
+
+Stackage is a database of collections of Haskell package versions on
+Hackage that are known, by testing, to work well together and with a specific
+version of GHC and its boot packages. Those collections are known as
+*snapshots*. As at July 2025, a snapshot for a recent version of GHC includes
+well over 3,000 packages.
+
+Stack can unpack packages from, and upload packages to, Hackage and
+builds making use of snapshots from Stackage.
+
+GHC comes with an application
+[**Haddock**](https://haskell-haddock.readthedocs.io/latest/) that automatically
+generates web page and other documentation from annotated Haskell code. The
+Hackage and Stackage websites display that documentation. Stack supports the use
+of Haddock.
+
+~~~mermaid
+flowchart LR
+  code@{ shape: docs, label: "Haskell code" }
+  haddock[Haddock]
+  docs@{ shape: docs, label: "Documentation" }
+  code --> haddock --> docs
+~~~
+
+**Hoogle** is a [website](https://hoogle.haskell.org/) and an
+[application](https://hackage.haskell.org/package/hoogle) that allows its users
+to search for the library components of Haskell packages, the modules they
+expose, and functions and types exported by modules. Stack supports the use of
+Hoogle on the command line.
+
+GHC is described in its
+[User Guide](https://downloads.haskell.org/ghc/latest/docs/users_guide/). It can
+be used directly but it is a complex application with many flags and options.
+These include flags to specify extensions to the Haskell language.  Haskell
+*build tools* are applications that make it easier to use GHC, including by
+applying sensible defaults. Stack is such a build tool. Stack itself uses
+the Cabal library to build.
+
+~~~mermaid
+flowchart LR
+  stack[Stack]
+  cabal["Cabal (the library)"]
+  code@{ shape: docs, label: "Haskell code" }
+  ghc[GHC]
+  binaries@{ shape: docs, label: "Executable and other files" }
+  subgraph buildtool ["Build tool"]
+      direction TB
+      stack --> cabal --> ghc
+  end
+  code --> buildtool --> binaries
+~~~
+
+When Haskell code changes, GHC and build tools aim to minimise what needs to be
+re-compiled.
+
+A Stack project may comprise only a single package, but Stack can also handle
+multi-package projects.
+
+Another build tool is **Cabal** (the tool) (named after the library). It is
+provided by the
+[`cabal-install`](https://hackage.haskell.org/package/cabal-install)
+Haskell package. Stack can be used independently of Cabal (the tool) but users
+can also use both, if they wish.
+
+Some popular code editors (including
+[Visual Studio Code](https://code.visualstudio.com/)) have extensions that
+support Haskell coding by providing an integrated development environment (IDE).
+Those extensions use **HLS** (the
+[Haskell Language Server](https://haskell-language-server.readthedocs.io/en/stable/)),
+an application that implements the Language Server Protocol for Haskell.
+
+Stack can manage versions of GHC and upgrade/downgrade Stack itself and is, in
+that sense, an *installer* of those applications as well as a build tool.
+However, Cabal (the tool) is not an installer and versions of HLS applicable to
+versions of GHC also need to be installed.
+[**GHCup**](https://www.haskell.org/ghcup/) is an installer of versions of GHC,
+HLS, Stack and Cabal (the tool) built for various operating systems and machine
+architectures. Stack can be configured to manage versions of GHC by using GHCup.
+
+~~~mermaid
+flowchart TD
+  ghcUp["GHCup
+    installer"]
+  ghc["GHC
+    compiler"]
+  hls["HLS
+    IDE tool"]
+  stack["Stack
+    build tool, installer"]
+  cabal["Cabal (the tool)
+    build tool"]
+  ghcUp -.-> ghc
+  ghcUp -.-> hls
+  ghcUp -.-> stack
+  stack -- "(optional) to fetch GHC" --> ghcUp
+  ghcUp -.-> cabal
+~~~
+
+## Setting up
+
+The goal of setting up is a `stack` executable on the PATH. As we will see, when
+Stack is used, it sets other things up as needed.
+
+*[PATH]: An environment variable that specifies a list of directories searched for executable files.
+
+For further information about setting up, see the
+[documentation](../install_and_upgrade.md) on that topic. Return here when you
+know that Stack is on the PATH.
+
+This guide assumes that the directory where Stack install executables (the
+location reported by `stack path --local-bin`) has been added to the PATH.
+
+This guide assumes that your computer's operating system is one of Linux, macOS
+or Windows. Stack's commands are the same on all operating systems.
diff --git a/doc/tutorial/installed_package_databases.md b/doc/tutorial/installed_package_databases.md
new file mode 100644
index 0000000000..c2775a114b
--- /dev/null
+++ b/doc/tutorial/installed_package_databases.md
@@ -0,0 +1,110 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 6. Installed package databases
+
+Time to take a short break from hands-on examples and discuss a little
+architecture. Stack has the concept of multiple *databases*.
+
+A database consists of a GHC package database (which contains the compiled
+version of a library), executables, and a few other things as well. To give you
+an idea, the contents of the parent directory of the `stack path --local-pkg-db`
+directory are the directories:
+
+~~~text
+bin
+doc
+lib
+pkgdb
+~~~
+
+Databases in Stack are *layered*. For example, the database listing we just gave
+is called a *local* database (also known as a *mutable* database). That is
+layered on top of a *snapshot* database (also known as a *write-only* database).
+The snapshot database contains the libraries and executables that are considered
+to be *immutable*. Finally, GHC itself ships with a number of libraries and
+executables, also considered to be immutable, which forms the *global* database.
+
+To get a quick idea of this, we can look at the output of the
+`stack exec -- ghc-pkg list` command in our `helloworld` project:
+
+~~~text
+<stack path --global-pkg-db directory>
+    Cabal-3.6.3.0
+    Win32-2.12.0.1
+    array-0.5.4.0
+    base-4.16.2.0
+    binary-0.8.9.0
+    bytestring-0.11.3.1
+    containers-0.6.5.1
+    deepseq-1.4.6.1
+    directory-1.3.6.2
+    exceptions-0.10.4
+    filepath-1.4.2.2
+    (ghc-9.2.3)
+    ghc-bignum-1.2
+    ghc-boot-9.2.3
+    ghc-boot-th-9.2.3
+    ghc-compact-0.1.0.0
+    ghc-heap-9.2.3
+    ghc-prim-0.8.0
+    ghci-9.2.3
+    haskeline-0.8.2
+    hpc-0.6.1.0
+    integer-gmp-1.1
+    libiserv-9.2.3
+    mtl-2.2.2
+    parsec-3.1.15.0
+    pretty-1.1.3.6
+    process-1.6.13.2
+    rts-1.0.2
+    stm-2.5.0.2
+    template-haskell-2.18.0.0
+    text-1.2.5.0
+    time-1.11.1.1
+    transformers-0.5.6.2
+    xhtml-3000.2.2.1
+
+<stack path --snapshot-pkg-db directory>
+    acme-missiles-0.3
+
+<stack path --local-pkg-db directory>
+    helloworld-0.1.0.0
+~~~
+
+where `<stack path --global-pkg-db directory>` refers to the directory output by
+the command `stack path --global-pkg-db`, and so on.
+
+Notice that `acme-missiles` ends up in the *snapshot* database. Any package
+which comes from Hackage, an archive, or a repository is considered to be an
+*immutable* package.
+
+Anything which is considered *mutable*, or depends on something mutable, ends up
+in the *local* database. This includes your own code and any other packages
+located on a local file path.
+
+The reason we have this structure is that:
+
+* it lets multiple projects reuse the same binary builds of immutable packages,
+* but does not allow different projects to "contaminate" each other by putting
+  non-standard content into the shared snapshot database.
+
+As you probably guessed, there can be multiple snapshot databases available. See
+the contents of the `snapshots` directory in the
+[Stack root](../topics/stack_root.md).
+
+* On Unix-like operating systems, each snapshot is in the last of a sequence of
+  three subdirectories named after the platform, a 256-bit hash of the source
+  map (how the package should be built -- including the compiler, options, and
+  immutable dependencies), and the GHC version.
+
+* On Windows, each snapshot is in a subdirectory that is a shorter hash (eight
+  characters) of the sequence of three directories used on Unix-like operating
+  systems. This is done to avoid problems created by default limits on file
+  path lengths on Windows systems.
+
+These snapshot databases do not get layered on top of each other; they are each
+used separately.
+
+In reality, you will rarely — if ever — interact directly with these databases,
+but it is good to have a basic understanding of how they work so you can
+understand why rebuilding may occur at different points.
diff --git a/doc/tutorial/locations_used_by_stack.md b/doc/tutorial/locations_used_by_stack.md
new file mode 100644
index 0000000000..7260ae8145
--- /dev/null
+++ b/doc/tutorial/locations_used_by_stack.md
@@ -0,0 +1,86 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 11. Locations used by Stack
+
+Generally, you do not need to worry about where Stack stores various files. But
+some people like to know this stuff. That's when the `stack path` command is
+useful.
+
+## The `stack path` command
+
+`stack path --help` explains the available options and, consequently,
+the output of the command:
+
+~~~text
+--stack-root             Global Stack root directory
+--global-config          Global Stack configuration file
+--project-root           Project root (derived from stack.yaml file)
+--config-location        Configuration location (where the stack.yaml file is)
+--bin-path               PATH environment variable
+--programs               Install location for GHC and other core tools (see
+                         'stack ls tools' command)
+--compiler-exe           Compiler binary (e.g. ghc)
+--compiler-bin           Directory containing the compiler binary (e.g. ghc)
+--compiler-tools-bin     Directory containing binaries specific to a
+                         particular compiler
+--local-bin              Directory where Stack installs executables (e.g.
+                         ~/.local/bin (Unix-like OSs) or %APPDATA%\local\bin
+                         (Windows))
+--extra-include-dirs     Extra include directories
+--extra-library-dirs     Extra library directories
+--snapshot-pkg-db        Snapshot package database
+--local-pkg-db           Local project package database
+--global-pkg-db          Global package database
+--ghc-package-path       GHC_PACKAGE_PATH environment variable
+--snapshot-install-root  Snapshot installation root
+--local-install-root     Local project installation root
+--snapshot-doc-root      Snapshot documentation root
+--local-doc-root         Local project documentation root
+--local-hoogle-root      Local project documentation root
+--dist-dir               Dist work directory, relative to package directory
+--local-hpc-root         Where HPC reports and tix files are stored
+~~~
+
+In addition, `stack path` accepts the flags above on the command line to state
+which keys you are interested in. This can be convenient for scripting. As a
+simple example, let us find out the sandboxed versions of GHC that Stack
+installed:
+
+=== "Unix-like"
+
+    Command:
+
+    ~~~text
+    ls $(stack path --programs)/*.installed
+    /home/<user_name>/.stack/programs/x86_64-linux/ghc-9.0.2.installed
+    ~~~
+
+=== "Windows"
+
+    In PowerShell, command:
+
+    ~~~text
+    dir "$(stack path --programs)/*.installed"
+
+    Directory: C:\Users\mikep\AppData\Local\Programs\stack\x86_64-windows
+
+    Mode                 LastWriteTime         Length Name
+    ----                 -------------         ------ ----
+    -a---          27/07/2022  5:40 PM              9 ghc-9.0.2.installed
+    -a---          25/02/2022 11:39 PM              9 msys2-20210604.installed
+    ~~~
+
+While we are talking about paths, to wipe our Stack install completely, here is
+what typically needs to be removed:
+
+1. the Stack root folder (see `stack path --stack-root`, before you uninstall);
+2. if different, the folder containing Stack's global configuration file (see
+   `stack path --global-config`, before you uninstall);
+3. on Windows, the folder containing Stack's tools (see `stack path --programs`,
+   before you uninstall), which is located outside of the Stack root folder; and
+4. the `stack` executable file (see `which stack`, on Unix-like operating
+   systems, or `where.exe stack`, on Windows).
+
+You may also want to delete `.stack-work` folders in any Haskell projects that
+you have built using Stack. The `stack uninstall` command provides information
+about how to uninstall Stack.
diff --git a/doc/tutorial/multi-package_projects.md b/doc/tutorial/multi-package_projects.md
new file mode 100644
index 0000000000..e25e31c9b0
--- /dev/null
+++ b/doc/tutorial/multi-package_projects.md
@@ -0,0 +1,157 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 9. Multi-package projects
+
+Everything we have done with Stack so far has used a single-package project,
+where the project directory is also the package's directory. However, a Stack
+project can have more than one project package.
+
+Let us demonstrate this with a project that has two project packages named
+`packageA` and `packageB`. We will create a project directory named `my-project`
+and, for our example, create the two project packages in subdirectories.
+Command:
+
+~~~text
+mkdir my-project
+cd my-project
+stack new packageA --no-init
+stack new packageB --no-init
+stack init
+~~~
+
+The `--no-init` flags above stop Stack from creating project-level configuration
+files in the `packageA` and `packageB` directories that
+[`stack new`](../commands/new_command.md) will create.
+
+The [`stack init`](../commands/init_command.md) command above creates a
+project-level configuration file (`stack.yaml`) in the `my-project` directory.
+The command should report something like this:
+
+~~~text
+Looking for Cabal or package.yaml files to use to initialise Stack's
+project-level YAML configuration file.
+
+Using the Cabal packages:
+* packageA\
+* packageB\
+
+Selecting the best among 14 snapshots...
+
+Note: Matches https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml
+
+Selected the snapshot https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml.
+Initialising Stack's project-level configuration file using snapshot https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml.
+Considered 2 user packages.
+Writing configuration to stack.yaml.
+Stack's project-level configuration file has been initialised.
+~~~
+
+Ignoring comments in the file, the content of the created `stack.yaml` file
+should be something like this:
+
+~~~yaml
+snapshot:
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml
+
+packages:
+- packageA
+- packageB
+~~~
+
+The value of the [`packages`](../configure/yaml/project.md#packages) key is a
+list of paths (relative paths, in this example) to project package directories.
+
+If we command
+[`stack ide targets`](../commands/ide_command.md#the-stack-ide-targets-command),
+Stack reports the build targets for these two project packages:
+
+~~~text
+packageA:lib
+packageA:exe:packageA-exe
+packageA:test:packageA-test
+packageB:lib
+packageB:exe:packageB-exe
+packageB:test:packageB-test
+~~~
+
+If we command
+[`stack build`](../commands/build_command.md#no-targets-specified), Stack will
+build all the library and executable components of all the project packages.
+
+One project package can depend on another. Let us demonstrate this by modifying
+the main library of the `packageB` package to depend on that of the `packageA`
+package.
+
+Currently, the source code of the `packageA` and `packageB` packages are the
+same. Let us first modify the `someFunc` function exported by the `Lib` module
+exposed by the `packageA` package, as follows:
+
+~~~haskell
+someFunc :: IO ()
+someFunc = putStrLn "someFunc of packageA's Lib module"
+~~~
+
+and the source code of the `Lib` module exposed by the `packageB` package to
+become:
+
+~~~haskell
+{-# LANGUAGE PackageImports #-}
+
+module Lib
+    ( someFunc
+    ) where
+
+import qualified "packageA" Lib as LibA
+
+someFunc :: IO ()
+someFunc = do
+    putStrLn "someFunc of packageB's Lib module"
+    LibA.someFunc
+~~~
+
+In this example, as the `packageA` and `packageB` packages both expose a module
+named `Lib`, we have to use GHC's language extension
+[`PackageImports`](https://downloads.haskell.org/ghc/latest/docs/users_guide/exts/package_qualified_imports.html)
+to allow imports from the `Lib` module exposed by the `packageA` package to be
+distiguished.
+
+In the package description file (`package.yaml`) for the `packageB` package, we
+need to specify that the dependencies of its main library now include the main
+library of the `packageA` package, as follows (extract):
+
+~~~yaml
+library:
+  source-dirs: src
+  dependencies:
+  - packageA # Add the dependency on the main library of the packageA package
+~~~
+
+Now, if we command `stack build packageB`, Stack will build the library and
+executable components of the `packageA` package (the dependency) and then the
+library and executable (named `packageB-exe`) of `packageB`.
+
+To execute the built `packageB-exe` executable, we can command:
+
+~~~text
+stack exec packageB-exe
+~~~
+
+giving the expected output:
+
+~~~text
+someFunc of packageB's Lib module
+someFunc of packageA's Lib module
+~~~
+
+!!! note
+
+    A project package can depend on another project package, as above. It can
+    also depend on a local package that is specified as an
+    [extra-dep](../configure/yaml/project.md#extra-deps). Although both
+    dependencies are local, the former is part of the project and the latter is
+    not.
+
+Multi-package projects are also the natural setting for GHC's
+[Backpack](../topics/backpack.md) module system, where a signature package, an
+implementation package, and a consumer package each live in separate directories
+under the same `stack.yaml`.
diff --git a/doc/tutorial/package_description.md b/doc/tutorial/package_description.md
new file mode 100644
index 0000000000..4a53d8aef8
--- /dev/null
+++ b/doc/tutorial/package_description.md
@@ -0,0 +1,420 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 2. Package description
+
+Let us begin to look at the `helloworld` example in more detail to understand
+better how Stack works.
+
+The contents of the project directory are set out below. Click
+:material-plus-circle: to learn more about each file or directory:
+
+~~~shell
+.
+├── .stack-work # (1)!
+│   └── ...
+│
+├── app
+│   └── Main.hs # (2)!
+├── src
+│   └── Lib.hs # (3)!
+├── test
+│   └── Spec.hs # (4)!
+│
+├── .gitignore # (5)!
+├── CHANGELOG.md # (6)!
+├── LICENSE # (7)!
+├── README.md # (8)!
+│
+├── package.yaml # (9)!
+├── helloworld.cabal # (10)!
+├── Setup.hs # (11)!
+│
+└── stack.yaml # (12)!
+~~~
+
+1.  The Stack work directory for the project and the project package.
+
+    Stack work directories are ones in which Stack stores files created during
+    the build process. A product of the build - does not affect the build (other
+    than to avoid rebuilding things unnecessarily).
+
+2.  The Haskell source code for the executable (application).
+
+    As your project develops you can add further source code files to the `app`
+    directory.
+
+3.  The executable uses a library. The Haskell source code for the library.
+
+    As your project develops you can add further source code files to the `src`
+    directory.
+
+4.  The package has a test suite executable. The Haskell source code for the
+    test suite.
+
+    As your project develops you can add further source code files to the `test`
+    directory.
+
+5.  A text file used to configure the Git tool to ignore certain files. Does not
+    affect the build.
+
+6.  A text file in the Markdown format in which changes to the project can be
+    documented. Does not affect the build.
+
+7.  A text file used to document the copyright applicable to the project's files
+    and the licence for the use of those files. Does not affect the build.
+
+8.  A text file in the Markdown format which is intended to be read by users of
+    the project. Does not affect the build.
+
+9.  A file describing the package in the Hpack format. See further below.
+
+10. A file describing the package in the Cabal format. See further below.
+
+11. A Haskell source file which is a component of the Cabal build system. See
+    further below.
+
+12. A text file in the YAML format, containing Stack's project-level
+    configuration. See the next part of this guide to getting started.
+
+The files of most interest here are `package.yaml` and `helloworld.cabal`. We
+will also explain the `Setup.hs` file.
+
+## Package description formats
+
+Each package contains a file that describes the package. It is located in the
+package's root directory.
+
+??? question "What is covered by a package description?"
+
+    A package description includes information such as the package name and
+    version, and the package's *components*. A package can have an optional
+    main library component and optional named sub-library components. It can
+    also have optional executable components, test suite components and
+    benchmark components. The description identifies other packages on which
+    those components depend.
+
+    A library component can also declare *signatures* — abstract module
+    interfaces that are filled in by a consumer. This is GHC's
+    [Backpack](../topics/backpack.md) module system.
+
+Stack is aware of two different formats of package description, and both files
+may be present in the package's root directory:
+
+<div class="grid cards" markdown>
+
+-   :material-package-variant:{ .lg .middle } __Cabal: A Cabal file__
+
+    Used directly by the Cabal build system.
+
+    Unique but simple syntax.
+
+    Named after the package (eg `helloworld.cabal`).
+
+    If no `package.yaml` file, used directly by Stack.
+
+    ---
+
+    Specified by the Cabal project:
+
+    [:octicons-arrow-right-24: Learn more](https://cabal.readthedocs.io/en/stable/cabal-package-description-file.html)
+
+-   :material-package-variant-plus:{ .lg .middle } __Hpack: a package.yaml file__
+
+    Used by Stack to create a Cabal file.
+
+    YAML syntax.
+
+    Named `package.yaml`.
+
+    Stack's preferred format. If present, used by Stack.
+
+    ---
+
+    Specified by the Hpack project:
+
+    [:octicons-arrow-right-24: Learn more](https://github.com/sol/hpack?tab=readme-ov-file#documentation)
+
+</div>
+
+??? question "Why use the Hpack format?"
+
+    A `package.yaml` file can be more concise and less repetitive than the Cabal
+    file that is generated from it. That is because the Hpack format uses
+    defaults and top-level keys common to other parts of the format. The YAML
+    syntax, which may already be familiar for some users, can also avoid
+    repetition.
+
+    In particular, the format's defaults can infer the names of exposed and
+    other modules.
+
+    The format allows a user to specify defaults in a file on GitHub or a local
+    file.
+
+??? question "I use the Hpack format. Should I also check-in a Cabal file to my repository?"
+
+    Yes. This helps people who do not use Stack or the Hpack tool separately.
+
+## `package.yaml`
+
+The `package.yaml` file describes the package in the
+[Hpack format](https://github.com/sol/hpack?tab=readme-ov-file#documentation).
+
+If a `package.yaml` file is present, Stack will use its built-in Hpack
+functionality to create a Cabal file.
+
+??? question "What are the contents of the `package.yaml` file?"
+
+    The contents of the `package.yaml` file for the `helloworld` example are
+    described below, using additional YAML comments:
+
+    ~~~yaml
+    # The name of the package:
+    name:                helloworld
+    # The version of the package:
+    version:             0.1.0.0
+    # The GitHub repository for the package (optional):
+    github:              "githubuser/helloworld"
+    # The licence for the use of the package's files (optional):
+    license:             BSD-3-Clause
+    # The author of the package (optional):
+    author:              "Author name here"
+    # The email address to contact the maintainer of the package (optional):
+    maintainer:          "example@example.com"
+    # The copyright for the package's files (optional):
+    copyright:           "2025 Author name here"
+
+    # Extra files (if any) to be distributed with the source files of the
+    # package:
+    extra-source-files:
+    - README.md
+    - CHANGELOG.md
+
+    # Metadata used when publishing your package
+    # synopsis:            Short description of your package
+    # category:            Web
+
+    # To avoid duplicated efforts in documentation and dealing with the
+    # complications of embedding Haddock markup inside cabal files, it is
+    # common to point users to the README.md file.
+    description:         Please see the README on GitHub at
+                         <https://github.com/githubuser/helloworld#readme>
+
+    # Dependencies applicable to all components:
+    dependencies:
+    - base >= 4.7 && < 5
+
+    # GHC options (if any) common to all components:
+    ghc-options:
+    # These GHC flags affect which warnings GHC will emit:
+    - -Wall
+    - -Wcompat
+    - -Widentities
+    - -Wincomplete-record-updates
+    - -Wincomplete-uni-patterns
+    - -Wmissing-export-lists
+    - -Wmissing-home-modules
+    - -Wpartial-fields
+    - -Wredundant-constraints
+
+    # The main (unnamed) library component of the package (if it has one):
+    library:
+      # Directories containing source files:
+      source-dirs: src
+
+    # The executable components of the package (if it has any):
+    executables:
+      # The executable component named 'helloworld-exe':
+      helloworld-exe:
+        # The source file exporting the 'main' function:
+        main:                Main.hs
+        # Directories containing source files:
+        source-dirs:         app
+        # GHC options applicable to the component:
+        ghc-options:
+        # Link the program with the 'threaded' version of GHC's runtime system:
+        - -threaded
+        # Make all of GHC's runtime system (RTS) options available:
+        - -rtsopts
+        # Compile so as to use simultaneous threads when running the program,
+        # based on how many processors are in the machine.
+        - -with-rtsopts=-N
+        # Dependencies applicable to the component:
+        dependencies:
+        # The main library of the package:
+        - helloworld
+
+    # The test suite components of the package (if it has any). Test suites have
+    # keys in common with executables:
+    tests:
+      # The test suite component named 'helloworld-test':
+      helloworld-test:
+        main:                Spec.hs
+        source-dirs:         test
+        ghc-options:
+        - -threaded
+        - -rtsopts
+        - -with-rtsopts=-N
+        dependencies:
+        - helloworld
+    ~~~
+
+??? question "What are the contents of a minimal `package.yaml` file?"
+
+    For a package `my-package-0.1.0.0` with a main library, an executable
+    named `my-program`, and a dependency only on the `base` package, its
+    `package.yaml` file could be as simple as the one below:
+
+    ~~~yaml
+    package: my-package
+    version: 0.1.0.0
+    dependencies:
+    - base
+    library:
+      source-dirs: src
+    executables:
+      my-program:
+        main: Main.hs
+        source-dirs: app
+        ghc-options:
+        - -threaded
+        - -rtsopts
+        - -with-rtsopts=-N
+        dependencies:
+        - my-package
+    ~~~
+
+## `helloworld.cabal`
+
+In the case of the `helloworld` example, the `helloworld.cabal` file is updated
+automatically as part of the `stack build` process and should not be modified.
+
+If the `package.yaml` file were deleted, Stack would use the Cabal file
+directly.
+
+??? question "What are the contents of the `helloworld.cabal` file?"
+
+    The contents of the `helloworld.cabal` file are described below, using
+    additional Cabal file comments:
+
+    ~~~text
+    -- The version of the Cabal package description format specification:
+    cabal-version: 2.2
+
+    -- This file has been generated from package.yaml by hpack version 0.37.0.
+    --
+    -- see: https://github.com/sol/hpack
+
+    -- The name of the package:
+    name:           helloworld
+    -- The version of the package:
+    version:        0.1.0.0
+    -- The description of the package:
+    description:    Please see the README on GitHub at
+                    <https://github.com/githubuser/helloworld#readme>
+    -- A URL for the package:
+    homepage:       https://github.com/githubuser/helloworld#readme
+    -- A URL for bug reports for the package:
+    bug-reports:    https://github.com/githubuser/helloworld/issues
+    -- The author of the package:
+    author:         Author name here
+    -- The email address to contact the maintainer of the package:
+    maintainer:     example@example.com
+    -- The copyright for the package's files:
+    copyright:      2025 Author name here
+    -- The licence for the use of the package's files:
+    license:        BSD-3-Clause
+    -- The file documenting the terms of the licence:
+    license-file:   LICENSE
+    -- The Cabal system build type of the package:
+    build-type:     Simple
+    -- Extra files to be distributed with the source files of the package:
+    extra-source-files:
+        README.md
+        CHANGELOG.md
+
+    -- The respository for the package:
+    source-repository head
+      type: git
+      location: https://github.com/githubuser/helloworld
+
+    -- The main (unnamed) library component of the package:
+    library
+      -- The modules that the library exposes:
+      exposed-modules:
+          Lib
+      -- The other modules of the compoment:
+      other-modules:
+          Paths_helloworld
+      -- Automatically generated modules of the component:
+      autogen-modules:
+          Paths_helloworld
+      -- Directories containing source files:
+      hs-source-dirs:
+          src
+      -- GHC options applicable to the component. In this case, they are flags
+      -- that affect which warnings GHC will emit:
+      ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates
+                   -Wincomplete-uni-patterns -Wmissing-export-lists
+                   -Wmissing-home-modules -Wpartial-fields
+                   -Wredundant-constraints
+      -- Dependencies applicable to the building of the component:
+      build-depends:
+          base >=4.7 && <5
+      -- The applicable version of the Haskell language:
+      default-language: Haskell2010
+
+    -- The executable 'helloworld-exe' component of the package. Executable
+    -- components have fields in common with library components:
+    executable helloworld-exe
+      -- The source file exporting the 'main' function:
+      main-is: Main.hs
+      other-modules:
+          Paths_helloworld
+      autogen-modules:
+          Paths_helloworld
+      hs-source-dirs:
+          app
+      -- GHC options applicable to the component. In this case, they include
+      -- flags that affect GHC's runtime system (RTS).
+      ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates
+                   -Wincomplete-uni-patterns -Wmissing-export-lists
+                   -Wmissing-home-modules -Wpartial-fields
+                   -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
+      build-depends:
+          base >=4.7 && <5
+        , helloworld
+      default-language: Haskell2010
+
+    -- The test suite 'helloworld-test' component of the package. Test suite
+    -- components have fields in common with executable components:
+    test-suite helloworld-test
+      -- The type of the test suite:
+      type: exitcode-stdio-1.0
+      main-is: Spec.hs
+      other-modules:
+          Paths_helloworld
+      autogen-modules:
+          Paths_helloworld
+      hs-source-dirs:
+          test
+      ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates
+                   -Wincomplete-uni-patterns -Wmissing-export-lists
+                   -Wmissing-home-modules -Wpartial-fields
+                   -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
+      build-depends:
+          base >=4.7 && <5
+        , helloworld
+      default-language: Haskell2010
+    ~~~
+
+## `Setup.hs`
+
+The `Setup.hs` file is a component of the Cabal build system.
+
+Technically, it is not needed by Stack, but it is considered good practice to
+include it. The file we are using is boilerplate:
+
+~~~haskell
+import Distribution.Simple
+main = defaultMain
+~~~
diff --git a/doc/tutorial/project_configuration.md b/doc/tutorial/project_configuration.md
new file mode 100644
index 0000000000..fe68c44713
--- /dev/null
+++ b/doc/tutorial/project_configuration.md
@@ -0,0 +1,57 @@
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 3. Project configuration
+
+Let us continue to look at the `helloworld` example in more detail to understand
+better how Stack works.
+
+As discussed in the previous part of this guide to getting started, some of the
+contents of the project directory are set out below. The item of interest here
+is the `stack.yaml` file.
+
+~~~text
+.
+├── .stack-work
+│   └── ...
+...
+│
+├── package.yaml
+├── helloworld.cabal
+├── Setup.hs
+│
+└── stack.yaml
+~~~
+
+## `stack.yaml`
+
+Stack requires a Stack project-level configuration file for every project.
+`stack.yaml` is that file. The contents of the file set project-specific and
+non-project-specific options that apply to the project. (Non-project
+specific options that affect the project may also be set in a
+[global Stack configuration file](../configure/yaml/index.md#project-level-and-global-configuration-files).)
+
+The contents of the `stack.yaml` file include comments beginning `#`. Ignoring
+those comments, the contents will look something like this:
+
+~~~yaml
+snapshot:
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml
+packages:
+- .
+~~~
+
+The key [`snapshot`](../configure/yaml/project.md#snapshot) is a
+project-specific configuration option. Its value tells Stack *how* to build your
+package: which version of GHC (and, implicitly, its boot packages) to use; which
+versions of other package dependencies to use, and so on. Our value here says to
+use [LTS Haskell 24.55](https://www.stackage.org/lts-24.55), which implies
+GHC 9.10.3 (which is why `stack build` installs that version of GHC if it is not
+already available to Stack). There are a number of values you can use for
+`snapshot`, which we will cover later.
+
+The key [`packages`](../configure/yaml/project.md#packages) is another
+project-specific configuration option. Its value tells Stack which project
+packages, located locally, to build. In our simple example, we have only a
+single project package, located in the same directory, so '`.`' suffices.
+However, Stack has powerful support for multi-package projects, which we will
+describe as this guide progresses.
diff --git a/doc/tutorial/stack_build_synonyms.md b/doc/tutorial/stack_build_synonyms.md
new file mode 100644
index 0000000000..ec37b94854
--- /dev/null
+++ b/doc/tutorial/stack_build_synonyms.md
@@ -0,0 +1,94 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 7. `stack build` synonyms
+
+Let us look at a subset of the `stack --help` output:
+
+~~~text
+build    Build the package(s) in this directory/configuration
+install  Shortcut for 'build --copy-bins'
+test     Shortcut for 'build --test'
+bench    Shortcut for 'build --bench'
+haddock  Shortcut for 'build --haddock'
+~~~
+
+Four of these commands are just synonyms for the `build` command. They are
+provided for convenience for common cases (e.g., `stack test` instead of
+`stack build --test`) and so that commonly expected commands just work.
+
+What's so special about these commands being synonyms? It allows us to make
+much more composable command lines. For example, we can have a command that
+builds executables, generates Haddock documentation (Haskell API-level docs),
+and builds and runs your test suites, with:
+
+~~~text
+stack build --haddock --test
+~~~
+
+You can even get more inventive as you learn about other flags. For example,
+take the following command:
+
+~~~text
+stack build --pedantic --haddock --test --exec "echo Yay, it succeeded" --file-watch
+~~~
+
+This command will:
+
+* turn on all warnings and errors (the `--pedantic` flag)
+* build your library and executables
+* generate Haddocks (the `--haddock` flag)
+* build and run your test suite (the `--test` flag)
+* run the command `echo Yay, it succeeded` when that completes (the `--exec`
+  option)
+* after building, watch for changes in the files used to build the project, and
+  kick off a new build when done (the `--file-watch` flag)
+
+## The `stack install` command and `copy-bins` option
+
+It is worth calling out the behavior of the `install` command and `--copy-bins`
+option, since this has confused a number of users (especially when compared to
+behavior of other tools like Cabal (the tool)). The `install` command does
+precisely one thing in addition to the build command: it copies any generated
+executables to the local binary directory. You may recognize the default value
+for that path:
+
+On Unix-like operating systems, command:
+
+~~~text
+stack path --local-bin
+/home/<user_name>/.local/bin
+~~~
+
+On Windows, command:
+
+~~~text
+stack path --local-bin
+C:\Users\<user_name>\AppData\Roaming\local\bin
+~~~
+
+That's why the download page recommends adding that directory to your PATH. This
+feature is convenient, because now you can simply run `executable-name` in your
+shell instead of having to run `stack exec executable-name` from inside your
+project directory.
+
+Since it is such a point of confusion, let us list a number of things Stack does
+*not* do specially for the `install` command:
+
+* Stack will always build any necessary dependencies for your code. The install
+  command is not necessary to trigger this behavior. If you just want to build a
+  project, run `stack build`.
+* Stack will *not* track which files it is copied to your local binary directory
+  nor provide a way to automatically delete them. There are many great tools out
+  there for managing installation of binaries, and Stack does not attempt to
+  replace those.
+* Stack will not necessarily be creating a relocatable executable. If your
+  executables hard-codes paths, copying the executable will not change those
+  hard-coded paths.
+
+  * At the time of writing, there is no way to change those kinds of paths with
+    Stack, but see
+    [issue #848 about --prefix](https://github.com/commercialhaskell/stack/issues/848)
+    for future plans.
+
+That's really all there is to the `install` command: for the simplicity of what
+it does, it occupies a much larger mental space than is warranted.
diff --git a/doc/tutorial/stack_build_targets.md b/doc/tutorial/stack_build_targets.md
new file mode 100644
index 0000000000..59ef23f8f8
--- /dev/null
+++ b/doc/tutorial/stack_build_targets.md
@@ -0,0 +1,107 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 8. `stack build` targets
+
+We have not discussed this too much yet, but, in addition to having a number of
+synonyms *and* taking a number of options on the command line, the `build`
+command *also* takes many arguments. These are parsed in different ways, and can
+be used to achieve a high level of flexibility in telling Stack exactly what you
+want to build.
+
+We are not going to cover the full generality of these arguments here; instead,
+there is documentation covering the full
+[build command syntax](../commands/build_command.md). Here, we will just point
+out a few different types of arguments:
+
+* You can specify a *package name*, e.g. `stack build vector`.
+    * This will attempt to build the `vector` package, whether it is a local
+      package, in your extra-deps, in your snapshot, or just available upstream.
+      If it is just available upstream but not included in your locals,
+      extra-deps, or snapshot, the newest version is automatically promoted to
+      an extra-dep.
+* You can also give a *package identifier*, which is a package name plus
+  version, e.g. `stack build yesod-bin-1.4.14`.
+    * This is almost identical to specifying a package name, except it will (1)
+      choose the given version instead of latest, and (2) error out if the given
+      version conflicts with the version of a project package.
+* The most flexibility comes from specifying individual *components*, e.g.
+  `stack build helloworld:test:helloworld-test` says "build the test suite
+  component named helloworld-test from the helloworld package."
+    * In addition to this long form, you can also shorten it by skipping what
+      type of component it is, e.g. `stack build helloworld:helloworld-test`, or
+      even skip the package name entirely, e.g. `stack build :helloworld-test`.
+* Finally, you can specify individual *directories* to build to trigger building
+  of any project packages included in those directories or subdirectories.
+
+When you give no specific arguments on the command line (e.g., `stack build`),
+it is the same as specifying the names of all of your project packages. If you
+just want to build the package for the directory you are currently in, you can
+use `stack build .`.
+
+## Components, --test, and --bench
+
+Here is one final important yet subtle point. Consider our `helloworld` package:
+it has a library component, an executable `helloworld-exe`, and a test suite
+`helloworld-test`. When you run `stack build helloworld`, how does it know which
+ones to build? By default, it will build the library (if any) and all of the
+executables but ignore the test suites and benchmarks.
+
+This is where the `--test` and `--bench` flags come into play. If you use them,
+those components will also be included. So `stack build --test helloworld` will
+end up including the helloworld-test component as well.
+
+You can bypass this implicit adding of components by being much more explicit,
+and stating the components directly. For example, the following will not build
+the `helloworld-exe` executable:
+
+~~~text
+stack purge
+stack build :helloworld-test
+helloworld> configure (lib + test)
+Configuring helloworld-0.1.0.0...
+helloworld> build (lib + test) with ghc-9.6.5
+Preprocessing library for helloworld-0.1.0.0..
+Building library for helloworld-0.1.0.0..
+[1 of 2] Compiling Lib
+[2 of 2] Compiling Paths_helloworld
+Preprocessing test suite 'helloworld-test' for helloworld-0.1.0.0..
+Building test suite 'helloworld-test' for helloworld-0.1.0.0..
+[1 of 2] Compiling Main
+[2 of 2] Compiling Paths_helloworld
+[3 of 3] Linking .stack-work\dist\<hash>\build\helloworld-test\helloworld-test.exe
+helloworld> copy/register
+Installing library in ...\helloworld\.stack-work\install\...
+Registering library for helloworld-0.1.0.0..
+helloworld> test (suite: helloworld-test)
+
+Test suite not yet implemented
+
+
+
+helloworld> Test suite helloworld-test passed
+Completed 2 action(s).
+~~~
+
+We first purged our project to clear old results so we know exactly what Stack
+is trying to do.
+
+The last line shows that our command also *runs* the test suite it just built.
+This may surprise some people who would expect tests to only be run when using
+`stack test`, but this design decision is what allows the `stack build` command
+to be as composable as it is (as described previously). The same rule applies to
+benchmarks. To spell it out completely:
+
+* The `--test` and `--bench` flags simply state which components of a package
+  should be built, if no explicit set of components is given
+* The default behavior for any test suite or benchmark component which has been
+  built is to also run it
+
+You can use the `--no-run-tests` and `--no-run-benchmarks` flags to disable
+running of these components. You can also use `--no-rerun-tests` to prevent
+running a test suite which has already passed and has not changed.
+
+!!! note
+
+    Stack does not build or run test suites and benchmarks for non-local
+    packages. This is done so that a command like `stack test` does not need to
+    run 200 test suites!
diff --git a/doc/tutorial/stack_configuration.md b/doc/tutorial/stack_configuration.md
new file mode 100644
index 0000000000..63c4b801fc
--- /dev/null
+++ b/doc/tutorial/stack_configuration.md
@@ -0,0 +1,76 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 14. Stack configuration
+
+Whenever you run something with Stack, it needs a project-level configuration
+file. The algorithm Stack uses to find such a file is:
+
+1. Check for a `--stack-yaml` or `-w` option on the command line
+2. Check for a `STACK_YAML` environment variable
+3. Check the current directory and all ancestor directories for a `stack.yaml`
+   file
+
+The first two provide a convenient method for using an alternate configuration.
+For example: `stack build --stack-yaml stack-ghc-9.2.3.yaml` can be used by your
+CI system to check your code against GHC 9.2.3. Setting the `STACK_YAML`
+environment variable can be convenient if you are going to be running commands
+like `stack ghc` in other directories, but you want to use the configuration you
+defined in a specific project.
+
+If Stack does not find a project level configuration file in any of the three
+specified locations, the *implicit global* logic kicks in. You have probably
+noticed that phrase a few times in the output from commands above. Implicit
+global is essentially a hack to allow Stack to be useful in a non-project
+setting. When no implicit global configuration file exists, Stack creates one
+for you with the latest LTS snapshot. This allows you to do things like:
+
+* compile individual files easily with `stack ghc`
+* build executables without starting a project, e.g. `stack install pandoc`
+
+Keep in mind that there is nothing magical about this implicit global
+configuration. It has no effect on projects at all. Every package you install
+with it is put into isolated databases just like everywhere else. The only magic
+is that it is the catch-all project whenever you are running Stack somewhere
+else.
+
+## Package description vs project-level configuration
+
+Now that we have covered a lot of ways to use Stack, this quick summary of
+package description files versus Stack's project-level configuration file will
+hopefully make sense and be a good reminder for future uses of Stack:
+
+<div class="grid cards" markdown>
+
+-   __Package description__
+
+    Each package has a package description file in the Cabal format (a Cabal
+    file named after the package.
+
+    A package may have a package description file in the Hpack format
+    (`package.yaml`). If one exists, Stack will use it to generate the Cabal
+    file.
+
+    ---
+
+    Specifies which other Haskell packages are dependencies of the package.
+
+    ---
+
+    Specifies the components, modules, and Cabal flags provided by the package.
+
+-   __Project-level configuration__
+
+    Each project has a project-level configuration file (named `stack.yaml`, by
+    default).
+
+    A project can have one or more project packages.
+
+    ---
+
+    Specifies which package versions are available to be used.
+
+    ---
+
+    Can override the Cabal flag settings for individual packages.
+
+</div>
diff --git a/doc/tutorial/tutorial_conclusion.md b/doc/tutorial/tutorial_conclusion.md
new file mode 100644
index 0000000000..e943eb6130
--- /dev/null
+++ b/doc/tutorial/tutorial_conclusion.md
@@ -0,0 +1,45 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 15. In conclusion
+
+Stack is not the only tool available for building Haskell code. If you are
+happy building with other tools, you may not need Stack. If you are experiencing
+problems with other tools, give Stack a try.
+
+If you are a new user who has no experience with other tools, we recommend
+Stack. It aims to be easy to use and its defaults match modern best practices in
+Haskell development.
+
+Other key features of Stack include:
+
+<div class="grid cards" markdown>
+
+-   __Sandboxing__
+
+    ---
+
+    A 'sandbox' is a development environment that is isolated from other parts
+    of the system. The concept of sandboxing is built into Stack.
+
+-   __Snapshots__
+
+    ---
+
+    A snapshot specifies a GHC versions and a set of package versions that work
+    well together. Stack uses snapshots to define precisely the set of package
+    versions available for a project.
+
+-   __Reproducibility__
+
+    ---
+
+    Stack goes to great lengths to ensure that `stack build` today does the
+    same thing tomorrow. Changing the build plan is always an explicit decision.
+
+-   __Building dependencies__
+
+    ---
+
+    Stack automatically builds dependencies.
+
+</div>
diff --git a/doc/tutorial/using_ghc_interactively.md b/doc/tutorial/using_ghc_interactively.md
new file mode 100644
index 0000000000..003baf6a80
--- /dev/null
+++ b/doc/tutorial/using_ghc_interactively.md
@@ -0,0 +1,31 @@
+  <div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
+
+# 13. Using GHC interactively
+
+GHCi is the interactive GHC environment, a.k.a. the REPL. You *could* access it
+with command:
+
+~~~text
+stack exec ghci
+~~~
+
+But that will not load up locally written modules for access. For that, use the
+`stack ghci` or `stack repl` commands, which are equivalent.
+
+## The `stack ghci` or `stack repl` command
+
+To then load
+modules from your project in GHCi, use the `:module` command (`:m` for short)
+followed by the module name.
+
+!!! note
+
+    If you have added packages to your project please make sure to mark them as
+    extra-deps for faster and reliable usage of `stack ghci`. Otherwise GHCi may
+    have trouble due to conflicts of compilation flags or having to
+    unnecessarily interpret too many modules. See Stack's project-level
+    [configuration](../configure/yaml/project.md#extra-deps) to learn how to
+    configure a package as an extra-dep.
+
+For further information, see the [REPL environment](../commands/ghci_command.md)
+documentation.
diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md
deleted file mode 100644
index ae6a777b9c..0000000000
--- a/doc/yaml_configuration.md
+++ /dev/null
@@ -1,1596 +0,0 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
-
-# Configuration and customisation
-
-Stack is configured by the content of YAML files. Some Stack operations can also
-be customised by the use of scripts.
-
-## YAML configuration
-
-Stack's YAML configuration options break down into
-[project-specific](#project-specific-configuration) options and
-[non-project-specific](#non-project-specific-configuration) options. They are
-configured at the project-level or globally.
-
-The **project-level** configuration file (`stack.yaml`) contains
-project-specific options and may contain non-project-specific options.
-
-Stack obtains project-level configuration from one of the following (in order of
-preference):
-
-1. A file specified by the `--stack-yaml` command line option.
-2. A file specified by the `STACK_YAML` environment variable.
-3. A file named `stack.yaml` in the current directory or an ancestor directory.
-4. A file name `stack.yaml` in the `global-project` directory in the Stack root.
-
-The **global** configuration file (`config.yaml`) contains only
-non-project-specific options.
-
-Stack obtains global configuration from a file named `config.yaml`:
-
-1. on Unix-like operating systems only, located in `/etc/stack` (for system-wide
-   options); and/or
-2. located in the Stack root (for user-specific options).
-
-This page is intended to document fully all YAML configuration options. If you
-identify any inaccuracies or incompleteness, please update the page, and if
-you're not sure how, open an issue labeled "question".
-
-If you wish to understand the difference between a `stack.yaml` files and a
-Cabal file (named `<package_name>.cabal`), see the
-[stack.yaml vs a Cabal file](stack_yaml_vs_cabal_package_file.md) documentation.
-
-## Project-specific configuration
-
-Project-specific configuration options are valid only in a project-level
-configuration file (`stack.yaml`).
-
-> Note: We define **project** to mean a directory that contains a `stack.yaml`
-> file, which specifies how to build a set of packages. We define **package** to
-> be a package with a Cabal file or an Hpack `package.yaml` file.
-
-In your project-specific options, you specify both **which local packages** to
-build and **which dependencies to use** when building these packages. Unlike the
-user's local packages, these dependencies aren't built by default. They only get
-built when needed.
-
-Shadowing semantics, described
-[here](https://docs.haskellstack.org/en/v1.5.1/architecture/#shadowing), are
-applied to your configuration. So, if you add a package to your `packages` list,
-it will be used even if you're using a snapshot that specifies a particular
-version. Similarly, `extra-deps` will shadow the version specified in the
-resolver.
-
-### resolver or snapshot
-
-Command line equivalent (takes precedence): `--resolver` option
-
-`resolver` and `snapshot` are synonyms. Only one of these keys is permitted, not
-both.
-
-The `resolver` or `snapshot` key specifies which snapshot is to be used for this
-project. A snapshot defines a GHC version, a number of packages available for
-installation, and various settings like build flags. It is called a resolver
-since a snapshot states how dependencies are resolved. There are currently
-four resolver types:
-
-* LTS Haskell snapshots, e.g. `resolver: lts-19.17`
-* Stackage Nightly snapshots, e.g. `resolver: nightly-2002-08-04`
-* No snapshot, just use packages shipped with the compiler. For GHC this looks
-  like `resolver: ghc-9.2.4`
-* Custom snapshot, via a URL or relative file path. For further information, see
-  the [Pantry](pantry.md) documentation.
-
-Each of these resolvers will also determine what constraints are placed on the
-compiler version. See the [compiler-check](#compiler-check) option for some
-additional control over compiler version.
-
-The `resolver` key corresponds to a Pantry snapshot location. For further
-information, see the [Pantry](pantry.md) documentation.
-
-### packages
-
-Default:
-
-~~~yaml
-packages:
-- .
-~~~
-
-_NOTE_ From Stack 1.11, Stack moved over to Pantry for managing extra-deps, and
-removed some legacy syntax for specifying dependencies in `packages`. Some
-conversion notes are provided below.
-
-The `packages` key specifies a list of packages that are part of your local
-project. These are specified via paths to local directories. The paths are
-considered relative to the directory containing the `stack.yaml` file. For
-example, if your `stack.yaml` is located at `/foo/bar/stack.yaml`, and you have:
-
-~~~yaml
-packages:
-- hello
-- there/world
-~~~
-
-Your configuration means "I have packages in `/foo/bar/hello` and
-`/foo/bar/there/world`.
-
-If these packages should be treated as dependencies instead, specify them in
-`extra-deps` key, described below.
-
-The `packages` key is _optional_. The default item, '`.`', means that your
-project has exactly one package, and it is located in the current directory.
-
-Each package directory specified must have a valid Cabal file or Hpack
-`package.yaml` file present. The subdirectories of the directory are not
-searched for Cabal files. Subdirectories will have to be specified as
-independent items in the list of packages.
-
-Project packages are different from snapshot dependencies (via `resolver`) and
-extra dependencies (via `extra-deps`) in multiple ways, e.g.:
-
-* Project packages will be built by default with a `stack build` without
-  specific targets. Dependencies will only be built if they are depended upon.
-* Test suites and benchmarks may be run for project packages. They are never run
-  for extra dependencies.
-
-__Legacy syntax__ Prior to Stack 1.11, it was possible to specify dependencies
-in your `packages` configuration value as well. This support was removed to
-simplify the file format. Instead, these values should be moved to `extra-deps`.
-As a concrete example, you would convert:
-
-~~~yaml
-packages:
-- .
-- location:
-    git: https://github.com/bitemyapp/esqueleto.git
-    commit: 08c9b4cdf977d5bcd1baba046a007940c1940758
-  extra-dep: true
-- location:
-    git: https://github.com/yesodweb/wai.git
-    commit: 6bf765e000c6fd14e09ebdea6c4c5b1510ff5376
-    subdirs:
-      - wai-extra
-  extra-dep: true
-
-extra-deps:
-  - streaming-commons-0.2.0.0
-  - time-1.9.1
-  - yesod-colonnade-1.3.0.1
-  - yesod-elements-1.1
-~~~
-
-into
-
-~~~yaml
-packages:
-- .
-
-extra-deps:
-  - streaming-commons-0.2.0.0
-  - time-1.9.1
-  - yesod-colonnade-1.3.0.1
-  - yesod-elements-1.1
-  - git: https://github.com/bitemyapp/esqueleto.git
-    commit: 08c9b4cdf977d5bcd1baba046a007940c1940758
-  - git: https://github.com/yesodweb/wai.git
-    commit: 6bf765e000c6fd14e09ebdea6c4c5b1510ff5376
-    subdirs:
-      - wai-extra
-~~~
-
-And, in fact, the `packages` value could be left off entirely since it's using
-the default value.
-
-### extra-deps
-
-Default: `[]`
-
-This key allows you to specify extra dependencies on top of what is defined in
-your snapshot (specified by the `resolver` key mentioned above). These
-dependencies may either come from a local file path or a Pantry package
-location.
-
-For the local file path case, the same relative path rules as apply to
-`packages` apply.
-
-Pantry package locations allow you to include dependencies from three different
-kinds of sources:
-
-* Hackage
-* Archives (tarballs or zip files, either local or over HTTP or HTTPS)
-* Git or Mercurial repositories
-
-Here's an example using all of the above:
-
-~~~yaml
-extra-deps:
-- vendor/hashable
-- streaming-commons-0.2.0.0
-- time-1.9.1
-- yesod-colonnade-1.3.0.1
-- yesod-elements-1.1
-- git: https://github.com/bitemyapp/esqueleto.git
-  commit: 08c9b4cdf977d5bcd1baba046a007940c1940758
-- url: https://github.com/yesodweb/wai/archive/6bf765e000c6fd14e09ebdea6c4c5b1510ff5376.tar.gz
-  subdirs:
-    - wai-extra
-- github: snoyberg/conduit
-  commit: 2e3e41de93821bcfe8ec6210aeca21be3f2087bf
-  subdirs:
-    - network-conduit-tls
-~~~
-
-For further information on the format for specifying dependencies, see the
-[Pantry](pantry.md) documentation.
-
-### flags
-
-Default: `{}`
-
-Command line equivalent (takes precedence): `stack build --flag` option
-
-Flags can be set for each package separately. For example:
-
-~~~yaml
-flags:
-  package-name:
-    flag-name: true
-~~~
-
-If a specified flag is different than the one specified for a snapshot package,
-then the snapshot package will automatically be promoted to be an extra-dep.
-
-### drop-packages
-
-[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
-
-Default: `[]`
-
-Packages which, when present in the snapshot specified in `resolver`, should not
-be included in our package. This can be used for a few different purposes, e.g.:
-
-* Ensure that packages you don't want used in your project cannot be used in a
-  `package.yaml` file (e.g., for license reasons)
-* Prevent overriding of a global package like `Cabal`. For more information, see
-  Stackage issue
-  [#4425](https://github.com/commercialhaskell/stackage/issues/4425)
-* When using a custom GHC build, avoid incompatible packages (see this
-  [comment](https://github.com/commercialhaskell/stack/pull/4655#issuecomment-477954429)).
-
-~~~yaml
-drop-packages:
-- Cabal
-- buggy-package
-- package-with-unacceptable-license
-~~~
-
-### user-message
-
-If present, specifies a message to be displayed every time the configuration is
-loaded by Stack. It can serve as a reminder for the user to review the
-configuration and make any changes if needed. The user can delete this message
-if the generated configuration is acceptable.
-
-For example, a user-message is inserted by `stack init` when it omits packages
-or adds external dependencies, namely:
-
-~~~yaml
-user-message: ! 'Warning: Some packages were found to be incompatible with the resolver
-  and have been left commented out in the packages section.
-
-  Warning: Specified resolver could not satisfy all dependencies. Some external packages
-  have been added as dependencies.
-
-  You can omit this message by removing it from stack.yaml
-
-'
-~~~
-
-### custom-preprocessor-extensions
-
-Default: `[]`
-
-Command line equivalent: `--customer-preprocessor-extensions` option
-
-In order for Stack to be aware of any custom preprocessors you are using, add
-their extensions here
-
-~~~yaml
-custom-preprocessor-extensions:
-- erb
-~~~
-
-TODO: Add a simple example of how to use custom preprocessors.
-
-## Non-project-specific configuration
-
-Non-project configuration options are valid in a project-level configuration
-file (`stack.yaml`) or in global configuration files (`config.yaml`). The
-options below are listed in alphabetic order.
-
-### allow-different-user
-
-[:octicons-tag-24: 1.0.1.0](https://github.com/commercialhaskell/stack/releases/tag/v1.0.1.0)
-
-Restrictions: POSIX systems only.
-
-Default: `false`
-
-Command line equivalent (takes precedence): `--[no-]allow-different-user` flag
-
-Allow users other than the owner of the Stack root to use the Stack
-installation.
-
-~~~yaml
-allow-different-user: true
-~~~
-
-The intention of this option is to prevent file permission problems, for example
-as the result of a Stack command executed under `sudo`.
-
-The option is automatically enabled when Stack is re-spawned in a Docker
-process.
-
-### allow-newer
-
-[:octicons-tag-24: 0.1.8.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.8.0)
-
-Default: `false`
-
-Whether to ignore version bounds in Cabal files. This also ignores lower bounds.
-The name `allow-newer` is chosen to match the commonly-used Cabal option.
-
-
-~~~yaml
-allow-newer: true
-~~~
-
-### apply-ghc-options
-
-[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
-
-Default: `locals`
-
-Which packages do ghc-options on the command line get applied to? Before Stack
-0.1.6, the default value was `targets`
-
-~~~yaml
-apply-ghc-options: locals # all local packages
-# apply-ghc-options: targets # all local packages that are targets
-# apply-ghc-options: everything # applied even to snapshot and extra-deps
-~~~
-
-Note that `everything` is a slightly dangerous value, as it can break invariants
-about your snapshot database.
-
-### arch
-
-Default: The machine architecture on which Stack is running.
-
-Command line equivalent (takes precedence): `--arch` option
-
-Stack identifies different GHC executables by platform (operating system and
-machine architecture), (optional) GHC variant and (optional) GHC build.
-See [`setup-info`](#setup-info).
-
-`arch` sets the machine architecture. Values are those recognized by Cabal,
-including `x86_64`, `i386` and `aarch64`.
-
-### build
-
-[:octicons-tag-24: 1.1.0](https://github.com/commercialhaskell/stack/releases/tag/v1.1.0)
-
-Default:
-
-~~~yaml
-build:
-  library-profiling: false
-  executable-profiling: false
-  copy-bins: false
-  prefetch: false
-  keep-going: false
-  keep-tmp-files: false
-
-  # NOTE: global usage of haddock can cause build failures when documentation is
-  # incorrectly formatted.  This could also affect scripts which use Stack.
-  haddock: false
-  haddock-arguments:
-    haddock-args: []      # Additional arguments passed to haddock, --haddock-arguments
-    # haddock-args:
-    # - "--css=/home/user/my-css"
-  open-haddocks: false    # --open
-  haddock-deps: false     # if unspecified, defaults to true if haddock is set
-  haddock-internal: false
-
-  # These are inadvisable to use in your global configuration, as they make the
-  # Stack build command line behave quite differently.
-  test: false
-  test-arguments:
-    rerun-tests: true   # Rerun successful tests
-    additional-args: [] # --test-arguments
-    # additional-args:
-    # - "--fail-fast"
-    coverage: false
-    no-run-tests: false
-  bench: false
-  benchmark-opts:
-    benchmark-arguments: ""
-    # benchmark-arguments: "--csv bench.csv"
-    no-run-benchmarks: false
-  force-dirty: false
-  reconfigure: false
-  cabal-verbose: false
-  split-objs: false
-
-  # Since 1.8. Starting with 2.0, the default is true
-  interleaved-output: true
-
-  # Since 1.10
-  ddump-dir: ""
-~~~
-
-Command line equivalents (take precedence): Yes, see below.
-
-Allows setting build options which are usually specified on the command line.
-
-The meanings of these settings correspond directly with the command line flags
-of the same name. For further information, see the
-[`stack build` command](build_command.md) documentation and the
-[users guide](GUIDE.md#the-build-command).
-
-### color
-
-Command line equivalent (takes precedence): `--color` option
-
-This option specifies when to use color in output. The option is used as
-`color: <WHEN>`, where `<WHEN>` is 'always', 'never', or 'auto'. On Windows
-versions before Windows 10, for terminals that do not support color codes, the
-default is 'never'; color may work on terminals that support color codes.
-
-(The British English spelling (colour) is also accepted. In yaml configuration
-files, the American spelling is the alternative that has priority.)
-
-### compiler
-
-[:octicons-tag-24: 0.1.8.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.8.0)
-
-Command line equivalent (takes precedence): `--compiler` option
-
-Overrides the compiler version in the resolver. Note that the `compiler-check`
-flag also applies to the version numbers. This uses the same syntax as compiler
-resolvers like `ghc-9.2.4`. This can be used to override the
-compiler for a Stackage snapshot, like this:
-
-~~~yaml
-resolver: lts-14.20
-compiler: ghc-8.6.4
-compiler-check: match-exact
-~~~
-
-#### Building GHC from source (experimental)
-
-[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
-
-Stack supports building the GHC compiler from source. The version to build and
-to use is defined by a a Git commit ID and an Hadrian "flavour" (Hadrian is the
-build system of GHC) with the following syntax:
-
-~~~yaml
-compiler: ghc-git-COMMIT-FLAVOUR
-~~~
-
-In the following example the commit ID is "5be7ad..." and the flavour is
-"quick":
-
-~~~yaml
-compiler: ghc-git-5be7ad7861c8d39f60b7101fd8d8e816ff50353a-quick
-~~~
-
-By default the code is retrieved from the main GHC repository. If you want to
-select another repository, set the "compiler-repository" option:
-
-~~~yaml
-compiler-repository: git://my/ghc/repository
-# default
-# compiler-repository: https://gitlab.haskell.org/ghc/ghc.git
-~~~
-
-Note that Stack doesn't check the compiler version when it uses a compiler built
-from source. Moreover it is assumed that the built compiler is recent enough as
-Stack doesn't enable any known workaround to make older compilers work.
-
-Building the compiler can take a very long time (more than one hour). Hint: for
-faster build times, use Hadrian flavours that disable documentation generation.
-
-#### Global packages
-
-The GHC compiler you build from sources may depend on unreleased versions of
-some global packages (e.g. Cabal). It may be an issue if a package you try to
-build with this compiler depends on such global packages because Stack may not
-be able to find versions of those packages (on Hackage, etc.) that are
-compatible with the compiler.
-
-The easiest way to deal with this issue is to drop the offending packages as
-follows. Instead of using the packages specified in the resolver, the global
-packages bundled with GHC will be used.
-
-~~~yaml
-drop-packages:
-- Cabal
-- ...
-~~~
-
-Another way to deal with this issue is to add the relevant packages as
-`extra-deps` built from source. To avoid mismatching versions, you can use
-exactly the same commit id you used to build GHC as follows:
-
-~~~
-extra-deps:
-- git: https://gitlab.haskell.org/ghc/ghc.git
-  commit: 5be7ad7861c8d39f60b7101fd8d8e816ff50353a
-  subdirs:
-    - libraries/Cabal/Cabal
-    - libraries/...
-~~~
-
-#### Bootstrapping compiler
-
-Building GHC from source requires a working GHC (known as the bootstrap
-compiler). As we use a Stack based version of Hadrian (`hadrian/build-stack` in
-GHC sources), the bootstrap compiler is configured into `hadrian/stack.yaml` and
-fully managed by Stack.
-
-### compiler-check
-
-[:octicons-tag-24: 0.1.4.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.4.0)
-
-Default: `match-minor`
-
-Specifies how the compiler version in the resolver is matched against concrete
-versions. Valid values:
-
-* `match-minor`: make sure that the first three components match, but allow
-  patch-level differences. For example< 7.8.4.1 and 7.8.4.2 would both match
-  7.8.4. This is useful to allow for custom patch levels of a compiler.
-* `match-exact`: the entire version number must match precisely
-* `newer-minor`: the third component can be increased, e.g. if your resolver is
-  `ghc-7.10.1`, then 7.10.2 will also be allowed. This was the default up
-  through Stack 0.1.3
-
-### concurrent-tests
-
-[:octicons-tag-24: 0.1.2.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.2.0)
-
-Default: `true`
-
-This option specifies whether test suites should be executed concurrently with
-each other. The default is `true` since this is usually fine and it often means
-that tests can complete earlier. However, if some test suites require exclusive
-access to some resource, or require a great deal of CPU or memory resources,
-then it makes sense to set this to `false`.
-
-~~~yaml
-concurrent-tests: false
-~~~
-
-### configure-options
-
-[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
-
-Options which are passed to the configure step of the Cabal build process.
-These can either be set by package name, or using the `$everything`,
-`$targets`, and `$locals` special keys. These special keys have the same
-meaning as in `ghc-options`.
-
-~~~yaml
-configure-options:
-  $everything:
-  - --with-gcc
-  - /some/path
-  my-package:
-  - --another-flag
-~~~
-
-### connection-count
-
-Default: `8`
-
-Integer indicating how many simultaneous downloads are allowed to happen.
-
-### default-template
-
-Default: `new-template` in the
-[stack-templates](https://github.com/commercialhaskell/stack-templates/)
-repository.
-
-This option specifies which template to use with `stack new`, when none is
-specified. Other templates are listed in the
-[stack-templates](https://github.com/commercialhaskell/stack-templates/)
-repository. See the output of `stack templates`.
-
-### docker
-
-Command line equivalents: `--docker-*` flags and options (see
-`stack --docker-help` for details).
-
-For further information, see the
-[Docker integration](docker_integration.md#configuration) documentation.
-
-### dump-logs
-
-[:octicons-tag-24: 1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v1.3.0)
-
-Default: `warning`
-
-Command line equivalent (takes precedence): `--[no-]dump-logs` flag
-
-In the case of *non-interleaved* output and *more than one* target package,
-Stack sends the build output from GHC for each target package to a log file,
-unless an error occurs. For further information, see the
-[`stack build --[no-]interleaved-output` flag](build_command.md#the-stack-build---no-interleaved-output-flag)
-documentation.
-
-The value of the `dump-logs` key controls what, if any, log file content is sent
-('dumped') to the console at the end of the build. Possible values are:
-
-~~~yaml
-dump-logs: none      # don't dump the content of any log files
-dump-logs: warning   # dump the content of log files that are warnings
-dump-logs: all       # dump all of the content of log files
-~~~
-
-At the command line, `--no-dump-logs` is equivalent to `dump-logs: none` and
-`--dump-logs` is equivalent to `dump-logs: all`.
-
-### extra-include-dirs
-
-Default: `[]`
-
-Command line equivalent: `--extra-include-dirs` option (repeat for each
-directory)
-
-A list of extra paths to be searched for header files. Paths should be absolute
-
-~~~yaml
-extra-include-dirs:
-- /opt/foo/include
-~~~
-
-Since these are system-dependent absolute paths, it is recommended that you
-specify these in your `config.yaml` file. If you control the build environment
-in your project's ``stack.yaml``, perhaps through docker or other means, then it
-may well make sense to include these there as well.
-
-### extra-lib-dirs
-
-Default: `[]`
-
-Command line equivalent: `--extra-lib-dirs` option (repeat for each directory)
-
-A list of extra paths to be searched for libraries. Paths should be absolute
-
-~~~yaml
-extra-lib-dirs:
-- /opt/foo/lib
-~~~
-
-Since these are system-dependent absolute paths, it is recommended that you
-specify these in your `config.yaml` file. If you control the build environment
-in your project's ``stack.yaml``, perhaps through Docker or other means, then it
-may well make sense to include these there as well.
-
-### extra-path
-
-[:octicons-tag-24: 0.1.4.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.4.0)
-
-This option specifies additional directories to prepend to the PATH. These will
-be used when resolving the location of executables, and will also be visible in
-the PATH of processes run by Stack.
-
-For example, to prepend `/path-to-some-dep/bin` to your PATH:
-
-~~~yaml
-extra-path:
-- /path-to-some-dep/bin
-~~~
-
-Other paths added by Stack - things like the project's binary directory and the
-compiler's binary directory - will take precedence over those specified here
-(the automatic paths get prepended).
-
-### ghc-build
-
-[:octicons-tag-24: 1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v1.3.0)
-
-Default: `standard`
-
-Command line equivalent (takes precedence): `--ghc-build` option
-
-Stack identifies different GHC executables by platform (operating system and
-machine architecture), (optional) GHC variant and (optional) GHC build.
-See [`setup-info`](#setup-info).
-
-`ghc-build` specifies a specialized architecture for the GHC executable.
-Normally this is determined automatically, but it can be overridden. Possible
-arguments include `standard`, `gmp4`, `nopie`, `tinfo6`, `tinfo6-nopie`,
-`ncurses6`, `int-native` and `integersimple`.
-
-### ghc-options
-
-[:octicons-tag-24: 0.1.4.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.4.0)
-
-Allows specifying per-package and global GHC options:
-
-~~~yaml
-ghc-options:
-    # All packages
-    "$locals": -Wall
-    "$targets": -Werror
-    "$everything": -O2
-    some-package: -DSOME_CPP_FLAG
-~~~
-
-Since Stack 1.6.0, setting a GHC options for a specific package will
-automatically promote it to a local package (much like setting a custom package
-flag). However, setting options via `$everything` on all flags will not do so
-(see
-[GitHub discussion](https://github.com/commercialhaskell/stack/issues/849#issuecomment-320892095)
-for reasoning). This can lead to unpredictable behavior by affecting your
-snapshot packages.
-
-The behavior of the `$locals`, `$targets`, and `$everything` special keys
-mirrors the behavior for the
-[`apply-ghc-options` setting](#apply-ghc-options), which affects command line
-parameters.
-
-!!! note
-
-    Prior to Stack 1.6.0, the `$locals`, `$targets`, and `$everything` keys
-    were not supported. Instead, you could use `"*"` for the behavior
-    represented now by `$everything`. It is highly recommended to switch to the
-    new, more expressive, keys.
-
-### ghc-variant
-
-[:octicons-tag-24: 0.1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.5.0)
-
-Default: `standard`
-
-Command line equivalent (takes precedence): `--ghc-variant` option
-
-Stack identifies different GHC executables by platform (operating system and
-machine architecture), (optional) GHC variant and (optional) GHC build.
-See [`setup-info`](#setup-info).
-
-`ghc-variant` specifies a variant of the GHC executable. Known values are:
-
-* `standard`: Use the standard GHC binary distribution
-* `int-native`: From GHC 9.4.1, use a GHC bindist that uses the Haskell-native
-   big-integer
-  [backend](https://downloads.haskell.org/~ghc/9.0.2/docs/html/users_guide/9.0.1-notes.html#highlights).
-  For further information, see this [article](https://iohk.io/en/blog/posts/2020/07/28/improving-haskells-big-numbers-support/).
-* `integersimple`: Use a GHC bindist that uses
-  [integer-simple instead of GMP](https://ghc.haskell.org/trac/ghc/wiki/ReplacingGMPNotes)
-* any other value: Use a custom GHC bindist. You should specify
-  [setup-info](#setup-info) or [setup-info-locations](#setup-info-locations)
-  so `stack setup` knows where to download it,
-  or pass the `stack setup --ghc-bindist` argument on the command-line
-
-This option is incompatible with `system-ghc: true`.
-
-### hackage-base-url
-
-[:octicons-tag-24: 1.9.1](https://github.com/commercialhaskell/stack/releases/tag/v1.9.1)
-
-Default: `https://hackage.haskell.org/`
-
-Sets the address of the Hackage server to upload the package to.
-
-~~~yaml
-hackage-base-url: https://hackage.example.com/
-~~~
-
-### hide-source-paths
-
-Default: `true`
-([:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1))
-
-Whether to use the `-fhide-source-paths` option by default for GHC >= 8.2:
-
-~~~yaml
-hide-source-paths: false
-~~~
-
-Build output when enabled:
-
-~~~text
-...
-[1 of 2] Compiling Lib
-[2 of 2] Compiling Paths_test_pr
-...
-~~~
-
-Build output when disabled:
-
-~~~text
-...
-[1 of 2] Compiling Lib              ( src/Lib.hs, .stack-work/dist/x86_64-linux-tinfo6/Cabal-2.4.0.1/build/Lib.o )
-...
-~~~
-
-### hide-th-loading
-
-Default: `true`
-
-Strip out the "Loading ..." lines from GHC build output, produced when using
-Template Haskell.
-
-### ignore-revision-mismatch
-
-(Removed 1.11)
-
-This flag was introduced in Stack 1.6, and removed on the move to Pantry. You
-will receive a warning if this configuration value is set.
-
-### install-ghc
-
-Default: `true`
-([:octicons-tag-24: 1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v1.5.0))
-
-Command line equivalent (takes precedence): `--[no-]install-ghc` flag
-
-Whether or not to automatically install GHC when necessary.
-
-### jobs
-
-Default: the number of processors reported by your CPU.
-
-Command line equivalent (takes precedence): `-j`, `--jobs` option
-
-Specifies how many build tasks should be run in parallel. One usage for this
-might be to avoid running out of memory by setting it to 1, like this:
-
-~~~yaml
-jobs: 1
-~~~
-
-### local-bin-path
-
-Default (on Unix-like operating systems): `~/.local/bin`
-
-Default (on Windows): `%APPDATA%\local\bin`
-
-Command line equivalent (takes precedence): `--local-bin-path` option
-
-Target directory for `stack install` and `stack build --copy-bins`.
-
-### local-programs-path
-
-[:octicons-tag-24: 1.3.0](https://github.com/commercialhaskell/stack/releases/tag/v1.3.0)
-
-The behaviour of this option differs between Unix-like operating systems and
-Windows.
-
-=== "Unix-like"
-
-    Default: `programs` directory in the Stack root.
-
-    This overrides the location of the Stack 'programs' directory, where tools
-    like GHC get installed.
-
-=== "Windows"
-
-    Default: `%LOCALAPPDATA%\Programs\stack`, if the `%LOCALAPPDATA%`
-    environment variable exists.
-
-    This overrides the location of the Stack 'programs' directory, where tools
-    like GHC and MSYS2 get installed.
-
-    !!! warning
-
-        If there is a space character in the `%LOCALAPPDATA%` path (which may be
-        the case if the relevant user account name and its corresponding user
-        profile path have a space) this may cause problems with building
-        packages that make use of the GNU project's `autoconf` package and
-        `configure` shell script files. That may be the case particularly if
-        there is no corresponding short name ('8 dot 3' name) for the directory
-        in the path with the space (which may be the case if '8 dot 3' names
-        have been stripped or their creation not enabled by default). If there
-        are problems building, it will be necessary to override the default
-        location of Stack's 'programs' directory to specify an alternative path
-        that does not contain space characters. Examples of packages on
-        Hackage that make use of `configure` are `network` and `process`.
-
-### modify-code-page
-
-[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
-
-Restrictions: Windows systems only.
-
-Default: `true`
-
-Command line equivalent (takes precedence): `--[no-]modify-code-page` flag
-
-Whether to modify the code page for UTF-8 output.
-
-~~~yaml
-modify-code-page: false
-~~~
-
-### nix
-
-[:octicons-tag-24: 0.1.10.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.10.0)
-
-Default:
-
-~~~yaml
-nix:
-  add-gc-roots: false
-  enable: false
-  nix-shell-options: []
-  packages: []
-  path: []
-  pure: true
-  shell-file:
-~~~
-
-Command line equivalents: `--nix-*` flags and options (see `stack --nix-help`
-for details).
-
-For further information, see the
-[Nix integration](nix_integration.md#configuration) documentation.
-
-### package-indices
-
-[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
-
-Default:
-
-~~~yaml
-package-indices:
-- download-prefix: https://hackage.haskell.org/
-  hackage-security:
-    keyids:
-    - 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d
-    - 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42
-    - 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3
-    - 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921
-    - fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0
-    key-threshold: 3
-    ignore-expiry: true
-~~~
-
-!!! note
-
-    Before Stack 2.1.3, the default for `ignore-expiry` was `false`. For more
-    information, see
-    [issue #4928](https://github.com/commercialhaskell/stack/issues/4928).
-
-!!! note
-
-    Before Stack 2.1.1, Stack had a different approach to `package-indices`. For
-    more information, see
-    [issue #4137](https://github.com/commercialhaskell/stack/issues/4137).
-
-Specify the package index. The index must use the
-[Hackage Security](https://hackage.haskell.org/package/hackage-security) format.
-This setting is most useful for providing a mirror of the official Hackage
-server for
-
-* bypassing a firewall; or
-* faster downloads.
-
-If the setting specifies an index that does not mirror Hackage, it is likely
-that will result in significant breakage, including most snapshots failing to
-work.
-
-In the case of Hackage, the keys of its root key holders are contained in the
-`haskell-infra/hackage-root-keys`
-[repository](https://github.com/haskell-infra/hackage-root-keys). The Hackage
-package index is signed. A signature is valid when three key holders have
-signed. The Hackage timestamp is also signed. A signature is valid when one key
-holder has signed.
-
-If the `hackage-security` key is absent, the Hackage Security configuration will
-default to that for the official Hackage server.
-
-`key-threshold` specifies the minimum number of keyholders that must have signed
-the package index for it to be considered valid.
-
-`ignore-expiry` specifies whether or not the expiration of timestamps should be
-ignored.
-
-### pvp-bounds
-
-[:octicons-tag-24: 0.1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.5.0)
-
-Default: `none`
-
-Command line equivalent (takes precedence): `stack sdist --pvp-bounds` option or
-`stack upload --pvp-bounds` option
-
-!!! warning
-
-    As of Stack 1.6.0, this feature does not reliably work, due to issues with
-    the Cabal library's printer. Stack will generate a warning when a lossy
-    conversion occurs, in which case you may need to disable this setting. For
-    further information, see issue
-    [#3550](https://github.com/commercialhaskell/stack/issues/3550).
-
-When using the `sdist` and `upload` commands, this setting determines whether
-the Cabal file's dependencies should be modified to reflect PVP lower and upper
-bounds.
-
-#### Basic use
-
-Values are `none` (unchanged), `upper` (add upper bounds), `lower` (add
-lower bounds), and both (and upper and lower bounds). The algorithm it follows
-is:
-
-* If an upper or lower bound already exists on a dependency, it's left alone
-* When adding a lower bound, we look at the current version specified by
-  `stack.yaml`, and set it as the lower bound (e.g., `foo >= 1.2.3`)
-* When adding an upper bound, we require less than the next major version
-  (e.g., `foo < 1.3`)
-
-~~~yaml
-pvp-bounds: none
-~~~
-
-For further information, see the announcement
-[blog post](https://www.fpcomplete.com/blog/2015/09/stack-pvp).
-
-#### Use with Cabal file revisions
-
-[:octicons-tag-24: 1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v1.5.0)
-
-Each of the values listed above supports adding `-revision` to the end of the
-value, e.g. `pvp-bounds: both-revision`. This means that, when uploading to
-Hackage, Stack will first upload your tarball with an unmodified Cabal file, and
-then upload a Cabal file revision with the PVP bounds added.
-
-This can be useful - especially combined with the
-[Stackage no-revisions feature](http://www.snoyman.com/blog/2017/04/stackages-no-revisions-field) -
-as a method to ensure PVP compliance without having to proactively fix bounds
-issues for Stackage maintenance.
-
-### recommend-stack-upgrade
-
-[:octicons-tag-24: 2.1.1](https://github.com/commercialhaskell/stack/releases/tag/v2.1.1)
-
-When Stack notices that a new version of Stack is available, should it notify
-the user?
-
-~~~yaml
-recommend-stack-upgrade: true
-~~~
-
-### rebuild-ghc-options
-
-[:octicons-tag-24: 0.1.6.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.6.0)
-
-Default: `false`
-
-Should we rebuild a package when its GHC options change? Before Stack 0.1.6,
-this was a non-configurable `true`. However, in most cases, the flag is used to
-affect optimization levels and warning behavior, for which GHC itself doesn't
-actually recompile the modules anyway. Therefore, the new behavior is to not
-recompile on an options change, but this behavior can be changed back with the
-following:
-
-~~~yaml
-rebuild-ghc-options: true
-~~~
-
-### require-stack-version
-
-Default: `"-any"`
-
-Require a version of Stack within the specified range
-([cabal-style](https://www.haskell.org/cabal/users-guide/developing-packages.html#build-information))
-to be used for this project. Example: `require-stack-version: "== 0.1.*"`
-
-### save-hackage-creds
-
-[:octicons-tag-24: 1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v1.5.0)
-
-Default: `true`
-
-Controls whether, when using `stack upload`, the user's Hackage username and
-password are stored in a local file.
-
-~~~yaml
-save-hackage-creds: true
-~~~
-
-### setup-info
-
-[:octicons-tag-24: 0.1.5.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.5.0)
-
-The `setup-info` dictionary specifies download locations for tools to be
-installed during set-up, such as GHC or, on Windows, 7z and MSYS2. The
-dictionary maps `('Tool', 'Platform', 'Version')` to the location where it can
-be obtained. For example, mapping `(GHC, 64-bit Windows, 9.2.3)` to the URL
-hosting the archive file for GHC's installation.
-
-Possible usages of this configuration option are:
-
-1. Using Stack offline or behind a firewall.
-2. Extending the tools known to Stack, such as cutting-edge versions of GHC or
-   builds for custom Linux distributions (for use with the
-   [ghc-variant](#ghc-variant) option).
-
-By default, Stack obtains the dictionary from
-[stack-setup-2.yaml](https://github.com/commercialhaskell/stackage-content/raw/master/stack/stack-setup-2.yaml).
-
-The `setup-info` dictionary is constructed in the following order:
-
-1. `setup-info` in the YAML configuration - inline configuration
-2. `--setup-info-yaml` command line arguments - URLs or paths. Multiple
-   locations may be specified.
-3. `setup-info-locations` in the YAML configuration - URLs or paths. See further
-   below.
-
-The format of this key is the same as in the default
-[stack-setup-2.yaml](https://github.com/commercialhaskell/stackage-content/raw/master/stack/stack-setup-2.yaml).
-For example, GHC 9.2.3 of custom variant `myvariant` (see further below) on
-64-bit Windows:
-
-~~~yaml
-setup-info:
-  ghc:
-    windows64-custom-myvariant:
-      9.2.3:
-        url: "https://example.com/ghc-9.2.3-x86_64-unknown-mingw32-myvariant.tar.xz"
-~~~
-
-'Platforms' are pairs of an operating system and a machine architecture (for
-example, 32-bit i386 or 64-bit x86-64) (represented by the
-`Cabal.Distribution.Systems.Platform` type). Stack currently (version 2.9.1)
-supports the following pairs in the format of the `setup-info` key:
-
-|Operating system|I386 arch|X86_64 arch|Other machine architectures                                 |
-|----------------|---------|-----------|------------------------------------------------------------|
-|Linux           |linux32  |linux64    |AArch64: linux-aarch64, Arm: linux-armv7, Sparc: linux-sparc|
-|OSX             |macosx   |macosx     |                                                            |
-|Windows         |windows32|windows64  |                                                            |
-|FreeBSD         |freebsd32|freebsd64  |AArch64: freebsd-aarch64                                    |
-|OpenBSD         |openbsd32|openbsd64  |                                                            |
-
-For GHC, the distinguishing 'Version' in the key format includes a 'tag' for
-any (optional) GHC variant (see [ghc-variant](#ghc-variant)) and a further 'tag'
-for any (optional) specialised GHC build (see [ghc-build](#ghc-build)).
-
-The optional variant 'tag' is either `-integersimple` or
-`-custom-<custom_variant_name>`.
-
-For example, for GHC 9.0.2 of specialised GHC build `tinfo6` on x86_64 Linux:
-~~~yaml
-setup-info:
-  ghc:
-    linux64-tinfo6:
-      9.0.2:
-        url: "http://downloads.haskell.org/~ghc/9.0.2/ghc-9.0.2a-x86_64-fedora27-linux.tar.xz"
-        content-length: 237286244
-        sha1: affc2aaa3e6a1c446698a884f56a0a13e57f00b4
-        sha256: b2670e9f278e10355b0475c2cc3b8842490f1bca3c70c306f104aa60caff37b0
-~~~
-
-On Windows, the required 7z executable and DLL tools are represented in the
-format of the `setup-info` key simply by `sevenzexe-info` and `sevenzdll-info`.
-
-This configuration **adds** the specified setup information metadata to the
-default. Specifying this configuration **does not** prevent the default
-[stack-setup-2.yaml](https://github.com/commercialhaskell/stackage-content/raw/master/stack/stack-setup-2.yaml)
-from being consulted as a fallback. If, however, you need to **replace** the
-default `setup-info` dictionary, use the following:
-
-~~~yaml
-setup-info-locations: []
-~~~
-
-### setup-info-locations
-
-[:octicons-tag-24: 2.3.1](https://github.com/commercialhaskell/stack/releases/tag/v2.3.1)
-
-Command line equivalent (takes precedence): `--setup-info-yaml` option
-
-By way of introduction, see the [`setup-info`](#setup-info) option. This option
-specifies the location(s) of `setup-info` dictionaries.
-
-The first location which provides a dictionary that specifies the location of a
-tool - `('Tool', 'Platform', 'Version')` - takes precedence. For example, you
-can extend the default tools, with a fallback to the default `setup-info`
-location, as follows:
-
-~~~yaml
-setup-info-locations:
-- C:/stack-offline/my-stack-setup.yaml
-- relative/inside/my/project/setup-info.yaml
-- \\smbShare\stack\my-stack-setup.yaml
-- http://stack-mirror.com/stack-setup.yaml
-# Fallback to the default location
-- https://github.com/commercialhaskell/stackage-content/raw/master/stack/stack-setup-2.yaml
-~~~
-
-Stack only refers to the default `setup-info` location if no locations are
-specified in the `setup-info-locations` configuration or on the command line
-using the `--setup-info-yaml` option.
-
-For example, both of the following will cause `stack setup` not to consult the
-default `setup-info` location:
-
-~~~yaml
-setup-info-locations:
-- C:/stack-offline/my-stack-setup.yaml
-~~~
-
-and
-
-~~~yaml
-setup-info-locations: []
-~~~
-
-Relative paths are resolved relative to the `stack.yaml` file (either the one in
-the local project or the global `stack.yaml`).
-
-Relative paths may also be used for the installation paths to tools (such as GHC
-or 7z). This allows vendoring the tools inside a monorepo (a single repository
-storing many projects). For example:
-
-Directory structure:
-
-~~~text
-- src/
-- installs/
-  - my-stack-setup.yaml
-  - 7z.exe
-  - 7z.dll
-  - ghc-9.2.3.tar.xz
-- stack.yaml
-~~~
-
-In the project's `stack.yaml`:
-
-~~~yaml
-setup-info-locations:
-- installs/my-stack-setup.yaml
-~~~
-
-In `installs/my-stack-setup.yaml`:
-
-~~~yaml
-sevenzexe-info:
-  url: "installs/7z.exe"
-
-sevenzdll-info:
-  url: "installs/7z.dll"
-
-ghc:
-  windows64:
-    9.2.3:
-      url: "installs/ghc-9.2.3.tar.xz"
-~~~
-
-### skip-ghc-check
-
-Default: `false`
-
-Command line equivalent (takes precedence): `--[no-]skip-ghc-check` flag
-
-Should we skip the check to confirm that your system GHC version (on the PATH)
-matches what your project expects?
-
-### skip-msys
-
-[:octicons-tag-24: 0.1.2.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.2.0)
-
-Restrictions: Windows systems only
-
-Default: `false`
-
-Command line equivalent (takes precedence): `--[no-]skip-msys` flag
-
-Skips checking for and installing MSYS2 when stack is Setting up the
-environment. This usually doesn't make sense in project-level configurations,
-just in `config.yaml`.
-
-~~~yaml
-skip-msys: true
-~~~
-
-### snapshot-location-base
-
-[:octicons-tag-24: 2.5.1](https://github.com/commercialhaskell/stack/releases/tag/v2.5.1)
-
-Default: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/
-(as set in the `pantry` library)
-
-Command line equivalent (takes precedence): `--snapshot-location-base` option
-
-Sets the base location of the LTS Haskell or Stackage Nightly snapshots.
-
-For example:
-
-~~~yaml
-snapshot-location-base: https://example.com/snapshots/location/
-~~~
-
-has the following effect:
-
-* `lts-X.Y` expands to `https://example.com/snapshots/location/lts/X/Y.yaml`
-* `nightly-YYYY-MM-DD` expands to
-  `https://example.com/snapshots/location/nightly/YYYY/M/D.yaml`
-
-This key is convenient in setups that restrict access to GitHub, for instance
-closed corporate setups. In this setting, it is common for the development
-environment to have general access to the internet, but not for testing/building
-environments. To avoid the firewall, one can run a local snapshots mirror and
-then use a custom `snapshot-location-base` in the closed environments only.
-
-### stack-colors
-
-Command line equivalent (takes precedence): `--stack-colors` option
-
-Stack uses styles to format some of its output. The default styles do not work
-well with every terminal theme. This option specifies Stack's output styles,
-allowing new styles to replace the defaults. The option is used as
-`stack-colors: <STYLES>`, where `<STYLES>` is a colon-delimited sequence of
-key=value, 'key' is a style name and 'value' is a semicolon-delimited list of
-'ANSI' SGR (Select Graphic Rendition) control codes (in decimal). Use the
-command `stack ls stack-colors --basic` to see the current sequence.
-
-The 'ANSI' standards refer to (1) standard ECMA-48 'Control Functions for Coded
-Character Sets' (5th edition, 1991); (2) extensions in ITU-T Recommendation
-(previously CCITT Recommendation) T.416 (03/93) 'Information Technology – Open
-Document Architecture (ODA) and Interchange Format: Character Content
-Architectures' (also published as ISO/IEC International Standard 8613-6); and
-(3) further extensions used by 'XTerm', a terminal emulator for the X Window
-System. The 'ANSI' SGR codes are described in a
-[Wikipedia article](http://en.wikipedia.org/wiki/ANSI_escape_code)
-and those codes supported on current versions of Windows in
-[Microsoft's documentation](https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences).
-
-For example, users of the popular
-[Solarized Dark](https://ethanschoonover.com/solarized/)
-terminal theme might wish to set the styles as follows:
-
-~~~yaml
-stack-colors: error=31:good=32:shell=35:dir=34:recommendation=32:target=95:module=35:package-component=95:secondary=92:highlight=32
-~~~
-In respect of styles used in verbose output, some of that output occurs before
-the configuration file is processed.
-
-(The British English spelling (colour) is also accepted. In YAML configuration
-files, the American spelling is the alternative that has priority.)
-
-### stack-developer-mode
-
-[:octicons-tag-24: 2.3.3](https://github.com/commercialhaskell/stack/releases/tag/v2.3.3)
-
-Default (official distributed binaries): `false`
-
-Default (built from source): `true`
-
-Turns on a mode where some messages are printed at WARN level instead of DEBUG
-level, especially useful for developers of Stack itself.
-
-~~~yaml
-stack-developer-mode: false
-~~~
-
-### system-ghc
-
-Default: `false`, unless the [Docker](docker_integration.md) or
-[Nix](nix_integration.md) integration is enabled.
-
-Command line equivalent (takes precedence): `--[no-]system-ghc` flag
-
-Enables or disables using the GHC available on the PATH. (Make sure PATH is
-explicit, i.e., don't use ~.) Useful to enable if you want to save the time,
-bandwidth or storage space needed to setup an isolated GHC.
-
-In a Nix-enabled configuration, Stack is incompatible with `system-ghc: false`.
-
-~~~yaml
-# Turn on system GHC
-system-ghc: true
-~~~
-
-### templates
-
-Command line equivalent (takes precedence): `stack new --param <key>:<value>`
-(or `-p`) option
-
-Templates used with `stack new` have a number of parameters that affect the
-generated code. These can be set for all new projects you create. The result of
-them can be observed in the generated LICENSE and Cabal files. The value for all
-of these parameters must be strings.
-
-The parameters are: `author-email`, `author-name`, `category`, `copyright`,
-`year` and `github-username`.
-
-* _author-email_ - sets the `maintainer` property in Cabal
-* _author-name_ - sets the `author` property in Cabal and the name used in
-  LICENSE
-* _category_ - sets the `category` property in Cabal. This is used in Hackage.
-  For examples of categories see
-  [Packages by category](https://hackage.haskell.org/packages/). It makes sense
-  for `category` to be set on a per project basis because it is uncommon for all
-  projects a user creates to belong to the same category. The category can be
-  set per project by passing `-p "category:value"` to the `stack new` command.
-* _copyright_ - sets the `copyright` property in Cabal. It is typically the
-  name of the holder of the copyright on the package and the year(s) from which
-  copyright is claimed. For example: `Copyright (c) 2006-2007 Joe Bloggs`
-* _year_ - if `copyright` is not specified, `year` and `author-name` are used
-  to generate the copyright property in Cabal. If `year` is not specified, it
-  defaults to the current year.
-* _github-username_ - used to generate `homepage` and `source-repository` in
-  Cabal. For instance `github-username: myusername` and
-  `stack new my-project new-template` would result:
-
-~~~yaml
-homepage: http://github.com/myusername/my-project#readme
-
-source-repository head
-  type: git
-  location: https://github.com/myusername/my-project
-~~~
-
-These properties can be set in `config.yaml` as follows:
-~~~yaml
-templates:
-  params:
-    author-name: Your Name
-    author-email: youremail@example.com
-    category: Your Projects Category
-    copyright: 'Copyright (c) 2022 Your Name'
-    github-username: yourusername
-~~~
-
-Additionally, `stack new` can automatically initialize source control
-repositories in the directories it creates.  Source control tools can be
-specified with the `scm-init` option. At the moment, only `git` is supported.
-
-~~~yaml
-templates:
-  scm-init: git
-~~~
-
-### urls
-
-Default:
-
-~~~yaml
-urls:
-  latest-snapshot: https://www.stackage.org/download/snapshots.json
-~~~
-
-Customize the URLs where Stack looks for snapshot build plans.
-
-### with-gcc
-
-Command line equivalent (takes precedence): `--with-gcc` option
-
-Specify a path to GCC explicitly, rather than relying on the normal path
-resolution.
-
-~~~yaml
-with-gcc: /usr/local/bin/gcc-5
-~~~
-
-### with-hpack
-
-Command line equivalent (takes precedence): `--with-hpack` option
-
-Use an [Hpack](https://github.com/sol/hpack) executable, rather than Stack's
-in-built version of the Hpack functionality.
-
-~~~yaml
-with-hpack: /usr/local/bin/hpack
-~~~
-
-### work-dir
-
-[:octicons-tag-24: 0.1.10.0](https://github.com/commercialhaskell/stack/releases/tag/v0.1.10.0)
-
-Default: `.stack-work`
-
-Command line equivalent (takes precedence): `--work-dir` option
-
-Environment variable alternative (lowest precedence): `STACK_WORK`
-
-`work-dir` (or the contents of `STACK_WORK`) specifies the relative path of
-Stack's 'work' directory.
-
-## Customisation scripts
-
-### GHC installation customisation
-
-[:octicons-tag-24: 2.9.1](https://github.com/commercialhaskell/stack/releases/tag/v2.9.1)
-
-On Unix-like operating systems and Windows, Stack's installation procedure can
-be fully customised by placing a `sh` shell script (a 'hook') in the Stack root
-directory at `hooks/ghc-install.sh`. On Unix-like operating systems, the script
-file must be made executable. The script is run by the `sh` application (which
-is provided by MSYS2 on Windows).
-
-The script **must** return an exit code of `0` and the standard output **must**
-be the absolute path to the GHC binary that was installed. Otherwise Stack will
-ignore the script and possibly fall back to its own installation procedure.
-
-The script is not run when `system-ghc: true`.
-
-When `install-ghc: false`, the script is still run, which allows you to ensure
-that only your script will install GHC and Stack won't default to its own
-installation logic, even when the script fails.
-
-The following environment variables are always available to the script:
-
-* `HOOK_GHC_TYPE = "bindist" | "git" | "ghcjs"`
-
-For "bindist", additional variables are:
-
-* `HOOK_GHC_VERSION = <ver>`
-
-For "git", additional variables are:
-
-* `HOOK_GHC_COMMIT = <commit>`
-* `HOOK_GHC_FLAVOR = <flavor>`
-
-For "ghcjs", additional variables are:
-
-* `HOOK_GHC_VERSION = <ver>`
-* `HOOK_GHCJS_VERSION = <ver>`
-
-An example script is:
-
-~~~sh
-#!/bin/sh
-
-set -eu
-
-case $HOOK_GHC_TYPE in
-	bindist)
-		# install GHC here, not printing to stdout, e.g.:
-		#   command install $HOOK_GHC_VERSION >/dev/null
-		;;
-	git)
-		>&2 echo "Hook doesn't support installing from source"
-		exit 1
-		;;
-	*)
-		>&2 echo "Unsupported GHC installation type: $HOOK_GHC_TYPE"
-		exit 2
-		;;
-esac
-
-echo "location/to/ghc/executable"
-~~~
-
-If the following script is installed by GHCup, GHCup makes use of it, so that if
-Stack needs a version of GHC, GHCup takes over obtaining and installing that
-version:
-
-~~~sh
-#!/bin/sh
-
-set -eu
-
-case $HOOK_GHC_TYPE in
-    bindist)
-        ghcdir=$(ghcup whereis --directory ghc "$HOOK_GHC_VERSION" || ghcup run --ghc "$HOOK_GHC_VERSION" --install) || exit 3
-        printf "%s/ghc" "${ghcdir}"
-        ;;
-    git)
-        # TODO: should be somewhat possible
-        >&2 echo "Hook doesn't support installing from source"
-        exit 1
-        ;;
-    *)
-        >&2 echo "Unsupported GHC installation type: $HOOK_GHC_TYPE"
-        exit 2
-        ;;
-esac
-~~~
diff --git a/etc/dockerfiles/arm64.Dockerfile b/etc/dockerfiles/arm64.Dockerfile
index 7a8006ee22..adac83d85a 100644
--- a/etc/dockerfiles/arm64.Dockerfile
+++ b/etc/dockerfiles/arm64.Dockerfile
@@ -1,12 +1,33 @@
-# Stack is built with GHC 9.2.4. GHC 9.2.4 for Linux/AArch64 says it was made on
+# This Dockerfile was previously used to build dynamically-linked Stack for
+# Linux/Aarch64. It was used with the following step in the GitHub Actions CI:
+#
+#   run: |
+#     set -ex
+#     docker build . -f etc/dockerfiles/arm64.Dockerfile -t stack --build-arg USERID=$(id -u) --build-arg GROUPID=$(id -g)
+#     rm -rf _release
+#     mkdir -p _release
+#     docker run --rm -v $(pwd):/src -w /src stack bash -c "/home/stack/release build"
+#
+# However, after Stack 2.11.1, it was replaced with a step that makes use of
+# https://gitlab.com/benz0li/ghc-musl.
+#
+# ------------------------------------------------------------------------------
+#
+# Stack is built with GHC 9.2.8. GHC 9.2.8 for Linux/AArch64 says it was made on
 # a Debian 10 system and requires GMP 6.1. Debian 10 is codename 'buster' and
 # includes libc6 (2.28-10+deb10u1).
 FROM debian:buster
 
+# pkg-config added to `apt-get install` list because it is required by package
+# digest-0.0.1.7.
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
     curl build-essential curl libffi-dev libffi6 libgmp-dev libgmp10 \
     libncurses-dev libncurses5 libtinfo5 libnuma-dev xz-utils g++ gcc \
-    libc6-dev libffi-dev libgmp-dev make zlib1g-dev git gnupg netbase
+    libc6-dev libffi-dev libgmp-dev make zlib1g-dev git gnupg netbase pkg-config
+
+# This is added in an attempt to avoid the failure:
+#   <stderr>: commitAndReleaseBuffer: invalid argument (invalid character)
+ENV LANG="C.UTF-8"
 
 RUN cd /tmp && \
     curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/clang+llvm-9.0.1-aarch64-linux-gnu.tar.xz --output /tmp/llvm.tar.xz && \
@@ -14,8 +35,10 @@ RUN cd /tmp && \
     tar xfv /tmp/llvm.tar --strip-components 1 -C /usr && \
     rm /tmp/llvm.tar
 
-RUN curl -L https://downloads.haskell.org/ghcup/unofficial-bindists/stack/2.7.5/stack-2.7.5-linux-aarch64.tar.gz --output /tmp/stack.tar.gz && \
-    tar xfv /tmp/stack.tar.gz -C /usr/local/bin && \
+# Stack's *.tar archive contains a directory that contains the 'stack'
+# executable, hence the use of tar's '--strip-components 1' option.
+RUN curl -L https://github.com/commercialhaskell/stack/releases/download/v2.11.1/stack-2.11.1-linux-aarch64.tar.gz --output /tmp/stack.tar.gz && \
+    tar xfv /tmp/stack.tar.gz -C /usr/local/bin --strip-components 1 && \
     rm /tmp/stack.tar.gz
 
 # RUN curl -sSL https://github.com/commercialhaskell/stack/releases/download/v2.7.1/stack-2.7.1-linux-aarch64.bin > /usr/local/bin/stack && \
@@ -46,5 +69,5 @@ RUN stack build shake
 
 COPY etc/scripts/release.hs /src
 
-RUN stack script --resolver nightly-2022-09-05 --extra-dep Cabal-3.6.3.0 --compile /src/release.hs -- --version
+RUN stack script --resolver lts-20.26 --compile /src/release.hs -- --version
 RUN cp /src/release /home/stack
diff --git a/etc/scripts/LICENSE b/etc/scripts/LICENSE
index 805eafc519..7d6acbccad 100644
--- a/etc/scripts/LICENSE
+++ b/etc/scripts/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2022, Stack contributors
+Copyright (c) 2015-2025, Stack contributors
 
 All rights reserved.
 
diff --git a/etc/scripts/README.md b/etc/scripts/README.md
index 710431ea4e..bfa738a9f2 100644
--- a/etc/scripts/README.md
+++ b/etc/scripts/README.md
@@ -14,7 +14,8 @@ Prerequisites
 These must be installed in the PATH to use the release tool:
 
 - stack
-- git (for Windows, [msysgit](https://msysgit.github.io) is recommended).
+- git (for Windows, [Git for Windows](https://gitforwindows.org/) is
+  recommended).
 
 Invocation
 ----------
@@ -30,7 +31,13 @@ addition, the following options are accepted:
 
 * `--allow-dirty`: by default, the `check` rule aborts if the working tree is
   dirty, but this will allow it to continue.
-  uploaded to.
+* `--arch=ARCHITECTURE`: Architecture to build (e.g. 'i386' or 'x86_64').
+* `--binary-variant=SUFFIX`: Extra suffix to add to binary executable archive
+  filename.
+* `--no-test-haddocks`: Disable testing building Haddock documentation.
+* `--alpine`: Build a statically linked binary using an Alpine Docker image.
+* `--build-args="ARG1 ARG2 ..."`: Additional arguments to pass to `stack build`.
+* `--certificate-name=NAME`: Certificate name for code signing on Windows.
 
 ### Targets
 
diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs
index f31db07e51..754a6d522e 100644
--- a/etc/scripts/build-stack-installer.hs
+++ b/etc/scripts/build-stack-installer.hs
@@ -1,7 +1,6 @@
 {- stack script
-    --resolver nightly-2022-09-05
-    --install-ghc
-    --package nsis
+   --snapshot lts-24.55
+   --package nsis
 -}
 {-# LANGUAGE OverloadedStrings #-}
 
diff --git a/etc/scripts/get-stack.sh b/etc/scripts/get-stack.sh
index 3878091cc6..319c74d514 100755
--- a/etc/scripts/get-stack.sh
+++ b/etc/scripts/get-stack.sh
@@ -69,12 +69,15 @@ post_install_separator() {
   info ""
 }
 
-# determines the CPU's instruction set
+# determines the CPU's instruction set architecture (ISA)
 get_isa() {
   if uname -m | grep -Eq 'armv[78]l?' ; then
     echo arm
   elif uname -m | grep -q aarch64 ; then
     echo aarch64
+  # uname -m returns arm64 on macOS/AArch64
+  elif uname -m | grep -q arm64 ; then
+    echo aarch64
   elif uname -m | grep -q x86 ; then
     echo x86
   else
@@ -226,7 +229,7 @@ do_debian_install() {
 # and install the necessary dependencies explicitly.
 do_fedora_install() {
   install_dependencies() {
-    dnf_install_pkgs perl make automake gcc gmp-devel libffi zlib-devel xz tar git gnupg
+    dnf_install_pkgs perl make automake gcc gcc-c++ gmp-devel libffi zlib-devel xz tar git gnupg
   }
 
   if is_x86_64 ; then
@@ -247,7 +250,7 @@ do_fedora_install() {
 # and install the necessary dependencies explicitly.
 do_centos_install() {
   install_dependencies() {
-    yum_install_pkgs perl make automake gcc gmp-devel libffi zlib xz tar git gnupg
+    yum_install_pkgs perl make automake gcc gcc-c++ gmp-devel libffi zlib xz tar git gnupg
   }
 
   if is_x86_64 ; then
@@ -289,16 +292,22 @@ do_windows_install() {
 }
 
 # Attempts to install on macOS.
-# If 'brew' exists, installs using Homebrew.  Otherwise, installs
-# the generic bindist.
 do_osx_install() {
-  info "Using generic bindist..."
-  info ""
-  install_64bit_osx_binary
-  info "NOTE: You may need to run 'xcode-select --install' and/or"
-  info "      'open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg'"
-  info "      to set up the Xcode command-line tools, which Stack uses."
-  info ""
+  if is_x86_64 ; then
+    install_x86_64_osx_binary
+    info "NOTE: You may need to run 'xcode-select --install' and/or"
+    info "      'open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg'"
+    info "      to set up the Xcode command-line tools, which Stack uses."
+    info ""
+  elif is_aarch64 ; then
+    install_aarch64_osx_binary
+    info "NOTE: You may need to run 'xcode-select --install' and/or"
+    info "      'open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg'"
+    info "      to set up the Xcode command-line tools, which Stack uses."
+    info ""
+  else
+    die "Sorry, currently only 64-bit (x86_64 or aarch64) macOS binary is available."
+  fi
 }
 
 # # Attempts to install on FreeBSD.  Installs dependencies with
@@ -581,7 +590,11 @@ install_aarch64_linux_binary() {
   install_from_bindist "linux-aarch64.tar.gz"
 }
 
-install_64bit_osx_binary() {
+install_aarch64_osx_binary() {
+  install_from_bindist "osx-aarch64.tar.gz"
+}
+
+install_x86_64_osx_binary() {
   install_from_bindist "osx-x86_64.tar.gz"
 }
 
@@ -732,14 +745,91 @@ on_path() {
   echo ":$PATH:" | grep -q :"$1":
 }
 
+# Check whether the script may be running in well-known CI environments
+has_ci_environment() {
+  if [ -n "$CI" ]; then
+    # GitHub Actions, GitLab CI, Travis, CircleCI and Bitbucket Pipelines all
+    # set CI.
+    return 0
+  elif [ -n "$TR_BUILD" ]; then
+    # Azure Pipelines sets TR_BUILD.
+    return 0
+  elif [ -n "$JENKINS_HOME" ]; then
+    # Jenkins sets JENKINS_HOME.
+    return 0
+  else
+    return 1
+  fi
+}
+
 # Check whether ~/.local/bin is on the PATH, and print a warning if not.
 check_home_local_bin_on_path() {
   if ! on_path "$HOME_LOCAL_BIN" ; then
-    #TODO: offer to add it for the user (pull requests welcome!)
     info "WARNING: '$HOME_LOCAL_BIN' is not on your PATH."
     info "    Stack will place the binaries it builds in '$HOME_LOCAL_BIN' so"
     info "    for best results, please add it to the beginning of PATH in your profile."
     info ""
+    # detect which profile file to use, then print a message about updating it
+    if [ -n "$BASH_VERSION" ]; then
+      if [ -f "$HOME/.bash_profile" ]; then
+        profile_file="$HOME/.bash_profile"
+      else
+        profile_file="$HOME/.bashrc"
+      fi
+    elif [ -n "$ZSH_VERSION" ]; then
+      profile_file="$HOME/.zshrc"
+    elif [ -n "$FISH_VERSION" ]; then
+      profile_file="$HOME/.config/fish/config.fish"
+    elif [ -n "$PROFILE" ]; then
+      profile_file="$PROFILE"
+    elif [ -f "$HOME/.bash_profile" ]; then
+      profile_file="$HOME/.bash_profile"
+    elif [ -f "$HOME/.bashrc" ]; then
+      profile_file="$HOME/.bashrc"
+    elif [ -f "$HOME/.zshrc" ]; then
+      profile_file="$HOME/.zshrc"
+    elif [ -f "$HOME/.config/fish/config.fish" ]; then
+      profile_file="$HOME/.config/fish/config.fish"
+    elif [ -f "$HOME/.profile" ]; then
+      profile_file="$HOME/.profile"
+    else
+      info "    (profile not found; please add it to your PATH manually)"
+    fi
+
+    # print a message about updating profile (if found)
+    if [ -n "$profile_file" ]; then
+      info "    You can do this by running the following command:"
+      info "    echo 'export PATH=\"$HOME_LOCAL_BIN:\$PATH\"' >> \"$profile_file\""
+      info "    (You may need to restart your shell for this to take effect.)"
+      info ""
+
+      # prompt to update it on their behalf, unless QUIET is set.
+      if [ -z "$QUIET" ] && ! has_ci_environment ; then
+        while true; do
+          info "Would you like this installer to add it to your PATH in '$profile_file'?"
+          info "    (This will be done by adding export PATH=\"$HOME_LOCAL_BIN:\$PATH\" to it."
+          info "    You may need to restart your shell for this to take effect.)"
+          info "    [y] Yes, prepend  [n] No (default)"
+          read -p "" yesno
+          # default to no.
+          yesno=${yesno:-n}
+          case $yesno in
+            [Yy]* )
+              echo "export PATH=\"$HOME_LOCAL_BIN:\$PATH\"" >> "$profile_file"
+              info "PATH updated in '$profile_file'"
+              break
+              ;;
+            [Nn]* )
+              info "Not updating PATH in '$profile_file'"
+              break
+              ;;
+            * )
+              info "Please answer 'y' or 'n'"
+              ;;
+          esac
+        done
+      fi
+    fi
   fi
 }
 
diff --git a/etc/scripts/install-many-stack-releases.hs b/etc/scripts/install-many-stack-releases.hs
index 2d1ed1e422..3b32ed463d 100755
--- a/etc/scripts/install-many-stack-releases.hs
+++ b/etc/scripts/install-many-stack-releases.hs
@@ -1,6 +1,6 @@
 #!/usr/bin/env stack
 {- stack script
-    --resolver lts-14.27
+    --snapshot lts-14.27
     --package base
     --package directory
     --package filepath
diff --git a/etc/scripts/ls-deps-as-cabal-constraints.sh b/etc/scripts/ls-deps-as-cabal-constraints.sh
new file mode 100755
index 0000000000..5f985dee21
--- /dev/null
+++ b/etc/scripts/ls-deps-as-cabal-constraints.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Lists the dependencies as exact (==) Cabal constraints for use with a Cabal
+# `cabal.project` file, and pipes to the specified location (typically a file):
+#
+set -eu
+
+stack ls dependencies cabal > "$1"
diff --git a/etc/scripts/package.yaml b/etc/scripts/package.yaml
new file mode 100644
index 0000000000..4043cb35bb
--- /dev/null
+++ b/etc/scripts/package.yaml
@@ -0,0 +1,18 @@
+# # Added as part of the work around for:
+# https://github.com/commercialhaskell/stack/issues/6711
+#
+# On Windows only, for some unidentified reason, stack script can fail when
+# using a pre-compiled package. This can affect the script
+# build-stack-installer.hs. The work around is to build the package required for
+# that script using the same Stack configuration as used by the script.
+
+# This dummy package descriptions is required because the first place that Stack
+# looks for a target is project packages and without a Cabal file, Stack will
+# report error [S-636].
+
+spec-version: 0.36.0
+
+name: dummy-for-build-stack-installer-work-around
+version: 0.0.0.0
+
+library: {}
diff --git a/etc/scripts/release-linux-aarch64.hs b/etc/scripts/release-linux-aarch64.hs
new file mode 100644
index 0000000000..d9eaa98fb8
--- /dev/null
+++ b/etc/scripts/release-linux-aarch64.hs
@@ -0,0 +1,288 @@
+{- stack script
+   --snapshot lts-24.55
+   --ghc-options -Wall
+-}
+
+-- As no packages are specified in the `stack script` command in the Stack
+-- interpreter options comment, Stack deduces the required packages from the
+-- module imports, being: Cabal, base, bytestring, directory, extra, process,
+-- shake, tar, zip-archive and zlib. These are either GHC boot packages or in
+-- the snapshot. Stackage LTS Haskell 24.55 does not include boot packages
+-- directly. As GHC 9.10.3 boot packages Cabal and Cabal-syntax expose modules
+-- with the same names, the language extension PackageImports is required.
+
+-- EXPERIMENTAL
+
+-- This corresponds to release.hs but is intended to be run only on
+-- macOS/AArch64 in order to create a statically-linked Linux/AArch64 version of
+-- Stack:
+--
+-- Install pre-requisites:
+--
+-- > brew install docker
+-- > brew install colima
+--
+-- Start colima and run script:
+--
+-- > colima start
+-- > release-linux-aarch64.hs build --alpine --build-args --docker-stack-exe=image
+--
+-- Could be incorporated into release.hs, in due course.
+
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE PackageImports      #-}
+{-# LANGUAGE PatternSynonyms     #-}
+
+import qualified Codec.Archive.Tar as Tar
+import qualified Codec.Archive.Tar.Entry as TarEntry
+import qualified Codec.Compression.GZip as GZip
+import           Control.Exception ( tryJust )
+import           Control.Monad ( guard )
+import qualified Data.ByteString.Lazy.Char8 as L8
+import           "extra" Data.List.Extra ( stripPrefix )
+import           Development.Shake
+                   ( Action, Change (..), pattern Chatty, Rules
+                   , ShakeOptions (..), (%>), actionOnException, alwaysRerun
+                   , cmd, copyFileChanged, getDirectoryFiles, liftIO, need
+                   , phony, shakeArgsWith, shakeOptions, want
+                   )
+import           Development.Shake.FilePath
+                   ( (<.>), (</>), exe, takeDirectory, toStandard )
+import           "Cabal" Distribution.PackageDescription
+                   ( PackageDescription (..), packageDescription, pkgVersion
+                   )
+import           Distribution.Simple.PackageDescription
+                   ( readGenericPackageDescription )
+import           "Cabal" Distribution.System
+                   ( Arch, OS (..), Platform (..), buildPlatform )
+import           "Cabal" Distribution.Text ( display )
+import           Distribution.Verbosity ( silent )
+import           System.Console.GetOpt ( ArgDescr (..), OptDescr (..) )
+import           System.Directory ( removeFile )
+import           System.IO.Error ( isDoesNotExistError )
+import           System.Process ( readProcess )
+
+-- | Entrypoint.
+main :: IO ()
+main = shakeArgsWith
+  shakeOptions { shakeFiles = releaseDir
+               , shakeVerbosity = Chatty
+               , shakeChange = ChangeModtimeAndDigestInput
+               }
+  options $
+  \flags args -> do
+  -- build the default value of type Global, with predefined constants
+
+    -- 'stack build --dry-run' just ensures that 'stack.cabal' is generated from
+    -- 'package.yaml'.
+    _ <- readProcess "stack" ["build", "--dry-run"] ""
+    gStackPackageDescription <-
+      packageDescription <$> readGenericPackageDescription silent "stack.cabal"
+
+    let Platform arch _ = buildPlatform
+        gArch = arch
+        gBuildArgs = ["--flag", "stack:-developer-mode"]
+        global = foldl
+          (flip id)
+          Global
+            { gStackPackageDescription
+            , gArch
+            , gBuildArgs
+            }
+          flags
+
+    pure $ Just $ rules global args
+
+-- | Additional command-line options.
+options :: [OptDescr (Either String (Global -> Global))]
+options =
+  [ Option "" [alpineOptName]
+      ( NoArg $ Right $ \g ->
+          g { gBuildArgs =
+                   gBuildArgs g
+                ++ [ "--flag=stack:static"
+                   , "--docker"
+                   , "--system-ghc"
+                   , "--no-install-ghc"
+                   ]
+            }
+      )
+      "Build a statically linked binary using an Alpine Docker image."
+  , Option "" [buildArgsOptName]
+      ( ReqArg
+          (\v -> Right $ \g -> g{gBuildArgs = gBuildArgs g ++ words v})
+          "\"ARG1 ARG2 ...\""
+      )
+      "Additional arguments to pass to 'stack build'."
+  ]
+
+-- | Shake rules.
+rules :: Global -> [String] -> Rules ()
+rules global args = do
+  case args of
+    [] -> error "No wanted target(s) specified."
+    _ -> want args
+
+  phony buildPhony $
+    mapM_ (\f -> need [releaseDir </> f]) binaryPkgFileNames
+
+  releaseDir </> binaryPkgTarGzFileName %> \out -> do
+    stageFiles <- getBinaryPkgStageFiles
+    writeTarGz id out releaseStageDir stageFiles
+
+  releaseStageDir </> binaryName </> stackExeFileName %> \out -> do
+    copyFileChanged (releaseDir </> binaryExeFileName) out
+
+  releaseStageDir </> (binaryName ++ "//*") %> \out -> do
+    copyFileChanged
+      (dropDirectoryPrefix (releaseStageDir </> binaryName) out)
+      out
+
+  releaseDir </> binaryExeFileName %> \out -> do
+    need [releaseBinDir </> binaryName </> stackExeFileName]
+    case platformOS of
+      OSX ->
+        cmd "strip -o"
+          [out, releaseBinDir </> binaryName </> stackExeFileName]
+      _ -> undefined
+
+  releaseBinDir </> binaryName </> stackExeFileName %> \out -> do
+    alwaysRerun
+    actionOnException
+      ( cmd stackProgName
+          (stackArgs global)
+          ["--local-bin-path=" ++ takeDirectory out]
+          "install"
+          global.gBuildArgs
+          integrationTestFlagArgs
+          "--pedantic"
+          "stack"
+      )
+      (tryJust (guard . isDoesNotExistError) (removeFile out))
+
+ where
+  integrationTestFlagArgs =
+    -- Explicitly enabling 'hide-dependency-versions' and 'supported-build' to
+    -- work around https://github.com/commercialhaskell/stack/issues/4960
+    [ "--flag=stack:hide-dependency-versions"
+    , "--flag=stack:supported-build"
+    ]
+
+  getBinaryPkgStageFiles = do
+    docFiles <- getDocFiles
+    let stageFiles = concat
+          [ [releaseStageDir </> binaryName </> stackExeFileName]
+          , map ((releaseStageDir </> binaryName) </>) docFiles
+          ]
+    need stageFiles
+    pure stageFiles
+
+  getDocFiles = getDirectoryFiles "." ["LICENSE", "*.md", "doc//*.md"]
+
+  buildPhony = "build"
+
+  releaseStageDir = releaseDir </> "stage"
+  releaseBinDir = releaseDir </> "bin"
+
+  binaryPkgFileNames =
+    case platformOS of
+      OSX -> [binaryExeFileName, binaryPkgTarGzFileName]
+      _ -> undefined
+  binaryPkgTarGzFileName = binaryName <.> tarGzExt
+  binaryExeFileName = binaryName ++ "-bin" <.> exe
+  binaryName = concat
+    [ stackProgName
+    , "-"
+    , stackVersionStr global
+    , "-"
+    , display targetPlatformOS
+    , "-"
+    , display global.gArch
+    ]
+  stackExeFileName = stackProgName <.> exe
+
+  tarGzExt = tarExt <.> gzExt
+  gzExt = ".gz"
+  tarExt = ".tar"
+
+-- | Create a .tar.gz files from files.  The paths should be absolute, and will
+-- be made relative to the base directory in the tarball.
+writeTarGz ::
+     (FilePath -> FilePath)
+  -> FilePath
+  -> FilePath
+  -> [FilePath]
+  -> Action ()
+writeTarGz fixPath out baseDir inputFiles = liftIO $ do
+  content <- Tar.pack baseDir $ map (dropDirectoryPrefix baseDir) inputFiles
+  L8.writeFile out $ GZip.compress $ Tar.write $ map fixPath' content
+ where
+  fixPath' :: Tar.Entry -> Tar.Entry
+  fixPath' entry =
+    case TarEntry.toTarPath isDir $ fixPath $ TarEntry.entryPath entry of
+      Left e -> error $ show (Tar.entryPath entry, e)
+      Right tarPath -> entry { TarEntry.entryTarPath = tarPath }
+   where
+    isDir =
+      case TarEntry.entryContent entry of
+        TarEntry.Directory -> True
+        _ -> False
+
+-- | Drops a directory prefix from a path. The prefix automatically has a path
+-- separator character appended. Fails if the path does not begin with the
+-- prefix.
+dropDirectoryPrefix :: FilePath -> FilePath -> FilePath
+dropDirectoryPrefix prefix path =
+  case stripPrefix (toStandard prefix ++ "/") (toStandard path) of
+    Nothing -> error
+      (  "dropDirectoryPrefix: cannot drop "
+      ++ show prefix
+      ++ " from "
+      ++ show path
+      )
+    Just stripped -> stripped
+
+-- | String representation of Stack package version.
+stackVersionStr :: Global -> String
+stackVersionStr =
+  display . pkgVersion . package . gStackPackageDescription
+
+-- | Current operating system.
+platformOS :: OS
+platformOS =
+  let Platform _ os = buildPlatform
+  in  os
+
+-- | Target operating system
+targetPlatformOS :: OS
+targetPlatformOS = Linux
+
+-- | Directory in which to store build and intermediate files.
+releaseDir :: FilePath
+releaseDir = "_release"
+
+-- | @--build-args@ command-line option name.
+buildArgsOptName :: String
+buildArgsOptName = "build-args"
+
+-- | @--alpine@ command-line option name.
+alpineOptName :: String
+alpineOptName = "alpine"
+
+-- | Arguments to pass to all 'stack' invocations.
+stackArgs :: Global -> [String]
+stackArgs global = [ "--arch=" ++ display global.gArch
+                   , "--interleaved-output"
+                   ]
+
+-- | Name of the 'stack' program.
+stackProgName :: FilePath
+stackProgName = "stack"
+
+-- | Global values and options.
+data Global = Global
+  { gStackPackageDescription :: !PackageDescription
+  , gArch :: !Arch
+  , gBuildArgs :: [String]
+  }
+  deriving Show
diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs
index 48968d7211..f53f5a9906 100644
--- a/etc/scripts/release.hs
+++ b/etc/scripts/release.hs
@@ -1,366 +1,487 @@
 {- stack script
-    --resolver nightly-2022-09-05
-    --extra-dep Cabal-3.6.3.0
-    --extra-dep directory-1.3.6.2
-    --ghc-options -Wall
+   --snapshot lts-24.55
+   --ghc-options -Wall
 -}
 
--- The GitHub workflow `integration-tests.yml` works on all operating systems
--- other than Windows without the `--extra-dep Cabal-3.6.3.0` and
--- `--extra-dep directory-1.3.6.2` above. However, on Windows, if they are
--- omitted, then `stack release.hs` somehow calls on Cabal-3.8.1.0 and
--- directory-1.3.8.0, which causes an error.
-
-{-# LANGUAGE RecordWildCards #-}
-
-import Control.Applicative
-import Control.Exception
-import Control.Monad
-import qualified Data.ByteString.Lazy.Char8 as L8
-import Data.List
-import Data.List.Extra
-import Data.Maybe
-import Distribution.PackageDescription.Parsec
-import Distribution.Text
-import Distribution.System
-import Distribution.Package
-import Distribution.PackageDescription hiding (options)
-import Distribution.Utils.ShortText (fromShortText)
-import Distribution.Verbosity
-import System.Console.GetOpt
-import System.Directory
-import System.IO.Error
-import System.Process
+-- As no packages are specified in the `stack script` command in the Stack
+-- interpreter options comment, Stack deduces the required packages from the
+-- module imports, being: Cabal, base, bytestring, directory, extra, process,
+-- shake, tar, zip-archive and zlib. These are either GHC boot packages or in
+-- the snapshot. Stackage LTS Haskell 24.55 does not include boot packages
+-- directly. As GHC 9.10.3 boot packages Cabal and Cabal-syntax expose modules
+-- with the same names, the language extension PackageImports is required.
+
+-- EXPERIMENTAL
+
+-- release.hs can be run on macOS/AArch64, using a Docker image for
+-- Alpine Linux/AArch64, in order to create a statically-linked Linux/AArch64
+-- version of Stack:
+--
+-- Install pre-requisites:
+--
+-- > brew install docker
+-- > brew install colima
+--
+-- Start colima (with sufficient memory for Stack's integration tests) and run
+-- script:
+--
+-- > colima start --memory 4 # The default 2 GB is likely insufficient
+-- > stack etc/scripts/release.hs check --alpine --stack-args=--docker-stack-exe=image
+-- > stack etc/scripts/release.hs build --alpine --stack-args=--docker-stack-exe=image
+-- > colima stop
+
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE PackageImports      #-}
+{-# LANGUAGE PatternSynonyms     #-}
 
 import qualified Codec.Archive.Tar as Tar
 import qualified Codec.Archive.Tar.Entry as TarEntry
 import qualified Codec.Archive.Zip as Zip
 import qualified Codec.Compression.GZip as GZip
-import Development.Shake
-import Development.Shake.FilePath
-import qualified System.Info as Info
-import Prelude -- Silence AMP warning
+import           Control.Exception ( tryJust )
+import           Control.Monad ( forM, guard, when )
+import qualified Data.ByteString.Lazy.Char8 as L8
+import           "extra" Data.List.Extra ( isInfixOf, lower, stripPrefix, trim )
+import           Data.Maybe ( fromMaybe )
+import           Development.Shake
+                   ( Action, Change (..), pattern Chatty, CmdOption (..), Rules
+                   , ShakeOptions (..), Stdout (..), (%>), actionOnException
+                   , alwaysRerun, cmd, command_, copyFileChanged
+                   , getDirectoryFiles, liftIO, need, phony, putInfo
+                   , removeFilesAfter, shakeArgsWith, shakeOptions, want
+                   )
+import           Development.Shake.FilePath
+                   ( (<.>), (</>), dropFileName, exe, takeDirectory, toStandard
+                   )
+import           "Cabal" Distribution.PackageDescription
+                   ( PackageDescription (..), packageDescription, pkgVersion
+                   )
+import           Distribution.Simple.PackageDescription
+                   ( readGenericPackageDescription )
+import           "Cabal" Distribution.System
+                   ( Arch, OS (..), Platform (..), buildPlatform )
+import           "Cabal" Distribution.Text ( display, simpleParse )
+import           "Cabal" Distribution.Utils.ShortText ( fromShortText )
+import           Distribution.Verbosity ( silent )
+import           System.Console.GetOpt ( ArgDescr (..), OptDescr (..) )
+import           System.Directory ( copyFile, getHomeDirectory, removeFile )
+import           System.IO.Error ( isDoesNotExistError )
+import           System.Process ( readProcess )
 
 -- | Entrypoint.
 main :: IO ()
-main =
-    shakeArgsWith
-        shakeOptions { shakeFiles = releaseDir
-                     , shakeVerbosity = Chatty
-                     , shakeChange = ChangeModtimeAndDigestInput }
-        options $
-        \flags args -> do
-            -- build the default value of type Global, with predefined constants
-
-            -- 'stack build --dry-run' just ensures that 'stack.cabal' is
-            -- generated from 'package.yaml'
-            _ <- readProcess "stack" ["build", "--dry-run"] ""
-            gStackPackageDescription <-
-                packageDescription <$> readGenericPackageDescription silent "stack.cabal"
-            gGitRevCount <- length . lines <$> readProcess "git" ["rev-list", "HEAD"] ""
-            gGitSha <- trim <$> readProcess "git" ["rev-parse", "HEAD"] ""
-            gHomeDir <- getHomeDirectory
-
-            let gAllowDirty = False
-                platformArgs :: [String]
-                platformArgs = if Info.os == "darwin"
-                               then ["--stack-yaml", "stack-macos.yaml"]
-                               else []
-                Platform arch _ = buildPlatform
-                gArch = arch
-                gBinarySuffix = ""
-                gTestHaddocks = True
-                gProjectRoot = "" -- Set to real value below.
-                gBuildArgs = platformArgs <> ["--flag", "stack:-developer-mode"]
-                gStaticLinux = False
-                gCertificateName = Nothing
-                global0 = foldl (flip id) Global{..} flags
-
-            -- Need to get paths after options since the '--arch' argument can effect them.
-            projectRoot' <- getStackPath global0 "project-root"
-            let global = global0
-                    { gProjectRoot = projectRoot' }
-            pure $ Just $ rules global args
-  where
-    getStackPath global path = do
-      out <- readProcess stackProgName (stackArgs global ++ ["path", "--" ++ path]) ""
-      pure $ trim $ fromMaybe out $ stripPrefix (path ++ ":") out
+main = shakeArgsWith
+  shakeOptions { shakeFiles = releaseDir
+               , shakeVerbosity = Chatty
+               , shakeChange = ChangeModtimeAndDigestInput
+               }
+  options $
+  \flags args -> do
+  -- build the default value of type Global, with predefined constants
+
+    -- 'stack build --dry-run' just ensures that 'stack.cabal' is generated from
+    -- 'package.yaml'.
+    _ <- readProcess "stack" ["build", "--dry-run"] ""
+    gStackPackageDescription <-
+      packageDescription <$> readGenericPackageDescription silent "stack.cabal"
+    gGitRevCount <- length . lines <$> readProcess "git" ["rev-list", "HEAD"] ""
+    gGitSha <- trim <$> readProcess "git" ["rev-parse", "HEAD"] ""
+    gHomeDir <- getHomeDirectory
+
+    let gAllowDirty = False
+        Platform arch _ = buildPlatform
+        gArch = arch
+        gTargetOS = platformOS
+        gBinarySuffix = ""
+        gTestHaddocks = True
+        gProjectRoot = "" -- Set to real value below.
+        gBuildArgs = ["--flag", "stack:-developer-mode"]
+        gStackArgs = []
+        gCheckStackArgs = []
+        gCertificateName = Nothing
+        global0 = foldl
+          (flip id)
+          Global
+            { gStackPackageDescription
+            , gAllowDirty
+            , gGitRevCount
+            , gGitSha
+            , gProjectRoot
+            , gHomeDir
+            , gArch
+            , gTargetOS
+            , gBinarySuffix
+            , gTestHaddocks
+            , gBuildArgs
+            , gStackArgs
+            , gCheckStackArgs
+            , gCertificateName
+            }
+          flags
+
+    -- Need to get paths after options since the '--arch' argument can effect
+    -- them.
+    projectRoot' <- getStackPath global0 "project-root"
+    let global = global0 { gProjectRoot = projectRoot' }
+    pure $ Just $ rules global args
+ where
+  getStackPath global path = do
+    out <-
+      readProcess stackProgName (stackArgs global ++ ["path", "--" ++ path]) ""
+    pure $ trim $ fromMaybe out $ stripPrefix (path ++ ":") out
 
 -- | Additional command-line options.
 options :: [OptDescr (Either String (Global -> Global))]
 options =
-    [ Option "" [allowDirtyOptName] (NoArg $ Right $ \g -> g{gAllowDirty = True})
-        "Allow a dirty working tree for release."
-    , Option "" [archOptName]
-        (ReqArg
-            (\v -> case simpleParse v of
-                Nothing -> Left $ "Unknown architecture in --arch option: " ++ v
-                Just arch -> Right $ \g -> g{gArch = arch})
-            "ARCHITECTURE")
-        "Architecture to build (e.g. 'i386' or 'x86_64')."
-    , Option "" [binaryVariantOptName]
-        (ReqArg (\v -> Right $ \g -> g{gBinarySuffix = v}) "SUFFIX")
-        "Extra suffix to add to binary executable archive filename."
-    , Option "" [noTestHaddocksOptName] (NoArg $ Right $ \g -> g{gTestHaddocks = False})
-        "Disable testing building haddocks."
-    , Option "" [alpineOptName]
-        (NoArg $ Right $ \g ->
-          g{gBuildArgs =
-              gBuildArgs g ++
-              ["--flag=stack:static", "--docker", "--system-ghc", "--no-install-ghc"],
-            gStaticLinux = True})
-        "Build a static binary using Alpine Docker image."
-    , Option "" [buildArgsOptName]
-        (ReqArg
-            (\v -> Right $ \g -> g{gBuildArgs = gBuildArgs g ++ words v})
-            "\"ARG1 ARG2 ...\"")
-        "Additional arguments to pass to 'stack build'."
-    , Option "" [certificateNameOptName]
-        (ReqArg (\v -> Right $ \g -> g{gCertificateName = Just v}) "NAME")
-        "Certificate name for code signing on Windows"
-    ]
+  [ Option "" [allowDirtyOptName]
+      (NoArg $ Right $ \g -> g{gAllowDirty = True})
+      "Allow a dirty working tree for release."
+  , Option "" [archOptName]
+      ( ReqArg
+          ( \v -> case simpleParse v of
+              Nothing -> Left $ "Unknown architecture in --arch option: " ++ v
+              Just arch -> Right $ \g -> g{gArch = arch}
+          )
+          "ARCHITECTURE"
+      )
+      "Architecture to build (e.g. 'i386' or 'x86_64')."
+  , Option "" [binaryVariantOptName]
+      (ReqArg (\v -> Right $ \g -> g{gBinarySuffix = v}) "SUFFIX")
+      "Extra suffix to add to binary executable archive filename."
+  , Option "" [noTestHaddocksOptName]
+      (NoArg $ Right $ \g -> g{gTestHaddocks = False})
+      "Disable testing building haddocks."
+  , Option "" [alpineOptName]
+      ( NoArg $ Right $ \g ->
+          g { gBuildArgs =
+                   gBuildArgs g
+                ++ [ "--flag=stack:static"
+                   ]
+            , gStackArgs =
+                   gStackArgs g
+                ++ [ "--docker"
+                   , "--system-ghc"
+                   , "--no-install-ghc"
+                   ]
+            , gCheckStackArgs =
+                   gCheckStackArgs g
+                ++ [ "--system-ghc"
+                   , "--no-install-ghc"
+                   ]
+            , gTargetOS = Linux
+            }
+      )
+      "Build a statically-linked binary using an Alpine Linux Docker image."
+  , Option "" [stackArgsOptName]
+      ( ReqArg
+          (\v -> Right $ \g -> g{gStackArgs = gStackArgs g ++ words v})
+          "\"ARG1 ARG2 ...\""
+      )
+      "Additional arguments to pass to 'stack'."
+  , Option "" [buildArgsOptName]
+      ( ReqArg
+          (\v -> Right $ \g -> g{gBuildArgs = gBuildArgs g ++ words v})
+          "\"ARG1 ARG2 ...\""
+      )
+      "Additional arguments to pass to 'stack build'."
+  , Option "" [certificateNameOptName]
+      (ReqArg (\v -> Right $ \g -> g{gCertificateName = Just v}) "NAME")
+      "Certificate name for code signing on Windows"
+  ]
 
 -- | Shake rules.
 rules :: Global -> [String] -> Rules ()
-rules global@Global{..} args = do
-    case args of
-        [] -> error "No wanted target(s) specified."
-        _ -> want args
-
-    phony releasePhony $ do
-        need [checkPhony]
-        need [buildPhony]
-
-    phony cleanPhony $
-        removeFilesAfter releaseDir ["//*"]
-
-    phony checkPhony $
-        need [releaseCheckDir </> binaryExeFileName]
-
-    phony buildPhony $
-        mapM_ (\f -> need [releaseDir </> f]) binaryPkgFileNames
-
-    releaseCheckDir </> binaryExeFileName %> \out -> do
-        need [releaseBinDir </> binaryName </> stackExeFileName]
-        Stdout dirty <- cmd "git status --porcelain"
-        when (not gAllowDirty && not (null (trim dirty))) $
-            error $ concat
-              [ "Working tree is dirty.  Use --"
-              , allowDirtyOptName
-              , " option to continue anyway. Output:\n"
-              , show dirty
-              ]
-        () <- cmd
-            [gProjectRoot </> releaseBinDir </> binaryName </> stackExeFileName]
-            (stackArgs global)
-            ["build"]
-            gBuildArgs
-            integrationTestFlagArgs
-            ["--pedantic", "--no-haddock-deps", "--test"]
-            ["--haddock" | gTestHaddocks]
-            ["stack"]
-        () <- cmd
-            [gProjectRoot </> releaseBinDir </> binaryName </> stackExeFileName]
-            ["exec"]
-            [gProjectRoot </> releaseBinDir </> binaryName </> "stack-integration-test"]
-        copyFileChanged (releaseBinDir </> binaryName </> stackExeFileName) out
-
-    releaseDir </> binaryPkgZipFileName %> \out -> do
-        stageFiles <- getBinaryPkgStageFiles
-        putNormal $ "zip " ++ out
-        liftIO $ do
-            entries <- forM stageFiles $ \stageFile -> do
-                Zip.readEntry
-                    [Zip.OptLocation
-                        (dropFileName (dropDirectoryPrefix (releaseStageDir </> binaryName) stageFile))
-                        False]
-                    stageFile
-            let archive = foldr Zip.addEntryToArchive Zip.emptyArchive entries
-            L8.writeFile out (Zip.fromArchive archive)
-
-    releaseDir </> binaryPkgTarGzFileName %> \out -> do
-        stageFiles <- getBinaryPkgStageFiles
-        writeTarGz id out releaseStageDir stageFiles
-
-    releaseDir </> binaryPkgStaticTarGzFileName %> \out -> do
-        stageFiles <- getBinaryPkgStageFiles
-        let fixPath path =
-                let (x, y) = break (== '/') path
-                 in concat [x, "-static", y]
-        writeTarGz fixPath out releaseStageDir stageFiles
-
-    releaseStageDir </> binaryName </> stackExeFileName %> \out -> do
-        copyFileChanged (releaseDir </> binaryExeFileName) out
-
-    releaseStageDir </> (binaryName ++ "//*") %> \out -> do
-        copyFileChanged
-            (dropDirectoryPrefix (releaseStageDir </> binaryName) out)
-            out
-
-    releaseDir </> binaryExeFileName %> \out -> do
-        need [releaseBinDir </> binaryName </> stackExeFileName]
-        (Stdout versionOut) <- cmd (releaseBinDir </> binaryName </> stackExeFileName) "--version"
-        when (not gAllowDirty && "dirty" `isInfixOf` lower versionOut) $
-            error ("Refusing continue because 'stack --version' reports dirty.  Use --" ++
-                   allowDirtyOptName ++ " option to continue anyway.")
-        case platformOS of
-            Windows -> do
-                -- Windows doesn't have or need a 'strip' command, so skip it.
-                -- Instead, we sign the executable
-                liftIO $ copyFile (releaseBinDir </> binaryName </> stackExeFileName) out
-                case gCertificateName of
-                    Nothing -> pure ()
-                    Just certName ->
-                        actionOnException
-                            (command_ [] "c:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Bin\\signtool.exe"
-                                ["sign"
-                                ,"/v"
-                                ,"/d", fromShortText $ synopsis gStackPackageDescription
-                                ,"/du", fromShortText $ homepage gStackPackageDescription
-                                ,"/n", certName
-                                ,"/t", "http://timestamp.verisign.com/scripts/timestamp.dll"
-                                ,out])
-                            (removeFile out)
-            Linux ->
-                -- Using Ubuntu's strip to strip an Alpine exe doesn't work, so just copy
-                liftIO $ copyFile (releaseBinDir </> binaryName </> stackExeFileName) out
-            _ ->
-                cmd "strip -o"
-                    [out, releaseBinDir </> binaryName </> stackExeFileName]
-
-    releaseDir </> binaryInstallerFileName %> \_ -> do
-        need [releaseDir </> binaryExeFileName]
-        need [releaseDir </> binaryInstallerNSIFileName]
-
-        command_ [Cwd releaseDir] "makensis.exe"
-            [ "-V3"
-            , binaryInstallerNSIFileName]
-
-    releaseDir </> binaryInstallerNSIFileName %> \out -> do
-        need ["etc" </> "scripts" </> "build-stack-installer" <.> "hs"]
-        cmd "stack etc/scripts/build-stack-installer.hs"
-            [ binaryExeFileName
-            , binaryInstallerFileName
-            , out
-            , stackVersionStr global
-            ] :: Action ()
-
-    releaseBinDir </> binaryName </> stackExeFileName %> \out -> do
-        alwaysRerun
-        actionOnException
-            (cmd stackProgName
-                (stackArgs global)
-                ["--local-bin-path=" ++ takeDirectory out]
-                "install"
-                gBuildArgs
-                integrationTestFlagArgs
-                "--pedantic"
-                "stack")
-            (tryJust (guard . isDoesNotExistError) (removeFile out))
-
-  where
-
-    integrationTestFlagArgs =
-        -- Explicitly enabling 'hide-dependency-versions' and 'supported-build' to work around
-        -- https://github.com/commercialhaskell/stack/issues/4960
-        [ "--flag=stack:integration-tests"
-        , "--flag=stack:hide-dependency-versions"
-        , "--flag=stack:supported-build"
+rules global args = do
+  case args of
+    [] -> error "No wanted target(s) specified."
+    _ -> want args
+
+  phony releasePhony $ do
+    need [checkPhony]
+    need [buildPhony]
+
+  phony cleanPhony $
+    removeFilesAfter releaseDir ["//*"]
+
+  phony checkPhony $
+    need [releaseCheckDir </> binaryExeFileName]
+
+  phony buildPhony $
+    mapM_ (\f -> need [releaseDir </> f]) binaryPkgFileNames
+
+  releaseCheckDir </> binaryExeFileName %> \out -> do
+    need [releaseBinDir </> binaryName </> stackExeFileName]
+    Stdout dirty <- cmd "git status --porcelain"
+    when (not global.gAllowDirty && not (null (trim dirty))) $
+      error $ concat
+        [ "Working tree is dirty.  Use --"
+        , allowDirtyOptName
+        , " option to continue anyway. Output:\n"
+        , show dirty
         ]
+    () <- cmd
+      stackProgName -- Use the platform's Stack
+      global.gStackArgs -- Possibly to set up a Docker container
+      ["exec"] -- To execute the target Stack
+      [ global.gProjectRoot </> releaseBinDir </> binaryName </>
+          stackExeFileName
+      ]
+      ["--"]
+      (stackArgs global)
+      global.gCheckStackArgs -- Possible use the Docker image's GHC
+      ["build"] -- To build the target Stack (Stack builds Stack)
+      global.gBuildArgs
+      integrationTestFlagArgs
+      ["--pedantic", "--no-haddock-deps", "--test"]
+      ["--haddock" | global.gTestHaddocks]
+      ["stack"]
+    -- We use the target Stack to execute the target stack-integration-test
+    -- outside of any Alpine Linux Docker container as the default linker on
+    -- Alpine Linux is ld.bfd and it is remarkably slow. stack-integration-test
+    -- will seek to use lld as the linker on Linux.
+    () <- cmd
+      (global.gProjectRoot </> releaseBinDir </> binaryName </>
+          stackExeFileName) -- Use the target Stack
+      ["exec"] -- To execute the target stack-integration-test
+      [ global.gProjectRoot </> releaseBinDir </> binaryName </>
+          "stack-integration-test"
+      ]
+    copyFileChanged (releaseBinDir </> binaryName </> stackExeFileName) out
+
+  releaseDir </> binaryPkgZipFileName %> \out -> do
+    stageFiles <- getBinaryPkgStageFiles
+    putInfo $ "zip " ++ out
+    liftIO $ do
+      entries <- forM stageFiles $ \stageFile -> do
+        Zip.readEntry
+          [ Zip.OptLocation
+              ( dropFileName
+                  ( dropDirectoryPrefix
+                      (releaseStageDir </> binaryName)
+                      stageFile
+                  )
+              )
+              False
+          ]
+          stageFile
+      let archive = foldr Zip.addEntryToArchive Zip.emptyArchive entries
+      L8.writeFile out (Zip.fromArchive archive)
+
+  releaseDir </> binaryPkgTarGzFileName %> \out -> do
+    stageFiles <- getBinaryPkgStageFiles
+    writeTarGz id out releaseStageDir stageFiles
+
+  releaseStageDir </> binaryName </> stackExeFileName %> \out -> do
+    copyFileChanged (releaseDir </> binaryExeFileName) out
+
+  releaseStageDir </> (binaryName ++ "//*") %> \out -> do
+    copyFileChanged
+      (dropDirectoryPrefix (releaseStageDir </> binaryName) out)
+      out
+
+  releaseDir </> binaryExeFileName %> \out -> do
+    need [releaseBinDir </> binaryName </> stackExeFileName]
+    (Stdout versionOut) <-
+      cmd
+        stackProgName -- Use the platform's Stack
+        global.gStackArgs -- Possibly to set up a Docker container
+        ["exec"] -- To execute the target Stack and get its version info
+        (releaseBinDir </> binaryName </> stackExeFileName)
+        ["--"]
+        ["--version"]
+    when (not global.gAllowDirty && "dirty" `isInfixOf` lower versionOut) $
+      error
+        (  "Refusing continue because 'stack --version' reports dirty.  Use --"
+        ++ allowDirtyOptName
+        ++ " option to continue anyway."
+        )
+    case platformOS of
+      Windows -> do
+        -- Windows doesn't have or need a 'strip' command, so skip it.
+        -- Instead, we sign the executable
+        liftIO $ copyFile (releaseBinDir </> binaryName </> stackExeFileName) out
+        case global.gCertificateName of
+          Nothing -> pure ()
+          Just certName ->
+            actionOnException
+              ( command_
+                  []
+                  "c:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Bin\\signtool.exe"
+                  [ "sign"
+                  , "/v"
+                  , "/d"
+                  , fromShortText $ synopsis global.gStackPackageDescription
+                  , "/du"
+                  , fromShortText $ homepage global.gStackPackageDescription
+                  , "/n"
+                  , certName
+                  , "/t"
+                  , "http://timestamp.verisign.com/scripts/timestamp.dll"
+                  , out
+                  ]
+              )
+              (removeFile out)
+      Linux ->
+        -- Using Ubuntu's strip to strip an Alpine exe doesn't work, so just copy
+        liftIO $ copyFile (releaseBinDir </> binaryName </> stackExeFileName) out
+      _ ->
+        cmd "strip -o"
+          [out, releaseBinDir </> binaryName </> stackExeFileName]
+
+  releaseDir </> binaryInstallerFileName %> \_ -> do
+    need [releaseDir </> binaryExeFileName]
+    need [releaseDir </> binaryInstallerNSIFileName]
+
+    command_ [Cwd releaseDir] "makensis.exe"
+      [ "-V3"
+      , binaryInstallerNSIFileName
+      ]
+
+  releaseDir </> binaryInstallerNSIFileName %> \out -> do
+    need ["etc" </> "scripts" </> "build-stack-installer" <.> "hs"]
+    -- Added as part of the work around for:
+    -- https://github.com/commercialhaskell/stack/issues/6711
+    --
+    -- On Windows only, for some unidentified reason, stack script can fail when
+    -- using a pre-compiled package. This can affect the script
+    -- build-stack-installer.hs. The work around is to build the package
+    -- required for that script using the same Stack configuration as used by
+    -- the script.
+    () <- cmd "stack --stack-yaml etc/scripts/stack.yaml build nsis"
+    cmd "stack etc/scripts/build-stack-installer.hs"
+      [ binaryExeFileName
+      , binaryInstallerFileName
+      , out
+      , stackVersionStr global
+      ] :: Action ()
+
+  releaseBinDir </> binaryName </> stackExeFileName %> \out -> do
+    alwaysRerun
+    actionOnException
+      ( cmd
+          stackProgName -- Use the platform's Stack
+          (stackArgs global)
+          ["--local-bin-path=" ++ takeDirectory out]
+          global.gStackArgs -- Possibly to set up a Docker container
+          "install" -- To build and install Stack to that local bin path
+          global.gBuildArgs
+          integrationTestFlagArgs
+          "--pedantic"
+          "stack"
+      )
+      (tryJust (guard . isDoesNotExistError) (removeFile out))
+
+ where
+  integrationTestFlagArgs =
+    -- Explicitly enabling 'hide-dependency-versions' and 'supported-build' to
+    -- work around https://github.com/commercialhaskell/stack/issues/4960
+    [ "--flag=stack:integration-tests"
+    , "--flag=stack:hide-dependency-versions"
+    , "--flag=stack:supported-build"
+    ]
 
-    getBinaryPkgStageFiles = do
-        docFiles <- getDocFiles
-        let stageFiles = concat
-                [[releaseStageDir </> binaryName </> stackExeFileName]
-                ,map ((releaseStageDir </> binaryName) </>) docFiles]
-        need stageFiles
-        pure stageFiles
-
-    getDocFiles = getDirectoryFiles "." ["LICENSE", "*.md", "doc//*.md"]
-
-    releasePhony = "release"
-    checkPhony = "check"
-    cleanPhony = "clean"
-    buildPhony = "build"
-
-    releaseCheckDir = releaseDir </> "check"
-    releaseStageDir = releaseDir </> "stage"
-    releaseBinDir = releaseDir </> "bin"
-
-    binaryPkgFileNames =
-        case platformOS of
-            Windows -> [binaryExeFileName, binaryPkgZipFileName, binaryPkgTarGzFileName, binaryInstallerFileName]
-            Linux -> concat
-              [ [binaryExeFileName, binaryPkgTarGzFileName]
-              , [binaryPkgStaticTarGzFileName | gStaticLinux]
-              ]
-            _ -> [binaryExeFileName, binaryPkgTarGzFileName]
-    binaryPkgZipFileName = binaryName <.> zipExt
-    binaryPkgTarGzFileName = binaryName <.> tarGzExt
-    binaryPkgStaticTarGzFileName = binaryStaticName <.> tarGzExt
-    -- Adding '-bin' to name to work around https://github.com/commercialhaskell/stack/issues/4961
-    binaryExeFileName = binaryName ++ "-bin" <.> exe
-    -- Prefix with 'installer-' so it doesn't get included in release artifacts
-    -- (due to NSIS limitation, needs to be in same directory as executable)
-    binaryInstallerNSIFileName = "installer-" ++ binaryName <.> nsiExt
-    binaryInstallerFileName = binaryName ++ "-installer" <.> exe
-    mkBinaryName isStatic =
-        concat
-            [ stackProgName
-            , "-"
-            , stackVersionStr global
-            , "-"
-            , display platformOS
-            , "-"
-            , display gArch
-            , if isStatic then "-static" else ""
-            , if null gBinarySuffix then "" else "-" ++ gBinarySuffix ]
-    binaryName = mkBinaryName False
-    binaryStaticName = mkBinaryName True
-    stackExeFileName = stackProgName <.> exe
-
-    zipExt = ".zip"
-    tarGzExt = tarExt <.> gzExt
-    gzExt = ".gz"
-    tarExt = ".tar"
-    nsiExt = ".nsi"
+  getBinaryPkgStageFiles = do
+    docFiles <- getDocFiles
+    let stageFiles = concat
+          [ [releaseStageDir </> binaryName </> stackExeFileName]
+          , map ((releaseStageDir </> binaryName) </>) docFiles
+          ]
+    need stageFiles
+    pure stageFiles
+
+  getDocFiles = getDirectoryFiles "." ["LICENSE", "*.md", "doc//*.md"]
+
+  releasePhony = "release"
+  checkPhony = "check"
+  cleanPhony = "clean"
+  buildPhony = "build"
+
+  releaseCheckDir = releaseDir </> "check"
+  releaseStageDir = releaseDir </> "stage"
+  releaseBinDir = releaseDir </> "bin"
+
+  binaryPkgFileNames =
+    case global.gTargetOS of
+      Windows ->
+        [ binaryExeFileName
+        , binaryPkgZipFileName
+        , binaryPkgTarGzFileName
+        , binaryInstallerFileName
+        ]
+      Linux -> [binaryExeFileName, binaryPkgTarGzFileName]
+      _ -> [binaryExeFileName, binaryPkgTarGzFileName]
+  binaryPkgZipFileName = binaryName <.> zipExt
+  binaryPkgTarGzFileName = binaryName <.> tarGzExt
+  binaryExeFileName = binaryName ++ "-bin" <.> exe
+  -- Prefix with 'installer-' so it doesn't get included in release artifacts
+  -- (due to NSIS limitation, needs to be in same directory as executable)
+  binaryInstallerNSIFileName = "installer-" ++ binaryName <.> nsiExt
+  binaryInstallerFileName = binaryName ++ "-installer" <.> exe
+  binaryName = concat
+    [ stackProgName
+    , "-"
+    , stackVersionStr global
+    , "-"
+    , display global.gTargetOS
+    , "-"
+    , display global.gArch
+    , if null global.gBinarySuffix then "" else "-" ++ global.gBinarySuffix
+    ]
+  stackExeFileName = stackProgName <.> exe
+
+  zipExt = ".zip"
+  tarGzExt = tarExt <.> gzExt
+  gzExt = ".gz"
+  tarExt = ".tar"
+  nsiExt = ".nsi"
 
 -- | Create a .tar.gz files from files.  The paths should be absolute, and will
 -- be made relative to the base directory in the tarball.
-writeTarGz :: (FilePath -> FilePath) -> FilePath -> FilePath -> [FilePath] -> Action ()
+writeTarGz ::
+     (FilePath -> FilePath)
+  -> FilePath
+  -> FilePath
+  -> [FilePath]
+  -> Action ()
 writeTarGz fixPath out baseDir inputFiles = liftIO $ do
-    content <- Tar.pack baseDir $ map (dropDirectoryPrefix baseDir) inputFiles
-    L8.writeFile out $ GZip.compress $ Tar.write $ map fixPath' content
-  where
-    fixPath' :: Tar.Entry -> Tar.Entry
-    fixPath' entry =
-        case TarEntry.toTarPath isDir $ fixPath $ TarEntry.entryPath entry of
-            Left e -> error $ show (Tar.entryPath entry, e)
-            Right tarPath -> entry { TarEntry.entryTarPath = tarPath }
-      where
-        isDir =
-            case TarEntry.entryContent entry of
-                TarEntry.Directory -> True
-                _ -> False
-
--- | Drops a directory prefix from a path.  The prefix automatically has a path
--- separator character appended.  Fails if the path does not begin with the prefix.
+  content <- Tar.pack baseDir $ map (dropDirectoryPrefix baseDir) inputFiles
+  L8.writeFile out $ GZip.compress $ Tar.write $ map fixPath' content
+ where
+  fixPath' :: Tar.Entry -> Tar.Entry
+  fixPath' entry =
+    case TarEntry.toTarPath isDir $ fixPath $ TarEntry.entryPath entry of
+      Left e -> error $ show (Tar.entryPath entry, e)
+      Right tarPath -> entry { TarEntry.entryTarPath = tarPath }
+   where
+    isDir =
+      case TarEntry.entryContent entry of
+        TarEntry.Directory -> True
+        _ -> False
+
+-- | Drops a directory prefix from a path. The prefix automatically has a path
+-- separator character appended. Fails if the path does not begin with the
+-- prefix.
 dropDirectoryPrefix :: FilePath -> FilePath -> FilePath
 dropDirectoryPrefix prefix path =
-    case stripPrefix (toStandard prefix ++ "/") (toStandard path) of
-        Nothing -> error ("dropDirectoryPrefix: cannot drop " ++ show prefix ++ " from " ++ show path)
-        Just stripped -> stripped
+  case stripPrefix (toStandard prefix ++ "/") (toStandard path) of
+    Nothing -> error
+      (  "dropDirectoryPrefix: cannot drop "
+      ++ show prefix
+      ++ " from "
+      ++ show path
+      )
+    Just stripped -> stripped
 
 -- | String representation of Stack package version.
 stackVersionStr :: Global -> String
 stackVersionStr =
-    display . pkgVersion . package . gStackPackageDescription
+  display . pkgVersion . package . gStackPackageDescription
 
 -- | Current operating system.
 platformOS :: OS
 platformOS =
-    let Platform _ os = buildPlatform
-    in os
+  let Platform _ os = buildPlatform
+  in  os
 
 -- | Directory in which to store build and intermediate files.
 releaseDir :: FilePath
@@ -382,6 +503,10 @@ binaryVariantOptName = "binary-variant"
 noTestHaddocksOptName :: String
 noTestHaddocksOptName = "no-test-haddocks"
 
+-- | @--stack-args@ command-line option name.
+stackArgsOptName :: String
+stackArgsOptName = "stack-args"
+
 -- | @--build-args@ command-line option name.
 buildArgsOptName :: String
 buildArgsOptName = "build-args"
@@ -396,7 +521,9 @@ certificateNameOptName = "certificate-name"
 
 -- | Arguments to pass to all 'stack' invocations.
 stackArgs :: Global -> [String]
-stackArgs Global{..} = ["--arch=" ++ display gArch, "--interleaved-output"]
+stackArgs global = [ "--arch=" ++ display global.gArch
+                   , "--interleaved-output"
+                   ]
 
 -- | Name of the 'stack' program.
 stackProgName :: FilePath
@@ -404,17 +531,19 @@ stackProgName = "stack"
 
 -- | Global values and options.
 data Global = Global
-    { gStackPackageDescription :: !PackageDescription
-    , gAllowDirty :: !Bool
-    , gGitRevCount :: !Int
-    , gGitSha :: !String
-    , gProjectRoot :: !FilePath
-    , gHomeDir :: !FilePath
-    , gArch :: !Arch
-    , gBinarySuffix :: !String
-    , gTestHaddocks :: !Bool
-    , gBuildArgs :: [String]
-    , gStaticLinux :: !Bool
-    , gCertificateName :: !(Maybe String)
-    }
-    deriving (Show)
+  { gStackPackageDescription :: !PackageDescription
+  , gAllowDirty :: !Bool
+  , gGitRevCount :: !Int
+  , gGitSha :: !String
+  , gProjectRoot :: !FilePath
+  , gHomeDir :: !FilePath
+  , gArch :: !Arch
+  , gTargetOS :: !OS
+  , gBinarySuffix :: !String
+  , gTestHaddocks :: !Bool
+  , gBuildArgs :: [String]
+  , gStackArgs :: [String]
+  , gCheckStackArgs :: [String]
+  , gCertificateName :: !(Maybe String)
+  }
+  deriving Show
diff --git a/etc/scripts/stack.yaml b/etc/scripts/stack.yaml
new file mode 100644
index 0000000000..5a5aa66426
--- /dev/null
+++ b/etc/scripts/stack.yaml
@@ -0,0 +1,9 @@
+# Added as part of the work around for:
+# https://github.com/commercialhaskell/stack/issues/6711
+#
+# On Windows only, for some unidentified reason, stack script can fail when
+# using a pre-compiled package. This can affect the script
+# build-stack-installer.hs. The work around is to build the package required for
+# that script using the same Stack configuration as used by the script.
+
+snapshot: lts-24.55
diff --git a/mkdocs.yml b/mkdocs.yml
index f8c53a0605..77864c4a26 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,9 +1,11 @@
-site_name: The Haskell Tool Stack
-site_description: The Haskell Tool Stack
+site_name: Stack
+site_description: |
+  A program for developing Haskell projects.
 site_author: Stack contributors
+site_url: !ENV READTHEDOCS_CANONICAL_URL
 repo_url: https://github.com/commercialhaskell/stack/
 edit_uri: tree/stable/doc/
-copyright: Copyright (c) 2015-2022, Stack contributors
+copyright: Copyright (c) 2015-2025, Stack contributors
 docs_dir: doc
 site_dir: _site
 theme:
@@ -11,8 +13,16 @@ theme:
   palette:
     primary: 'deep purple'
     accent: 'deep purple'
-  icon:
-    logo: material/language-haskell
+  logo: img/stack-logo-white.svg
+  favicon: img/stack-favicon.svg
+  features:
+  - content.code.annotate
+  - content.code.copy
+  - content.code.select
+  - content.tabs.link
+  - navigation.indexes
+  - navigation.tabs
+  - navigation.top
 extra_css:
 - css/extra.css
 extra_javascript:
@@ -20,61 +30,161 @@ extra_javascript:
 # Read the Docs requires JQuery for its JavaScript code to inject the flyout
 # menu. Material for MkDocs does not come with JQuery.
 - 'https://code.jquery.com/jquery-3.6.1.min.js'
+- https://cdn.jsdelivr.net/npm/mermaid@11.7.0/dist/mermaid.min.js
+exclude_docs: |
+  /maintainers/archive/
+  /maintainers/stack_errors.md
 
 nav:
-- Home: README.md
-- Tool documentation:
-  - Install/upgrade: install_and_upgrade.md
-  - User's guide (introductory): GUIDE.md
-  - User's guide (advanced): GUIDE_advanced.md
-  - FAQ: faq.md
-  - Configuration (project and global): yaml_configuration.md
-  - Snapshot and package location: pantry.md
-  - Snapshot specification: custom_snapshot.md
-  - stack.yaml vs a Cabal file: stack_yaml_vs_cabal_package_file.md
-  - Build command: build_command.md
-  - Code coverage: coverage.md
-  - REPL environment: ghci.md
-  - Dependency visualization: dependency_visualization.md
-  - Docker integration: docker_integration.md
-  - Nix integration: nix_integration.md
-  - Non-standard project initialization: nonstandard_project_init.md
-  - Stack and Visual Studio Code: Stack_and_VS_Code.md
-  - Developing on Windows: developing_on_windows.md
-  - Shell auto-completion: shell_autocompletion.md
-  - Travis CI: travis_ci.md
-  - Azure CI: azure_ci.md
-  - Lock files: lock_files.md
-- Advanced documentation:
-  - Build overview: build_overview.md
-- Project documentation:
+- Welcome!: README.md
+- Setting up: install_and_upgrade.md
+- Getting started:
+  - tutorial/index.md
+  - 1. A Hello World example: tutorial/hello_world_example.md
+  - 2. Package description: tutorial/package_description.md
+  - 3. Project configuration: tutorial/project_configuration.md
+  - 4. Building your project: tutorial/building_your_project.md
+  - 5. Building existing projects: tutorial/building_existing_projects.md
+  - 6. Installed package databases: tutorial/installed_package_databases.md
+  - 7. stack build synonyms: tutorial/stack_build_synonyms.md
+  - 8. stack build targets: tutorial/stack_build_targets.md
+  - 9. Multi-package projects: tutorial/multi-package_projects.md
+  - 10. Cabal flags and GHC options: tutorial/cabal_flags_and_ghc_options.md
+  - 11. Locations used by Stack: tutorial/locations_used_by_stack.md
+  - 12. Executing commands: tutorial/executing_commands.md
+  - 13. Using GHC interactively: tutorial/using_ghc_interactively.md
+  - 14. Stack configuration: tutorial/stack_configuration.md
+  - 15. In conclusion: tutorial/tutorial_conclusion.md
+- Commands:
+  - commands/index.md
+  - bench: commands/bench_command.md
+  - build: commands/build_command.md
+  - clean: commands/clean_command.md
+  - config: commands/config_command.md
+  - dot: commands/dot_command.md
+  - docker: commands/docker_command.md
+  - eval: commands/eval_command.md
+  - exec: commands/exec_command.md
+  - ghc: commands/ghc_command.md
+  - ghci: commands/ghci_command.md
+  - haddock: commands/haddock_command.md
+  - hoogle: commands/hoogle_command.md
+  - hpc: commands/hpc_command.md
+  - ide: commands/ide_command.md
+  - init: commands/init_command.md
+  - install: commands/install_command.md
+  - list: commands/list_command.md
+  - ls: commands/ls_command.md
+  - new: commands/new_command.md
+  - path: commands/path_command.md
+  - purge: commands/purge_command.md
+  - query: commands/query_command.md
+  - repl: commands/repl_command.md
+  - run: commands/run_command.md
+  - runghc: commands/runghc_command.md
+  - runhaskell: commands/runhaskell_command.md
+  - script: commands/script_command.md
+  - sdist: commands/sdist_command.md
+  - setup: commands/setup_command.md
+  - templates: commands/templates_command.md
+  - test: commands/test_command.md
+  - uninstall: commands/uninstall_command.md
+  - unpack: commands/unpack_command.md
+  - update: commands/update_command.md
+  - upgrade: commands/upgrade_command.md
+  - upload: commands/upload_command.md
+- Configure:
+  - configure/index.md
+  - Environment variables: configure/environment_variables.md
+  - Configuration files:
+    - configure/yaml/index.md
+    - Project-specific configuration: configure/yaml/project.md
+    - Non-project specific configuration: configure/yaml/non-project.md
+    - The !include directive: configure/yaml/include.md
+  - Global flags and options: configure/global_flags.md
+  - Customisation scripts: configure/customisation_scripts.md
+- Topics:
+  - topics/index.md
+  - Stack root: topics/stack_root.md
+  - Stack work directories: topics/stack_work.md
+  - Stack environment: topics/stack_environment.md
+  - Snapshot location: topics/snapshot_location.md
+  - Package location: topics/package_location.md
+  - Snapshot specification: topics/custom_snapshot.md
+  - stack.yaml vs a Cabal file: topics/stack_yaml_vs_cabal_package_file.md
+  - Script interpreter: topics/scripts.md
+  - Docker integration: topics/docker_integration.md
+  - Nix integration: topics/nix_integration.md
+  - Non-standard project initialization: topics/nonstandard_project_init.md
+  - Backpack support: topics/backpack.md
+  - Building GHC from source: topics/GHC_from_source.md
+  - Debugging: topics/debugging.md
+  - Editor integration: topics/editor_integration.md
+  - Stack and Visual Studio Code: topics/Stack_and_VS_Code.md
+  - Developing on Windows: topics/developing_on_windows.md
+  - Shell auto-completion: topics/shell_autocompletion.md
+  - CI: topics/CI.md
+  - Travis CI: topics/travis_ci.md
+  - Azure CI: topics/azure_ci.md
+  - Lock files: topics/lock_files.md
+  - Haskell and C code: topics/haskell_and_c_code.md
+- Get involved:
+  - community/index.md
   - Contributors:
     - Contributor's guide: CONTRIBUTING.md
+    - Dev Containers: dev_containers.md
   - Maintainers:
+    - Version scheme: maintainers/version_scheme.md
     - Releases: maintainers/releases.md
     - Maintainer team process: maintainers/team_process.md
     - Add GHC version: maintainers/ghc.md
-    - Docker images: maintainers/docker.md
     - Upgrading MSYS2: maintainers/msys.md
     - Upgrading 7-Zip: maintainers/7zip.md
     - HaskellStack.org: maintainers/haskellstack.org.md
-- Signing key: SIGNING_KEY.md
+    - Self-hosted runners: maintainers/self-hosted_runners.md
+    - Signing key: SIGNING_KEY.md
+  - How Stack works:
+    - Build overview: build_overview.md
+- FAQ: faq.md
 - Glossary: glossary.md
-- Version history: ChangeLog.md
+- More:
+  - Other resources: other_resources.md
+  - Version history: ChangeLog.md
 
 markdown_extensions:
+- abbr
 - admonition
 - attr_list
+- def_list
+- footnotes
+- md_in_html
 - pymdownx.details
 - pymdownx.emoji:
-    emoji_index: !!python/name:materialx.emoji.twemoji
-    emoji_generator: !!python/name:materialx.emoji.to_svg
+    emoji_index: !!python/name:material.extensions.emoji.twemoji
+    emoji_generator: !!python/name:material.extensions.emoji.to_svg
 - pymdownx.highlight:
     anchor_linenums: true
 - pymdownx.inlinehilite
 - pymdownx.snippets
-- pymdownx.superfences
+- pymdownx.superfences:
+    custom_fences:
+    - name: mermaid
+      class: mermaid
+      format: !!python/name:pymdownx.superfences.fence_code_format
 - pymdownx.tabbed:
     alternate_style: true
+- pymdownx.tilde
 - toc:
     permalink: true
+
+plugins:
+- search: {}
+- redirects:
+    redirect_maps:
+      'GUIDE.md': 'tutorial/index.md'
+      'yaml_configuration.md': 'configure/yaml/index.md'
+      'build_command.md': 'commands/build_command.md'
+      'custom_snapshot.md': 'topics/custom_snapshot.md'
+      'lock_files.md': 'topics/lock_files.md'
+      'scripts.md': 'topics/scripts.md'
+- social
diff --git a/package.yaml b/package.yaml
index 16a7a29f56..bfc3b3003b 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,29 +1,39 @@
+# Hpack >= 0.35.0 is provided by Stack >= 2.9.1.
+spec-version: 0.35.0
+
 name: stack
-version: '2.10.0'
-synopsis: The Haskell Tool Stack
+version: '4.2.0'
+synopsis: A program for developing Haskell projects
 description: |
-  Please see the documentation at <https://docs.haskellstack.org>
-  for usage information.
-  .
+  Stack (the Haskell Tool Stack) is a program for developing Haskell projects.
+  It is aimed at new and experienced users of Haskell and seeks to support them
+  fully on Linux, macOS and Windows.
+
+  For information about how to use Stack, see <https://docs.haskellstack.org>.
+
   If building a 'stack' executable for distribution, please download the
   source code from <https://github.com/commercialhaskell/stack/releases>
-  and build it using Stack itself in order to ensure identical behaviour
-  to official binaries.  This package on Hackage is provided for convenience
-  and bootstrapping purposes.
-  .
-  Note that the API for the library is not currently stable, and may
-  change significantly, even between minor releases. It is
-  currently only intended for use by the executable.
+  and build it with Stack in order to ensure identical behaviour to official
+  binaries.
+
+  This package is provided on Hackage for convenience and bootstrapping
+  purposes.
+
+  Currently, the library exposed by the package is intended for use only by the
+  executable. The library's API may change significantly, even between minor
+  releases.
 category: Development
 author: Commercial Haskell SIG
-maintainer: manny@fpcomplete.com
-license: BSD3
+maintainer:
+- Mike Pilgrem <public@pilgrem.com>
+- Emanuel Borsboom <manny@fpcomplete.com>
+license: BSD-3-Clause
 github: commercialhaskell/stack
 homepage: http://haskellstack.org
 custom-setup:
   dependencies:
   - base >= 4.14.3.0 && < 5
-  - Cabal
+  - Cabal >= 3.14 && < 3.18
   - filepath
 extra-source-files:
 # note: leaving out 'package.yaml' because it causes confusion with hackage metadata revisions
@@ -31,43 +41,45 @@ extra-source-files:
 - ChangeLog.md
 - README.md
 - stack.yaml
-- stack-macos.yaml
-- doc/*.md
+- doc/**/*.md
 - src/setup-shim/StackSetupShim.hs
-- test/package-dump/ghc-7.10.txt
-- test/package-dump/ghc-7.8.4-osx.txt
-- test/package-dump/ghc-7.8.txt
-- test/package-dump/ghc-head.txt
-- src/test/Stack/Untar/test1.tar.gz
-- src/test/Stack/Untar/test2.tar.gz
+- tests/unit/package-dump/ghc-7.10.txt
+- tests/unit/package-dump/ghc-7.8.4-osx.txt
+- tests/unit/package-dump/ghc-7.8.txt
+- tests/unit/package-dump/ghc-head.txt
+- tests/unit/Stack/Untar/test1.tar.gz
+- tests/unit/Stack/Untar/test2.tar.gz
+# Support for people who prefer, or need, to build Stack with Cabal (the tool):
+- cabal.project
+- cabal.config
+# GHC's GHC2024 language extension is supported by GHC >= 9.10.1
+language: GHC2024
 ghc-options:
 - -fwrite-ide-info
 - -hiedir=.hie
 - -Wall
-- -fwarn-tabs
-- -fwarn-incomplete-uni-patterns
-- -fwarn-incomplete-record-updates
-- -optP-Wno-nonportable-include-path # workaround [Filename case on macOS · Issue #4739 · haskell/cabal](https://github.com/haskell/cabal/issues/4739)
+- -Wmissing-export-lists
+# Workaround for https://github.com/haskell/cabal/issues/4739.
+# -Wnon-noportable-include-path is a Clang diagnostic flag. See
+# https://clang.llvm.org/docs/DiagnosticsReference.html#wnonportable-include-path
+- -optP-Wno-nonportable-include-path
 dependencies:
-- base >= 4.14.3.0 && < 5
-- Cabal >= 3.6.3.0
+- base >= 4.16.0.0 && < 5
+- Cabal >= 3.14 && < 3.17
 - aeson >= 2.0.3.0
-- annotated-wl-pprint
-- ansi-terminal
+- aeson-warning-parser >= 0.1.1
+- ansi-terminal >= 1.0.2
 - array
 - async
 - attoparsec
 - base64-bytestring
 - bytestring
-- casa-client
-- casa-types
-- colour
+- casa-client >= 0.0.2
+- companion
 - conduit
 - conduit-extra
 - containers
-- cryptonite
-- cryptonite-conduit
-- deepseq
+- crypton
 - directory
 - echo
 - exceptions
@@ -75,66 +87,51 @@ dependencies:
 - file-embed
 - filelock
 - filepath
-- fsnotify < 0.4
+- fsnotify >= 0.4.1
 - generic-deriving
-- hackage-security
+- ghc-boot
 - hashable
-- hi-file-parser
-- hpack
+- hi-file-parser >= 0.1.9.0
+- hpack >= 0.36.0
 - hpc
 - http-client
-- http-client-tls
+- http-client-tls >= 0.3.6.2
 - http-conduit
-- http-download
+- http-download >= 0.2.2.0
 - http-types
-- memory
 - microlens
-- mintty
-- mono-traversable
 - mtl
 - mustache
 - neat-interpolation
-- network-uri
 - open-browser
-- optparse-applicative >= 0.17.0.0
-- pantry >= 0.6.0
-- path
+- optparse-applicative >= 0.18.1.0
+- pantry >= 0.11.4
+- path >= 0.9.5
 - path-io
 # In order for Cabal (the tool) to build Stack, it needs to be told of the
 # upper bound on persistent. See
 # https://github.com/commercialhaskell/stack/pull/5677#issuecomment-1193318542
-- persistent >= 2.13.3.5 && < 2.14
+- persistent >= 2.14.0.0 && < 2.19
 - persistent-sqlite
-- persistent-template
 - pretty
-- primitive
 - process >= 1.6.13.2
 - project-template
+- ram
 - random
-- retry
-- rio >= 0.1.22.0
-- rio-prettyprint >= 0.1.1.0
-- semigroups
+- rio >= 0.1.22.0 && ( < 0.1.23.0 || > 0.1.23.0 )
+- rio-prettyprint >= 0.1.8.0
+- semaphore-compat < 2
 - split
 - stm
-- streaming-commons
-- tar
+- tar >= 0.6.2.0
 - template-haskell
-- temporary
 - text
-- text-metrics
-- th-reify-many
 - time
-- tls
 - transformers
-- typed-process
-- unicode-transforms
 - unix-compat
-- unliftio
 - unordered-containers
 - vector
 - yaml
-- zip-archive
 - zlib
 when:
 - condition: os(windows)
@@ -148,16 +145,25 @@ when:
           hsc2hs:hsc2hs
     dependencies:
     - unix
+# See https://github.com/haskell/network/pull/552.
+- condition: impl(ghc >= 9.4.5) && os(windows)
+  dependencies: network >= 3.1.2.9
 - condition: flag(developer-mode)
   then:
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True
   else:
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False
+- condition: flag(disable-stack-upload)
+  then:
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True
+  else:
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False
 library:
-  source-dirs: src/
+  source-dirs: src
   ghc-options:
-  - -fwarn-identities
+  - -Widentities
   generated-exposed-modules:
+  - Build_stack
   - Paths_stack
   exposed-modules:
   - Control.Concurrent.Execute
@@ -165,6 +171,7 @@ library:
   - Data.Attoparsec.Combinators
   - Data.Attoparsec.Interpreter
   - Data.Monoid.Map
+  - GHC.Utils.GhcPkg.Main.Compat
   - Network.HTTP.StackClient
   - Options.Applicative.Args
   - Options.Applicative.Builder.Extra
@@ -172,27 +179,43 @@ library:
   - Path.CheckInstall
   - Path.Extra
   - Path.Find
+  - Stack
   - Stack.Build
+  - Stack.Build.Backpack
   - Stack.Build.Cache
   - Stack.Build.ConstructPlan
   - Stack.Build.Execute
+  - Stack.Build.ExecuteEnv
+  - Stack.Build.ExecutePackage
   - Stack.Build.Haddock
   - Stack.Build.Installed
   - Stack.Build.Source
   - Stack.Build.Target
+  - Stack.BuildInfo
+  - Stack.BuildOpts
   - Stack.BuildPlan
+  - Stack.CLI
   - Stack.Clean
+  - Stack.Component
+  - Stack.ComponentFile
   - Stack.Config
   - Stack.Config.Build
+  - Stack.Config.ConfigureScript
   - Stack.Config.Docker
   - Stack.Config.Nix
+  - Stack.ConfigureOpts
   - Stack.ConfigCmd
   - Stack.Constants
   - Stack.Constants.Config
+  - Stack.Constants.StackProgName
   - Stack.Coverage
   - Stack.DefaultColorWhen
+  - Stack.DependencyGraph
   - Stack.Docker
+  - Stack.DockerCmd
   - Stack.Dot
+  - Stack.Eval
+  - Stack.Exec
   - Stack.FileWatch
   - Stack.GhcPkg
   - Stack.Ghci
@@ -210,30 +233,45 @@ library:
   - Stack.Options.BuildParser
   - Stack.Options.CleanParser
   - Stack.Options.ConfigParser
+  - Stack.Options.ConfigEnvParser
+  - Stack.Options.ConfigSetParser
   - Stack.Options.Completion
   - Stack.Options.DockerParser
   - Stack.Options.DotParser
+  - Stack.Options.EvalParser
   - Stack.Options.ExecParser
+  - Stack.Options.FlagsParser
   - Stack.Options.GhcBuildParser
   - Stack.Options.GhciParser
   - Stack.Options.GhcVariantParser
   - Stack.Options.GlobalParser
   - Stack.Options.HaddockParser
   - Stack.Options.HpcReportParser
+  - Stack.Options.IdeParser
+  - Stack.Options.InitParser
   - Stack.Options.LogLevelParser
+  - Stack.Options.LsParser
   - Stack.Options.NewParser
   - Stack.Options.NixParser
   - Stack.Options.PackageParser
-  - Stack.Options.ResolverParser
-  - Stack.Options.ScriptParser
+  - Stack.Options.PackagesParser
+  - Stack.Options.PathParser
+  - Stack.Options.PvpBoundsParser
   - Stack.Options.SDistParser
+  - Stack.Options.ScriptParser
+  - Stack.Options.SetupParser
+  - Stack.Options.SnapshotParser
   - Stack.Options.TestParser
+  - Stack.Options.UnpackParser
+  - Stack.Options.UpgradeParser
   - Stack.Options.UploadParser
   - Stack.Options.Utils
   - Stack.Package
   - Stack.PackageDump
+  - Stack.PackageFile
   - Stack.Path
   - Stack.Prelude
+  - Stack.Query
   - Stack.Runners
   - Stack.Script
   - Stack.SDist
@@ -244,22 +282,96 @@ library:
   - Stack.Storage.Project
   - Stack.Storage.User
   - Stack.Storage.Util
+  - Stack.Templates
+  - Stack.Types.AddCommand
+  - Stack.Types.AllowNewerDeps
+  - Stack.Types.ApplyGhcOptions
+  - Stack.Types.ApplyProgOptions
   - Stack.Types.Build
+  - Stack.Types.Build.ConstructPlan
+  - Stack.Types.Build.Exception
+  - Stack.Types.BuildConfig
+  - Stack.Types.BuildOpts
+  - Stack.Types.BuildOptsCLI
+  - Stack.Types.BuildOptsMonoid
+  - Stack.Types.CabalConfigKey
+  - Stack.Types.Cache
+  - Stack.Types.Casa
+  - Stack.Types.ColorWhen
+  - Stack.Types.CompCollection
   - Stack.Types.CompilerBuild
+  - Stack.Types.CompilerPaths
   - Stack.Types.Compiler
+  - Stack.Types.Component
+  - Stack.Types.ComponentUtils
   - Stack.Types.Config
-  - Stack.Types.Config.Build
+  - Stack.Types.ConfigExtra
+  - Stack.Types.Config.Exception
+  - Stack.Types.ConfigMonoid
+  - Stack.Types.ConfigSetOpts
+  - Stack.Types.ConfigureOpts
+  - Stack.Types.Curator
+  - Stack.Types.Dependency
+  - Stack.Types.DependencyTree
   - Stack.Types.Docker
+  - Stack.Types.DockerEntrypoint
+  - Stack.Types.DotConfig
+  - Stack.Types.DotOpts
+  - Stack.Types.DownloadInfo
+  - Stack.Types.DumpLogs
+  - Stack.Types.DumpPackage
+  - Stack.Types.EnvConfig
+  - Stack.Types.EnvSettings
+  - Stack.Types.ExtraDirs
+  - Stack.Types.FileDigestCache
+  - Stack.Types.GHCDownloadInfo
+  - Stack.Types.GHCVariant
+  - Stack.Types.GhcOptionKey
+  - Stack.Types.GhcOptions
+  - Stack.Types.GhcPkgExe
   - Stack.Types.GhcPkgId
+  - Stack.Types.GhciOpts
+  - Stack.Types.GlobalOpts
+  - Stack.Types.GlobalOptsMonoid
+  - Stack.Types.HpcReportOpts
+  - Stack.Types.IdeOpts
+  - Stack.Types.Installed
+  - Stack.Types.InterfaceOpt
+  - Stack.Types.IsMutable
+  - Stack.Types.LockFileBehavior
+  - Stack.Types.LsOpts
+  - Stack.Types.MsysEnvironment
   - Stack.Types.NamedComponent
   - Stack.Types.Nix
   - Stack.Types.Package
+  - Stack.Types.PackageFile
   - Stack.Types.PackageName
-  - Stack.Types.Resolver
+  - Stack.Types.ParentMap
+  - Stack.Types.Plan
+  - Stack.Types.Platform
+  - Stack.Types.Project
+  - Stack.Types.ProjectAndConfigMonoid
+  - Stack.Types.ProjectConfig
+  - Stack.Types.PvpBounds
+  - Stack.Types.Runner
+  - Stack.Types.SCM
+  - Stack.Types.SDistOpts
+  - Stack.Types.SetupInfo
+  - Stack.Types.SetupOpts
+  - Stack.Types.Snapshot
   - Stack.Types.SourceMap
+  - Stack.Types.StackYamlLoc
+  - Stack.Types.Storage
   - Stack.Types.TemplateName
+  - Stack.Types.UnusedFlags
+  - Stack.Types.UpgradeOpts
+  - Stack.Types.UploadOpts
   - Stack.Types.Version
+  - Stack.Types.VersionedDownloadInfo
+  - Stack.Types.WantedCompilerSetter
+  - Stack.Uninstall
   - Stack.Unpack
+  - Stack.Update
   - Stack.Upgrade
   - Stack.Upload
   - System.Info.ShortPathName
@@ -273,13 +385,19 @@ library:
     else:
       source-dirs: src/unix/
       c-sources: src/unix/cbits/uname.c
+  - condition: ! '!(flag(disable-git-info))'
+    cpp-options: -DUSE_GIT_INFO
+    dependencies:
+    - githash
+    - optparse-simple
+  - condition: flag(hide-dependency-versions)
+    cpp-options: -DHIDE_DEP_VERSIONS
+  - condition: flag(supported-build)
+    cpp-options: -DSUPPORTED_BUILD
 executables:
   stack:
     main: Main.hs
-    source-dirs: src/main
-    generated-other-modules:
-    - Build_stack
-    - Paths_stack
+    source-dirs: app
     ghc-options:
     - -threaded
     - -rtsopts
@@ -290,20 +408,11 @@ executables:
       ld-options:
       - -static
       - -pthread
-    - condition: ! '!(flag(disable-git-info))'
-      cpp-options: -DUSE_GIT_INFO
-      dependencies:
-      - githash
-      - optparse-simple
-    - condition: flag(hide-dependency-versions)
-      cpp-options: -DHIDE_DEP_VERSIONS
-    - condition: flag(supported-build)
-      cpp-options: -DSUPPORTED_BUILD
   stack-integration-test:
     main: IntegrationSpec.hs
     source-dirs:
-    - test/integration
-    - test/integration/lib
+    - tests/integration
+    - tests/integration/lib
     ghc-options:
     - -threaded
     - -rtsopts
@@ -320,9 +429,15 @@ executables:
       - -static
       - -pthread
 tests:
-  stack-test:
+  stack-unit-test:
     main: Spec.hs
-    source-dirs: src/test
+    source-dirs: tests/unit
+    when:
+    - condition: 'os(windows)'
+      then:
+        source-dirs: tests/unit/windows/
+      else:
+        source-dirs: tests/unit/unix/
     ghc-options:
     - -threaded
     dependencies:
@@ -330,41 +445,53 @@ tests:
     - hspec
     - raw-strings-qq
     - stack
-    - smallcheck
     verbatim: |
       build-tool-depends:
           hspec-discover:hspec-discover
 flags:
   static:
-    description: Pass -static/-pthread to ghc when linking the stack binary.
+    description: >-
+      When building the Stack executable, or the stack-integration-test
+      executable, pass the -static and -pthread flags to the linker used by GHC.
     manual: true
     default: false
   disable-git-info:
-    description: Disable compile-time inclusion of current git info in stack
+    description: >-
+      Disable inclusion of current Git information in the Stack executable when
+      it is built.
     manual: true
     default: false
   hide-dependency-versions:
-    description: "Hides dependency versions from 'stack --version', used only by building
-      Stack and the default 'stack.yaml'.  Note to packagers/distributors:
-      DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING 'stack' ANY OTHER WAY
-      (e.g. using cabal or from Hackage), as it makes debugging support
-      requests more difficult."
+    description: >-
+      Hides dependency versions from 'stack --version'. Used only when building
+      a Stack executable for official release. Note to packagers/distributors:
+      DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING STACK ANY OTHER WAY (e.g.
+      using Cabal or from Hackage), as it makes debugging support requests more
+      difficult.
     manual: true
     default: false
   integration-tests:
-    description: Run the integration test suite
+    description: Run the integration test suite.
     manual: true
     default: false
   supported-build:
-    description: "If false, causes 'stack --version' to issue a warning about
-      the build being unsupported.  Should be True only if building with
-      Stack and the default 'stack.yaml'.  Note to packagers/distributors:
-      DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING 'stack' ANY OTHER WAY
-      (e.g. using cabal or from Hackage), as it makes debugging support
-      requests more difficult."
+    description: >-
+      If false, causes 'stack --version' to issue a warning about the build
+      being unsupported. Used only when building a Stack executable for official
+      release. Note to packagers/distributors: DO NOT OVERRIDE THIS FLAG IF YOU
+      ARE BUILDING STACK ANY OTHER WAY (e.g. using Cabal or from Hackage), as it
+      makes debugging support requests more difficult.
     manual: true
     default: false
   developer-mode:
-    description: "By default, should extra developer information be output?"
+    description: >-
+      By default, output extra developer information.
+    manual: true
+    default: false
+  disable-stack-upload:
+    description: >-
+      For use only during development and debugging. Disable 'stack upload' so
+      that it does not make HTTP requests. Stack will output information about
+      the HTTP request(s) that it would have made if the command was enabled.
     manual: true
     default: false
diff --git a/src/Control/Concurrent/Execute.hs b/src/Control/Concurrent/Execute.hs
index e5e7c2eea5..2ec8f0960c 100644
--- a/src/Control/Concurrent/Execute.hs
+++ b/src/Control/Concurrent/Execute.hs
@@ -1,157 +1,200 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+
+{-|
+Module      : Control.Concurrent.Execute
+Description : Concurrent execution with dependencies.
+License     : BSD-3-Clause
+
+Concurrent execution with dependencies. Types currently hard-coded for needs of
+stack, but could be generalized easily.
+-}
 
--- Concurrent execution with dependencies. Types currently hard-coded for needs
--- of stack, but could be generalized easily.
 module Control.Concurrent.Execute
     ( ActionType (..)
     , ActionId (..)
     , ActionContext (..)
     , Action (..)
-    , Concurrency(..)
+    , Concurrency (..)
     , runActions
     ) where
 
-import           Control.Concurrent.STM   (retry)
+import           Control.Concurrent.STM ( check )
 import           Stack.Prelude
-import           Data.List (sortBy)
-import qualified Data.Set                 as Set
+import           Data.List ( sortBy )
+import qualified Data.Set as Set
+import           Stack.Types.Plan ( ComponentKey )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Control.Concurrent.Execute" module.
+data ExecuteException
+  = InconsistentDependenciesBug
+  deriving Show
 
+instance Exception ExecuteException where
+  displayException InconsistentDependenciesBug = bugReport "[S-2816]"
+    "Inconsistent dependencies were discovered while executing your build \
+    \plan."
+
+-- | Type representing types of Stack build actions.
 data ActionType
-    = ATBuild
-      -- ^ Action for building a package's library and executables. If
-      -- 'taskAllInOne' is 'True', then this will also build benchmarks
-      -- and tests. It is 'False' when then library's benchmarks or
-      -- test-suites have cyclic dependencies.
-    | ATBuildFinal
-      -- ^ Task for building the package's benchmarks and test-suites.
-      -- Requires that the library was already built.
-    | ATRunTests
-      -- ^ Task for running the package's test-suites.
-    | ATRunBenchmarks
-      -- ^ Task for running the package's benchmarks.
-    deriving (Show, Eq, Ord)
-data ActionId = ActionId !PackageIdentifier !ActionType
-    deriving (Show, Eq, Ord)
+  = ATBuild
+    -- ^ Action for configuring and building a single component (library,
+    -- sub-library, executable, or Backpack instantiation).
+  | ATBuildFinal
+    -- ^ Action for building a package's test-suites and\/or benchmarks as a
+    -- separate Setup invocation. Used when the final task is not folded into
+    -- the primary 'ATBuild': curator builds that expect test failures, the
+    -- cyclic-plan fallback, or per-component CTest\/CBench keys.
+  | ATRunTests
+    -- ^ Task for running the package's test-suites.
+  | ATRunBenchmarks
+    -- ^ Task for running the package's benchmarks.
+  deriving (Show, Eq, Ord)
+
+-- | Types representing the unique ids of Stack build actions.
+data ActionId
+  = ActionId !ComponentKey !ActionType
+  deriving (Eq, Ord, Show)
+
+-- | Type representing Stack build actions.
 data Action = Action
-    { actionId :: !ActionId
-    , actionDeps :: !(Set ActionId)
-    , actionDo :: !(ActionContext -> IO ())
-    , actionConcurrency :: !Concurrency
-    }
+  { actionId :: !ActionId
+    -- ^ The action's unique id.
+  , actionDeps :: !(Set ActionId)
+    -- ^ Actions on which this action depends.
+  , action :: !(ActionContext -> IO ())
+    -- ^ The action's 'IO' action, given a context.
+  , concurrency :: !Concurrency
+    -- ^ Whether this action may be run concurrently with others.
+  }
 
-data Concurrency = ConcurrencyAllowed | ConcurrencyDisallowed
-    deriving (Eq)
+-- | Type representing permissions for actions to be run concurrently with
+-- others.
+data Concurrency
+  = ConcurrencyAllowed
+  | ConcurrencyDisallowed
+  deriving Eq
 
 data ActionContext = ActionContext
-    { acRemaining :: !(Set ActionId)
-    -- ^ Does not include the current action
-    , acDownstream :: [Action]
-    -- ^ Actions which depend on the current action
-    , acConcurrency :: !Concurrency
-    -- ^ Whether this action may be run concurrently with others
-    }
+  { remaining :: !(Set ActionId)
+    -- ^ Does not include the current action.
+  , downstream :: [Action]
+    -- ^ Actions which depend on the current action.
+  , concurrency :: !Concurrency
+    -- ^ Whether this action may be run concurrently with others.
+  }
 
 data ExecuteState = ExecuteState
-    { esActions    :: TVar [Action]
-    , esExceptions :: TVar [SomeException]
-    , esInAction   :: TVar (Set ActionId)
-    , esCompleted  :: TVar Int
-    , esKeepGoing  :: Bool
-    }
+  { actions    :: TVar [Action]
+  , exceptions :: TVar [SomeException]
+  , inAction   :: TVar (Set ActionId)
+  , completed  :: TVar Int
+  , keepGoing  :: Bool
+  }
 
-data ExecuteException
-    = InconsistentDependencies
-    deriving Typeable
-instance Exception ExecuteException
-
-instance Show ExecuteException where
-    show InconsistentDependencies =
-        "Inconsistent dependencies were discovered while executing your build \
-        \plan. This should never happen, please report it as a bug to the \
-        \Stack team."
-
-runActions :: Int -- ^ threads
-           -> Bool -- ^ keep going after one task has failed
-           -> [Action]
-           -> (TVar Int -> TVar (Set ActionId) -> IO ()) -- ^ progress updated
-           -> IO [SomeException]
-runActions threads keepGoing actions0 withProgress = do
-    es <- ExecuteState
-        <$> newTVarIO (sortActions actions0)
-        <*> newTVarIO []
-        <*> newTVarIO Set.empty
-        <*> newTVarIO 0
-        <*> pure keepGoing
-    _ <- async $ withProgress (esCompleted es) (esInAction es)
-    if threads <= 1
-        then runActions' es
-        else replicateConcurrently_ threads $ runActions' es
-    readTVarIO $ esExceptions es
+runActions ::
+     Int -- ^ threads
+  -> Bool -- ^ keep going after one task has failed
+  -> [Action]
+  -> (TVar Int -> TVar (Set ActionId) -> IO ()) -- ^ progress updated
+  -> IO [SomeException]
+runActions threads keepGoing actions withProgress = do
+  es <- ExecuteState
+    <$> newTVarIO (sortActions actions) -- esActions
+    <*> newTVarIO [] -- esExceptions
+    <*> newTVarIO Set.empty -- esInAction
+    <*> newTVarIO 0 -- esCompleted
+    <*> pure keepGoing -- esKeepGoing
+  _ <- async $ withProgress es.completed es.inAction
+  if threads <= 1
+    then runActions' es
+    else replicateConcurrently_ threads $ runActions' es
+  readTVarIO es.exceptions
 
 -- | Sort actions such that those that can't be run concurrently are at
 -- the end.
 sortActions :: [Action] -> [Action]
-sortActions = sortBy (compareConcurrency `on` actionConcurrency)
-  where
-    -- NOTE: Could derive Ord. However, I like to make this explicit so
-    -- that changes to the datatype must consider how it's affecting
-    -- this.
-    compareConcurrency ConcurrencyAllowed ConcurrencyDisallowed = LT
-    compareConcurrency ConcurrencyDisallowed ConcurrencyAllowed = GT
-    compareConcurrency _ _ = EQ
+sortActions = sortBy (compareConcurrency `on` (.concurrency))
+ where
+  -- NOTE: Could derive Ord. However, I like to make this explicit so
+  -- that changes to the datatype must consider how it's affecting
+  -- this.
+  compareConcurrency ConcurrencyAllowed ConcurrencyDisallowed = LT
+  compareConcurrency ConcurrencyDisallowed ConcurrencyAllowed = GT
+  compareConcurrency _ _ = EQ
 
 runActions' :: ExecuteState -> IO ()
-runActions' ExecuteState {..} =
-    loop
-  where
-    breakOnErrs inner = do
-        errs <- readTVar esExceptions
-        if null errs || esKeepGoing
-            then inner
-            else pure $ pure ()
-    withActions inner = do
-        as <- readTVar esActions
-        if null as
-            then pure $ pure ()
-            else inner as
-    loop = join $ atomically $ breakOnErrs $ withActions $ \as ->
-        case break (Set.null . actionDeps) as of
-            (_, []) -> do
-                inAction <- readTVar esInAction
-                if Set.null inAction
-                    then do
-                        unless esKeepGoing $
-                            modifyTVar esExceptions (toException InconsistentDependencies:)
-                        pure $ pure ()
-                    else retry
-            (xs, action:ys) -> do
-                inAction <- readTVar esInAction
-                case actionConcurrency action of
-                  ConcurrencyAllowed -> pure ()
-                  ConcurrencyDisallowed -> unless (Set.null inAction) retry
-                let as' = xs ++ ys
-                    remaining = Set.union
-                        (Set.fromList $ map actionId as')
-                        inAction
-                writeTVar esActions as'
-                modifyTVar esInAction (Set.insert $ actionId action)
-                pure $ mask $ \restore -> do
-                    eres <- try $ restore $ actionDo action ActionContext
-                        { acRemaining = remaining
-                        , acDownstream = downstreamActions (actionId action) as'
-                        , acConcurrency = actionConcurrency action
-                        }
-                    atomically $ do
-                        modifyTVar esInAction (Set.delete $ actionId action)
-                        modifyTVar esCompleted (+1)
-                        case eres of
-                            Left err -> modifyTVar esExceptions (err:)
-                            Right () ->
-                                let dropDep a = a { actionDeps = Set.delete (actionId action) $ actionDeps a }
-                                 in modifyTVar esActions $ map dropDep
-                    restore loop
-
-downstreamActions :: ActionId -> [Action] -> [Action]
-downstreamActions aid = filter (\a -> aid `Set.member` actionDeps a)
+runActions' es = loop
+ where
+  loop :: IO ()
+  loop = join $ atomically $ breakOnErrs $ withActions processActions
+
+  breakOnErrs :: STM (IO ()) -> STM (IO ())
+  breakOnErrs inner = do
+    errs <- readTVar es.exceptions
+    if null errs || es.keepGoing
+      then inner
+      else doNothing
+
+  withActions :: ([Action] -> STM (IO ())) -> STM (IO ())
+  withActions inner = do
+    actions <- readTVar es.actions
+    if null actions
+      then doNothing
+      else inner actions
+
+  processActions :: [Action] -> STM (IO ())
+  processActions actions = do
+    inAction <- readTVar es.inAction
+    case break (Set.null . (.actionDeps)) actions of
+      (_, []) -> do
+        check (Set.null inAction)
+        unless es.keepGoing $
+          modifyTVar es.exceptions (toException InconsistentDependenciesBug:)
+        doNothing
+      (xs, action:ys) -> processAction inAction (xs ++ ys) action
+
+  processAction :: Set ActionId -> [Action] -> Action -> STM (IO ())
+  processAction inAction otherActions action = do
+    let concurrency = action.concurrency
+    unless (concurrency == ConcurrencyAllowed) $
+      check (Set.null inAction)
+    let action' = action.actionId
+        otherActions' = Set.fromList $ map (.actionId) otherActions
+        remaining = Set.union otherActions' inAction
+        downstream = downstreamActions action' otherActions
+        actionContext = ActionContext
+          { remaining
+          , downstream
+          , concurrency
+          }
+    writeTVar es.actions otherActions
+    modifyTVar es.inAction (Set.insert action')
+    pure $ do
+      mask $ \restore -> do
+        eres <- try $ restore $ action.action actionContext
+        atomically $ do
+          modifyTVar es.inAction (Set.delete action')
+          modifyTVar es.completed (+1)
+          case eres of
+            Left err -> modifyTVar es.exceptions (err:)
+            Right () -> modifyTVar es.actions $ map (dropDep action')
+      loop
+
+  -- | Filter a list of actions to include only those that depend on the given
+  -- action.
+  downstreamActions :: ActionId -> [Action] -> [Action]
+  downstreamActions aid = filter (\a -> aid `Set.member` a.actionDeps)
+
+  -- | Given two actions (the first specified by its id) yield an action
+  -- equivalent to the second but excluding any dependency on the first action.
+  dropDep :: ActionId -> Action -> Action
+  dropDep action' action =
+    action { actionDeps = Set.delete action' action.actionDeps }
+
+  -- | @IO ()@ lifted into 'STM'.
+  doNothing :: STM (IO ())
+  doNothing = pure $ pure ()
diff --git a/src/Data/Attoparsec/Args.hs b/src/Data/Attoparsec/Args.hs
index cf12c431d8..b5a72fb458 100644
--- a/src/Data/Attoparsec/Args.hs
+++ b/src/Data/Attoparsec/Args.hs
@@ -1,25 +1,31 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
--- | Parsing of Stack command line arguments
+{-|
+Module      : Data.Attoparsec.Args
+Description : Parsing of Stack command line arguments.
+License     : BSD-3-Clause
+
+Parsing of Stack command line arguments.
+-}
 
 module Data.Attoparsec.Args
-    ( EscapingMode(..)
-    , argsParser
-    , parseArgs
-    , parseArgsFromString
-    ) where
+  ( EscapingMode (..)
+  , argsParser
+  , parseArgs
+  , parseArgsFromString
+  ) where
 
-import           Data.Attoparsec.Text ((<?>))
+import           Data.Attoparsec.Text ( (<?>) )
 import qualified Data.Attoparsec.Text as P
 import qualified Data.Text as T
 import           Stack.Prelude
 
 -- | Mode for parsing escape characters.
 data EscapingMode
-    = Escaping
-    | NoEscaping
-    deriving (Show,Eq,Enum)
+  = Escaping
+  | NoEscaping
+  deriving (Enum, Eq, Show)
 
 -- | Parse arguments using 'argsParser'.
 parseArgs :: EscapingMode -> Text -> Either String [String]
@@ -29,17 +35,24 @@ parseArgs mode = P.parseOnly (argsParser mode)
 parseArgsFromString :: EscapingMode -> String -> Either String [String]
 parseArgsFromString mode = P.parseOnly (argsParser mode) . T.pack
 
--- | A basic argument parser. It supports space-separated text, and
--- string quotation with identity escaping: \x -> x.
+-- | A basic argument parser. It supports space-separated text, and string
+-- quotation with identity escaping: \x -> x.
 argsParser :: EscapingMode -> P.Parser [String]
-argsParser mode = many (P.skipSpace *> (quoted <|> unquoted)) <*
-                  P.skipSpace <* (P.endOfInput <?> "unterminated string")
-  where
-    unquoted = P.many1 naked
-    quoted = P.char '"' *> string <* P.char '"'
-    string = many (case mode of
-                     Escaping -> escaped <|> nonquote
-                     NoEscaping -> nonquote)
-    escaped = P.char '\\' *> P.anyChar
-    nonquote = P.satisfy (/= '"')
-    naked = P.satisfy (not . flip elem ("\" " :: String))
+argsParser mode =
+     many
+       (  P.skipSpace
+       *> (quoted <|> unquoted)
+       )
+  <* P.skipSpace
+  <* (P.endOfInput <?> "unterminated string")
+ where
+  quoted = P.char '"' *> str <* P.char '"'
+  unquoted = P.many1 naked
+  str = many
+    ( case mode of
+        Escaping -> escaped <|> nonquote
+        NoEscaping -> nonquote
+    )
+  escaped = P.char '\\' *> P.anyChar
+  nonquote = P.satisfy (/= '"')
+  naked = P.satisfy (not . flip elem ("\" " :: String))
diff --git a/src/Data/Attoparsec/Combinators.hs b/src/Data/Attoparsec/Combinators.hs
index a377e2b0be..a3ab042221 100644
--- a/src/Data/Attoparsec/Combinators.hs
+++ b/src/Data/Attoparsec/Combinators.hs
@@ -1,25 +1,38 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
--- | More readable combinators for writing parsers.
+{-|
+Module      : Data.Attoparsec.Combinators
+Description : More readable combinators for writing parsers.
+License     : BSD-3-Clause
 
-module Data.Attoparsec.Combinators where
+More readable combinators for writing parsers.
+-}
 
-import Stack.Prelude
+module Data.Attoparsec.Combinators
+  ( alternating
+  , appending
+  , concating
+  , pured
+  ) where
+
+import           Stack.Prelude
 
 -- | Concatenate two parsers.
-appending :: (Applicative f,Semigroup a)
-                 => f a -> f a -> f a
+appending ::
+     (Applicative f, Semigroup a)
+  => f a
+  -> f a
+  -> f a
 appending a b = (<>) <$> a <*> b
 
 -- | Alternative parsers.
-alternating :: Alternative f
-            => f a -> f a -> f a
+alternating :: Alternative f => f a -> f a -> f a
 alternating a b = a <|> b
 
 -- | Pure something.
-pured :: (Applicative g,Applicative f) => g a -> g (f a)
+pured :: (Applicative g, Applicative f) => g a -> g (f a)
 pured = fmap pure
 
 -- | Concating the result of an action.
-concating :: (Monoid m,Applicative f) => f [m] -> f m
+concating :: (Monoid m, Applicative f) => f [m] -> f m
 concating = fmap mconcat
diff --git a/src/Data/Attoparsec/Interpreter.hs b/src/Data/Attoparsec/Interpreter.hs
index 56a79b0a74..93087ae0c8 100644
--- a/src/Data/Attoparsec/Interpreter.hs
+++ b/src/Data/Attoparsec/Interpreter.hs
@@ -1,153 +1,162 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-{- |  This module implements parsing of additional arguments embedded in a
-      comment when Stack is invoked as a script interpreter
+{-|
+Module      : Data.Attoparsec.Interpreter
+License     : BSD-3-Clause
 
-  ===Specifying arguments in script interpreter mode
-  @/stack/@ can execute a Haskell source file using @/runghc/@ and if required
-  it can also install and setup the compiler and any package dependencies
-  automatically.
+This module implements parsing of additional arguments embedded in a comment
+when Stack is invoked as a script interpreter
 
-  For using a Haskell source file as an executable script on a Unix like OS,
-  the first line of the file must specify @stack@ as the interpreter using a
-  shebang directive e.g.
+=== Specifying arguments in script interpreter mode
 
-  > #!/usr/bin/env stack
+@/stack/@ can execute a Haskell source file using @/runghc/@ and if required it
+can also install and setup the compiler and any package dependencies
+automatically.
 
-  Additional arguments can be specified in a haskell comment following the
-  @#!@ line. The contents inside the comment must be a single valid stack
-  command line, starting with @stack@ as the command and followed by the
-  options to use for executing this file.
+For using a Haskell source file as an executable script on a Unix like OS, the
+first line of the file must specify @stack@ as the interpreter using a shebang
+directive e.g.
 
-  The comment must be on the line immediately following the @#!@ line. The
-  comment must start in the first column of the line. When using a block style
-  comment the command can be split on multiple lines.
+> #!/usr/bin/env stack
 
-  Here is an example of a single line comment:
+Additional arguments can be specified in a haskell comment following the @#!@
+line. The contents inside the comment must be a single valid stack command line,
+starting with @stack@ as the command and followed by the options to use for
+executing this file.
 
-  > #!/usr/bin/env stack
-  > -- stack --resolver lts-3.14 --install-ghc runghc --package random
+The comment must be on the line immediately following the @#!@ line. The
+comment must start in the first column of the line. When using a block style
+comment the command can be split on multiple lines.
 
-  Here is an example of a multi line block comment:
+Here is an example of a single line comment:
+
+> #!/usr/bin/env stack
+> -- stack --snapshot lts-3.14 --install-ghc runghc --package random
+
+Here is an example of a multi line block comment:
 
 @
   #!\/usr\/bin\/env stack
   {\- stack
-    --resolver lts-3.14
+    --snapshot lts-3.14
     --install-ghc
     runghc
     --package random
   -\}
 @
 
-  When the @#!@ line is not present, the file can still be executed
-  using @stack \<file name\>@ command if the file starts with a valid stack
-  interpreter comment. This can be used to execute the file on Windows for
-  example.
+When the @#!@ line is not present, the file can still be executed using
+@stack \<file name\>@ command if the file starts with a valid stack interpreter
+comment. This can be used to execute the file on Windows for example.
 
-  Nested block comments are not supported.
+Nested block comments are not supported.
 -}
 
 module Data.Attoparsec.Interpreter
-    ( interpreterArgsParser -- for unit tests
-    , getInterpreterArgs
-    ) where
+  ( interpreterArgsParser -- for unit tests
+  , getInterpreterArgs
+  ) where
 
-import           Data.Attoparsec.Args
-import           Data.Attoparsec.Text ((<?>))
+import           Data.Attoparsec.Args ( EscapingMode (..), argsParser )
+import           Data.Attoparsec.Text ( (<?>) )
 import qualified Data.Attoparsec.Text as P
-import           Data.Char (isSpace)
-import           Conduit
-import           Data.Conduit.Attoparsec
-import           Data.List (intercalate)
-import           Data.Text (pack)
+import           Data.Char ( isSpace )
+import           Conduit ( decodeUtf8C, withSourceFile )
+import           Data.Conduit.Attoparsec ( ParseError (..), Position (..), sinkParserEither )
+import           Data.List ( intercalate )
+import           Data.List.NonEmpty ( singleton )
+import           Data.Text ( pack )
+import           RIO.NonEmpty ( nonEmpty )
+import           Stack.Constants ( stackProgName )
 import           Stack.Prelude
-import           System.FilePath (takeExtension)
-import           System.IO (hPutStrLn)
+import           System.FilePath ( takeExtension )
+import           System.IO ( hPutStrLn )
 
 -- | Parser to extract the Stack command line embedded inside a comment
 -- after validating the placement and formatting rules for a valid
 -- interpreter specification.
 interpreterArgsParser :: Bool -> String -> P.Parser String
 interpreterArgsParser isLiterate progName = P.option "" sheBangLine *> interpreterComment
-  where
-    sheBangLine =   P.string "#!"
-                 *> P.manyTill P.anyChar P.endOfLine
-
-    commentStart psr =   (psr <?> (progName ++ " options comment"))
-                      *> P.skipSpace
-                      *> (P.string (pack progName) <?> show progName)
-
-    -- Treat newlines as spaces inside the block comment
-    anyCharNormalizeSpace = let normalizeSpace c = if isSpace c then ' ' else c
-                            in P.satisfyWith normalizeSpace $ const True
-
-    comment start end = commentStart start
-      *> ((end >> pure "")
-          <|> (P.space *> (P.manyTill anyCharNormalizeSpace end <?> "-}")))
-
-    horizontalSpace = P.satisfy P.isHorizontalSpace
-
-    lineComment =  comment "--" (P.endOfLine <|> P.endOfInput)
-    literateLineComment = comment
-      (">" *> horizontalSpace *> "--")
-      (P.endOfLine <|> P.endOfInput)
-    blockComment = comment "{-" (P.string "-}")
-
-    literateBlockComment =
-      (">" *> horizontalSpace *> "{-")
-      *> P.skipMany (("" <$ horizontalSpace) <|> (P.endOfLine *> ">"))
-      *> (P.string (pack progName) <?> progName)
-      *> P.manyTill' (P.satisfy (not . P.isEndOfLine)
-                       <|> (' ' <$ (P.endOfLine *> ">" <?> ">"))) "-}"
-
-    interpreterComment = if isLiterate
-                            then literateLineComment <|> literateBlockComment
-                            else lineComment <|> blockComment
+ where
+  sheBangLine =   P.string "#!"
+               *> P.manyTill P.anyChar P.endOfLine
+
+  commentStart :: P.Parser Text -> P.Parser Text
+  commentStart psr =   (psr <?> (progName ++ " options comment"))
+                    *> P.skipSpace
+                    *> (P.string (pack progName) <?> show progName)
+
+  -- Treat newlines as spaces inside the block comment
+  anyCharNormalizeSpace = let normalizeSpace c = if isSpace c then ' ' else c
+                            in  P.satisfyWith normalizeSpace $ const True
+
+  comment :: P.Parser Text -> P.Parser a -> P.Parser String
+  comment start end = commentStart start
+    *> ((end >> pure "")
+        <|> (P.space *> (P.manyTill anyCharNormalizeSpace end <?> "-}")))
+
+  horizontalSpace = P.satisfy P.isHorizontalSpace
+
+  lineComment =  comment "--" (P.endOfLine <|> P.endOfInput)
+  literateLineComment = comment
+    (">" *> horizontalSpace *> "--")
+    (P.endOfLine <|> P.endOfInput)
+  blockComment = comment "{-" (P.string "-}")
+
+  literateBlockComment =
+    (">" *> horizontalSpace *> "{-")
+    *> P.skipMany (("" <$ horizontalSpace) <|> (P.endOfLine *> ">"))
+    *> (P.string (pack progName) <?> progName)
+    *> P.manyTill' (P.satisfy (not . P.isEndOfLine)
+                     <|> (' ' <$ (P.endOfLine *> ">" <?> ">"))) "-}"
+
+  interpreterComment = if isLiterate
+                         then literateLineComment <|> literateBlockComment
+                         else lineComment <|> blockComment
 
 -- | Extract Stack arguments from a correctly placed and correctly formatted
 -- comment when it is being used as an interpreter
-getInterpreterArgs :: String -> IO [String]
-getInterpreterArgs file = do
-  eArgStr <- withSourceFile file parseFile
-  case eArgStr of
-    Left err -> handleFailure $ decodeError err
-    Right str -> parseArgStr str
-  where
-    parseFile src =
-         runConduit
-       $ src
-      .| decodeUtf8C
-      .| sinkParserEither (interpreterArgsParser isLiterate stackProgName)
-
-    isLiterate = takeExtension file == ".lhs"
-
-    -- FIXME We should print anything only when explicit verbose mode is
-    -- specified by the user on command line. But currently the
-    -- implementation does not accept or parse any command line flags in
-    -- interpreter mode. We can only invoke the interpreter as
-    -- "stack <file name>" strictly without any options.
-    stackWarn s = hPutStrLn stderr $ stackProgName ++ ": WARNING! " ++ s
-
-    handleFailure err = do
-      mapM_ stackWarn (lines err)
-      stackWarn "Missing or unusable Stack options specification"
-      stackWarn "Using runghc without any additional Stack options"
-      pure ["runghc"]
-
-    parseArgStr str =
-      case P.parseOnly (argsParser Escaping) (pack str) of
-        Left err -> handleFailure ("Error parsing command specified in the "
-                        ++ "Stack options comment: " ++ err)
-        Right [] -> handleFailure "Empty argument list in Stack options comment"
-        Right args -> pure args
-
-    decodeError e =
-      case e of
-        ParseError ctxs _ (Position line col _) ->
-          if null ctxs
-          then "Parse error"
-          else ("Expecting " ++ intercalate " or " ctxs)
-          ++ " at line " ++ show line ++ ", column " ++ show col
-        DivergentParser -> "Divergent parser"
+getInterpreterArgs :: String -> IO (NonEmpty String)
+getInterpreterArgs file = withSourceFile file parseFile >>= \case
+  Left err -> handleFailure $ decodeError err
+  Right str -> parseArgStr str
+ where
+  parseFile src =
+       runConduit
+     $ src
+    .| decodeUtf8C
+    .| sinkParserEither (interpreterArgsParser isLiterate stackProgName)
+
+  isLiterate = takeExtension file == ".lhs"
+
+  -- FIXME We should print anything only when explicit verbose mode is
+  -- specified by the user on command line. But currently the
+  -- implementation does not accept or parse any command line flags in
+  -- interpreter mode. We can only invoke the interpreter as
+  -- "stack <file name>" strictly without any options.
+  stackWarn s = hPutStrLn stderr $ stackProgName ++ ": WARNING! " ++ s
+
+  handleFailure err = do
+    mapM_ stackWarn (lines err)
+    stackWarn "Missing or unusable Stack options specification"
+    stackWarn "Using runghc without any additional Stack options"
+    pure $ singleton "runghc"
+
+  parseArgStr str =
+    case P.parseOnly (argsParser Escaping) (pack str) of
+      Left err -> handleFailure ("Error parsing command specified in the "
+                      ++ "Stack options comment: " ++ err)
+      Right args -> maybe
+        (handleFailure "Empty argument list in Stack options comment")
+        pure
+        (nonEmpty args)
+
+  decodeError e =
+    case e of
+      ParseError ctxs _ (Position l col _) ->
+        if null ctxs
+        then "Parse error"
+        else ("Expecting " ++ intercalate " or " ctxs)
+        ++ " at line " ++ show l ++ ", column " ++ show col
+      DivergentParser -> "Divergent parser"
diff --git a/src/Data/Monoid/Map.hs b/src/Data/Monoid/Map.hs
index fbd6bc686e..e7dd7cb31d 100644
--- a/src/Data/Monoid/Map.hs
+++ b/src/Data/Monoid/Map.hs
@@ -1,19 +1,24 @@
-{-# LANGUAGE DeriveGeneric              #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-|
+Module      : Data.Monoid.Map
+License     : BSD-3-Clause
+-}
 
-module Data.Monoid.Map where
+module Data.Monoid.Map
+  ( MonoidMap (..)
+  ) where
 
 import qualified Data.Map as M
 import           Stack.Prelude
 
 -- | Utility newtype wrapper to make Map's Monoid also use the
 -- element's Monoid.
-newtype MonoidMap k a = MonoidMap (Map k a)
-    deriving (Eq, Ord, Read, Show, Generic, Functor)
+newtype MonoidMap k a
+  = MonoidMap (Map k a)
+  deriving (Eq, Functor, Generic, Ord, Read, Show)
 
 instance (Ord k, Semigroup a) => Semigroup (MonoidMap k a) where
-    MonoidMap mp1 <> MonoidMap mp2 = MonoidMap (M.unionWith (<>) mp1 mp2)
+  MonoidMap mp1 <> MonoidMap mp2 = MonoidMap (M.unionWith (<>) mp1 mp2)
 
 instance (Ord k, Semigroup a) => Monoid (MonoidMap k a) where
-    mappend = (<>)
-    mempty = MonoidMap mempty
+  mappend = (<>)
+  mempty = MonoidMap mempty
diff --git a/src/GHC/Utils/GhcPkg/Main/Compat.hs b/src/GHC/Utils/GhcPkg/Main/Compat.hs
new file mode 100644
index 0000000000..668216cd99
--- /dev/null
+++ b/src/GHC/Utils/GhcPkg/Main/Compat.hs
@@ -0,0 +1,536 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : GHC.Utils.GhcPkg.Main.Compat
+License     : BSD-3-Clause
+
+This module is based on GHC's utils\ghc-pkg\Main.hs at
+commit f66fc15f2e6849125074bcfeb44334a663323ca6 (see GHC merge request !11142),
+with:
+
+* changeDBDir' does not perform an effective @ghc-pkg recache@,
+* the cache is not used,
+* consistency checks are not performed,
+* use Stack program name,
+* use "Stack.Prelude" rather than "Prelude",
+* use t'RIO' @env@ monad,
+* use well-typed representations of paths from the @path@ package,
+* add pretty messages and exceptions,
+* redundant code deleted,
+* Hlint applied, and
+* explicit import lists.
+
+The version of the ghc-pkg executable supplied with GHCs published before
+28 August 2023 does not efficiently bulk unregister. This module exports a
+function that does efficiently bulk unregister.
+-}
+
+module GHC.Utils.GhcPkg.Main.Compat
+  ( ghcPkgUnregisterForce
+  ) where
+
+-----------------------------------------------------------------------------
+--
+-- (c) The University of Glasgow 2004-2009.
+--
+-- Package management tool
+--
+-----------------------------------------------------------------------------
+
+import qualified Data.Foldable as F
+import qualified Data.Traversable as F
+import           Distribution.InstalledPackageInfo as Cabal
+import           Distribution.Package ( UnitId, mungedId )
+import qualified Distribution.Parsec as Cabal
+import           Distribution.Text ( display )
+import           Distribution.Version ( nullVersion )
+import           GHC.IO.Exception (IOErrorType(InappropriateType))
+import qualified GHC.Unit.Database as GhcPkg
+import           Path
+                   ( SomeBase (..), fileExtension, mapSomeBase, parseRelFile
+                   , parseSomeDir, prjSomeBase
+                   )
+import qualified Path as P
+import           Path.IO
+                   ( createDirIfMissing, doesDirExist, listDir, removeFile )
+import qualified RIO.ByteString as BS
+import           RIO.List ( isPrefixOf, stripSuffix )
+import           RIO.NonEmpty ( nonEmpty )
+import qualified RIO.NonEmpty as NE
+import           Stack.Constants ( relFilePackageCache )
+import           Stack.Prelude hiding ( display )
+import           Stack.Types.GhcPkgExe
+                   ( GhcPkgPrettyException (..), GlobPackageIdentifier (..)
+                   , PackageArg (..)
+                   )
+import           System.Environment ( getEnv )
+import           System.FilePath as FilePath
+import           System.IO ( readFile )
+import           System.IO.Error
+                   ( ioeGetErrorType, ioError, isDoesNotExistError )
+
+-- | Function equivalent to:
+--
+-- > ghc-pkg --no-user-package-db --package-db=<pkgDb> unregister [--ipid] <P>
+--
+ghcPkgUnregisterForce ::
+     HasTerm env
+  => Path Abs Dir -- ^ Path to the global package database
+  -> Path Abs Dir -- ^ Path to the package database
+  -> Bool -- ^ Apply ghc-pkg's --ipid, --unit-id flag?
+  -> [String] -- ^ Packages to unregister
+  -> RIO env ()
+ghcPkgUnregisterForce globalDb pkgDb hasIpid pkgarg_strs = do
+  pkgargs <- forM pkgarg_strs $ readPackageArg as_arg
+  prettyDebugL
+    $ flow "Unregistering from"
+    : (pretty pkgDb <> ":")
+    : mkNarrativeList (Just Current) False
+        (map (fromString . show) pkgargs :: [StyleDoc])
+  unregisterPackages globalDb pkgargs pkgDb
+ where
+  as_arg = if hasIpid then AsUnitId else AsDefault
+
+-- -----------------------------------------------------------------------------
+-- Do the business
+
+-- | Enum flag representing argument type
+data AsPackageArg
+  = AsUnitId
+  | AsDefault
+
+parseCheck :: Cabal.Parsec a => String -> String -> RIO env a
+parseCheck str what =
+  case Cabal.eitherParsec str of
+    Left e  -> prettyThrowIO $ CannotParse str what e
+    Right x -> pure x
+
+readGlobPkgId :: String -> RIO env GlobPackageIdentifier
+readGlobPkgId str = case stripSuffix "-*" str of
+  Nothing ->
+    ExactPackageIdentifier <$> parseCheck str "package identifier (exact)"
+  Just str' ->
+    GlobPackageIdentifier <$> parseCheck str' "package identifier (glob)"
+
+readPackageArg :: AsPackageArg -> String -> RIO env PackageArg
+readPackageArg AsUnitId str = IUId <$> parseCheck str "installed package id"
+readPackageArg AsDefault str = Id <$> readGlobPkgId str
+
+-- -----------------------------------------------------------------------------
+-- Package databases
+
+data PackageDB (mode :: GhcPkg.DbMode) = PackageDB
+  { location :: !(SomeBase Dir)
+    -- We only need possibly-relative package db location. The relative
+    -- location is used as an identifier for the db, so it is important we do
+    -- not modify it.
+  , packageDbLock :: !(GhcPkg.DbOpenMode mode GhcPkg.PackageDbLock)
+    -- If package db is open in read write mode, we keep its lock around for
+    -- transactional updates.
+  , packages :: [InstalledPackageInfo]
+  }
+
+-- | A stack of package databases. Convention: head is the topmost in the stack.
+type PackageDBStack = [PackageDB 'GhcPkg.DbReadOnly]
+
+-- | Selector for picking the right package DB to modify as \'modify\' changes
+-- the first database that contains a specific package.
+newtype DbModifySelector = ContainsPkg PackageArg
+
+getPkgDatabases ::
+     forall env. HasTerm env
+  => Path Abs Dir
+     -- ^ Path to the global package database.
+  -> PackageArg
+  -> Path Abs Dir
+     -- ^ Path to the package database.
+  -> RIO
+       env
+       ( PackageDBStack
+          -- the real package DB stack: [global,user] ++ DBs specified on the
+          -- command line with -f.
+       , GhcPkg.DbOpenMode GhcPkg.DbReadWrite (PackageDB GhcPkg.DbReadWrite)
+         -- which one to modify, if any
+       , PackageDBStack
+         -- the package DBs specified on the command line, or [global,user]
+         -- otherwise. This is used as the list of package DBs for commands
+         -- that just read the DB, such as 'list'.
+       )
+getPkgDatabases globalDb pkgarg pkgDb = do
+  -- Second we determine the location of the global package config.  On Windows,
+  -- this is found relative to the ghc-pkg.exe binary, whereas on Unix the
+  -- location is passed to the binary using the --global-package-db flag by the
+  -- wrapper script.
+  let sys_databases = [Abs globalDb]
+  e_pkg_path <- tryIO (liftIO $ System.Environment.getEnv "GHC_PACKAGE_PATH")
+  let env_stack =
+        case nonEmpty <$> e_pkg_path of
+          Left _ -> sys_databases
+          Right Nothing -> []
+          Right (Just path)
+            | isSearchPathSeparator (NE.last path)
+            -> mapMaybe parseSomeDir (splitSearchPath (NE.init path)) <> sys_databases
+            | otherwise
+            -> mapMaybe parseSomeDir (splitSearchPath $ NE.toList path)
+
+  -- -f flags on the command line add to the database stack, unless any of them
+  -- are present in the stack already.
+  let final_stack = [Abs pkgDb | Abs pkgDb `notElem` env_stack] <> env_stack
+
+  (db_stack, db_to_operate_on) <- getDatabases pkgDb final_stack
+
+  let flag_db_stack = [ db | db <- db_stack, db.location == Abs pkgDb ]
+
+  prettyDebugL
+    $ flow "Db stack:"
+    : map (pretty . (.location)) db_stack
+  F.forM_ db_to_operate_on $ \db ->
+    prettyDebugL
+      [ "Modifying:"
+      , pretty db.location
+      ]
+  prettyDebugL
+    $ flow "Flag db stack:"
+    : map (pretty . (.location)) flag_db_stack
+
+  pure (db_stack, db_to_operate_on, flag_db_stack)
+ where
+  getDatabases flag_db_name final_stack = do
+    -- The package db we open in read write mode is the first one included in
+    -- flag_db_names that contains specified package. Therefore we need to
+    -- open each one in read/write mode first and decide whether it's for
+    -- modification based on its contents.
+      (db_stack, mto_modify) <- stateSequence Nothing
+        [ \case
+            to_modify@(Just _) -> (, to_modify) <$> readDatabase db_path
+            Nothing -> if db_path /= Abs flag_db_name
+              then (, Nothing) <$> readDatabase db_path
+              else do
+                let hasPkg :: PackageDB mode -> Bool
+                    hasPkg = not . null . findPackage pkgarg . (.packages)
+
+                    openRo (e::IOException) = do
+                      db <- readDatabase db_path
+                      if hasPkg db
+                        then
+                          prettyThrowIO $ CannotOpenDBForModification db_path e
+                        else pure (db, Nothing)
+
+                -- If we fail to open the database in read/write mode, we need
+                -- to check if it's for modification first before throwing an
+                -- error, so we attempt to open it in read only mode.
+                handle openRo $ do
+                  db <- readParseDatabase
+                          (GhcPkg.DbOpenReadWrite $ ContainsPkg pkgarg) db_path
+                  let ro_db = db { packageDbLock = GhcPkg.DbOpenReadOnly }
+                  if hasPkg db
+                    then pure (ro_db, Just db)
+                    else do
+                      -- If the database is not for modification after all,
+                      -- drop the write lock as we are already finished with
+                      -- the database.
+                      case db.packageDbLock of
+                        GhcPkg.DbOpenReadWrite lock ->
+                          liftIO $ GhcPkg.unlockPackageDb lock
+                      pure (ro_db, Nothing)
+        | db_path <- final_stack ]
+
+      to_modify <- case mto_modify of
+        Just db -> pure db
+        Nothing -> cannotFindPackage pkgarg Nothing
+
+      pure (db_stack, GhcPkg.DbOpenReadWrite to_modify)
+   where
+    -- Parse package db in read-only mode.
+    readDatabase :: SomeBase Dir -> RIO env (PackageDB 'GhcPkg.DbReadOnly)
+    readDatabase = readParseDatabase GhcPkg.DbOpenReadOnly
+
+  stateSequence :: Monad m => s -> [s -> m (a, s)] -> m ([a], s)
+  stateSequence s []     = pure ([], s)
+  stateSequence s (m:ms) = do
+    (a, s')   <- m s
+    (as, s'') <- stateSequence s' ms
+    pure (a : as, s'')
+
+readParseDatabase ::
+     forall mode t env. HasTerm env
+  => GhcPkg.DbOpenMode mode t
+  -> SomeBase Dir
+  -> RIO env (PackageDB mode)
+readParseDatabase mode path = tryIO (prjSomeBase listDir path) >>= \case
+  Left err
+    | ioeGetErrorType err == InappropriateType ->
+       -- We provide a limited degree of backwards compatibility for
+       -- old single-file style db:
+       tryReadParseOldFileStyleDatabase mode path >>= \case
+         Just db -> pure db
+         Nothing -> prettyThrowIO $ SingleFileDBUnsupported path
+    | otherwise -> liftIO $ ioError err
+  Right (_, fs) -> ignore_cache
+   where
+    confs = filter isConf fs
+
+    isConf :: Path Abs File -> Bool
+    isConf f = case fileExtension f of
+      Nothing -> False
+      Just ext -> ext == ".conf"
+
+    ignore_cache :: RIO env (PackageDB mode)
+    ignore_cache = do
+      -- If we're opening for modification, we need to acquire a lock even if
+      -- we don't open the cache now, because we are going to modify it later.
+      lock <- liftIO $
+        F.mapM (const $ GhcPkg.lockPackageDb (prjSomeBase toFilePath cache)) mode
+      pkgs <- mapM parseSingletonPackageConf confs
+      mkPackageDB pkgs lock
+ where
+  cache = mapSomeBase (P.</> relFilePackageCache) path
+
+  mkPackageDB ::
+       [InstalledPackageInfo]
+    -> GhcPkg.DbOpenMode mode GhcPkg.PackageDbLock
+    -> RIO env (PackageDB mode)
+  mkPackageDB pkgs lock =
+    pure PackageDB
+      { location = path
+      , packageDbLock = lock
+      , packages = pkgs
+      }
+
+parseSingletonPackageConf ::
+     HasTerm env
+  => Path Abs File
+  -> RIO env InstalledPackageInfo
+parseSingletonPackageConf file = do
+  prettyDebugL
+    [ flow "Reading package config:"
+    , pretty file
+    ]
+  BS.readFile (toFilePath file) >>= fmap fst . parsePackageInfo
+
+-- -----------------------------------------------------------------------------
+-- Workaround for old single-file style package dbs
+
+-- Single-file style package dbs have been deprecated for some time, but
+-- it turns out that Cabal was using them in one place. So this code is for a
+-- workaround to allow older Cabal versions to use this newer ghc.
+
+-- We check if the file db contains just "[]" and if so, we look for a new
+-- dir-style db in path.d/, ie in a dir next to the given file.
+-- We cannot just replace the file with a new dir style since Cabal still
+-- assumes it's a file and tries to overwrite with 'writeFile'.
+
+-- ghc itself also cooperates in this workaround
+
+tryReadParseOldFileStyleDatabase ::
+     HasTerm env
+  => GhcPkg.DbOpenMode mode t
+  -> SomeBase Dir
+  -> RIO env (Maybe (PackageDB mode))
+tryReadParseOldFileStyleDatabase mode path = do
+  -- assumes we've already established that path exists and is not a dir
+  content <- liftIO $ readFile (prjSomeBase toFilePath path) `catchIO` \_ -> pure ""
+  if take 2 content == "[]"
+    then do
+      path_dir <- adjustOldDatabasePath path
+      prettyWarnL
+        [ flow "Ignoring old file-style db and trying"
+        , pretty path_dir
+        ]
+      direxists <- prjSomeBase doesDirExist path_dir
+      if direxists
+        then do
+          db <- readParseDatabase mode path_dir
+          -- but pretend it was at the original location
+          pure $ Just db { location         = path }
+         else do
+           lock <- F.forM mode $ \_ -> do
+             prjSomeBase (createDirIfMissing True) path_dir
+             liftIO $ GhcPkg.lockPackageDb $
+               prjSomeBase (toFilePath . (P.</> relFilePackageCache)) path_dir
+           pure $ Just PackageDB
+             { location         = path
+             , packageDbLock    = lock
+             , packages         = []
+             }
+
+    -- if the path is not a file, or is not an empty db then we fail
+    else pure Nothing
+
+adjustOldFileStylePackageDB :: PackageDB mode -> RIO env (PackageDB mode)
+adjustOldFileStylePackageDB db = do
+  -- assumes we have not yet established if it's an old style or not
+  mcontent <- liftIO $
+    fmap Just (readFile (prjSomeBase toFilePath db.location)) `catchIO` \_ -> pure Nothing
+  case fmap (take 2) mcontent of
+    -- it is an old style and empty db, so look for a dir kind in location.d/
+    Just "[]" -> do
+      adjustedDatabasePath <- adjustOldDatabasePath db.location
+      pure db { location = adjustedDatabasePath }
+    -- it is old style but not empty, we have to bail
+    Just _ -> prettyThrowIO $ SingleFileDBUnsupported db.location
+    -- probably not old style, carry on as normal
+    Nothing -> pure db
+
+adjustOldDatabasePath :: SomeBase Dir -> RIO env (SomeBase Dir)
+adjustOldDatabasePath = prjSomeBase addDToDirName
+ where
+  addDToDirName dir = do
+    let dirNameWithD = toFilePath dir <> ".d"
+    maybe
+      (prettyThrowIO $ CannotParseDirectoryWithDBug dirNameWithD)
+      pure
+      (parseSomeDir dirNameWithD)
+
+parsePackageInfo :: BS.ByteString -> RIO env (InstalledPackageInfo, [String])
+parsePackageInfo str =
+  case parseInstalledPackageInfo str of
+    Right (warnings, ok) -> pure (mungePackageInfo ok, ws)
+     where
+      ws = [ msg | msg <- warnings
+                 , not ("Unrecognized field pkgroot" `isPrefixOf` msg) ]
+    Left err -> prettyThrowIO $ ParsePackageInfoExceptions (unlines (F.toList err))
+
+mungePackageInfo :: InstalledPackageInfo -> InstalledPackageInfo
+mungePackageInfo ipi = ipi
+
+-- -----------------------------------------------------------------------------
+-- Making changes to a package database
+
+newtype DBOp = RemovePackage InstalledPackageInfo
+
+changeNewDB ::
+     HasTerm env
+  => [DBOp]
+  -> PackageDB 'GhcPkg.DbReadWrite
+  -> RIO env ()
+changeNewDB cmds new_db = do
+  new_db' <- adjustOldFileStylePackageDB new_db
+  prjSomeBase (createDirIfMissing True) new_db'.location
+  changeDBDir' cmds new_db'
+
+changeDBDir' ::
+     HasTerm env
+  => [DBOp]
+  -> PackageDB 'GhcPkg.DbReadWrite
+  -> RIO env ()
+changeDBDir' cmds db = do
+  mapM_ do_cmd cmds
+  case db.packageDbLock of
+    GhcPkg.DbOpenReadWrite lock -> liftIO $ GhcPkg.unlockPackageDb lock
+ where
+  do_cmd (RemovePackage p) = do
+    let relFileConfName = display (installedUnitId p) <> ".conf"
+    relFileConf <- maybe
+      (prettyThrowIO $ CannotParseRelFileBug relFileConfName)
+      pure
+      (parseRelFile relFileConfName)
+    let file = mapSomeBase (P.</> relFileConf) db.location
+    prettyDebugL
+      [ "Removing"
+      , pretty file
+      ]
+    removeFileSafe file
+
+unregisterPackages ::
+     forall env. HasTerm env
+  => Path Abs Dir
+     -- ^ Path to the global package database.
+  -> [PackageArg]
+  -> Path Abs Dir
+     -- ^ Path to the package database.
+  -> RIO env ()
+unregisterPackages globalDb pkgargs pkgDb = do
+  pkgsByPkgDBs <- F.foldlM (getPkgsByPkgDBs []) [] pkgargs
+  forM_ pkgsByPkgDBs unregisterPackages'
+ where
+  -- Update a list of 'packages by package database' for a package. Assumes that
+  -- a package to be unregistered is in no more than one database.
+  getPkgsByPkgDBs ::
+       [(PackageDB GhcPkg.DbReadWrite, [UnitId])]
+       -- ^ List of considered 'packages by package database'
+    -> [(PackageDB GhcPkg.DbReadWrite, [UnitId])]
+       -- ^ List of to be considered 'packages by package database'
+    -> PackageArg
+       -- Package to update
+    -> RIO env [(PackageDB GhcPkg.DbReadWrite, [UnitId])]
+  -- No more 'packages by package database' to consider? We need to try to get
+  -- another package database.
+  getPkgsByPkgDBs pkgsByPkgDBs [] pkgarg =
+    getPkgDatabases globalDb pkgarg pkgDb >>= \case
+      (_, GhcPkg.DbOpenReadWrite (db :: PackageDB GhcPkg.DbReadWrite), _) -> do
+        pks <- do
+          let pkgs = db.packages
+              ps = findPackage pkgarg pkgs
+          -- This shouldn't happen if getPkgsByPkgDBs picks the DB correctly.
+          when (null ps) $ cannotFindPackage pkgarg $ Just db
+          pure (map installedUnitId ps)
+        let pkgsByPkgDB = (db, pks)
+        pure (pkgsByPkgDB : pkgsByPkgDBs)
+  -- Consider the next 'packages by package database' in the list of ones to
+  -- consider.
+  getPkgsByPkgDBs pkgsByPkgDBs ( pkgsByPkgDB : pkgsByPkgDBs') pkgarg = do
+    let (db, pks') = pkgsByPkgDB
+        pkgs = db.packages
+        ps = findPackage pkgarg pkgs
+        pks = map installedUnitId ps
+        pkgByPkgDB' = (db, pks <> pks')
+    if null ps
+      then
+        -- Not found in the package database? Add the package database to those
+        -- considered and try with the remaining package databases to consider.
+        getPkgsByPkgDBs ( pkgsByPkgDB : pkgsByPkgDBs ) pkgsByPkgDBs' pkgarg
+      else
+        -- Found in the package database? Add to the list of packages to be
+        -- unregistered from that package database. TO DO: Perhaps check not
+        -- already in that list for better error messages when there are
+        -- duplicated requests to unregister.
+        pure (pkgsByPkgDBs <> (pkgByPkgDB' : pkgsByPkgDBs'))
+
+  unregisterPackages' :: (PackageDB GhcPkg.DbReadWrite, [UnitId]) -> RIO env ()
+  unregisterPackages' (db, pks) = do
+    let pkgs = db.packages
+        cmds = [ RemovePackage pkg
+               | pkg <- pkgs, installedUnitId pkg `elem` pks
+               ]
+        new_db = db{ packages = pkgs' }
+         where
+          deleteFirstsBy' :: (a -> b -> Bool) -> [a] -> [b] -> [a]
+          deleteFirstsBy' eq = foldl' (deleteBy' eq)
+
+          deleteBy' :: (a -> b -> Bool) -> [a] -> b -> [a]
+          deleteBy' _ [] _ = []
+          deleteBy' eq (y:ys) x = if y `eq` x then ys else y : deleteBy' eq ys x
+
+          pkgs' = deleteFirstsBy' (\p1 p2 -> installedUnitId p1 == p2) pkgs pks
+    -- Use changeNewDB, rather than changeDB, to avoid duplicating
+    -- updateInternalDB db cmds
+    changeNewDB cmds new_db
+
+findPackage :: PackageArg -> [InstalledPackageInfo] -> [InstalledPackageInfo]
+findPackage pkgarg = filter (pkgarg `matchesPkg`)
+
+cannotFindPackage :: PackageArg -> Maybe (PackageDB mode) -> RIO env a
+cannotFindPackage pkgarg mdb =
+  prettyThrowIO $ CannotFindPackage pkgarg ((.location) <$> mdb)
+
+matches :: GlobPackageIdentifier -> MungedPackageId -> Bool
+GlobPackageIdentifier pn `matches` pid' = pn == mungedName pid'
+ExactPackageIdentifier pid `matches` pid' =
+     mungedName pid == mungedName pid'
+  && (  mungedVersion pid == mungedVersion pid'
+     || mungedVersion pid == nullVersion
+     )
+
+matchesPkg :: PackageArg -> InstalledPackageInfo -> Bool
+(Id pid)        `matchesPkg` pkg = pid `matches` mungedId pkg
+(IUId ipid)     `matchesPkg` pkg = ipid == installedUnitId pkg
+(Substring _ m) `matchesPkg` pkg = m (display (mungedId pkg))
+
+-- removeFileSave doesn't throw an exceptions, if the file is already deleted
+removeFileSafe :: SomeBase File -> RIO env ()
+removeFileSafe fn = do
+  prjSomeBase removeFile fn `catchIO` \ e ->
+    unless (isDoesNotExistError e) $ liftIO $ ioError e
diff --git a/src/Network/HTTP/StackClient.hs b/src/Network/HTTP/StackClient.hs
index 441dfd026c..2a6bc48b90 100644
--- a/src/Network/HTTP/StackClient.hs
+++ b/src/Network/HTTP/StackClient.hs
@@ -1,10 +1,13 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE LambdaCase        #-}
 {-# LANGUAGE OverloadedStrings #-}
 
--- |
--- Wrapper functions of 'Network.HTTP.Simple' and 'Network.HTTP.Client' to
--- add the 'User-Agent' HTTP request header to each request.
+{-|
+Module      : Network.HTTP.StackClient
+License     : BSD-3-Clause
+
+Wrapper functions of 'Network.HTTP.Simple' and 'Network.HTTP.Client' to add the
+'User-Agent' HTTP request header to each request.
+-}
 
 module Network.HTTP.StackClient
   ( httpJSON
@@ -15,6 +18,7 @@ module Network.HTTP.StackClient
   , setRequestCheckStatus
   , setRequestMethod
   , setRequestHeader
+  , setRequestHeaders
   , addRequestHeader
   , setRequestBody
   , getResponseHeaders
@@ -30,12 +34,16 @@ module Network.HTTP.StackClient
   , applyDigestAuth
   , displayDigestAuthException
   , Request
-  , RequestBody(RequestBodyBS, RequestBodyLBS)
-  , Response
-  , HttpException
+  , RequestBody (RequestBodyBS, RequestBodyLBS)
+  , Response (..)
+  , HttpException (..)
+  , HttpExceptionContent (..)
+  , notFound404
   , hAccept
   , hContentLength
   , hContentMD5
+  , method
+  , methodPost
   , methodPut
   , formDataBody
   , partFileRequestBody
@@ -44,6 +52,7 @@ module Network.HTTP.StackClient
   , setGitHubHeaders
   , download
   , redownload
+  , requestBody
   , verifiedDownload
   , verifiedDownloadWithProgress
   , CheckHexDigest (..)
@@ -58,61 +67,90 @@ module Network.HTTP.StackClient
   , setForceDownload
   ) where
 
-import           Control.Monad.State (get, put, modify)
-import           Data.Aeson (FromJSON)
+import           Control.Monad.State ( get, put, modify )
+import           Data.Aeson ( FromJSON )
 import qualified Data.ByteString as Strict
-import           Data.Conduit (ConduitM, ConduitT, awaitForever, (.|), yield, await)
-import           Data.Conduit.Lift (evalStateC)
+import           Data.Conduit
+                   ( ConduitM, ConduitT, awaitForever, (.|), yield, await )
+import           Data.Conduit.Lift ( evalStateC )
 import qualified Data.Conduit.List as CL
-import           Data.Monoid (Sum (..))
+import           Data.List.Extra ( (!?) )
+import           Data.Monoid ( Sum (..) )
 import qualified Data.Text as T
-import           Data.Time.Clock (NominalDiffTime, diffUTCTime, getCurrentTime)
-import           Network.HTTP.Client (Request, RequestBody(..), Response, parseRequest, getUri, path, checkResponse, parseUrlThrow)
-import           Network.HTTP.Simple (setRequestCheckStatus, setRequestMethod, setRequestBody, setRequestHeader, addRequestHeader, HttpException(..), getResponseBody, getResponseStatusCode, getResponseHeaders)
-import           Network.HTTP.Types (hAccept, hContentLength, hContentMD5, methodPut)
-import           Network.HTTP.Conduit (requestHeaders)
-import           Network.HTTP.Client.TLS (getGlobalManager, applyDigestAuth, displayDigestAuthException)
-import           Network.HTTP.Download hiding (download, redownload, verifiedDownload)
+import           Data.Time.Clock
+                   ( NominalDiffTime, diffUTCTime, getCurrentTime )
+import           Network.HTTP.Client
+                   ( HttpException (..), HttpExceptionContent (..), Manager
+                   , Request, RequestBody (..), Response (..), checkResponse
+                   , getUri, method, parseRequest, parseUrlThrow, path
+                   , requestBody
+                   )
+import           Network.HTTP.Client.MultipartFormData
+                   ( formDataBody, partBS, partFileRequestBody, partLBS )
+import           Network.HTTP.Client.TLS
+                   ( displayDigestAuthException, getGlobalManager )
+import qualified Network.HTTP.Client.TLS ( applyDigestAuth )
+import           Network.HTTP.Conduit ( requestHeaders )
+import           Network.HTTP.Download
+                   ( CheckHexDigest (..), DownloadRequest, HashCheck (..)
+                   , VerifiedDownloadException (..), drRetryPolicyDefault
+                   , mkDownloadRequest, modifyRequest, setForceDownload
+                   , setHashChecks, setLengthCheck, setRetryPolicy
+                   )
 import qualified Network.HTTP.Download as Download
+import           Network.HTTP.Simple
+                   ( addRequestHeader, getResponseBody, getResponseHeaders
+                   , getResponseStatusCode, setRequestBody
+                   , setRequestCheckStatus, setRequestHeader, setRequestHeaders
+                   , setRequestMethod
+                   )
 import qualified Network.HTTP.Simple
-import           Network.HTTP.Client.MultipartFormData (formDataBody, partFileRequestBody, partBS, partLBS)
-import           Path
-import           Prelude (until, (!!))
+                   ( httpJSON, httpLbs, httpNoBody, httpSink, withResponse )
+import           Network.HTTP.Types
+                   ( hAccept, hContentLength, hContentMD5, methodPost, methodPut
+                   , notFound404
+                   )
+import           Path ( Abs, File, Path )
+import           Prelude ( until )
 import           RIO
-import           RIO.PrettyPrint
-import           Text.Printf (printf)
-
+import           RIO.PrettyPrint ( HasTerm )
+import           Text.Printf ( printf )
 
+-- | Set the User-Agent request header to @The Haskell Stack@.
 setUserAgent :: Request -> Request
 setUserAgent = setRequestHeader "User-Agent" ["The Haskell Stack"]
 
-
+-- | Like 'Network.HTTP.Simple.httpJSON' but sets the User-Agent request header.
 httpJSON :: (MonadIO m, FromJSON a) => Request -> m (Response a)
 httpJSON = Network.HTTP.Simple.httpJSON . setUserAgent
 
-
+-- | Like 'Network.HTTP.Simple.httpLbs' but sets the User-Agent request header.
 httpLbs :: MonadIO m => Request -> m (Response LByteString)
 httpLbs = Network.HTTP.Simple.httpLbs . setUserAgent
 
-
+-- | Like 'Network.HTTP.Simple.httpNoBody' but sets the User-Agent request
+-- header.
 httpNoBody :: MonadIO m => Request -> m (Response ())
 httpNoBody = Network.HTTP.Simple.httpNoBody . setUserAgent
 
-
-httpSink
-  :: MonadUnliftIO m
+-- | Like 'Network.HTTP.Simple.httpSink' but sets the User-Agent request header.
+httpSink ::
+     MonadUnliftIO m
   => Request
   -> (Response () -> ConduitM Strict.ByteString Void m a)
   -> m a
 httpSink = Network.HTTP.Simple.httpSink . setUserAgent
 
-
-withResponse
-  :: (MonadUnliftIO m, MonadIO n)
-  => Request -> (Response (ConduitM i Strict.ByteString n ()) -> m a) -> m a
+-- | Like 'Network.HTTP.Simple.withResponse' but sets the User-Agent request
+-- header.
+withResponse ::
+     (MonadUnliftIO m, MonadIO n)
+  => Request
+  -> (Response (ConduitM i Strict.ByteString n ()) -> m a)
+  -> m a
 withResponse = Network.HTTP.Simple.withResponse . setUserAgent
 
--- | Set the user-agent request header
+-- | Set the Accept request header to specify GitHub API v3.
 setGitHubHeaders :: Request -> Request
 setGitHubHeaders = setRequestHeader "Accept" ["application/vnd.github.v3+json"]
 
@@ -122,20 +160,25 @@ setGitHubHeaders = setRequestHeader "Accept" ["application/vnd.github.v3+json"]
 -- appropriate destination.
 --
 -- Throws an exception if things go wrong
-download :: HasTerm env
-         => Request
-         -> Path Abs File -- ^ destination
-         -> RIO env Bool -- ^ Was a downloaded performed (True) or did the file already exist (False)?
-download req dest = Download.download (setUserAgent req) dest
+download ::
+     HasTerm env
+  => Request
+  -> Path Abs File
+     -- ^ destination
+  -> RIO env Bool
+     -- ^ Was a downloaded performed (True) or did the file already exist
+     -- (False)?
+download req = Download.download (setUserAgent req)
 
 -- | Same as 'download', but will download a file a second time if it is already present.
 --
 -- Returns 'True' if the file was downloaded, 'False' otherwise
-redownload :: HasTerm env
-           => Request
-           -> Path Abs File -- ^ destination
-           -> RIO env Bool
-redownload req dest = Download.redownload (setUserAgent req) dest
+redownload ::
+     HasTerm env
+  => Request
+  -> Path Abs File -- ^ destination
+  -> RIO env Bool
+redownload req = Download.redownload (setUserAgent req)
 
 -- | Copied and extended version of Network.HTTP.Download.download.
 --
@@ -150,19 +193,19 @@ redownload req dest = Download.redownload (setUserAgent req) dest
 -- Throws VerifiedDownloadException.
 -- Throws IOExceptions related to file system operations.
 -- Throws HttpException.
-verifiedDownload
-         :: HasTerm env
-         => DownloadRequest
-         -> Path Abs File -- ^ destination
-         -> (Maybe Integer -> ConduitM ByteString Void (RIO env) ()) -- ^ custom hook to observe progress
-         -> RIO env Bool -- ^ Whether a download was performed
-verifiedDownload dr destpath progressSink =
-    Download.verifiedDownload dr' destpath progressSink
-  where
-    dr' = modifyRequest setUserAgent dr
-
-verifiedDownloadWithProgress
-  :: HasTerm env
+verifiedDownload ::
+     HasTerm env
+  => DownloadRequest
+  -> Path Abs File -- ^ destination
+  -> (Maybe Integer -> ConduitM ByteString Void (RIO env) ())
+     -- ^ custom hook to observe progress
+  -> RIO env Bool -- ^ Whether a download was performed
+verifiedDownload dr = Download.verifiedDownload dr'
+ where
+  dr' = modifyRequest setUserAgent dr
+
+verifiedDownloadWithProgress ::
+     HasTerm env
   => DownloadRequest
   -> Path Abs File
   -> Text
@@ -171,8 +214,8 @@ verifiedDownloadWithProgress
 verifiedDownloadWithProgress req destpath lbl msize =
   verifiedDownload req destpath (chattyDownloadProgress lbl msize)
 
-chattyDownloadProgress
-  :: ( HasLogFunc env
+chattyDownloadProgress ::
+     ( HasLogFunc env
      , MonadIO m
      , MonadReader env m
      )
@@ -181,35 +224,38 @@ chattyDownloadProgress
   -> f
   -> ConduitT ByteString c m ()
 chattyDownloadProgress label mtotalSize _ = do
-    _ <- logSticky $ RIO.display label <> ": download has begun"
-    CL.map (Sum . Strict.length)
-      .| chunksOverTime 1
-      .| go
-  where
-    go = evalStateC 0 $ awaitForever $ \(Sum size) -> do
-        modify (+ size)
-        totalSoFar <- get
-        logSticky $ fromString $
-            case mtotalSize of
-                Nothing -> chattyProgressNoTotal totalSoFar
-                Just 0 -> chattyProgressNoTotal totalSoFar
-                Just totalSize -> chattyProgressWithTotal totalSoFar totalSize
-
-    -- Example: ghc: 42.13 KiB downloaded...
-    chattyProgressNoTotal totalSoFar =
-        printf ("%s: " <> bytesfmt "%7.2f" totalSoFar <> " downloaded...")
-                (T.unpack label)
+  _ <- logSticky $ RIO.display label <> ": download has begun"
+  CL.map (Sum . Strict.length)
+    .| chunksOverTime 1
+    .| go
+ where
+  go = evalStateC 0 $ awaitForever $ \(Sum size) -> do
+    modify (+ size)
+    totalSoFar <- get
+    logSticky $ fromString $
+      case mtotalSize of
+        Nothing -> chattyProgressNoTotal totalSoFar
+        Just 0 -> chattyProgressNoTotal totalSoFar
+        Just totalSize -> chattyProgressWithTotal totalSoFar totalSize
+
+  -- Example: ghc: 42.13 KiB downloaded...
+  chattyProgressNoTotal totalSoFar =
+    printf ("%s: " <> bytesfmt "%7.2f" totalSoFar <> " downloaded...")
+           (T.unpack label)
 
     -- Example: ghc: 50.00 MiB / 100.00 MiB (50.00%) downloaded...
-    chattyProgressWithTotal totalSoFar total =
-      printf ("%s: " <>
-              bytesfmt "%7.2f" totalSoFar <> " / " <>
-              bytesfmt "%.2f" total <>
-              " (%6.2f%%) downloaded...")
-              (T.unpack label)
-              percentage
-      where percentage :: Double
-            percentage = fromIntegral totalSoFar / fromIntegral total * 100
+  chattyProgressWithTotal totalSoFar total =
+    printf (  "%s: "
+           <> bytesfmt "%7.2f" totalSoFar
+           <> " / "
+           <> bytesfmt "%.2f" total
+           <> " (%6.2f%%) downloaded..."
+           )
+           (T.unpack label)
+           percentage
+   where
+    percentage :: Double
+    percentage = fromIntegral totalSoFar / fromIntegral total * 100
 
 -- | Given a printf format string for the decimal part and a number of
 -- bytes, formats the bytes using an appropriate unit and returns the
@@ -220,36 +266,55 @@ chattyDownloadProgress label mtotalSize _ = do
 bytesfmt :: Integral a => String -> a -> String
 bytesfmt formatter bs = printf (formatter <> " %s")
                                (fromIntegral (signum bs) * dec :: Double)
-                               (bytesSuffixes !! i)
-  where
-    (dec,i) = getSuffix (abs bs)
-    getSuffix n = until p (\(x,y) -> (x / 1024, y+1)) (fromIntegral n,0)
-      where p (n',numDivs) = n' < 1024 || numDivs == (length bytesSuffixes - 1)
-    bytesSuffixes :: [String]
-    bytesSuffixes = ["B","KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"]
+                               bytesSuffix
+ where
+  (dec, i) = getSuffix (abs bs)
+  getSuffix n = until p (\(x, y) -> (x / 1024, y + 1)) (fromIntegral n, 0)
+   where
+    p (n', numDivs) = n' < 1024 || numDivs == length bytesSuffixes - 1
+  bytesSuffixes :: [String]
+  bytesSuffixes = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"]
+  bytesSuffix = fromMaybe
+    (error "bytesfmt: the impossible happened! Index out of range.")
+    (bytesSuffixes !? i)
 
 -- Await eagerly (collect with monoidal append),
 -- but space out yields by at least the given amount of time.
 -- The final yield may come sooner, and may be a superfluous mempty.
 -- Note that Integer and Float literals can be turned into NominalDiffTime
 -- (these literals are interpreted as "seconds")
-chunksOverTime :: (Monoid a, Semigroup a, MonadIO m) => NominalDiffTime -> ConduitM a a m ()
+chunksOverTime ::
+     (Monoid a, Semigroup a, MonadIO m)
+  => NominalDiffTime
+  -> ConduitM a a m ()
 chunksOverTime diff = do
-    currentTime <- liftIO getCurrentTime
-    evalStateC (currentTime, mempty) go
-  where
-    -- State is a tuple of:
-    -- * the last time a yield happened (or the beginning of the sink)
-    -- * the accumulated awaits since the last yield
-    go = await >>= \case
-      Nothing -> do
-        (_, acc) <- get
-        yield acc
-      Just a -> do
-        (lastTime, acc) <- get
-        let acc' = acc <> a
-        currentTime <- liftIO getCurrentTime
-        if diff < diffUTCTime currentTime lastTime
-          then put (currentTime, mempty) >> yield acc'
-          else put (lastTime,    acc')
-        go
+  currentTime <- liftIO getCurrentTime
+  evalStateC (currentTime, mempty) go
+ where
+  -- State is a tuple of:
+  -- * the last time a yield happened (or the beginning of the sink)
+  -- * the accumulated awaits since the last yield
+  go = await >>= \case
+    Nothing -> do
+      (_, acc) <- get
+      yield acc
+    Just a -> do
+      (lastTime, acc) <- get
+      let acc' = acc <> a
+      currentTime <- liftIO getCurrentTime
+      if diff < diffUTCTime currentTime lastTime
+        then put (currentTime, mempty) >> yield acc'
+        else put (lastTime,    acc')
+      go
+
+-- | Like 'Network.HTTP.Client.TLS.applyDigestAuth' but sets the User-Agent
+-- request header.
+applyDigestAuth ::
+     (MonadIO m, MonadThrow n)
+  => Strict.ByteString
+  -> Strict.ByteString
+  -> Request
+  -> Manager
+  -> m (n Request)
+applyDigestAuth user pass =
+  Network.HTTP.Client.TLS.applyDigestAuth user pass . setUserAgent
diff --git a/src/Options/Applicative/Args.hs b/src/Options/Applicative/Args.hs
index 71e5d6f444..a77b567efc 100644
--- a/src/Options/Applicative/Args.hs
+++ b/src/Options/Applicative/Args.hs
@@ -1,38 +1,51 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
--- | Accepting arguments to be passed through to a sub-process.
+{-|
+Module      : Options.Applicative.Args
+Description : Accepting arguments to be passed through to a sub-process.
+License     : BSD-3-Clause
+
+Accepting arguments to be passed through to a sub-process.
+-}
 
 module Options.Applicative.Args
-    (argsArgument
-    ,argsOption
-    ,cmdOption)
-    where
+  ( argsArgument
+  , argsOption
+  , cmdOption
+  ) where
 
-import           Data.Attoparsec.Args
+import           Data.Attoparsec.Args ( EscapingMode (..), parseArgsFromString )
 import qualified Options.Applicative as O
 import           Stack.Prelude
 
--- | An argument which accepts a list of arguments e.g. @--ghc-options="-X P.hs \"this\""@.
+-- | An argument which accepts a list of arguments
+-- e.g. @--ghc-options="-X P.hs \"this\""@.
 argsArgument :: O.Mod O.ArgumentFields [String] -> O.Parser [String]
 argsArgument =
-    O.argument
-        (do string <- O.str
-            either O.readerError pure (parseArgsFromString Escaping string))
+  O.argument
+    ( do s <- O.str
+         either O.readerError pure (parseArgsFromString Escaping s)
+    )
 
--- | An option which accepts a list of arguments e.g. @--ghc-options="-X P.hs \"this\""@.
+-- | An option which accepts a list of arguments
+-- e.g. @--ghc-options="-X P.hs \"this\""@.
 argsOption :: O.Mod O.OptionFields [String] -> O.Parser [String]
 argsOption =
-    O.option
-        (do string <- O.str
-            either O.readerError pure (parseArgsFromString Escaping string))
+  O.option
+    ( do s <- O.str
+         either O.readerError pure (parseArgsFromString Escaping s)
+    )
 
--- | An option which accepts a command and a list of arguments e.g. @--exec "echo hello world"@
-cmdOption :: O.Mod O.OptionFields (String, [String]) -> O.Parser (String, [String])
+-- | An option which accepts a command and a list of arguments
+-- e.g. @--exec "echo hello world"@
+cmdOption ::
+     O.Mod O.OptionFields (String, [String])
+  -> O.Parser (String, [String])
 cmdOption =
-    O.option
-        (do string <- O.str
-            xs <- either O.readerError pure (parseArgsFromString Escaping string)
-            case xs of
-                [] -> O.readerError "Must provide a command"
-                x:xs' -> pure (x, xs'))
+  O.option
+    ( do s <- O.str
+         either O.readerError pure (parseArgsFromString Escaping s) >>= \case
+           [] -> O.readerError "Must provide a command"
+           x:xs' -> pure (x, xs')
+    )
diff --git a/src/Options/Applicative/Builder/Extra.hs b/src/Options/Applicative/Builder/Extra.hs
index eafb7d5ba6..18eb7c1d07 100644
--- a/src/Options/Applicative/Builder/Extra.hs
+++ b/src/Options/Applicative/Builder/Extra.hs
@@ -1,57 +1,87 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE RecordWildCards     #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 
--- | Extra functions for optparse-applicative.
+{-|
+Module      : Options.Applicative.Builder.Extra
+Description : Extra functions for optparse-applicative.
+License     : BSD-3-Clause
+
+Extra functions for optparse-applicative.
+-}
 
 module Options.Applicative.Builder.Extra
-  (boolFlags
-  ,boolFlagsNoDefault
-  ,firstBoolFlagsNoDefault
-  ,firstBoolFlagsTrue
-  ,firstBoolFlagsFalse
-  ,enableDisableFlags
-  ,enableDisableFlagsNoDefault
-  ,extraHelpOption
-  ,execExtraHelp
-  ,textOption
-  ,textArgument
-  ,optionalFirst
-  ,optionalFirstTrue
-  ,optionalFirstFalse
-  ,absFileOption
-  ,relFileOption
-  ,absDirOption
-  ,relDirOption
-  ,eitherReader'
-  ,fileCompleter
-  ,fileExtCompleter
-  ,dirCompleter
-  ,PathCompleterOpts(..)
-  ,defaultPathCompleterOpts
-  ,pathCompleterWith
-  ,unescapeBashArg
-  ,showHelpText
+  ( boolFlags
+  , boolFlagsNoDefault
+  , firstBoolFlagsNoDefault
+  , firstBoolFlagsTrue
+  , firstBoolFlagsFalse
+  , enableDisableFlags
+  , enableDisableFlagsNoDefault
+  , extraHelpOption
+  , execExtraHelp
+  , textOption
+  , textArgument
+  , optionalFirst
+  , optionalFirstTrue
+  , optionalFirstFalse
+  , absFileOption
+  , relFileOption
+  , absDirOption
+  , relDirOption
+  , eitherReader'
+  , fileCompleter
+  , fileExtCompleter
+  , dirCompleter
+  , PathCompleterOpts (..)
+  , defaultPathCompleterOpts
+  , pathCompleterWith
+  , unescapeBashArg
+  , showHelpText
   ) where
 
-import Data.List (isPrefixOf)
-import Data.Maybe
-import Data.Monoid hiding ((<>))
+import           Data.List ( isPrefixOf )
 import qualified Data.Text as T
-import Options.Applicative
-import Options.Applicative.Types (readerAsk)
-import Path hiding ((</>))
-import Stack.Prelude
-import System.Directory (getCurrentDirectory, getDirectoryContents, doesDirectoryExist)
-import System.Environment (withArgs)
-import System.FilePath (takeBaseName, (</>), splitFileName, isRelative, takeExtension)
+import           Options.Applicative
+                   ( ArgumentFields, Completer, FlagFields, Mod, OptionFields
+                   , ParseError (..), Parser, ReadM, abortOption, argument
+                   , completer, eitherReader, execParser, flag', fullDesc, help
+                   , hidden, idm, info, infoOption, internal, long, metavar
+                   , mkCompleter, option, progDesc, strArgument
+                   )
+import           Options.Applicative.Types ( readerAsk )
+import           Path ( parseAbsDir, parseAbsFile, parseRelDir, parseRelFile )
+import           Stack.Prelude
+import           System.Directory
+                   ( doesDirectoryExist, getCurrentDirectory
+                   , getDirectoryContents
+                   )
+import           System.Environment ( withArgs )
+import           System.FilePath
+                   ( (</>), isRelative, splitFileName, takeBaseName
+                   , takeExtension
+                   )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Options.Applicative.Builder.Extra" module.
+data OptionsApplicativeExtraException
+  = FlagNotFoundBug
+  deriving Show
+
+instance Exception OptionsApplicativeExtraException where
+  displayException FlagNotFoundBug =
+    "Error: [S-2797]\n"
+    ++ "The impossible happened! No valid flags found in \
+       \enableDisableFlagsNoDefault. Please report this bug at Stack's \
+       \repository."
 
 -- | Enable/disable flags for a 'Bool'.
-boolFlags :: Bool                 -- ^ Default value
-          -> String               -- ^ Flag name
-          -> String               -- ^ Help suffix
-          -> Mod FlagFields Bool
-          -> Parser Bool
+boolFlags ::
+     Bool                 -- ^ Default value
+  -> String               -- ^ Flag name
+  -> String               -- ^ Help suffix
+  -> Mod FlagFields Bool
+  -> Parser Bool
 boolFlags defaultValue name helpSuffix =
   enableDisableFlags defaultValue True False name $ concat
     [ helpSuffix
@@ -60,112 +90,158 @@ boolFlags defaultValue name helpSuffix =
     , ")"
     ]
 
--- | Enable/disable flags for a 'Bool', without a default case (to allow chaining with '<|>').
-boolFlagsNoDefault :: String               -- ^ Flag name
-                   -> String               -- ^ Help suffix
-                   -> Mod FlagFields Bool
-                   -> Parser Bool
+-- | Enable/disable flags for a 'Bool', without a default case (to allow
+-- chaining with '<|>').
+boolFlagsNoDefault ::
+     String               -- ^ Flag name
+  -> String               -- ^ Help suffix
+  -> Mod FlagFields Bool
+  -> Parser Bool
 boolFlagsNoDefault = enableDisableFlagsNoDefault True False
 
 -- | Flag with no default of True or False
-firstBoolFlagsNoDefault :: String -> String -> Mod FlagFields (Maybe Bool) -> Parser (First Bool)
+firstBoolFlagsNoDefault ::
+     String
+  -> String
+  -> Mod FlagFields (Maybe Bool)
+  -> Parser (First Bool)
 firstBoolFlagsNoDefault name helpSuffix mod' =
   First <$>
   enableDisableFlags Nothing (Just True) (Just False)
   name helpSuffix mod'
 
 -- | Flag with a Semigroup instance and a default of True
-firstBoolFlagsTrue :: String -> String -> Mod FlagFields FirstTrue -> Parser FirstTrue
+firstBoolFlagsTrue ::
+     String
+  -> String
+  -> Mod FlagFields FirstTrue
+  -> Parser FirstTrue
 firstBoolFlagsTrue name helpSuffix =
   enableDisableFlags mempty (FirstTrue (Just True)) (FirstTrue (Just False))
   name $ helpSuffix ++ " (default: enabled)"
 
 -- | Flag with a Semigroup instance and a default of False
-firstBoolFlagsFalse :: String -> String -> Mod FlagFields FirstFalse -> Parser FirstFalse
+firstBoolFlagsFalse ::
+     String
+  -> String
+  -> Mod FlagFields FirstFalse
+  -> Parser FirstFalse
 firstBoolFlagsFalse name helpSuffix =
   enableDisableFlags mempty (FirstFalse (Just True)) (FirstFalse (Just False))
   name $ helpSuffix ++ " (default: disabled)"
 
 -- | Enable/disable flags for any type.
-enableDisableFlags :: a                 -- ^ Default value
-                   -> a                 -- ^ Enabled value
-                   -> a                 -- ^ Disabled value
-                   -> String            -- ^ Name
-                   -> String            -- ^ Help suffix
-                   -> Mod FlagFields a
-                   -> Parser a
-enableDisableFlags defaultValue enabledValue disabledValue name helpSuffix mods =
-  enableDisableFlagsNoDefault enabledValue disabledValue name helpSuffix mods <|>
-  pure defaultValue
+enableDisableFlags ::
+     a                 -- ^ Default value
+  -> a                 -- ^ Enabled value
+  -> a                 -- ^ Disabled value
+  -> String            -- ^ Name
+  -> String            -- ^ Help suffix
+  -> Mod FlagFields a
+  -> Parser a
+enableDisableFlags defaultValue enabledValue disabledValue name helpSuffix
+  mods =
+    enableDisableFlagsNoDefault
+      enabledValue
+      disabledValue
+      name
+      helpSuffix
+      mods <|> pure defaultValue
 
 -- | Enable/disable flags for any type, without a default (to allow chaining with '<|>')
-enableDisableFlagsNoDefault :: a                 -- ^ Enabled value
-                            -> a                 -- ^ Disabled value
-                            -> String            -- ^ Name
-                            -> String            -- ^ Help suffix
-                            -> Mod FlagFields a
-                            -> Parser a
+enableDisableFlagsNoDefault ::
+     a                 -- ^ Enabled value
+  -> a                 -- ^ Disabled value
+  -> String            -- ^ Name
+  -> String            -- ^ Help suffix
+  -> Mod FlagFields a
+  -> Parser a
 enableDisableFlagsNoDefault enabledValue disabledValue name helpSuffix mods =
   last <$> some
-      ((flag'
-           enabledValue
-           (hidden <>
-            internal <>
-            long name <>
-            help helpSuffix <>
-            mods) <|>
-       flag'
-           disabledValue
-           (hidden <>
-            internal <>
-            long ("no-" ++ name) <>
-            help helpSuffix <>
-            mods)) <|>
-       flag'
-           disabledValue
-           (long ("[no-]" ++ name) <>
-            help ("Enable/disable " ++ helpSuffix) <>
-            mods))
-  where
-    last xs =
-      case reverse xs of
-        [] -> impureThrow $ stringException "enableDisableFlagsNoDefault.last"
-        x:_ -> x
-
--- | Show an extra help option (e.g. @--docker-help@ shows help for all @--docker*@ args).
+    (   flag'
+          enabledValue
+          (  hidden
+          <> internal
+          <> long name
+          <> help helpSuffix
+          <> mods
+          )
+    <|> flag'
+          disabledValue
+          (  hidden
+          <> internal
+          <> long ("no-" ++ name)
+          <> help helpSuffix
+          <> mods
+          )
+    <|> flag'
+          disabledValue
+          (  long ("[no-]" ++ name)
+          <> help ("Enable/disable " ++ helpSuffix)
+          <> mods
+          )
+    )
+ where
+  last xs =
+    case reverse xs of
+      [] -> impureThrow FlagNotFoundBug
+      x:_ -> x
+
+-- | Show an extra help option (e.g. @--docker-help@ shows help for all
+-- @--docker*@ args).
 --
--- To actually have that help appear, use 'execExtraHelp' before executing the main parser.
-extraHelpOption :: Bool             -- ^ Hide from the brief description?
-                -> String           -- ^ Program name, e.g. @"stack"@
-                -> String           -- ^ Option glob expression, e.g. @"docker*"@
-                -> String           -- ^ Help option name, e.g. @"docker-help"@
-                -> Parser (a -> a)
+-- To actually have that help appear, use 'execExtraHelp' before executing the
+-- main parser.
+extraHelpOption ::
+     Bool             -- ^ Hide from the brief description?
+  -> String           -- ^ Program name, e.g. @"stack"@
+  -> String           -- ^ Option glob expression, e.g. @"docker*"@
+  -> String           -- ^ Help option name, e.g. @"docker-help"@
+  -> Parser (a -> a)
 extraHelpOption hide progName fakeName helpName =
-    infoOption (optDesc' ++ ".") (long helpName <> hidden <> internal) <*>
-    infoOption (optDesc' ++ ".") (long fakeName <>
-                                  help optDesc' <>
-                                  (if hide then hidden <> internal else idm))
-  where optDesc' = concat ["Run '", takeBaseName progName, " --", helpName, "' for details"]
+      infoOption
+        (optDesc' ++ ".")
+        (long helpName <> hidden <> internal)
+  <*> infoOption
+        (optDesc' ++ ".")
+        (  long fakeName
+        <> help optDesc'
+        <> (if hide then hidden <> internal else idm)
+        )
+ where
+  optDesc' = concat
+    [ "Run '"
+    , takeBaseName progName
+    , " --"
+    , helpName
+    , "' for details."
+    ]
 
 -- | Display extra help if extra help option passed in arguments.
 --
--- Since optparse-applicative doesn't allow an arbitrary IO action for an 'abortOption', this
--- was the best way I found that doesn't require manually formatting the help.
-execExtraHelp :: [String]  -- ^ Command line arguments
-              -> String    -- ^ Extra help option name, e.g. @"docker-help"@
-              -> Parser a  -- ^ Option parser for the relevant command
-              -> String    -- ^ Option description
-              -> IO ()
+-- Since optparse-applicative doesn't allow an arbitrary IO action for an
+-- 'abortOption', this was the best way I found that doesn't require manually
+-- formatting the help.
+execExtraHelp ::
+     [String]  -- ^ Command line arguments
+  -> String    -- ^ Extra help option name, e.g. @"docker-help"@
+  -> Parser a  -- ^ Option parser for the relevant command
+  -> String    -- ^ Option description
+  -> IO ()
 execExtraHelp args helpOpt parser pd =
-    when (args == ["--" ++ helpOpt]) $
-      withArgs ["--help"] $ do
-        _ <- execParser (info (hiddenHelper <*>
-                               ((,) <$>
-                                parser <*>
-                                some (strArgument (metavar "OTHER ARGUMENTS") :: Parser String)))
-                        (fullDesc <> progDesc pd))
-        pure ()
-  where hiddenHelper = abortOption showHelpText (long "help" <> hidden <> internal)
+  when (args == ["--" ++ helpOpt]) $
+    withArgs ["--help"] $
+      void $ execParser (info
+             (   hiddenHelper
+             <*> ( (,)
+                     <$> parser
+                     <*> some (strArgument
+                           (metavar "OTHER ARGUMENTS") :: Parser String)
+                 )
+             )
+            (fullDesc <> progDesc pd))
+ where
+  hiddenHelper = abortOption showHelpText (long "help" <> hidden <> internal)
 
 -- | 'option', specialized to 'Text'.
 textOption :: Mod OptionFields Text -> Parser Text
@@ -175,115 +251,139 @@ textOption = option (T.pack <$> readerAsk)
 textArgument :: Mod ArgumentFields Text -> Parser Text
 textArgument = argument (T.pack <$> readerAsk)
 
--- | Like 'optional', but returning a 'First'.
+-- | Like 'optional', but returning a t'First'.
 optionalFirst :: Alternative f => f a -> f (First a)
 optionalFirst = fmap First . optional
 
--- | Like 'optional', but returning a 'FirstTrue'.
+-- | Like 'optional', but returning a t'FirstTrue'.
 optionalFirstTrue :: Alternative f => f Bool -> f FirstTrue
 optionalFirstTrue = fmap FirstTrue . optional
 
--- | Like 'optional', but returning a 'FirstFalse'.
+-- | Like 'optional', but returning a t'FirstFalse'.
 optionalFirstFalse :: Alternative f => f Bool -> f FirstFalse
 optionalFirstFalse = fmap FirstFalse . optional
 
 absFileOption :: Mod OptionFields (Path Abs File) -> Parser (Path Abs File)
 absFileOption mods = option (eitherReader' parseAbsFile) $
-  completer (pathCompleterWith defaultPathCompleterOpts { pcoRelative = False }) <> mods
+     completer
+       (pathCompleterWith defaultPathCompleterOpts { relative = False })
+  <> mods
 
 relFileOption :: Mod OptionFields (Path Rel File) -> Parser (Path Rel File)
 relFileOption mods = option (eitherReader' parseRelFile) $
-  completer (pathCompleterWith defaultPathCompleterOpts { pcoAbsolute = False }) <> mods
+     completer
+       (pathCompleterWith defaultPathCompleterOpts { absolute = False })
+  <> mods
 
 absDirOption :: Mod OptionFields (Path Abs Dir) -> Parser (Path Abs Dir)
 absDirOption mods = option (eitherReader' parseAbsDir) $
-  completer (pathCompleterWith defaultPathCompleterOpts { pcoRelative = False, pcoFileFilter = const False }) <> mods
+     completer
+       ( pathCompleterWith
+          defaultPathCompleterOpts
+            { relative = False
+            , fileFilter = const False
+            }
+       )
+  <> mods
 
 relDirOption :: Mod OptionFields (Path Rel Dir) -> Parser (Path Rel Dir)
 relDirOption mods = option (eitherReader' parseRelDir) $
-  completer (pathCompleterWith defaultPathCompleterOpts { pcoAbsolute = False, pcoFileFilter = const False }) <> mods
+     completer
+       ( pathCompleterWith
+           defaultPathCompleterOpts
+             { absolute = False
+             , fileFilter = const False
+             }
+       )
+  <> mods
 
 -- | Like 'eitherReader', but accepting any @'Show' e@ on the 'Left'.
 eitherReader' :: Show e => (String -> Either e a) -> ReadM a
 eitherReader' f = eitherReader (mapLeft show . f)
 
 data PathCompleterOpts = PathCompleterOpts
-    { pcoAbsolute :: Bool
-    , pcoRelative :: Bool
-    , pcoRootDir :: Maybe FilePath
-    , pcoFileFilter :: FilePath -> Bool
-    , pcoDirFilter :: FilePath -> Bool
-    }
+  { absolute :: Bool
+  , relative :: Bool
+  , rootDir :: Maybe FilePath
+  , fileFilter :: FilePath -> Bool
+  , dirFilter :: FilePath -> Bool
+  }
 
 defaultPathCompleterOpts :: PathCompleterOpts
 defaultPathCompleterOpts = PathCompleterOpts
-    { pcoAbsolute = True
-    , pcoRelative = True
-    , pcoRootDir = Nothing
-    , pcoFileFilter = const True
-    , pcoDirFilter = const True
-    }
+  { absolute = True
+  , relative = True
+  , rootDir = Nothing
+  , fileFilter = const True
+  , dirFilter = const True
+  }
 
 fileCompleter :: Completer
 fileCompleter = pathCompleterWith defaultPathCompleterOpts
 
 fileExtCompleter :: [String] -> Completer
-fileExtCompleter exts = pathCompleterWith defaultPathCompleterOpts { pcoFileFilter = (`elem` exts) . takeExtension }
+fileExtCompleter exts =
+  pathCompleterWith
+    defaultPathCompleterOpts { fileFilter = (`elem` exts) . takeExtension }
 
 dirCompleter :: Completer
-dirCompleter = pathCompleterWith defaultPathCompleterOpts { pcoFileFilter = const False }
+dirCompleter =
+  pathCompleterWith defaultPathCompleterOpts { fileFilter = const False }
 
 pathCompleterWith :: PathCompleterOpts -> Completer
-pathCompleterWith PathCompleterOpts {..} = mkCompleter $ \inputRaw -> do
-    -- Unescape input, to handle single and double quotes. Note that the
-    -- results do not need to be re-escaped, due to some fiddly bash
-    -- magic.
-    let input = unescapeBashArg inputRaw
-    let (inputSearchDir0, searchPrefix) = splitFileName input
-        inputSearchDir = if inputSearchDir0 == "./" then "" else inputSearchDir0
-    msearchDir <-
-        case (isRelative inputSearchDir, pcoAbsolute, pcoRelative) of
-            (True, _, True) -> do
-                rootDir <- maybe getCurrentDirectory pure pcoRootDir
-                pure $ Just (rootDir </> inputSearchDir)
-            (False, True, _) -> pure $ Just inputSearchDir
-            _ -> pure Nothing
-    case msearchDir of
-        Nothing
-            | input == "" && pcoAbsolute -> pure ["/"]
-            | otherwise -> pure []
-        Just searchDir -> do
-            entries <- getDirectoryContents searchDir `catch` \(_ :: IOException) -> pure []
-            fmap catMaybes $ forM entries $ \entry ->
-                -- Skip . and .. unless user is typing . or ..
-                if entry `elem` ["..", "."] && searchPrefix `notElem` ["..", "."] then pure Nothing else
-                    if searchPrefix `isPrefixOf` entry
-                        then do
-                            let path = searchDir </> entry
-                            case (pcoFileFilter path, pcoDirFilter path) of
-                                (True, True) -> pure $ Just (inputSearchDir </> entry)
-                                (fileAllowed, dirAllowed) -> do
-                                    isDir <- doesDirectoryExist path
-                                    if (if isDir then dirAllowed else fileAllowed)
-                                        then pure $ Just (inputSearchDir </> entry)
-                                        else pure Nothing
-                        else pure Nothing
+pathCompleterWith pco = mkCompleter $ \inputRaw -> do
+  -- Unescape input, to handle single and double quotes. Note that the
+  -- results do not need to be re-escaped, due to some fiddly bash
+  -- magic.
+  let input = unescapeBashArg inputRaw
+  let (inputSearchDir0, searchPrefix) = splitFileName input
+      inputSearchDir = if inputSearchDir0 == "./" then "" else inputSearchDir0
+  msearchDir <-
+    case (isRelative inputSearchDir, pco.absolute, pco.relative) of
+      (True, _, True) -> do
+        rootDir <- maybe getCurrentDirectory pure pco.rootDir
+        pure $ Just (rootDir </> inputSearchDir)
+      (False, True, _) -> pure $ Just inputSearchDir
+      _ -> pure Nothing
+  case msearchDir of
+    Nothing
+      | input == "" && pco.absolute -> pure ["/"]
+      | otherwise -> pure []
+    Just searchDir -> do
+      entries <-
+        getDirectoryContents searchDir `catch` \(_ :: IOException) -> pure []
+      fmap catMaybes $ forM entries $ \entry ->
+        -- Skip . and .. unless user is typing . or ..
+        if entry `elem` ["..", "."] && searchPrefix `notElem` ["..", "."]
+          then pure Nothing
+          else
+            if searchPrefix `isPrefixOf` entry
+              then do
+                let path = searchDir </> entry
+                case (pco.fileFilter path, pco.dirFilter path) of
+                  (True, True) -> pure $ Just (inputSearchDir </> entry)
+                  (fileAllowed, dirAllowed) -> do
+                    isDir <- doesDirectoryExist path
+                    if (if isDir then dirAllowed else fileAllowed)
+                      then pure $ Just (inputSearchDir </> entry)
+                      else pure Nothing
+              else pure Nothing
 
 unescapeBashArg :: String -> String
 unescapeBashArg ('\'' : rest) = rest
 unescapeBashArg ('\"' : rest) = go rest
-  where
-    pattern = "$`\"\\\n" :: String
-    go [] = []
-    go ('\\' : x : xs)
-        | x `elem` pattern = x : xs
-        | otherwise = '\\' : x : go xs
-    go (x : xs) = x : go xs
+ where
+  special = "$`\"\\\n" :: String
+  go [] = []
+  go ('\\' : x : xs)
+    | x `elem` special = x : xs
+    | otherwise = '\\' : x : go xs
+  go (x : xs) = x : go xs
 unescapeBashArg input = go input
-  where
-    go [] = []
-    go ('\\' : x : xs) = x : go xs
-    go (x : xs) = x : go xs
+ where
+  go [] = []
+  go ('\\' : x : xs) = x : go xs
+  go (x : xs) = x : go xs
 
 showHelpText :: ParseError
 showHelpText = ShowHelpText Nothing
diff --git a/src/Options/Applicative/Complicated.hs b/src/Options/Applicative/Complicated.hs
index c98025c0f2..6cbb1cf8d5 100644
--- a/src/Options/Applicative/Complicated.hs
+++ b/src/Options/Applicative/Complicated.hs
@@ -1,11 +1,17 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
--- | Simple interface to complicated program arguments.
---
--- This is a "fork" of the @optparse-simple@ package that has some workarounds for
--- optparse-applicative issues that become problematic with programs that have many options and
--- subcommands. Because it makes the interface more complex, these workarounds are not suitable for
--- pushing upstream to optparse-applicative.
+{-|
+Module      : Options.Applicative.Complicated
+Description : Simple interface to complicated program arguments.
+License     : BSD-3-Clause
+
+Simple interface to complicated program arguments.
+
+This is a "fork" of the @optparse-simple@ package that has some workarounds for
+optparse-applicative issues that become problematic with programs that have many
+options and subcommands. Because it makes the interface more complex, these
+workarounds are not suitable for pushing upstream to optparse-applicative.
+-}
 
 module Options.Applicative.Complicated
   ( addCommand
@@ -14,144 +20,176 @@ module Options.Applicative.Complicated
   , complicatedParser
   ) where
 
-import           Control.Monad.Trans.Except
-import           Control.Monad.Trans.Writer
+import           Control.Monad.Trans.Except ( runExceptT )
+import           Control.Monad.Trans.Writer ( runWriter, tell )
 import           Options.Applicative
-import           Options.Applicative.Types
-import           Options.Applicative.Builder.Extra
-import           Options.Applicative.Builder.Internal
+                   ( Parser, ParserFailure, ParserHelp, ParserResult (..)
+                   , abortOption, command, execParserPure, footer, fullDesc
+                   , handleParseResult, header, help, hsubparser, info
+                   , infoOption, long, metavar, noBacktrack, prefs, progDesc
+                   , short, showHelpOnEmpty
+                   )
+import           Options.Applicative.Builder.Extra ( showHelpText )
 import           Stack.Prelude
-import           Stack.Types.Config
-import           System.Environment
+import           Stack.Types.AddCommand ( AddCommand )
+import           Stack.Types.GlobalOptsMonoid ( GlobalOptsMonoid )
+import           Stack.Types.Runner ( Runner )
+import           System.Environment ( getArgs )
 
 -- | Generate and execute a complicated options parser.
-complicatedOptions
-  :: Version
-  -- ^ numeric version
+complicatedOptions ::
+     Version
+     -- ^ numeric version
   -> Maybe String
-  -- ^ version string
+     -- ^ version string
   -> String
-  -- ^ Hpack numeric version, as string
+     -- ^ Hpack numeric version, as string
   -> String
-  -- ^ header
+     -- ^ header
   -> String
-  -- ^ program description (displayed between usage and options listing in the help output)
+     -- ^ program description (displayed between usage and options listing in
+     -- the help output)
   -> String
-  -- ^ footer
+     -- ^ footer
   -> Parser GlobalOptsMonoid
-  -- ^ common settings
-  -> Maybe (ParserFailure ParserHelp -> [String] -> IO (GlobalOptsMonoid,(RIO Runner (),GlobalOptsMonoid)))
-  -- ^ optional handler for parser failure; 'handleParseResult' is called by
-  -- default
+     -- ^ common settings
+  -> Maybe (  ParserFailure ParserHelp
+           -> [String]
+           -> IO (GlobalOptsMonoid, (RIO Runner (), GlobalOptsMonoid))
+           )
+     -- ^ optional handler for parser failure; 'handleParseResult' is called by
+     -- default
   -> AddCommand
-  -- ^ commands (use 'addCommand')
+     -- ^ commands (use 'addCommand')
   -> IO (GlobalOptsMonoid, RIO Runner ())
-complicatedOptions numericVersion stringVersion numericHpackVersion h pd footerStr commonParser mOnFailure commandParser =
-  do args <- getArgs
-     (a,(b,c)) <- let parserPrefs = prefs $ noBacktrack <> showHelpOnEmpty
-                  in  case execParserPure parserPrefs parser args of
+complicatedOptions
+    numericVersion
+    stringVersion
+    numericHpackVersion
+    h
+    pd
+    footerStr
+    commonParser
+    mOnFailure
+    commandParser
+  = do
+    args <- getArgs
+    (a, (b, c)) <- let parserPrefs = prefs $ noBacktrack <> showHelpOnEmpty
+                   in  case execParserPure parserPrefs parser args of
        -- call onFailure handler if it's present and parsing options failed
-       Failure f | Just onFailure <- mOnFailure -> onFailure f args
-       parseResult -> handleParseResult parseResult
-     pure (mappend c a,b)
-  where parser = info (helpOption <*> versionOptions <*> complicatedParser "COMMAND|FILE" commonParser commandParser) desc
-        desc = fullDesc <> header h <> progDesc pd <> footer footerStr
-        versionOptions =
-          case stringVersion of
-            Nothing -> versionOption (versionString numericVersion)
-            Just s -> versionOption s <*> numericVersionOption <*> numericHpackVersionOption
-        versionOption s =
-          infoOption
-            s
-            (long "version" <>
-             help "Show version")
-        numericVersionOption =
-          infoOption
-            (versionString numericVersion)
-            (long "numeric-version" <>
-             help "Show only version number")
-        numericHpackVersionOption =
-          infoOption
-            numericHpackVersion
-            (long "hpack-numeric-version" <>
-             help "Show only Hpack's version number")
+      Failure f | Just onFailure <- mOnFailure -> onFailure f args
+      parseResult -> handleParseResult parseResult
+    pure (mappend c a, b)
+ where
+  parser = info
+    (   helpOption
+    <*> versionOptions
+    <*> complicatedParser "COMMAND|FILE" commonParser commandParser
+    )
+    desc
+  desc = fullDesc <> header h <> progDesc pd <> footer footerStr
+  versionOptions =
+    case stringVersion of
+      Nothing -> versionOption (versionString numericVersion)
+      Just s ->
+            versionOption s
+        <*> numericVersionOption
+        <*> numericHpackVersionOption
+  versionOption s =
+    infoOption
+      s
+      (  long "version"
+      <> help "Show version."
+      )
+  numericVersionOption =
+    infoOption
+      (versionString numericVersion)
+      (  long "numeric-version"
+      <> help "Show only version number."
+      )
+  numericHpackVersionOption =
+    infoOption
+      numericHpackVersion
+      (  long "hpack-numeric-version"
+      <> help "Show only Hpack's version number."
+      )
 
 -- | Add a command to the options dispatcher.
-addCommand :: String   -- ^ command string
-           -> String   -- ^ title of command
-           -> String   -- ^ footer of command help
-           -> (opts -> RIO Runner ()) -- ^ constructor to wrap up command in common data type
-           -> (opts -> GlobalOptsMonoid -> GlobalOptsMonoid) -- ^ extend common settings from local settings
-           -> Parser GlobalOptsMonoid -- ^ common parser
-           -> Parser opts -- ^ command parser
-           -> AddCommand
+addCommand ::
+     String   -- ^ command string
+  -> String   -- ^ title of command
+  -> String   -- ^ footer of command help
+  -> (opts -> RIO Runner ())
+     -- ^ constructor to wrap up command in common data type
+  -> (opts -> GlobalOptsMonoid -> GlobalOptsMonoid)
+     -- ^ extend common settings from local settings
+  -> Parser GlobalOptsMonoid -- ^ common parser
+  -> Parser opts -- ^ command parser
+  -> AddCommand
 addCommand cmd title footerStr constr extendCommon =
-  addCommand' cmd title footerStr (\a c -> (constr a,extendCommon a c))
+  addCommand' cmd title footerStr (\a c -> (constr a, extendCommon a c))
 
 -- | Add a command that takes sub-commands to the options dispatcher.
-addSubCommands
-  :: String
-  -- ^ command string
+addSubCommands ::
+     String
+     -- ^ command string
   -> String
-  -- ^ title of command
+     -- ^ title of command
   -> String
-  -- ^ footer of command help
+     -- ^ footer of command help
   -> Parser GlobalOptsMonoid
-  -- ^ common parser
+     -- ^ common parser
   -> AddCommand
-  -- ^ sub-commands (use 'addCommand')
+     -- ^ sub-commands (use 'addCommand')
   -> AddCommand
 addSubCommands cmd title footerStr commonParser commandParser =
-  addCommand' cmd
-              title
-              footerStr
-              (\(c1,(a,c2)) c3 -> (a,mconcat [c3, c2, c1]))
-              commonParser
-              (complicatedParser "COMMAND" commonParser commandParser)
+  addCommand'
+    cmd
+    title
+    footerStr
+    (\(c1, (a, c2)) c3 -> (a, mconcat [c3, c2, c1]))
+    commonParser
+    (complicatedParser "COMMAND" commonParser commandParser)
 
 -- | Add a command to the options dispatcher.
-addCommand' :: String   -- ^ command string
-            -> String   -- ^ title of command
-            -> String   -- ^ footer of command help
-            -> (opts -> GlobalOptsMonoid -> (RIO Runner (),GlobalOptsMonoid)) -- ^ constructor to wrap up command in common data type
-            -> Parser GlobalOptsMonoid -- ^ common parser
-            -> Parser opts -- ^ command parser
-            -> AddCommand
+addCommand' ::
+     String   -- ^ command string
+  -> String   -- ^ title of command
+  -> String   -- ^ footer of command help
+  -> (opts -> GlobalOptsMonoid -> (RIO Runner (),GlobalOptsMonoid))
+     -- ^ constructor to wrap up command in common data type
+  -> Parser GlobalOptsMonoid -- ^ common parser
+  -> Parser opts -- ^ command parser
+  -> AddCommand
 addCommand' cmd title footerStr constr commonParser inner =
-  lift (tell (command cmd
-                      (info (constr <$> inner <*> commonParser)
-                            (progDesc title <> footer footerStr))))
+  lift $ tell $
+    command
+      cmd
+      ( info
+          (constr <$> inner <*> commonParser)
+          (progDesc title <> footer footerStr)
+      )
 
 -- | Generate a complicated options parser.
-complicatedParser
-  :: String
-  -- ^ metavar for the sub-command
+complicatedParser ::
+     String
+     -- ^ metavar for the sub-command
   -> Parser GlobalOptsMonoid
-  -- ^ common settings
+     -- ^ common settings
   -> AddCommand
-  -- ^ commands (use 'addCommand')
-  -> Parser (GlobalOptsMonoid,(RIO Runner (),GlobalOptsMonoid))
+     -- ^ commands (use 'addCommand')
+  -> Parser (GlobalOptsMonoid, (RIO Runner (), GlobalOptsMonoid))
 complicatedParser commandMetavar commonParser commandParser =
-   (,) <$>
-   commonParser <*>
-   case runWriter (runExceptT commandParser) of
-     (Right (),d) -> hsubparser' commandMetavar d
-     (Left b,_) -> pure (b,mempty)
-
--- | Subparser with @--help@ argument. Borrowed with slight modification
--- from Options.Applicative.Extra.
-hsubparser' :: String -> Mod CommandFields a -> Parser a
-hsubparser' commandMetavar m = mkParser d g rdr
-  where
-    Mod _ d g = metavar commandMetavar `mappend` m
-    (groupName, cmds, subs) = mkCommand m
-    rdr = CmdReader groupName cmds (fmap add_helper . subs)
-    add_helper pinfo = pinfo
-      { infoParser = infoParser pinfo <**> helpOption }
+  (,)
+    <$> commonParser
+    <*> case runWriter (runExceptT commandParser) of
+          (Right (), m) -> hsubparser (m <> metavar commandMetavar)
+          (Left b, _) -> pure (b, mempty)
 
 -- | Non-hidden help option.
 helpOption :: Parser (a -> a)
 helpOption =
-    abortOption showHelpText $
-    long "help" <>
-    help "Show this help text"
+  abortOption showHelpText $
+       long "help"
+    <> short 'h'
+    <> help "Show this help text."
diff --git a/src/Path/CheckInstall.hs b/src/Path/CheckInstall.hs
index 407924ba85..6b324fcd7e 100644
--- a/src/Path/CheckInstall.hs
+++ b/src/Path/CheckInstall.hs
@@ -1,53 +1,66 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Path.CheckInstall where
+{-|
+Module      : Path.CheckInstall
+License     : BSD-3-Clause
+-}
 
-import           Control.Monad.Extra (anyM, (&&^))
-import qualified Data.Text as T
+module Path.CheckInstall
+  ( warnInstallSearchPathIssues
+  ) where
+
+import           Control.Monad.Extra ( (&&^), anyM )
 import           Stack.Prelude
-import           RIO.PrettyPrint
-import           Stack.Types.Config
+import           Stack.Types.Config ( HasConfig )
 import qualified System.Directory as D
 import qualified System.FilePath as FP
 
--- | Checks if the installed executable will be available on the user's
--- PATH. This doesn't use @envSearchPath menv@ because it includes paths
--- only visible when running in the Stack environment.
-warnInstallSearchPathIssues :: HasConfig env => FilePath -> [Text] -> RIO env ()
+-- | Checks if the installed executable will be available on the user's PATH.
+-- This doesn't use @envSearchPath menv@ because it includes paths only visible
+-- when running in the Stack environment.
+warnInstallSearchPathIssues ::
+     HasConfig env
+  => FilePath
+  -> [String]
+  -> RIO env ()
 warnInstallSearchPathIssues destDir installed = do
-    searchPath <- liftIO FP.getSearchPath
-    destDirIsInPATH <- liftIO $
-        anyM (\dir -> D.doesDirectoryExist dir &&^ fmap (FP.equalFilePath destDir) (D.canonicalizePath dir)) searchPath
-    if destDirIsInPATH
-        then forM_ installed $ \exe -> do
-            mexePath <- (liftIO . D.findExecutable . T.unpack) exe
-            case mexePath of
-                Just exePath -> do
-                    exeDir <- (liftIO . fmap FP.takeDirectory . D.canonicalizePath) exePath
-                    unless (exeDir `FP.equalFilePath` destDir) $ do
-                        prettyWarnL
-                          [ flow "The"
-                          , style File . fromString . T.unpack $ exe
-                          , flow "executable found on the PATH environment variable is"
-                          , style File . fromString $ exePath
-                          , flow "and not the version that was just installed."
-                          , flow "This means that"
-                          , style File . fromString . T.unpack $ exe
-                          , "calls on the command line will not use this version."
-                          ]
-                Nothing -> do
-                    prettyWarnL
-                      [ flow "Installation path"
-                      , style Dir . fromString $ destDir
-                      , flow "is on the PATH but the"
-                      , style File . fromString . T.unpack $ exe
-                      , flow "executable that was just installed could not be found on the PATH."
-                      ]
-        else do
+  searchPath <- liftIO FP.getSearchPath
+  destDirIsInPATH <- liftIO $
+    anyM
+      ( \dir ->     D.doesDirectoryExist dir
+                &&^ fmap (FP.equalFilePath destDir) (D.canonicalizePath dir)
+      )
+      searchPath
+  if destDirIsInPATH
+    then forM_ installed $ \exe -> do
+      (liftIO . D.findExecutable) exe >>= \case
+        Just exePath -> do
+          exeDir <-
+            (liftIO . fmap FP.takeDirectory . D.canonicalizePath) exePath
+          unless (exeDir `FP.equalFilePath` destDir) $
             prettyWarnL
-              [ flow "Installation path "
-              , style Dir . fromString $ destDir
-              , "not found on the PATH environment variable."
+              [ flow "The"
+              , style File . fromString $ exe
+              , flow "executable found on the PATH environment variable is"
+              , style File . fromString $ exePath
+              , flow "and not the version that was just installed."
+              , flow "This means that"
+              , style File . fromString $ exe
+              , "calls on the command line will not use this version."
               ]
+        Nothing ->
+          prettyWarnL
+            [ flow "Installation path"
+            , style Dir . fromString $ destDir
+            , flow "is on the PATH but the"
+            , style File . fromString $ exe
+            , flow "executable that was just installed could not be found on \
+                   \the PATH."
+            ]
+    else
+      prettyWarnL
+        [ flow "Installation path "
+        , style Dir . fromString $ destDir
+        , "not found on the PATH environment variable."
+        ]
diff --git a/src/Path/Extended.hs b/src/Path/Extended.hs
deleted file mode 100644
index c3f6c27ebd..0000000000
--- a/src/Path/Extended.hs
+++ /dev/null
@@ -1,24 +0,0 @@
-module Path.Extended
- ( fileExtension
- , addExtension
- , replaceExtension
- ) where
-
-import           Control.Monad.Catch
-import qualified Path
-import           Path (Path, File)
-
-fileExtension :: MonadThrow m => Path b File -> m String
-fileExtension = Path.fileExtension
-
-addExtension :: MonadThrow m
-  => String
-  -> Path b File
-  -> m (Path b File)
-addExtension = Path.addExtension
-
-replaceExtension :: MonadThrow m
-  => String
-  -> Path b File
-  -> m (Path b File)
-replaceExtension ext = Path.replaceExtension ('.' : ext)
diff --git a/src/Path/Extra.hs b/src/Path/Extra.hs
index d7ebf673a8..8a149b18bc 100644
--- a/src/Path/Extra.hs
+++ b/src/Path/Extra.hs
@@ -1,32 +1,44 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE ViewPatterns      #-}
 
--- | Extra Path utilities.
+{-|
+Module      : Path.Extra
+Description : Extra Path utilities.
+License     : BSD-3-Clause
+-}
 
 module Path.Extra
-  (toFilePathNoTrailingSep
-  ,dropRoot
-  ,parseCollapsedAbsDir
-  ,parseCollapsedAbsFile
-  ,concatAndCollapseAbsDir
-  ,rejectMissingFile
-  ,rejectMissingDir
-  ,pathToByteString
-  ,pathToLazyByteString
-  ,pathToText
-  ,tryGetModificationTime
+  ( toFilePathNoTrailingSep
+  , parseCollapsedAbsDir
+  , parseCollapsedAbsFile
+  , concatAndCollapseAbsDir
+  , rejectMissingFile
+  , rejectMissingDir
+  , pathToByteString
+  , pathToLazyByteString
+  , pathToText
+  , tryGetModificationTime
+  , forgivingResolveDir
+  , forgivingResolveFile
+  , forgivingResolveFile'
   ) where
 
-import           Data.Time (UTCTime)
+import           Data.Time ( UTCTime )
 import           Path
+                   ( Abs, Dir, File, Path, PathException (..), parseAbsDir
+                   , parseAbsFile, toFilePath
+                   )
 import           Path.IO
-import           Path.Internal (Path(..))
+                   ( doesDirExist, doesFileExist, getCurrentDir
+                   , getModificationTime
+                   )
 import           RIO
-import           System.IO.Error (isDoesNotExistError)
+import           System.IO.Error ( isDoesNotExistError )
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy.Char8 as BSL
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
+import qualified System.Directory as D
 import qualified System.FilePath as FP
 
 -- | Convert to FilePath but don't add a trailing slash.
@@ -48,8 +60,13 @@ parseCollapsedAbsFile = parseAbsFile . collapseFilePath
 -- | Add a relative FilePath to the end of a Path
 -- We can't parse the FilePath first because we need to account for ".."
 -- in the FilePath (#2895)
-concatAndCollapseAbsDir :: MonadThrow m => Path Abs Dir -> FilePath -> m (Path Abs Dir)
-concatAndCollapseAbsDir base rel = parseCollapsedAbsDir (toFilePath base FP.</> rel)
+concatAndCollapseAbsDir ::
+     MonadThrow m
+  => Path Abs Dir
+  -> FilePath
+  -> m (Path Abs Dir)
+concatAndCollapseAbsDir base rel =
+  parseCollapsedAbsDir (toFilePath base FP.</> rel)
 
 -- | Collapse intermediate "." and ".." directories from a path.
 --
@@ -64,49 +81,46 @@ concatAndCollapseAbsDir base rel = parseCollapsedAbsDir (toFilePath base FP.</>
 -- (adapted from @Text.Pandoc.Shared@)
 collapseFilePath :: FilePath -> FilePath
 collapseFilePath = FP.joinPath . reverse . foldl' go [] . FP.splitDirectories
-  where
-    go rs "." = rs
-    go r@(p:rs) ".." = case p of
-                            ".." -> "..":r
-                            (checkPathSeparator -> True) -> "..":r
-                            _ -> rs
-    go _ (checkPathSeparator -> True) = [[FP.pathSeparator]]
-    go rs x = x:rs
-    checkPathSeparator [x] = FP.isPathSeparator x
-    checkPathSeparator _ = False
-
--- | Drop the root (either @\/@ on POSIX or @C:\\@, @D:\\@, etc. on
--- Windows).
-dropRoot :: Path Abs t -> Path Rel t
-dropRoot (Path l) = Path (FP.dropDrive l)
+ where
+  go rs "." = rs
+  go r@(p:rs) ".." = case p of
+                          ".." -> "..":r
+                          (checkPathSeparator -> True) -> "..":r
+                          _ -> rs
+  go _ (checkPathSeparator -> True) = [[FP.pathSeparator]]
+  go rs x = x:rs
+  checkPathSeparator [x] = FP.isPathSeparator x
+  checkPathSeparator _ = False
 
 -- | If given file in 'Maybe' does not exist, ensure we have 'Nothing'. This
--- is to be used in conjunction with 'forgivingAbsence' and
--- 'resolveFile'.
+-- is to be used in conjunction with 'Path.IO.forgivingAbsence' and
+-- 'Path.IO.resolveFile'.
 --
--- Previously the idiom @forgivingAbsence (resolveFile …)@ alone was used,
--- which relied on 'canonicalizePath' throwing 'isDoesNotExistError' when
--- path does not exist. As it turns out, this behavior is actually not
--- intentional and unreliable, see
--- <https://github.com/haskell/directory/issues/44>. This was “fixed” in
--- version @1.2.3.0@ of @directory@ package (now it never throws). To make
--- it work with all versions, we need to use the following idiom:
+-- Previously the idiom @forgivingAbsence (resolveFile …)@ alone was used, which
+-- relied on 'Path.IO.canonicalizePath' throwing 'isDoesNotExistError' when path
+-- does not exist. As it turns out, this behavior is actually not intentional
+-- and unreliable, see <https://github.com/haskell/directory/issues/44>. This
+-- was “fixed” in version @1.2.3.0@ of @directory@ package (now it never
+-- throws). To make it work with all versions, we need to use the following
+-- idiom:
 --
 -- > forgivingAbsence (resolveFile …) >>= rejectMissingFile
 
-rejectMissingFile :: MonadIO m
+rejectMissingFile ::
+     MonadIO m
   => Maybe (Path Abs File)
   -> m (Maybe (Path Abs File))
 rejectMissingFile Nothing = pure Nothing
-rejectMissingFile (Just p) = bool Nothing (Just p) `liftM` doesFileExist p
+rejectMissingFile (Just p) = bool Nothing (Just p) <$> doesFileExist p
 
 -- | See 'rejectMissingFile'.
 
-rejectMissingDir :: MonadIO m
+rejectMissingDir ::
+     MonadIO m
   => Maybe (Path Abs Dir)
   -> m (Maybe (Path Abs Dir))
 rejectMissingDir Nothing = pure Nothing
-rejectMissingDir (Just p) = bool Nothing (Just p) `liftM` doesDirExist p
+rejectMissingDir (Just p) = bool Nothing (Just p) <$> doesDirExist p
 
 -- | Convert to a lazy ByteString using toFilePath and UTF8.
 pathToLazyByteString :: Path b t -> BSL.ByteString
@@ -116,8 +130,67 @@ pathToLazyByteString = BSL.fromStrict . pathToByteString
 pathToByteString :: Path b t -> BS.ByteString
 pathToByteString = T.encodeUtf8 . pathToText
 
+-- | Convert to a 'T.Text' type.
 pathToText :: Path b t -> T.Text
 pathToText = T.pack . toFilePath
 
+-- | Attempt to get the time at which the given file was last modified. Yields
+-- `Left ()` if the file does not exist.
+--
+-- The operation may fail with 'System.IO.Error.isPermissionError' if the user
+-- is not permitted to read the modification time.
+--
+-- Caveat for POSIX systems: This function returns a timestamp with sub-second
+-- resolution only if this package is compiled against `unix-2.6.0.0` or later
+-- and the underlying filesystem supports them.
 tryGetModificationTime :: MonadIO m => Path Abs File -> m (Either () UTCTime)
-tryGetModificationTime = liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime
+tryGetModificationTime =
+  liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime
+
+-- | 'Path.IO.resolveDir' (@path-io@ package) throws 'InvalidAbsDir' (@path@
+-- package) in certain circumstances; this function yields 'Nothing' in those
+-- circumstances.
+forgivingResolveDir ::
+     MonadIO m
+  => Path Abs Dir
+     -- ^ Base directory
+  -> FilePath
+     -- ^ Path to resolve
+  -> m (Maybe (Path Abs Dir))
+forgivingResolveDir b p = liftIO $
+  D.canonicalizePath (toFilePath b FP.</> p) >>= \cp ->
+    catch
+      (Just <$> parseAbsDir cp)
+      ( \e -> case e of
+          InvalidAbsDir _ -> pure Nothing
+          _ -> throwIO e
+      )
+
+-- | 'Path.IO.resolveFile' (@path-io@ package) throws 'InvalidAbsFile' (@path@
+-- package) in certain circumstances; this function yields 'Nothing' in those
+-- circumstances.
+forgivingResolveFile ::
+     MonadIO m
+  => Path Abs Dir
+     -- ^ Base directory
+  -> FilePath
+     -- ^ Path to resolve
+  -> m (Maybe (Path Abs File))
+forgivingResolveFile b p = liftIO $
+  D.canonicalizePath (toFilePath b FP.</> p) >>= \cp ->
+    catch
+      (Just <$> parseAbsFile cp)
+      ( \e -> case e of
+          InvalidAbsFile _ -> pure Nothing
+          _ -> throwIO e
+      )
+
+-- | 'Path.IO.resolveFile'' (@path-io@ package) throws 'InvalidAbsFile' (@path@
+-- package) in certain circumstances; this function yields 'Nothing' in those
+-- circumstances.
+forgivingResolveFile' ::
+     MonadIO m
+  => FilePath
+     -- ^ Path to resolve
+  -> m (Maybe (Path Abs File))
+forgivingResolveFile' p = getCurrentDir >>= flip forgivingResolveFile p
diff --git a/src/Path/Find.hs b/src/Path/Find.hs
index 1c8d15d025..6828629047 100644
--- a/src/Path/Find.hs
+++ b/src/Path/Find.hs
@@ -1,53 +1,66 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE DataKinds         #-}
 
--- | Finding files.
+{-|
+Module      : Path.Find
+Description : Finding files.
+License     : BSD-3-Clause
+
+Finding files.
+-}
 
 module Path.Find
-  (findFileUp
-  ,findDirUp
-  ,findFiles
-  ,findInParents)
-  where
+  ( findFileUp
+  , findDirUp
+  , findFiles
+  , findInParents
+  ) where
 
-import RIO
-import System.IO.Error (isPermissionError)
 import qualified Data.List as L
-import Path
-import Path.IO hiding (findFiles)
-import System.PosixCompat.Files (getSymbolicLinkStatus, isSymbolicLink)
+import           Path ( Abs, Dir, File, Path, parent, toFilePath )
+import           Path.IO ( listDir )
+import           RIO
+import           System.IO.Error ( isPermissionError )
+import           System.PosixCompat.Files
+                   ( getSymbolicLinkStatus, isSymbolicLink )
 
 -- | Find the location of a file matching the given predicate.
-findFileUp :: (MonadIO m,MonadThrow m)
-           => Path Abs Dir                -- ^ Start here.
-           -> (Path Abs File -> Bool)     -- ^ Predicate to match the file.
-           -> Maybe (Path Abs Dir)        -- ^ Do not ascend above this directory.
-           -> m (Maybe (Path Abs File))  -- ^ Absolute file path.
+findFileUp ::
+     (MonadIO m, MonadThrow m)
+  => Path Abs Dir              -- ^ Start here.
+  -> (Path Abs File -> Bool)   -- ^ Predicate to match the file.
+  -> Maybe (Path Abs Dir)      -- ^ Do not ascend above this directory.
+  -> m (Maybe (Path Abs File)) -- ^ Absolute file path.
 findFileUp = findPathUp snd
 
 -- | Find the location of a directory matching the given predicate.
-findDirUp :: (MonadIO m,MonadThrow m)
-          => Path Abs Dir                -- ^ Start here.
-          -> (Path Abs Dir -> Bool)      -- ^ Predicate to match the directory.
-          -> Maybe (Path Abs Dir)        -- ^ Do not ascend above this directory.
-          -> m (Maybe (Path Abs Dir))   -- ^ Absolute directory path.
+findDirUp ::
+     (MonadIO m,MonadThrow m)
+  => Path Abs Dir               -- ^ Start here.
+  -> (Path Abs Dir -> Bool)     -- ^ Predicate to match the directory.
+  -> Maybe (Path Abs Dir)       -- ^ Do not ascend above this directory.
+  -> m (Maybe (Path Abs Dir))   -- ^ Absolute directory path.
 findDirUp = findPathUp fst
 
 -- | Find the location of a path matching the given predicate.
-findPathUp :: (MonadIO m,MonadThrow m)
-           => (([Path Abs Dir],[Path Abs File]) -> [Path Abs t])
-              -- ^ Choose path type from pair.
-           -> Path Abs Dir                     -- ^ Start here.
-           -> (Path Abs t -> Bool)             -- ^ Predicate to match the path.
-           -> Maybe (Path Abs Dir)             -- ^ Do not ascend above this directory.
-           -> m (Maybe (Path Abs t))           -- ^ Absolute path.
-findPathUp pathType dir p upperBound =
-  do entries <- listDir dir
-     case L.find p (pathType entries) of
-       Just path -> pure (Just path)
-       Nothing | Just dir == upperBound -> pure Nothing
-               | parent dir == dir -> pure Nothing
-               | otherwise -> findPathUp pathType (parent dir) p upperBound
+findPathUp ::
+     (MonadIO m,MonadThrow m)
+  => (([Path Abs Dir],[Path Abs File]) -> [Path Abs t])
+     -- ^ Choose path type from pair.
+  -> Path Abs Dir
+     -- ^ Start here.
+  -> (Path Abs t -> Bool)
+     -- ^ Predicate to match the path.
+  -> Maybe (Path Abs Dir)
+     -- ^ Do not ascend above this directory.
+  -> m (Maybe (Path Abs t))
+     -- ^ Absolute path.
+findPathUp pathType dir p upperBound = do
+  entries <- listDir dir
+  case L.find p (pathType entries) of
+    Just path -> pure (Just path)
+    Nothing | Just dir == upperBound -> pure Nothing
+            | parent dir == dir -> pure Nothing
+            | otherwise -> findPathUp pathType (parent dir) p upperBound
 
 -- | Find files matching predicate below a root directory.
 --
@@ -56,38 +69,44 @@ findPathUp pathType dir p upperBound =
 --
 -- TODO: write one of these that traverses symbolic links but
 -- efficiently ignores loops.
-findFiles :: Path Abs Dir            -- ^ Root directory to begin with.
-          -> (Path Abs File -> Bool) -- ^ Predicate to match files.
-          -> (Path Abs Dir -> Bool)  -- ^ Predicate for which directories to traverse.
-          -> IO [Path Abs File]      -- ^ List of matching files.
-findFiles dir p traversep =
-  do (dirs,files) <- catchJust (\ e -> if isPermissionError e
-                                         then Just ()
-                                         else Nothing)
-                               (listDir dir)
-                               (\ _ -> pure ([], []))
-     filteredFiles <- evaluate $ force (filter p files)
-     filteredDirs <- filterM (fmap not . isSymLink) dirs
-     subResults <-
-       forM filteredDirs
-            (\entry ->
-               if traversep entry
-                  then findFiles entry p traversep
-                  else pure [])
-     pure (concat (filteredFiles : subResults))
+findFiles ::
+     Path Abs Dir
+     -- ^ Root directory to begin with.
+  -> (Path Abs File -> Bool)
+     -- ^ Predicate to match files.
+  -> (Path Abs Dir -> Bool)
+     -- ^ Predicate for which directories to traverse.
+  -> IO [Path Abs File]
+     -- ^ List of matching files.
+findFiles dir p traversep = do
+  (dirs,files) <- catchJust (\ e -> if isPermissionError e
+                                      then Just ()
+                                      else Nothing)
+                            (listDir dir)
+                            (\ _ -> pure ([], []))
+  filteredFiles <- evaluate $ force (filter p files)
+  filteredDirs <- filterM (fmap not . isSymLink) dirs
+  subResults <-
+    forM filteredDirs
+         (\entry ->
+            if traversep entry
+               then findFiles entry p traversep
+               else pure [])
+  pure (concat (filteredFiles : subResults))
 
 isSymLink :: Path Abs t -> IO Bool
 isSymLink = fmap isSymbolicLink . getSymbolicLinkStatus . toFilePath
 
 -- | @findInParents f path@ applies @f@ to @path@ and its 'parent's until
 -- it finds a 'Just' or reaches the root directory.
-findInParents :: MonadIO m => (Path Abs Dir -> m (Maybe a)) -> Path Abs Dir -> m (Maybe a)
-findInParents f path = do
-    mres <- f path
-    case mres of
-        Just res -> pure (Just res)
-        Nothing -> do
-            let next = parent path
-            if next == path
-                then pure Nothing
-                else findInParents f next
+findInParents ::
+     MonadIO m
+  => (Path Abs Dir -> m (Maybe a))
+  -> Path Abs Dir -> m (Maybe a)
+findInParents f path = f path >>= \case
+  Just res -> pure (Just res)
+  Nothing -> do
+    let next = parent path
+    if next == path
+      then pure Nothing
+      else findInParents f next
diff --git a/src/Stack.hs b/src/Stack.hs
new file mode 100644
index 0000000000..44061d1c1f
--- /dev/null
+++ b/src/Stack.hs
@@ -0,0 +1,143 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack
+Description : Main Stack tool entry point.
+License     : BSD-3-Clause
+
+Main Stack tool entry point.
+-}
+
+module Stack
+  ( main
+  ) where
+
+import           Control.Monad.Extra ( whenJust )
+import           GHC.IO.Encoding ( mkTextEncoding, textEncodingName )
+import           Options.Applicative.Builder.Extra ( execExtraHelp )
+import           Path ( parseAbsFile )
+import           Stack.BuildInfo ( versionString' )
+import           Stack.CLI ( commandLineHandler )
+import           Stack.Constants ( stackProgName )
+import           Stack.Docker ( dockerCmdName, dockerHelpOptName )
+import           Stack.Nix ( nixCmdName, nixHelpOptName )
+import           Stack.Options.DockerParser ( dockerOptsParser )
+import           Stack.Options.GlobalParser ( globalOptsFromMonoid )
+import           Stack.Options.NixParser ( nixOptsParser )
+import           Stack.Prelude
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withRunnerGlobal )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Runner ( Runner )
+import           Stack.Types.Version
+                   ( VersionCheck (..), checkVersion, showStackVersion
+                   , stackVersion
+                   )
+import           System.Directory ( getCurrentDirectory )
+import           System.Environment ( executablePath, getArgs, getProgName )
+import           System.IO ( hGetEncoding, hPutStrLn, hSetEncoding )
+import           System.Terminal ( hIsTerminalDeviceOrMinTTY )
+
+-- | Type representing exceptions thrown by functions in the "Stack" module.
+data StackException
+  = InvalidReExecVersion String String
+  deriving Show
+
+instance Exception StackException where
+  displayException (InvalidReExecVersion expected actual) = concat
+    [ "Error: [S-2186]\n"
+    , "When re-executing '"
+    , stackProgName
+    , "' in a container, the incorrect version was found\nExpected: "
+    , expected
+    , "; found: "
+    , actual
+    ]
+
+-- | Main Stack tool entry point.
+main :: IO ()
+main = do
+  -- Line buffer the output by default, particularly for non-terminal runs.
+  -- See https://github.com/commercialhaskell/stack/pull/360
+  hSetBuffering stdout LineBuffering
+  hSetBuffering stdin  LineBuffering
+  hSetBuffering stderr LineBuffering
+  hSetTranslit stdout
+  hSetTranslit stderr
+  args <- getArgs
+  progName <- getProgName
+  mExecutableFilePath <- fromMaybe (pure Nothing) executablePath
+  let mExecutablePath = mExecutableFilePath >>= parseAbsFile
+  isTerminal <- hIsTerminalDeviceOrMinTTY stdout
+  execExtraHelp
+    args
+    dockerHelpOptName
+    (dockerOptsParser False)
+    ("Only showing --" ++ dockerCmdName ++ "* options.")
+  execExtraHelp
+    args
+    nixHelpOptName
+    (nixOptsParser False)
+    ("Only showing --" ++ nixCmdName ++ "* options.")
+  currentDir <- getCurrentDirectory
+  try (commandLineHandler currentDir progName mExecutablePath False) >>= \case
+    Left (exitCode :: ExitCode) ->
+      throwIO exitCode
+    Right (globalMonoid, run) -> do
+      global <-
+        globalOptsFromMonoid progName mExecutablePath isTerminal globalMonoid
+      when (global.logLevel == LevelDebug) $
+        hPutStrLn stderr versionString'
+      whenJust global.reExecVersion $ \expectVersion -> do
+        expectVersion' <- parseVersionThrowing expectVersion
+        unless (checkVersion MatchMinor expectVersion' stackVersion) $
+          throwIO $ InvalidReExecVersion expectVersion showStackVersion
+      withRunnerGlobal global $ run `catches`
+        [ Handler handleExitCode
+        , Handler handlePrettyException
+        , Handler handlePantryException
+        , Handler handleSomeException
+        ]
+
+-- | Change the character encoding of the given Handle to transliterate on
+-- unsupported characters instead of throwing an exception
+hSetTranslit :: Handle -> IO ()
+hSetTranslit h = do
+  menc <- hGetEncoding h
+  whenJust (fmap textEncodingName menc) $ \name ->
+    unless ('/' `elem` name) $ do
+      enc' <- mkTextEncoding $ name ++ "//TRANSLIT"
+      hSetEncoding h enc'
+
+-- | Handle ExitCode exceptions.
+handleExitCode :: ExitCode -> RIO Runner a
+handleExitCode = exitWith
+
+-- | Handle PrettyException exceptions.
+handlePrettyException :: PrettyException -> RIO Runner a
+handlePrettyException = handleAnyPrettyException
+
+-- | Handle (pretty) PantryException exceptions.
+handlePantryException :: PantryException -> RIO Runner a
+handlePantryException = handleAnyPrettyException
+
+-- | Handle any pretty exception.
+handleAnyPrettyException :: (Exception e, Pretty e) => e -> RIO Runner a
+handleAnyPrettyException e = do
+  -- The code below loads the entire Stack configuration, when all that is
+  -- needed are the Stack colours. A tailored approach may be better.
+  tryAny (withConfig NoReexec $ prettyError $ pretty e) >>= \case
+    -- Falls back to the command line's Stack colours if there is any error in
+    -- loading the entire Stack configuration.
+    Left _ -> prettyError $ pretty e
+    Right _ -> pure ()
+  exitFailure
+
+-- | Handle SomeException exceptions. This special handler stops "stack: " from
+-- being printed before the exception.
+handleSomeException :: SomeException -> RIO Runner a
+handleSomeException (SomeException e) = do
+  logError $ fromString $ displayException e
+  exitFailure
diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs
index f22c496ea1..a3d7a7cfd5 100644
--- a/src/Stack/Build.hs
+++ b/src/Stack/Build.hs
@@ -1,55 +1,150 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE DeriveDataTypeable  #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
 
--- | Build the project.
+{-|
+Module      : Stack.Build
+Description : Build the project.
+License     : BSD-3-Clause
+
+Build the project.
+-}
 
 module Stack.Build
-  (build
-  ,buildLocalTargets
-  ,loadPackage
-  ,mkBaseConfigOpts
-  ,queryBuildInfo
-  ,splitObjsWarning
-  ,CabalVersionException(..))
-  where
+  ( buildCmd
+  , build
+  , buildLocalTargets
+  , loadPackage
+  , mkBaseConfigOpts
+  , splitObjsWarning
+  ) where
 
-import           Stack.Prelude hiding (loadPackage)
-import           Data.Aeson (Value (Object, Array), (.=), object)
-import qualified Data.Aeson.Key as Key
-import qualified Data.Aeson.KeyMap as KeyMap
-import           Data.List ((\\), isPrefixOf)
-import           Data.List.Extra (groupSort)
-import qualified Data.List.NonEmpty as NE
+import           Data.Attoparsec.Args ( EscapingMode (Escaping), parseArgs )
+import qualified Data.Either.Extra as EE
+import           Data.List ( (\\) )
+import           Data.List.Extra ( groupSort )
 import qualified Data.Map as Map
 import qualified Data.Set as Set
-import qualified Data.Text as T
-import           Data.Text.Encoding (decodeUtf8)
-import qualified Data.Text.IO as TIO
-import           Data.Text.Read (decimal)
-import qualified Data.Vector as V
-import qualified Data.Yaml as Yaml
-import qualified Distribution.PackageDescription as C
-import           Distribution.Types.Dependency (depLibraries)
-import           Distribution.Version (mkVersion)
-import           Path (parent)
-import           Stack.Build.ConstructPlan
-import           Stack.Build.Execute
-import           Stack.Build.Installed
-import           Stack.Build.Source
-import           Stack.Package
-import           Stack.Setup (withNewLocalBuildTargets)
-import           Stack.Types.Build
-import           Stack.Types.Config
-import           Stack.Types.NamedComponent
+-- import qualified Distribution.PackageDescription as C
+-- import           Distribution.Types.Dependency ( Dependency (..), depLibraries )
+import           Distribution.Version ( mkVersion )
+import           RIO.NonEmpty ( nonEmpty )
+import qualified RIO.NonEmpty as NE
+import           Stack.Build.ConstructPlan ( constructPlan )
+import           Stack.Build.Execute ( executePlan, preFetch, printPlan )
+import           Stack.Build.Installed ( getInstalled, toInstallMap )
+import           Stack.Build.Source ( localDependencies, projectLocalPackages )
+import           Stack.Build.Target ( NeedTargets (..) )
+import           Stack.FileWatch ( fileWatch, fileWatchPoll )
+import           Stack.Package ( buildableExes, resolvePackage )
+import           Stack.Prelude hiding ( loadPackage )
+import           Stack.Runners ( ShouldReexec (..), withConfig, withEnvConfig )
+import           Stack.Setup ( withNewLocalBuildTargets )
+import           Stack.Types.Build.ConstructPlan ( PackageLoader )
+import           Stack.Types.Build.Exception
+                   ( BuildException (..), BuildPrettyException (..) )
+import           Stack.Types.BuildConfig ( HasBuildConfig, configFileL )
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
+import           Stack.Types.BuildOptsCLI
+                   ( BuildCommand (..), BuildOptsCLI (..), FileWatchOpts (..) )
+import           Stack.Types.BuildOptsMonoid
+                   ( buildOptsMonoidBenchmarksL, buildOptsMonoidHaddockL
+                   , buildOptsMonoidInstallExesL, buildOptsMonoidTestsL
+                   )
+import           Stack.Types.CompilerPaths ( HasCompiler, cabalVersionL )
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName, unqualCompToString )
+import           Stack.Types.Config ( Config (..), HasConfig (..), buildOptsL )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), HasSourceMap
+                   , actualCompilerVersionL, installationRootDeps
+                   , installationRootLocal, packageDatabaseDeps
+                   , packageDatabaseExtra, packageDatabaseLocal
+                   )
+import           Stack.Types.GlobalOpts ( globalOptsBuildOptsMonoidL )
+import           Stack.Types.NamedComponent ( exeComponents )
 import           Stack.Types.Package
+                   ( InstallLocation (..), LocalPackage (..), Package (..)
+                   , PackageConfig (..), lpFiles, lpFilesForComponents
+                   )
+import           Stack.Types.Plan
+                   ( Plan (..), Task (..), TaskType (..), componentKeyPkgName
+                   , taskLocation, taskProvides
+                   )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( Runner, globalOptsL )
 import           Stack.Types.SourceMap
+                   ( SMTargets (..), SourceMap (..), Target (..) )
+
+newtype CabalVersionPrettyException
+  = CabalVersionNotSupported Version
+  deriving Show
+
+instance Pretty CabalVersionPrettyException where
+  pretty (CabalVersionNotSupported cabalVer) =
+    "[S-5973]"
+    <> line
+    <> fillSep
+         [ flow "Stack builds with the version of the Cabal package that comes \
+                \with the specified version of GHC. However, Stack no longer \
+                \supports such Cabal versions before 2.2. Version"
+         , fromString $ versionString cabalVer
+         , flow "was found. To fix this, either use Stack"
+         , downgradeRecommendation
+         , flow "or earlier or use a snapshot that specifies a version of GHC \
+                \that is 8.4 or later. Stackage LTS Haskell 12.0"
+         , parens (style Shell "lts-12.0")
+         , flow "or later or Nightly 2018-03-13"
+         , parens (style Shell "nightly-2018-03-13")
+         , flow "or later specify such GHC versions."
+         ]
+   where
+    -- Due to a bug, Stack 2.15.1 does not support Cabal < 2.
+    downgradeRecommendation = if cabalVer < mkVersion [2]
+      then "2.15.3 or 2.13.1"
+      else "2.15.3"
 
-import           Stack.Types.Compiler (compilerVersionText, getGhcVersion)
-import           System.Terminal (fixCodePage)
+instance Exception CabalVersionPrettyException
+
+-- | Helper for build and install commands
+buildCmd :: BuildOptsCLI -> RIO Runner ()
+buildCmd opts = do
+  when (any (("-prof" `elem`) . fromRight [] . parseArgs Escaping) opts.ghcOptions) $
+    prettyThrowIO GHCProfOptionInvalid
+  local (over globalOptsL modifyGO) $
+    case opts.fileWatch of
+      FileWatchPoll -> withFileWatchHook fileWatchPoll
+      FileWatch -> withFileWatchHook fileWatch
+      NoFileWatch -> inner Nothing
+ where
+  withFileWatchHook fileWatchAction =
+    -- This loads the full configuration in order to obtain the file-watch-hook
+    -- setting. That is likely not the most efficient approach.
+    withConfig YesReexec $ withEnvConfig NeedTargets opts $
+      fileWatchAction (inner . Just)
+  inner ::
+       Maybe (Set (Path Abs File) -> IO ())
+    -> RIO Runner ()
+  inner setLocalFiles = withConfig YesReexec $ withEnvConfig NeedTargets opts $
+    Stack.Build.build setLocalFiles
+  -- Read the build command from the CLI and enable it to run
+  modifyGO =
+    case opts.command of
+      Test -> set
+        (globalOptsBuildOptsMonoidL . buildOptsMonoidTestsL)
+        (Just True)
+      Haddock -> set
+        (globalOptsBuildOptsMonoidL . buildOptsMonoidHaddockL)
+        (Just True)
+      Bench -> set
+        (globalOptsBuildOptsMonoidL . buildOptsMonoidBenchmarksL)
+        (Just True)
+      Install -> set
+        (globalOptsBuildOptsMonoidL . buildOptsMonoidInstallExesL)
+        (Just True)
+      Build -> id -- Default case is just Build
 
 -- | Build.
 --
@@ -60,322 +155,303 @@ build :: HasEnvConfig env
       => Maybe (Set (Path Abs File) -> IO ()) -- ^ callback after discovering all local files
       -> RIO env ()
 build msetLocalFiles = do
-  mcp <- view $ configL.to configModifyCodePage
-  ghcVersion <- view $ actualCompilerVersionL.to getGhcVersion
-  fixCodePage mcp ghcVersion $ do
-    bopts <- view buildOptsL
-    sourceMap <- view $ envConfigL.to envConfigSourceMap
-    locals <- projectLocalPackages
-    depsLocals <- localDependencies
-    let allLocals = locals <> depsLocals
-
-    checkSubLibraryDependencies (Map.elems $ smProject sourceMap)
-
-    boptsCli <- view $ envConfigL.to envConfigBuildOptsCLI
-    -- Set local files, necessary for file watching
-    stackYaml <- view stackYamlL
-    for_ msetLocalFiles $ \setLocalFiles -> do
-      files <-
-        if boptsCLIWatchAll boptsCli
-        then sequence [lpFiles lp | lp <- allLocals]
-        else forM allLocals $ \lp -> do
-          let pn = packageName (lpPackage lp)
-          case Map.lookup pn (smtTargets $ smTargets sourceMap) of
-            Nothing ->
-              pure Set.empty
-            Just (TargetAll _) ->
-              lpFiles lp
-            Just (TargetComps components) ->
-              lpFilesForComponents components lp
-      liftIO $ setLocalFiles $ Set.insert stackYaml $ Set.unions files
+  bopts <- view buildOptsL
+  sourceMap <- view $ envConfigL . to (.sourceMap)
+  locals <- projectLocalPackages
+  depsLocals <- localDependencies
+  boptsCli <- view $ envConfigL . to (.buildOptsCLI)
+  -- Set local files, necessary for file watching
+  configFile <- view configFileL
+  let allLocals = locals <> depsLocals
+      -- We are indifferent as to whether the configuration file is a
+      -- user-specifc global or a project-level one.
+      eitherConfigFile = EE.fromEither configFile
+  for_ msetLocalFiles $ \setLocalFiles -> do
+    files <-
+      if boptsCli.watchAll
+      then sequence [lpFiles lp | lp <- allLocals]
+      else forM allLocals $ \lp -> do
+        let pn = lp.package.name
+        case Map.lookup pn sourceMap.targets.targets of
+          Nothing ->
+            pure Set.empty
+          Just (TargetAll _) ->
+            lpFiles lp
+          Just (TargetComps components) ->
+            lpFilesForComponents components lp
+    liftIO $ setLocalFiles $ Set.insert eitherConfigFile $ Set.unions files
 
-    checkComponentsBuildable allLocals
+  checkComponentsBuildable allLocals
 
-    installMap <- toInstallMap sourceMap
-    (installedMap, globalDumpPkgs, snapshotDumpPkgs, localDumpPkgs) <-
-        getInstalled installMap
+  installMap <- toInstallMap sourceMap
+  (installedMap, globalDumpPkgs, snapshotDumpPkgs, localDumpPkgs) <-
+      getInstalled installMap
 
-    baseConfigOpts <- mkBaseConfigOpts boptsCli
-    plan <- constructPlan baseConfigOpts localDumpPkgs loadPackage sourceMap installedMap (boptsCLIInitialBuildSteps boptsCli)
+  baseConfigOpts <- mkBaseConfigOpts boptsCli
+  let allDumpPkgs = globalDumpPkgs ++ snapshotDumpPkgs ++ localDumpPkgs
+  plan <- constructPlan
+            baseConfigOpts
+            localDumpPkgs
+            allDumpPkgs
+            loadPackage
+            sourceMap
+            installedMap
+            boptsCli.initialBuildSteps
 
-    allowLocals <- view $ configL.to configAllowLocals
-    unless allowLocals $ case justLocals plan of
-      [] -> pure ()
-      localsIdents -> throwM $ LocalPackagesPresent localsIdents
+  allowLocals <- view $ configL . to (.allowLocals)
+  case justLocals plan of
+    [] -> when bopts.forceDirty $ prettyWarn $
+         fillSep
+           [ style Shell "--force-dirty"
+           , flow "is specified but no local packages will be built."
+           ]
+      <> blankLine
+      <> flow "If your aim is that Stack rebuilds an installed package (one \
+              \registered in the relevant package database) that Stack deems \
+              \immutable, first unregister it from the database by commanding:"
+      <> blankLine
+      <> style Shell "stack exec -- ghc-pkg unregister --force <package>"
+    localsIdents -> unless allowLocals $
+      throwM $ LocalPackagesPresent localsIdents
 
-    checkCabalVersion
-    warnAboutSplitObjs bopts
-    warnIfExecutablesWithSameNameCouldBeOverwritten locals plan
+  checkCabalVersion
+  haddockCompsSupported <- warnAboutHaddockComps bopts
+  let disableHaddockComps =
+        local $ over buildOptsL $ \bo ->
+          bo
+            { haddockExecutables = False
+            , haddockTests = False
+            , haddockBenchmarks = False
+            }
+      withHaddockCompsGuarded = if haddockCompsSupported
+        then id
+        else disableHaddockComps
+  warnAboutSplitObjs bopts
+  warnIfExecutablesWithSameNameCouldBeOverwritten locals plan
 
-    when (boptsPreFetch bopts) $
-        preFetch plan
+  when bopts.preFetch $
+      preFetch plan
 
-    if boptsCLIDryrun boptsCli
-        then printPlan plan
-        else executePlan boptsCli baseConfigOpts locals
-                         globalDumpPkgs
-                         snapshotDumpPkgs
-                         localDumpPkgs
-                         installedMap
-                         (smtTargets $ smTargets sourceMap)
-                         plan
+  if boptsCli.dryrun
+    then
+      printPlan plan
+    else
+      withHaddockCompsGuarded $ executePlan
+        boptsCli
+        baseConfigOpts
+        locals
+        globalDumpPkgs
+        snapshotDumpPkgs
+        localDumpPkgs
+        installedMap
+        sourceMap.targets.targets
+        plan
 
-buildLocalTargets :: HasEnvConfig env => NonEmpty Text -> RIO env (Either SomeException ())
+-- | Build one or more local targets.
+buildLocalTargets ::
+     HasEnvConfig env
+  => NonEmpty Text
+     -- ^ Local targets to build.
+  -> RIO env (Either SomeException ())
 buildLocalTargets targets =
   tryAny $ withNewLocalBuildTargets (NE.toList targets) $ build Nothing
 
+-- | Extract the local package identifiers from the plan. Multiple component
+-- tasks for the same package are deduplicated.
 justLocals :: Plan -> [PackageIdentifier]
 justLocals =
-    map taskProvides .
-    filter ((== Local) . taskLocation) .
-    Map.elems .
-    planTasks
+  Set.toList . Set.fromList .
+  map taskProvides .
+  filter ((== Local) . taskLocation) .
+  Map.elems .
+  (.tasks)
 
 checkCabalVersion :: HasEnvConfig env => RIO env ()
 checkCabalVersion = do
-    allowNewer <- view $ configL.to configAllowNewer
-    cabalVer <- view cabalVersionL
-    -- https://github.com/haskell/cabal/issues/2023
-    when (allowNewer && cabalVer < mkVersion [1, 22]) $ throwM $
-        CabalVersionException $
-            "Error: --allow-newer requires at least Cabal version 1.22, but version " ++
-            versionString cabalVer ++
-            " was found."
-    -- Since --exact-configuration is always passed, some old cabal
-    -- versions can no longer be used. See the following link for why
-    -- it's 1.19.2:
-    -- https://github.com/haskell/cabal/blob/580fe6b6bf4e1648b2f66c1cb9da9f1f1378492c/cabal-install/Distribution/Client/Setup.hs#L592
-    when (cabalVer < mkVersion [1, 19, 2]) $ throwM $
-        CabalVersionException $
-            "Stack no longer supports Cabal versions older than 1.19.2, but version " ++
-            versionString cabalVer ++
-            " was found.  To fix this, consider updating the resolver to lts-3.0 or later / nightly-2015-05-05 or later."
-
-newtype CabalVersionException = CabalVersionException { unCabalVersionException :: String }
-    deriving (Typeable)
-
-instance Show CabalVersionException where show = unCabalVersionException
-instance Exception CabalVersionException
+  cabalVer <- view cabalVersionL
+  when (cabalVer < mkVersion [2, 2]) $
+    prettyThrowM $ CabalVersionNotSupported cabalVer
 
 -- | See https://github.com/commercialhaskell/stack/issues/1198.
-warnIfExecutablesWithSameNameCouldBeOverwritten
-    :: HasLogFunc env => [LocalPackage] -> Plan -> RIO env ()
+warnIfExecutablesWithSameNameCouldBeOverwritten ::
+     HasTerm env
+  => [LocalPackage]
+  -> Plan
+  -> RIO env ()
 warnIfExecutablesWithSameNameCouldBeOverwritten locals plan = do
-    logDebug "Checking if we are going to build multiple executables with the same name"
-    forM_ (Map.toList warnings) $ \(exe,(toBuild,otherLocals)) -> do
-        let exe_s
-                | length toBuild > 1 = "several executables with the same name:"
-                | otherwise = "executable"
-            exesText pkgs =
-                T.intercalate
-                    ", "
-                    ["'" <> T.pack (packageNameString p) <> ":" <> exe <> "'" | p <- pkgs]
-        (logWarn . display . T.unlines . concat)
-            [ [ "Building " <> exe_s <> " " <> exesText toBuild <> "." ]
-            , [ "Only one of them will be available via 'stack exec' or locally installed."
-              | length toBuild > 1
-              ]
-            , [ "Other executables with the same name might be overwritten: " <>
-                exesText otherLocals <> "."
-              | not (null otherLocals)
-              ]
-            ]
-  where
-    -- Cases of several local packages having executables with the same name.
-    -- The Map entries have the following form:
-    --
-    --  executable name: ( package names for executables that are being built
-    --                   , package names for other local packages that have an
-    --                     executable with the same name
-    --                   )
-    warnings :: Map Text ([PackageName],[PackageName])
-    warnings =
-        Map.mapMaybe
-            (\(pkgsToBuild,localPkgs) ->
-                case (pkgsToBuild,NE.toList localPkgs \\ NE.toList pkgsToBuild) of
-                    (_ :| [],[]) ->
-                        -- We want to build the executable of single local package
-                        -- and there are no other local packages with an executable of
-                        -- the same name. Nothing to warn about, ignore.
-                        Nothing
-                    (_,otherLocals) ->
-                        -- We could be here for two reasons (or their combination):
-                        -- 1) We are building two or more executables with the same
-                        --    name that will end up overwriting each other.
-                        -- 2) In addition to the executable(s) that we want to build
-                        --    there are other local packages with an executable of the
-                        --    same name that might get overwritten.
-                        -- Both cases warrant a warning.
-                        Just (NE.toList pkgsToBuild,otherLocals))
-            (Map.intersectionWith (,) exesToBuild localExes)
-    exesToBuild :: Map Text (NonEmpty PackageName)
-    exesToBuild =
-        collect
-            [ (exe,pkgName')
-            | (pkgName',task) <- Map.toList (planTasks plan)
-            , TTLocalMutable lp <- [taskType task]
-            , exe <- (Set.toList . exeComponents . lpComponents) lp
+  logDebug "Checking if we are going to build multiple executables with the same name"
+  forM_ (Map.toList warnings) $ \(exe, (toBuild, otherLocals)) -> do
+    let exe_s
+          | length toBuild > 1 = flow "several executables with the same name:"
+          | otherwise = "executable"
+        exesText pkgs =
+          fillSep $ punctuate
+            ","
+            [ style
+                PkgComponent
+                (fromString $ packageNameString p <> ":" <> unqualCompToString exe)
+            | p <- pkgs
             ]
-    localExes :: Map Text (NonEmpty PackageName)
-    localExes =
-        collect
-            [ (exe,packageName pkg)
-            | pkg <- map lpPackage locals
-            , exe <- Set.toList (packageExes pkg)
-            ]
-    collect :: Ord k => [(k,v)] -> Map k (NonEmpty v)
-    collect = Map.map NE.fromList . Map.fromDistinctAscList . groupSort
+    prettyWarnL $
+         [ "Building"
+         , exe_s
+         , exesText toBuild <> "."
+         ]
+      <> [ fillSep
+             [ flow "Only one of them will be available via"
+             , style Shell "stack exec"
+             , flow "or locally installed."
+             ]
+         | length toBuild > 1
+         ]
+      <> [ fillSep
+             [ flow "Other executables with the same name might be overwritten:"
+             , exesText otherLocals <> "."
+             ]
+         | not (null otherLocals)
+         ]
+ where
+  -- Cases of several project packages having executables with the same name.
+  -- The Map entries have the following form:
+  --
+  --  executable name: ( package names for executables that are being built
+  --                   , package names for other project packages that have an
+  --                     executable with the same name
+  --                   )
+  warnings :: Map StackUnqualCompName ([PackageName],[PackageName])
+  warnings =
+    Map.mapMaybe
+      (\(pkgsToBuild, localPkgs) ->
+        case (pkgsToBuild, NE.toList localPkgs \\ NE.toList pkgsToBuild) of
+          (_ :| [], []) ->
+            -- We want to build the executable of single project package
+            -- and there are no other project packages with an executable of
+            -- the same name. Nothing to warn about, ignore.
+            Nothing
+          (_, otherLocals) ->
+            -- We could be here for two reasons (or their combination):
+            -- 1) We are building two or more executables with the same
+            --    name that will end up overwriting each other.
+            -- 2) In addition to the executable(s) that we want to build
+            --    there are other project packages with an executable of the
+            --    same name that might get overwritten.
+            -- Both cases warrant a warning.
+            Just (NE.toList pkgsToBuild, otherLocals))
+      (Map.intersectionWith (,) exesToBuild localExes)
+  exesToBuild :: Map StackUnqualCompName (NonEmpty PackageName)
+  exesToBuild =
+    collect
+      [ (exe, pn)
+      | (pn, task) <- Map.toList perPkgTasks
+      , TTLocalMutable lp <- [task.taskType]
+      , exe <- (Set.toList . exeComponents . (.components)) lp
+      ]
+  -- Multiple component tasks for the same package share the same Task data.
+  -- Use one representative task per package to avoid duplicates.
+  perPkgTasks :: Map PackageName Task
+  perPkgTasks = Map.fromList
+    [ (componentKeyPkgName ck, t) | (ck, t) <- Map.toList plan.tasks ]
+  localExes :: Map StackUnqualCompName (NonEmpty PackageName)
+  localExes =
+    collect
+      [ (exe, pkg.name)
+      | pkg <- map (.package) locals
+      , exe <- Set.toList (buildableExes pkg)
+      ]
+  collect :: Ord k => [(k, v)] -> Map k (NonEmpty v)
+  collect = Map.mapMaybe nonEmpty . Map.fromDistinctAscList . groupSort
 
-warnAboutSplitObjs :: HasLogFunc env => BuildOpts -> RIO env ()
-warnAboutSplitObjs bopts | boptsSplitObjs bopts = do
-    logWarn $ "Building with --split-objs is enabled. " <> fromString splitObjsWarning
+warnAboutHaddockComps ::
+     (HasCompiler env, HasTerm env)
+  => BuildOpts
+  -> RIO env Bool
+warnAboutHaddockComps bopts = do
+  let haddockCompsWanted =
+           bopts.haddockExecutables
+        || bopts.haddockTests
+        || bopts.haddockBenchmarks
+  cabalVer <- view cabalVersionL
+  if haddockCompsWanted && cabalVer < mkVersion [3, 8, 1]
+    then do
+      prettyWarnL
+        [ flow "Stack builds Haddock documentation with the version of the \
+               \Cabal package that comes with the specified version of GHC. \
+               \Version"
+        , fromString $ versionString cabalVer
+        , flow "was found, which does not support the building of \
+               \documentation for executables, test suites or benchmarks. \
+               \Options to build such documentation will be ignored. To use \
+               \the options, use a snapshot that specifies a version of GHC \
+               \that is 9.4 or later. Stackage LTS Haskell 21.0"
+        , parens (style Shell "lts-21.0")
+        , flow "or later or Nightly 2022-11-19"
+        , parens (style Shell "nightly-2022-11-19")
+        , flow "or later specify such GHC versions."
+        ]
+      pure False
+    else pure haddockCompsWanted
+
+warnAboutSplitObjs :: HasTerm env => BuildOpts -> RIO env ()
+warnAboutSplitObjs bopts |  bopts.splitObjs =
+  prettyWarnL
+    [ flow "Building with"
+    , style Shell "--split-objs"
+    , flow "is enabled."
+    , flow splitObjsWarning
+    ]
 warnAboutSplitObjs _ = pure ()
 
+-- | Text warning about the experimental nature of Stack's @--split-objs@ flag.
 splitObjsWarning :: String
-splitObjsWarning = unwords
-     [ "Note that this feature is EXPERIMENTAL, and its behavior may be changed and improved."
-     , "You will need to clean your workdirs before use. If you want to compile all dependencies"
-     , "with split-objs, you will need to delete the snapshot (and all snapshots that could"
-     , "reference that snapshot)."
-     ]
+splitObjsWarning =
+  "Note that this feature is EXPERIMENTAL, and its behavior may be changed and \
+  \improved. You will need to clean your workdirs before use. If you want to \
+  \compile all dependencies with split-objs, you will need to delete the \
+  \snapshot (and all snapshots that could reference that snapshot)."
 
 -- | Get the @BaseConfigOpts@ necessary for constructing configure options
 mkBaseConfigOpts :: (HasEnvConfig env)
                  => BuildOptsCLI -> RIO env BaseConfigOpts
-mkBaseConfigOpts boptsCli = do
-    bopts <- view buildOptsL
-    snapDBPath <- packageDatabaseDeps
-    localDBPath <- packageDatabaseLocal
-    snapInstallRoot <- installationRootDeps
-    localInstallRoot <- installationRootLocal
-    packageExtraDBs <- packageDatabaseExtra
-    pure BaseConfigOpts
-        { bcoSnapDB = snapDBPath
-        , bcoLocalDB = localDBPath
-        , bcoSnapInstallRoot = snapInstallRoot
-        , bcoLocalInstallRoot = localInstallRoot
-        , bcoBuildOpts = bopts
-        , bcoBuildOptsCLI = boptsCli
-        , bcoExtraDBs = packageExtraDBs
-        }
+mkBaseConfigOpts buildOptsCLI = do
+  buildOpts <- view buildOptsL
+  snapDB <- packageDatabaseDeps
+  localDB <- packageDatabaseLocal
+  snapInstallRoot <- installationRootDeps
+  localInstallRoot <- installationRootLocal
+  extraDBs <- packageDatabaseExtra
+  pure BaseConfigOpts
+    { snapDB
+    , localDB
+    , snapInstallRoot
+    , localInstallRoot
+    , buildOpts
+    , buildOptsCLI
+    , extraDBs
+    }
 
 -- | Provide a function for loading package information from the package index
-loadPackage
-  :: (HasBuildConfig env, HasSourceMap env)
-  => PackageLocationImmutable
-  -> Map FlagName Bool
-  -> [Text] -- ^ GHC options
-  -> [Text] -- ^ Cabal configure options
-  -> RIO env Package
+loadPackage :: (HasBuildConfig env, HasSourceMap env) => PackageLoader (RIO env)
 loadPackage loc flags ghcOptions cabalConfigOpts = do
-  compiler <- view actualCompilerVersionL
+  compilerVersion <- view actualCompilerVersionL
   platform <- view platformL
   let pkgConfig = PackageConfig
-        { packageConfigEnableTests = False
-        , packageConfigEnableBenchmarks = False
-        , packageConfigFlags = flags
-        , packageConfigGhcOptions = ghcOptions
-        , packageConfigCabalConfigOpts = cabalConfigOpts
-        , packageConfigCompilerVersion = compiler
-        , packageConfigPlatform = platform
+        { enableTests = False
+        , enableBenchmarks = False
+        , flags
+        , ghcOptions
+        , cabalConfigOpts
+        , compilerVersion
+        , platform
         }
   resolvePackage pkgConfig <$> loadCabalFileImmutable loc
 
--- | Query information about the build and print the result to stdout in YAML format.
-queryBuildInfo :: HasEnvConfig env
-               => [Text] -- ^ selectors
-               -> RIO env ()
-queryBuildInfo selectors0 =
-        rawBuildInfo
-    >>= select id selectors0
-    >>= liftIO . TIO.putStrLn . addGlobalHintsComment . decodeUtf8 . Yaml.encode
-  where
-    select _ [] value = pure value
-    select front (sel:sels) value =
-        case value of
-            Object o ->
-                case KeyMap.lookup (Key.fromText sel) o of
-                    Nothing -> err "Selector not found"
-                    Just value' -> cont value'
-            Array v ->
-                case decimal sel of
-                    Right (i, "")
-                        | i >= 0 && i < V.length v -> cont $ v V.! i
-                        | otherwise -> err "Index out of range"
-                    _ -> err "Encountered array and needed numeric selector"
-            _ -> err $ "Cannot apply selector to " ++ show value
-      where
-        cont = select (front . (sel:)) sels
-        err msg = throwString $ msg ++ ": " ++ show (front [sel])
-    -- Include comments to indicate that this portion of the "stack
-    -- query" API is not necessarily stable.
-    addGlobalHintsComment
-      | null selectors0 = T.replace globalHintsLine ("\n" <> globalHintsComment <> globalHintsLine)
-      -- Append comment instead of pre-pending. The reasoning here is
-      -- that something *could* expect that the result of 'stack query
-      -- global-hints ghc-boot' is just a string literal. Seems easier
-      -- for to expect the first line of the output to be the literal.
-      | ["global-hints"] `isPrefixOf` selectors0 = (<> ("\n" <> globalHintsComment))
-      | otherwise = id
-    globalHintsLine = "\nglobal-hints:\n"
-    globalHintsComment = T.concat
-      [ "# Note: global-hints is experimental and may be renamed / removed in the future.\n"
-      , "# See https://github.com/commercialhaskell/stack/issues/3796"
-      ]
--- | Get the raw build information object
-rawBuildInfo :: HasEnvConfig env => RIO env Value
-rawBuildInfo = do
-    locals <- projectLocalPackages
-    wantedCompiler <- view $ wantedCompilerVersionL.to (utf8BuilderToText . display)
-    actualCompiler <- view $ actualCompilerVersionL.to compilerVersionText
-    pure $ object
-        [ "locals" .= Object (KeyMap.fromList $ map localToPair locals)
-        , "compiler" .= object
-            [ "wanted" .= wantedCompiler
-            , "actual" .= actualCompiler
-            ]
-        ]
-  where
-    localToPair lp =
-        (Key.fromText $ T.pack $ packageNameString $ packageName p, value)
-      where
-        p = lpPackage lp
-        value = object
-            [ "version" .= CabalString (packageVersion p)
-            , "path" .= toFilePath (parent $ lpCabalFile lp)
-            ]
-
 checkComponentsBuildable :: MonadThrow m => [LocalPackage] -> m ()
 checkComponentsBuildable lps =
-    unless (null unbuildable) $ throwM $ SomeTargetsNotBuildable unbuildable
-  where
-    unbuildable =
-        [ (packageName (lpPackage lp), c)
-        | lp <- lps
-        , c <- Set.toList (lpUnbuildable lp)
-        ]
-
--- | Find if sublibrary dependency exist in each project
-checkSubLibraryDependencies :: HasLogFunc env => [ProjectPackage] -> RIO env ()
-checkSubLibraryDependencies proj = do
-  forM_ proj $ \p -> do
-    C.GenericPackageDescription _ _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p
-
-    let dependencies = concatMap getDeps subLibs <>
-                       concatMap getDeps foreignLibs <>
-                       concatMap getDeps exes <>
-                       concatMap getDeps tests <>
-                       concatMap getDeps benches <>
-                       maybe [] C.condTreeConstraints lib
-        libraries = concatMap (toList . depLibraries) dependencies
-
-    when (subLibDepExist libraries)
-      (logWarn "SubLibrary dependency is not supported, this will almost certainly fail")
-  where
-    getDeps (_, C.CondNode _ dep _) = dep
-    subLibDepExist lib =
-      any (\x ->
-        case x of
-          C.LSubLibName _ -> True
-          C.LMainLibName  -> False
-      ) lib
+  unless (null unbuildable) $
+    prettyThrowM $ SomeTargetsNotBuildable unbuildable
+ where
+  unbuildable =
+    [ (lp.package.name, c)
+    | lp <- lps
+    , c <- Set.toList lp.unbuildable
+    ]
diff --git a/src/Stack/Build/Backpack.hs b/src/Stack/Build/Backpack.hs
new file mode 100644
index 0000000000..c19fdcbf9a
--- /dev/null
+++ b/src/Stack/Build/Backpack.hs
@@ -0,0 +1,680 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Build.Backpack
+Description : Backpack (cross-package) instantiation support.
+License     : BSD-3-Clause
+
+Create CInst instantiation tasks for Backpack packages. Given the build plan's
+dependency resolution results, this module scans consumer packages for mixin
+references to indefinite (signature-only) packages and creates additional build
+tasks that instantiate those packages with concrete implementations.
+-}
+
+module Stack.Build.Backpack
+  ( addInstantiationTasks
+  , loadFoundIndefiniteTasks
+  ) where
+
+import           Crypto.Hash ( hashWith, SHA256 (..) )
+import qualified Data.ByteArray.Encoding as Mem
+                   ( Base (Base16), convertToBase )
+import qualified Data.List as L
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import qualified Data.Text as T
+import           Distribution.ModuleName ( ModuleName )
+import qualified Distribution.Text as CabalText
+import           Distribution.Types.IncludeRenaming ( IncludeRenaming (..) )
+import           Distribution.Types.Mixin
+                   ( Mixin (..), mixinIncludeRenaming, mixinPackageName )
+import           Distribution.Types.ModuleRenaming
+                   ( ModuleRenaming (..) )
+import           Path ( parent )
+import           Stack.ConfigureOpts ( packageConfigureOptsFromPackage )
+import           Stack.Package
+                   ( packageIsIndefinite, processPackageDepsEither )
+import           Stack.Prelude
+import           Stack.Types.Build.ConstructPlan
+                   ( AddDepRes (..), CombinedMap, MissingPresentDeps (..)
+                   , PackageInfo (..), processAdr
+                   )
+import           Stack.Types.SourceMap ( CommonPackage (..) )
+import           Distribution.Types.BuildType ( BuildType (Configure) )
+import           Stack.Types.Cache ( CachePkgSrc (..) )
+import           Stack.Types.Component
+                   ( StackBuildInfo (..), StackLibrary (..) )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts (..) )
+import           Stack.Types.EnvConfig ( EnvConfig (..), HasEnvConfig (..) )
+import           Stack.Types.Installed
+                   ( InstallLocation (..), Installed (..)
+                   , InstalledLibraryInfo (..), installedVersion
+                   )
+import           Stack.Types.IsMutable ( IsMutable (..) )
+import           Stack.Types.NamedComponent ( NamedComponent (..) )
+import           Stack.Types.Package
+                   ( LocalPackage (..), Package (..), PackageSource (..)
+                   , packageIdentifier, psVersion, toCabalMungedPackageId
+                   )
+import           Stack.Types.Plan
+                   ( ComponentKey (..), Task (..), TaskConfigOpts (..)
+                   , TaskType (..), installLocationIsMutable
+                   )
+
+-- | Extract the package metadata from a build task.
+taskPackage :: Task -> Package
+taskPackage t = case t.taskType of
+  TTLocalMutable lp     -> lp.package
+  TTRemotePackage _ p _ -> p
+
+-- | Load source-backed template tasks for ADRFound indefinite (Backpack
+-- signature) packages. These tasks are used only as sources for CInst tasks.
+-- The original ADRFound entries must remain ADRFound: a clean installed
+-- indefinite package should not be added to the build plan just because a
+-- dependent package needs a CInst task.
+--
+-- Only packages actually referenced by a consumer's mixin, plus the indefinite
+-- dependencies discovered while loading those package descriptions, are loaded.
+-- This avoids unnecessary Pantry lookups for the common case (no Backpack).
+loadFoundIndefiniteTasks ::
+     forall env. HasEnvConfig env
+  => (  PackageLocationImmutable
+     -> Map FlagName Bool
+     -> [Text]
+     -> [Text]
+     -> RIO EnvConfig Package
+     )
+     -- ^ Load package from source (loadPackage0)
+  -> EnvConfig
+  -> Map PackageName PackageSource
+  -> CombinedMap
+  -> BaseConfigOpts
+  -> [(PackageName, AddDepRes)]
+  -> RIO env (Map PackageName Task)
+loadFoundIndefiniteTasks loadPkg econfig sources combinedMap bco adrs =
+  go Set.empty Map.empty foundTargets
+ where
+  adrMap :: Map PackageName AddDepRes
+  adrMap = Map.fromList adrs
+
+  -- Collect package names referenced by any consumer's mixin.
+  mixinTargets :: Set PackageName
+  mixinTargets = Set.fromList
+    [ depName
+    | (_, ADRToInstall task) <- adrs
+    , let pkg = taskPackage task
+    , depName <- mixinTargetsFor pkg
+    ]
+
+  -- Filter to mixin targets that are ADRFound.
+  foundTargets :: [PackageName]
+  foundTargets =
+    [ name
+    | name <- Set.toList mixinTargets
+    , Just (ADRFound _ _) <- [Map.lookup name adrMap]
+    ]
+
+  go ::
+       Set PackageName
+    -> Map PackageName Task
+    -> [PackageName]
+    -> RIO env (Map PackageName Task)
+  go _seen templates [] = pure templates
+  go seen templates (name:rest)
+    | name `Set.member` seen = go seen templates rest
+    | otherwise = do
+        mTemplate <- loadTemplate name
+        case mTemplate of
+          Nothing ->
+            go (Set.insert name seen) templates rest
+          Just (_, template) ->
+            let pkg = taskPackage template
+            in  go
+                  (Set.insert name seen)
+                  (Map.insert name template templates)
+                  (foundDependencyTargets pkg ++ rest)
+
+  loadTemplate ::
+       PackageName
+    -> RIO env (Maybe (PackageName, Task))
+  loadTemplate name =
+    case Map.lookup name sources of
+      Just ps ->
+        loadFromSourceTemplate name ps
+      Nothing ->
+        case Map.lookup name combinedMap of
+          Just (PIOnlyInstalled _ installed) ->
+            -- Source not available from the source map (GHC boot library,
+            -- external package DB, or similar). Look up Hackage as a fallback;
+            -- packageIsIndefinite filters out ordinary dependencies.
+            loadFromHackage name installed
+          Just (PIBoth ps _) ->
+            loadFromSourceTemplate name ps
+          Just (PIOnlySource ps) ->
+            -- Should not happen (ADRFound implies installed), but handle
+            -- gracefully by loading the package to check.
+            loadFromSourceTemplate name ps
+          Nothing ->
+            -- Package not in combined map — shouldn't happen. Skip.
+            pure Nothing
+
+  loadFromSource :: PackageSource -> RIO env Package
+  loadFromSource = \case
+    PSRemote pkgLoc _version _fromSnapshot cp ->
+      runRIO econfig $ loadPkg pkgLoc cp.flags cp.ghcOptions cp.cabalConfigOpts
+    PSFilePath lp -> pure lp.package
+
+  mkTask :: Package -> PackageSource -> Task
+  mkTask package ps =
+    let loc = psLocation ps
+        isMutable = installLocationIsMutable loc
+        MissingPresentDeps missing present minMutable =
+          templateDeps package
+    in  Task
+          { configOpts = TaskConfigOpts
+              { missing
+              , envConfig = econfig
+              , baseConfigOpts = bco
+              , isLocalNonExtraDep = psLocal ps
+              , isMutable = isMutable <> minMutable
+              , pkgConfigOpts = packageConfigureOptsFromPackage package
+              , instantiationDeps = []
+              }
+          , buildHaddocks = False
+          , allInOne = True
+          , present
+          , taskType = case ps of
+              PSFilePath lp -> TTLocalMutable lp
+              PSRemote pkgLoc _version _fromSnapshot _cp ->
+                TTRemotePackage isMutable package pkgLoc
+          , cachePkgSrc = toCachePkgSrc ps
+          , buildTypeConfig = packageBuildTypeConfig package
+          , backpackInstEntries = []
+          }
+
+  loadFromSourceTemplate ::
+       PackageName
+    -> PackageSource
+    -> RIO env (Maybe (PackageName, Task))
+  loadFromSourceTemplate name ps = do
+    package <- loadFromSource ps
+    if packageIsIndefinite package
+      then pure $ Just (name, mkTask package ps)
+      else pure Nothing
+
+  loadFromHackage ::
+       PackageName
+    -> Installed
+    -> RIO env (Maybe (PackageName, Task))
+  loadFromHackage name installed = do
+    let version = installedVersion installed
+    mPkgLoc <- runRIO econfig $
+      getLatestHackageRevision YesRequireHackageIndex name version >>= \case
+        Nothing -> pure Nothing
+        Just (_rev, cfKey, treeKey) ->
+          pure $ Just $ PLIHackage (PackageIdentifier name version) cfKey treeKey
+    case mPkgLoc of
+      Nothing -> pure Nothing
+      Just pkgLoc -> do
+        package <- runRIO econfig $ loadPkg pkgLoc Map.empty [] []
+        if packageIsIndefinite package
+          then do
+            let MissingPresentDeps missing present minMutable =
+                  templateDeps package
+                task = Task
+                  { configOpts = TaskConfigOpts
+                      { missing
+                      , envConfig = econfig
+                      , baseConfigOpts = bco
+                      , isLocalNonExtraDep = False
+                      , isMutable = Immutable <> minMutable
+                      , pkgConfigOpts = packageConfigureOptsFromPackage package
+                      , instantiationDeps = []
+                      }
+                  , buildHaddocks = False
+                  , allInOne = True
+                  , present
+                  , taskType = TTRemotePackage Immutable package pkgLoc
+                  , cachePkgSrc = CacheSrcUpstream
+                  , buildTypeConfig = packageBuildTypeConfig package
+                  , backpackInstEntries = []
+                  }
+            pure $ Just (name, task)
+          else pure Nothing
+
+  foundDependencyTargets :: Package -> [PackageName]
+  foundDependencyTargets package =
+    [ depName
+    | depName <- mixinTargetsFor package
+    , Just ADRFound{} <- [Map.lookup depName adrMap]
+    ]
+
+  mixinTargetsFor :: Package -> [PackageName]
+  mixinTargetsFor package =
+    [ mixinPackageName mixin
+    | lib <- maybeToList package.library ++ toList package.subLibraries
+    , mixin <- lib.buildInfo.mixins
+    ]
+
+  templateDeps ::
+       Package
+    -> MissingPresentDeps
+  templateDeps package =
+    fromRight mempty $
+      runIdentity $
+        processPackageDepsEither package $ \depName _depValue ->
+          pure (Right (case Map.lookup depName adrMap of
+            Just adr ->
+              processAdr adr
+            Nothing ->
+              dependencyFromCombinedMap depName) :: Either () MissingPresentDeps)
+
+  dependencyFromCombinedMap :: PackageName -> MissingPresentDeps
+  dependencyFromCombinedMap depName =
+    case Map.lookup depName combinedMap of
+      Just (PIOnlyInstalled loc installed) ->
+        dependencyFromInstalled loc installed
+      Just (PIBoth _ installed) ->
+        dependencyFromInstalled Local installed
+      Just (PIOnlySource ps) ->
+        MissingPresentDeps
+          { missingPackages = Set.singleton $
+              PackageIdentifier depName (psVersion ps)
+          , presentPackages = mempty
+          , isMutable = installLocationIsMutable $ psLocation ps
+          }
+      Nothing ->
+        mempty
+
+  dependencyFromInstalled ::
+       InstallLocation
+    -> Installed
+    -> MissingPresentDeps
+  dependencyFromInstalled loc installed =
+    processAdr $ ADRFound loc installed
+
+-- | Post-pass: scan consumer tasks for Backpack mixins referencing indefinite
+-- packages and create CInst instantiation tasks. Returns the augmented list
+-- plus any warnings about unsupported Backpack patterns.
+addInstantiationTasks ::
+     Map PackageName (Set ModuleName)
+     -- ^ Installed package modules (from ghc-pkg dump). Used for module
+     -- resolution when the implementing package is ADRFound (already
+     -- installed, no Task/Package metadata available).
+  -> Map PackageName Task
+     -- ^ Source-backed templates for clean ADRFound indefinite packages.
+  -> [(PackageName, AddDepRes)]     -- ^ Original per-package ADRs
+  -> [(ComponentKey, AddDepRes)]    -- ^ Expanded component-keyed ADRs
+  -> ([(ComponentKey, AddDepRes)], [StyleDoc])
+     -- ^ (Augmented with CInst tasks, warnings)
+addInstantiationTasks installedModules foundIndefiniteTasks origAdrs expandedAdrs =
+  let adrMap = Map.fromList origAdrs
+      -- Process each entry, collecting new CInst tasks and modified consumers.
+      (newInstTasks, modifiedEntries, warns) =
+        foldr (processEntry adrMap) ([], [], []) expandedAdrs
+      -- Deduplicate CInst tasks: multiple components of the same consumer
+      -- may reference the same mixin, producing identical CInst entries.
+      -- Map.fromList keeps the last, Map.toList restores the list.
+      dedupedInstTasks = Map.toList $ Map.fromList newInstTasks
+  in  (modifiedEntries ++ dedupedInstTasks, warns)
+ where
+  processEntry ::
+       Map PackageName AddDepRes
+    -> (ComponentKey, AddDepRes)
+    -> ([(ComponentKey, AddDepRes)], [(ComponentKey, AddDepRes)], [StyleDoc])
+    -> ([(ComponentKey, AddDepRes)], [(ComponentKey, AddDepRes)], [StyleDoc])
+  processEntry adrMap (ck, ADRToInstall task) (instAcc, entryAcc, warnAcc) =
+    let pkg = taskPackage task
+        -- Get mixins from the main library and all sub-libraries.
+        mainMixins = case pkg.library of
+          Just lib -> lib.buildInfo.mixins
+          Nothing  -> []
+        subLibMixins = concatMap (\lib -> lib.buildInfo.mixins)
+                                 (toList pkg.subLibraries)
+        allMixins = mainMixins ++ subLibMixins
+        -- Collect the consumer's build-depends to scope module resolution.
+        -- When multiple packages expose the same module, only the consumer's
+        -- direct dependencies are considered (matching Cabal's behavior).
+        consumerDeps = Set.fromList $ concatMap
+          (\lib -> Map.keys lib.buildInfo.dependency)
+          (maybeToList pkg.library ++ toList pkg.subLibraries)
+        -- Process each mixin that references an indefinite dep.
+        (instTasks, instKeys, mixinWarns) =
+          processAllMixins ck pkg allMixins adrMap consumerDeps
+        -- Add CInst keys to the consumer's instantiationDeps.
+        modifiedTask
+          | null instKeys = task
+          | otherwise = task
+              { configOpts = task.configOpts
+                  { instantiationDeps =
+                      task.configOpts.instantiationDeps ++ instKeys
+                  }
+              }
+    in  ( instTasks ++ instAcc
+        , (ck, ADRToInstall modifiedTask) : entryAcc
+        , mixinWarns ++ warnAcc
+        )
+  processEntry _ entry (instAcc, entryAcc, warnAcc) =
+    (instAcc, entry : entryAcc, warnAcc)
+
+  -- Process all mixins for a consumer, returning new CInst entries, their
+  -- ComponentKeys (to add as deps on the consumer), and any warnings.
+  processAllMixins ::
+       ComponentKey           -- ^ Consumer's key
+    -> Package                -- ^ Consumer's package
+    -> [Mixin]                -- ^ Consumer's library mixins
+    -> Map PackageName AddDepRes
+    -> Set PackageName         -- ^ Consumer's build-depends
+    -> ([(ComponentKey, AddDepRes)], [ComponentKey], [StyleDoc])
+  processAllMixins _ck _pkg mixins adrMap' consumerDeps =
+    foldr (processMixin adrMap' consumerDeps) ([], [], []) mixins
+
+  processMixin ::
+       Map PackageName AddDepRes
+    -> Set PackageName         -- ^ Consumer's build-depends
+    -> Mixin
+    -> ([(ComponentKey, AddDepRes)], [ComponentKey], [StyleDoc])
+    -> ([(ComponentKey, AddDepRes)], [ComponentKey], [StyleDoc])
+  processMixin adrMap' consumerDeps mixin (instAcc, keyAcc, warnAcc) =
+    let depPkgName = mixinPackageName mixin
+    in  case lookupIndefiniteTask depPkgName adrMap' of
+      Just sigTask ->
+            let sigPkg = taskPackage sigTask
+            in
+            let -- Get signatures from the sig-pkg's main library.
+                ownSigs :: [ModuleName]
+                ownSigs = case sigPkg.library of
+                  Just lib -> lib.signatures
+                  Nothing  -> []
+                -- Collect inherited signatures from transitive indefinite
+                -- deps.  When a sig-pkg depends on another indefinite package,
+                -- its holes propagate upward.  The CInst must fill ALL holes
+                -- (own + inherited) or Cabal reports "non-closing
+                -- substitution".
+                inheritedSigs :: [ModuleName]
+                inheritedSigs =
+                  -- Deduplicate: diamond deps can yield the same sig
+                  -- from multiple paths.
+                  nubOrd $ collectInheritedSigs sigPkg adrMap' Set.empty
+                -- Determine the module mapping from the mixin's requiresRn.
+                renaming = includeRequiresRn (mixinIncludeRenaming mixin)
+                -- Resolve the sig-pkg's own signatures using the consumer's
+                -- mixin renaming.  Module lookup is scoped to the consumer's
+                -- build-depends so that multiple instantiations with different
+                -- implementations don't conflict.
+                (ownEntries, ownWarns) =
+                  resolveAllEntries depPkgName renaming adrMap'
+                    consumerDeps ownSigs
+                -- Resolve inherited signatures using DefaultRenaming (the
+                -- consumer's mixin only renames the direct sig-pkg's
+                -- signatures, not inherited ones).
+                (inheritedEntries, inheritedWarns) =
+                  resolveAllEntries depPkgName DefaultRenaming adrMap'
+                    consumerDeps inheritedSigs
+                entries = ownEntries ++ inheritedEntries
+                resolveWarns = ownWarns ++ inheritedWarns
+            in  if null entries
+                  then (instAcc, keyAcc, resolveWarns ++ warnAcc)
+                  else
+                    let hashSuffix = instHashSuffix entries
+                        instCk = ComponentKey depPkgName (CInst hashSuffix)
+                        -- The CInst task's missing includes the sig-pkg's
+                        -- original missing plus implementing packages that
+                        -- are ADRToInstall.
+                        implPidsMissing = Set.fromList
+                          [ packageIdentifier (taskPackage implTask)
+                          | (_, implPkgName', _) <- entries
+                          , Just (ADRToInstall implTask) <-
+                              [Map.lookup implPkgName' adrMap']
+                          ]
+                        -- For ADRFound implementing packages, add their
+                        -- PID→GhcPkgId to the CInst task's present map so
+                        -- that mkInstantiateWithOpts can generate
+                        -- --instantiate-with flags.
+                        implPresent = Map.fromList
+                          [ ( toCabalMungedPackageId pid Nothing
+                            , gid
+                            )
+                          | (_, implPkgName', _) <- entries
+                          , Just (ADRFound _ (Library pid
+                              (InstalledLibraryInfo (Just gid) _))) <-
+                              [Map.lookup implPkgName' adrMap']
+                          ]
+                        instTask = sigTask
+                          { backpackInstEntries = entries
+                          , configOpts = sigTask.configOpts
+                              { missing =
+                                  sigTask.configOpts.missing <> implPidsMissing
+                              , instantiationDeps = []
+                              }
+                          , present =
+                              sigTask.present <> implPresent
+                          }
+                    in  ( (instCk, ADRToInstall instTask) : instAcc
+                        , instCk : keyAcc
+                        , resolveWarns ++ warnAcc
+                        )
+      Nothing ->
+        case Map.lookup depPkgName adrMap' of
+          Just ADRFound{} ->
+            -- Sig-pkg is installed and its source could not be resolved
+            -- (loadFoundIndefiniteTasks already tried). This typically means
+            -- a GHC boot library or a package missing from Hackage.
+            let w = fillSep
+                  [ flow "Backpack: mixin referencing"
+                  , style Current (fromPackageName depPkgName)
+                  , flow "is skipped because that package is installed and its"
+                  , flow "source could not be found for instantiation."
+                  , flow "Consider adding it as a local package in stack.yaml."
+                  ]
+            in  (instAcc, keyAcc, w : warnAcc)
+          _ -> (instAcc, keyAcc, warnAcc)
+
+  -- Collect signatures inherited from a package's transitive indefinite deps.
+  -- When pkg-A depends on indefinite pkg-B, pkg-B's signatures propagate up
+  -- as holes in pkg-A.  This recursively walks the dep graph, collecting
+  -- signatures from all reachable indefinite packages.
+  collectInheritedSigs ::
+       Package
+    -> Map PackageName AddDepRes
+    -> Set PackageName           -- ^ Already visited (cycle prevention)
+    -> [ModuleName]
+  collectInheritedSigs pkg adrMap' visited =
+    concatMap collectFromDep depNames
+   where
+    depNames :: [PackageName]
+    depNames = case pkg.library of
+      Just lib -> Map.keys lib.buildInfo.dependency
+      Nothing  -> []
+    collectFromDep :: PackageName -> [ModuleName]
+    collectFromDep depName
+      | depName `Set.member` visited = []
+      | otherwise =
+          case lookupIndefiniteTask depName adrMap' of
+            Just depTask ->
+              let depPkg = taskPackage depTask
+                  depSigs = case depPkg.library of
+                    Just lib -> lib.signatures
+                    Nothing  -> []
+                  transitive = collectInheritedSigs depPkg adrMap'
+                                 (Set.insert depName visited)
+              in  depSigs ++ transitive
+            Nothing -> []
+
+  lookupIndefiniteTask ::
+       PackageName
+    -> Map PackageName AddDepRes
+    -> Maybe Task
+  lookupIndefiniteTask depPkgName adrMap' =
+    case Map.lookup depPkgName adrMap' of
+      Just (ADRToInstall task)
+        | packageIsIndefinite (taskPackage task) -> Just task
+      Just ADRFound{} -> Map.lookup depPkgName foundIndefiniteTasks
+      _ -> Nothing
+
+  -- Resolve all signature entries for a mixin, collecting both successful
+  -- resolutions and warnings for signatures that could not be resolved.
+  resolveAllEntries ::
+       PackageName              -- ^ Sig-pkg name (for warning messages)
+    -> ModuleRenaming
+    -> Map PackageName AddDepRes
+    -> Set PackageName          -- ^ Consumer's build-depends (scope)
+    -> [ModuleName]             -- ^ Signatures to resolve
+    -> ([(ModuleName, PackageName, ModuleName)], [StyleDoc])
+  resolveAllEntries sigPkgName renaming adrMap' scope sigs =
+    case renaming of
+      HidingRenaming hiddenSigs ->
+        -- HidingRenaming: hide specified sigs from mixin linking.  Hidden
+        -- sigs remain as unfilled holes (the consumer becomes indefinite for
+        -- them).  Since Cabal requires a closing substitution, we can only
+        -- create a CInst when nothing is actually hidden — otherwise the
+        -- partial --instantiate-with would fail.
+        let visibleSigs = filter (`notElem` hiddenSigs) sigs
+        in  if length visibleSigs == length sigs
+              -- Nothing actually hidden: equivalent to DefaultRenaming.
+              then foldr (resolveOne sigPkgName DefaultRenaming adrMap' scope)
+                         ([], []) visibleSigs
+              -- Some sigs hidden: can't fully instantiate this copy.
+              else ([], [])
+      _ -> foldr (resolveOne sigPkgName renaming adrMap' scope) ([], []) sigs
+
+  -- Resolve a single signature entry, producing a warning if it fails.
+  resolveOne ::
+       PackageName              -- ^ Sig-pkg name (for warning messages)
+    -> ModuleRenaming
+    -> Map PackageName AddDepRes
+    -> Set PackageName          -- ^ Consumer's build-depends (scope)
+    -> ModuleName              -- ^ Signature module name
+    -> ([(ModuleName, PackageName, ModuleName)], [StyleDoc])
+    -> ([(ModuleName, PackageName, ModuleName)], [StyleDoc])
+  resolveOne sigPkgName renaming adrMap' scope sigName (entryAcc, warnAcc) =
+    case renaming of
+      DefaultRenaming ->
+        -- Identity mapping: sigName is filled by a module with the same name.
+        case findDepExposingModule sigName adrMap' scope of
+          Right implPkgName ->
+            ((sigName, implPkgName, sigName) : entryAcc, warnAcc)
+          Left w ->
+            (entryAcc, mkModuleWarn sigPkgName sigName w : warnAcc)
+      ModuleRenaming mappings ->
+        -- Explicit: look for (sigName, implModuleName) in the mapping.
+        case lookup sigName mappings of
+          Just implModName ->
+            case findDepExposingModule implModName adrMap' scope of
+              Right implPkgName ->
+                ((sigName, implPkgName, implModName) : entryAcc, warnAcc)
+              Left w ->
+                (entryAcc, mkModuleWarn sigPkgName implModName w : warnAcc)
+          Nothing ->
+            -- Signature not mentioned in the explicit mapping — this is
+            -- normal (the mixin doesn't remap this sig), skip silently.
+            (entryAcc, warnAcc)
+      HidingRenaming _ ->
+        -- Converted to DefaultRenaming in resolveAllEntries; should not
+        -- reach here.
+        (entryAcc, warnAcc)
+
+  -- Build a warning message for a failed module resolution.
+  mkModuleWarn :: PackageName -> ModuleName -> [PackageName] -> StyleDoc
+  mkModuleWarn sigPkgName modName candidates = fillSep $ case candidates of
+    [] ->
+      [ flow "Backpack: no dependency exposes module"
+      , style Current (fromString (CabalText.display modName))
+      , flow "needed to instantiate"
+      , style Current (fromPackageName sigPkgName) <> "."
+      , flow "Ensure the implementing package is listed in build-depends."
+      ]
+    _ ->
+      [ flow "Backpack: multiple dependencies expose module"
+      , style Current (fromString (CabalText.display modName))
+      , flow "needed to instantiate"
+      , style Current (fromPackageName sigPkgName) <> ":"
+      ]
+      ++ L.intersperse "," (map (style Current . fromPackageName) candidates)
+      ++ ["—", flow "cannot determine which to use. Skipping instantiation."]
+
+  -- Find which dep in the ADR map exposes a given module name. Only packages
+  -- that are in the consumer's build-depends (scope) are considered, so that
+  -- multiple consumers can instantiate the same sig-pkg with different
+  -- implementations without ambiguity.  Returns @Right pkgName@ on unique
+  -- match, or @Left candidates@ (empty = no match, multiple = ambiguous) on
+  -- failure.
+  --
+  -- Checks both ADRToInstall entries (via Package metadata) and ADRFound
+  -- entries (via the installed modules map from ghc-pkg dump). This allows
+  -- module resolution to work when the implementing package is already
+  -- installed (e.g., from a snapshot or a previous build).
+  findDepExposingModule ::
+       ModuleName
+    -> Map PackageName AddDepRes
+    -> Set PackageName          -- ^ Consumer's build-depends (scope)
+    -> Either [PackageName] PackageName
+  findDepExposingModule modName adrMap' scope =
+    let -- Check ADRToInstall entries (have full Package metadata).
+        fromTasks =
+          [ pn
+          | (pn, ADRToInstall t) <- Map.toList adrMap'
+          , pn `Set.member` scope
+          , let p = taskPackage t
+          , not (packageIsIndefinite p)
+          , exposesModule modName p
+          ]
+        -- Check ADRFound entries (use installed modules map from dump).
+        fromInstalled =
+          [ pn
+          | (pn, ADRFound _ _) <- Map.toList adrMap'
+          , pn `Set.member` scope
+          , case Map.lookup pn installedModules of
+              Just mods -> modName `Set.member` mods
+              Nothing -> False
+          ]
+        candidates = fromTasks ++ fromInstalled
+    in  case candidates of
+          [pn] -> Right pn
+          _    -> Left candidates
+
+  exposesModule :: ModuleName -> Package -> Bool
+  exposesModule modName p =
+    mainExposes || subLibExposes
+   where
+    mainExposes = case p.library of
+      Just lib -> modName `L.elem` (lib.exposedModules :: [ModuleName])
+      Nothing  -> False
+    subLibExposes = any
+      (\lib -> modName `L.elem` (lib.exposedModules :: [ModuleName]))
+      (toList p.subLibraries)
+
+  -- Produce a deterministic hash suffix from instantiation entries.
+  instHashSuffix :: [(ModuleName, PackageName, ModuleName)] -> Text
+  instHashSuffix entries =
+    let sorted = L.sort
+          [ CabalText.display sig ++ "=" ++ packageNameString implPkg
+              ++ ":" ++ CabalText.display implMod
+          | (sig, implPkg, implMod) <- entries
+          ]
+        input = encodeUtf8 $ T.pack $ L.intercalate "," sorted
+        digest = hashWith SHA256 input
+        -- Take first 16 hex chars for a short but unique-enough suffix.
+        hexStr = Mem.convertToBase Mem.Base16 digest :: ByteString
+    in  T.take 16 (decodeUtf8Lenient hexStr)
+
+-- Local helpers (duplicated from ConstructPlan to avoid import cycle)
+
+packageBuildTypeConfig :: Package -> Bool
+packageBuildTypeConfig pkg = pkg.buildType == Configure
+
+psLocal :: PackageSource -> Bool
+psLocal (PSFilePath _) = True
+psLocal PSRemote{}     = False
+
+psLocation :: PackageSource -> InstallLocation
+psLocation (PSFilePath _) = Local
+psLocation PSRemote{}     = Snap
+
+toCachePkgSrc :: PackageSource -> CachePkgSrc
+toCachePkgSrc (PSFilePath lp) =
+  CacheSrcLocal (toFilePath (parent lp.cabalFP))
+toCachePkgSrc PSRemote{} = CacheSrcUpstream
diff --git a/src/Stack/Build/Cache.hs b/src/Stack/Build/Cache.hs
index d24bbe8724..696a2e2ef9 100644
--- a/src/Stack/Build/Cache.hs
+++ b/src/Stack/Build/Cache.hs
@@ -1,153 +1,204 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE DataKinds             #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-
--- | Cache information about previous builds
-module Stack.Build.Cache
-    ( tryGetBuildCache
-    , tryGetConfigCache
-    , tryGetCabalMod
-    , tryGetSetupConfigMod
-    , tryGetPackageProjectRoot
-    , getInstalledExes
-    , tryGetFlagCache
-    , deleteCaches
-    , markExeInstalled
-    , markExeNotInstalled
-    , writeFlagCache
-    , writeBuildCache
-    , writeConfigCache
-    , writeCabalMod
-    , writeSetupConfigMod
-    , writePackageProjectRoot
-    , TestStatus (..)
-    , setTestStatus
-    , getTestStatus
-    , writePrecompiledCache
-    , readPrecompiledCache
-    -- Exported for testing
-    , BuildCache(..)
-    ) where
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
 
-import           Stack.Prelude
-import           Crypto.Hash (hashWith, SHA256(..))
-import qualified Data.ByteArray as Mem (convert)
-import           Data.ByteString.Builder (byteString)
+{-|
+Module      : Stack.Build.Cache
+Description : Cache information about previous builds.
+License     : BSD-3-Clause
+
+Cache information about previous builds.
+-}
+
+module Stack.Build.Cache
+  ( tryGetBuildCache
+  , tryGetConfigCache
+  , tryGetCabalMod
+  , tryGetSetupConfigMod
+  , tryGetPackageProjectRoot
+  , getInstalledExes
+  , tryGetFlagCache
+  , deleteCaches
+  , markExeInstalled
+  , markExeNotInstalled
+  , writeFlagCache
+  , writeBuildCache
+  , writeConfigCache
+  , writeCabalMod
+  , writeSetupConfigMod
+  , writePackageProjectRoot
+  , TestStatus (..)
+  , setTestStatus
+  , getTestStatus
+  , writePrecompiledCache
+  , readPrecompiledCache
+  -- Exported for testing
+  , BuildFileCache (..)
+  ) where
+
+import           Crypto.Hash ( hashWith, SHA256 (..) )
+import qualified Data.ByteArray as Mem ( convert )
+import           Data.ByteString.Builder ( byteString )
 import qualified Data.Map as M
 import qualified Data.Set as Set
-import qualified Data.Text as T
 import qualified Data.Yaml as Yaml
-import           Foreign.C.Types (CTime)
-import           Path
+import           Foreign.C.Types ( CTime )
+import           Path ( (</>), filename, parent, parseRelFile )
 import           Path.IO
-import           Stack.Constants
+                   ( ensureDir, ignoringAbsence, listDir, makeRelative
+                   , removeFile
+                   )
+import           Stack.Constants ( bindirSuffix, relDirInstalledPackages )
 import           Stack.Constants.Config
+                   ( buildCachesDir, configCabalMod, configPackageProjectRoot
+                   , configSetupConfigMod, testSuccessFile
+                   )
+import           Stack.Prelude
 import           Stack.Storage.Project
+                   ( ConfigCacheKey, configCacheKey, deactiveConfigCache
+                   , loadConfigCache, saveConfigCache
+                   )
 import           Stack.Storage.User
-import           Stack.Types.Build
+                   ( PrecompiledCacheKey, loadPrecompiledCache
+                   , precompiledCacheKey, savePrecompiledCache
+                   )
 import           Stack.Types.Cache
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
+                   ( BuildFileCache (..), ConfigCache, ConfigCacheType (..)
+                   , FileCache, PrecompiledCache (..)
+                   )
+import           Stack.Types.CompilerPaths ( cabalVersionL )
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName, unqualCompToString )
+import           Stack.Types.Config ( stackRootL )
+import           Stack.Types.ConfigureOpts
+                   ( BaseConfigOpts (..), ConfigureOpts (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
+                   , installationRootDeps, installationRootLocal
+                   , platformGhcRelDir
+                   )
+import           Stack.Types.GhcPkgId ( ghcPkgIdString )
+import           Stack.Types.Installed
+                   ( InstallLocation (..), Installed (..), foldOnGhcPkgId' )
 import           Stack.Types.NamedComponent
-import           Stack.Types.SourceMap (smRelDir)
-import           System.PosixCompat.Files (modificationTime, getFileStatus, setFileTimes)
-
--- | Directory containing files to mark an executable as installed
-exeInstalledDir :: (HasEnvConfig env)
-                => InstallLocation -> RIO env (Path Abs Dir)
-exeInstalledDir Snap = (</> relDirInstalledPackages) `liftM` installationRootDeps
-exeInstalledDir Local = (</> relDirInstalledPackages) `liftM` installationRootLocal
-
--- | Get all of the installed executables
-getInstalledExes :: (HasEnvConfig env)
-                 => InstallLocation -> RIO env [PackageIdentifier]
+                   ( NamedComponent (..), componentCachePath )
+import           Stack.Types.SourceMap ( smRelDir )
+import           System.PosixCompat.Files
+                   ( getFileStatus, modificationTime, setFileTimes )
+
+-- | Directory containing files to mark an executable as installed.
+exeInstalledDir ::
+     (HasEnvConfig env)
+  => InstallLocation
+  -> RIO env (Path Abs Dir)
+exeInstalledDir Snap = (</> relDirInstalledPackages) <$> installationRootDeps
+exeInstalledDir Local = (</> relDirInstalledPackages) <$> installationRootLocal
+
+-- | Get all of the installed executables.
+getInstalledExes ::
+     (HasEnvConfig env)
+  => InstallLocation
+  -> RIO env [PackageIdentifier]
 getInstalledExes loc = do
-    dir <- exeInstalledDir loc
-    (_, files) <- liftIO $ handleIO (const $ pure ([], [])) $ listDir dir
-    pure $
-        concat $
-        M.elems $
-        -- If there are multiple install records (from a Stack version
-        -- before https://github.com/commercialhaskell/stack/issues/2373
-        -- was fixed), then we don't know which is correct - ignore them.
-        M.fromListWith (\_ _ -> []) $
-        map (\x -> (pkgName x, [x])) $
-        mapMaybe (parsePackageIdentifier . toFilePath . filename) files
-
--- | Mark the given executable as installed
-markExeInstalled :: (HasEnvConfig env)
-                 => InstallLocation -> PackageIdentifier -> RIO env ()
+  dir <- exeInstalledDir loc
+  (_, files) <- liftIO $ handleIO (const $ pure ([], [])) $ listDir dir
+  pure $
+    concat $
+    M.elems $
+    -- If there are multiple install records (from a Stack version before
+    -- https://github.com/commercialhaskell/stack/issues/2373 was fixed), then
+    -- we don't know which is correct - ignore them.
+    M.fromListWith (\_ _ -> []) $
+    map (\x -> (pkgName x, [x])) $
+    mapMaybe (parsePackageIdentifier . toFilePath . filename) files
+
+-- | Mark the given executable as installed.
+markExeInstalled ::
+     (HasEnvConfig env)
+  => InstallLocation
+  -> PackageIdentifier
+  -> RIO env ()
 markExeInstalled loc ident = do
-    dir <- exeInstalledDir loc
-    ensureDir dir
-    ident' <- parseRelFile $ packageIdentifierString ident
-    let fp = dir </> ident'
-    -- Remove old install records for this package.
-    -- TODO: This is a bit in-efficient. Put all this metadata into one file?
-    installed <- getInstalledExes loc
-    forM_ (filter (\x -> pkgName ident == pkgName x) installed)
-          (markExeNotInstalled loc)
-    -- TODO consideration for the future: list all of the executables
-    -- installed, and invalidate this file in getInstalledExes if they no
-    -- longer exist
-    writeBinaryFileAtomic fp "Installed"
-
--- | Mark the given executable as not installed
-markExeNotInstalled :: (HasEnvConfig env)
-                    => InstallLocation -> PackageIdentifier -> RIO env ()
+  dir <- exeInstalledDir loc
+  ensureDir dir
+  ident' <- parseRelFile $ packageIdentifierString ident
+  let fp = dir </> ident'
+  -- Remove old install records for this package.
+  -- TODO: This is a bit in-efficient. Put all this metadata into one file?
+  installed <- getInstalledExes loc
+  forM_ (filter (\x -> pkgName ident == pkgName x) installed)
+        (markExeNotInstalled loc)
+  -- TODO consideration for the future: list all of the executables installed,
+  -- and invalidate this file in getInstalledExes if they no longer exist
+  writeBinaryFileAtomic fp "Installed"
+
+-- | Mark the given executable as not installed.
+markExeNotInstalled ::
+     (HasEnvConfig env)
+  => InstallLocation
+  -> PackageIdentifier
+  -> RIO env ()
 markExeNotInstalled loc ident = do
-    dir <- exeInstalledDir loc
-    ident' <- parseRelFile $ packageIdentifierString ident
-    liftIO $ ignoringAbsence (removeFile $ dir </> ident')
-
-buildCacheFile :: (HasEnvConfig env, MonadReader env m, MonadThrow m)
-               => Path Abs Dir
-               -> NamedComponent
-               -> m (Path Abs File)
+  dir <- exeInstalledDir loc
+  ident' <- parseRelFile $ packageIdentifierString ident
+  liftIO $ ignoringAbsence (removeFile $ dir </> ident')
+
+buildCacheFile ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> NamedComponent
+     -- ^ Package component.
+  -> m (Path Abs File)
 buildCacheFile dir component = do
-    cachesDir <- buildCachesDir dir
-    smh <- view $ envConfigL.to envConfigSourceMapHash
-    smDirName <- smRelDir smh
-    let nonLibComponent prefix name = prefix <> "-" <> T.unpack name
-    cacheFileName <- parseRelFile $ case component of
-        CLib -> "lib"
-        CInternalLib name -> nonLibComponent "internal-lib" name
-        CExe name -> nonLibComponent "exe" name
-        CTest name -> nonLibComponent "test" name
-        CBench name -> nonLibComponent "bench" name
-    pure $ cachesDir </> smDirName </> cacheFileName
+  cachesDir <- buildCachesDir dir
+  smh <- view $ envConfigL . to (.sourceMapHash)
+  smDirName <- smRelDir smh
+  cacheFileName <- parseRelFile $ componentCachePath component
+  pure $ cachesDir </> smDirName </> cacheFileName
 
 -- | Try to read the dirtiness cache for the given package directory.
-tryGetBuildCache :: HasEnvConfig env
-                 => Path Abs Dir
-                 -> NamedComponent
-                 -> RIO env (Maybe (Map FilePath FileCacheInfo))
+tryGetBuildCache ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> NamedComponent
+     -- ^ Package component.
+  -> RIO env (Maybe FileCache)
 tryGetBuildCache dir component = do
   fp <- buildCacheFile dir component
   ensureDir $ parent fp
-  either (const Nothing) (Just . buildCacheTimes) <$>
-    liftIO (tryAny (Yaml.decodeFileThrow (toFilePath fp)))
+  let decode :: MonadIO m => m BuildFileCache
+      decode = Yaml.decodeFileThrow (toFilePath fp)
+  either (const Nothing) (Just . (.fileCache)) <$> liftIO (tryAny decode)
 
--- | Try to read the dirtiness cache for the given package directory.
-tryGetConfigCache :: HasEnvConfig env
-                  => Path Abs Dir -> RIO env (Maybe ConfigCache)
+-- | Try to read the Cabal configuration cache for the given package directory.
+tryGetConfigCache ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> ConfigCacheType
+     -- ^ Type of cache.
+  -> RIO env (Maybe ConfigCache)
 tryGetConfigCache dir =
-    loadConfigCache $ configCacheKey dir ConfigCacheTypeConfig
+  loadConfigCache . configCacheKey dir
 
--- | Try to read the mod time of the Cabal file from the last build
-tryGetCabalMod :: HasEnvConfig env
-               => Path Abs Dir -> RIO env (Maybe CTime)
+-- | Try to read the modification time of the Cabal file from the last build.
+tryGetCabalMod ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> RIO env (Maybe CTime)
 tryGetCabalMod dir = do
   fp <- toFilePath <$> configCabalMod dir
   tryGetFileMod fp
 
--- | Try to read the mod time of setup-config file from the last build
-tryGetSetupConfigMod :: HasEnvConfig env
-               => Path Abs Dir -> RIO env (Maybe CTime)
+-- | Try to read the modification time of setup-config file from the last build.
+tryGetSetupConfigMod ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> RIO env (Maybe CTime)
 tryGetSetupConfigMod dir = do
   fp <- toFilePath <$> configSetupConfigMod dir
   tryGetFileMod fp
@@ -155,11 +206,13 @@ tryGetSetupConfigMod dir = do
 tryGetFileMod :: MonadIO m => FilePath -> m (Maybe CTime)
 tryGetFileMod fp =
   liftIO $ either (const Nothing) (Just . modificationTime) <$>
-      tryIO (getFileStatus fp)
+    tryIO (getFileStatus fp)
 
--- | Try to read the project root from the last build of a package
-tryGetPackageProjectRoot :: HasEnvConfig env
-               => Path Abs Dir -> RIO env (Maybe ByteString)
+-- | Try to read the project root from the last build of a package.
+tryGetPackageProjectRoot ::
+     HasEnvConfig env
+  => Path Abs Dir
+  -> RIO env (Maybe ByteString)
 tryGetPackageProjectRoot dir = do
   fp <- toFilePath <$> configPackageProjectRoot dir
   tryReadFileBinary fp
@@ -167,135 +220,159 @@ tryGetPackageProjectRoot dir = do
 tryReadFileBinary :: MonadIO m => FilePath -> m (Maybe ByteString)
 tryReadFileBinary fp =
   liftIO $ either (const Nothing) Just <$>
-      tryIO (readFileBinary fp)
+    tryIO (readFileBinary fp)
 
 -- | Write the dirtiness cache for this package's files.
-writeBuildCache :: HasEnvConfig env
-                => Path Abs Dir
-                -> NamedComponent
-                -> Map FilePath FileCacheInfo -> RIO env ()
-writeBuildCache dir component times = do
-    fp <- toFilePath <$> buildCacheFile dir component
-    liftIO $ Yaml.encodeFile fp BuildCache
-        { buildCacheTimes = times
-        }
-
--- | Write the dirtiness cache for this package's configuration.
-writeConfigCache :: HasEnvConfig env
-                => Path Abs Dir
-                -> ConfigCache
-                -> RIO env ()
-writeConfigCache dir =
-    saveConfigCache (configCacheKey dir ConfigCacheTypeConfig)
+writeBuildCache ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> NamedComponent
+     -- ^ Package component.
+  -> FileCache
+     -- ^ File cache.
+  -> RIO env ()
+writeBuildCache dir component fileCache = do
+  fp <- toFilePath <$> buildCacheFile dir component
+  liftIO $ Yaml.encodeFile fp BuildFileCache { fileCache }
+
+-- | Write the given Cabal configuration cache for the given package directory.
+writeConfigCache ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> ConfigCacheType
+     -- ^ Type of cache.
+  -> ConfigCache
+     -- ^ Cabal configuration cache.
+  -> RIO env ()
+writeConfigCache dir cacheType =
+  saveConfigCache (configCacheKey dir cacheType)
 
 -- | See 'tryGetCabalMod'
-writeCabalMod :: HasEnvConfig env
-              => Path Abs Dir
-              -> CTime
-              -> RIO env ()
+writeCabalMod ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> CTime
+  -> RIO env ()
 writeCabalMod dir x = do
-    fp <- configCabalMod dir
-    writeBinaryFileAtomic fp "Just used for its modification time"
-    liftIO $ setFileTimes (toFilePath fp) x x
+  fp <- configCabalMod dir
+  writeBinaryFileAtomic fp "Just used for its modification time"
+  liftIO $ setFileTimes (toFilePath fp) x x
 
 -- | See 'tryGetSetupConfigMod'
-writeSetupConfigMod
-  :: HasEnvConfig env
+writeSetupConfigMod ::
+     HasEnvConfig env
   => Path Abs Dir
   -> Maybe CTime
   -> RIO env ()
 writeSetupConfigMod dir Nothing = do
-    fp <- configSetupConfigMod dir
-    ignoringAbsence $ removeFile fp
+  fp <- configSetupConfigMod dir
+  ignoringAbsence $ removeFile fp
 writeSetupConfigMod dir (Just x) = do
-    fp <- configSetupConfigMod dir
-    writeBinaryFileAtomic fp "Just used for its modification time"
-    liftIO $ setFileTimes (toFilePath fp) x x
+  fp <- configSetupConfigMod dir
+  writeBinaryFileAtomic fp "Just used for its modification time"
+  liftIO $ setFileTimes (toFilePath fp) x x
 
--- | See 'tryGetPackageProjectRoot'
-writePackageProjectRoot
-  :: HasEnvConfig env
+-- | See 'tryGetPackageProjectRoot'.
+writePackageProjectRoot ::
+     HasEnvConfig env
   => Path Abs Dir
   -> ByteString
   -> RIO env ()
 writePackageProjectRoot dir projectRoot = do
-    fp <- configPackageProjectRoot dir
-    writeBinaryFileAtomic fp (byteString projectRoot)
-
--- | Delete the caches for the project.
-deleteCaches :: HasEnvConfig env => Path Abs Dir -> RIO env ()
-deleteCaches dir
-    {- FIXME confirm that this is acceptable to remove
-    bfp <- buildCacheFile dir
-    removeFileIfExists bfp
-    -}
- = deactiveConfigCache $ configCacheKey dir ConfigCacheTypeConfig
+  fp <- configPackageProjectRoot dir
+  writeBinaryFileAtomic fp (byteString projectRoot)
 
+-- | Delete the Cabal configuration cache for the given package directory.
+deleteCaches ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> ConfigCacheType
+     -- ^ Type of cache.
+  -> RIO env ()
+deleteCaches dir cacheType =
+  {- FIXME confirm that this is acceptable to remove
+  bfp <- buildCacheFile dir
+  removeFileIfExists bfp
+  -}
+  deactiveConfigCache $ configCacheKey dir cacheType
+
+-- | For the given installed item, yields the key used to retrieve a record from
+-- the library Cabal flag cache or executable Cabal flag cache.
 flagCacheKey :: (HasEnvConfig env) => Installed -> RIO env ConfigCacheKey
 flagCacheKey installed = do
-    installationRoot <- installationRootLocal
-    case installed of
-        Library _ gid _ ->
-            pure $
-            configCacheKey installationRoot (ConfigCacheTypeFlagLibrary gid)
-        Executable ident ->
-            pure $
-            configCacheKey
-                installationRoot
-                (ConfigCacheTypeFlagExecutable ident)
-
--- | Loads the flag cache for the given installed extra-deps
-tryGetFlagCache :: HasEnvConfig env
-                => Installed
-                -> RIO env (Maybe ConfigCache)
+  installationRoot <- installationRootLocal
+  pure $ configCacheKey installationRoot $ case installed of
+    Library ident _ -> ConfigCacheTypeFlagLibrary ident
+    Executable ident -> ConfigCacheTypeFlagExecutable ident
+
+-- | Loads the Cabal flag cache for the given installed extra-deps.
+tryGetFlagCache ::
+     HasEnvConfig env
+  => Installed
+  -> RIO env (Maybe ConfigCache)
 tryGetFlagCache gid = do
-    key <- flagCacheKey gid
-    loadConfigCache key
-
-writeFlagCache :: HasEnvConfig env
-               => Installed
-               -> ConfigCache
-               -> RIO env ()
+  key <- flagCacheKey gid
+  loadConfigCache key
+
+-- | Write the Cabal flag cache for the given installed extra-deps.
+writeFlagCache ::
+     HasEnvConfig env
+  => Installed
+  -> ConfigCache
+  -> RIO env ()
 writeFlagCache gid cache = do
-    key <- flagCacheKey gid
-    saveConfigCache key cache
+  key <- flagCacheKey gid
+  saveConfigCache key cache
 
 successBS, failureBS, unknownBS :: IsString s => s
 successBS = "success"
 failureBS = "failure"
 unknownBS = "unknown"
 
--- | Status of a test suite
-data TestStatus = TSSuccess | TSFailure | TSUnknown
-
--- | Mark test suite status
-setTestStatus :: HasEnvConfig env
-              => Path Abs Dir
-              -> TestStatus
-              -> RIO env ()
+-- | Status of test suite(s).
+data TestStatus
+  = TSSuccess
+    -- ^ The test suite(s) succeeded.
+  | TSFailure
+    -- ^ One or more test suites failed.
+  | TSUnknown
+    -- ^ The outcome of the test suite(s) is unknown.
+
+-- | Mark test suite status.
+setTestStatus ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> TestStatus
+     -- ^ The status of the test suite(s).
+  -> RIO env ()
 setTestStatus dir status = do
-    fp <- testSuccessFile dir
-    writeBinaryFileAtomic fp $
-      case status of
-        TSSuccess -> successBS
-        TSFailure -> failureBS
-        TSUnknown -> unknownBS
-
--- | Check if the test suite already passed
-getTestStatus :: HasEnvConfig env
-              => Path Abs Dir
-              -> RIO env TestStatus
+  fp <- testSuccessFile dir
+  writeBinaryFileAtomic fp $
+    case status of
+      TSSuccess -> successBS
+      TSFailure -> failureBS
+      TSUnknown -> unknownBS
+
+-- | Check if the test suite(s) already passed.
+getTestStatus ::
+     HasEnvConfig env
+  => Path Abs Dir
+     -- ^ Package directory.
+  -> RIO env TestStatus
 getTestStatus dir = do
   fp <- testSuccessFile dir
-  -- we could ensure the file is the right size first,
-  -- but we're not expected an attack from the user's filesystem
-  eres <- tryIO (readFileBinary $ toFilePath fp)
-  pure $
-    case eres of
-      Right bs
-        | bs == successBS -> TSSuccess
-        | bs == failureBS -> TSFailure
-      _ -> TSUnknown
+  -- we could ensure the file is the right size first, but we're not expected an
+  -- attack from the user's filesystem
+  tryIO (readFileBinary $ toFilePath fp) <&> \case
+    Right bs
+      | bs == successBS -> TSSuccess
+      | bs == failureBS -> TSFailure
+    _ -> TSUnknown
 
 --------------------------------------
 -- Precompiled Cache
@@ -311,96 +388,107 @@ getTestStatus dir = do
 --
 -- We only pay attention to non-directory options. We don't want to avoid a
 -- cache hit just because it was installed in a different directory.
-getPrecompiledCacheKey :: HasEnvConfig env
-                    => PackageLocationImmutable
-                    -> ConfigureOpts
-                    -> Bool -- ^ build haddocks
-                    -> Set GhcPkgId -- ^ dependencies
-                    -> RIO env PrecompiledCacheKey
-getPrecompiledCacheKey loc copts buildHaddocks installedPackageIDs = do
+getPrecompiledCacheKey ::
+     HasEnvConfig env
+  => PackageLocationImmutable
+  -> ConfigureOpts
+  -> Bool -- ^ build haddocks
+  -> RIO env PrecompiledCacheKey
+getPrecompiledCacheKey loc configureOpts buildHaddocks = do
   compiler <- view actualCompilerVersionL
   cabalVersion <- view cabalVersionL
 
-  -- The goal here is to come up with a string representing the
-  -- package location which is unique. Luckily @TreeKey@s are exactly
-  -- that!
+  -- The goal here is to come up with a string representing the package location
+  -- which is unique. Luckily @TreeKey@s are exactly that!
   treeKey <- getPackageLocationTreeKey loc
   let packageKey = utf8BuilderToText $ display treeKey
 
   platformGhcDir <- platformGhcRelDir
 
   -- In Cabal versions 1.22 and later, the configure options contain the
-  -- installed package IDs, which is what we need for a unique hash.
-  -- Unfortunately, earlier Cabals don't have the information, so we must
-  -- supplement it with the installed package IDs directly.
-  -- See issue: https://github.com/commercialhaskell/stack/issues/1103
-  let input = (coNoDirs copts, installedPackageIDs)
-      optionsHash = Mem.convert $ hashWith SHA256 $ encodeUtf8 $ tshow input
+  -- installed package IDs, which is what we need for a unique hash. See also
+  -- issue: https://github.com/commercialhaskell/stack/issues/1103
+  let optionsToHash = configureOpts.nonPathRelated
+      optionsHash =
+        Mem.convert $ hashWith SHA256 $ encodeUtf8 $ tshow optionsToHash
 
-  pure $ precompiledCacheKey platformGhcDir compiler cabalVersion packageKey optionsHash buildHaddocks
+  pure $ precompiledCacheKey
+    platformGhcDir compiler cabalVersion packageKey optionsHash buildHaddocks
 
 -- | Write out information about a newly built package
-writePrecompiledCache :: HasEnvConfig env
-                      => BaseConfigOpts
-                      -> PackageLocationImmutable
-                      -> ConfigureOpts
-                      -> Bool -- ^ build haddocks
-                      -> Set GhcPkgId -- ^ dependencies
-                      -> Installed -- ^ library
-                      -> [GhcPkgId] -- ^ sublibraries, in the GhcPkgId format
-                      -> Set Text -- ^ executables
-                      -> RIO env ()
-writePrecompiledCache baseConfigOpts loc copts buildHaddocks depIDs mghcPkgId sublibs exes = do
-  key <- getPrecompiledCacheKey loc copts buildHaddocks depIDs
-  ec <- view envConfigL
-  let stackRootRelative = makeRelative (view stackRootL ec)
-  mlibpath <- case mghcPkgId of
-    Executable _ -> pure Nothing
-    Library _ ipid _ -> Just <$> pathFromPkgId stackRootRelative ipid
-  sublibpaths <- mapM (pathFromPkgId stackRootRelative) sublibs
-  exes' <- forM (Set.toList exes) $ \exe -> do
-      name <- parseRelFile $ T.unpack exe
-      stackRootRelative $ bcoSnapInstallRoot baseConfigOpts </> bindirSuffix </> name
-  let precompiled = PrecompiledCache
-        { pcLibrary = mlibpath
-        , pcSubLibs = sublibpaths
-        , pcExes = exes'
-        }
-  savePrecompiledCache key precompiled
-  -- reuse precompiled cache with haddocks also in case when haddocks are not required
-  when buildHaddocks $ do
-    key' <- getPrecompiledCacheKey loc copts False depIDs
-    savePrecompiledCache key' precompiled
-  where
-    pathFromPkgId stackRootRelative ipid = do
-      ipid' <- parseRelFile $ ghcPkgIdString ipid ++ ".conf"
-      stackRootRelative $ bcoSnapDB baseConfigOpts </> ipid'
-
--- | Check the cache for a precompiled package matching the given
--- configuration.
-readPrecompiledCache :: forall env. HasEnvConfig env
-                     => PackageLocationImmutable -- ^ target package
-                     -> ConfigureOpts
-                     -> Bool -- ^ build haddocks
-                     -> Set GhcPkgId -- ^ dependencies
-                     -> RIO env (Maybe (PrecompiledCache Abs))
-readPrecompiledCache loc copts buildHaddocks depIDs = do
-    key <- getPrecompiledCacheKey loc copts buildHaddocks depIDs
-    mcache <- loadPrecompiledCache key
-    maybe (pure Nothing) (fmap Just . mkAbs) mcache
-  where
-    -- Since commit ed9ccc08f327bad68dd2d09a1851ce0d055c0422,
-    -- pcLibrary paths are stored as relative to the Stack
-    -- root. Therefore, we need to prepend the Stack root when
-    -- checking that the file exists. For the older cached paths, the
-    -- file will contain an absolute path, which will make `stackRoot
-    -- </>` a no-op.
-    mkAbs :: PrecompiledCache Rel -> RIO env (PrecompiledCache Abs)
-    mkAbs pc0 = do
-      stackRoot <- view stackRootL
-      let mkAbs' = (stackRoot </>)
-      pure PrecompiledCache
-        { pcLibrary = mkAbs' <$> pcLibrary pc0
-        , pcSubLibs = mkAbs' <$> pcSubLibs pc0
-        , pcExes = mkAbs' <$> pcExes pc0
-        }
+writePrecompiledCache ::
+     HasEnvConfig env
+  => BaseConfigOpts
+  -> PackageLocationImmutable
+  -> ConfigureOpts
+  -> Bool -- ^ build haddocks
+  -> Installed -- ^ library
+  -> Set StackUnqualCompName -- ^ executables
+  -> RIO env ()
+writePrecompiledCache
+    baseConfigOpts
+    loc
+    copts
+    buildHaddocks
+    mghcPkgId
+    exes
+  = do
+      key <- getPrecompiledCacheKey loc copts buildHaddocks
+      ec <- view envConfigL
+      let stackRootRelative = makeRelative (view stackRootL ec)
+      exes' <- forM (Set.toList exes) $ \exe -> do
+        name <- parseRelFile $ unqualCompToString exe
+        stackRootRelative $
+           baseConfigOpts.snapInstallRoot </> bindirSuffix </> name
+      let installedLibToPath libName ghcPkgId pcAction = do
+            libPath <- pathFromPkgId stackRootRelative ghcPkgId
+            pc <- pcAction
+            pure $ case libName of
+              Nothing -> pc { library = Just libPath }
+              _ -> pc { subLibs = libPath : pc.subLibs }
+      precompiled <- foldOnGhcPkgId'
+        installedLibToPath
+        mghcPkgId
+        ( pure PrecompiledCache
+            { library = Nothing
+            , subLibs = []
+            , exes = exes'
+            }
+        )
+      savePrecompiledCache key precompiled
+      -- reuse precompiled cache with haddocks also in case when haddocks are
+      -- not required
+      when buildHaddocks $ do
+        key' <- getPrecompiledCacheKey loc copts False
+        savePrecompiledCache key' precompiled
+ where
+  pathFromPkgId stackRootRelative ipid = do
+    ipid' <- parseRelFile $ ghcPkgIdString ipid ++ ".conf"
+    stackRootRelative $ baseConfigOpts.snapDB </> ipid'
+
+-- | Check the cache for a precompiled package matching the given configuration.
+readPrecompiledCache ::
+     forall env. HasEnvConfig env
+  => PackageLocationImmutable -- ^ target package
+  -> ConfigureOpts
+  -> Bool -- ^ build haddocks
+  -> RIO env (Maybe (PrecompiledCache Abs))
+readPrecompiledCache loc copts buildHaddocks = do
+  key <- getPrecompiledCacheKey loc copts buildHaddocks
+  mcache <- loadPrecompiledCache key
+  maybe (pure Nothing) (fmap Just . mkAbs) mcache
+ where
+  -- Since commit ed9ccc08f327bad68dd2d09a1851ce0d055c0422, pcLibrary paths are
+  -- stored as relative to the Stack root. Therefore, we need to prepend the
+  -- Stack root when checking that the file exists. For the older cached paths,
+  -- the file will contain an absolute path, which will make `stackRoot </>`
+  -- a no-op.
+  mkAbs :: PrecompiledCache Rel -> RIO env (PrecompiledCache Abs)
+  mkAbs pc0 = do
+    stackRoot <- view stackRootL
+    let mkAbs' = (stackRoot </>)
+    pure PrecompiledCache
+      { library = mkAbs' <$> pc0.library
+      , subLibs = mkAbs' <$> pc0.subLibs
+      , exes = mkAbs' <$> pc0.exes
+      }
diff --git a/src/Stack/Build/ConstructPlan.hs b/src/Stack/Build/ConstructPlan.hs
index bcfbe59afc..4cf4669213 100644
--- a/src/Stack/Build/ConstructPlan.hs
+++ b/src/Stack/Build/ConstructPlan.hs
@@ -1,917 +1,1331 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE DeriveDataTypeable    #-}
-{-# LANGUAGE DeriveGeneric         #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 {-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-{-# LANGUAGE TupleSections         #-}
 {-# LANGUAGE ViewPatterns          #-}
 
--- | Construct a @Plan@ for how to build
+{-|
+Module      : Stack.Build.ConstructPlan
+Description : Construct a @Plan@ for how to build.
+License     : BSD-3-Clause
+
+Construct a @Plan@ for how to build.
+-}
+
 module Stack.Build.ConstructPlan
-    ( constructPlan
-    ) where
-
-import           Stack.Prelude hiding (Display (..), loadPackage)
-import           Control.Monad.RWS.Strict hiding ((<>))
-import           Control.Monad.State.Strict (execState)
-import qualified Data.List as L
-import qualified Data.Map.Strict as M
+  ( constructPlan
+  -- * Exported for testing
+  , shouldSplitComponents
+  ) where
+
+import           Control.Monad.Trans.Maybe ( MaybeT (..) )
+import qualified Data.Map.Merge.Strict as Map
 import qualified Data.Map.Strict as Map
-import           Data.Monoid.Map (MonoidMap(..))
+import           Data.Monoid.Map ( MonoidMap(..) )
 import qualified Data.Set as Set
 import qualified Data.Text as T
-import qualified Distribution.Text as Cabal
-import qualified Distribution.Version as Cabal
-import           Distribution.Types.BuildType (BuildType (Configure))
-import           Distribution.Types.PackageName (mkPackageName)
-import           Distribution.Version (mkVersion)
-import           Generics.Deriving.Monoid (memptydefault, mappenddefault)
-import           Path (parent)
-import qualified RIO
-import           Stack.Build.Cache
-import           Stack.Build.Haddock
-import           Stack.Build.Installed
-import           Stack.Build.Source
-import           Stack.Constants
+import           Distribution.Types.BuildType ( BuildType (Configure, Simple) )
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Version ( mkVersion )
+import           Path ( parent )
+import qualified RIO.NonEmpty as NE
+import           RIO.Process ( findExecutable )
+import           RIO.State
+                   ( State, StateT (..), execState, get, modify, modify', put )
+import           RIO.Writer ( WriterT (..), pass, tell )
+import           Stack.Build.Backpack
+                   ( addInstantiationTasks, loadFoundIndefiniteTasks )
+import           Stack.Build.Cache ( tryGetFlagCache )
+import           Stack.Build.Haddock ( shouldHaddockDeps )
+import           Stack.Build.Source ( loadLocalPackage )
+import           Stack.ConfigureOpts
+                   ( configureOptsFromBase, packageConfigureOptsFromPackage
+                   , renderConfigureOpts
+                   )
+import           Stack.Constants ( compilerOptionsCabalFlag )
 import           Stack.Package
-import           Stack.PackageDump
-import           Stack.SourceMap
-import           Stack.Types.Build
-import           Stack.Types.Compiler
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
+                   ( applyForceCustomBuild, buildableExes
+                   , buildableForeignLibs, buildableSubLibs
+                   , hasBuildableMainLibrary, hasIntraPackageDeps
+                   , packageUnknownTools, packageUsesBackpack
+                   , processPackageDepsEither
+                   )
+import           Stack.Prelude hiding ( loadPackage )
+import           Stack.SourceMap ( getPLIVersion, mkProjectPackage )
+import           Stack.Types.Build.ConstructPlan
+                   ( AddDepRes (..), CombinedMap, Ctx (..), LibraryMap, M
+                   , MissingPresentDeps (..), PackageInfo (..), PackageLoader
+                   , ToolWarning(..), UnregisterState (..), W (..)
+                   , adrHasLibrary, adrVersion, isAdrToInstall, processAdr
+                   , toTask
+                   )
+import           Stack.Types.Build.Exception
+                   ( BadDependency (..), BuildException (..)
+                   , BuildPrettyException (..), ConstructPlanException (..)
+                   )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..), configFileL )
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
+import           Stack.Types.BuildOptsCLI
+                   ( BuildOptsCLI (..), BuildSubset (..) )
+import           Stack.Types.Cache ( CachePkgSrc (..), ConfigCache (..) )
+import           Stack.Types.CompCollection ( collectionMember )
+import           Stack.Types.Compiler ( WhichCompiler (..), getGhcVersion )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), HasCompiler (..) )
+import           Stack.Types.ComponentUtils ( unqualCompFromText )
+import           Stack.Types.Config ( Config (..), HasConfig (..), stackRootL )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts (..) )
+import           Stack.Types.Curator ( Curator (..) )
+import           Stack.Types.Dependency ( DepValue (..), isDepTypeLibrary )
+import           Stack.Types.DumpPackage ( DumpPackage (..), sublibParentPkgId )
+import           Stack.Types.EnvConfig ( EnvConfig (..), HasEnvConfig (..) )
+import           Stack.Types.EnvSettings
+                   ( EnvSettings (..), minimalEnvSettings )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Installed
+                   ( InstallLocation (..), Installed (..)
+                   , InstalledMap
+                   , installedVersion
+                   )
+import           Stack.Types.IsMutable ( IsMutable (..) )
 import           Stack.Types.NamedComponent
+                   ( NamedComponent (..), exeComponents, isCBench, isCTest
+                   , renderComponent
+                   )
 import           Stack.Types.Package
+                   ( ExeName (..), LocalPackage (..), Package (..)
+                   , PackageSource (..), packageIdentifier, psVersion
+                   , runMemoizedWith
+                   )
+import           Stack.Types.Plan
+                   ( ComponentKey (..), Plan (..), Task (..)
+                   , TaskConfigOpts (..), TaskType (..), componentKeyPkgName
+                   , fromComponentKey, installLocationIsMutable, taskIsTarget
+                   , taskLocation, taskProvides
+                   )
+import           Stack.Types.ProjectConfig ( isPCGlobalProject )
+import           Stack.Types.Runner ( HasRunner (..), globalOptsL )
 import           Stack.Types.SourceMap
+                   ( CommonPackage (..), DepPackage (..), FromSnapshot (..)
+                   , GlobalPackage (..), SMTargets (..), SourceMap (..)
+                   )
 import           Stack.Types.Version
-import           System.Environment (lookupEnv)
-import           System.IO (putStrLn)
-import           RIO.PrettyPrint
-import           RIO.Process (findExecutable, HasProcessContext (..))
-
-data PackageInfo
-    =
-      -- | This indicates that the package is already installed, and
-      -- that we shouldn't build it from source. This is only the case
-      -- for global packages.
-      PIOnlyInstalled InstallLocation Installed
-      -- | This indicates that the package isn't installed, and we know
-      -- where to find its source.
-    | PIOnlySource PackageSource
-      -- | This indicates that the package is installed and we know
-      -- where to find its source. We may want to reinstall from source.
-    | PIBoth PackageSource Installed
-    deriving (Show)
-
-combineSourceInstalled :: PackageSource
-                       -> (InstallLocation, Installed)
-                       -> PackageInfo
-combineSourceInstalled ps (location, installed) =
-    assert (psVersion ps == installedVersion installed) $
-    case location of
-        -- Always trust something in the snapshot
-        Snap -> PIOnlyInstalled location installed
-        Local -> PIBoth ps installed
+                   ( VersionRange, latestApplicableVersion, versionRangeText
+                   , withinRange
+                   )
+import           System.Environment ( lookupEnv )
 
-type CombinedMap = Map PackageName PackageInfo
-
-combineMap :: Map PackageName PackageSource -> InstalledMap -> CombinedMap
-combineMap = Map.mergeWithKey
-    (\_ s i -> Just $ combineSourceInstalled s i)
-    (fmap PIOnlySource)
-    (fmap (uncurry PIOnlyInstalled))
-
-data AddDepRes
-    = ADRToInstall Task
-    | ADRFound InstallLocation Installed
-    deriving Show
-
-type ParentMap = MonoidMap PackageName (First Version, [(PackageIdentifier, VersionRange)])
-
-data W = W
-    { wFinals :: !(Map PackageName (Either ConstructPlanException Task))
-    , wInstall :: !(Map Text InstallLocation)
-    -- ^ executable to be installed, and location where the binary is placed
-    , wDirty :: !(Map PackageName Text)
-    -- ^ why a local package is considered dirty
-    , wWarnings :: !([Text] -> [Text])
-    -- ^ Warnings
-    , wParents :: !ParentMap
-    -- ^ Which packages a given package depends on, along with the package's version
-    } deriving Generic
-instance Semigroup W where
-    (<>) = mappenddefault
-instance Monoid W where
-    mempty = memptydefault
-    mappend = (<>)
-
-type M = RWST -- TODO replace with more efficient WS stack on top of StackT
-    Ctx
-    W
-    (Map PackageName (Either ConstructPlanException AddDepRes))
-    IO
-
-data Ctx = Ctx
-    { baseConfigOpts :: !BaseConfigOpts
-    , loadPackage    :: !(PackageLocationImmutable -> Map FlagName Bool -> [Text] -> [Text] -> M Package)
-    , combinedMap    :: !CombinedMap
-    , ctxEnvConfig   :: !EnvConfig
-    , callStack      :: ![PackageName]
-    , wanted         :: !(Set PackageName)
-    , localNames     :: !(Set PackageName)
-    , mcurator       :: !(Maybe Curator)
-    , pathEnvVar     :: !Text
-    }
-
-instance HasPlatform Ctx
-instance HasGHCVariant Ctx
-instance HasLogFunc Ctx where
-    logFuncL = configL.logFuncL
-instance HasRunner Ctx where
-    runnerL = configL.runnerL
-instance HasStylesUpdate Ctx where
-  stylesUpdateL = runnerL.stylesUpdateL
-instance HasTerm Ctx where
-  useColorL = runnerL.useColorL
-  termWidthL = runnerL.termWidthL
-instance HasConfig Ctx
-instance HasPantryConfig Ctx where
-    pantryConfigL = configL.pantryConfigL
-instance HasProcessContext Ctx where
-    processContextL = configL.processContextL
-instance HasBuildConfig Ctx
-instance HasSourceMap Ctx where
-    sourceMapL = envConfigL.sourceMapL
-instance HasCompiler Ctx where
-    compilerPathsL = envConfigL.compilerPathsL
-instance HasEnvConfig Ctx where
-    envConfigL = lens ctxEnvConfig (\x y -> x { ctxEnvConfig = y })
-
--- | Computes a build plan. This means figuring out which build 'Task's
--- to take, and the interdependencies among the build 'Task's. In
--- particular:
+-- | Computes a build plan. This means figuring out which build t'Task's to
+-- take, and the interdependencies among the build t'Task's. In particular:
 --
--- 1) It determines which packages need to be built, based on the
--- transitive deps of the current targets. For local packages, this is
--- indicated by the 'lpWanted' boolean. For extra packages to build,
--- this comes from the @extraToBuild0@ argument of type @Set
--- PackageName@. These are usually packages that have been specified on
--- the commandline.
+-- 1) It determines which packages need to be built, based on the transitive
+-- deps of the current targets. For project packages, this is indicated by the
+-- 'Stack.Types.Package.wanted' boolean. For extra packages to build, this comes
+-- from the @extraToBuild0@ argument of type @Set PackageName@. These are
+-- usually packages that have been specified on the command line.
 --
--- 2) It will only rebuild an upstream package if it isn't present in
--- the 'InstalledMap', or if some of its dependencies have changed.
+-- 2) It will only rebuild an upstream package if it isn't present in the
+-- 'InstalledMap', or if some of its dependencies have changed.
 --
--- 3) It will only rebuild a local package if its files are dirty or
--- some of its dependencies have changed.
-constructPlan :: forall env. HasEnvConfig env
-              => BaseConfigOpts
-              -> [DumpPackage] -- ^ locally registered
-              -> (PackageLocationImmutable -> Map FlagName Bool -> [Text] -> [Text] -> RIO EnvConfig Package) -- ^ load upstream package
-              -> SourceMap
-              -> InstalledMap
-              -> Bool
-              -> RIO env Plan
-constructPlan baseConfigOpts0 localDumpPkgs loadPackage0 sourceMap installedMap initialBuildSteps = do
+-- 3) It will only rebuild a local package if its files are dirty or some of its
+-- dependencies have changed.
+constructPlan ::
+     forall env. HasEnvConfig env
+  => BaseConfigOpts
+  -> [DumpPackage]
+     -- ^ Locally registered.
+  -> [DumpPackage]
+     -- ^ All dump packages (global + snapshot + local)
+  -> PackageLoader (RIO EnvConfig)
+     -- ^ Function to load a 'Package' given the location of a package assumed
+     -- to be immutable.
+  -> SourceMap
+  -> InstalledMap
+  -> Bool
+     -- ^ Only include initial build steps required for GHCi?
+  -> RIO env Plan
+constructPlan
+    baseConfigOpts0
+    localDumpPkgs
+    allDumpPkgs
+    loadPackage0
+    sourceMap
+    installedMap
+    initialBuildSteps
+  = do
     logDebug "Constructing the build plan"
 
-    when hasBaseInDeps $
-      prettyWarn $ flow "You are trying to upgrade/downgrade base, which is almost certainly not what you really want. Please, consider using another GHC version if you need a certain version of base, or removing base from extra-deps. See more at https://github.com/commercialhaskell/stack/issues/3940." <> line
+    config <- view configL
+    let ghcVersion = getGhcVersion sourceMap.compiler
+        isBaseWiredIn = ghcVersion < mkVersion [9,12]
+    when (hasBaseInDeps && (isBaseWiredIn || config.notifyIfBaseNotBoot)) $ do
+      let intro = fillSep
+            [ flow "Before GHC 9.12.1, the base package is a GHC wired-in \
+                   \one. For other GHC versions it is not. You are using"
+            , style Current $ "GHC " <> fromString (versionString ghcVersion)
+            , flow "and trying to replace its"
+            , style Current "base"
+            , flow "boot package."
+            ]
+          adviceInit = if isBaseWiredIn
+            then
+              [ flow "Almost certainly, that is not what you really want to \
+                     \do. Consider removing"
+              ]
+            else
+              [ flow "That may be not what you want to do. If not, consider \
+                     \removing"
+              ]
+          adviceRest =
+            [ style Current "base"
+            , flow "as an"
+            , style Shell "extra-deps" <> ","
+            , flow "or, if you need a particular version of"
+            , style Current "base" <> ","
+            , flow "consider using a different GHC version."
+            ]
+          adviceMute = fillSep
+            [ flow "To mute this message in future, set"
+            , style Shell (flow "notify-if-base-not-boot: false")
+            , flow "in Stack's configuration."
+            ]
+      prettyWarn $
+           intro
+        <> blankLine
+        <> fillSep (adviceInit <> adviceRest)
+        <> (if isBaseWiredIn then mempty else blankLine <> adviceMute)
+        <> line
 
     econfig <- view envConfigL
-    globalCabalVersion <- view $ compilerPathsL.to cpCabalVersion
+    globalCabalVersion <- view $ compilerPathsL . to (.cabalVersion)
     sources <- getSources globalCabalVersion
-    mcur <- view $ buildConfigL.to bcCurator
-
-    let onTarget = void . addDep
-    let inner = mapM_ onTarget $ Map.keys (smtTargets $ smTargets sourceMap)
-    pathEnvVar' <- liftIO $ maybe mempty T.pack <$> lookupEnv "PATH"
-    let ctx = mkCtx econfig globalCabalVersion sources mcur pathEnvVar'
-    ((), m, W efinals installExes dirtyReason warnings parents) <-
-        liftIO $ runRWST inner ctx M.empty
-    mapM_ (logWarn . RIO.display) (warnings [])
-    let toEither (_, Left e)  = Left e
-        toEither (k, Right v) = Right (k, v)
-        (errlibs, adrs) = partitionEithers $ map toEither $ M.toList m
-        (errfinals, finals) = partitionEithers $ map toEither $ M.toList efinals
+    curator <- view $ buildConfigL . to (.curator)
+    pathEnvVar <- liftIO $ maybe mempty T.pack <$> lookupEnv "PATH"
+    let ctx = mkCtx econfig globalCabalVersion sources curator pathEnvVar
+        targetPackageNames = Map.keys sourceMap.targets.targets
+        -- Ignore the result of 'getCachedDepOrAddDep'.
+        onTarget pkgName = do
+          logDebugPlanS "constructPlan" $
+               "Constructing for target "
+            <> fromPackageName pkgName
+          void $ getCachedDepOrAddDep pkgName
+        inner :: M ()
+        inner = mapM_ onTarget targetPackageNames
+        action :: RIO Ctx (((), W), LibraryMap)
+        action = runStateT (runWriterT inner) Map.empty
+    (((), output), libraryMap) <- liftIO $ runRIO ctx action
+    let W efinals installExes dirtyReason warnings parents = output
+    -- Report any warnings
+    mapM_ prettyWarn (warnings [])
+    -- Separate out errors
+    let (errlibs, adrs) =
+          partitionEithers $ map toEither $ Map.toList libraryMap
+        (errfinals, finals) =
+          partitionEithers $ map toEither $ Map.toList efinals
         errs = errlibs ++ errfinals
     if null errs
-        then do
-            let toTask (_, ADRFound _ _) = Nothing
-                toTask (name, ADRToInstall task) = Just (name, task)
-                tasks = M.fromList $ mapMaybe toTask adrs
-                takeSubset =
-                    case boptsCLIBuildSubset $ bcoBuildOptsCLI baseConfigOpts0 of
-                        BSAll -> pure
-                        BSOnlySnapshot -> pure . stripLocals
-                        BSOnlyDependencies -> pure . stripNonDeps (M.keysSet $ smDeps sourceMap)
-                        BSOnlyLocals -> errorOnSnapshot
-            takeSubset Plan
-                { planTasks = tasks
-                , planFinals = M.fromList finals
-                , planUnregisterLocal = mkUnregisterLocal tasks dirtyReason localDumpPkgs initialBuildSteps
-                , planInstallExes =
-                    if boptsInstallExes (bcoBuildOpts baseConfigOpts0) ||
-                       boptsInstallCompilerTool (bcoBuildOpts baseConfigOpts0)
-                        then installExes
-                        else Map.empty
-                }
-        else do
-            planDebug $ show errs
-            stackYaml <- view stackYamlL
-            stackRoot <- view stackRootL
-            prettyErrorNoIndent $
-                pprintExceptions errs stackYaml stackRoot parents (wanted ctx) prunedGlobalDeps
-            throwM $ ConstructPlanFailed "Plan construction failed."
-  where
-    hasBaseInDeps = Map.member (mkPackageName "base") (smDeps sourceMap)
-
-    mkCtx econfig globalCabalVersion sources mcur pathEnvVar' = Ctx
-        { baseConfigOpts = baseConfigOpts0
-        , loadPackage = \w x y z -> runRIO econfig $
-            applyForceCustomBuild globalCabalVersion <$> loadPackage0 w x y z
-        , combinedMap = combineMap sources installedMap
-        , ctxEnvConfig = econfig
-        , callStack = []
-        , wanted = Map.keysSet (smtTargets $ smTargets sourceMap)
-        , localNames = Map.keysSet (smProject sourceMap)
-        , mcurator = mcur
-        , pathEnvVar = pathEnvVar'
-        }
+      then do
+        -- Load source-backed templates for clean installed indefinite packages.
+        -- This lets addInstantiationTasks clone them for CInst tasks without
+        -- turning their ADRFound CLib entries into build tasks.
+        let loadPkg w x y z = applyForceCustomBuild globalCabalVersion
+                             <$> loadPackage0 w x y z
+            -- Build a module lookup map from installed packages (dump data).
+            -- Used by addInstantiationTasks to resolve modules from ADRFound
+            -- packages that don't have Package metadata.
+            installedModules = Map.fromListWith Set.union
+              [ (pkgName dp.packageIdent, dp.exposedModules)
+              | dp <- allDumpPkgs
+              , isNothing dp.sublib  -- Only main libraries
+              ]
+        foundIndefiniteTasks <- loadFoundIndefiniteTasks
+                   loadPkg econfig sources ctx.combinedMap ctx.baseConfigOpts adrs
+        let expandedAdrs = concatMap (uncurry expandToComponentKeys) adrs
+            (withInstantiations, bpWarnings) =
+              addInstantiationTasks
+                installedModules
+                foundIndefiniteTasks
+                adrs
+                expandedAdrs
+            tasks = Map.fromList $ mapMaybe
+              (toMaybe . second toTask)
+              withInstantiations
+        mapM_ prettyWarn bpWarnings
+        takeSubset Plan
+          { tasks = tasks
+          , finals = Map.fromList finals
+          , unregisterLocal =
+              mkUnregisterLocal tasks dirtyReason localDumpPkgs initialBuildSteps
+          , installExes =
+              if    baseConfigOpts0.buildOpts.installExes
+                 || baseConfigOpts0.buildOpts.installCompilerTool
+                then installExes
+                else Map.empty
+          }
+      else do
+        configFile <- view configFileL
+        stackRoot <- view stackRootL
+        isImplicitGlobal <-
+          view $ configL . to (isPCGlobalProject . (.project))
+        prettyThrowM $ ConstructPlanFailed
+          errs
+          configFile
+          stackRoot
+          isImplicitGlobal
+          parents
+          ctx.wanted
+          prunedGlobalDeps
+ where
+  sourceProject = sourceMap.project
+  sourceDeps = sourceMap.deps
+
+  hasBaseInDeps = Map.member (mkPackageName "base") sourceDeps
+
+  mkCtx ::
+       EnvConfig
+    -> Version
+    -> Map PackageName PackageSource
+    -> Maybe Curator
+    -> Text
+    -> Ctx
+  mkCtx ctxEnvConfig globalCabalVersion sources curator pathEnvVar =
+    let loadPackage loc flags ghcOptions cabalConfigOpts = do
+          let action = do
+                package <- loadPackage0 loc flags ghcOptions cabalConfigOpts
+                pure $ applyForceCustomBuild globalCabalVersion package
+          runRIO ctxEnvConfig action
+    in  Ctx
+          { baseConfigOpts = baseConfigOpts0
+          , loadPackage
+          , combinedMap = combineMap sources installedMap
+          , ctxEnvConfig
+          , callStack = []
+          , wanted = Map.keysSet sourceMap.targets.targets
+          , localNames = Map.keysSet sourceProject
+          , curator
+          , pathEnvVar
+          }
+
+  toEither :: (k, Either e v) -> Either e (k, v)
+  toEither (_, Left e)  = Left e
+  toEither (k, Right v) = Right (k, v)
+
+  toMaybe :: (k, Maybe v) -> Maybe (k, v)
+  toMaybe (_, Nothing) = Nothing
+  toMaybe (k, Just v) = Just (k, v)
+
+  takeSubset :: Plan -> RIO env Plan
+  takeSubset = case baseConfigOpts0.buildOptsCLI.buildSubset of
+    BSAll -> pure
+    BSOnlySnapshot -> stripLocals
+    BSOnlyDependencies -> stripNonDeps
+    BSOnlyLocals -> errorOnSnapshot
+
+  -- | Strip out anything from the 'Plan' intended for the local database.
+  stripLocals :: Plan -> RIO env Plan
+  stripLocals plan = pure plan
+    { tasks = Map.filter checkTask plan.tasks
+    , finals = Map.empty
+    , unregisterLocal = Map.empty
+    , installExes = Map.filter (/= Local) plan.installExes
+    }
+   where
+    checkTask task = taskLocation task == Snap
 
-    prunedGlobalDeps = flip Map.mapMaybe (smGlobal sourceMap) $ \gp ->
-      case gp of
-         ReplacedGlobalPackage deps ->
-           let pruned = filter (not . inSourceMap) deps
-           in if null pruned then Nothing else Just pruned
-         GlobalPackage _ -> Nothing
-
-    inSourceMap pname = pname `Map.member` smDeps sourceMap ||
-                        pname `Map.member` smProject sourceMap
-
-    getSources globalCabalVersion = do
-      let loadLocalPackage' pp = do
-            lp <- loadLocalPackage pp
-            pure lp { lpPackage = applyForceCustomBuild globalCabalVersion $ lpPackage lp }
-      pPackages <- for (smProject sourceMap) $ \pp -> do
-        lp <- loadLocalPackage' pp
-        pure $ PSFilePath lp
-      bopts <- view $ configL.to configBuild
-      deps <- for (smDeps sourceMap) $ \dp ->
-        case dpLocation dp of
-          PLImmutable loc ->
-            pure $ PSRemote loc (getPLIVersion loc) (dpFromSnapshot dp) (dpCommon dp)
-          PLMutable dir -> do
-            pp <- mkProjectPackage YesPrintWarnings dir (shouldHaddockDeps bopts)
-            lp <- loadLocalPackage' pp
-            pure $ PSFilePath lp
-      pure $ pPackages <> deps
-
--- | Throw an exception if there are any snapshot packages in the plan.
-errorOnSnapshot :: Plan -> RIO env Plan
-errorOnSnapshot plan@(Plan tasks _finals _unregister installExes) = do
-  let snapTasks = Map.keys $ Map.filter (\t -> taskLocation t == Snap) tasks
-  let snapExes = Map.keys $ Map.filter (== Snap) installExes
-  unless (null snapTasks && null snapExes) $ throwIO $
-    NotOnlyLocal snapTasks snapExes
-  pure plan
-
-data NotOnlyLocal = NotOnlyLocal [PackageName] [Text]
-
-instance Show NotOnlyLocal where
-  show (NotOnlyLocal packages exes) = concat
-    [ "Specified only-locals, but I need to build snapshot contents:\n"
-    , if null packages then "" else concat
-        [ "Packages: "
-        , L.intercalate ", " (map packageNameString packages)
-        , "\n"
-        ]
-    , if null exes then "" else concat
-        [ "Executables: "
-        , L.intercalate ", " (map T.unpack exes)
-        , "\n"
-        ]
-    ]
-instance Exception NotOnlyLocal
-
--- | State to be maintained during the calculation of local packages
--- to unregister.
-data UnregisterState = UnregisterState
-    { usToUnregister :: !(Map GhcPkgId (PackageIdentifier, Text))
-    , usKeep :: ![DumpPackage]
-    , usAnyAdded :: !Bool
+  stripNonDeps :: Plan -> RIO env Plan
+  stripNonDeps plan = pure plan
+    { tasks = Map.filter checkTask plan.tasks
+    , finals = Map.empty
+    , installExes = Map.empty -- TODO maybe don't disable this?
     }
+   where
+    deps = Map.keysSet sourceDeps
+    checkTask task = taskProvides task `Set.member` missingForDeps
+    providesDep task = pkgName (taskProvides task) `Set.member` deps
+    tasks = Map.elems plan.tasks
+    missing =
+      Map.fromList $ map (taskProvides &&&  (.configOpts.missing)) tasks
+    missingForDeps = flip execState mempty $
+      for_ tasks $ \task ->
+        when (providesDep task) $
+          collectMissing mempty (taskProvides task)
+    collectMissing dependents pid = do
+      when (pid `elem` dependents) $
+        impureThrow $ TaskCycleBug pid
+      modify' (<> Set.singleton pid)
+      mapM_
+        (collectMissing (pid:dependents))
+        (fromMaybe mempty $ Map.lookup pid missing)
+
+  -- | Throw an exception if there are any snapshot packages in the plan.
+  errorOnSnapshot :: Plan -> RIO env Plan
+  errorOnSnapshot plan@(Plan tasks _finals _unregister installExes) = do
+    let snapTasks = Set.toList $ Set.fromList $ map componentKeyPkgName
+          $ Map.keys $ Map.filter (\t -> taskLocation t == Snap) tasks
+        snapExes = Map.keys $ Map.filter (== Snap) installExes
+    unless (null snapTasks && null snapExes) $
+      prettyThrowIO $ NotOnlyLocal snapTasks snapExes
+    pure plan
+
+  prunedGlobalDeps :: Map PackageName [PackageName]
+  prunedGlobalDeps = flip Map.mapMaybe sourceMap.globalPkgs $
+    \case
+      ReplacedGlobalPackage deps ->
+        let pruned = filter (not . inSourceMap) deps
+        in  if null pruned then Nothing else Just pruned
+      GlobalPackage _ -> Nothing
+   where
+    inSourceMap pname =
+      pname `Map.member` sourceDeps || pname `Map.member` sourceProject
+
+  getSources :: Version -> RIO env (Map PackageName PackageSource)
+  getSources globalCabalVersion = do
+    let loadLocalPackage' pp = do
+          lp <- loadLocalPackage pp
+          let lpPackage' =
+                applyForceCustomBuild globalCabalVersion lp.package
+          pure lp { package = lpPackage' }
+    pPackages <- for sourceProject $ \pp -> do
+      lp <- loadLocalPackage' pp
+      pure $ PSFilePath lp
+    bopts <- view $ configL . to (.build)
+    deps <- for sourceDeps $ \dp ->
+      case dp.location of
+        PLImmutable loc ->
+          pure $
+            PSRemote loc (getPLIVersion loc) dp.fromSnapshot dp.depCommon
+        PLMutable dir -> do
+          pp <- mkProjectPackage YesPrintWarnings dir (shouldHaddockDeps bopts)
+          lp <- loadLocalPackage' pp
+          pure $ PSFilePath lp
+    pure $ pPackages <> deps
 
 -- | Determine which packages to unregister based on the given tasks and
--- already registered local packages
-mkUnregisterLocal :: Map PackageName Task
-                  -- ^ Tasks
-                  -> Map PackageName Text
-                  -- ^ Reasons why packages are dirty and must be rebuilt
-                  -> [DumpPackage]
-                  -- ^ Local package database dump
-                  -> Bool
-                  -- ^ If true, we're doing a special initialBuildSteps
-                  -- build - don't unregister target packages.
-                  -> Map GhcPkgId (PackageIdentifier, Text)
-mkUnregisterLocal tasks dirtyReason localDumpPkgs initialBuildSteps =
-    -- We'll take multiple passes through the local packages. This
-    -- will allow us to detect that a package should be unregistered,
-    -- as well as all packages directly or transitively depending on
-    -- it.
-    loop Map.empty localDumpPkgs
-  where
-    loop toUnregister keep
-        -- If any new packages were added to the unregister Map, we
-        -- need to loop through the remaining packages again to detect
-        -- if a transitive dependency is being unregistered.
-        | usAnyAdded us = loop (usToUnregister us) (usKeep us)
-        -- Nothing added, so we've already caught them all. Return the
-        -- Map we've already calculated.
-        | otherwise = usToUnregister us
-      where
-        -- Run the unregister checking function on all packages we
-        -- currently think we'll be keeping.
-        us = execState (mapM_ go keep) UnregisterState
-            { usToUnregister = toUnregister
-            , usKeep = []
-            , usAnyAdded = False
-            }
+-- already registered project packages and local extra-deps.
+mkUnregisterLocal ::
+     Map ComponentKey Task
+     -- ^ Tasks
+  -> Map PackageName Text
+     -- ^ Reasons why packages are dirty and must be rebuilt
+  -> [DumpPackage]
+     -- ^ Local package database dump
+  -> Bool
+     -- ^ If true, we're doing a special initialBuildSteps build - don't
+     -- unregister target packages.
+  -> Map GhcPkgId (PackageIdentifier, Text)
+mkUnregisterLocal componentTasks dirtyReason localDumpPkgs initialBuildSteps =
+  -- We'll take multiple passes through the local packages. This will allow us
+  -- to detect that a package should be unregistered, as well as all packages
+  -- directly or transitively depending on it.
+  loop Map.empty localDumpPkgs
+ where
+  -- Derive a per-package task map: pick one representative non-CInst task per
+  -- package. A CInst task registers a Backpack instantiation, but it relies on
+  -- the existing indefinite library registration for the same package name.
+  -- Treating CInst-only packages as normal rebuilds unregisters that
+  -- indefinite unit before the CInst configure step can use it.
+  tasks :: Map PackageName Task
+  tasks = Map.fromList
+    [ (componentKeyPkgName ck, t)
+    | (ck, t) <- Map.toList componentTasks
+    , not (componentKeyIsCInst ck)
+    ]
 
-    go dp = do
-        us <- get
-        case go' (usToUnregister us) ident deps of
-            -- Not unregistering, add it to the keep list
-            Nothing -> put us { usKeep = dp : usKeep us }
-            -- Unregistering, add it to the unregister Map and
-            -- indicate that a package was in fact added to the
-            -- unregister Map so we loop again.
-            Just reason -> put us
-                { usToUnregister = Map.insert gid (ident, reason) (usToUnregister us)
-                , usAnyAdded = True
-                }
-      where
-        gid = dpGhcPkgId dp
-        ident = dpPackageIdent dp
-        deps = dpDepends dp
-
-    go' toUnregister ident deps
-      -- If we're planning on running a task on it, then it must be
-      -- unregistered, unless it's a target and an initial-build-steps
-      -- build is being done.
-      | Just task <- Map.lookup name tasks
-          = if initialBuildSteps && taskIsTarget task && taskProvides task == ident
-              then Nothing
-              else Just $ fromMaybe "" $ Map.lookup name dirtyReason
-      -- Check if a dependency is going to be unregistered
-      | (dep, _):_ <- mapMaybe (`Map.lookup` toUnregister) deps
-          = Just $ "Dependency being unregistered: " <> T.pack (packageIdentifierString dep)
-      -- None of the above, keep it!
-      | otherwise = Nothing
-      where
-        name :: PackageName
-        name = pkgName ident
-
--- | Given a 'LocalPackage' and its 'lpTestBench', adds a 'Task' for
--- running its tests and benchmarks.
---
--- If @isAllInOne@ is 'True', then this means that the build step will
--- also build the tests. Otherwise, this indicates that there's a cyclic
--- dependency and an additional build step needs to be done.
+  loop ::
+       Map GhcPkgId (PackageIdentifier, Text)
+       -- ^ Current local packages to unregister.
+    -> [DumpPackage]
+       -- ^ Current local packages to keep.
+    -> Map GhcPkgId (PackageIdentifier, Text)
+       -- ^ Revised local packages to unregister.
+  loop toUnregister keep
+    -- If any new packages were added to the unregister Map, we need to loop
+    -- through the remaining packages again to detect if a transitive dependency
+    -- is being unregistered.
+    | us.anyAdded = loop us.toUnregister us.toKeep
+    -- Nothing added, so we've already caught them all. Return the Map we've
+    -- already calculated.
+    | otherwise = us.toUnregister
+   where
+    -- Run the unregister checking function on all packages we currently think
+    -- we'll be keeping.
+    us = execState (mapM_ go keep) initialUnregisterState
+    initialUnregisterState = UnregisterState
+      { toUnregister
+      , toKeep = []
+      , anyAdded = False
+      }
+
+  go :: DumpPackage -> State UnregisterState ()
+  go dp = do
+    us <- get
+    case maybeUnregisterReason us.toUnregister ident mParentLibId deps of
+      -- Not unregistering, add it to the keep list.
+      Nothing -> put us { toKeep = dp : us.toKeep }
+      -- Unregistering, add it to the unregister Map; and indicate that a
+      -- package was in fact added to the unregister Map, so we loop again.
+      Just reason -> put us
+        { toUnregister = Map.insert gid (ident, reason) us.toUnregister
+        , anyAdded = True
+        }
+   where
+    gid = dp.ghcPkgId
+    ident = dp.packageIdent
+    mParentLibId = sublibParentPkgId dp
+    deps = dp.depends
+
+  maybeUnregisterReason ::
+       Map GhcPkgId (PackageIdentifier, Text)
+       -- ^ Current local packages to unregister.
+    -> PackageIdentifier
+       -- ^ Package identifier.
+    -> Maybe PackageIdentifier
+       -- ^ If package for sub library, package identifier of the parent.
+    -> [GhcPkgId]
+       -- ^ Dependencies of the package.
+    -> Maybe Text
+       -- ^ If to be unregistered, the reason for doing so.
+  maybeUnregisterReason toUnregister ident mParentLibId deps
+    -- If the package is not for a sub library, then it is directly relevant. If
+    -- it is, then the relevant package is the parent. If we are planning on
+    -- running a task on the relevant package, then the package must be
+    -- unregistered, unless it is a target and an initial-build-steps build is
+    -- being done.
+    | Just task <- Map.lookup relevantPkgName tasks =
+        if    initialBuildSteps
+           && taskIsTarget task
+           && taskProvides task == relevantPkgId
+          then Nothing
+          else Just $ fromMaybe "" $ Map.lookup relevantPkgName dirtyReason
+    -- Check if a dependency is going to be unregistered
+    | (dep, _):_ <- mapMaybe (`Map.lookup` toUnregister) deps =
+        Just $ "Dependency being unregistered: "
+          <> T.pack (packageIdentifierString dep)
+    -- None of the above, keep it!
+    | otherwise = Nothing
+    where
+      -- If the package is not for a sub library, then the relevant package
+      -- identifier is that of the package. If it is, then the relevant package
+      -- identifier is that of the parent.
+      relevantPkgId :: PackageIdentifier
+      relevantPkgId = fromMaybe ident mParentLibId
+      -- If the package is not for a sub library, then the relevant package name
+      -- is that of the package. If it is, then the relevant package name is
+      -- that of the parent.
+      relevantPkgName :: PackageName
+      relevantPkgName = maybe (pkgName ident) pkgName mParentLibId
+
+  componentKeyIsCInst :: ComponentKey -> Bool
+  componentKeyIsCInst (ComponentKey _ CInst{}) = True
+  componentKeyIsCInst _ = False
+
+-- | Given a t'LocalPackage' and its test\/benchmark 'Package', adds a
+-- t'Task' for running its tests and benchmarks. Resolves the package's deps
+-- via 'addPackageDeps' (in the common case these have already been resolved
+-- for the library build, so the lookups are cache hits).
+addFinal ::
+     LocalPackage
+  -> Package
+  -> Bool
+     -- ^ Will the test\/benchmark build be folded into the package's primary
+     -- build (all-in-one)? 'False' forces a separate build step: curator
+     -- builds that expect test failures, or the cyclic-plan fallback.
+  -> Bool
+     -- ^ Should Haddock documentation be built?
+  -> M ()
+addFinal lp package allInOne buildHaddocks = do
+  let name = package.name
+      -- Split (per-component Backpack) packages key their finals under
+      -- CTest\/CBench, separate from the primary CLib\/CInst build, so they
+      -- always need their own build step regardless of the caller's flag.
+      effectiveAllInOne = allInOne && not (shouldSplitComponents package)
+  logDebugPlanS "addFinal" "Clearing the call stack."
+  res <- local (\ctx' -> ctx' { callStack = [] }) $
+           addPackageDeps package >>= \case
+    Left e -> pure $ Left e
+    Right (MissingPresentDeps missing present _minLoc) -> do
+      let pkgConfigOpts = packageConfigureOptsFromPackage package
+      ctx <- ask
+      let configOpts = TaskConfigOpts
+            { missing
+            , envConfig = ctx.ctxEnvConfig
+            , baseConfigOpts = ctx.baseConfigOpts
+            , isLocalNonExtraDep = True
+            , isMutable = Mutable
+            , pkgConfigOpts
+            , instantiationDeps = []
+            }
+      pure $ Right Task
+        { configOpts
+        , buildHaddocks
+        , allInOne = effectiveAllInOne
+        , present
+        , taskType = TTLocalMutable lp
+        , cachePkgSrc = CacheSrcLocal (toFilePath (parent lp.cabalFP))
+        , buildTypeConfig = packageBuildTypeConfig package
+        , backpackInstEntries = []
+        }
+  ctx <- ask
+  logDebugPlanS "addFinal" $
+       "Restoring the call stack: "
+    <> fromString (show $ map packageNameString ctx.callStack)
+  let finalKeys
+        | shouldSplitComponents package =
+            let testComps = filter isCTest $ Set.toList lp.components
+                benchComps = filter isCBench $ Set.toList lp.components
+            in  case testComps ++ benchComps of
+                  [] -> [ComponentKey name CLib]
+                  comps -> map (ComponentKey name) comps
+        | otherwise = [ComponentKey name CLib]
+  forM_ finalKeys $ \ck -> do
+    logDebugPlanS "addFinal" $
+         "Adding to construction output "
+      <> fromComponentKey ck
+      <> summariseResult res
+    tell mempty { wFinals = Map.singleton ck res }
+
+-- | Given a 'PackageName', adds all of the build tasks to build the package, if
+-- needed. First checks if the package name is in the library map.
 --
--- This will also add all the deps needed to build the tests /
--- benchmarks. If @isAllInOne@ is 'True' (the common case), then all of
--- these should have already been taken care of as part of the build
--- step.
-addFinal :: LocalPackage -> Package -> Bool -> Bool -> M ()
-addFinal lp package isAllInOne buildHaddocks = do
-    depsRes <- addPackageDeps package
-    res <- case depsRes of
-        Left e -> pure $ Left e
-        Right (missing, present, _minLoc) -> do
-            ctx <- ask
-            pure $ Right Task
-                { taskProvides = PackageIdentifier
-                    (packageName package)
-                    (packageVersion package)
-                , taskConfigOpts = TaskConfigOpts missing $ \missing' ->
-                    let allDeps = Map.union present missing'
-                     in configureOpts
-                            (view envConfigL ctx)
-                            (baseConfigOpts ctx)
-                            allDeps
-                            True -- local
-                            Mutable
-                            package
-                , taskBuildHaddock = buildHaddocks
-                , taskPresent = present
-                , taskType = TTLocalMutable lp
-                , taskAllInOne = isAllInOne
-                , taskCachePkgSrc = CacheSrcLocal (toFilePath (parent (lpCabalFile lp)))
-                , taskAnyMissing = not $ Set.null missing
-                , taskBuildTypeConfig = packageBuildTypeConfig package
-                }
-    tell mempty { wFinals = Map.singleton (packageName package) res }
-
--- | Given a 'PackageName', adds all of the build tasks to build the
--- package, if needed.
+-- 'constructPlan' invokes this on all the target packages.
 --
--- 'constructPlan' invokes this on all the target packages, setting
--- @treatAsDep'@ to False, because those packages are direct build
--- targets. 'addPackageDeps' invokes this while recursing into the
--- dependencies of a package. As such, it sets @treatAsDep'@ to True,
--- forcing this package to be marked as a dependency, even if it is
--- directly wanted. This makes sense - if we left out packages that are
--- deps, it would break the --only-dependencies build plan.
-addDep :: PackageName
-       -> M (Either ConstructPlanException AddDepRes)
-addDep name = do
-    ctx <- ask
-    m <- get
-    case Map.lookup name m of
-        Just res -> do
-            planDebug $ "addDep: Using cached result for " ++ show name ++ ": " ++ show res
-            pure res
-        Nothing -> do
-            res <- if name `elem` callStack ctx
-                then do
-                    planDebug $ "addDep: Detected cycle " ++ show name ++ ": " ++ show (callStack ctx)
-                    pure $ Left $ DependencyCycleDetected $ name : callStack ctx
-                else local (\ctx' -> ctx' { callStack = name : callStack ctx' }) $ do
-                    let mpackageInfo = Map.lookup name $ combinedMap ctx
-                    planDebug $ "addDep: Package info for " ++ show name ++ ": " ++ show mpackageInfo
-                    case mpackageInfo of
-                        -- TODO look up in the package index and see if there's a
-                        -- recommendation available
-                        Nothing -> pure $ Left $ UnknownPackage name
-                        Just (PIOnlyInstalled loc installed) -> do
-                            -- FIXME Slightly hacky, no flags since
-                            -- they likely won't affect executable
-                            -- names. This code does not feel right.
-                            let version = installedVersion installed
-                                askPkgLoc = liftRIO $ do
-                                  mrev <- getLatestHackageRevision YesRequireHackageIndex name version
-                                  case mrev of
-                                    Nothing -> do
-                                      -- this could happen for GHC boot libraries missing from Hackage
-                                      logWarn $ "No latest package revision found for: " <>
-                                          fromString (packageNameString name) <> ", dependency callstack: " <>
-                                          displayShow (map packageNameString $ callStack ctx)
-                                      pure Nothing
-                                    Just (_rev, cfKey, treeKey) ->
-                                      pure . Just $
-                                          PLIHackage (PackageIdentifier name version) cfKey treeKey
-                            tellExecutablesUpstream name askPkgLoc loc Map.empty
-                            pure $ Right $ ADRFound loc installed
-                        Just (PIOnlySource ps) -> do
-                            tellExecutables name ps
-                            installPackage name ps Nothing
-                        Just (PIBoth ps installed) -> do
-                            tellExecutables name ps
-                            installPackage name ps (Just installed)
-            updateLibMap name res
-            pure res
-
--- FIXME what's the purpose of this? Add a Haddock!
+-- 'addPackageDeps' invokes this while recursing into the dependencies of a
+-- package, even if it is directly wanted. This makes sense - if we left out
+-- packages that are deps, it would break the --only-dependencies build plan.
+getCachedDepOrAddDep ::
+     PackageName
+  -> M (Either ConstructPlanException AddDepRes)
+getCachedDepOrAddDep name = do
+  libraryMap <- get
+  case Map.lookup name libraryMap of
+    Just res -> do
+      logDebugPlanS "getCachedDepOrAddDep" $
+           "Using cached result for "
+        <> fromPackageName name
+        <> ": "
+        <> fromString (show res)
+      pure res
+    Nothing -> checkCallStackAndAddDep name
+
+-- | Given a 'PackageName', known not to be in the library map, adds all of the
+-- build tasks to build the package. First checks that the package name is not
+-- already in the call stack.
+checkCallStackAndAddDep ::
+     PackageName
+  -> M (Either ConstructPlanException AddDepRes)
+checkCallStackAndAddDep name = do
+  ctx <- ask
+  let compiler = ctx.ctxEnvConfig.sourceMap.compiler
+  res <- if name `elem` ctx.callStack
+    then do
+      logDebugPlanS "checkCallStackAndAddDep" $
+           "Detected cycle "
+        <> fromPackageName name
+        <> ": "
+        <> fromString (show $ map packageNameString ctx.callStack)
+      pure $ Left $ DependencyCycleDetected $ name : ctx.callStack
+    else case Map.lookup name ctx.combinedMap of
+      -- TODO look up in the package index and see if there's a
+      -- recommendation available
+      Nothing -> do
+        logDebugPlanS "checkCallStackAndAddDep" $
+             "No package info for "
+          <> fromPackageName name
+          <> "."
+        pure $ Left $ UnknownPackage compiler name
+      Just packageInfo -> do
+        logDebugPlanS "checkCallStackAndAddDep" $
+             "Pushing "
+          <> fromPackageName name
+          <> " on to the call stack."
+        -- Add the current package name to the head of the call stack.
+        res <- local (\ctx' -> ctx' { callStack = name : ctx'.callStack }) $
+          addDep name packageInfo
+        logDebugPlanS "checkCallStackAndAddDep" $
+             "Popped "
+          <> fromPackageName name
+          <> " from the call stack."
+        pure res
+  updateLibMap name res
+  pure res
+
+-- | Given a 'PackageName' and its 'PackageInfo' from the combined map, adds all
+-- of the build tasks to build the package. Assumes that the head of the call
+-- stack is the current package name.
+addDep ::
+     PackageName
+  -> PackageInfo
+  -> M (Either ConstructPlanException AddDepRes)
+addDep name packageInfo = do
+  logDebugPlanS "addDep" $
+       "Package info for "
+    <> fromPackageName name
+    <> ": "
+    <> fromString (show packageInfo)
+  case packageInfo of
+    PIOnlyInstalled loc installed -> do
+      -- FIXME Slightly hacky, no flags since they likely won't affect
+      -- executable names. This code does not feel right.
+      let version = installedVersion installed
+          askPkgLoc = liftRIO $
+            getLatestHackageRevision YesRequireHackageIndex name version >>= \case
+              Nothing -> do
+                -- This could happen for GHC boot libraries missing from
+                -- Hackage.
+                cs <- asks (NE.nonEmpty . (.callStack))
+                cs' <- maybe
+                  (throwIO CallStackEmptyBug)
+                  (pure . NE.tail)
+                  cs
+                prettyWarnL
+                  $ flow "No latest package revision found for"
+                  : style Current (fromPackageName name) <> ","
+                  : flow "dependency callstack:"
+                  : mkNarrativeList Nothing False
+                      (map fromPackageName cs' :: [StyleDoc])
+                pure Nothing
+              Just (_rev, cfKey, treeKey) ->
+                pure $ Just $
+                  PLIHackage (PackageIdentifier name version) cfKey treeKey
+      tellExecutablesUpstream name askPkgLoc loc Map.empty
+      pure $ Right $ ADRFound loc installed
+    PIOnlySource ps -> do
+      tellExecutables name ps
+      installPackage name ps Nothing
+    PIBoth ps installed -> do
+      tellExecutables name ps
+      installPackage name ps (Just installed)
+
+-- | For given 'PackageName' and 'PackageSource' values, adds relevant
+-- executables to the collected output.
 tellExecutables :: PackageName -> PackageSource -> M ()
 tellExecutables _name (PSFilePath lp)
-    | lpWanted lp = tellExecutablesPackage Local $ lpPackage lp
-    | otherwise = pure ()
--- Ignores ghcOptions because they don't matter for enumerating
--- executables.
+  | lp.wanted = tellExecutablesPackage Local lp.package
+  | otherwise = pure ()
+-- Ignores ghcOptions because they don't matter for enumerating executables.
 tellExecutables name (PSRemote pkgloc _version _fromSnapshot cp) =
-    tellExecutablesUpstream name (pure $ Just pkgloc) Snap (cpFlags cp)
+  tellExecutablesUpstream name (pure $ Just pkgloc) Snap cp.flags
 
+-- | For a given 'PackageName' value, known to be immutable, adds relevant
+-- executables to the collected output.
 tellExecutablesUpstream ::
-       PackageName
-    -> M (Maybe PackageLocationImmutable)
-    -> InstallLocation
-    -> Map FlagName Bool
-    -> M ()
+     PackageName
+  -> M (Maybe PackageLocationImmutable)
+  -> InstallLocation
+  -> Map FlagName Bool
+  -> M ()
 tellExecutablesUpstream name retrievePkgLoc loc flags = do
-    ctx <- ask
-    when (name `Set.member` wanted ctx) $ do
-        mPkgLoc <- retrievePkgLoc
-        forM_ mPkgLoc $ \pkgLoc -> do
-            p <- loadPackage ctx pkgLoc flags [] []
-            tellExecutablesPackage loc p
-
+  ctx <- ask
+  when (name `Set.member` ctx.wanted) $ do
+    mPkgLoc <- retrievePkgLoc
+    forM_ mPkgLoc $ \pkgLoc -> do
+      p <- ctx.loadPackage pkgLoc flags [] []
+      tellExecutablesPackage loc p
+
+-- | For given 'InstallLocation' and t'Package' values, adds relevant
+-- executables to the collected output. In most cases, the relevant executables
+-- are all the executables of the package. If the package is a wanted local one,
+-- the executables are those executables that are wanted executables.
 tellExecutablesPackage :: InstallLocation -> Package -> M ()
 tellExecutablesPackage loc p = do
-    cm <- asks combinedMap
-    -- Determine which components are enabled so we know which ones to copy
-    let myComps =
-            case Map.lookup (packageName p) cm of
-                Nothing -> assert False Set.empty
-                Just (PIOnlyInstalled _ _) -> Set.empty
-                Just (PIOnlySource ps) -> goSource ps
-                Just (PIBoth ps _) -> goSource ps
-
-        goSource (PSFilePath lp)
-            | lpWanted lp = exeComponents (lpComponents lp)
-            | otherwise = Set.empty
-        goSource PSRemote{} = Set.empty
-
-    tell mempty { wInstall = Map.fromList $ map (, loc) $ Set.toList $ filterComps myComps $ packageExes p }
-  where
-    filterComps myComps x
-        | Set.null myComps = x
-        | otherwise = Set.intersection x myComps
+  cm <- asks (.combinedMap)
+  -- Determine which components are enabled so we know which ones to copy
+  let myComps =
+        case Map.lookup p.name cm of
+          Nothing -> assert False Set.empty
+          Just (PIOnlyInstalled _ _) -> Set.empty
+          Just (PIOnlySource ps) -> goSource ps
+          Just (PIBoth ps _) -> goSource ps
+
+      goSource (PSFilePath lp)
+        | lp.wanted = exeComponents lp.components
+        | otherwise = Set.empty
+      goSource PSRemote{} = Set.empty
+
+  tell mempty
+    { wInstall = Map.fromList $
+        map (, loc) $ Set.toList $ filterComps myComps $ buildableExes p
+    }
+ where
+  filterComps myComps x
+    | Set.null myComps = x
+    | otherwise = Set.intersection x myComps
 
 -- | Given a 'PackageSource' and perhaps an 'Installed' value, adds
--- build 'Task's for the package and its dependencies.
-installPackage :: PackageName
-               -> PackageSource
-               -> Maybe Installed
-               -> M (Either ConstructPlanException AddDepRes)
+-- build t'Task's for the package and its dependencies.
+installPackage ::
+     PackageName
+  -> PackageSource
+  -> Maybe Installed
+  -> M (Either ConstructPlanException AddDepRes)
 installPackage name ps minstalled = do
+  ctx <- ask
+  case ps of
+    PSRemote pkgLoc _version _fromSnapshot cp -> do
+      logDebugPlanS "installPackage" $
+           "Building upstream package "
+        <> fromPackageName name
+        <> "."
+      package <- ctx.loadPackage
+        pkgLoc cp.flags cp.ghcOptions cp.cabalConfigOpts
+      resolveDepsAndInstall cp.buildHaddocks ps package minstalled
+    PSFilePath lp -> do
+      case lp.testBench of
+        Nothing -> do
+          logDebugPlanS "installPackage" $
+               "No test or bench component for "
+            <> fromPackageName name
+            <> ", building directly."
+          resolveDepsAndInstall
+            lp.buildHaddocks ps lp.package minstalled
+        Just tb -> do
+          -- Preserve the current library map.
+          libMap <- get
+          -- Attempt to find a plan which performs an all-in-one build. Ignore
+          -- the writer action + reset the state if it fails.
+          res <- pass $ do
+            res <- addPackageDeps tb
+            let modifyOutput = case res of
+                  Left _ -> const mempty
+                  _ -> id
+            pure (res, modifyOutput)
+          case res of
+            Right deps -> do
+              logDebugPlanS "installPackage" $
+                   "For "
+                <> fromPackageName name
+                <> ", successfully added package deps."
+              -- In curator builds the test\/benchmark build can't be folded
+              -- into the library build: a test\/benchmark failure could stop
+              -- the library being available to its dependents. When the
+              -- library is already available (not 'ADRToInstall') it would
+              -- be fine, hence the 'isAdrToInstall' guard.
+              splitRequired <-
+                expectedTestOrBenchFailures name <$> asks (.curator)
+              adr <- installPackageGivenDeps
+                lp.buildHaddocks ps tb minstalled deps
+              let finalAllInOne = not (isAdrToInstall adr && splitRequired)
+              -- FIXME: this redundantly adds the deps (but they'll all just
+              -- get looked up in the map)
+              addFinal lp tb finalAllInOne False
+              pure $ Right adr
+            Left _ -> do
+              -- Reset the state to how it was before attempting to find a
+              -- combined build plan.
+              logDebugPlanS "installPackage" $
+                   "Before trying cyclic plan, resetting lib result map to: "
+                <> fromString (show libMap)
+              put libMap
+              -- Otherwise, fall back on building the tests / benchmarks in a
+              -- separate step (allInOne = False): the library is built on its
+              -- own first, then the test\/benchmark build on top of it.
+              res' <- resolveDepsAndInstall
+                lp.buildHaddocks ps lp.package minstalled
+              when (isRight res') $ do
+                -- Insert it into the map so that it's available for addFinal.
+                updateLibMap name res'
+                addFinal lp tb False False
+              pure res'
+
+-- | Does the curator (if any) expect this package's test-suites or benchmarks
+-- to fail? If so, the test\/benchmark build must be a step separate from the
+-- library build, so that a test\/benchmark failure does not stop the library
+-- being available to its dependents.
+expectedTestOrBenchFailures :: PackageName -> Maybe Curator -> Bool
+expectedTestOrBenchFailures name maybeCurator = fromMaybe False $ do
+  curator <- maybeCurator
+  pure $  Set.member name curator.expectTestFailure
+       || Set.member name curator.expectBenchmarkFailure
+
+resolveDepsAndInstall ::
+     Bool
+     -- ^ Should Haddock documentation be built?
+  -> PackageSource
+  -> Package
+  -> Maybe Installed
+  -> M (Either ConstructPlanException AddDepRes)
+resolveDepsAndInstall buildHaddocks ps package minstalled =
+  addPackageDeps package >>= \case
+    Left err -> pure $ Left err
+    Right deps ->
+      Right <$>
+        installPackageGivenDeps
+          buildHaddocks ps package minstalled deps
+
+-- | Checks if we need to install the given t'Package', given the results of
+-- 'addPackageDeps'. If dependencies are missing, the package is dirty, or it is
+-- not installed, then it needs to be installed.
+installPackageGivenDeps ::
+     Bool
+     -- ^ Should Haddock documentation be built?
+  -> PackageSource
+  -> Package
+  -> Maybe Installed
+  -> MissingPresentDeps
+  -> M AddDepRes
+installPackageGivenDeps
+    buildHaddocks
+    ps
+    package
+    minstalled
+    (MissingPresentDeps missing present minMutable)
+  = do
+    let name = package.name
+    mRightVersionInstalled <- case minstalled of
+      Just installed -> if Set.null missing
+        then do
+          shouldInstall <-
+            checkDirtiness ps installed package present buildHaddocks
+          pure $ if shouldInstall then Nothing else Just installed
+        else do
+          let packageNameText = T.pack . packageNameString . pkgName
+              t = T.intercalate ", " $ map packageNameText (Set.toList missing)
+          tell mempty
+            { wDirty =
+                Map.singleton name $ "missing dependencies: " <> addEllipsis t
+            }
+          pure Nothing
+      Nothing -> pure Nothing
     ctx <- ask
-    case ps of
-        PSRemote pkgLoc _version _fromSnapshot cp -> do
-            planDebug $ "installPackage: Doing all-in-one build for upstream package " ++ show name
-            package <- loadPackage ctx pkgLoc (cpFlags cp) (cpGhcOptions cp) (cpCabalConfigOpts cp)
-            resolveDepsAndInstall True (cpHaddocks cp) ps package minstalled
-        PSFilePath lp -> do
-            case lpTestBench lp of
-                Nothing -> do
-                    planDebug $ "installPackage: No test / bench component for " ++ show name ++ " so doing an all-in-one build."
-                    resolveDepsAndInstall True (lpBuildHaddocks lp) ps (lpPackage lp) minstalled
-                Just tb -> do
-                    -- Attempt to find a plan which performs an all-in-one
-                    -- build.  Ignore the writer action + reset the state if
-                    -- it fails.
-                    s <- get
-                    res <- pass $ do
-                        res <- addPackageDeps tb
-                        let writerFunc w = case res of
-                                Left _ -> mempty
-                                _ -> w
-                        pure (res, writerFunc)
-                    case res of
-                        Right deps -> do
-                          planDebug $ "installPackage: For " ++ show name ++ ", successfully added package deps"
-                          -- in curator builds we can't do all-in-one build as test/benchmark failure
-                          -- could prevent library from being available to its dependencies
-                          -- but when it's already available it's OK to do that
-                          splitRequired <- expectedTestOrBenchFailures <$> asks mcurator
-                          let isAllInOne = not splitRequired
-                          adr <- installPackageGivenDeps isAllInOne (lpBuildHaddocks lp) ps tb minstalled deps
-                          let finalAllInOne = case adr of
-                                ADRToInstall _ | splitRequired -> False
-                                _ -> True
-                          -- FIXME: this redundantly adds the deps (but
-                          -- they'll all just get looked up in the map)
-                          addFinal lp tb finalAllInOne False
-                          pure $ Right adr
-                        Left _ -> do
-                            -- Reset the state to how it was before
-                            -- attempting to find an all-in-one build
-                            -- plan.
-                            planDebug $ "installPackage: Before trying cyclic plan, resetting lib result map to " ++ show s
-                            put s
-                            -- Otherwise, fall back on building the
-                            -- tests / benchmarks in a separate step.
-                            res' <- resolveDepsAndInstall False (lpBuildHaddocks lp) ps (lpPackage lp) minstalled
-                            when (isRight res') $ do
-                                -- Insert it into the map so that it's
-                                -- available for addFinal.
-                                updateLibMap name res'
-                                addFinal lp tb False False
-                            pure res'
- where
-   expectedTestOrBenchFailures maybeCurator = fromMaybe False $ do
-     curator <- maybeCurator
-     pure $ Set.member name (curatorExpectTestFailure curator) ||
-            Set.member name (curatorExpectBenchmarkFailure curator)
-
-resolveDepsAndInstall :: Bool
-                      -> Bool
-                      -> PackageSource
-                      -> Package
-                      -> Maybe Installed
-                      -> M (Either ConstructPlanException AddDepRes)
-resolveDepsAndInstall isAllInOne buildHaddocks ps package minstalled = do
-    res <- addPackageDeps package
-    case res of
-        Left err -> pure $ Left err
-        Right deps -> liftM Right $ installPackageGivenDeps isAllInOne buildHaddocks ps package minstalled deps
-
--- | Checks if we need to install the given 'Package', given the results
--- of 'addPackageDeps'. If dependencies are missing, the package is
--- dirty, or it's not installed, then it needs to be installed.
-installPackageGivenDeps :: Bool
-                        -> Bool
-                        -> PackageSource
-                        -> Package
-                        -> Maybe Installed
-                        -> ( Set PackageIdentifier
-                           , Map PackageIdentifier GhcPkgId
-                           , IsMutable )
-                        -> M AddDepRes
-installPackageGivenDeps isAllInOne buildHaddocks ps package minstalled (missing, present, minMutable) = do
-    let name = packageName package
-    ctx <- ask
-    mRightVersionInstalled <- case (minstalled, Set.null missing) of
-        (Just installed, True) -> do
-            shouldInstall <- checkDirtiness ps installed package present buildHaddocks
-            pure $ if shouldInstall then Nothing else Just installed
-        (Just _, False) -> do
-            let t = T.intercalate ", " $ map (T.pack . packageNameString . pkgName) (Set.toList missing)
-            tell mempty { wDirty = Map.singleton name $ "missing dependencies: " <> addEllipsis t }
-            pure Nothing
-        (Nothing, _) -> pure Nothing
     let loc = psLocation ps
-        mutable = installLocationIsMutable loc <> minMutable
-    pure $ case mRightVersionInstalled of
-        Just installed -> ADRFound loc installed
-        Nothing -> ADRToInstall Task
-            { taskProvides = PackageIdentifier
-                (packageName package)
-                (packageVersion package)
-            , taskConfigOpts = TaskConfigOpts missing $ \missing' ->
-                let allDeps = Map.union present missing'
-                 in configureOpts
-                        (view envConfigL ctx)
-                        (baseConfigOpts ctx)
-                        allDeps
-                        (psLocal ps)
-                        mutable
-                        package
-            , taskBuildHaddock = buildHaddocks
-            , taskPresent = present
-            , taskType =
-                case ps of
-                    PSFilePath lp ->
-                      TTLocalMutable lp
-                    PSRemote pkgLoc _version _fromSnapshot _cp ->
-                      TTRemotePackage mutable package pkgLoc
-            , taskAllInOne = isAllInOne
-            , taskCachePkgSrc = toCachePkgSrc ps
-            , taskAnyMissing = not $ Set.null missing
-            , taskBuildTypeConfig = packageBuildTypeConfig package
+        isMutable = installLocationIsMutable loc <> minMutable
+        pkgConfigOpts = packageConfigureOptsFromPackage package
+        configOpts = TaskConfigOpts
+            { missing
+            , envConfig = ctx.ctxEnvConfig
+            , baseConfigOpts = ctx.baseConfigOpts
+            , isLocalNonExtraDep = psLocal ps
+            , isMutable
+            , pkgConfigOpts
+            , instantiationDeps = []
             }
+    pure $ case mRightVersionInstalled of
+      Just installed -> ADRFound loc installed
+      Nothing -> ADRToInstall Task
+        { configOpts
+        , buildHaddocks
+        -- Primary build task: 'allInOne' is not consulted for these (only for
+        -- final tasks in 'Plan' @finals@); set to 'True'.
+        , allInOne = True
+        , present
+        , taskType =
+            case ps of
+              PSFilePath lp ->
+                TTLocalMutable lp
+              PSRemote pkgLoc _version _fromSnapshot _cp ->
+                TTRemotePackage isMutable package pkgLoc
+        , cachePkgSrc = toCachePkgSrc ps
+        , buildTypeConfig = packageBuildTypeConfig package
+        , backpackInstEntries = []
+        }
 
 -- | Is the build type of the package Configure
 packageBuildTypeConfig :: Package -> Bool
-packageBuildTypeConfig pkg = packageBuildType pkg == Configure
-
--- Update response in the lib map. If it is an error, and there's
--- already an error about cyclic dependencies, prefer the cyclic error.
+packageBuildTypeConfig pkg = pkg.buildType == Configure
+
+-- | Only Backpack-using single-library packages take the per-component
+-- split path. Everything else uses the legacy whole-package path.
+shouldSplitComponents :: Package -> Bool
+shouldSplitComponents pkg =
+     pkg.buildType == Simple
+  && not (hasIntraPackageDeps pkg)
+  && not (hasMultipleRegisterableLibraries pkg)
+  && packageUsesBackpack pkg
+
+-- | More than one registerable library (main + sub, or 2+ subs).
+hasMultipleRegisterableLibraries :: Package -> Bool
+hasMultipleRegisterableLibraries pkg =
+  let mainLibCount = if hasBuildableMainLibrary pkg then 1 else 0
+      subLibCount = Set.size (buildableSubLibs pkg)
+  in  mainLibCount + subLibCount > 1
+
+-- | Expand an AddDepRes into per-component (ComponentKey, AddDepRes) pairs.
+-- For local Simple packages without intra-package deps, creates one entry per
+-- buildable component (lib, sub-libs, foreign libs, exes). Everything else
+-- gets a single CLib entry.
+expandToComponentKeys ::
+     PackageName -> AddDepRes -> [(ComponentKey, AddDepRes)]
+expandToComponentKeys name adr = case adr of
+  ADRToInstall task -> case task.taskType of
+    TTLocalMutable lp
+      | shouldSplitComponents lp.package ->
+          let pkg = lp.package
+              libComps = [CLib | hasBuildableMainLibrary pkg]
+              subLibComps =
+                map CSubLib $ Set.toList $ buildableSubLibs pkg
+              flibComps =
+                map CFlib $ Set.toList $ buildableForeignLibs pkg
+              -- Mirrors 'exesToBuild' in Stack.Build.ExecutePackage.
+              exeComps =
+                map CExe $ Set.toList $
+                  if lp.wanted
+                    then exeComponents lp.components
+                    else buildableExes pkg
+              allComps = libComps ++ subLibComps ++ flibComps ++ exeComps
+          in  map (\comp -> (ComponentKey name comp, adr)) allComps
+    _ -> [(ComponentKey name CLib, adr)]
+  _ -> [(ComponentKey name CLib, adr)]
+
+-- Update response in the library map. If it is an error, and there's already an
+-- error about cyclic dependencies, prefer the cyclic error.
 updateLibMap :: PackageName -> Either ConstructPlanException AddDepRes -> M ()
-updateLibMap name val = modify $ \mp ->
-    case (M.lookup name mp, val) of
-        (Just (Left DependencyCycleDetected{}), Left _) -> mp
-        _ -> M.insert name val mp
+updateLibMap name res = do
+  logDebugPlanS "updateLibMap" $
+       "Updating for: "
+    <> fromPackageName name
+    <> summariseResult res
+  modify $ \mp ->
+    case (Map.lookup name mp, res) of
+      (Just (Left DependencyCycleDetected{}), Left _) -> mp
+      _ -> Map.insert name res mp
 
 addEllipsis :: Text -> Text
 addEllipsis t
-    | T.length t < 100 = t
-    | otherwise = T.take 97 t <> "..."
-
--- | Given a package, recurses into all of its dependencies. The results
--- indicate which packages are missing, meaning that their 'GhcPkgId's
--- will be figured out during the build, after they've been built. The
--- 2nd part of the tuple result indicates the packages that are already
--- installed which will be used.
---
--- The 3rd part of the tuple is an 'InstallLocation'. If it is 'Local',
--- then the parent package must be installed locally. Otherwise, if it
--- is 'Snap', then it can either be installed locally or in the
--- snapshot.
-addPackageDeps :: Package -> M (Either ConstructPlanException (Set PackageIdentifier, Map PackageIdentifier GhcPkgId, IsMutable))
+  | T.length t < 100 = t
+  | otherwise = T.take 97 t <> "..."
+
+-- | Given a package, recurses into all of its dependencies. The resulting
+-- triple indicates: (1) which packages are missing. This means that their
+-- 'GhcPkgId's will be figured out during the build, after they've been built;
+-- (2) the packages that are already installed and which will be used; and
+-- (3) whether the package itself is mutable or immutable.
+addPackageDeps ::
+     Package
+  -> M (Either ConstructPlanException MissingPresentDeps)
 addPackageDeps package = do
-    ctx <- ask
-    deps' <- packageDepsWithTools package
-    deps <- forM (Map.toList deps') $ \(depname, DepValue range depType) -> do
-        eres <- addDep depname
-        let getLatestApplicableVersionAndRev :: M (Maybe (Version, BlobKey))
-            getLatestApplicableVersionAndRev = do
-              vsAndRevs <- runRIO ctx $ getHackagePackageVersions YesRequireHackageIndex UsePreferredVersions depname
-              pure $ do
-                lappVer <- latestApplicableVersion range $ Map.keysSet vsAndRevs
-                revs <- Map.lookup lappVer vsAndRevs
-                (cabalHash, _) <- Map.maxView revs
-                Just (lappVer, cabalHash)
-        case eres of
-            Left e -> do
-                addParent depname range Nothing
-                let bd =
-                        case e of
-                            UnknownPackage name -> assert (name == depname) NotInBuildPlan
-                            DependencyCycleDetected names -> BDDependencyCycleDetected names
-                            -- ultimately we won't show any
-                            -- information on this to the user, we'll
-                            -- allow the dependency failures alone to
-                            -- display to avoid spamming the user too
-                            -- much
-                            DependencyPlanFailures _ _  -> Couldn'tResolveItsDependencies (packageVersion package)
-                mlatestApplicable <- getLatestApplicableVersionAndRev
-                pure $ Left (depname, (range, mlatestApplicable, bd))
-            Right adr | depType == AsLibrary && not (adrHasLibrary adr) ->
-                pure $ Left (depname, (range, Nothing, HasNoLibrary))
-            Right adr -> do
-                addParent depname range Nothing
-                inRange <- if adrVersion adr `withinRange` range
-                    then pure True
-                    else do
-                        let warn_ reason =
-                                tell mempty { wWarnings = (msg:) }
-                              where
-                                msg = T.concat
-                                    [ "WARNING: Ignoring "
-                                    , T.pack $ packageNameString $ packageName package
-                                    , "'s bounds on "
-                                    , T.pack $ packageNameString depname
-                                    , " ("
-                                    , versionRangeText range
-                                    , "); using "
-                                    , T.pack $ packageIdentifierString $ PackageIdentifier depname (adrVersion adr)
-                                    , ".\nReason: "
-                                    , reason
-                                    , "."
-                                    ]
-                        allowNewer <- view $ configL.to configAllowNewer
-                        if allowNewer
-                            then do
-                                warn_ "allow-newer enabled"
-                                pure True
-                            else do
-                                -- We ignore dependency information for packages in a snapshot
-                                x <- inSnapshot (packageName package) (packageVersion package)
-                                y <- inSnapshot depname (adrVersion adr)
-                                if x && y
-                                    then do
-                                        warn_ "trusting snapshot over Cabal file dependency information"
-                                        pure True
-                                    else pure False
-                if inRange
-                    then case adr of
-                        ADRToInstall task -> pure $ Right
-                            (Set.singleton $ taskProvides task, Map.empty, taskTargetIsMutable task)
-                        ADRFound loc (Executable _) -> pure $ Right
-                            (Set.empty, Map.empty, installLocationIsMutable loc)
-                        ADRFound loc (Library ident gid _) -> pure $ Right
-                            (Set.empty, Map.singleton ident gid, installLocationIsMutable loc)
-                    else do
-                        mlatestApplicable <- getLatestApplicableVersionAndRev
-                        pure $ Left (depname, (range, mlatestApplicable, DependencyMismatch $ adrVersion adr))
-    case partitionEithers deps of
-        -- Note that the Monoid for 'InstallLocation' means that if any
-        -- is 'Local', the result is 'Local', indicating that the parent
-        -- package must be installed locally. Otherwise the result is
-        -- 'Snap', indicating that the parent can either be installed
-        -- locally or in the snapshot.
-        ([], pairs) -> pure $ Right $ mconcat pairs
-        (errs, _) -> pure $ Left $ DependencyPlanFailures
-            package
-            (Map.fromList errs)
-  where
-    adrVersion (ADRToInstall task) = pkgVersion $ taskProvides task
-    adrVersion (ADRFound _ installed) = installedVersion installed
-    -- Update the parents map, for later use in plan construction errors
-    -- - see 'getShortestDepsPath'.
-    addParent depname range mversion = tell mempty { wParents = MonoidMap $ M.singleton depname val }
-      where
-        val = (First mversion, [(packageIdentifier package, range)])
-
-    adrHasLibrary :: AddDepRes -> Bool
-    adrHasLibrary (ADRToInstall task) = taskHasLibrary task
-    adrHasLibrary (ADRFound _ Library{}) = True
-    adrHasLibrary (ADRFound _ Executable{}) = False
-
-    taskHasLibrary :: Task -> Bool
-    taskHasLibrary task =
-      case taskType task of
-        TTLocalMutable lp -> packageHasLibrary $ lpPackage lp
-        TTRemotePackage _ p _ -> packageHasLibrary p
-
-    -- make sure we consider internal libraries as libraries too
-    packageHasLibrary :: Package -> Bool
-    packageHasLibrary p =
-      not (Set.null (packageInternalLibraries p)) ||
-      case packageLibraries p of
-        HasLibraries _ -> True
-        NoLibraries -> False
-
-checkDirtiness :: PackageSource
-               -> Installed
-               -> Package
-               -> Map PackageIdentifier GhcPkgId
-               -> Bool
-               -> M Bool
-checkDirtiness ps installed package present buildHaddocks = do
-    ctx <- ask
-    moldOpts <- runRIO ctx $ tryGetFlagCache installed
-    let configOpts = configureOpts
-            (view envConfigL ctx)
-            (baseConfigOpts ctx)
-            present
-            (psLocal ps)
-            (installLocationIsMutable $ psLocation ps) -- should be Local i.e. mutable always
-            package
-        wantConfigCache = ConfigCache
-            { configCacheOpts = configOpts
-            , configCacheDeps = Set.fromList $ Map.elems present
-            , configCacheComponents =
-                case ps of
-                    PSFilePath lp -> Set.map (encodeUtf8 . renderComponent) $ lpComponents lp
-                    PSRemote{} -> Set.empty
-            , configCacheHaddock = buildHaddocks
-            , configCachePkgSrc = toCachePkgSrc ps
-            , configCachePathEnvVar = pathEnvVar ctx
-            }
-        config = view configL ctx
-    mreason <-
-      case moldOpts of
-        Nothing -> pure $ Just "old configure information not found"
-        Just oldOpts
-          | Just reason <- describeConfigDiff config oldOpts wantConfigCache -> pure $ Just reason
-          | True <- psForceDirty ps -> pure $ Just "--force-dirty specified"
-          | otherwise -> do
-              dirty <- psDirty ps
-              pure $
-                case dirty of
-                  Just files -> Just $ "local file changes: " <> addEllipsis (T.pack $ unwords $ Set.toList files)
-                  Nothing -> Nothing
-    case mreason of
-        Nothing -> pure False
-        Just reason -> do
-            tell mempty { wDirty = Map.singleton (packageName package) reason }
+  checkAndWarnForUnknownTools package
+  let pkgId = packageIdentifier package
+  processPackageDepsEither package (processDep pkgId) <&> \case
+    -- Note that the Monoid for 'IsMutable' means that if any is 'Mutable',
+    -- the result is 'Mutable'. Otherwise the result is 'Immutable'.
+    Right v -> Right v
+    Left errs ->
+      Left $ DependencyPlanFailures package errs
+
+-- | Given a dependency, yields either information for an error message or a
+-- triple indicating: (1) if the dependency is to be installed, its package
+-- identifier; (2) if the dependency is installed and a library, its package
+-- identifier and 'GhcPkgId'; and (3) if the dependency is, or will be when
+-- installed, mutable or immutable.
+processDep ::
+     PackageIdentifier
+     -- ^ The package which has the dependency being processed.
+  -> PackageName
+     -- ^ The name of the dependency.
+  -> DepValue
+     -- ^ The version range and dependency type of the dependency.
+  -> M ( Either
+           ( Map
+               PackageName
+               (VersionRange, Maybe (Version, BlobKey), BadDependency)
+           )
+           MissingPresentDeps
+       )
+processDep pkgId name value = do
+  let failure mLatestApp err =
+        Left $ Map.singleton name (range, mLatestApp, err)
+  getCachedDepOrAddDep name >>= \case
+    Left e -> do
+      addParent
+      let bd = case e of
+            UnknownPackage _ name' -> assert (name' == name) NotInBuildPlan
+            DependencyCycleDetected names -> BDDependencyCycleDetected names
+            -- Ultimately we won't show any information on this to the user;
+            -- we'll allow the dependency failures alone to display to avoid
+            -- spamming the user too much.
+            DependencyPlanFailures _ _  ->
+              Couldn'tResolveItsDependencies version
+      mLatestApplicable <- getLatestApplicableVersionAndRev name range
+      pure $ failure mLatestApplicable bd
+    Right adr
+      | isDepTypeLibrary value.depType && not (adrHasLibrary adr) ->
+          pure $ failure Nothing HasNoLibrary
+    Right adr -> do
+      addParent
+      inRange <- adrInRange pkgId name range adr
+      if inRange
+        then pure $ Right $ processAdr adr
+        else do
+          mLatestApplicable <- getLatestApplicableVersionAndRev name range
+          pure $ failure mLatestApplicable (DependencyMismatch $ adrVersion adr)
+ where
+  range = value.versionRange
+  version = pkgVersion pkgId
+  -- Update the parents map, for later use in plan construction errors
+  -- - see 'getShortestDepsPath'.
+  addParent =
+    let parentMap = Map.singleton name [(pkgId, range)]
+    in  tell mempty { wParents = MonoidMap parentMap }
+
+getLatestApplicableVersionAndRev ::
+     PackageName
+  -> VersionRange
+  -> M (Maybe (Version, BlobKey))
+getLatestApplicableVersionAndRev name range = do
+  ctx <- ask
+  vsAndRevs <- runRIO ctx $
+    getHackagePackageVersions YesRequireHackageIndex UsePreferredVersions name
+  pure $ do
+    lappVer <- latestApplicableVersion range $ Map.keysSet vsAndRevs
+    revs <- Map.lookup lappVer vsAndRevs
+    (cabalHash, _) <- Map.maxView revs
+    Just (lappVer, cabalHash)
+
+-- | Function to determine whether the result of 'addDep' is within range, given
+-- the version range of the dependency and taking into account Stack's
+-- @allow-newer@ configuration.
+adrInRange ::
+     PackageIdentifier
+     -- ^ The package which has the dependency.
+  -> PackageName
+     -- ^ The name of the dependency.
+  -> VersionRange
+     -- ^ The version range of the dependency.
+  -> AddDepRes
+     -- ^ The result of 'addDep'.
+  -> M Bool
+adrInRange pkgId name range adr = if adrVersion adr `withinRange` range
+  then pure True
+  else do
+    config <- view configL
+    allowNewerCLI <- view $ envConfigL . to (.buildOptsCLI) . to (.allowNewer)
+    let allowNewerConfig = config.allowNewer
+        allowNewer = fromFirst False $ allowNewerCLI <> allowNewerConfig
+        allowNewerDeps = config.allowNewerDeps
+    if allowNewer
+      then case allowNewerDeps of
+        Nothing -> do
+          warn_ True $
+            fillSep
+              [ style Shell "allow-newer"
+              , "enabled"
+              ]
+          pure True
+        Just boundsIgnoredDeps -> do
+          let pkgName' = fromPackageName pkgName
+              isBoundsIgnoreDep = pkgName `elem` boundsIgnoredDeps
+              reason = if isBoundsIgnoreDep
+                then fillSep
+                  [ style Current pkgName'
+                  , flow "is an"
+                  , style Shell "allow-newer-dep"
+                  , flow "and"
+                  , style Shell "allow-newer"
+                  , "enabled"
+                  ]
+                else fillSep
+                  [ style Current pkgName'
+                  , flow "is not an"
+                  , style Shell "allow-newer-dep"
+                  , flow "although"
+                  , style Shell "allow-newer"
+                  , "enabled"
+                  ]
+          warn_ isBoundsIgnoreDep reason
+          pure isBoundsIgnoreDep
+      else do
+        when (isJust allowNewerDeps) $
+          warn_ False $
+            fillSep
+              [ "although"
+              , style Shell "allow-newer-deps"
+              , flow "are specified,"
+              , style Shell "allow-newer"
+              , "is"
+              , style Shell "false"
+              ]
+        -- We ignore dependency information for packages in a snapshot
+        pkgInSnapshot <- inSnapshot pkgName version
+        adrInSnapshot <- inSnapshot name (adrVersion adr)
+        if pkgInSnapshot && adrInSnapshot
+          then do
+            warn_ True
+              ( flow "trusting snapshot over Cabal file dependency \
+                     \information"
+              )
             pure True
-
-describeConfigDiff :: Config -> ConfigCache -> ConfigCache -> Maybe Text
+          else pure False
+ where
+  PackageIdentifier pkgName version = pkgId
+  warn_ isIgnoring reason = tell mempty { wWarnings = (msg:) }
+   where
+    msg = fillSep
+            [ if isIgnoring
+                then "Ignoring"
+                else flow "Not ignoring"
+            , style Current (fromPackageName pkgName) <> "'s"
+            , flow "bounds on"
+            , style Current (fromPackageName name)
+            , parens (fromString . T.unpack $ versionRangeText range)
+            , flow "and using"
+            , style
+                Current
+                (fromPackageId $ PackageIdentifier name (adrVersion adr)) <> "."
+            ]
+       <> line
+       <> fillSep
+            [ "Reason:"
+            , reason <> "."
+            ]
+
+checkDirtiness ::
+     PackageSource
+  -> Installed
+  -> Package
+  -> Map MungedPackageId GhcPkgId
+  -> Bool
+     -- ^ Is Haddock documentation being built?
+  -> M Bool
+checkDirtiness ps installed package present buildHaddocks = do
+  ctx <- ask
+  moldOpts <- runRIO ctx $ tryGetFlagCache installed
+  let packageConfigureOpt = packageConfigureOptsFromPackage package
+      configureOpts = configureOptsFromBase
+        (view envConfigL ctx)
+        ctx.baseConfigOpts
+        present
+        (psLocal ps)
+        (installLocationIsMutable $ psLocation ps) -- should be Local i.e. mutable always
+        packageConfigureOpt
+      components = case ps of
+        PSFilePath lp ->
+          Set.map (encodeUtf8 . renderComponent) lp.components
+        PSRemote{} -> Set.empty
+      wantConfigCache = ConfigCache
+        { configureOpts
+        , deps = Set.fromList $ Map.elems present
+        , components
+        , buildHaddocks
+        , pkgSrc = toCachePkgSrc ps
+        , pathEnvVar = ctx.pathEnvVar
+        }
+      config = view configL ctx
+  mreason <-
+    case moldOpts of
+      Nothing -> pure $ Just "old configure information not found"
+      Just oldOpts
+        | Just reason <- describeConfigDiff config oldOpts wantConfigCache ->
+            pure $ Just reason
+        | True <- psForceDirty ps -> pure $ Just "--force-dirty specified"
+        | otherwise ->
+            psDirty ps <&> \case
+              Just files -> Just $
+                   "local file changes: "
+                <> addEllipsis (T.pack $ unwords $ Set.toList files)
+              Nothing -> Nothing
+  case mreason of
+    Nothing -> pure False
+    Just reason -> do
+      tell mempty { wDirty = Map.singleton package.name reason }
+      pure True
+
+-- | If the new Cabal configuration cache is the same as the old, yields
+-- 'Nothing'. Otherwise yields 'Just' a textual explanation of how they differ.
+describeConfigDiff ::
+     Config
+  -> ConfigCache
+     -- ^ The old Cabal configuration cache.
+  -> ConfigCache
+     -- ^ The new Cabal configuration cache.
+  -> Maybe Text
 describeConfigDiff config old new
-    | configCachePkgSrc old /= configCachePkgSrc new = Just $
-        "switching from " <>
-        pkgSrcName (configCachePkgSrc old) <> " to " <>
-        pkgSrcName (configCachePkgSrc new)
-    | not (configCacheDeps new `Set.isSubsetOf` configCacheDeps old) = Just "dependencies changed"
-    | not $ Set.null newComponents =
-        Just $ "components added: " `T.append` T.intercalate ", "
-            (map (decodeUtf8With lenientDecode) (Set.toList newComponents))
-    | not (configCacheHaddock old) && configCacheHaddock new = Just "rebuilding with haddocks"
-    | oldOpts /= newOpts = Just $ T.pack $ concat
-        [ "flags changed from "
-        , show oldOpts
-        , " to "
-        , show newOpts
-        ]
-    | otherwise = Nothing
-  where
-    stripGhcOptions =
-        go
-      where
-        go [] = []
-        go ("--ghc-option":x:xs) = go' Ghc x xs
-        go ("--ghc-options":x:xs) = go' Ghc x xs
-        go ((T.stripPrefix "--ghc-option=" -> Just x):xs) = go' Ghc x xs
-        go ((T.stripPrefix "--ghc-options=" -> Just x):xs) = go' Ghc x xs
-        go (x:xs) = x : go xs
-
-        go' wc x xs = checkKeepers wc x $ go xs
-
-        checkKeepers wc x xs =
-            case filter isKeeper $ T.words x of
-                [] -> xs
-                keepers -> T.pack (compilerOptionsCabalFlag wc) : T.unwords keepers : xs
-
-        -- GHC options which affect build results and therefore should always
-        -- force a rebuild
-        --
-        -- For the most part, we only care about options generated by Stack
-        -- itself
-        isKeeper = (== "-fhpc") -- more to be added later
-
-    userOpts = filter (not . isStackOpt)
-             . (if configRebuildGhcOptions config
-                   then id
-                   else stripGhcOptions)
-             . map T.pack
-             . (\(ConfigureOpts x y) -> x ++ y)
-             . configCacheOpts
-
-    (oldOpts, newOpts) = removeMatching (userOpts old) (userOpts new)
-
-    removeMatching (x:xs) (y:ys)
-        | x == y = removeMatching xs ys
-    removeMatching xs ys = (xs, ys)
-
-    newComponents = configCacheComponents new `Set.difference` configCacheComponents old
-
-    pkgSrcName (CacheSrcLocal fp) = T.pack fp
-    pkgSrcName CacheSrcUpstream = "upstream source"
+  | old.pkgSrc /= new.pkgSrc = Just $
+      "switching from " <>
+      pkgSrcName old.pkgSrc <> " to " <>
+      pkgSrcName new.pkgSrc
+  | not (new.deps `Set.isSubsetOf` old.deps) =
+      Just "dependencies changed"
+  | not $ Set.null newComponents =
+      Just $ "components added: " `T.append` T.intercalate ", "
+          (map (decodeUtf8With lenientDecode) (Set.toList newComponents))
+  | not old.buildHaddocks && new.buildHaddocks =
+      Just "rebuilding with haddocks"
+  | oldOpts /= newOpts = Just $ T.pack $ concat
+      [ "flags changed from "
+      , show oldOpts
+      , " to "
+      , show newOpts
+      ]
+  | otherwise = Nothing
+ where
+  stripGhcOptions = go
+   where
+    go [] = []
+    go ("--ghc-option":x:xs) = go' Ghc x xs
+    go ("--ghc-options":x:xs) = go' Ghc x xs
+    go ((T.stripPrefix "--ghc-option=" -> Just x):xs) = go' Ghc x xs
+    go ((T.stripPrefix "--ghc-options=" -> Just x):xs) = go' Ghc x xs
+    go (x:xs) = x : go xs
+
+    go' wc x xs = checkKeepers wc x $ go xs
+
+    checkKeepers wc x xs =
+      case filter isKeeper $ T.words x of
+        [] -> xs
+        keepers -> T.pack (compilerOptionsCabalFlag wc) : T.unwords keepers : xs
+
+    -- GHC options which affect build results and therefore should always force
+    -- a rebuild
+    --
+    -- For the most part, we only care about options generated by Stack itself
+    isKeeper = (== "-fhpc") -- more to be added later
+
+  userOpts = filter (not . isStackOpt)
+           . (if config.rebuildGhcOptions
+                then id
+                else stripGhcOptions)
+           . map T.pack
+           . renderConfigureOpts
+           . (.configureOpts)
+   where
+    -- options set by Stack
+    isStackOpt :: Text -> Bool
+    isStackOpt t = any (`T.isPrefixOf` t)
+      [ "--dependency="
+      , "--constraint="
+      , "--package-db="
+      , "--libdir="
+      , "--bindir="
+      , "--datadir="
+      , "--libexecdir="
+      , "--sysconfdir"
+      , "--docdir="
+      , "--htmldir="
+      , "--haddockdir="
+      , "--enable-tests"
+      , "--enable-benchmarks"
+      , "--exact-configuration"
+      -- Treat these as causing dirtiness, to resolve
+      -- https://github.com/commercialhaskell/stack/issues/2984
+      --
+      -- , "--enable-library-profiling"
+      -- , "--enable-executable-profiling"
+      -- , "--enable-profiling"
+      ] || t == "--user"
+
+  (oldOpts, newOpts) = removeMatching (userOpts old) (userOpts new)
+
+  removeMatching (x:xs) (y:ys)
+    | x == y = removeMatching xs ys
+  removeMatching xs ys = (xs, ys)
+
+  newComponents =
+    new.components `Set.difference` old.components
+
+  pkgSrcName (CacheSrcLocal fp) = T.pack fp
+  pkgSrcName CacheSrcUpstream = "upstream source"
 
 psForceDirty :: PackageSource -> Bool
-psForceDirty (PSFilePath lp) = lpForceDirty lp
+psForceDirty (PSFilePath lp) = lp.forceDirty
 psForceDirty PSRemote{} = False
 
-psDirty
-  :: (MonadIO m, HasEnvConfig env, MonadReader env m)
+psDirty ::
+     (MonadIO m, HasEnvConfig env, MonadReader env m)
   => PackageSource
   -> m (Maybe (Set FilePath))
-psDirty (PSFilePath lp) = runMemoizedWith $ lpDirtyFiles lp
+psDirty (PSFilePath lp) = runMemoizedWith lp.dirtyFiles
 psDirty PSRemote {} = pure Nothing -- files never change in a remote package
 
 psLocal :: PackageSource -> Bool
@@ -922,336 +1336,103 @@ psLocation :: PackageSource -> InstallLocation
 psLocation (PSFilePath _) = Local
 psLocation PSRemote{} = Snap
 
--- | Get all of the dependencies for a given package, including build
--- tool dependencies.
-packageDepsWithTools :: Package -> M (Map PackageName DepValue)
-packageDepsWithTools p = do
-    -- Check whether the tool is on the PATH before warning about it.
-    warnings <- fmap catMaybes $ forM (Set.toList $ packageUnknownTools p) $
-      \name@(ExeName toolName) -> do
-        let settings = minimalEnvSettings { esIncludeLocals = True }
-        config <- view configL
-        menv <- liftIO $ configProcessContextSettings config settings
-        mfound <- runRIO menv $ findExecutable $ T.unpack toolName
-        case mfound of
-            Left _ -> pure $ Just $ ToolWarning name (packageName p)
-            Right _ -> pure Nothing
-    tell mempty { wWarnings = (map toolWarningText warnings ++) }
-    pure $ packageDeps p
-
--- | Warn about tools in the snapshot definition. States the tool name
--- expected and the package name using it.
-data ToolWarning = ToolWarning ExeName PackageName
-  deriving Show
-
-toolWarningText :: ToolWarning -> Text
-toolWarningText (ToolWarning (ExeName toolName) pkgName') =
-    "No packages found in snapshot which provide a " <>
-    T.pack (show toolName) <>
-    " executable, which is a build-tool dependency of " <>
-    T.pack (packageNameString pkgName')
-
--- | Strip out anything from the @Plan@ intended for the local database
-stripLocals :: Plan -> Plan
-stripLocals plan = plan
-    { planTasks = Map.filter checkTask $ planTasks plan
-    , planFinals = Map.empty
-    , planUnregisterLocal = Map.empty
-    , planInstallExes = Map.filter (/= Local) $ planInstallExes plan
-    }
-  where
-    checkTask task = taskLocation task == Snap
-
-stripNonDeps :: Set PackageName -> Plan -> Plan
-stripNonDeps deps plan = plan
-    { planTasks = Map.filter checkTask $ planTasks plan
-    , planFinals = Map.empty
-    , planInstallExes = Map.empty -- TODO maybe don't disable this?
-    }
-  where
-    checkTask task = taskProvides task `Set.member` missingForDeps
-    providesDep task = pkgName (taskProvides task) `Set.member` deps
-    missing = Map.fromList $ map (taskProvides &&& tcoMissing . taskConfigOpts) $
-              Map.elems (planTasks plan)
-    missingForDeps = flip execState mempty $ do
-      for_ (Map.elems $ planTasks plan) $ \task ->
-        when (providesDep task) $ collectMissing mempty (taskProvides task)
-
-    collectMissing dependents pid = do
-      when (pid `elem` dependents) $ error $
-        "Unexpected: task cycle for " <> packageNameString (pkgName pid)
-      modify'(<> Set.singleton pid)
-      mapM_ (collectMissing (pid:dependents)) (fromMaybe mempty $ M.lookup pid missing)
-
--- | Is the given package/version combo defined in the snapshot or in the global database?
+-- | For the given package, warn about any unknown tools that are not on the
+-- PATH and not one of the executables of the package.
+checkAndWarnForUnknownTools :: Package -> M ()
+checkAndWarnForUnknownTools p = do
+  let unknownTools = Set.toList $ packageUnknownTools p
+  -- Check whether the tool is on the PATH or a package executable before
+  -- warning about it.
+  warnings <-
+    fmap catMaybes $ forM unknownTools $ \toolName ->
+      runMaybeT $ notOnPath toolName *> notPackageExe toolName *> warn toolName
+  tell mempty { wWarnings = (map toolWarningText warnings ++) }
+ where
+  -- From Cabal 2.0, build-tools can specify a pre-built executable that should
+  -- already be on the PATH.
+  notOnPath toolName = MaybeT $ do
+    let settings = minimalEnvSettings { includeLocals = True }
+    config <- view configL
+    menv <- liftIO $ config.processContextSettings settings
+    eFound <- runRIO menv $ findExecutable $ T.unpack toolName
+    skipIf $ isRight eFound
+  -- From Cabal 1.12, build-tools can specify another executable in the same
+  -- package.
+  notPackageExe toolName =
+    MaybeT $ skipIf $
+      collectionMember (unqualCompFromText toolName) p.executables
+  warn name = MaybeT . pure . Just $ ToolWarning (ExeName name) p.name
+  skipIf p' = pure $ if p' then Nothing else Just ()
+
+toolWarningText :: ToolWarning -> StyleDoc
+toolWarningText (ToolWarning (ExeName toolName) pkgName') = fillSep
+  [ flow "No packages found in snapshot which provide a"
+  , style PkgComponent (fromString $ show toolName)
+  , flow "executable, which is a build-tool dependency of"
+  , style Current (fromPackageName pkgName')
+  ]
+
+-- | Is the given package/version combo defined in the snapshot or in the global
+-- database?
 inSnapshot :: PackageName -> Version -> M Bool
 inSnapshot name version = do
-    ctx <- ask
-    pure $ fromMaybe False $ do
-        ps <- Map.lookup name (combinedMap ctx)
-        case ps of
-            PIOnlySource (PSRemote _ srcVersion FromSnapshot _) ->
-                pure $ srcVersion == version
-            PIBoth (PSRemote _ srcVersion FromSnapshot _) _ ->
-                pure $ srcVersion == version
-            -- OnlyInstalled occurs for global database
-            PIOnlyInstalled loc (Library pid _gid _lic) ->
-              assert (loc == Snap) $
-              assert (pkgVersion pid == version) $
-              Just True
-            _ -> pure False
-
-data ConstructPlanException
-    = DependencyCycleDetected [PackageName]
-    | DependencyPlanFailures Package (Map PackageName (VersionRange, LatestApplicableVersion, BadDependency))
-    | UnknownPackage PackageName -- TODO perhaps this constructor will be removed, and BadDependency will handle it all
-    -- ^ Recommend adding to extra-deps, give a helpful version number?
-    deriving (Typeable, Eq, Show)
-
--- | The latest applicable version and it's latest Cabal file revision.
--- For display purposes only, Nothing if package not found
-type LatestApplicableVersion = Maybe (Version, BlobKey)
-
--- | Reason why a dependency was not used
-data BadDependency
-    = NotInBuildPlan
-    | Couldn'tResolveItsDependencies Version
-    | DependencyMismatch Version
-    | HasNoLibrary
-    -- ^ See description of 'DepType'
-    | BDDependencyCycleDetected ![PackageName]
-    deriving (Typeable, Eq, Ord, Show)
+  ctx <- ask
+  pure $ fromMaybe False $
+    Map.lookup name ctx.combinedMap >>= \case
+      PIOnlySource (PSRemote _ srcVersion FromSnapshot _) ->
+        pure $ srcVersion == version
+      PIBoth (PSRemote _ srcVersion FromSnapshot _) _ ->
+        pure $ srcVersion == version
+      -- OnlyInstalled occurs for global database
+      PIOnlyInstalled loc (Library pid _) ->
+        assert (loc == Snap) $
+        assert (pkgVersion pid == version) $
+        Just True
+      _ -> pure False
 
 -- TODO: Consider intersecting version ranges for multiple deps on a
 -- package.  This is why VersionRange is in the parent map.
 
-pprintExceptions
-    :: [ConstructPlanException]
-    -> Path Abs File
-    -> Path Abs Dir
-    -> ParentMap
-    -> Set PackageName
-    -> Map PackageName [PackageName]
-    -> StyleDoc
-pprintExceptions exceptions stackYaml stackRoot parentMap wanted' prunedGlobalDeps =
-    mconcat $
-      [ flow "While constructing the build plan, the following exceptions were encountered:"
-      , line <> line
-      , mconcat (L.intersperse (line <> line) (mapMaybe pprintException exceptions'))
-      , line <> line
-      , flow "Some different approaches to resolving this:"
-      , line <> line
-      ] ++
-      (if not onlyHasDependencyMismatches then [] else
-         [ "  *" <+> align (flow "Set 'allow-newer: true' in " <+> pretty (defaultUserConfigPath stackRoot) <+> "to ignore all version constraints and build anyway.")
-         , line <> line
-         ]
-      ) ++ addExtraDepsRecommendations
-
-  where
-    exceptions' = {- should we dedupe these somehow? nubOrd -} exceptions
-
-    addExtraDepsRecommendations
-      | Map.null extras = []
-      | (Just _) <- Map.lookup (mkPackageName "base") extras =
-          [ "  *" <+> align (flow "Build requires unattainable version of base. Since base is a part of GHC, you most likely need to use a different GHC version with the matching base.")
-           , line
-          ]
-      | otherwise =
-         [ "  *" <+> align
-           (style Recommendation (flow "Recommended action:") <+>
-            flow "try adding the following to your extra-deps in" <+>
-            pretty stackYaml <> ":")
-         , line <> line
-         , vsep (map pprintExtra (Map.toList extras))
-         , line
-         ]
-
-    extras = Map.unions $ map getExtras exceptions'
-    getExtras DependencyCycleDetected{} = Map.empty
-    getExtras UnknownPackage{} = Map.empty
-    getExtras (DependencyPlanFailures _ m) =
-       Map.unions $ map go $ Map.toList m
-     where
-       -- TODO: Likely a good idea to distinguish these to the user.  In particular, for DependencyMismatch
-       go (name, (_range, Just (version,cabalHash), NotInBuildPlan)) =
-           Map.singleton name (version,cabalHash)
-       go (name, (_range, Just (version,cabalHash), DependencyMismatch{})) =
-           Map.singleton name (version, cabalHash)
-       go _ = Map.empty
-    pprintExtra (name, (version, BlobKey cabalHash cabalSize)) =
-      let cfInfo = CFIHash cabalHash (Just cabalSize)
-          packageIdRev = PackageIdentifierRevision name version cfInfo
-       in fromString ("- " ++ T.unpack (utf8BuilderToText (RIO.display packageIdRev)))
-
-    allNotInBuildPlan = Set.fromList $ concatMap toNotInBuildPlan exceptions'
-    toNotInBuildPlan (DependencyPlanFailures _ pDeps) =
-      map fst $ filter (\(_, (_, _, badDep)) -> badDep == NotInBuildPlan) $ Map.toList pDeps
-    toNotInBuildPlan _ = []
-
-    -- This checks if 'allow-newer: true' could resolve all issues.
-    onlyHasDependencyMismatches = all go exceptions'
-      where
-        go DependencyCycleDetected{} = False
-        go UnknownPackage{} = False
-        go (DependencyPlanFailures _ m) =
-          all (\(_, _, depErr) -> isMismatch depErr) (M.elems m)
-        isMismatch DependencyMismatch{} = True
-        isMismatch Couldn'tResolveItsDependencies{} = True
-        isMismatch _ = False
-
-    pprintException (DependencyCycleDetected pNames) = Just $
-        flow "Dependency cycle detected in packages:" <> line <>
-        indent 4 (encloseSep "[" "]" "," (map (style Error . fromString . packageNameString) pNames))
-    pprintException (DependencyPlanFailures pkg pDeps) =
-        case mapMaybe pprintDep (Map.toList pDeps) of
-            [] -> Nothing
-            depErrors -> Just $
-                flow "In the dependencies for" <+> pkgIdent <>
-                pprintFlags (packageFlags pkg) <> ":" <> line <>
-                indent 4 (vsep depErrors) <>
-                case getShortestDepsPath parentMap wanted' (packageName pkg) of
-                    Nothing -> line <> flow "needed for unknown reason - stack invariant violated."
-                    Just [] -> line <> flow "needed since" <+> pkgName' <+> flow "is a build target."
-                    Just (target:path) -> line <> flow "needed due to" <+> encloseSep "" "" " -> " pathElems
-                      where
-                        pathElems =
-                            [style Target . fromString . packageIdentifierString $ target] ++
-                            map (fromString . packageIdentifierString) path ++
-                            [pkgIdent]
-              where
-                pkgName' = style Current . fromString . packageNameString $ packageName pkg
-                pkgIdent = style Current . fromString . packageIdentifierString $ packageIdentifier pkg
-    -- Skip these when they are redundant with 'NotInBuildPlan' info.
-    pprintException (UnknownPackage name)
-        | name `Set.member` allNotInBuildPlan = Nothing
-        | name `Set.member` wiredInPackages =
-            Just $ flow "Can't build a package with same name as a wired-in-package:" <+> (style Current . fromString . packageNameString $ name)
-        | Just pruned <- Map.lookup name prunedGlobalDeps =
-            let prunedDeps = map (style Current . fromString . packageNameString) pruned
-            in Just $ flow "Can't use GHC boot package" <+>
-                      (style Current . fromString . packageNameString $ name) <+>
-                      flow "when it has an overridden dependency (issue #4510);" <+>
-                      flow "you need to add the following as explicit dependencies to the project:" <+>
-                      line <+> encloseSep "" "" ", " prunedDeps
-        | otherwise = Just $ flow "Unknown package:" <+> (style Current . fromString . packageNameString $ name)
-
-    pprintFlags flags
-        | Map.null flags = ""
-        | otherwise = parens $ sep $ map pprintFlag $ Map.toList flags
-    pprintFlag (name, True) = "+" <> fromString (flagNameString name)
-    pprintFlag (name, False) = "-" <> fromString (flagNameString name)
-
-    pprintDep (name, (range, mlatestApplicable, badDep)) = case badDep of
-        NotInBuildPlan
-          | name `elem` fold prunedGlobalDeps -> Just $
-              style Error (fromString $ packageNameString name) <+>
-              align ((if range == Cabal.anyVersion
-                        then flow "needed"
-                        else flow "must match" <+> goodRange) <> "," <> softline <>
-                     flow "but this GHC boot package has been pruned (issue #4510);" <+>
-                     flow "you need to add the package explicitly to extra-deps" <+>
-                     latestApplicable Nothing)
-          | otherwise -> Just $
-              style Error (fromString $ packageNameString name) <+>
-              align ((if range == Cabal.anyVersion
-                        then flow "needed"
-                        else flow "must match" <+> goodRange) <> "," <> softline <>
-                     flow "but the Stack configuration has no specified version" <+>
-                     latestApplicable Nothing)
-        -- TODO: For local packages, suggest editing constraints
-        DependencyMismatch version -> Just $
-            (style Error . fromString . packageIdentifierString) (PackageIdentifier name version) <+>
-            align (flow "from Stack configuration does not match" <+> goodRange <+>
-                   latestApplicable (Just version))
-        -- I think the main useful info is these explain why missing
-        -- packages are needed. Instead lets give the user the shortest
-        -- path from a target to the package.
-        Couldn'tResolveItsDependencies _version -> Nothing
-        HasNoLibrary -> Just $
-            style Error (fromString $ packageNameString name) <+>
-            align (flow "is a library dependency, but the package provides no library")
-        BDDependencyCycleDetected names -> Just $
-            style Error (fromString $ packageNameString name) <+>
-            align (flow $ "dependency cycle detected: " ++ L.intercalate ", " (map packageNameString names))
-      where
-        goodRange = style Good (fromString (Cabal.display range))
-        latestApplicable mversion =
-            case mlatestApplicable of
-                Nothing
-                    | isNothing mversion ->
-                        flow "(no package with that name found, perhaps there \
-                             \is a typo in a package's build-depends or an \
-                             \omission from the stack.yaml packages list?)"
-                    | otherwise -> ""
-                Just (laVer, _)
-                    | Just laVer == mversion -> softline <>
-                        flow "(latest matching version is specified)"
-                    | otherwise -> softline <>
-                        flow "(latest matching version is" <+> style Good (fromString $ versionString laVer) <> ")"
-
--- | Get the shortest reason for the package to be in the build plan. In
--- other words, trace the parent dependencies back to a 'wanted'
--- package.
-getShortestDepsPath
-    :: ParentMap
-    -> Set PackageName
-    -> PackageName
-    -> Maybe [PackageIdentifier]
-getShortestDepsPath (MonoidMap parentsMap) wanted' name =
-    if Set.member name wanted'
-        then Just []
-        else case M.lookup name parentsMap of
-            Nothing -> Nothing
-            Just (_, parents) -> Just $ findShortest 256 paths0
-              where
-                paths0 = M.fromList $ map (\(ident, _) -> (pkgName ident, startDepsPath ident)) parents
-  where
-    -- The 'paths' map is a map from PackageName to the shortest path
-    -- found to get there. It is the frontier of our breadth-first
-    -- search of dependencies.
-    findShortest :: Int -> Map PackageName DepsPath -> [PackageIdentifier]
-    findShortest fuel _ | fuel <= 0 =
-        [PackageIdentifier (mkPackageName "stack-ran-out-of-jet-fuel") (mkVersion [0])]
-    findShortest _ paths | M.null paths = []
-    findShortest fuel paths =
-        case targets of
-            [] -> findShortest (fuel - 1) $ M.fromListWith chooseBest $ concatMap extendPath recurses
-            _ -> let (DepsPath _ _ path) = L.minimum (map snd targets) in path
-      where
-        (targets, recurses) = L.partition (\(n, _) -> n `Set.member` wanted') (M.toList paths)
-    chooseBest :: DepsPath -> DepsPath -> DepsPath
-    chooseBest x y = max x y
-    -- Extend a path to all its parents.
-    extendPath :: (PackageName, DepsPath) -> [(PackageName, DepsPath)]
-    extendPath (n, dp) =
-        case M.lookup n parentsMap of
-            Nothing -> []
-            Just (_, parents) -> map (\(pkgId, _) -> (pkgName pkgId, extendDepsPath pkgId dp)) parents
-
-data DepsPath = DepsPath
-    { dpLength :: Int -- ^ Length of dpPath
-    , dpNameLength :: Int -- ^ Length of package names combined
-    , dpPath :: [PackageIdentifier] -- ^ A path where the packages later
-                                    -- in the list depend on those that
-                                    -- come earlier
-    }
-    deriving (Eq, Ord, Show)
-
-startDepsPath :: PackageIdentifier -> DepsPath
-startDepsPath ident = DepsPath
-    { dpLength = 1
-    , dpNameLength = length (packageNameString (pkgName ident))
-    , dpPath = [ident]
-    }
-
-extendDepsPath :: PackageIdentifier -> DepsPath -> DepsPath
-extendDepsPath ident dp = DepsPath
-    { dpLength = dpLength dp + 1
-    , dpNameLength = dpNameLength dp + length (packageNameString (pkgName ident))
-    , dpPath = [ident]
-    }
+logDebugPlanS ::
+     (HasCallStack, HasRunner env, MonadIO m, MonadReader env m)
+  => LogSource
+  -> Utf8Builder
+  -> m ()
+logDebugPlanS s msg = do
+  debugPlan <- view $ globalOptsL . to (.planInLog)
+  when debugPlan $ logDebugS s msg
+
+-- | A function to summarise a result. Assumes that 'Left' is an error and
+-- 'Right' is not. Intended to be used to annotate, so includes an initial space
+-- character.
+summariseResult :: Either a b -> Utf8Builder
+summariseResult res = " (" <> either (const "error") (const "ok") res <> ")"
+
+-- | A function to yield a 'PackageInfo' value from: (1) a 'PackageSource'
+-- value; and (2) a pair of an 'InstallLocation' value and an 'Installed' value.
+-- Checks that the version of the 'PackageSource' value and the version of the
+-- `Installed` value are the same.
+combineSourceInstalled ::
+     PackageSource
+  -> (InstallLocation, Installed)
+  -> PackageInfo
+combineSourceInstalled ps (location, installed) =
+  assert (psVersion ps == installedVersion installed) $
+    case location of
+      -- Always trust something in the snapshot
+      Snap -> PIOnlyInstalled location installed
+      Local -> PIBoth ps installed
 
--- Switch this to 'True' to enable some debugging putStrLn in this module
-planDebug :: MonadIO m => String -> m ()
-planDebug = if False then liftIO . putStrLn else \_ -> pure ()
+-- | A function to yield a 'CombinedMap' value from: (1) a dictionary of package
+-- names, and where the source code of the named package is located; and (2) an
+-- 'InstalledMap' value.
+combineMap :: Map PackageName PackageSource -> InstalledMap -> CombinedMap
+combineMap = Map.merge
+  (Map.mapMissing (\_ s -> PIOnlySource s))
+  (Map.mapMissing (\_ i -> uncurry PIOnlyInstalled i))
+  (Map.zipWithMatched (\_ s i -> combineSourceInstalled s i))
+
+toCachePkgSrc :: PackageSource -> CachePkgSrc
+toCachePkgSrc (PSFilePath lp) =
+  CacheSrcLocal (toFilePath (parent lp.cabalFP))
+toCachePkgSrc PSRemote{} = CacheSrcUpstream
diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
index 10ee48323a..684d72f3c0 100644
--- a/src/Stack/Build/Execute.hs
+++ b/src/Stack/Build/Execute.hs
@@ -1,2322 +1,732 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE DataKinds             #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE RankNTypes            #-}
-{-# LANGUAGE RecordWildCards       #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-{-# LANGUAGE TupleSections         #-}
-{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE TypeFamilies        #-}
+
+{-|
+Module      : Stack.Build.Execute
+Description : Perform a build.
+License     : BSD-3-Clause
+
+Perform a build.
+-}
 
--- | Perform a build
 module Stack.Build.Execute
-    ( printPlan
-    , preFetch
-    , executePlan
-    -- * Running Setup.hs
-    , ExecuteEnv
-    , withExecuteEnv
-    , withSingleContext
-    , ExcludeTHLoading(..)
-    , KeepOutputOpen(..)
-    ) where
+  ( printPlan
+  , preFetch
+  , executePlan
+  -- * Running Setup.hs
+  , ExcludeTHLoading (..)
+  , KeepOutputOpen (..)
+  -- * Exported for testing
+  , missingToDeps
+  , intraPackageDeps
+  , finalTestsAndBenches
+  ) where
 
 import           Control.Concurrent.Execute
-import           Control.Concurrent.STM (check)
-import           Stack.Prelude hiding (Display (..))
-import           Crypto.Hash
-import           Data.Attoparsec.Text hiding (try)
-import qualified Data.ByteArray as Mem (convert)
-import qualified Data.ByteString as S
-import qualified Data.ByteString.Builder
-import qualified Data.ByteString.Lazy as BL
-import qualified Data.ByteString.Base64.URL as B64URL
-import           Data.Char (isSpace)
-import           Conduit
-import qualified Data.Conduit.Binary as CB
-import qualified Data.Conduit.Filesystem as CF
-import qualified Data.Conduit.List as CL
-import           Data.Conduit.Process.Typed (createSource)
-import qualified Data.Conduit.Text as CT
+                   ( Action (..), ActionId (..), ActionType (..)
+                   , Concurrency (..), runActions
+                   )
+import           Control.Concurrent.STM ( check )
+import           Control.Monad.Extra ( whenJust )
 import qualified Data.List as L
-import           Data.List.NonEmpty (nonEmpty)
-import qualified Data.List.NonEmpty as NonEmpty (toList)
-import           Data.List.Split (chunksOf)
-import qualified Data.Map.Strict as M
+import           Data.List.Split ( chunksOf )
+import qualified Data.Map.Merge.Strict as Map
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import qualified Data.Text as T
-import           Data.Text.Encoding (decodeUtf8)
-import           Data.Tuple
-import           Data.Time (ZonedTime, getZonedTime, formatTime, defaultTimeLocale)
-import qualified Data.ByteString.Char8 as S8
-import qualified Distribution.PackageDescription as C
-import qualified Distribution.Simple.Build.Macros as C
-import           Distribution.System            (OS (Windows),
-                                                 Platform (Platform))
-import qualified Distribution.Text as C
-import           Distribution.Types.PackageName (mkPackageName)
-import           Distribution.Types.UnqualComponentName (mkUnqualComponentName)
-import           Distribution.Verbosity (showForCabal)
-import           Distribution.Version (mkVersion)
-import           Path
-import           Path.CheckInstall
-import           Path.Extra (toFilePathNoTrailingSep, rejectMissingFile)
-import           Path.IO hiding (findExecutable, makeAbsolute, withSystemTempDir)
-import qualified RIO
-import           Stack.Build.Cache
+import           Data.Tuple ( swap )
+import           Distribution.System ( OS (..), Platform (..) )
+import           Path ( (</>),  parent )
+import           Path.CheckInstall ( warnInstallSearchPathIssues )
+import           Path.Extra ( forgivingResolveFile, rejectMissingFile )
+import           Path.IO ( ensureDir )
+import           RIO.NonEmpty ( nonEmpty )
+import qualified RIO.NonEmpty as NE
+import           RIO.Process ( HasProcessContext (..), proc, runProcess_ )
+import           Stack.Build.ExecuteEnv ( ExecuteEnv (..), withExecuteEnv )
+import           Stack.Build.ExecutePackage
+                   ( singleBench, singleBuild, singleTest )
 import           Stack.Build.Haddock
-import           Stack.Build.Installed
-import           Stack.Build.Source
-import           Stack.Build.Target
-import           Stack.Config
-import           Stack.Constants
-import           Stack.Constants.Config
+                   ( generateDepsHaddockIndex
+                   , generateLocalHaddockForHackageArchives
+                   , generateLocalHaddockIndex, generateSnapHaddockIndex
+                   , openHaddocksInBrowser
+                   )
+import           Stack.Constants ( bindirSuffix )
 import           Stack.Coverage
-import           Stack.DefaultColorWhen (defaultColorWhen)
-import           Stack.GhcPkg
-import           Stack.Package
-import           Stack.PackageDump
+                   ( deleteHpcReports, generateHpcMarkupIndex
+                   , generateHpcUnifiedReport
+                   )
+import           Stack.GhcPkg ( unregisterGhcPkgIds )
+import           Stack.Prelude
 import           Stack.Types.Build
-import           Stack.Types.Compiler
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
-import           Stack.Types.NamedComponent
+                   ( ExcludeTHLoading (..), KeepOutputOpen (..) )
+import           Stack.Types.Build.Exception ( BuildPrettyException (..) )
+import           Stack.Types.BuildOpts
+                   ( BenchmarkOpts (..), BuildOpts (..), TestOpts (..) )
+import           Stack.Types.BuildOptsCLI ( BuildOptsCLI (..) )
+import           Stack.Types.BuildOptsMonoid ( ProgressBarFormat (..) )
+import           Stack.Types.CompilerPaths ( HasCompiler (..), getGhcPkgExe )
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName, unqualCompToString )
+import           Stack.Types.Config ( Config (..), HasConfig (..), buildOptsL )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts (..) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig
+                   ( HasEnvConfig (..), bindirCompilerTools
+                   , installationRootDeps, installationRootLocal
+                   , packageDatabaseLocal
+                   )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.Installed
+                   ( InstallLocation (..), InstalledMap
+                   , installedPackageIdentifier
+                   )
 import           Stack.Types.Package
-import           Stack.Types.Version
+                   ( LocalPackage (..), Package (..), packageIdentifier )
+import           Stack.Types.NamedComponent
+                   ( NamedComponent (..), benchComponents, testComponents )
+import           Stack.Types.Plan
+                   ( ComponentKey (..), Plan (..), Task (..)
+                   , TaskConfigOpts (..), TaskType (..)
+                   , componentKeyPkgName, taskLocation, taskProvides
+                   )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( terminalL, viewExecutablePath )
+import           Stack.Types.SourceMap ( Target )
 import qualified System.Directory as D
-import           System.Environment (getExecutablePath, lookupEnv)
-import           System.FileLock (withTryFileLock, SharedExclusive (Exclusive), withFileLock)
 import qualified System.FilePath as FP
-import           System.IO.Error (isDoesNotExistError)
-import           System.PosixCompat.Files (createLink, modificationTime, getFileStatus)
-import           RIO.PrettyPrint
-import           RIO.Process
-import           Pantry.Internal.Companion
-import           System.Random (randomIO)
-
--- | Has an executable been built or not?
-data ExecutableBuildStatus
-    = ExecutableBuilt
-    | ExecutableNotBuilt
-  deriving (Show, Eq, Ord)
 
--- | Fetch the packages necessary for a build, for example in combination with a dry run.
+-- | Fetch the packages necessary for a build, for example in combination with
+-- a dry run.
 preFetch :: HasEnvConfig env => Plan -> RIO env ()
 preFetch plan
-    | Set.null pkgLocs = logDebug "Nothing to fetch"
-    | otherwise = do
-        logDebug $
-            "Prefetching: " <>
-            mconcat (L.intersperse ", " (RIO.display <$> Set.toList pkgLocs))
-        fetchPackages pkgLocs
-  where
-    pkgLocs = Set.unions $ map toPkgLoc $ Map.elems $ planTasks plan
-
-    toPkgLoc task =
-        case taskType task of
-            TTLocalMutable{} -> Set.empty
-            TTRemotePackage _ _ pkgloc -> Set.singleton pkgloc
+  | Set.null pkgLocs = logDebug "Nothing to fetch"
+  | otherwise = do
+      logDebug $
+           "Prefetching: "
+        <> mconcat (L.intersperse ", " (display <$> Set.toList pkgLocs))
+      fetchPackages pkgLocs
+ where
+  pkgLocs = Set.unions $ map toPkgLoc $ Map.elems plan.tasks
+
+  toPkgLoc task =
+    case task.taskType of
+      TTLocalMutable{} -> Set.empty
+      TTRemotePackage _ _ pkgloc -> Set.singleton pkgloc
 
 -- | Print a description of build plan for human consumption.
-printPlan :: HasRunner env => Plan -> RIO env ()
+printPlan :: HasEnvConfig env => Plan -> RIO env ()
 printPlan plan = do
-    case Map.elems $ planUnregisterLocal plan of
-        [] -> logInfo "No packages would be unregistered."
-        xs -> do
-            logInfo "Would unregister locally:"
-            forM_ xs $ \(ident, reason) -> logInfo $
-                fromString (packageIdentifierString ident) <>
-                if T.null reason
-                  then ""
-                  else " (" <> RIO.display reason <> ")"
-
-    logInfo ""
-
-    case Map.elems $ planTasks plan of
-        [] -> logInfo "Nothing to build."
-        xs -> do
-            logInfo "Would build:"
-            mapM_ (logInfo . displayTask) xs
-
-    let hasTests = not . Set.null . testComponents . taskComponents
-        hasBenches = not . Set.null . benchComponents . taskComponents
-        tests = Map.elems $ Map.filter hasTests $ planFinals plan
-        benches = Map.elems $ Map.filter hasBenches $ planFinals plan
-
-    unless (null tests) $ do
-        logInfo ""
-        logInfo "Would test:"
-        mapM_ (logInfo . displayTask) tests
-    unless (null benches) $ do
-        logInfo ""
-        logInfo "Would benchmark:"
-        mapM_ (logInfo . displayTask) benches
-
-    logInfo ""
-
-    case Map.toList $ planInstallExes plan of
-        [] -> logInfo "No executables to be installed."
-        xs -> do
-            logInfo "Would install executables:"
-            forM_ xs $ \(name, loc) -> logInfo $
-                RIO.display name <>
-                " from " <>
-                (case loc of
-                   Snap -> "snapshot"
-                   Local -> "local") <>
-                " database"
+  case Map.elems plan.unregisterLocal of
+    [] -> prettyInfo $
+               flow "No packages would be unregistered."
+            <> line
+    xs -> do
+      let unregisterMsg (ident, reason) = fillSep $
+              fromString (packageIdentifierString ident)
+            : [ parens $ flow (T.unpack reason) | not $ T.null reason ]
+      prettyInfo $
+           flow "Would unregister locally:"
+        <> line
+        <> bulletedList (map unregisterMsg xs)
+        <> line
+
+  case Map.elems plan.tasks of
+    [] -> prettyInfo $
+               flow "Nothing to build."
+            <> line
+    xs -> do
+      prettyInfo $
+           flow "Would build:"
+        <> line
+        <> bulletedList (map displayTask xs)
+        <> line
+
+  buildOpts <- view buildOptsL
+  let hasTests = not . Set.null . testComponents . taskComponents
+      hasBenches = not . Set.null . benchComponents . taskComponents
+      tests = Map.elems $ Map.filter hasTests plan.finals
+      benches = Map.elems $ Map.filter hasBenches plan.finals
+      runTests = buildOpts.testOpts.runTests
+      runBenchmarks = buildOpts.benchmarkOpts.runBenchmarks
+
+  unless (null tests) $
+    if runTests
+      then
+        prettyInfo $
+             flow "Would test:"
+          <> line
+          <> bulletedList (map displayTask tests)
+          <> line
+      else
+        prettyInfo $
+             fillSep
+               [ flow "Would not test, as running disabled by"
+               , style Shell "--no-run-tests"
+               , "flag."
+               ]
+          <> line
+
+  unless (null benches) $
+    if runBenchmarks
+      then
+        prettyInfo $
+             flow "Would benchmark:"
+          <> line
+          <> bulletedList (map displayTask benches)
+          <> line
+      else
+        prettyInfo $
+             fillSep
+               [ flow "Would not benchmark, as running disabled by"
+               , style Shell "--no-run-benchmarks"
+               , "flag."
+               ]
+          <> line
+
+  case Map.toList plan.installExes of
+    [] -> prettyInfo $
+               flow "No executables to be installed."
+            <> line
+    xs -> do
+      let executableMsg (name, loc) = fillSep $
+              fromString (unqualCompToString name)
+            : "from"
+            : ( case loc of
+                  Snap -> "snapshot" :: StyleDoc
+                  Local -> "local" :: StyleDoc
+              )
+            : ["database."]
+      prettyInfo $
+           flow "Would install executables:"
+        <> line
+        <> bulletedList (map executableMsg xs)
+        <> line
 
 -- | For a dry run
-displayTask :: Task -> Utf8Builder
-displayTask task =
-    fromString (packageIdentifierString (taskProvides task)) <>
-    ": database=" <>
-    (case taskLocation task of
-        Snap -> "snapshot"
-        Local -> "local") <>
-    ", source=" <>
-    (case taskType task of
-        TTLocalMutable lp -> fromString $ toFilePath $ parent $ lpCabalFile lp
-        TTRemotePackage _ _ pl -> RIO.display pl) <>
-    (if Set.null missing
-        then ""
-        else ", after: " <>
-             mconcat (L.intersperse "," (fromString . packageIdentifierString <$> Set.toList missing)))
-  where
-    missing = tcoMissing $ taskConfigOpts task
-
-data ExecuteEnv = ExecuteEnv
-    { eeConfigureLock  :: !(MVar ())
-    , eeInstallLock    :: !(MVar ())
-    , eeBuildOpts      :: !BuildOpts
-    , eeBuildOptsCLI   :: !BuildOptsCLI
-    , eeBaseConfigOpts :: !BaseConfigOpts
-    , eeGhcPkgIds      :: !(TVar (Map PackageIdentifier Installed))
-    , eeTempDir        :: !(Path Abs Dir)
-    , eeSetupHs        :: !(Path Abs File)
-    -- ^ Temporary Setup.hs for simple builds
-    , eeSetupShimHs    :: !(Path Abs File)
-    -- ^ Temporary SetupShim.hs, to provide access to initial-build-steps
-    , eeSetupExe       :: !(Maybe (Path Abs File))
-    -- ^ Compiled version of eeSetupHs
-    , eeCabalPkgVer    :: !Version
-    , eeTotalWanted    :: !Int
-    , eeLocals         :: ![LocalPackage]
-    , eeGlobalDB       :: !(Path Abs Dir)
-    , eeGlobalDumpPkgs :: !(Map GhcPkgId DumpPackage)
-    , eeSnapshotDumpPkgs :: !(TVar (Map GhcPkgId DumpPackage))
-    , eeLocalDumpPkgs  :: !(TVar (Map GhcPkgId DumpPackage))
-    , eeLogFiles       :: !(TChan (Path Abs Dir, Path Abs File))
-    , eeCustomBuilt    :: !(IORef (Set PackageName))
-    -- ^ Stores which packages with custom-setup have already had their
-    -- Setup.hs built.
-    , eeLargestPackageName :: !(Maybe Int)
-    -- ^ For nicer interleaved output: track the largest package name size
-    , eePathEnvVar :: !Text
-    -- ^ Value of the PATH environment variable
-    }
-
-buildSetupArgs :: [String]
-buildSetupArgs =
-     [ "-rtsopts"
-     , "-threaded"
-     , "-clear-package-db"
-     , "-global-package-db"
-     , "-hide-all-packages"
-     , "-package"
-     , "base"
-     , "-main-is"
-     , "StackSetupShim.mainOverride"
+displayTask :: Task -> StyleDoc
+displayTask task = fillSep $
+     [ fromString (packageIdentifierString (taskProvides task)) <> ":"
+     ,    "database="
+       <> ( case taskLocation task of
+              Snap -> "snapshot" :: StyleDoc
+              Local -> "local" :: StyleDoc
+          )
+       <> ","
+     ,    "source="
+       <> ( case task.taskType of
+              TTLocalMutable lp -> pretty $ parent lp.cabalFP
+              TTRemotePackage _ _ pl -> fromString $ T.unpack $ textDisplay pl
+          )
+       <> if Set.null missing
+            then mempty
+            else ","
      ]
-
-simpleSetupCode :: Builder
-simpleSetupCode = "import Distribution.Simple\nmain = defaultMain"
-
-simpleSetupHash :: String
-simpleSetupHash =
-    T.unpack $ decodeUtf8 $ S.take 8 $ B64URL.encode $ Mem.convert $ hashWith SHA256 $
-    toStrictBytes $
-    Data.ByteString.Builder.toLazyByteString $
-    encodeUtf8Builder (T.pack (unwords buildSetupArgs)) <> setupGhciShimCode <> simpleSetupCode
-
--- | Get a compiled Setup exe
-getSetupExe :: HasEnvConfig env
-            => Path Abs File -- ^ Setup.hs input file
-            -> Path Abs File -- ^ SetupShim.hs input file
-            -> Path Abs Dir -- ^ temporary directory
-            -> RIO env (Maybe (Path Abs File))
-getSetupExe setupHs setupShimHs tmpdir = do
-    wc <- view $ actualCompilerVersionL.whichCompilerL
-    platformDir <- platformGhcRelDir
-    config <- view configL
-    cabalVersionString <- view $ cabalVersionL.to versionString
-    actualCompilerVersionString <- view $ actualCompilerVersionL.to compilerVersionString
-    platform <- view platformL
-    let baseNameS = concat
-            [ "Cabal-simple_"
-            , simpleSetupHash
-            , "_"
-            , cabalVersionString
-            , "_"
-            , actualCompilerVersionString
-            ]
-        exeNameS = baseNameS ++
-            case platform of
-                Platform _ Windows -> ".exe"
-                _ -> ""
-        outputNameS =
-            case wc of
-                Ghc -> exeNameS
-        setupDir =
-            view stackRootL config </>
-            relDirSetupExeCache </>
-            platformDir
-
-    exePath <- (setupDir </>) <$> parseRelFile exeNameS
-
-    exists <- liftIO $ D.doesFileExist $ toFilePath exePath
-
-    if exists
-        then pure $ Just exePath
-        else do
-            tmpExePath <- fmap (setupDir </>) $ parseRelFile $ "tmp-" ++ exeNameS
-            tmpOutputPath <- fmap (setupDir </>) $ parseRelFile $ "tmp-" ++ outputNameS
-            ensureDir setupDir
-            let args = buildSetupArgs ++
-                    [ "-package"
-                    , "Cabal-" ++ cabalVersionString
-                    , toFilePath setupHs
-                    , toFilePath setupShimHs
-                    , "-o"
-                    , toFilePath tmpOutputPath
-                    ]
-            compilerPath <- getCompilerPath
-            withWorkingDir (toFilePath tmpdir) $ proc (toFilePath compilerPath) args (\pc0 -> do
-              let pc = setStdout (useHandleOpen stderr) pc0
-              runProcess_ pc)
-                `catch` \ece ->
-                    throwM $ SetupHsBuildFailure (eceExitCode ece) Nothing compilerPath args Nothing []
-            renameFile tmpExePath exePath
-            pure $ Just exePath
-
--- | Execute a function that takes an 'ExecuteEnv'.
-withExecuteEnv :: forall env a. HasEnvConfig env
-               => BuildOpts
-               -> BuildOptsCLI
-               -> BaseConfigOpts
-               -> [LocalPackage]
-               -> [DumpPackage] -- ^ global packages
-               -> [DumpPackage] -- ^ snapshot packages
-               -> [DumpPackage] -- ^ local packages
-               -> Maybe Int -- ^ largest package name, for nicer interleaved output
-               -> (ExecuteEnv -> RIO env a)
-               -> RIO env a
-withExecuteEnv bopts boptsCli baseConfigOpts locals globalPackages snapshotPackages localPackages mlargestPackageName inner =
-    createTempDirFunction stackProgName $ \tmpdir -> do
-        configLock <- liftIO $ newMVar ()
-        installLock <- liftIO $ newMVar ()
-        idMap <- liftIO $ newTVarIO Map.empty
-        config <- view configL
-
-        customBuiltRef <- newIORef Set.empty
-
-        -- Create files for simple setup and setup shim, if necessary
-        let setupSrcDir =
-                view stackRootL config </>
-                relDirSetupExeSrc
-        ensureDir setupSrcDir
-        setupFileName <- parseRelFile ("setup-" ++ simpleSetupHash ++ ".hs")
-        let setupHs = setupSrcDir </> setupFileName
-        setupHsExists <- doesFileExist setupHs
-        unless setupHsExists $ writeBinaryFileAtomic setupHs simpleSetupCode
-        setupShimFileName <- parseRelFile ("setup-shim-" ++ simpleSetupHash ++ ".hs")
-        let setupShimHs = setupSrcDir </> setupShimFileName
-        setupShimHsExists <- doesFileExist setupShimHs
-        unless setupShimHsExists $ writeBinaryFileAtomic setupShimHs setupGhciShimCode
-        setupExe <- getSetupExe setupHs setupShimHs tmpdir
-
-        cabalPkgVer <- view cabalVersionL
-        globalDB <- view $ compilerPathsL.to cpGlobalDB
-        snapshotPackagesTVar <- liftIO $ newTVarIO (toDumpPackagesByGhcPkgId snapshotPackages)
-        localPackagesTVar <- liftIO $ newTVarIO (toDumpPackagesByGhcPkgId localPackages)
-        logFilesTChan <- liftIO $ atomically newTChan
-        let totalWanted = length $ filter lpWanted locals
-        pathEnvVar <- liftIO $ maybe mempty T.pack <$> lookupEnv "PATH"
-        inner ExecuteEnv
-            { eeBuildOpts = bopts
-            , eeBuildOptsCLI = boptsCli
-             -- Uncertain as to why we cannot run configures in parallel. This
-             -- appears to be a Cabal library bug. Original issue:
-             -- https://github.com/commercialhaskell/stack/issues/84. Ideally
-             -- we'd be able to remove this.
-            , eeConfigureLock = configLock
-            , eeInstallLock = installLock
-            , eeBaseConfigOpts = baseConfigOpts
-            , eeGhcPkgIds = idMap
-            , eeTempDir = tmpdir
-            , eeSetupHs = setupHs
-            , eeSetupShimHs = setupShimHs
-            , eeSetupExe = setupExe
-            , eeCabalPkgVer = cabalPkgVer
-            , eeTotalWanted = totalWanted
-            , eeLocals = locals
-            , eeGlobalDB = globalDB
-            , eeGlobalDumpPkgs = toDumpPackagesByGhcPkgId globalPackages
-            , eeSnapshotDumpPkgs = snapshotPackagesTVar
-            , eeLocalDumpPkgs = localPackagesTVar
-            , eeLogFiles = logFilesTChan
-            , eeCustomBuilt = customBuiltRef
-            , eeLargestPackageName = mlargestPackageName
-            , eePathEnvVar = pathEnvVar
-            } `finally` dumpLogs logFilesTChan totalWanted
-  where
-    toDumpPackagesByGhcPkgId = Map.fromList . map (\dp -> (dpGhcPkgId dp, dp))
-
-    createTempDirFunction
-        | boptsKeepTmpFiles bopts = withKeepSystemTempDir
-        | otherwise = withSystemTempDir
-
-    dumpLogs :: TChan (Path Abs Dir, Path Abs File) -> Int -> RIO env ()
-    dumpLogs chan totalWanted = do
-        allLogs <- fmap reverse $ liftIO $ atomically drainChan
-        case allLogs of
-            -- No log files generated, nothing to dump
-            [] -> pure ()
-            firstLog:_ -> do
-                toDump <- view $ configL.to configDumpLogs
-                case toDump of
-                    DumpAllLogs -> mapM_ (dumpLog "") allLogs
-                    DumpWarningLogs -> mapM_ dumpLogIfWarning allLogs
-                    DumpNoLogs
-                        | totalWanted > 1 ->
-                            logInfo $
-                                "Build output has been captured to log files, use " <>
-                                "--dump-logs to see it on the console"
-                        | otherwise -> pure ()
-                logInfo $ "Log files have been written to: " <>
-                          fromString (toFilePath (parent (snd firstLog)))
-
-        -- We only strip the colors /after/ we've dumped logs, so that
-        -- we get pretty colors in our dump output on the terminal.
-        colors <- shouldForceGhcColorFlag
-        when colors $ liftIO $ mapM_ (stripColors . snd) allLogs
-      where
-        drainChan :: STM [(Path Abs Dir, Path Abs File)]
-        drainChan = do
-            mx <- tryReadTChan chan
-            case mx of
-                Nothing -> pure []
-                Just x -> do
-                    xs <- drainChan
-                    pure $ x:xs
-
-    dumpLogIfWarning :: (Path Abs Dir, Path Abs File) -> RIO env ()
-    dumpLogIfWarning (pkgDir, filepath) = do
-      firstWarning <- withSourceFile (toFilePath filepath) $ \src ->
-            runConduit
-          $ src
-         .| CT.decodeUtf8Lenient
-         .| CT.lines
-         .| CL.map stripCR
-         .| CL.filter isWarning
-         .| CL.take 1
-      unless (null firstWarning) $ dumpLog " due to warnings" (pkgDir, filepath)
-
-    isWarning :: Text -> Bool
-    isWarning t = ": Warning:" `T.isSuffixOf` t -- prior to GHC 8
-               || ": warning:" `T.isInfixOf` t -- GHC 8 is slightly different
-               || "mwarning:" `T.isInfixOf` t -- colorized output
-
-    dumpLog :: String -> (Path Abs Dir, Path Abs File) -> RIO env ()
-    dumpLog msgSuffix (pkgDir, filepath) = do
-        logInfo $
-          "\n--  Dumping log file" <>
-          fromString msgSuffix <>
-          ": " <>
-          fromString (toFilePath filepath) <>
-          "\n"
-        compilerVer <- view actualCompilerVersionL
-        withSourceFile (toFilePath filepath) $ \src ->
-              runConduit
-            $ src
-           .| CT.decodeUtf8Lenient
-           .| mungeBuildOutput ExcludeTHLoading ConvertPathsToAbsolute pkgDir compilerVer
-           .| CL.mapM_ (logInfo . RIO.display)
-        logInfo $ "\n--  End of log file: " <> fromString (toFilePath filepath) <> "\n"
-
-    stripColors :: Path Abs File -> IO ()
-    stripColors fp = do
-      let colorfp = toFilePath fp ++ "-color"
-      withSourceFile (toFilePath fp) $ \src ->
-        withSinkFile colorfp $ \sink ->
-        runConduit $ src .| sink
-      withSourceFile colorfp $ \src ->
-        withSinkFile (toFilePath fp) $ \sink ->
-        runConduit $ src .| noColors .| sink
-
-      where
-        noColors = do
-          CB.takeWhile (/= 27) -- ESC
-          mnext <- CB.head
-          case mnext of
-            Nothing -> pure ()
-            Just x -> assert (x == 27) $ do
-              -- Color sequences always end with an m
-              CB.dropWhile (/= 109) -- m
-              CB.drop 1 -- drop the m itself
-              noColors
+  <> [ fillSep $
+           "after:"
+         : mkNarrativeList Nothing False
+             (map fromPackageId (Set.toList missing) :: [StyleDoc])
+     | not $ Set.null missing
+     ]
+ where
+  missing = task.configOpts.missing
 
 -- | Perform the actual plan
-executePlan :: HasEnvConfig env
-            => BuildOptsCLI
-            -> BaseConfigOpts
-            -> [LocalPackage]
-            -> [DumpPackage] -- ^ global packages
-            -> [DumpPackage] -- ^ snapshot packages
-            -> [DumpPackage] -- ^ local packages
-            -> InstalledMap
-            -> Map PackageName Target
-            -> Plan
-            -> RIO env ()
-executePlan boptsCli baseConfigOpts locals globalPackages snapshotPackages localPackages installedMap targets plan = do
+executePlan ::
+     HasEnvConfig env
+  => BuildOptsCLI
+  -> BaseConfigOpts
+  -> [LocalPackage]
+  -> [DumpPackage]
+     -- ^ global packages
+  -> [DumpPackage]
+     -- ^ snapshot packages
+  -> [DumpPackage]
+     -- ^ project packages and local extra-deps
+  -> InstalledMap
+  -> Map PackageName Target
+  -> Plan
+  -> RIO env ()
+executePlan
+    boptsCli
+    baseConfigOpts
+    locals
+    globalPackages
+    snapshotPackages
+    localPackages
+    installedMap
+    targets
+    plan
+  = do
     logDebug "Executing the build plan"
     bopts <- view buildOptsL
-    withExecuteEnv bopts boptsCli baseConfigOpts locals globalPackages snapshotPackages localPackages mlargestPackageName
+    withExecuteEnv
+      bopts
+      boptsCli
+      baseConfigOpts
+      locals
+      globalPackages
+      snapshotPackages
+      localPackages
+      mlargestPackageName
       (executePlan' installedMap targets plan)
 
-    copyExecutables (planInstallExes plan)
+    copyExecutables plan.installExes
 
     config <- view configL
-    menv' <- liftIO $ configProcessContextSettings config EnvSettings
-                    { esIncludeLocals = True
-                    , esIncludeGhcPackagePath = True
-                    , esStackExe = True
-                    , esLocaleUtf8 = False
-                    , esKeepGhcRts = False
-                    }
+    menv' <- liftIO $ config.processContextSettings EnvSettings
+               { includeLocals = True
+               , includeGhcPackagePath = True
+               , stackExe = True
+               , localeUtf8 = False
+               , keepGhcRts = False
+               }
     withProcessContext menv' $
-      forM_ (boptsCLIExec boptsCli) $ \(cmd, args) ->
+      forM_ boptsCli.exec $ \(cmd, args) ->
       proc cmd args runProcess_
-  where
-    mlargestPackageName =
-      Set.lookupMax $
-      Set.map (length . packageNameString) $
-      Map.keysSet (planTasks plan) <> Map.keysSet (planFinals plan)
-
-copyExecutables
-    :: HasEnvConfig env
-    => Map Text InstallLocation
-    -> RIO env ()
+ where
+  mlargestPackageName =
+    Set.lookupMax $
+    Set.map (length . packageNameString . componentKeyPkgName) $
+    Map.keysSet plan.tasks <> Map.keysSet plan.finals
+
+copyExecutables ::
+     HasEnvConfig env
+  => Map StackUnqualCompName InstallLocation
+  -> RIO env ()
 copyExecutables exes | Map.null exes = pure ()
 copyExecutables exes = do
-    snapBin <- (</> bindirSuffix) `liftM` installationRootDeps
-    localBin <- (</> bindirSuffix) `liftM` installationRootLocal
-    compilerSpecific <- boptsInstallCompilerTool <$> view buildOptsL
-    destDir <- if compilerSpecific
-                   then bindirCompilerTools
-                   else view $ configL.to configLocalBin
-    ensureDir destDir
-
-    destDir' <- liftIO . D.canonicalizePath . toFilePath $ destDir
-
-    platform <- view platformL
-    let ext =
-            case platform of
-                Platform _ Windows -> ".exe"
-                _ -> ""
-
-    currExe <- liftIO getExecutablePath -- needed for windows, see below
-
-    installed <- forMaybeM (Map.toList exes) $ \(name, loc) -> do
-        let bindir =
-                case loc of
-                    Snap -> snapBin
-                    Local -> localBin
-        mfp <- liftIO $ forgivingAbsence (resolveFile bindir $ T.unpack name ++ ext)
-          >>= rejectMissingFile
-        case mfp of
-            Nothing -> do
-                logWarn $
-                    "Couldn't find executable " <>
-                    RIO.display name <>
-                    " in directory " <>
-                    fromString (toFilePath bindir)
-                pure Nothing
-            Just file -> do
-                let destFile = destDir' FP.</> T.unpack name ++ ext
-                logInfo $
-                    "Copying from " <>
-                    fromString (toFilePath file) <>
-                    " to " <>
-                    fromString destFile
-
-                liftIO $ case platform of
-                    Platform _ Windows | FP.equalFilePath destFile currExe ->
-                        windowsRenameCopy (toFilePath file) destFile
-                    _ -> D.copyFile (toFilePath file) destFile
-                pure $ Just (name <> T.pack ext)
-
-    unless (null installed) $ do
-        logInfo ""
-        logInfo $
-            "Copied executables to " <>
-            fromString destDir' <>
-            ":"
-    forM_ installed $ \exe -> logInfo ("- " <> RIO.display exe)
-    unless compilerSpecific $ warnInstallSearchPathIssues destDir' installed
-
+  snapBin <- (</> bindirSuffix) <$> installationRootDeps
+  localBin <- (</> bindirSuffix) <$> installationRootLocal
+  compilerSpecific <- (.installCompilerTool) <$> view buildOptsL
+  destDir <- if compilerSpecific
+               then bindirCompilerTools
+               else view $ configL . to (.localBin)
+  ensureDir destDir
+
+  destDir' <- liftIO . D.canonicalizePath . toFilePath $ destDir
+
+  platform <- view platformL
+  let ext =
+        case platform of
+          Platform _ Windows -> ".exe"
+          _ -> ""
+
+  -- needed for windows, see below
+  currExe <- toFilePath <$> viewExecutablePath
+
+  installed <- forMaybeM (Map.toList exes) $ \(name, loc) -> do
+    let strName = unqualCompToString name
+        bindir =
+            case loc of
+                Snap -> snapBin
+                Local -> localBin
+    mfp <- forgivingResolveFile bindir (strName ++ ext)
+      >>= rejectMissingFile
+    case mfp of
+      Nothing -> do
+        prettyWarnL
+          [ flow "Couldn't find executable"
+          , style Current (fromString strName)
+          , flow "in directory"
+          , pretty bindir <> "."
+          ]
+        pure Nothing
+      Just file -> do
+        let destFile = destDir' FP.</> strName ++ ext
+        prettyInfoL
+          [ flow "Copying from"
+          , pretty file
+          , "to"
+          , style File (fromString destFile) <> "."
+          ]
+
+        liftIO $ case platform of
+          Platform _ Windows | FP.equalFilePath destFile currExe ->
+              windowsRenameCopy (toFilePath file) destFile
+          _ -> D.copyFile (toFilePath file) destFile
+        pure $ Just (strName ++ ext)
+
+  unless (null installed) $ do
+    prettyInfo $
+         fillSep
+           [ flow "Copied executables to"
+           , pretty destDir <> ":"
+           ]
+      <> line
+      <> bulletedList
+           (map fromString installed :: [StyleDoc])
+  unless compilerSpecific $ warnInstallSearchPathIssues destDir' installed
 
 -- | Windows can't write over the current executable. Instead, we rename the
 -- current executable to something else and then do the copy.
 windowsRenameCopy :: FilePath -> FilePath -> IO ()
 windowsRenameCopy src dest = do
-    D.copyFile src new
-    D.renameFile dest old
-    D.renameFile new dest
-  where
-    new = dest ++ ".new"
-    old = dest ++ ".old"
+  D.copyFile src new
+  D.renameFile dest old
+  D.renameFile new dest
+ where
+  new = dest ++ ".new"
+  old = dest ++ ".old"
 
 -- | Perform the actual plan (internal)
-executePlan' :: HasEnvConfig env
-             => InstalledMap
-             -> Map PackageName Target
-             -> Plan
-             -> ExecuteEnv
-             -> RIO env ()
-executePlan' installedMap0 targets plan ee@ExecuteEnv {..} = do
-    when (toCoverage $ boptsTestOpts eeBuildOpts) deleteHpcReports
-    cv <- view actualCompilerVersionL
-    case nonEmpty . Map.toList $ planUnregisterLocal plan of
-        Nothing -> pure ()
-        Just ids -> do
-            localDB <- packageDatabaseLocal
-            unregisterPackages cv localDB ids
-
-    liftIO $ atomically $ modifyTVar' eeLocalDumpPkgs $ \initMap ->
-        foldl' (flip Map.delete) initMap $ Map.keys (planUnregisterLocal plan)
-
-    run <- askRunInIO
-
-    -- If running tests concurrently with each other, then create an MVar
-    -- which is empty while each test is being run.
-    concurrentTests <- view $ configL.to configConcurrentTests
-    mtestLock <- if concurrentTests then pure Nothing else Just <$> liftIO (newMVar ())
-
-    let actions = concatMap (toActions installedMap' mtestLock run ee) $ Map.elems $ Map.mergeWithKey
-            (\_ b f -> Just (Just b, Just f))
-            (fmap (\b -> (Just b, Nothing)))
-            (fmap (\f -> (Nothing, Just f)))
-            (planTasks plan)
-            (planFinals plan)
-    threads <- view $ configL.to configJobs
-    let keepGoing =
-            fromMaybe (not (M.null (planFinals plan))) (boptsKeepGoing eeBuildOpts)
-    terminal <- view terminalL
-    errs <- liftIO $ runActions threads keepGoing actions $ \doneVar actionsVar -> do
-        let total = length actions
-            loop prev
-                | prev == total =
-                    run $ logStickyDone ("Completed " <> RIO.display total <> " action(s).")
-                | otherwise = do
-                    inProgress <- readTVarIO actionsVar
-                    let packageNames = map (\(ActionId pkgID _) -> pkgName pkgID) (toList inProgress)
-                        nowBuilding :: [PackageName] -> Utf8Builder
-                        nowBuilding []    = ""
-                        nowBuilding names = mconcat $ ": " : L.intersperse ", " (map (fromString . packageNameString) names)
-                    when terminal $ run $
-                        logSticky $
-                            "Progress " <> RIO.display prev <> "/" <> RIO.display total <>
-                                nowBuilding packageNames
-                    done <- atomically $ do
-                        done <- readTVar doneVar
-                        check $ done /= prev
-                        pure done
-                    loop done
-        when (total > 1) $ loop 0
-    when (toCoverage $ boptsTestOpts eeBuildOpts) $ do
-        generateHpcUnifiedReport
-        generateHpcMarkupIndex
-    unless (null errs) $ throwM $ ExecutionFailure errs
-    when (boptsHaddock eeBuildOpts) $ do
-        snapshotDumpPkgs <- liftIO (readTVarIO eeSnapshotDumpPkgs)
-        localDumpPkgs <- liftIO (readTVarIO eeLocalDumpPkgs)
-        generateLocalHaddockIndex eeBaseConfigOpts localDumpPkgs eeLocals
-        generateDepsHaddockIndex eeBaseConfigOpts eeGlobalDumpPkgs snapshotDumpPkgs localDumpPkgs eeLocals
-        generateSnapHaddockIndex eeBaseConfigOpts eeGlobalDumpPkgs snapshotDumpPkgs
-        when (boptsOpenHaddocks eeBuildOpts) $ do
-            let planPkgs, localPkgs, installedPkgs, availablePkgs
-                    :: Map PackageName (PackageIdentifier, InstallLocation)
-                planPkgs = Map.map (taskProvides &&& taskLocation) (planTasks plan)
-                localPkgs =
-                    Map.fromList
-                        [(packageName p, (packageIdentifier p, Local)) | p <- map lpPackage eeLocals]
-                installedPkgs = Map.map (swap . second installedPackageIdentifier) installedMap'
-                availablePkgs = Map.unions [planPkgs, localPkgs, installedPkgs]
-            openHaddocksInBrowser eeBaseConfigOpts availablePkgs (Map.keysSet targets)
-  where
-    installedMap' = Map.difference installedMap0
-                  $ Map.fromList
-                  $ map (\(ident, _) -> (pkgName ident, ()))
-                  $ Map.elems
-                  $ planUnregisterLocal plan
-
-unregisterPackages ::
-       (HasProcessContext env, HasLogFunc env, HasPlatform env, HasCompiler env)
-    => ActualCompiler
-    -> Path Abs Dir
-    -> NonEmpty (GhcPkgId, (PackageIdentifier, Text))
-    -> RIO env ()
-unregisterPackages cv localDB ids = do
-    let logReason ident reason =
-            logInfo $
-            fromString (packageIdentifierString ident) <> ": unregistering" <>
-            if T.null reason
-                then ""
-                else " (" <> RIO.display reason <> ")"
-    let unregisterSinglePkg select (gid, (ident, reason)) = do
-            logReason ident reason
-            pkg <- getGhcPkgExe
-            unregisterGhcPkgIds pkg localDB $ select ident gid :| []
-
-    case cv of
-        -- GHC versions >= 8.2.1 support batch unregistering of packages. See
-        -- https://gitlab.haskell.org/ghc/ghc/issues/12637
-        ACGhc v | v >= mkVersion [8, 2, 1] -> do
-                platform <- view platformL
-                -- According to https://support.microsoft.com/en-us/help/830473/command-prompt-cmd-exe-command-line-string-limitation
-                -- the maximum command line length on Windows since XP is 8191 characters.
-                -- We use conservative batch size of 100 ids on this OS thus argument name '-ipid', package name,
-                -- its version and a hash should fit well into this limit.
-                -- On Unix-like systems we're limited by ARG_MAX which is normally hundreds
-                -- of kilobytes so batch size of 500 should work fine.
-                let batchSize = case platform of
-                      Platform _ Windows -> 100
-                      _ -> 500
-                let chunksOfNE size = mapMaybe nonEmpty . chunksOf size . NonEmpty.toList
-                for_ (chunksOfNE batchSize ids) $ \batch -> do
-                    for_ batch $ \(_, (ident, reason)) -> logReason ident reason
-                    pkg <- getGhcPkgExe
-                    unregisterGhcPkgIds pkg localDB $ fmap (Right . fst) batch
-
-        -- GHC versions >= 7.9 support unregistering of packages via their
-        -- GhcPkgId.
-        ACGhc v | v >= mkVersion [7, 9] -> for_ ids . unregisterSinglePkg $ \_ident gid -> Right gid
-
-        _ -> for_ ids . unregisterSinglePkg $ \ident _gid -> Left ident
-
-toActions :: HasEnvConfig env
-          => InstalledMap
-          -> Maybe (MVar ())
-          -> (RIO env () -> IO ())
-          -> ExecuteEnv
-          -> (Maybe Task, Maybe Task) -- build and final
-          -> [Action]
-toActions installedMap mtestLock runInBase ee (mbuild, mfinal) =
-    abuild ++ afinal
-  where
-    abuild =
-        case mbuild of
-            Nothing -> []
-            Just task@Task {..} ->
-                [ Action
-                    { actionId = ActionId taskProvides ATBuild
-                    , actionDeps =
-                        Set.map (\ident -> ActionId ident ATBuild) (tcoMissing taskConfigOpts)
-                    , actionDo = \ac -> runInBase $ singleBuild ac ee task installedMap False
-                    , actionConcurrency = ConcurrencyAllowed
-                    }
+executePlan' ::
+     HasEnvConfig env
+  => InstalledMap
+  -> Map PackageName Target
+  -> Plan
+  -> ExecuteEnv
+  -> RIO env ()
+executePlan' installedMap0 targets plan ee = do
+  config <- view configL
+  let !buildOpts = ee.buildOpts
+      !testOpts = buildOpts.testOpts
+      !benchmarkOpts = buildOpts.benchmarkOpts
+      runTests = testOpts.runTests
+      runBenchmarks = benchmarkOpts.runBenchmarks
+      noNotifyIfNoRunTests = not config.notifyIfNoRunTests
+      noNotifyIfNoRunBenchmarks = not config.notifyIfNoRunBenchmarks
+      hasTests = not . Set.null . testComponents . taskComponents
+      hasBenches = not . Set.null . benchComponents . taskComponents
+      tests = Map.elems $ Map.filter hasTests plan.finals
+      benches = Map.elems $ Map.filter hasBenches plan.finals
+  when testOpts.coverage deleteHpcReports
+  whenJust (nonEmpty $ Map.toList plan.unregisterLocal) $ \ids -> do
+    localDB <- packageDatabaseLocal
+    unregisterPackages localDB ids
+
+  liftIO $ atomically $ modifyTVar' ee.localDumpPkgs $ \initMap ->
+    foldl' (flip Map.delete) initMap $ Map.keys plan.unregisterLocal
+
+  run <- askRunInIO
+
+  -- If running tests concurrently with each other, then create an MVar
+  -- which is empty while each test is being run.
+  concurrentTests <- view $ configL . to (.concurrentTests)
+  mtestLock <- if concurrentTests
+                 then pure Nothing
+                 else Just <$> liftIO (newMVar ())
+
+  let taskKeys = Map.keysSet plan.tasks
+      actions = concatMap
+        (uncurry $ toActions installedMap' mtestLock run ee taskKeys) $
+        Map.toList $ Map.merge
+          (Map.mapMissing (\_ b -> (Just b, Nothing)))
+          (Map.mapMissing (\_ f -> (Nothing, Just f)))
+          (Map.zipWithMatched (\_ b f -> (Just b, Just f)))
+          plan.tasks
+          plan.finals
+  threads <- view $ configL . to (.jobs)
+  let keepGoing = fromMaybe
+        (not (Map.null plan.finals))
+        buildOpts.keepGoing
+  terminal <- view terminalL
+  terminalWidth <- view termWidthL
+  unless (noNotifyIfNoRunTests || runTests || null tests) $
+    prettyInfo $
+      fillSep
+        [ flow "All test running disabled by"
+        , style Shell "--no-run-tests"
+        , flow "flag. To mute this message in future, set"
+        , style Shell (flow "notify-if-no-run-tests: false")
+        , flow "in Stack's configuration."
+        ]
+  unless (noNotifyIfNoRunBenchmarks || runBenchmarks || null benches) $
+    prettyInfo $
+      fillSep
+        [ flow "All benchmark running disabled by"
+        , style Shell "--no-run-benchmarks"
+        , flow "flag. To mute this message in future, set"
+        , style Shell (flow "notify-if-no-run-benchmarks: false")
+        , flow "in Stack's configuration."
+        ]
+  errs <- liftIO $ runActions threads keepGoing actions $
+    \doneVar actionsVar -> do
+      let total = length actions
+          loop prev
+            | prev == total =
+                run $ logStickyDone
+                  ( "Completed " <> display total <> " action(s).")
+            | otherwise = do
+                inProgress <- readTVarIO actionsVar
+                let packageNames = map
+                      (\(ActionId ck' _) -> componentKeyPkgName ck')
+                      (toList inProgress)
+                    nowBuilding :: [PackageName] -> Utf8Builder
+                    nowBuilding []    = ""
+                    nowBuilding names = mconcat $
+                        ": "
+                      : L.intersperse ", " (map fromPackageName names)
+                    progressFormat = buildOpts.progressBar
+                    progressLine prev' total' =
+                         "Progress "
+                      <> display prev' <> "/" <> display total'
+                      <> if progressFormat == CountOnlyBar
+                           then mempty
+                           else nowBuilding packageNames
+                    ellipsize n text =
+                      if T.length text <= n || progressFormat /= CappedBar
+                        then text
+                        else T.take (n - 1) text <> "…"
+                when (terminal && progressFormat /= NoBar) $
+                  run $ logSticky $ display $ ellipsize terminalWidth $
+                    utf8BuilderToText $ progressLine prev total
+                done <- atomically $ do
+                  done <- readTVar doneVar
+                  check $ done /= prev
+                  pure done
+                loop done
+      when (total > 1) $ loop 0
+  when testOpts.coverage $ do
+    generateHpcUnifiedReport
+    generateHpcMarkupIndex
+  unless (null errs) $
+    prettyThrowM $ ExecutionFailure errs
+  when buildOpts.buildHaddocks $ do
+    if buildOpts.haddockForHackage
+      then
+        generateLocalHaddockForHackageArchives ee.locals
+      else do
+        snapshotDumpPkgs <- liftIO (readTVarIO ee.snapshotDumpPkgs)
+        localDumpPkgs <- liftIO (readTVarIO ee.localDumpPkgs)
+        generateLocalHaddockIndex ee.baseConfigOpts localDumpPkgs ee.locals
+        generateDepsHaddockIndex
+          ee.baseConfigOpts
+          ee.globalDumpPkgs
+          snapshotDumpPkgs
+          localDumpPkgs
+          ee.locals
+        generateSnapHaddockIndex
+          ee.baseConfigOpts
+          ee.globalDumpPkgs
+          snapshotDumpPkgs
+        when buildOpts.openHaddocks $ do
+          let planPkgs, localPkgs, installedPkgs, availablePkgs
+                :: Map PackageName (PackageIdentifier, InstallLocation)
+              planPkgs = Map.fromList
+                [ (componentKeyPkgName ck, (taskProvides t, taskLocation t))
+                | (ck, t) <- Map.toList plan.tasks
                 ]
-    afinal =
-        case mfinal of
-            Nothing -> []
-            Just task@Task {..} ->
-                (if taskAllInOne then id else (:)
-                    Action
-                        { actionId = ActionId taskProvides ATBuildFinal
-                        , actionDeps = addBuild
-                            (Set.map (\ident -> ActionId ident ATBuild) (tcoMissing taskConfigOpts))
-                        , actionDo = \ac -> runInBase $ singleBuild ac ee task installedMap True
-                        , actionConcurrency = ConcurrencyAllowed
-                        }) $
-                -- These are the "final" actions - running tests and benchmarks.
-                (if Set.null tests then id else (:)
-                    Action
-                        { actionId = ActionId taskProvides ATRunTests
-                        , actionDeps = finalDeps
-                        , actionDo = \ac -> withLock mtestLock $ runInBase $ do
-                            singleTest topts (Set.toList tests) ac ee task installedMap
-                        -- Always allow tests tasks to run concurrently with
-                        -- other tasks, particularly build tasks. Note that
-                        -- 'mtestLock' can optionally make it so that only
-                        -- one test is run at a time.
-                        , actionConcurrency = ConcurrencyAllowed
-                        }) $
-                (if Set.null benches then id else (:)
-                    Action
-                        { actionId = ActionId taskProvides ATRunBenchmarks
-                        , actionDeps = finalDeps
-                        , actionDo = \ac -> runInBase $ do
-                            singleBench beopts (Set.toList benches) ac ee task installedMap
-                        -- Never run benchmarks concurrently with any other task, see #3663
-                        , actionConcurrency = ConcurrencyDisallowed
-                        })
-                []
-              where
-                comps = taskComponents task
-                tests = testComponents comps
-                benches = benchComponents comps
-                finalDeps =
-                    if taskAllInOne
-                        then addBuild mempty
-                        else Set.singleton (ActionId taskProvides ATBuildFinal)
-                addBuild =
-                    case mbuild of
-                        Nothing -> id
-                        Just _ -> Set.insert $ ActionId taskProvides ATBuild
-    withLock Nothing f = f
-    withLock (Just lock) f = withMVar lock $ \() -> f
-    bopts = eeBuildOpts ee
-    topts = boptsTestOpts bopts
-    beopts = boptsBenchmarkOpts bopts
-
--- | Generate the ConfigCache
-getConfigCache :: HasEnvConfig env
-               => ExecuteEnv -> Task -> InstalledMap -> Bool -> Bool
-               -> RIO env (Map PackageIdentifier GhcPkgId, ConfigCache)
-getConfigCache ExecuteEnv {..} task@Task {..} installedMap enableTest enableBench = do
-    let extra =
-            -- We enable tests if the test suite dependencies are already
-            -- installed, so that we avoid unnecessary recompilation based on
-            -- cabal_macros.h changes when switching between 'stack build' and
-            -- 'stack test'. See:
-            -- https://github.com/commercialhaskell/stack/issues/805
-            case taskType of
-                TTLocalMutable _ ->
-                  -- FIXME: make this work with exact-configuration.
-                  -- Not sure how to plumb the info atm. See
-                  -- https://github.com/commercialhaskell/stack/issues/2049
-                  [ "--enable-tests" | enableTest] ++
-                  [ "--enable-benchmarks" | enableBench]
-                TTRemotePackage{} -> []
-    idMap <- liftIO $ readTVarIO eeGhcPkgIds
-    let getMissing ident =
-            case Map.lookup ident idMap of
-                Nothing
-                    -- Expect to instead find it in installedMap if it's
-                    -- an initialBuildSteps target.
-                    | boptsCLIInitialBuildSteps eeBuildOptsCLI && taskIsTarget task,
-                      Just (_, installed) <- Map.lookup (pkgName ident) installedMap
-                        -> installedToGhcPkgId ident installed
-                Just installed -> installedToGhcPkgId ident installed
-                _ -> error $ "singleBuild: invariant violated, missing package ID missing: " ++ show ident
-        installedToGhcPkgId ident (Library ident' x _) = assert (ident == ident') $ Just (ident, x)
-        installedToGhcPkgId _ (Executable _) = Nothing
-        missing' = Map.fromList $ mapMaybe getMissing $ Set.toList missing
-        TaskConfigOpts missing mkOpts = taskConfigOpts
-        opts = mkOpts missing'
-        allDeps = Set.fromList $ Map.elems missing' ++ Map.elems taskPresent
-        cache = ConfigCache
-            { configCacheOpts = opts
-                { coNoDirs = coNoDirs opts ++ map T.unpack extra
-                }
-            , configCacheDeps = allDeps
-            , configCacheComponents =
-                case taskType of
-                    TTLocalMutable lp -> Set.map (encodeUtf8 . renderComponent) $ lpComponents lp
-                    TTRemotePackage{} -> Set.empty
-            , configCacheHaddock = taskBuildHaddock
-            , configCachePkgSrc = taskCachePkgSrc
-            , configCachePathEnvVar = eePathEnvVar
-            }
-        allDepsMap = Map.union missing' taskPresent
-    pure (allDepsMap, cache)
-
--- | Ensure that the configuration for the package matches what is given
-ensureConfig :: HasEnvConfig env
-             => ConfigCache -- ^ newConfigCache
-             -> Path Abs Dir -- ^ package directory
-             -> ExecuteEnv
-             -> RIO env () -- ^ announce
-             -> (ExcludeTHLoading -> [String] -> RIO env ()) -- ^ cabal
-             -> Path Abs File -- ^ Cabal file
-             -> Task
-             -> RIO env Bool
-ensureConfig newConfigCache pkgDir ExecuteEnv {..} announce cabal cabalfp task = do
-    newCabalMod <- liftIO $ modificationTime <$> getFileStatus (toFilePath cabalfp)
-    setupConfigfp <- setupConfigFromDir pkgDir
-    let getNewSetupConfigMod =
-          liftIO $ either (const Nothing) (Just . modificationTime) <$>
-          tryJust (guard . isDoesNotExistError) (getFileStatus (toFilePath setupConfigfp))
-    newSetupConfigMod <- getNewSetupConfigMod
-    newProjectRoot <- S8.pack . toFilePath <$> view projectRootL
-    -- See https://github.com/commercialhaskell/stack/issues/3554
-    taskAnyMissingHack <- view $ actualCompilerVersionL.to getGhcVersion.to (< mkVersion [8, 4])
-    needConfig <-
-        if boptsReconfigure eeBuildOpts || (taskAnyMissing task && taskAnyMissingHack)
-            then pure True
-            else do
-                -- We can ignore the components portion of the config
-                -- cache, because it's just used to inform 'construct
-                -- plan that we need to plan to build additional
-                -- components. These components don't affect the actual
-                -- package configuration.
-                let ignoreComponents cc = cc { configCacheComponents = Set.empty }
-                -- Determine the old and new configuration in the local directory, to
-                -- determine if we need to reconfigure.
-                mOldConfigCache <- tryGetConfigCache pkgDir
-
-                mOldCabalMod <- tryGetCabalMod pkgDir
-
-                -- Cabal's setup-config is created per OS/Cabal version, multiple
-                -- projects using the same package could get a conflict because of this
-                mOldSetupConfigMod <- tryGetSetupConfigMod pkgDir
-                mOldProjectRoot <- tryGetPackageProjectRoot pkgDir
-
-                pure $ fmap ignoreComponents mOldConfigCache /= Just (ignoreComponents newConfigCache)
-                      || mOldCabalMod /= Just newCabalMod
-                      || mOldSetupConfigMod /= newSetupConfigMod
-                      || mOldProjectRoot /= Just newProjectRoot
-    let ConfigureOpts dirs nodirs = configCacheOpts newConfigCache
-
-    when (taskBuildTypeConfig task) ensureConfigureScript
-
-    when needConfig $ withMVar eeConfigureLock $ \_ -> do
-        deleteCaches pkgDir
-        announce
-        cp <- view compilerPathsL
-        let (GhcPkgExe pkgPath) = cpPkg cp
-        let programNames =
-              case cpWhich cp of
-                Ghc ->
-                  [ ("ghc", toFilePath (cpCompiler cp))
-                  , ("ghc-pkg", toFilePath pkgPath)
+              localPkgs =
+                Map.fromList
+                  [ (p.name, (packageIdentifier p, Local))
+                  | p <- map (.package) ee.locals
                   ]
-        exes <- forM programNames $ \(name, file) -> do
-            mpath <- findExecutable file
-            pure $ case mpath of
-                Left _ -> []
-                Right x -> pure $ concat ["--with-", name, "=", x]
-        -- Configure cabal with arguments determined by
-        -- Stack.Types.Build.configureOpts
-        cabal KeepTHLoading $ "configure" : concat
-            [ concat exes
-            , dirs
-            , nodirs
-            ]
-        -- Only write the cache for local packages.  Remote packages are built
-        -- in a temporary directory so the cache would never be used anyway.
-        case taskType task of
-            TTLocalMutable{} -> writeConfigCache pkgDir newConfigCache
-            TTRemotePackage{} -> pure ()
-        writeCabalMod pkgDir newCabalMod
-        -- This file gets updated one more time by the configure step, so get
-        -- the most recent value. We could instead change our logic above to
-        -- check if our config mod file is newer than the file above, but this
-        -- seems reasonable too.
-        getNewSetupConfigMod >>= writeSetupConfigMod pkgDir
-        writePackageProjectRoot pkgDir newProjectRoot
-
-    pure needConfig
-  where
-    -- When build-type is Configure, we need to have a configure
-    -- script in the local directory. If it doesn't exist, build it
-    -- with autoreconf -i. See:
-    -- https://github.com/commercialhaskell/stack/issues/3534
-    ensureConfigureScript = do
-      let fp = pkgDir </> relFileConfigure
-      exists <- doesFileExist fp
-      unless exists $ do
-        logInfo $ "Trying to generate configure with autoreconf in " <> fromString (toFilePath pkgDir)
-        let autoreconf = if osIsWindows
-                           then readProcessNull "sh" ["autoreconf", "-i"]
-                           else readProcessNull "autoreconf" ["-i"]
-            -- On Windows 10, an upstream issue with the `sh autoreconf -i`
-            -- command means that command clears, but does not then restore, the
-            -- ENABLE_VIRTUAL_TERMINAL_PROCESSING flag for native terminals. The
-            -- following hack re-enables the lost ANSI-capability.
-            fixupOnWindows = when osIsWindows (void $ liftIO defaultColorWhen)
-        withWorkingDir (toFilePath pkgDir) $ autoreconf `catchAny` \ex -> do
-          fixupOnWindows
-          logWarn $ "Unable to run autoreconf: " <> displayShow ex
-          when osIsWindows $ do
-            logInfo $ "Check that executable perl is on the path in Stack's " <>
-              "MSYS2 \\usr\\bin folder, and working, and that script file " <>
-              "autoreconf is on the path in that location. To check that " <>
-              "perl or autoreconf are on the path in the required location, " <>
-              "run commands:"
-            logInfo ""
-            logInfo "  stack exec where -- perl"
-            logInfo "  stack exec where -- autoreconf"
-            logInfo ""
-            logInfo $ "If perl or autoreconf is not on the path in the " <>
-              "required location, add them with command (note that the " <>
-              "relevant package name is 'autoconf' not 'autoreconf'):"
-            logInfo ""
-            logInfo "  stack exec pacman -- --sync --refresh autoconf"
-            logInfo ""
-            logInfo $ "Some versions of perl from MSYS2 are broken. See " <>
-              "https://github.com/msys2/MSYS2-packages/issues/1611 and " <>
-              "https://github.com/commercialhaskell/stack/pull/4781. To " <>
-              "test if perl in the required location is working, try command:"
-            logInfo ""
-            logInfo "  stack exec perl -- --version"
-            logInfo ""
-        fixupOnWindows
+              installedPkgs =
+                Map.map (swap . second installedPackageIdentifier) installedMap'
+              availablePkgs = Map.unions [planPkgs, localPkgs, installedPkgs]
+          openHaddocksInBrowser
+            ee.baseConfigOpts
+            availablePkgs
+            (Map.keysSet targets)
+ where
+  installedMap' = Map.difference installedMap0
+                $ Map.fromList
+                $ map (\(ident, _) -> (pkgName ident, ()))
+                $ Map.elems plan.unregisterLocal
 
--- | Make a padded prefix for log messages
-packageNamePrefix :: ExecuteEnv -> PackageName -> Utf8Builder
-packageNamePrefix ee name' =
-  let name = packageNameString name'
-      paddedName =
-        case eeLargestPackageName ee of
-          Nothing -> name
-          Just len -> assert (len >= length name) $ RIO.take len $ name ++ L.repeat ' '
-   in fromString paddedName <> "> "
-
-announceTask :: HasLogFunc env => ExecuteEnv -> Task -> Utf8Builder -> RIO env ()
-announceTask ee task action = logInfo $
-    packageNamePrefix ee (pkgName (taskProvides task)) <>
-    action
-
--- | Ensure we're the only action using the directory.  See
--- <https://github.com/commercialhaskell/stack/issues/2730>
-withLockedDistDir
-  :: HasEnvConfig env
-  => (Utf8Builder -> RIO env ()) -- ^ announce
-  -> Path Abs Dir -- ^ root directory for package
-  -> RIO env a
-  -> RIO env a
-withLockedDistDir announce root inner = do
-  distDir <- distRelativeDir
-  let lockFP = root </> distDir </> relFileBuildLock
-  ensureDir $ parent lockFP
-
-  mres <-
-    withRunInIO $ \run ->
-    withTryFileLock (toFilePath lockFP) Exclusive $ \_lock ->
-    run inner
-
-  case mres of
-    Just res -> pure res
-    Nothing -> do
-      let complainer delay = do
-            delay 5000000 -- 5 seconds
-            announce $ "blocking for directory lock on " <> fromString (toFilePath lockFP)
-            forever $ do
-              delay 30000000 -- 30 seconds
-              announce $ "still blocking for directory lock on " <>
-                         fromString (toFilePath lockFP) <>
-                         "; maybe another Stack process is running?"
-      withCompanion (\x -> complainer x) $
-        \stopComplaining ->
-        withRunInIO $ \run ->
-        withFileLock (toFilePath lockFP) Exclusive $ \_ ->
-        run $ stopComplaining *> inner
-
--- | How we deal with output from GHC, either dumping to a log file or the
--- console (with some prefix).
-data OutputType
-  = OTLogFile !(Path Abs File) !Handle
-  | OTConsole !(Maybe Utf8Builder)
-
--- | This sets up a context for executing build steps which need to run
--- Cabal (via a compiled Setup.hs).  In particular it does the following:
---
--- * Ensures the package exists in the file system, downloading if necessary.
---
--- * Opens a log file if the built output shouldn't go to stderr.
---
--- * Ensures that either a simple Setup.hs is built, or the package's
---   custom setup is built.
---
--- * Provides the user a function with which run the Cabal process.
-withSingleContext :: forall env a. HasEnvConfig env
-                  => ActionContext
-                  -> ExecuteEnv
-                  -> Task
-                  -> Map PackageIdentifier GhcPkgId
-                  -- ^ All dependencies' package ids to provide to Setup.hs.
-                  -> Maybe String
-                  -> (  Package                                -- Package info
-                     -> Path Abs File                          -- Cabal file path
-                     -> Path Abs Dir                           -- Package root directory file path
-                     -- Note that the `Path Abs Dir` argument is redundant with the `Path Abs File`
-                     -- argument, but we provide both to avoid recalculating `parent` of the `File`.
-                     -> (KeepOutputOpen -> ExcludeTHLoading -> [String] -> RIO env ())
-                                                               -- Function to run Cabal with args
-                     -> (Utf8Builder -> RIO env ())      -- An 'announce' function, for different build phases
-                     -> OutputType
-                     -> RIO env a)
-                  -> RIO env a
-withSingleContext ActionContext {..} ee@ExecuteEnv {..} task@Task {..} allDeps msuffix inner0 =
-    withPackage $ \package cabalfp pkgDir ->
-    withOutputType pkgDir package $ \outputType ->
-    withCabal package pkgDir outputType $ \cabal ->
-    inner0 package cabalfp pkgDir cabal announce outputType
-  where
-    announce = announceTask ee task
-
-    wanted =
-        case taskType of
-            TTLocalMutable lp -> lpWanted lp
-            TTRemotePackage{} -> False
-
-    -- Output to the console if this is the last task, and the user
-    -- asked to build it specifically. When the action is a
-    -- 'ConcurrencyDisallowed' action (benchmarks), then we can also be
-    -- sure to have exclusive access to the console, so output is also
-    -- sent to the console in this case.
-    --
-    -- See the discussion on #426 for thoughts on sending output to the
-    -- console from concurrent tasks.
-    console =
-      (wanted &&
-       all (\(ActionId ident _) -> ident == taskProvides) (Set.toList acRemaining) &&
-       eeTotalWanted == 1
-      ) || (acConcurrency == ConcurrencyDisallowed)
-
-    withPackage inner =
-        case taskType of
-            TTLocalMutable lp -> do
-              let root = parent $ lpCabalFile lp
-              withLockedDistDir announce root $
-                inner (lpPackage lp) (lpCabalFile lp) root
-            TTRemotePackage _ package pkgloc -> do
-                suffix <- parseRelDir $ packageIdentifierString $ packageIdent package
-                let dir = eeTempDir </> suffix
-                unpackPackageLocation dir pkgloc
-
-                -- See: https://github.com/commercialhaskell/stack/issues/157
-                distDir <- distRelativeDir
-                let oldDist = dir </> relDirDist
-                    newDist = dir </> distDir
-                exists <- doesDirExist oldDist
-                when exists $ do
-                  -- Previously used takeDirectory, but that got confused
-                  -- by trailing slashes, see:
-                  -- https://github.com/commercialhaskell/stack/issues/216
-                  --
-                  -- Instead, use Path which is a bit more resilient
-                  ensureDir $ parent newDist
-                  renameDir oldDist newDist
-
-                let name = pkgName taskProvides
-                cabalfpRel <- parseRelFile $ packageNameString name ++ ".cabal"
-                let cabalfp = dir </> cabalfpRel
-                inner package cabalfp dir
-
-    withOutputType pkgDir package inner
-        -- Not in interleaved mode. When building a single wanted package, dump
-        -- to the console with no prefix.
-        | console = inner $ OTConsole Nothing
-
-        -- If the user requested interleaved output, dump to the console with a
-        -- prefix.
-        | boptsInterleavedOutput eeBuildOpts =
-             inner $ OTConsole $ Just $ packageNamePrefix ee $ packageName package
-
-        -- Neither condition applies, dump to a file.
-        | otherwise = do
-            logPath <- buildLogPath package msuffix
-            ensureDir (parent logPath)
-            let fp = toFilePath logPath
-
-            -- We only want to dump logs for local non-dependency packages
-            case taskType of
-                TTLocalMutable lp | lpWanted lp ->
-                    liftIO $ atomically $ writeTChan eeLogFiles (pkgDir, logPath)
-                _ -> pure ()
-
-            withBinaryFile fp WriteMode $ \h -> inner $ OTLogFile logPath h
-
-    withCabal
-        :: Package
-        -> Path Abs Dir
-        -> OutputType
-        -> ((KeepOutputOpen -> ExcludeTHLoading -> [String] -> RIO env ()) -> RIO env a)
-        -> RIO env a
-    withCabal package pkgDir outputType inner = do
-        config <- view configL
-        unless (configAllowDifferentUser config) $
-            checkOwnership (pkgDir </> configWorkDir config)
-        let envSettings = EnvSettings
-                { esIncludeLocals = taskLocation task == Local
-                , esIncludeGhcPackagePath = False
-                , esStackExe = False
-                , esLocaleUtf8 = True
-                , esKeepGhcRts = False
+unregisterPackages ::
+     (HasCompiler env, HasPlatform env, HasProcessContext env, HasTerm env)
+  => Path Abs Dir
+  -> NonEmpty (GhcPkgId, (PackageIdentifier, Text))
+  -> RIO env ()
+unregisterPackages localDB ids = do
+  let logReason ident reason =
+        prettyInfoL
+          (  [ fromString (packageIdentifierString ident) <> ":"
+             , "unregistering"
+             ]
+          <> [ parens (flow $ T.unpack reason) | not $ T.null reason ]
+          )
+  -- GHC versions >= 8.2.1 support batch unregistering of packages. See
+  -- https://gitlab.haskell.org/ghc/ghc/issues/12637
+  platform <- view platformL
+  -- According to
+  -- https://support.microsoft.com/en-us/help/830473/command-prompt-cmd-exe-command-line-string-limitation
+  -- the maximum command line length on Windows since XP is 8191 characters. We
+  -- use conservative batch size of 100 ids on this OS thus argument name
+  -- '-ipid', package name, its version and a hash should fit well into this
+  -- limit. On Unix-like systems we're limited by ARG_MAX which is normally
+  -- hundreds of kilobytes so batch size of 500 should work fine.
+  let batchSize = case platform of
+        Platform _ Windows -> 100
+        _ -> 500
+  let chunksOfNE size = mapMaybe nonEmpty . chunksOf size . NE.toList
+  for_ (chunksOfNE batchSize ids) $ \batch -> do
+    for_ batch $ \(_, (ident, reason)) -> logReason ident reason
+    pkg <- getGhcPkgExe
+    unregisterGhcPkgIds True pkg localDB $ fmap (Right . fst) batch
+
+toActions ::
+     HasEnvConfig env
+  => InstalledMap
+  -> Maybe (MVar ())
+  -> (RIO env () -> IO ())
+  -> ExecuteEnv
+  -> Set ComponentKey
+     -- ^ All component keys that have build tasks (not finals), used to
+     -- determine intra-package dependencies.
+  -> ComponentKey
+  -> (Maybe Task, Maybe Task) -- build and final
+  -> [Action]
+toActions installedMap mtestLock runInBase ee taskKeys ck (mbuild, mfinal) =
+  abuild ++ afinal
+ where
+  intraPackageDep = intraPackageDeps taskKeys ck
+  -- For non-split packages (Custom/Configure/Hooks/Make build-types, or
+  -- intra-package Backpack deps) the primary and final tasks share this
+  -- ComponentKey (CLib). When both are present we fold the final into the
+  -- primary build: singleBuild is flagged as both a final build AND a
+  -- merged build, which tells it to configure with
+  -- --enable-tests/--enable-benchmarks and build lib/exe alongside
+  -- tests/benches in a single Setup invocation. Split packages never hit
+  -- this merge because their final entries are keyed by CTest/CBench, not
+  -- CLib, so mfinal is Nothing here.
+  -- The primary build is "merged" with the final (it configures with
+  -- --enable-tests/--enable-benchmarks and builds the tests/benches alongside
+  -- the lib/exe in one Setup invocation) exactly when an all-in-one final
+  -- task exists for this ComponentKey. A non-all-in-one final (curator
+  -- builds, the cyclic-plan fallback, or per-component CTest/CBench keys)
+  -- gets its own ATBuildFinal action instead, built from the final task, and
+  -- the primary build stays plain.
+  merged = maybe False (.allInOne) mfinal
+  abuild = case mbuild of
+    Nothing -> []
+    Just task ->
+      [ Action
+          { actionId = ActionId ck ATBuild
+          , actionDeps =
+              missingToDeps task.configOpts.missing
+              <> intraPackageDep
+              <> Set.fromList
+                   (map (`ActionId` ATBuild)
+                        task.configOpts.instantiationDeps)
+          , action =
+              \ac -> runInBase $
+                singleBuild ac ee task installedMap merged merged ck
+          , concurrency = ConcurrencyAllowed
+          }
+      ]
+  afinal = case mfinal of
+    Nothing -> []
+    Just task -> finalBuild ++ finalRun
+     where
+      (tests, benches) = finalTestsAndBenches ck (taskComponents task)
+      -- An ATBuildFinal (and anything that builds for this key) depends on the
+      -- primary ATBuild for this key, if one exists (the package's own
+      -- library, built first).
+      onPrimaryBuild =
+        maybe id (const (Set.insert (ActionId ck ATBuild))) mbuild
+      -- An all-in-one final is built by the primary ATBuild (when one exists,
+      -- in merged mode); when the primary is up-to-date there is nothing to
+      -- build. A non-all-in-one final gets its own ATBuildFinal action, built
+      -- from the FINAL task, whose configOpts carry the test/bench
+      -- dependencies (which the lib-only primary task may not have).
+      finalBuild
+        | task.allInOne = []
+        | otherwise =
+            [ Action
+                { actionId = ActionId ck ATBuildFinal
+                , actionDeps = onPrimaryBuild $
+                    missingToDeps task.configOpts.missing
+                    <> intraPackageDep
+                    <> Set.fromList
+                         (map (`ActionId` ATBuild)
+                              task.configOpts.instantiationDeps)
+                , action =
+                    -- isFinalBuild=True, isMergedBuild=False: buildAndCopyOpts
+                    -- emits only test/bench targets and skips copy/install.
+                    \ac -> runInBase $
+                      singleBuild ac ee task installedMap True False ck
+                , concurrency = ConcurrencyAllowed
                 }
-        menv <- liftIO $ configProcessContextSettings config envSettings
-        distRelativeDir' <- distRelativeDir
-        esetupexehs <-
-            -- Avoid broken Setup.hs files causing problems for simple build
-            -- types, see:
-            -- https://github.com/commercialhaskell/stack/issues/370
-            case (packageBuildType package, eeSetupExe) of
-                (C.Simple, Just setupExe) -> pure $ Left setupExe
-                _ -> liftIO $ Right <$> getSetupHs pkgDir
-        inner $ \keepOutputOpen stripTHLoading args -> do
-            let cabalPackageArg
-                    -- Omit cabal package dependency when building
-                    -- Cabal. See
-                    -- https://github.com/commercialhaskell/stack/issues/1356
-                    | packageName package == mkPackageName "Cabal" = []
-                    | otherwise =
-                        ["-package=" ++ packageIdentifierString
-                                            (PackageIdentifier cabalPackageName
-                                                              eeCabalPkgVer)]
-                packageDBArgs =
-                    ( "-clear-package-db"
-                    : "-global-package-db"
-                    : map (("-package-db=" ++) . toFilePathNoTrailingSep) (bcoExtraDBs eeBaseConfigOpts)
-                    ) ++
-                    ( ("-package-db=" ++ toFilePathNoTrailingSep (bcoSnapDB eeBaseConfigOpts))
-                    : ("-package-db=" ++ toFilePathNoTrailingSep (bcoLocalDB eeBaseConfigOpts))
-                    : ["-hide-all-packages"]
-                    )
-
-                warnCustomNoDeps :: RIO env ()
-                warnCustomNoDeps =
-                    case (taskType, packageBuildType package) of
-                        (TTLocalMutable lp, C.Custom) | lpWanted lp -> do
-                            prettyWarnL
-                                [ flow "Package"
-                                , fromString $ packageNameString $ packageName package
-                                , flow "uses a custom Cabal build, but does not use a custom-setup stanza"
-                                ]
-                        _ -> pure ()
-
-                getPackageArgs :: Path Abs Dir -> RIO env [String]
-                getPackageArgs setupDir =
-                    case packageSetupDeps package of
-                        -- The package is using the Cabal custom-setup
-                        -- configuration introduced in Cabal 1.24. In
-                        -- this case, the package is providing an
-                        -- explicit list of dependencies, and we
-                        -- should simply use all of them.
-                        Just customSetupDeps -> do
-                            unless (Map.member (mkPackageName "Cabal") customSetupDeps) $
-                                prettyWarnL
-                                    [ fromString $ packageNameString $ packageName package
-                                    , "has a setup-depends field, but it does not mention a Cabal dependency. This is likely to cause build errors."
-                                    ]
-                            matchedDeps <- forM (Map.toList customSetupDeps) $ \(name, range) -> do
-                                let matches (PackageIdentifier name' version) =
-                                        name == name' &&
-                                        version `withinRange` range
-                                case filter (matches . fst) (Map.toList allDeps) of
-                                    x:xs -> do
-                                        unless (null xs)
-                                            (logWarn ("Found multiple installed packages for custom-setup dep: " <> fromString (packageNameString name)))
-                                        pure ("-package-id=" ++ ghcPkgIdString (snd x), Just (fst x))
-                                    [] -> do
-                                        logWarn ("Could not find custom-setup dep: " <> fromString (packageNameString name))
-                                        pure ("-package=" ++ packageNameString name, Nothing)
-                            let depsArgs = map fst matchedDeps
-                            -- Generate setup_macros.h and provide it to ghc
-                            let macroDeps = mapMaybe snd matchedDeps
-                                cppMacrosFile = setupDir </> relFileSetupMacrosH
-                                cppArgs = ["-optP-include", "-optP" ++ toFilePath cppMacrosFile]
-                            writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros (packageVersion package) macroDeps)))
-                            pure (packageDBArgs ++ depsArgs ++ cppArgs)
-
-                        -- This branch is usually taken for builds, and
-                        -- is always taken for `stack sdist`.
-                        --
-                        -- This approach is debatable. It adds access to the
-                        -- snapshot package database for Cabal. There are two
-                        -- possible objections:
-                        --
-                        -- 1. This doesn't isolate the build enough; arbitrary
-                        -- other packages available could cause the build to
-                        -- succeed or fail.
-                        --
-                        -- 2. This doesn't provide enough packages: we should also
-                        -- include the local database when building local packages.
-                        --
-                        -- Currently, this branch is only taken via `stack
-                        -- sdist` or when explicitly requested in the
-                        -- stack.yaml file.
-                        Nothing -> do
-                            warnCustomNoDeps
-                            pure $ cabalPackageArg ++
-                                    -- NOTE: This is different from
-                                    -- packageDBArgs above in that it does not
-                                    -- include the local database and does not
-                                    -- pass in the -hide-all-packages argument
-                                    ("-clear-package-db"
-                                    : "-global-package-db"
-                                    : map (("-package-db=" ++) . toFilePathNoTrailingSep) (bcoExtraDBs eeBaseConfigOpts)
-                                ++ ["-package-db=" ++ toFilePathNoTrailingSep (bcoSnapDB eeBaseConfigOpts)])
-
-                setupArgs = ("--builddir=" ++ toFilePathNoTrailingSep distRelativeDir') : args
-
-                runExe :: Path Abs File -> [String] -> RIO env ()
-                runExe exeName fullArgs = do
-                    compilerVer <- view actualCompilerVersionL
-                    runAndOutput compilerVer `catch` \ece -> do
-                        (mlogFile, bss) <-
-                            case outputType of
-                                OTConsole _ -> pure (Nothing, [])
-                                OTLogFile logFile h ->
-                                    if keepOutputOpen == KeepOpen
-                                    then pure (Nothing, []) -- expected failure build continues further
-                                    else do
-                                        liftIO $ hClose h
-                                        fmap (Just logFile,) $ withSourceFile (toFilePath logFile) $ \src ->
-                                               runConduit
-                                             $ src
-                                            .| CT.decodeUtf8Lenient
-                                            .| mungeBuildOutput stripTHLoading makeAbsolute pkgDir compilerVer
-                                            .| CL.consume
-                        throwM $ CabalExitedUnsuccessfully
-                            (eceExitCode ece)
-                            taskProvides
-                            exeName
-                            fullArgs
-                            mlogFile
-                            bss
-                  where
-                    runAndOutput :: ActualCompiler -> RIO env ()
-                    runAndOutput compilerVer = withWorkingDir (toFilePath pkgDir) $ withProcessContext menv $ case outputType of
-                        OTLogFile _ h -> do
-                          let prefixWithTimestamps =
-                                if configPrefixTimestamps config
-                                   then PrefixWithTimestamps
-                                   else WithoutTimestamps
-                          void $ sinkProcessStderrStdout (toFilePath exeName) fullArgs
-                              (sinkWithTimestamps prefixWithTimestamps h)
-                              (sinkWithTimestamps prefixWithTimestamps h)
-                        OTConsole mprefix ->
-                            let prefix = fold mprefix in
-                            void $ sinkProcessStderrStdout (toFilePath exeName) fullArgs
-                                (outputSink KeepTHLoading LevelWarn compilerVer prefix)
-                                (outputSink stripTHLoading LevelInfo compilerVer prefix)
-                    outputSink
-                        :: HasCallStack
-                        => ExcludeTHLoading
-                        -> LogLevel
-                        -> ActualCompiler
-                        -> Utf8Builder
-                        -> ConduitM S.ByteString Void (RIO env) ()
-                    outputSink excludeTH level compilerVer prefix =
-                        CT.decodeUtf8Lenient
-                        .| mungeBuildOutput excludeTH makeAbsolute pkgDir compilerVer
-                        .| CL.mapM_ (logGeneric "" level . (prefix <>) . RIO.display)
-                    -- If users want control, we should add a config option for this
-                    makeAbsolute :: ConvertPathsToAbsolute
-                    makeAbsolute = case stripTHLoading of
-                        ExcludeTHLoading -> ConvertPathsToAbsolute
-                        KeepTHLoading    -> KeepPathsAsIs
-
-            exeName <- case esetupexehs of
-                Left setupExe -> pure setupExe
-                Right setuphs -> do
-                    distDir <- distDirFromDir pkgDir
-                    let setupDir = distDir </> relDirSetup
-                        outputFile = setupDir </> relFileSetupLower
-                    customBuilt <- liftIO $ readIORef eeCustomBuilt
-                    if Set.member (packageName package) customBuilt
-                        then pure outputFile
-                        else do
-                            ensureDir setupDir
-                            compilerPath <- view $ compilerPathsL.to cpCompiler
-                            packageArgs <- getPackageArgs setupDir
-                            runExe compilerPath $
-                                [ "--make"
-                                , "-odir", toFilePathNoTrailingSep setupDir
-                                , "-hidir", toFilePathNoTrailingSep setupDir
-                                , "-i", "-i."
-                                ] ++ packageArgs ++
-                                [ toFilePath setuphs
-                                , toFilePath eeSetupShimHs
-                                , "-main-is"
-                                , "StackSetupShim.mainOverride"
-                                , "-o", toFilePath outputFile
-                                , "-threaded"
-                                ] ++
-
-                                -- Apply GHC options
-                                -- https://github.com/commercialhaskell/stack/issues/4526
-                                map T.unpack (
-                                  Map.findWithDefault [] AGOEverything (configGhcOptionsByCat config) ++
-                                  case configApplyGhcOptions config of
-                                    AGOEverything -> boptsCLIGhcOptions eeBuildOptsCLI
-                                    AGOTargets -> []
-                                    AGOLocals -> [])
-
-                            liftIO $ atomicModifyIORef' eeCustomBuilt $
-                                \oldCustomBuilt -> (Set.insert (packageName package) oldCustomBuilt, ())
-                            pure outputFile
-            let cabalVerboseArg =
-                  let CabalVerbosity cv = boptsCabalVerbose eeBuildOpts
-                  in  "--verbose=" <> showForCabal cv
-            runExe exeName $ cabalVerboseArg:setupArgs
-
--- Implements running a package's build, used to implement 'ATBuild' and
--- 'ATBuildFinal' tasks.  In particular this does the following:
---
--- * Checks if the package exists in the precompiled cache, and if so,
---   add it to the database instead of performing the build.
---
--- * Runs the configure step if needed ('ensureConfig')
---
--- * Runs the build step
---
--- * Generates haddocks
---
--- * Registers the library and copies the built executables into the
---   local install directory. Note that this is literally invoking Cabal
---   with @copy@, and not the copying done by @stack install@ - that is
---   handled by 'copyExecutables'.
-singleBuild :: forall env. (HasEnvConfig env, HasRunner env)
-            => ActionContext
-            -> ExecuteEnv
-            -> Task
-            -> InstalledMap
-            -> Bool             -- ^ Is this a final build?
-            -> RIO env ()
-singleBuild ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} installedMap isFinalBuild = do
-    (allDepsMap, cache) <- getConfigCache ee task installedMap enableTests enableBenchmarks
-    mprecompiled <- getPrecompiled cache
-    minstalled <-
-        case mprecompiled of
-            Just precompiled -> copyPreCompiled precompiled
-            Nothing -> do
-                mcurator <- view $ buildConfigL.to bcCurator
-                realConfigAndBuild cache mcurator allDepsMap
-    case minstalled of
-        Nothing -> pure ()
-        Just installed -> do
-            writeFlagCache installed cache
-            liftIO $ atomically $ modifyTVar eeGhcPkgIds $ Map.insert taskProvides installed
-  where
-    pname = pkgName taskProvides
-    doHaddock mcurator package
-                      = taskBuildHaddock &&
-                        not isFinalBuild &&
-                        -- Works around haddock failing on bytestring-builder since it has no modules
-                        -- when bytestring is new enough.
-                        packageHasExposedModules package &&
-                        -- Special help for the curator tool to avoid haddocks that are known to fail
-                        maybe True (Set.notMember pname . curatorSkipHaddock) mcurator
-    expectHaddockFailure mcurator =
-        maybe False (Set.member pname . curatorExpectHaddockFailure) mcurator
-    fulfillHaddockExpectations mcurator action | expectHaddockFailure mcurator = do
-        eres <- tryAny $ action KeepOpen
-        case eres of
-          Right () -> logWarn $ fromString (packageNameString pname) <> ": unexpected Haddock success"
-          Left _ -> pure ()
-    fulfillHaddockExpectations _ action = do
-        action CloseOnException
-
-    buildingFinals = isFinalBuild || taskAllInOne
-    enableTests = buildingFinals && any isCTest (taskComponents task)
-    enableBenchmarks = buildingFinals && any isCBench (taskComponents task)
-
-    annSuffix executableBuildStatuses = if result == "" then "" else " (" <> result <> ")"
-      where
-        result = T.intercalate " + " $ concat
-            [ ["lib" | taskAllInOne && hasLib]
-            , ["internal-lib" | taskAllInOne && hasSubLib]
-            , ["exe" | taskAllInOne && hasExe]
-            , ["test" | enableTests]
-            , ["bench" | enableBenchmarks]
             ]
-        (hasLib, hasSubLib, hasExe) = case taskType of
-            TTLocalMutable lp ->
-              let package = lpPackage lp
-                  hasLibrary =
-                    case packageLibraries package of
-                      NoLibraries -> False
-                      HasLibraries _ -> True
-                  hasSubLibrary = not . Set.null $ packageInternalLibraries package
-                  hasExecutables = not . Set.null $ exesToBuild executableBuildStatuses lp
-               in (hasLibrary, hasSubLibrary, hasExecutables)
-            -- This isn't true, but we don't want to have this info for
-            -- upstream deps.
-            _ -> (False, False, False)
-
-    getPrecompiled cache =
-        case taskType of
-            TTRemotePackage Immutable _ loc -> do
-                mpc <- readPrecompiledCache
-                       loc
-                       (configCacheOpts cache)
-                       (configCacheHaddock cache)
-                       (configCacheDeps cache)
-                case mpc of
-                    Nothing -> pure Nothing
-                    -- Only pay attention to precompiled caches that refer to packages within
-                    -- the snapshot.
-                    Just pc | maybe False
-                                    (bcoSnapInstallRoot eeBaseConfigOpts `isProperPrefixOf`)
-                                    (pcLibrary pc) ->
-                        pure Nothing
-                    -- If old precompiled cache files are left around but snapshots are deleted,
-                    -- it is possible for the precompiled file to refer to the very library
-                    -- we're building, and if flags are changed it may try to copy the library
-                    -- to itself. This check prevents that from happening.
-                    Just pc -> do
-                        let allM _ [] = pure True
-                            allM f (x:xs) = do
-                                b <- f x
-                                if b then allM f xs else pure False
-                        b <- liftIO $ allM doesFileExist $ maybe id (:) (pcLibrary pc) $ pcExes pc
-                        pure $ if b then Just pc else Nothing
-            _ -> pure Nothing
-
-    copyPreCompiled (PrecompiledCache mlib sublibs exes) = do
-        wc <- view $ actualCompilerVersionL.whichCompilerL
-        announceTask ee task "using precompiled package"
-
-        -- We need to copy .conf files for the main library and all sublibraries which exist in the cache,
-        -- from their old snapshot to the new one. However, we must unregister any such library in the new
-        -- snapshot, in case it was built with different flags.
-        let
-          subLibNames = map T.unpack . Set.toList $ case taskType of
-            TTLocalMutable lp -> packageInternalLibraries $ lpPackage lp
-            TTRemotePackage _ p _ -> packageInternalLibraries p
-          PackageIdentifier name version = taskProvides
-          mainLibName = packageNameString name
-          mainLibVersion = versionString version
-          pkgName = mainLibName ++ "-" ++ mainLibVersion
-          -- z-package-z-internal for internal lib internal of package package
-          toCabalInternalLibName n = concat ["z-", mainLibName, "-z-", n, "-", mainLibVersion]
-          allToUnregister = map (const pkgName) (maybeToList mlib) ++ map toCabalInternalLibName subLibNames
-          allToRegister = maybeToList mlib ++ sublibs
-
-        unless (null allToRegister) $ do
-            withMVar eeInstallLock $ \() -> do
-                -- We want to ignore the global and user databases.
-                -- Unfortunately, ghc-pkg doesn't take such arguments on the
-                -- command line. Instead, we'll set GHC_PACKAGE_PATH. See:
-                -- https://github.com/commercialhaskell/stack/issues/1146
-
-                let modifyEnv = Map.insert
-                      (ghcPkgPathEnvVar wc)
-                      (T.pack $ toFilePathNoTrailingSep $ bcoSnapDB eeBaseConfigOpts)
-
-                withModifyEnvVars modifyEnv $ do
-                  GhcPkgExe ghcPkgExe <- getGhcPkgExe
-
-                  -- first unregister everything that needs to be unregistered
-                  forM_ allToUnregister $ \packageName -> catchAny
-                      (readProcessNull (toFilePath ghcPkgExe) [ "unregister", "--force", packageName])
-                      (const (pure ()))
-
-                  -- now, register the cached conf files
-                  forM_ allToRegister $ \libpath ->
-                    proc (toFilePath ghcPkgExe) [ "register", "--force", toFilePath libpath] readProcess_
-
-        liftIO $ forM_ exes $ \exe -> do
-            ensureDir bindir
-            let dst = bindir </> filename exe
-            createLink (toFilePath exe) (toFilePath dst) `catchIO` \_ -> copyFile exe dst
-        case (mlib, exes) of
-            (Nothing, _:_) -> markExeInstalled (taskLocation task) taskProvides
-            _ -> pure ()
-
-        -- Find the package in the database
-        let pkgDbs = [bcoSnapDB eeBaseConfigOpts]
-
-        case mlib of
-            Nothing -> pure $ Just $ Executable taskProvides
-            Just _ -> do
-                mpkgid <- loadInstalledPkg pkgDbs eeSnapshotDumpPkgs pname
-
-                pure $ Just $
-                    case mpkgid of
-                        Nothing -> assert False $ Executable taskProvides
-                        Just pkgid -> Library taskProvides pkgid Nothing
-      where
-        bindir = bcoSnapInstallRoot eeBaseConfigOpts </> bindirSuffix
-
-    realConfigAndBuild cache mcurator allDepsMap = withSingleContext ac ee task allDepsMap Nothing
-        $ \package cabalfp pkgDir cabal0 announce _outputType -> do
-            let cabal = cabal0 CloseOnException
-            executableBuildStatuses <- getExecutableBuildStatuses package pkgDir
-            when (not (cabalIsSatisfied executableBuildStatuses) && taskIsTarget task)
-                 (logInfo
-                      ("Building all executables for `" <> fromString (packageNameString (packageName package)) <>
-                       "' once. After a successful build of all of them, only specified executables will be rebuilt."))
-
-            _neededConfig <- ensureConfig cache pkgDir ee (announce ("configure" <> RIO.display (annSuffix executableBuildStatuses))) cabal cabalfp task
-            let installedMapHasThisPkg :: Bool
-                installedMapHasThisPkg =
-                    case Map.lookup (packageName package) installedMap of
-                        Just (_, Library ident _ _) -> ident == taskProvides
-                        Just (_, Executable _) -> True
-                        _ -> False
-
-            case ( boptsCLIOnlyConfigure eeBuildOptsCLI
-                 , boptsCLIInitialBuildSteps eeBuildOptsCLI && taskIsTarget task) of
-                -- A full build is done if there are downstream actions,
-                -- because their configure step will require that this
-                -- package is built. See
-                -- https://github.com/commercialhaskell/stack/issues/2787
-                (True, _) | null acDownstream -> pure Nothing
-                (_, True) | null acDownstream || installedMapHasThisPkg -> do
-                    initialBuildSteps executableBuildStatuses cabal announce
-                    pure Nothing
-                _ -> fulfillCuratorBuildExpectations pname mcurator enableTests enableBenchmarks Nothing $
-                     Just <$> realBuild cache package pkgDir cabal0 announce executableBuildStatuses
-
-    initialBuildSteps executableBuildStatuses cabal announce = do
-        announce ("initial-build-steps" <> RIO.display (annSuffix executableBuildStatuses))
-        cabal KeepTHLoading ["repl", "stack-initial-build-steps"]
-
-    realBuild
-        :: ConfigCache
-        -> Package
-        -> Path Abs Dir
-        -> (KeepOutputOpen -> ExcludeTHLoading -> [String] -> RIO env ())
-        -> (Utf8Builder -> RIO env ())
-        -> Map Text ExecutableBuildStatus
-        -> RIO env Installed
-    realBuild cache package pkgDir cabal0 announce executableBuildStatuses = do
-        let cabal = cabal0 CloseOnException
-        wc <- view $ actualCompilerVersionL.whichCompilerL
-
-        markExeNotInstalled (taskLocation task) taskProvides
-        case taskType of
-            TTLocalMutable lp -> do
-                when enableTests $ setTestStatus pkgDir TSUnknown
-                caches <- runMemoizedWith $ lpNewBuildCaches lp
-                mapM_ (uncurry (writeBuildCache pkgDir))
-                      (Map.toList caches)
-            TTRemotePackage{} -> pure ()
-
-        -- FIXME: only output these if they're in the build plan.
-
-        let postBuildCheck _succeeded = do
-                mlocalWarnings <- case taskType of
-                    TTLocalMutable lp -> do
-                        warnings <- checkForUnlistedFiles taskType pkgDir
-                        -- TODO: Perhaps only emit these warnings for non extra-dep?
-                        pure (Just (lpCabalFile lp, warnings))
-                    _ -> pure Nothing
-                -- NOTE: once
-                -- https://github.com/commercialhaskell/stack/issues/2649
-                -- is resolved, we will want to partition the warnings
-                -- based on variety, and output in different lists.
-                let showModuleWarning (UnlistedModulesWarning comp modules) =
-                      "- In" <+>
-                      fromString (T.unpack (renderComponent comp)) <>
-                      ":" <> line <>
-                      indent 4 (mconcat $ L.intersperse line $ map (style Good . fromString . C.display) modules)
-                forM_ mlocalWarnings $ \(cabalfp, warnings) -> do
-                    unless (null warnings) $ prettyWarn $
-                        "The following modules should be added to exposed-modules or other-modules in" <+>
-                        pretty cabalfp <> ":" <> line <>
-                        indent 4 (mconcat $ L.intersperse line $ map showModuleWarning warnings) <>
-                        line <> line <>
-                        "Missing modules in the Cabal file are likely to cause undefined reference errors from the linker, along with other problems."
-
-        () <- announce ("build" <> RIO.display (annSuffix executableBuildStatuses))
-        config <- view configL
-        extraOpts <- extraBuildOptions wc eeBuildOpts
-        let stripTHLoading
-                | configHideTHLoading config = ExcludeTHLoading
-                | otherwise                  = KeepTHLoading
-        cabal stripTHLoading (("build" :) $ (++ extraOpts) $
-            case (taskType, taskAllInOne, isFinalBuild) of
-                (_, True, True) -> error "Invariant violated: cannot have an all-in-one build that also has a final build step."
-                (TTLocalMutable lp, False, False) -> primaryComponentOptions executableBuildStatuses lp
-                (TTLocalMutable lp, False, True) -> finalComponentOptions lp
-                (TTLocalMutable lp, True, False) -> primaryComponentOptions executableBuildStatuses lp ++ finalComponentOptions lp
-                (TTRemotePackage{}, _, _) -> [])
-          `catch` \ex -> case ex of
-              CabalExitedUnsuccessfully{} -> postBuildCheck False >> throwM ex
-              _ -> throwM ex
-        postBuildCheck True
-
-        mcurator <- view $ buildConfigL.to bcCurator
-        when (doHaddock mcurator package) $ do
-            announce "haddock"
-            sourceFlag <- if not (boptsHaddockHyperlinkSource eeBuildOpts) then pure [] else do
-                -- See #2429 for why the temp dir is used
-                ec
-                  <- withWorkingDir (toFilePath eeTempDir)
-                   $ proc "haddock" ["--hyperlinked-source"]
-                   $ \pc -> withProcessWait
-                     (setStdout createSource $ setStderr createSource pc) $ \p ->
-                       runConcurrently
-                         $ Concurrently (runConduit $ getStdout p .| CL.sinkNull)
-                        *> Concurrently (runConduit $ getStderr p .| CL.sinkNull)
-                        *> Concurrently (waitExitCode p)
-                case ec of
-                    -- Fancy crosslinked source
-                    ExitSuccess -> pure ["--haddock-option=--hyperlinked-source"]
-                    -- Older hscolour colouring
-                    ExitFailure _ -> do
-                        hscolourExists <- doesExecutableExist "HsColour"
-                        unless hscolourExists $ logWarn
-                            ("Warning: haddock not generating hyperlinked sources because 'HsColour' not\n" <>
-                             "found on PATH (use 'stack install hscolour' to install).")
-                        pure ["--hyperlink-source" | hscolourExists]
-
-            -- For GHC 8.4 and later, provide the --quickjump option.
-            actualCompiler <- view actualCompilerVersionL
-            let quickjump =
-                  case actualCompiler of
-                    ACGhc ghcVer
-                      | ghcVer >= mkVersion [8, 4] -> ["--haddock-option=--quickjump"]
-                    _ -> []
-
-            fulfillHaddockExpectations mcurator $ \keep -> cabal0 keep KeepTHLoading $ concat
-                [ ["haddock", "--html", "--hoogle", "--html-location=../$pkg-$version/"]
-                , sourceFlag
-                , ["--internal" | boptsHaddockInternal eeBuildOpts]
-                , [ "--haddock-option=" <> opt
-                  | opt <- hoAdditionalArgs (boptsHaddockOpts eeBuildOpts) ]
-                , quickjump
-                ]
-
-        let hasLibrary =
-              case packageLibraries package of
-                NoLibraries -> False
-                HasLibraries _ -> True
-            packageHasComponentSet f = not $ Set.null $ f package
-            hasInternalLibrary = packageHasComponentSet packageInternalLibraries
-            hasExecutables = packageHasComponentSet packageExes
-            shouldCopy = not isFinalBuild && (hasLibrary || hasInternalLibrary || hasExecutables)
-        when shouldCopy $ withMVar eeInstallLock $ \() -> do
-            announce "copy/register"
-            eres <- try $ cabal KeepTHLoading ["copy"]
-            case eres of
-                Left err@CabalExitedUnsuccessfully{} ->
-                    throwM $ CabalCopyFailed (packageBuildType package == C.Simple) (show err)
-                _ -> pure ()
-            when hasLibrary $ cabal KeepTHLoading ["register"]
-
-        -- copy ddump-* files
-        case T.unpack <$> boptsDdumpDir eeBuildOpts of
-          Just ddumpPath | buildingFinals && not (null ddumpPath) -> do
-            distDir <- distRelativeDir
-            ddumpDir <- parseRelDir ddumpPath
-
-            logDebug $ fromString ("ddump-dir: " <> toFilePath ddumpDir)
-            logDebug $ fromString ("dist-dir: " <> toFilePath distDir)
-
-            runConduitRes
-              $ CF.sourceDirectoryDeep False (toFilePath distDir)
-             .| CL.filter (L.isInfixOf ".dump-")
-             .| CL.mapM_ (\src -> liftIO $ do
-                  parentDir <- parent <$> parseRelDir src
-                  destBaseDir <- (ddumpDir </>) <$> stripProperPrefix distDir parentDir
-                  -- exclude .stack-work dir
-                  unless (".stack-work" `L.isInfixOf` toFilePath destBaseDir) $ do
-                    ensureDir destBaseDir
-                    src' <- parseRelFile src
-                    copyFile src' (destBaseDir </> filename src'))
-          _ -> pure ()
-
-        let (installedPkgDb, installedDumpPkgsTVar) =
-                case taskLocation task of
-                    Snap ->
-                         ( bcoSnapDB eeBaseConfigOpts
-                         , eeSnapshotDumpPkgs )
-                    Local ->
-                        ( bcoLocalDB eeBaseConfigOpts
-                        , eeLocalDumpPkgs )
-        let ident = PackageIdentifier (packageName package) (packageVersion package)
-        -- only pure the sublibs to cache them if we also cache the main lib (that is, if it exists)
-        (mpkgid, sublibsPkgIds) <- case packageLibraries package of
-            HasLibraries _ -> do
-                sublibsPkgIds <- fmap catMaybes $
-                  forM (Set.toList $ packageInternalLibraries package) $ \sublib -> do
-                    -- z-haddock-library-z-attoparsec for internal lib attoparsec of haddock-library
-                    let sublibName = T.concat ["z-", T.pack $ packageNameString $ packageName package, "-z-", sublib]
-                    case parsePackageName $ T.unpack sublibName of
-                      Nothing -> pure Nothing -- invalid lib, ignored
-                      Just subLibName -> loadInstalledPkg [installedPkgDb] installedDumpPkgsTVar subLibName
-
-                mpkgid <- loadInstalledPkg [installedPkgDb] installedDumpPkgsTVar (packageName package)
-                case mpkgid of
-                    Nothing -> throwM $ Couldn'tFindPkgId $ packageName package
-                    Just pkgid -> pure (Library ident pkgid Nothing, sublibsPkgIds)
-            NoLibraries -> do
-                markExeInstalled (taskLocation task) taskProvides -- TODO unify somehow with writeFlagCache?
-                pure (Executable ident, []) -- don't pure sublibs in this case
-
-        case taskType of
-            TTRemotePackage Immutable _ loc ->
-              writePrecompiledCache
-                eeBaseConfigOpts
-                loc
-                (configCacheOpts cache)
-                (configCacheHaddock cache)
-                (configCacheDeps cache)
-                mpkgid sublibsPkgIds (packageExes package)
-            _ -> pure ()
-
-        case taskType of
-            -- For packages from a package index, pkgDir is in the tmp
-            -- directory. We eagerly delete it if no other tasks
-            -- require it, to reduce space usage in tmp (#3018).
-            TTRemotePackage{} -> do
-                let remaining = filter (\(ActionId x _) -> x == taskProvides) (Set.toList acRemaining)
-                when (null remaining) $ removeDirRecur pkgDir
-            TTLocalMutable{} -> pure ()
-
-        pure mpkgid
-
-    loadInstalledPkg pkgDbs tvar name = do
-        pkgexe <- getGhcPkgExe
-        dps <- ghcPkgDescribe pkgexe name pkgDbs $ conduitDumpPackage .| CL.consume
-        case dps of
-            [] -> pure Nothing
-            [dp] -> do
-                liftIO $ atomically $ modifyTVar' tvar (Map.insert (dpGhcPkgId dp) dp)
-                pure $ Just (dpGhcPkgId dp)
-            _ -> error $ "singleBuild: invariant violated: multiple results when describing installed package " ++ show (name, dps)
-
--- | Get the build status of all the package executables. Do so by
--- testing whether their expected output file exists, e.g.
---
--- .stack-work/dist/x86_64-osx/Cabal-1.22.4.0/build/alpha/alpha
--- .stack-work/dist/x86_64-osx/Cabal-1.22.4.0/build/alpha/alpha.exe
--- .stack-work/dist/x86_64-osx/Cabal-1.22.4.0/build/alpha/alpha.jsexe/ (NOTE: a dir)
-getExecutableBuildStatuses
-    :: HasEnvConfig env
-    => Package -> Path Abs Dir -> RIO env (Map Text ExecutableBuildStatus)
-getExecutableBuildStatuses package pkgDir = do
-    distDir <- distDirFromDir pkgDir
-    platform <- view platformL
-    fmap
-        M.fromList
-        (mapM (checkExeStatus platform distDir) (Set.toList (packageExes package)))
-
--- | Check whether the given executable is defined in the given dist directory.
-checkExeStatus
-    :: HasLogFunc env
-    => Platform
-    -> Path b Dir
-    -> Text
-    -> RIO env (Text, ExecutableBuildStatus)
-checkExeStatus platform distDir name = do
-    exename <- parseRelDir (T.unpack name)
-    exists <- checkPath (distDir </> relDirBuild </> exename)
-    pure
-        ( name
-        , if exists
-              then ExecutableBuilt
-              else ExecutableNotBuilt)
-  where
-    checkPath base =
-        case platform of
-            Platform _ Windows -> do
-                fileandext <- parseRelFile (file ++ ".exe")
-                doesFileExist (base </> fileandext)
-            _ -> do
-                fileandext <- parseRelFile file
-                doesFileExist (base </> fileandext)
-      where
-        file = T.unpack name
-
--- | Check if any unlisted files have been found, and add them to the build cache.
-checkForUnlistedFiles :: HasEnvConfig env => TaskType -> Path Abs Dir -> RIO env [PackageWarning]
-checkForUnlistedFiles (TTLocalMutable lp) pkgDir = do
-    caches <- runMemoizedWith $ lpNewBuildCaches lp
-    (addBuildCache,warnings) <-
-        addUnlistedToBuildCache
-            (lpPackage lp)
-            (lpCabalFile lp)
-            (lpComponents lp)
-            caches
-    forM_ (M.toList addBuildCache) $ \(component, newToCache) -> do
-        let cache = Map.findWithDefault Map.empty component caches
-        writeBuildCache pkgDir component $
-            Map.unions (cache : newToCache)
-    pure warnings
-checkForUnlistedFiles TTRemotePackage{} _ = pure []
-
--- | Implements running a package's tests. Also handles producing
--- coverage reports if coverage is enabled.
-singleTest :: HasEnvConfig env
-           => TestOpts
-           -> [Text]
-           -> ActionContext
-           -> ExecuteEnv
-           -> Task
-           -> InstalledMap
-           -> RIO env ()
-singleTest topts testsToRun ac ee task installedMap = do
-    -- FIXME: Since this doesn't use cabal, we should be able to avoid using a
-    -- full blown 'withSingleContext'.
-    (allDepsMap, _cache) <- getConfigCache ee task installedMap True False
-    mcurator <- view $ buildConfigL.to bcCurator
-    let pname = pkgName $ taskProvides task
-        expectFailure = expectTestFailure pname mcurator
-    withSingleContext ac ee task allDepsMap (Just "test") $ \package _cabalfp pkgDir _cabal announce outputType -> do
-        config <- view configL
-        let needHpc = toCoverage topts
-
-        toRun <-
-            if toDisableRun topts
-              then do
-                  announce "Test running disabled by --no-run-tests flag."
-                  pure False
-              else if toRerunTests topts
-                  then pure True
-                  else do
-                    status <- getTestStatus pkgDir
-                    case status of
-                      TSSuccess -> do
-                        unless (null testsToRun) $ announce "skipping already passed test"
-                        pure False
-                      TSFailure
-                        | expectFailure -> do
-                            announce "skipping already failed test that's expected to fail"
-                            pure False
-                        | otherwise -> do
-                            announce "rerunning previously failed test"
-                            pure True
-                      TSUnknown -> pure True
-
-        when toRun $ do
-            buildDir <- distDirFromDir pkgDir
-            hpcDir <- hpcDirFromDir pkgDir
-            when needHpc (ensureDir hpcDir)
-
-            let suitesToRun
-                  = [ testSuitePair
-                    | testSuitePair <- Map.toList $ packageTests package
-                    , let testName = fst testSuitePair
-                    , testName `elem` testsToRun
-                    ]
-
-            errs <- liftM Map.unions $ forM suitesToRun $ \(testName, suiteInterface) -> do
-                let stestName = T.unpack testName
-                (testName', isTestTypeLib) <-
-                    case suiteInterface of
-                        C.TestSuiteLibV09{} -> pure (stestName ++ "Stub", True)
-                        C.TestSuiteExeV10{} -> pure (stestName, False)
-                        interface -> throwM (TestSuiteTypeUnsupported interface)
-
-                let exeName = testName' ++
-                        case configPlatform config of
-                            Platform _ Windows -> ".exe"
-                            _ -> ""
-                tixPath <- liftM (pkgDir </>) $ parseRelFile $ exeName ++ ".tix"
-                exePath <- liftM (buildDir </>) $ parseRelFile $ "build/" ++ testName' ++ "/" ++ exeName
-                exists <- doesFileExist exePath
-                -- in Stack.Package.packageFromPackageDescription we filter out
-                -- package itself of any dependencies so any tests requiring loading
-                -- of their own package library will fail
-                -- so to prevent this we return it back here but unfortunately unconditionally
-                installed <- case Map.lookup pname installedMap of
-                  Just (_, installed) -> pure $ Just installed
-                  Nothing -> do
-                    idMap <- liftIO $ readTVarIO (eeGhcPkgIds ee)
-                    pure $ Map.lookup (taskProvides task) idMap
-                let pkgGhcIdList = case installed of
-                                       Just (Library _ ghcPkgId _) -> [ghcPkgId]
-                                       _ -> []
-                -- doctest relies on template-haskell in QuickCheck-based tests
-                thGhcId <- case L.find ((== "template-haskell") . pkgName . dpPackageIdent. snd)
-                                (Map.toList $ eeGlobalDumpPkgs ee) of
-                  Just (ghcId, _) -> pure ghcId
-                  Nothing -> error "template-haskell is a wired-in GHC boot library but it wasn't found"
-                -- env variable GHC_ENVIRONMENT is set for doctest so module names for
-                -- packages with proper dependencies should no longer get ambiguous
-                -- see e.g. https://github.com/doctest/issues/119
-                -- also we set HASKELL_DIST_DIR to a package dist directory so
-                -- doctest will be able to load modules autogenerated by Cabal
-                let setEnv f pc = modifyEnvVars pc $ \envVars ->
-                      Map.insert "HASKELL_DIST_DIR" (T.pack $ toFilePath buildDir) $
-                      Map.insert "GHC_ENVIRONMENT" (T.pack f) envVars
-                    fp' = eeTempDir ee </> testGhcEnvRelFile
-                -- Add a random suffix to avoid conflicts between parallel jobs
-                -- See https://github.com/commercialhaskell/stack/issues/5024
-                randomInt <- liftIO (randomIO :: IO Int)
-                let randomSuffix = "." <> show (abs randomInt)
-                fp <- toFilePath <$> addExtension randomSuffix fp'
-                let snapDBPath = toFilePathNoTrailingSep (bcoSnapDB $ eeBaseConfigOpts ee)
-                    localDBPath = toFilePathNoTrailingSep (bcoLocalDB $ eeBaseConfigOpts ee)
-                    ghcEnv =
-                        "clear-package-db\n" <>
-                        "global-package-db\n" <>
-                        "package-db " <> fromString snapDBPath <> "\n" <>
-                        "package-db " <> fromString localDBPath <> "\n" <>
-                        foldMap (\ghcId -> "package-id " <> RIO.display (unGhcPkgId ghcId) <> "\n")
-                            (pkgGhcIdList ++ thGhcId:M.elems allDepsMap)
-                writeFileUtf8Builder fp ghcEnv
-                menv <- liftIO $ setEnv fp =<< configProcessContextSettings config EnvSettings
-                    { esIncludeLocals = taskLocation task == Local
-                    , esIncludeGhcPackagePath = True
-                    , esStackExe = True
-                    , esLocaleUtf8 = False
-                    , esKeepGhcRts = False
-                    }
-                let emptyResult = Map.singleton testName Nothing
-                withProcessContext menv $ if exists
-                    then do
-                        -- We clear out the .tix files before doing a run.
-                        when needHpc $ do
-                            tixexists <- doesFileExist tixPath
-                            when tixexists $
-                                logWarn ("Removing HPC file " <> fromString (toFilePath tixPath))
-                            liftIO $ ignoringAbsence (removeFile tixPath)
-
-                        let args = toAdditionalArgs topts
-                            argsDisplay = case args of
-                                            [] -> ""
-                                            _ -> ", args: " <> T.intercalate " " (map showProcessArgDebug args)
-                        announce $ "test (suite: " <> RIO.display testName <> RIO.display argsDisplay <> ")"
-
-                        -- Clear "Progress: ..." message before
-                        -- redirecting output.
-                        case outputType of
-                          OTConsole _ -> do
-                            logStickyDone ""
-                            liftIO $ hFlush stdout
-                            liftIO $ hFlush stderr
-                          OTLogFile _ _ -> pure ()
-
-                        let output =
-                                case outputType of
-                                    OTConsole Nothing -> Nothing <$ inherit
-                                    OTConsole (Just prefix) -> fmap
-                                      (\src -> Just $ runConduit $ src .|
-                                               CT.decodeUtf8Lenient .|
-                                               CT.lines .|
-                                               CL.map stripCR .|
-                                               CL.mapM_ (\t -> logInfo $ prefix <> RIO.display t))
-                                      createSource
-                                    OTLogFile _ h -> Nothing <$ useHandleOpen h
-                            optionalTimeout action
-                                | Just maxSecs <- toMaximumTimeSeconds topts, maxSecs > 0 = do
-                                    timeout (maxSecs * 1000000) action
-                                | otherwise = Just <$> action
-
-                        mec <- withWorkingDir (toFilePath pkgDir) $
-                          optionalTimeout $ proc (toFilePath exePath) args $ \pc0 -> do
-                            stdinBS <-
-                              if isTestTypeLib
-                                then do
-                                  logPath <- buildLogPath package (Just stestName)
-                                  ensureDir (parent logPath)
-                                  pure $ BL.fromStrict
-                                       $ encodeUtf8 $ fromString $
-                                       show (logPath, mkUnqualComponentName (T.unpack testName))
-                                else pure mempty
-                            let pc = setStdin (byteStringInput stdinBS)
-                                   $ setStdout output
-                                   $ setStderr output
-                                     pc0
-                            withProcessWait pc $ \p -> do
-                              case (getStdout p, getStderr p) of
-                                (Nothing, Nothing) -> pure ()
-                                (Just x, Just y) -> concurrently_ x y
-                                (x, y) -> assert False $ concurrently_ (fromMaybe (pure ()) x) (fromMaybe (pure ()) y)
-                              waitExitCode p
-                        -- Add a trailing newline, incase the test
-                        -- output didn't finish with a newline.
-                        case outputType of
-                          OTConsole Nothing -> logInfo ""
-                          _ -> pure ()
-                        -- Move the .tix file out of the package
-                        -- directory into the hpc work dir, for
-                        -- tidiness.
-                        when needHpc $
-                            updateTixFile (packageName package) tixPath testName'
-                        let announceResult result = announce $ "Test suite " <> RIO.display testName <> " " <> result
-                        case mec of
-                            Just ExitSuccess -> do
-                                announceResult "passed"
-                                pure Map.empty
-                            Nothing -> do
-                                announceResult "timed out"
-                                if expectFailure
-                                then pure Map.empty
-                                else pure $ Map.singleton testName Nothing
-                            Just ec -> do
-                                announceResult "failed"
-                                if expectFailure
-                                then pure Map.empty
-                                else pure $ Map.singleton testName (Just ec)
-                    else do
-                        unless expectFailure $ logError $ displayShow $ TestSuiteExeMissing
-                            (packageBuildType package == C.Simple)
-                            exeName
-                            (packageNameString (packageName package))
-                            (T.unpack testName)
-                        pure emptyResult
-
-            when needHpc $ do
-                let testsToRun' = map f testsToRun
-                    f tName =
-                        case Map.lookup tName (packageTests package) of
-                            Just C.TestSuiteLibV09{} -> tName <> "Stub"
-                            _ -> tName
-                generateHpcReport pkgDir package testsToRun'
-
-            bs <- liftIO $
-                case outputType of
-                    OTConsole _ -> pure ""
-                    OTLogFile logFile h -> do
-                        hClose h
-                        S.readFile $ toFilePath logFile
-
-            let succeeded = Map.null errs
-            unless (succeeded || expectFailure) $ throwM $ TestSuiteFailure
-                (taskProvides task)
-                errs
-                (case outputType of
-                   OTLogFile fp _ -> Just fp
-                   OTConsole _ -> Nothing)
-                bs
-
-            setTestStatus pkgDir $ if succeeded then TSSuccess else TSFailure
-
--- | Implements running a package's benchmarks.
-singleBench :: HasEnvConfig env
-            => BenchmarkOpts
-            -> [Text]
-            -> ActionContext
-            -> ExecuteEnv
-            -> Task
-            -> InstalledMap
-            -> RIO env ()
-singleBench beopts benchesToRun ac ee task installedMap = do
-    (allDepsMap, _cache) <- getConfigCache ee task installedMap False True
-    withSingleContext ac ee task allDepsMap (Just "bench") $ \_package _cabalfp _pkgDir cabal announce _outputType -> do
-        let args = map T.unpack benchesToRun <> maybe []
-                         ((:[]) . ("--benchmark-options=" <>))
-                         (beoAdditionalArgs beopts)
-
-        toRun <-
-            if beoDisableRun beopts
-              then do
-                  announce "Benchmark running disabled by --no-run-benchmarks flag."
-                  pure False
-              else do
-                  pure True
-
-        when toRun $ do
-            announce "benchmarks"
-            cabal CloseOnException KeepTHLoading ("bench" : args)
-
-data ExcludeTHLoading = ExcludeTHLoading | KeepTHLoading
-data ConvertPathsToAbsolute = ConvertPathsToAbsolute | KeepPathsAsIs
--- | special marker for expected failures in curator builds, using those
--- we need to keep log handle open as build continues further even after a failure
-data KeepOutputOpen = KeepOpen | CloseOnException deriving Eq
-
--- | Strip Template Haskell "Loading package" lines and making paths absolute.
-mungeBuildOutput :: forall m. MonadIO m
-                 => ExcludeTHLoading       -- ^ exclude TH loading?
-                 -> ConvertPathsToAbsolute -- ^ convert paths to absolute?
-                 -> Path Abs Dir           -- ^ package's root directory
-                 -> ActualCompiler         -- ^ compiler we're building with
-                 -> ConduitM Text Text m ()
-mungeBuildOutput excludeTHLoading makeAbsolute pkgDir compilerVer = void $
-    CT.lines
-    .| CL.map stripCR
-    .| CL.filter (not . isTHLoading)
-    .| filterLinkerWarnings
-    .| toAbsolute
-  where
-    -- | Is this line a Template Haskell "Loading package" line
-    -- ByteString
-    isTHLoading :: Text -> Bool
-    isTHLoading = case excludeTHLoading of
-        KeepTHLoading    -> const False
-        ExcludeTHLoading -> \bs ->
-            "Loading package " `T.isPrefixOf` bs &&
-            ("done." `T.isSuffixOf` bs || "done.\r" `T.isSuffixOf` bs)
-
-    filterLinkerWarnings :: ConduitM Text Text m ()
-    filterLinkerWarnings
-        -- Check for ghc 7.8 since it's the only one prone to producing
-        -- linker warnings on Windows x64
-        | getGhcVersion compilerVer >= mkVersion [7, 8] = doNothing
-        | otherwise = CL.filter (not . isLinkerWarning)
-
-    isLinkerWarning :: Text -> Bool
-    isLinkerWarning str =
-        ("ghc.exe: warning:" `T.isPrefixOf` str || "ghc.EXE: warning:" `T.isPrefixOf` str) &&
-        "is linked instead of __imp_" `T.isInfixOf` str
-
-    -- | Convert GHC error lines with file paths to have absolute file paths
-    toAbsolute :: ConduitM Text Text m ()
-    toAbsolute = case makeAbsolute of
-        KeepPathsAsIs          -> doNothing
-        ConvertPathsToAbsolute -> CL.mapM toAbsolutePath
-
-    toAbsolutePath :: Text -> m Text
-    toAbsolutePath bs = do
-        let (x, y) = T.break (== ':') bs
-        mabs <-
-            if isValidSuffix y
-                then liftIO $ liftM (fmap ((T.takeWhile isSpace x <>) . T.pack . toFilePath)) $
-                         forgivingAbsence (resolveFile pkgDir (T.unpack $ T.dropWhile isSpace x)) `catch`
-                             \(_ :: PathException) -> pure Nothing
-                else pure Nothing
-        case mabs of
-            Nothing -> pure bs
-            Just fp -> pure $ fp `T.append` y
-
-    doNothing :: ConduitM Text Text m ()
-    doNothing = awaitForever yield
-
-    -- | Match the error location format at the end of lines
-    isValidSuffix = isRight . parseOnly lineCol
-    lineCol = char ':'
-           >> choice
-                [ num >> char ':' >> num >> optional (char '-' >> num) >> pure ()
-                , char '(' >> num >> char ',' >> num >> string ")-(" >> num >> char ',' >> num >> char ')' >> pure ()
-                ]
-           >> char ':'
-           >> pure ()
-        where num = some digit
-
--- | Whether to prefix log lines with timestamps.
-data PrefixWithTimestamps = PrefixWithTimestamps | WithoutTimestamps
-
--- | Write stream of lines to handle, but adding timestamps.
-sinkWithTimestamps :: MonadIO m => PrefixWithTimestamps -> Handle -> ConduitT ByteString Void m ()
-sinkWithTimestamps prefixWithTimestamps h =
-    case prefixWithTimestamps of
-        PrefixWithTimestamps ->
-            CB.lines .| CL.mapM addTimestamp .| CL.map (<> "\n") .| sinkHandle h
-        WithoutTimestamps -> sinkHandle h
-  where
-    addTimestamp theLine = do
-        now <- liftIO getZonedTime
-        pure (formatZonedTimeForLog now <> " " <> theLine)
-
--- | Format a time in ISO8601 format. We choose ZonedTime over UTCTime
--- because a user expects to see logs in their local time, and would
--- be confused to see UTC time. Stack's debug logs also use the local
--- time zone.
-formatZonedTimeForLog :: ZonedTime -> ByteString
-formatZonedTimeForLog = S8.pack . formatTime defaultTimeLocale "%Y-%m-%dT%H:%M:%S%6Q"
-
--- | Find the Setup.hs or Setup.lhs in the given directory. If none exists,
--- throw an exception.
-getSetupHs :: Path Abs Dir -- ^ project directory
-           -> IO (Path Abs File)
-getSetupHs dir = do
-    exists1 <- doesFileExist fp1
-    if exists1
-        then pure fp1
-        else do
-            exists2 <- doesFileExist fp2
-            if exists2
-                then pure fp2
-                else throwM $ NoSetupHsFound dir
-  where
-    fp1 = dir </> relFileSetupHs
-    fp2 = dir </> relFileSetupLhs
-
--- Do not pass `-hpcdir` as GHC option if the coverage is not enabled.
--- This helps running stack-compiled programs with dynamic interpreters like `hint`.
--- Cfr: https://github.com/commercialhaskell/stack/issues/997
-extraBuildOptions :: (HasEnvConfig env, HasRunner env)
-                  => WhichCompiler -> BuildOpts -> RIO env [String]
-extraBuildOptions wc bopts = do
-    colorOpt <- appropriateGhcColorFlag
-    let optsFlag = compilerOptionsCabalFlag wc
-        baseOpts = maybe "" (" " ++) colorOpt
-    if toCoverage (boptsTestOpts bopts)
-      then do
-        hpcIndexDir <- toFilePathNoTrailingSep <$> hpcRelativeDir
-        pure [optsFlag, "-hpcdir " ++ hpcIndexDir ++ baseOpts]
-      else
-        pure [optsFlag, baseOpts]
-
--- Library, internal and foreign libraries and executable build components.
-primaryComponentOptions :: Map Text ExecutableBuildStatus -> LocalPackage -> [String]
-primaryComponentOptions executableBuildStatuses lp =
-      -- TODO: get this information from target parsing instead,
-      -- which will allow users to turn off library building if
-      -- desired
-      (case packageLibraries package of
-         NoLibraries -> []
-         HasLibraries names ->
-             map T.unpack
-           $ T.append "lib:" (T.pack (packageNameString (packageName package)))
-           : map (T.append "flib:") (Set.toList names)) ++
-      map (T.unpack . T.append "lib:") (Set.toList $ packageInternalLibraries package) ++
-      map (T.unpack . T.append "exe:") (Set.toList $ exesToBuild executableBuildStatuses lp)
-  where
-    package = lpPackage lp
-
--- | History of this function:
---
--- * Normally it would do either all executables or if the user
---   specified requested components, just build them. Afterwards, due
---   to this Cabal bug <https://github.com/haskell/cabal/issues/2780>,
---   we had to make Stack build all executables every time.
---
--- * In <https://github.com/commercialhaskell/stack/issues/3229> this
---   was flagged up as very undesirable behavior on a large project,
---   hence the behavior below that we build all executables once
---   (modulo success), and thereafter pay attention to user-wanted
---   components.
---
-exesToBuild :: Map Text ExecutableBuildStatus -> LocalPackage -> Set Text
-exesToBuild executableBuildStatuses lp =
-    if cabalIsSatisfied executableBuildStatuses && lpWanted lp
-        then exeComponents (lpComponents lp)
-        else packageExes (lpPackage lp)
-
--- | Do the current executables satisfy Cabal's bugged out requirements?
-cabalIsSatisfied :: Map k ExecutableBuildStatus -> Bool
-cabalIsSatisfied = all (== ExecutableBuilt) . M.elems
-
--- Test-suite and benchmark build components.
-finalComponentOptions :: LocalPackage -> [String]
-finalComponentOptions lp =
-    map (T.unpack . renderComponent) $
-    Set.toList $
-    Set.filter (\c -> isCTest c || isCBench c) (lpComponents lp)
+      -- The test/bench run actions depend on whichever action built them: the
+      -- primary ATBuild for an all-in-one final (when one exists), otherwise
+      -- the ATBuildFinal above.
+      buildDep
+        | task.allInOne =
+            maybe Set.empty (const (Set.singleton (ActionId ck ATBuild))) mbuild
+        | otherwise = Set.singleton (ActionId ck ATBuildFinal)
+      -- These are the "final" actions - running test suites and benchmarks,
+      -- unless --no-run-tests or --no-run-benchmarks is enabled.
+      finalRun =
+           [ Action
+               { actionId = ActionId ck ATRunTests
+               , actionDeps = buildDep
+               , action = \ac -> withLock mtestLock $ runInBase $
+                   singleTest topts (Set.toList tests) ac ee task installedMap
+                 -- Always allow test tasks to run concurrently with other
+                 -- tasks, particularly build tasks. Note that 'mtestLock' can
+                 -- optionally make it so that only one test is run at a time.
+               , concurrency = ConcurrencyAllowed
+               }
+           | not (Set.null tests) && runTests
+           ]
+        ++ [ Action
+               { actionId = ActionId ck ATRunBenchmarks
+               , actionDeps = buildDep
+               , action = \ac -> runInBase $
+                   singleBench
+                     beopts
+                     (Set.toList benches)
+                     ac
+                     ee
+                     task
+                     installedMap
+               -- Never run benchmarks concurrently with any other task, see
+               -- #3663
+               , concurrency = ConcurrencyDisallowed
+               }
+           | not (Set.null benches) && runBenchmarks
+           ]
+  withLock Nothing f = f
+  withLock (Just lock) f = withMVar lock $ \() -> f
+  bopts = ee.buildOpts
+  topts = bopts.testOpts
+  beopts = bopts.benchmarkOpts
+  runTests = topts.runTests
+  runBenchmarks = beopts.runBenchmarks
+
+-- | Map external package dependencies to ActionIds. External dependencies are
+-- always library dependencies, so each PackageIdentifier maps to a
+-- ComponentKey with CLib.
+missingToDeps :: Set PackageIdentifier -> Set ActionId
+missingToDeps = Set.map
+  (\pid -> ActionId (ComponentKey (pkgName pid) CLib) ATBuild)
+
+-- | Compute intra-package dependencies for a component. Non-CLib components
+-- depend on CLib ATBuild of the same package, if a CLib build task exists in
+-- the plan. CLib itself has no intra-package deps.
+intraPackageDeps :: Set ComponentKey -> ComponentKey -> Set ActionId
+intraPackageDeps taskKeys ck = case ck of
+  ComponentKey _ CLib -> Set.empty
+  ComponentKey name _ ->
+    let libKey = ComponentKey name CLib
+    in  if libKey `Set.member` taskKeys
+          then Set.singleton (ActionId libKey ATBuild)
+          else Set.empty
+
+-- | Determine which test suites and benchmarks should be run for a final
+-- action. For per-component CTest\/CBench keys, returns exactly that one
+-- component. For non-split CLib keys, returns all tests\/benches from the
+-- component set.
+finalTestsAndBenches ::
+     ComponentKey
+  -> Set NamedComponent
+  -> (Set StackUnqualCompName, Set StackUnqualCompName)
+     -- ^ (tests, benches)
+finalTestsAndBenches ck comps = case ck of
+  ComponentKey _ (CTest name) -> (Set.singleton name, Set.empty)
+  ComponentKey _ (CBench name) -> (Set.empty, Set.singleton name)
+  _ -> (testComponents comps, benchComponents comps)
 
 taskComponents :: Task -> Set NamedComponent
 taskComponents task =
-    case taskType task of
-        TTLocalMutable lp -> lpComponents lp -- FIXME probably just want lpWanted
-        TTRemotePackage{} -> Set.empty
-
-expectTestFailure :: PackageName -> Maybe Curator -> Bool
-expectTestFailure pname mcurator =
-    maybe False (Set.member pname . curatorExpectTestFailure) mcurator
-
-expectBenchmarkFailure :: PackageName -> Maybe Curator -> Bool
-expectBenchmarkFailure pname mcurator =
-    maybe False (Set.member pname . curatorExpectBenchmarkFailure) mcurator
-
-fulfillCuratorBuildExpectations ::
-       (HasLogFunc env, HasCallStack)
-    => PackageName
-    -> Maybe Curator
-    -> Bool
-    -> Bool
-    -> b
-    -> RIO env b
-    -> RIO env b
-fulfillCuratorBuildExpectations pname mcurator enableTests _ defValue action | enableTests &&
-                                                                          expectTestFailure pname mcurator = do
-    eres <- tryAny action
-    case eres of
-      Right res -> do
-          logWarn $ fromString (packageNameString pname) <> ": unexpected test build success"
-          pure res
-      Left _ -> pure defValue
-fulfillCuratorBuildExpectations pname mcurator _ enableBench defValue action | enableBench &&
-                                                                          expectBenchmarkFailure pname mcurator = do
-    eres <- tryAny action
-    case eres of
-      Right res -> do
-          logWarn $ fromString (packageNameString pname) <> ": unexpected benchmark build success"
-          pure res
-      Left _ -> pure defValue
-fulfillCuratorBuildExpectations _ _ _ _ _ action = do
-    action
+  case task.taskType of
+    TTLocalMutable lp -> lp.components -- FIXME probably just want lpWanted
+    TTRemotePackage{} -> Set.empty
diff --git a/src/Stack/Build/ExecuteEnv.hs b/src/Stack/Build/ExecuteEnv.hs
new file mode 100644
index 0000000000..f231bca66a
--- /dev/null
+++ b/src/Stack/Build/ExecuteEnv.hs
@@ -0,0 +1,1168 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE TypeFamilies          #-}
+
+{-|
+Module      : Stack.Build.ExecuteEnv
+License     : BSD-3-Clause
+
+Provides all the necessary types and functions for running cabal Setup.hs
+commands. Only used in the "Execute" and "ExecutePackage" modules.
+-}
+
+module Stack.Build.ExecuteEnv
+  ( ExecuteEnv (..)
+  , withExecuteEnv
+  , withSingleContext
+  , ExcludeTHLoading (..)
+  , KeepOutputOpen (..)
+  , OutputType (..)
+  ) where
+
+import           Control.Concurrent.Companion ( Companion, withCompanion )
+import           Control.Concurrent.Execute
+                   ( ActionContext (..), ActionId (..), Concurrency (..) )
+import           Control.Monad.Extra ( whenJust )
+import           Crypto.Hash ( SHA256 (..), hashWith )
+import           Data.Attoparsec.Text ( char, choice, digit, parseOnly )
+import qualified Data.Attoparsec.Text as P ( string )
+import qualified Data.ByteArray as Mem ( convert )
+import qualified Data.ByteString as S
+import qualified Data.ByteString.Base64.URL as B64URL
+import qualified Data.ByteString.Builder ( toLazyByteString )
+import qualified Data.ByteString.Char8 as S8
+import           Data.Char ( isSpace )
+import           Conduit
+                   ( ConduitT, awaitForever, sinkHandle, withSinkFile
+                   , withSourceFile, yield
+                   )
+import qualified Data.Conduit.Binary as CB
+import qualified Data.Conduit.List as CL
+import qualified Data.Conduit.Text as CT
+import qualified Data.List as L
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import qualified Data.Text as T
+import           Data.Text.Encoding ( decodeUtf8 )
+import           Data.Time
+                   ( ZonedTime, defaultTimeLocale, formatTime, getZonedTime )
+import qualified Distribution.PackageDescription as C
+import qualified Distribution.Simple.Build.Macros as C
+import           Distribution.System ( OS (..), Platform (..) )
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Verbosity ( showForCabal )
+import           Distribution.Version ( mkVersion )
+import           Path
+                   ( PathException, (</>), parent, parseRelDir, parseRelFile )
+import           Path.Extra ( forgivingResolveFile, toFilePathNoTrailingSep )
+import           Path.IO
+                   ( doesDirExist, doesFileExist, ensureDir, ignoringAbsence
+                   , removeFile, renameDir, renameFile
+                   )
+import           RIO.Process
+                   ( eceExitCode, proc, runProcess_, setStdout, useHandleOpen
+                   , withWorkingDir
+                   )
+import           Stack.Config ( checkOwnership )
+import           Stack.Constants
+                   ( cabalPackageName, relDirDist, relDirSetup
+                   , relDirSetupExeCache, relDirSetupExeSrc, relFileBuildLock
+                   , relFileSetupHs, relFileSetupLhs, relFileSetupLower
+                   , relFileSetupMacrosH, setupGhciShimCode, stackProgName
+                   )
+import           Stack.Constants.Config ( distDirFromDir, distRelativeDir )
+import           Stack.Package ( buildLogPath )
+import           Stack.Prelude
+import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
+import           Stack.Types.Build
+                   ( ConvertPathsToAbsolute (..), ExcludeTHLoading (..)
+                   , KeepOutputOpen (..), RunCabalWithArgs
+                   )
+import           Stack.Types.Build.Exception
+                   ( BuildException (..), BuildPrettyException (..) )
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
+import           Stack.Types.BuildOptsCLI ( BuildOptsCLI (..) )
+import           Stack.Types.BuildOptsMonoid ( CabalVerbosity (..) )
+import           Stack.Types.Compiler
+                   ( WhichCompiler (..), compilerVersionString
+                   , getGhcVersion, whichCompilerL
+                   )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), HasCompiler (..), cabalVersionL
+                   , getCompilerPath
+                   )
+import           Stack.Types.Config
+                   ( Config (..), HasConfig (..), stackRootL )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts (..) )
+import           Stack.Types.Dependency
+                   ( DepLibrary (..), DepType (..), DepValue (..) )
+import           Stack.Types.DumpLogs ( DumpLogs (..) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig
+                   ( HasEnvConfig (..), actualCompilerVersionL
+                   , platformGhcRelDir, shouldForceGhcColorFlag
+                   )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId, ghcPkgIdString )
+import           Stack.Types.Installed ( InstallLocation (..), Installed (..) )
+import           Stack.Types.Package
+                   ( LocalPackage (..), Package (..), packageIdentifier
+                   , toCabalMungedPackageName
+                   )
+import           Stack.Types.Plan
+                   ( TaskType (..), componentKeyPkgName
+                   , taskTypeLocation, taskTypePackageIdentifier
+                   )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Version ( withinRange )
+import qualified System.Directory as D
+import           System.Environment ( lookupEnv )
+import           System.FileLock
+                   ( SharedExclusive (..), withFileLock, withTryFileLock )
+import           System.Semaphore
+                   ( Semaphore, destroySemaphore, freshSemaphore )
+
+-- | Type representing environments in which the @Setup.hs@ commands of Cabal
+-- (the library) can be executed.
+data ExecuteEnv = ExecuteEnv
+  { installLock    :: !(MVar ())
+  , buildOpts      :: !BuildOpts
+  , buildOptsCLI   :: !BuildOptsCLI
+  , baseConfigOpts :: !BaseConfigOpts
+  , ghcPkgIds      :: !(TVar (Map PackageIdentifier Installed))
+  , tempDir        :: !(Path Abs Dir)
+  , setupHs        :: !(Path Abs File)
+    -- ^ Temporary Setup.hs for simple builds
+  , setupShimHs    :: !(Path Abs File)
+    -- ^ Temporary SetupShim.hs, to provide access to initial-build-steps
+  , setupExe       :: !(Maybe (Path Abs File))
+    -- ^ Compiled version of eeSetupHs
+  , cabalPkgVer    :: !Version
+    -- ^ The version of the compiler's Cabal boot package.
+  , totalWanted    :: !Int
+  , locals         :: ![LocalPackage]
+  , globalDB       :: !(Path Abs Dir)
+  , globalDumpPkgs :: !(Map GhcPkgId DumpPackage)
+  , snapshotDumpPkgs :: !(TVar (Map GhcPkgId DumpPackage))
+  , localDumpPkgs  :: !(TVar (Map GhcPkgId DumpPackage))
+  , logFiles       :: !(TChan (Path Abs Dir, Path Abs File))
+  , customBuilt    :: !(IORef (Set PackageName))
+    -- ^ Stores which packages with custom-setup have already had their
+    -- Setup.hs built.
+  , largestPackageName :: !(Maybe Int)
+    -- ^ For nicer interleaved output: track the largest package name size
+  , pathEnvVar :: !Text
+    -- ^ Value of the PATH environment variable
+  , semaphore :: !(Maybe Semaphore)
+    -- ^ The semaphore that is used for job control, if --semaphore is given
+  }
+
+-- | Type representing setup executable circumstances.
+data SetupExe
+  = SimpleSetupExe !(Path Abs File)
+    -- ^ The build type is Simple and there is a path to an existing setup
+    -- executable.
+  | OtherSetupHs !(Path Abs File)
+    -- ^ Other circumstances with a path to the source code for the setup
+    -- executable.
+
+buildSetupArgs :: [String]
+buildSetupArgs =
+  [ "-rtsopts"
+  , "-threaded"
+  , "-clear-package-db"
+  , "-global-package-db"
+  , "-hide-all-packages"
+  , "-package"
+  , "base"
+  , "-main-is"
+  , "StackSetupShim.mainOverride"
+  ]
+
+simpleSetupCode :: Builder
+simpleSetupCode = "import Distribution.Simple\nmain = defaultMain"
+
+simpleSetupHash :: String
+simpleSetupHash =
+    T.unpack
+  $ decodeUtf8
+  $ S.take 8
+  $ B64URL.encode
+  $ Mem.convert
+  $ hashWith SHA256
+  $ toStrictBytes
+  $ Data.ByteString.Builder.toLazyByteString
+  $  encodeUtf8Builder (T.pack (unwords buildSetupArgs))
+  <> setupGhciShimCode
+  <> simpleSetupCode
+
+-- | Get a compiled Setup exe
+getSetupExe ::
+     HasEnvConfig env
+  => Path Abs File
+     -- ^ Setup.hs input file
+  -> Path Abs File
+     -- ^ SetupShim.hs input file
+  -> Path Abs Dir
+     -- ^ temporary directory
+  -> RIO env (Maybe (Path Abs File))
+getSetupExe setupHs setupShimHs tmpdir = do
+  wc <- view $ actualCompilerVersionL . whichCompilerL
+  platformDir <- platformGhcRelDir
+  config <- view configL
+  cabalVersionString <- view $ cabalVersionL . to versionString
+  actualCompilerVersionString <-
+    view $ actualCompilerVersionL . to compilerVersionString
+  platform <- view platformL
+  let baseNameS = concat
+        [ "Cabal-simple_"
+        , simpleSetupHash
+        , "_"
+        , cabalVersionString
+        , "_"
+        , actualCompilerVersionString
+        ]
+      exeNameS = baseNameS ++
+        case platform of
+          Platform _ Windows -> ".exe"
+          _ -> ""
+      outputNameS =
+        case wc of
+            Ghc -> exeNameS
+      setupDir =
+        view stackRootL config </>
+        relDirSetupExeCache </>
+        platformDir
+
+  exePath <- (setupDir </>) <$> parseRelFile exeNameS
+
+  exists <- liftIO $ D.doesFileExist $ toFilePath exePath
+
+  if exists
+    then pure $ Just exePath
+    else do
+      tmpExePath <- fmap (setupDir </>) $ parseRelFile $ "tmp-" ++ exeNameS
+      tmpOutputPath <-
+        fmap (setupDir </>) $ parseRelFile $ "tmp-" ++ outputNameS
+      ensureDir setupDir
+      let args = buildSetupArgs ++
+            [ "-package"
+            , "Cabal-" ++ cabalVersionString
+            , toFilePath setupHs
+            , toFilePath setupShimHs
+            , "-o"
+            , toFilePath tmpOutputPath
+            ]
+      compilerPath <- getCompilerPath
+      withWorkingDir (toFilePath tmpdir) $
+        proc (toFilePath compilerPath) args (\pc0 -> do
+          let pc = setStdout (useHandleOpen stderr) pc0
+          runProcess_ pc)
+            `catch` \ece ->
+              prettyThrowM $ SetupHsBuildFailure
+                (eceExitCode ece) Nothing compilerPath args Nothing []
+      renameFile tmpExePath exePath
+      pure $ Just exePath
+
+semaphorePrefix :: String
+semaphorePrefix = "stack"
+
+-- | Execute a function that takes an t'ExecuteEnv'.
+withExecuteEnv ::
+     forall env a. HasEnvConfig env
+  => BuildOpts
+  -> BuildOptsCLI
+  -> BaseConfigOpts
+  -> [LocalPackage]
+  -> [DumpPackage]
+     -- ^ global packages
+  -> [DumpPackage]
+     -- ^ snapshot packages
+  -> [DumpPackage]
+     -- ^ project packages and local extra-deps
+  -> Maybe Int
+     -- ^ largest package name, for nicer interleaved output
+  -> (ExecuteEnv -> RIO env a)
+  -> RIO env a
+withExecuteEnv
+    buildOpts
+    buildOptsCLI
+    baseConfigOpts
+    locals
+    globalPackages
+    snapshotPackages
+    localPackages
+    largestPackageName
+    inner
+  = createTempDirFunction stackProgName $ \tempDir -> do
+      installLock <- liftIO $ newMVar ()
+      ghcPkgIds <- liftIO $ newTVarIO Map.empty
+      config <- view configL
+      customBuilt <- newIORef Set.empty
+      -- Create files for simple setup and setup shim, if necessary
+      let setupSrcDir =
+              view stackRootL config </>
+              relDirSetupExeSrc
+      ensureDir setupSrcDir
+      let setupStub = "setup-" ++ simpleSetupHash
+      setupFileName <- parseRelFile (setupStub ++ ".hs")
+      setupHiName <- parseRelFile (setupStub ++ ".hi")
+      setupOName <- parseRelFile (setupStub ++ ".o")
+      let setupHs = setupSrcDir </> setupFileName
+          setupHi = setupSrcDir </> setupHiName
+          setupO =  setupSrcDir </> setupOName
+      setupHsExists <- doesFileExist setupHs
+      unless setupHsExists $ writeBinaryFileAtomic setupHs simpleSetupCode
+      let setupShimStub = "setup-shim-" ++ simpleSetupHash
+      setupShimFileName <- parseRelFile (setupShimStub ++ ".hs")
+      setupShimHiName <- parseRelFile (setupShimStub ++ ".hi")
+      setupShimOName <- parseRelFile (setupShimStub ++ ".o")
+      let setupShimHs = setupSrcDir </> setupShimFileName
+          setupShimHi = setupSrcDir </> setupShimHiName
+          setupShimO = setupSrcDir </> setupShimOName
+      setupShimHsExists <- doesFileExist setupShimHs
+      unless setupShimHsExists $
+        writeBinaryFileAtomic setupShimHs setupGhciShimCode
+      setupExe <- getSetupExe setupHs setupShimHs tempDir
+      -- See https://github.com/commercialhaskell/stack/issues/6267. Remove any
+      -- historical *.hi or *.o files. This can be dropped when Stack drops
+      -- support for the problematic versions of GHC.
+      ignoringAbsence (removeFile setupHi)
+      ignoringAbsence (removeFile setupO)
+      ignoringAbsence (removeFile setupShimHi)
+      ignoringAbsence (removeFile setupShimO)
+      compilerVersion <- view actualCompilerVersionL
+      let ghcVersion = getGhcVersion compilerVersion
+      cabalPkgVer <- view cabalVersionL
+      globalDB <- view $ compilerPathsL . to (.globalDB)
+      let globalDumpPkgs = toDumpPackagesByGhcPkgId globalPackages
+      snapshotDumpPkgs <-
+        liftIO $ newTVarIO (toDumpPackagesByGhcPkgId snapshotPackages)
+      localDumpPkgs <-
+        liftIO $ newTVarIO (toDumpPackagesByGhcPkgId localPackages)
+      logFiles <- liftIO $ atomically newTChan
+      let totalWanted = length $ filter (.wanted) locals
+      pathEnvVar <- liftIO $ maybe mempty T.pack <$> lookupEnv "PATH"
+      jobs <- view $ configL . to (.jobs)
+      let semaphoreSupported =
+               (cabalPkgVer >= mkVersion [3, 12, 0, 0])
+            && (ghcVersion >= mkVersion [9, 8, 1])
+          semaphoreUnsupportedWarning =
+            prettyWarnL
+              [ "The"
+              , style Shell "--semaphore"
+              , flow "flag was specified, which is supported by GHC 9.8.1 or \
+                     \later with Cabal 3.12.0.0 (a boot package of GHC 9.10.1) \
+                     \or later. GHC version"
+              , fromString (versionString ghcVersion)
+              , flow "and Cabal version"
+              , fromString (versionString cabalPkgVer)
+              , flow "was found. The flag will be ignored."
+              ]
+      semaphore <- if not buildOpts.semaphore
+        then pure Nothing
+        else if semaphoreSupported
+          then Just <$> liftIO (freshSemaphore semaphorePrefix jobs)
+          else semaphoreUnsupportedWarning >> pure Nothing
+      inner ExecuteEnv
+        { buildOpts
+        , buildOptsCLI
+          -- Uncertain as to why we cannot run configures in parallel. This
+          -- appears to be a Cabal library bug. Original issue:
+          -- https://github.com/commercialhaskell/stack/issues/84. Ideally
+          -- we'd be able to remove this.
+        , installLock
+        , baseConfigOpts
+        , ghcPkgIds
+        , tempDir
+        , setupHs
+        , setupShimHs
+        , setupExe
+        , cabalPkgVer
+        , totalWanted
+        , locals
+        , globalDB
+        , globalDumpPkgs
+        , snapshotDumpPkgs
+        , localDumpPkgs
+        , logFiles
+        , customBuilt
+        , largestPackageName
+        , pathEnvVar
+        , semaphore
+        } `finally` do
+          liftIO (whenJust semaphore destroySemaphore)
+          dumpLogs logFiles totalWanted
+ where
+  toDumpPackagesByGhcPkgId = Map.fromList . map (\dp -> (dp.ghcPkgId, dp))
+
+  createTempDirFunction
+    | buildOpts.keepTmpFiles = withKeepSystemTempDir
+    | otherwise = withSystemTempDir
+
+  dumpLogs :: TChan (Path Abs Dir, Path Abs File) -> Int -> RIO env ()
+  dumpLogs chan totalWanted = do
+    allLogs <- fmap reverse $ liftIO $ atomically drainChan
+    case allLogs of
+      -- No log files generated, nothing to dump
+      [] -> pure ()
+      firstLog:_ -> do
+        view (configL . to (.dumpLogs)) >>= \case
+          DumpAllLogs -> mapM_ (dumpLog "") allLogs
+          DumpWarningLogs -> mapM_ dumpLogIfWarning allLogs
+          DumpNoLogs
+              | totalWanted > 1 ->
+                  prettyInfoL
+                    [ flow "Build output has been captured to log files, use"
+                    , style Shell "--dump-logs"
+                    , flow "to see it on the console."
+                    ]
+              | otherwise -> pure ()
+        prettyInfoL
+          [ flow "Log files have been written to:"
+          , pretty (parent (snd firstLog))
+          ]
+
+    -- We only strip the colors /after/ we've dumped logs, so that we get pretty
+    -- colors in our dump output on the terminal.
+    colors <- shouldForceGhcColorFlag
+    when colors $ liftIO $ mapM_ (stripColors . snd) allLogs
+   where
+    drainChan :: STM [(Path Abs Dir, Path Abs File)]
+    drainChan =
+      tryReadTChan chan >>= \case
+        Nothing -> pure []
+        Just x -> do
+          xs <- drainChan
+          pure $ x:xs
+
+  dumpLogIfWarning :: (Path Abs Dir, Path Abs File) -> RIO env ()
+  dumpLogIfWarning (pkgDir, filepath) = do
+    firstWarning <- withSourceFile (toFilePath filepath) $ \src ->
+         runConduit
+       $ src
+      .| CT.decodeUtf8Lenient
+      .| CT.lines
+      .| CL.map stripCR
+      .| CL.filter isWarning
+      .| CL.take 1
+    unless (null firstWarning) $ dumpLog " due to warnings" (pkgDir, filepath)
+
+  isWarning :: Text -> Bool
+  isWarning t = ": Warning:" `T.isSuffixOf` t -- prior to GHC 8
+             || ": warning:" `T.isInfixOf` t -- GHC 8 is slightly different
+             || "mwarning:" `T.isInfixOf` t -- colorized output
+
+  dumpLog :: String -> (Path Abs Dir, Path Abs File) -> RIO env ()
+  dumpLog msgSuffix (pkgDir, filepath) = do
+    prettyNote $
+         fillSep
+           ( ( fillSep
+                 ( flow "Dumping log file"
+                 : [ flow msgSuffix | not (L.null msgSuffix) ]
+                 )
+             <> ":"
+             )
+           : [ pretty filepath <> "." ]
+           )
+      <> line
+    withSourceFile (toFilePath filepath) $ \src ->
+         runConduit
+       $ src
+      .| CT.decodeUtf8Lenient
+      .| mungeBuildOutput ExcludeTHLoading ConvertPathsToAbsolute pkgDir
+      .| CL.mapM_ (logInfo . display)
+    prettyNote $
+         fillSep
+           [ flow "End of log file:"
+           , pretty filepath <> "."
+           ]
+      <> line
+
+  stripColors :: Path Abs File -> IO ()
+  stripColors fp = do
+    let colorfp = toFilePath fp ++ "-color"
+    withSourceFile (toFilePath fp) $ \src ->
+      withSinkFile colorfp $ \sink ->
+      runConduit $ src .| sink
+    withSourceFile colorfp $ \src ->
+      withSinkFile (toFilePath fp) $ \sink ->
+      runConduit $ src .| noColors .| sink
+
+   where
+    noColors = do
+      CB.takeWhile (/= 27) -- ESC
+      mnext <- CB.head
+      whenJust mnext $ \x -> assert (x == 27) $ do
+        -- Color sequences always end with an m
+        CB.dropWhile (/= 109) -- m
+        CB.drop 1 -- drop the m itself
+        noColors
+
+-- | Make a padded prefix for log messages
+packageNamePrefix :: ExecuteEnv -> PackageName -> String
+packageNamePrefix ee name' =
+  let name = packageNameString name'
+      paddedName =
+        case ee.largestPackageName of
+          Nothing -> name
+          Just len ->
+            assert (len >= length name) $ take len $ name ++ L.repeat ' '
+  in  paddedName <> "> "
+
+announceTask ::
+     HasLogFunc env
+  => ExecuteEnv
+  -> TaskType
+  -> Utf8Builder
+  -> RIO env ()
+announceTask ee taskType action = logInfo $
+     fromString
+       (packageNamePrefix ee (pkgName (taskTypePackageIdentifier taskType)))
+  <> action
+
+prettyAnnounceTask ::
+     HasTerm env
+  => ExecuteEnv
+  -> TaskType
+  -> StyleDoc
+  -> RIO env ()
+prettyAnnounceTask ee taskType action = prettyInfo $
+     fromString
+       (packageNamePrefix ee (pkgName (taskTypePackageIdentifier taskType)))
+  <> action
+
+-- | Ensure we're the only action using the directory.  See
+-- <https://github.com/commercialhaskell/stack/issues/2730>
+withLockedDistDir ::
+     forall env a. HasEnvConfig env
+  => (StyleDoc -> RIO env ())
+     -- ^ A pretty announce function
+  -> Path Abs Dir
+     -- ^ root directory for package
+  -> RIO env a
+  -> RIO env a
+withLockedDistDir announce root inner = do
+  distDir <- distRelativeDir
+  let lockFP = root </> distDir </> relFileBuildLock
+  ensureDir $ parent lockFP
+
+  mres <-
+    withRunInIO $ \run ->
+    withTryFileLock (toFilePath lockFP) Exclusive $ \_lock ->
+    run inner
+
+  case mres of
+    Just res -> pure res
+    Nothing -> do
+      let complainer :: Companion (RIO env)
+          complainer delay = do
+            delay 5000000 -- 5 seconds
+            announce $ fillSep
+              [ flow "blocking for directory lock on"
+              , pretty lockFP
+              ]
+            forever $ do
+              delay 30000000 -- 30 seconds
+              announce $ fillSep
+                [ flow "still blocking for directory lock on"
+                , pretty lockFP <> ";"
+                , flow "maybe another Stack process is running?"
+                ]
+      withCompanion complainer $
+        \stopComplaining ->
+          withRunInIO $ \run ->
+            withFileLock (toFilePath lockFP) Exclusive $ \_ ->
+              run $ stopComplaining *> inner
+
+-- | How we deal with output from GHC, either dumping to a log file or the
+-- console (with some prefix).
+data OutputType
+  = OTLogFile !(Path Abs File) !Handle
+  | OTConsole !(Maybe Utf8Builder)
+
+-- | This sets up a context for executing build steps which need to run
+-- Cabal (via a compiled Setup.hs).  In particular it does the following:
+--
+-- * Ensures the package exists in the file system, downloading if necessary.
+--
+-- * Opens a log file if the built output shouldn't go to stderr.
+--
+-- * Ensures that either a simple Setup.hs is built, or the package's
+--   custom setup is built.
+--
+-- * Provides the user a function with which run the Cabal process.
+withSingleContext ::
+     forall env a. HasEnvConfig env
+  => ActionContext
+  -> ExecuteEnv
+  -> TaskType
+  -> Map MungedPackageId GhcPkgId
+     -- ^ Ids of Installed packages that are assumed to be available to build a
+     -- package's custom @Setup.hs@, given its dependencies specified in its
+     -- @custom-setup@ stanza of its Cabal file.
+  -> Maybe String
+     -- ^ An optional suffix for the build log's file name.
+  -> Maybe Text
+     -- ^ Optional CInst dist-dir suffix for Backpack instantiation tasks.
+     -- When 'Just', the @--builddir@ passed to Setup.hs is extended with
+     -- @inst-\<suffix\>@ so that the instantiated build does not clobber the
+     -- indefinite package's build artifacts.
+  -> (  Package        -- Package info
+     -> Path Abs File  -- Cabal file path
+     -> Path Abs Dir   -- Package root directory file path
+        -- Note that the `Path Abs Dir` argument is redundant with the
+        -- `Path Abs File` argument, but we provide both to avoid recalculating
+        -- `parent` of the `File`.
+     -> RunCabalWithArgs env
+        -- Function to run Cabal (the library) with arguments.
+     -> (Utf8Builder -> RIO env ())
+        -- An plain 'announce' function, for different build phases
+     -> OutputType
+     -> RIO env a
+     )
+  -> RIO env a
+withSingleContext
+    ac
+    ee
+    taskType
+    allDeps
+    msuffix
+    mInstSuffix
+    inner0
+  = withPackage $ \package cabalFP pkgDir ->
+      withOutputType pkgDir package $ \outputType ->
+        withCabal package pkgDir outputType $ \cabal ->
+          inner0 package cabalFP pkgDir cabal announce outputType
+ where
+  pkgId = taskTypePackageIdentifier taskType
+  announce = announceTask ee taskType
+  prettyAnnounce = prettyAnnounceTask ee taskType
+
+  wanted =
+    case taskType of
+      TTLocalMutable lp -> lp.wanted
+      TTRemotePackage{} -> False
+
+  -- Output to the console if this is the last task, and the user asked to build
+  -- it specifically. When the action is a 'ConcurrencyDisallowed' action
+  -- (benchmarks), then we can also be sure to have exclusive access to the
+  -- console, so output is also sent to the console in this case.
+  --
+  -- See the discussion on #426 for thoughts on sending output to the console
+  --from concurrent tasks.
+  console =
+       (  wanted
+       && all
+            (\(ActionId ck _) -> componentKeyPkgName ck == pkgName pkgId)
+            (Set.toList ac.remaining)
+       && ee.totalWanted == 1
+       )
+    || ac.concurrency == ConcurrencyDisallowed
+
+  withPackage inner =
+    case taskType of
+      TTLocalMutable lp -> do
+        let root = parent lp.cabalFP
+        withLockedDistDir prettyAnnounce root $
+          inner lp.package lp.cabalFP root
+      TTRemotePackage _ package pkgloc -> do
+        suffix <-
+          parseRelDir $ packageIdentifierString $ packageIdentifier package
+        let dir = ee.tempDir </> suffix
+        unpackPackageLocation dir pkgloc
+
+        -- See: https://github.com/commercialhaskell/stack/issues/157
+        distDir <- distRelativeDir
+        let oldDist = dir </> relDirDist
+            newDist = dir </> distDir
+        exists <- doesDirExist oldDist
+        when exists $ do
+          -- Previously used takeDirectory, but that got confused
+          -- by trailing slashes, see:
+          -- https://github.com/commercialhaskell/stack/issues/216
+          --
+          -- Instead, use Path which is a bit more resilient
+          ensureDir $ parent newDist
+          renameDir oldDist newDist
+
+        let name = pkgName pkgId
+        cabalfpRel <- parseRelFile $ packageNameString name ++ ".cabal"
+        let cabalFP = dir </> cabalfpRel
+        inner package cabalFP dir
+
+  withOutputType pkgDir package inner
+    -- Not in interleaved mode. When building a single wanted package, dump
+    -- to the console with no prefix.
+    | console = inner $ OTConsole Nothing
+
+    -- If the user requested interleaved output, dump to the console with a
+    -- prefix.
+    | ee.buildOpts.interleavedOutput = inner $
+        OTConsole $ Just $ fromString (packageNamePrefix ee package.name)
+
+    -- Neither condition applies, dump to a file.
+    | otherwise = do
+        logPath <- buildLogPath package msuffix
+        ensureDir (parent logPath)
+        let fp = toFilePath logPath
+
+        -- We only want to dump logs for local non-dependency packages
+        case taskType of
+          TTLocalMutable lp | lp.wanted ->
+              liftIO $ atomically $ writeTChan ee.logFiles (pkgDir, logPath)
+          _ -> pure ()
+
+        withBinaryFile fp WriteMode $ \h -> inner $ OTLogFile logPath h
+
+  withCabal ::
+       Package
+    -> Path Abs Dir
+    -> OutputType
+    -> (  RunCabalWithArgs env
+          -- Function to run Cabal (the library) with arguments.
+       -> RIO env a
+       )
+    -> RIO env a
+  withCabal package pkgDir outputType inner = do
+    config <- view configL
+    unless config.allowDifferentUser $
+      checkOwnership (pkgDir </> config.workDir)
+    let envSettings = EnvSettings
+          { includeLocals = taskTypeLocation taskType == Local
+          , includeGhcPackagePath = False
+          , stackExe = False
+          , localeUtf8 = True
+          , keepGhcRts = False
+          }
+    menv <- liftIO $ config.processContextSettings envSettings
+    distDir' <- distDirFromDir pkgDir
+    buildDir <- case mInstSuffix of
+      Nothing -> pure distDir'
+      Just suffix -> do
+        instSubDir <- parseRelDir ("inst-" ++ T.unpack suffix)
+        pure (distDir' </> instSubDir)
+    setupexehs <-
+      -- Avoid broken Setup.hs files causing problems for simple build
+      -- types, see:
+      -- https://github.com/commercialhaskell/stack/issues/370
+      case (package.buildType, ee.setupExe) of
+        (C.Simple, Just setupExe) -> pure $ SimpleSetupExe setupExe
+        _ -> liftIO $ OtherSetupHs <$> getSetupHs pkgDir
+    inner $ \keepOutputOpen stripTHLoading args -> do
+      let cabalPackageArg
+            -- Omit cabal package dependency when building
+            -- Cabal. See
+            -- https://github.com/commercialhaskell/stack/issues/1356
+            | package.name == mkPackageName "Cabal" = []
+            | otherwise =
+                ["-package=" ++ packageIdentifierString
+                                    (PackageIdentifier cabalPackageName
+                                                      ee.cabalPkgVer)]
+          packageDBArgs =
+            ( "-clear-package-db"
+            : "-global-package-db"
+            : map
+                (("-package-db=" ++) . toFilePathNoTrailingSep)
+                ee.baseConfigOpts.extraDBs
+            ) ++
+            ( (  "-package-db="
+              ++ toFilePathNoTrailingSep ee.baseConfigOpts.snapDB
+              )
+            : (  "-package-db="
+              ++ toFilePathNoTrailingSep ee.baseConfigOpts.localDB
+              )
+            : ["-hide-all-packages"]
+            )
+
+          warnCustomNoDeps :: RIO env ()
+          warnCustomNoDeps =
+            case (taskType, package.buildType) of
+              (TTLocalMutable lp, C.Custom) | lp.wanted ->
+                prettyWarnL
+                  [ flow "Package"
+                  , fromPackageName package.name
+                  , flow "uses a custom Cabal build, but does not use a \
+                         \custom-setup stanza"
+                  ]
+              _ -> pure ()
+
+          getPackageArgs :: Path Abs Dir -> RIO env [String]
+          getPackageArgs setupDir =
+            case package.setupDeps of
+              -- The package is using the Cabal custom-setup configuration
+              -- introduced in Cabal 1.24. In this case, the package is
+              -- providing an explicit list of dependencies, and we should
+              -- simply use all of them.
+              Just customSetupDeps -> do
+                cabalPackageArg' <-
+                  if Map.member (mkPackageName "Cabal") customSetupDeps
+                    then pure []
+                    else do
+                      prettyWarnL
+                        [ style Current (fromPackageName package.name)
+                        , flow "has a"
+                        , style Shell "setup-depends"
+                        , flow "field, but it does not mention a"
+                        , style Current "Cabal"
+                        , flow "dependency. Stack customizes setup using \
+                               \Cabal, so it has added the GHC boot package as \
+                               \a dependency."
+                        ]
+                      pure cabalPackageArg
+                matchedDeps <-
+                  forM (Map.toList customSetupDeps) $ \(name, depValue) -> do
+                    let mungedPkgNames = depToMungedPkgNames name depValue
+                        countMungedPkgNames = Set.size mungedPkgNames
+                        matches (MungedPackageId mungedPkgName version) _ =
+                             mungedPkgName `Set.member` mungedPkgNames
+                          && version `withinRange` depValue.versionRange
+                    case Map.filterWithKey matches allDeps of
+                      matchedDeps | Map.null matchedDeps -> do
+                        prettyWarnL
+                          [ flow "Could not find custom-setup dep:"
+                          , style Current (fromPackageName name) <> "."
+                          ]
+                        pure (["-package=" <> packageNameString name], Nothing)
+                      matchedDeps -> do
+                        let groupMatchedByVersion =
+                              Map.foldlWithKey'
+                                ( \acc k v ->
+                                    let p = mungedVersion k
+                                        innerMap = Map.singleton k v
+                                    in  Map.insertWith Map.union p innerMap acc
+                                )
+                                Map.empty
+                                matchedDeps
+                            countMatchedDeps = Map.size matchedDeps
+                        if Map.size groupMatchedByVersion == 1
+                          then do
+                            when (countMatchedDeps < countMungedPkgNames) $
+                              prettyWarnL
+                                [ flow "Found insufficent installed packages \
+                                       \for custom-setup dep:"
+                                , style Current (fromPackageName name) <> "."
+                                ]
+                          else do
+                            prettyWarnL
+                              [ flow "Found installed packages with multiple \
+                                     \versions for custom-setup dep:"
+                              , style Current (fromPackageName name) <> "."
+                              ]
+                        let packageIdOpt ghcPkgId =
+                              "-package-id=" <> ghcPkgIdString ghcPkgId
+                            -- The previous algorithm (arbitrarily?) selected
+                            -- the first relevant item yielded by Map.toList
+                            -- (which is Map.toAscList), so we select the
+                            -- minimum:
+                            selectedGroup = Map.findMin groupMatchedByVersion
+                            selectedVersion = fst selectedGroup
+                            packageIdOpts =
+                              map packageIdOpt $ Map.elems $ snd selectedGroup
+                            selectedPkgId =
+                              PackageIdentifier name selectedVersion
+                        pure (packageIdOpts, Just selectedPkgId)
+                let depsArgs = L.concatMap fst matchedDeps
+                -- Generate setup_macros.h and provide it to ghc
+                let macroDeps = mapMaybe snd matchedDeps
+                    cppMacrosFile = setupDir </> relFileSetupMacrosH
+                    cppArgs =
+                      ["-optP-include", "-optP" ++ toFilePath cppMacrosFile]
+                writeBinaryFileAtomic
+                  cppMacrosFile
+                  ( encodeUtf8Builder
+                      ( T.pack
+                          ( C.generatePackageVersionMacros
+                              package.version
+                              macroDeps
+                          )
+                      )
+                  )
+                pure (packageDBArgs ++ depsArgs ++ cabalPackageArg' ++ cppArgs)
+
+              -- This branch is usually taken for builds, and is always taken
+              -- for `stack sdist`.
+              --
+              -- This approach is debatable. It adds access to the snapshot
+              -- package database for Cabal. There are two possible objections:
+              --
+              -- 1. This doesn't isolate the build enough; arbitrary other
+              -- packages available could cause the build to succeed or fail.
+              --
+              -- 2. This doesn't provide enough packages: we should also
+              -- include the local database when building local packages.
+              --
+              -- Currently, this branch is only taken via `stack sdist` or when
+              -- explicitly requested in the stack.yaml file.
+              Nothing -> do
+                warnCustomNoDeps
+                let packageDBArgs' = case package.buildType of
+                      -- The Configure build type is very similar to Simple. As
+                      -- such, Stack builds the setup executable in much the
+                      -- same way as it would in the case of Simple.
+                      C.Configure ->
+                        [ "-hide-all-packages"
+                        , "-package base"
+                        ]
+                      -- NOTE: This is different from packageDBArgs above in
+                      -- that it does not include the local database and does
+                      -- not pass in the -hide-all-packages argument
+                      _ ->
+                           map
+                             (("-package-db=" ++) . toFilePathNoTrailingSep)
+                             ee.baseConfigOpts.extraDBs
+                        <> [    "-package-db="
+                             <> toFilePathNoTrailingSep ee.baseConfigOpts.snapDB
+                           ]
+                pure $
+                     [ "-clear-package-db"
+                     , "-global-package-db"
+                     ]
+                  <> packageDBArgs'
+                  <> cabalPackageArg
+
+          setupArgs =
+            ("--builddir=" ++ toFilePathNoTrailingSep buildDir) : args
+
+          depToMungedPkgNames ::
+               PackageName
+               -- ^ The name of the Cabal package.
+            -> DepValue
+               -- ^ The dependency value for that package.
+            -> Set.Set MungedPackageName
+          depToMungedPkgNames pkgName depValue
+            | AsLibrary depLibrary <- depValue.depType =
+                let addMain = if depLibrary.main
+                      then Set.insert mungedMainPkgName
+                      else id
+                    mungedMainPkgName = toCabalMungedPackageName pkgName Nothing
+                    subLibSet =
+                      Set.map
+                        (toCabalMungedPackageName pkgName . Just)
+                        depLibrary.subLib
+                in  addMain subLibSet
+            | otherwise = Set.empty
+
+          runExe :: Path Abs File -> [String] -> RIO env ()
+          runExe exeName fullArgs = do
+            runAndOutput `catch` \ece -> do
+              (mlogFile, bss) <-
+                case outputType of
+                  OTConsole _ -> pure (Nothing, [])
+                  OTLogFile logFile h ->
+                    if keepOutputOpen == KeepOpen
+                    then
+                      pure (Nothing, []) -- expected failure build continues further
+                    else do
+                      liftIO $ hClose h
+                      fmap (Just logFile,) $ withSourceFile (toFilePath logFile) $
+                        \src ->
+                             runConduit
+                           $ src
+                          .| CT.decodeUtf8Lenient
+                          .| mungeBuildOutput stripTHLoading makeAbsolute pkgDir
+                          .| CL.consume
+              prettyThrowM $ CabalExitedUnsuccessfully
+                (eceExitCode ece) pkgId exeName fullArgs mlogFile bss
+           where
+            runAndOutput :: RIO env ()
+            runAndOutput = withWorkingDir (toFilePath pkgDir) $
+              withProcessContext menv $ case outputType of
+                OTLogFile _ h -> do
+                  let prefixWithTimestamps =
+                        if config.prefixTimestamps
+                          then PrefixWithTimestamps
+                          else WithoutTimestamps
+                  void $ sinkProcessStderrStdout (toFilePath exeName) fullArgs
+                    (sinkWithTimestamps prefixWithTimestamps h)
+                    (sinkWithTimestamps prefixWithTimestamps h)
+                OTConsole mprefix ->
+                  let prefix = fromMaybe mempty mprefix
+                  in  void $ sinkProcessStderrStdout
+                        (toFilePath exeName)
+                        fullArgs
+                        (outputSink KeepTHLoading LevelWarn prefix)
+                        (outputSink stripTHLoading LevelInfo prefix)
+            outputSink ::
+                 HasCallStack
+              => ExcludeTHLoading
+              -> LogLevel
+              -> Utf8Builder
+              -> ConduitM S.ByteString Void (RIO env) ()
+            outputSink excludeTH level prefix =
+              CT.decodeUtf8Lenient
+              .| mungeBuildOutput excludeTH makeAbsolute pkgDir
+              .| CL.mapM_ (logGeneric "" level . (prefix <>) . display)
+            -- If users want control, we should add a config option for this
+            makeAbsolute :: ConvertPathsToAbsolute
+            makeAbsolute = case stripTHLoading of
+              ExcludeTHLoading -> ConvertPathsToAbsolute
+              KeepTHLoading    -> KeepPathsAsIs
+
+      exeName <- case setupexehs of
+        SimpleSetupExe setupExe -> pure setupExe
+        OtherSetupHs setuphs -> do
+          distDir <- distDirFromDir pkgDir
+          let setupDir = distDir </> relDirSetup
+              outputFile = setupDir </> relFileSetupLower
+          customBuilt <- liftIO $ readIORef ee.customBuilt
+          if Set.member package.name customBuilt
+            then pure outputFile
+            else do
+              ensureDir setupDir
+              compilerPath <- view $ compilerPathsL . to (.compiler)
+              packageArgs <- getPackageArgs setupDir
+              runExe compilerPath $
+                   [ "--make"
+                   , "-odir", toFilePathNoTrailingSep setupDir
+                   , "-hidir", toFilePathNoTrailingSep setupDir
+                   , "-i", "-i."
+                   ]
+                <> packageArgs
+                <> [ toFilePath setuphs
+                   , toFilePath ee.setupShimHs
+                   , "-main-is"
+                   , "StackSetupShim.mainOverride"
+                   , "-o", toFilePath outputFile
+                   , "-threaded"
+                   ]
+                -- Apply GHC options
+                -- https://github.com/commercialhaskell/stack/issues/4526
+                <> map
+                     T.unpack
+                     (  Map.findWithDefault
+                          []
+                          AGOEverything
+                          config.ghcOptionsByCat
+                     <> case config.applyGhcOptions of
+                          AGOEverything -> ee.buildOptsCLI.ghcOptions
+                          AGOTargets -> []
+                          AGOLocals -> []
+                     )
+
+              liftIO $ atomicModifyIORef' ee.customBuilt $
+                \oldCustomBuilt ->
+                  (Set.insert package.name oldCustomBuilt, ())
+              pure outputFile
+      let cabalVerboseArg =
+            let CabalVerbosity cv = ee.buildOpts.cabalVerbose
+            in  "--verbose=" <> showForCabal cv
+      runExe exeName $ cabalVerboseArg:setupArgs
+
+-- | Strip Template Haskell "Loading package" lines and making paths absolute.
+mungeBuildOutput ::
+     forall m. (MonadIO m, MonadUnliftIO m)
+  => ExcludeTHLoading
+     -- ^ exclude TH loading?
+  -> ConvertPathsToAbsolute
+     -- ^ convert paths to absolute?
+  -> Path Abs Dir
+     -- ^ package's root directory
+  -> ConduitM Text Text m ()
+mungeBuildOutput excludeTHLoading makeAbsolute pkgDir = void $
+  CT.lines
+  .| CL.map stripCR
+  .| CL.filter (not . isTHLoading)
+  .| filterLinkerWarnings
+  .| toAbsolute
+ where
+  -- | Is this line a Template Haskell "Loading package" line
+  -- ByteString
+  isTHLoading :: Text -> Bool
+  isTHLoading = case excludeTHLoading of
+    KeepTHLoading    -> const False
+    ExcludeTHLoading -> \bs ->
+      "Loading package " `T.isPrefixOf` bs &&
+      ("done." `T.isSuffixOf` bs || "done.\r" `T.isSuffixOf` bs)
+
+  filterLinkerWarnings :: ConduitM Text Text m ()
+  filterLinkerWarnings =
+    -- Check for ghc 7.8 since it's the only one prone to producing
+    -- linker warnings on Windows x64
+    doNothing
+
+  -- | Convert GHC error lines with file paths to have absolute file paths
+  toAbsolute :: ConduitM Text Text m ()
+  toAbsolute = case makeAbsolute of
+    KeepPathsAsIs          -> doNothing
+    ConvertPathsToAbsolute -> CL.mapM toAbsolutePath
+
+  toAbsolutePath :: Text -> m Text
+  toAbsolutePath bs = do
+    let (x, y) = T.break (== ':') bs
+    mabs <-
+      if isValidSuffix y
+        then
+          fmap (fmap ((T.takeWhile isSpace x <>) . T.pack . toFilePath)) $
+            forgivingResolveFile pkgDir (T.unpack $ T.dropWhile isSpace x) `catch`
+              \(_ :: PathException) -> pure Nothing
+        else pure Nothing
+    case mabs of
+      Nothing -> pure bs
+      Just fp -> pure $ fp `T.append` y
+
+  doNothing :: ConduitM Text Text m ()
+  doNothing = awaitForever yield
+
+  -- | Match the error location format at the end of lines
+  isValidSuffix = isRight . parseOnly lineCol
+  lineCol = char ':'
+    >> choice
+         [ num >> char ':' >> num >> optional (char '-' >> num) >> pure ()
+         , char '(' >> num >> char ',' >> num >> P.string ")-(" >> num >>
+           char ',' >> num >> char ')' >> pure ()
+         ]
+    >> char ':'
+    >> pure ()
+   where
+    num = some digit
+
+-- | Whether to prefix log lines with timestamps.
+data PrefixWithTimestamps
+  = PrefixWithTimestamps
+  | WithoutTimestamps
+
+-- | Write stream of lines to handle, but adding timestamps.
+sinkWithTimestamps ::
+     MonadIO m
+  => PrefixWithTimestamps
+  -> Handle
+  -> ConduitT ByteString Void m ()
+sinkWithTimestamps prefixWithTimestamps h =
+  case prefixWithTimestamps of
+    PrefixWithTimestamps ->
+      CB.lines .| CL.mapM addTimestamp .| CL.map (<> "\n") .| sinkHandle h
+    WithoutTimestamps -> sinkHandle h
+ where
+  addTimestamp theLine = do
+    now <- liftIO getZonedTime
+    pure (formatZonedTimeForLog now <> " " <> theLine)
+
+-- | Format a time in ISO8601 format. We choose ZonedTime over UTCTime
+-- because a user expects to see logs in their local time, and would
+-- be confused to see UTC time. Stack's debug logs also use the local
+-- time zone.
+formatZonedTimeForLog :: ZonedTime -> ByteString
+formatZonedTimeForLog =
+  S8.pack . formatTime defaultTimeLocale "%Y-%m-%dT%H:%M:%S%6Q"
+
+-- | Find the Setup.hs or Setup.lhs in the given directory. If none exists,
+-- throw an exception.
+getSetupHs ::
+     Path Abs Dir -- ^ project directory
+  -> IO (Path Abs File)
+getSetupHs dir = do
+  exists1 <- doesFileExist fp1
+  if exists1
+    then pure fp1
+    else do
+      exists2 <- doesFileExist fp2
+      if exists2
+        then pure fp2
+        else throwM $ NoSetupHsFound dir
+ where
+  fp1 = dir </> relFileSetupHs
+  fp2 = dir </> relFileSetupLhs
diff --git a/src/Stack/Build/ExecutePackage.hs b/src/Stack/Build/ExecutePackage.hs
new file mode 100644
index 0000000000..36f3207c89
--- /dev/null
+++ b/src/Stack/Build/ExecutePackage.hs
@@ -0,0 +1,1695 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE TypeFamilies          #-}
+
+{-|
+Module      : Stack.Build.ExecutePackage
+Description : Perform a build.
+License     : BSD-3-Clause
+
+Perform a build.
+-}
+
+module Stack.Build.ExecutePackage
+  ( singleBuild
+  , singleTest
+  , singleBench
+  , componentTarget
+  , componentEnableTests
+  , componentEnableBenchmarks
+  , dispatchBuildOpts
+    -- * Backpack helpers (exported for testing)
+  , findGhcPkgId
+  , mkInstantiateWithOpts
+  ) where
+
+import           Control.Concurrent.Execute
+                   ( ActionContext (..), ActionId (..) )
+import           Control.Monad.Extra ( whenJust )
+import qualified Data.ByteString as S
+import qualified Data.ByteString.Char8 as S8
+import qualified Data.ByteString.Lazy as BL
+import           Conduit ( runConduitRes )
+import qualified Data.Conduit.Filesystem as CF
+import qualified Data.Conduit.List as CL
+import           Data.Conduit.Process.Typed ( createSource )
+import qualified Data.Conduit.Text as CT
+import qualified Data.List as L
+import qualified Data.List.NonEmpty as NE
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import qualified Data.Text as T
+import           Distribution.ModuleName ( ModuleName )
+import qualified Distribution.PackageDescription as C
+import           Distribution.System ( OS (..), Platform (..) )
+import qualified Distribution.Text as C
+import           Distribution.Types.MungedPackageName
+                   ( encodeCompatPackageName )
+import           Path
+                   ( (</>), addExtension, filename, isProperPrefixOf, parent
+                   , parseRelDir, parseRelFile, stripProperPrefix
+                   )
+import           Path.Extra ( toFilePathNoTrailingSep )
+import           Path.IO
+                   ( copyFile, doesFileExist, ensureDir, ignoringAbsence
+                   , removeDirRecur, removeFile
+                   )
+import           RIO.NonEmpty ( nonEmpty )
+import           RIO.Process
+                   ( HasProcessContext, byteStringInput, findExecutable
+                   , getStderr, getStdout, inherit, modifyEnvVars, proc
+                   , setStderr, setStdin, setStdout, showProcessArgDebug
+                   , useHandleOpen, waitExitCode, withModifyEnvVars
+                   , withProcessWait, withWorkingDir
+                   )
+import           Stack.Build.ConstructPlan ( shouldSplitComponents )
+import           Stack.Build.Cache
+                   ( TestStatus (..), deleteCaches, getTestStatus
+                   , markExeInstalled, markExeNotInstalled, readPrecompiledCache
+                   , setTestStatus, tryGetCabalMod, tryGetConfigCache
+                   , tryGetPackageProjectRoot, tryGetSetupConfigMod
+                   , writeBuildCache, writeCabalMod, writeConfigCache
+                   , writeFlagCache, writePrecompiledCache
+                   , writePackageProjectRoot, writeSetupConfigMod
+                   )
+import           Stack.Build.ExecuteEnv
+                   ( ExcludeTHLoading (..), ExecuteEnv (..), KeepOutputOpen (..)
+                   , OutputType (..), withSingleContext
+                   )
+import           Stack.Build.TestSuiteTimeout
+                   ( forceKill, prepareForEscalation, terminateGracefully )
+import           Stack.Build.Source ( addUnlistedToBuildCache )
+import           Stack.Config.ConfigureScript ( ensureConfigureScript )
+import           Stack.ConfigureOpts
+                   ( configureOptsFromBase, renderConfigureOpts )
+import           Stack.Constants
+                   ( bindirSuffix, compilerOptionsCabalFlag, testGhcEnvRelFile )
+import           Stack.Constants.Config
+                   ( distDirFromDir, distRelativeDir, hpcDirFromDir
+                   , hpcRelativeDir, setupConfigFromDir
+                   )
+import           Stack.Coverage ( generateHpcReport, updateTixFile )
+import           Stack.GhcPkg ( ghcPkg, ghcPkgPathEnvVar, unregisterGhcPkgIds )
+import           Stack.Package
+                   ( buildLogPath, buildableExes, buildableSubLibs
+                   , hasBuildableMainLibrary, hasIntraPackageDeps
+                   )
+import           Stack.PackageDump ( conduitDumpPackage, ghcPkgDescribe )
+import           Stack.Prelude
+import           Stack.Types.Build ( RunCabalWithArgs )
+import           Stack.Types.Build.Exception
+                   ( BuildException (..), BuildPrettyException (..) )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..), configFileRootL )
+import           Stack.Types.BuildOpts
+                   ( BenchmarkOpts (..), BuildOpts (..), HaddockOpts (..)
+                   , TestOpts (..)
+                   )
+import           Stack.Types.BuildOptsCLI ( BuildOptsCLI (..) )
+import           Stack.Types.Cache
+                   ( ConfigCache (..), ConfigCacheType (..)
+                   , PrecompiledCache (..)
+                   )
+import qualified Stack.Types.Cache as ConfigCache ( ConfigCache (..) )
+import           Stack.Types.CompCollection
+                   ( collectionKeyValueList, collectionLookup
+                   , foldComponentToAnotherCollection, getBuildableListText
+                   )
+import           Stack.Types.Compiler
+                   ( WhichCompiler (..), whichCompiler, whichCompilerL )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), GhcPkgExe (..), HasCompiler (..)
+                   , cpWhich, getGhcPkgExe
+                   )
+import qualified Stack.Types.Component as Component
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName, toCabalName, unqualCompToString
+                   , unqualCompToText
+                   )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.ConfigureOpts
+                   ( BaseConfigOpts (..), ConfigureOpts (..) )
+import           Stack.Types.Curator ( Curator (..) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
+                   , appropriateGhcColorFlag
+                   )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
+import           Stack.Types.GhcPkgId
+                   ( GhcPkgId, ghcPkgIdString, ghcPkgIdToText )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Installed
+                   ( InstallLocation (..), Installed (..), InstalledMap
+                   , InstalledLibraryInfo (..), simpleInstalledLib
+                   )
+import           Stack.Types.IsMutable ( IsMutable (..) )
+import           Stack.Types.NamedComponent
+                   ( NamedComponent (..), exeComponents, isCBench, isCTest
+                   , renderComponent
+                   )
+import           Stack.Types.Package
+                   ( LocalPackage (..), Package (..), installedPackageToGhcPkgId
+                   , runMemoizedWith, toCabalMungedPackageName
+                   )
+import           Stack.Types.PackageFile ( PackageWarning (..) )
+import           Stack.Types.Plan
+                   ( ComponentKey (..), Task (..), TaskConfigOpts (..)
+                   , TaskType (..), componentKeyPkgName, taskIsTarget
+                   , taskLocation, taskProvides, taskTargetIsMutable
+                   , taskTypePackageIdentifier
+                   )
+import           Stack.Types.Runner ( HasRunner, globalOptsL )
+import           Stack.Types.SourceMap ( SourceMap (..) )
+import           System.IO.Error ( isDoesNotExistError )
+import           System.PosixCompat.Files
+                   ( createLink, getFileStatus, modificationTime )
+import           System.Random ( randomIO )
+import           System.Semaphore ( Semaphore (..), SemaphoreName (..) )
+
+-- | Generate the t'ConfigCache' value.
+getConfigCache ::
+     HasEnvConfig env
+  => ExecuteEnv
+  -> Task
+  -> InstalledMap
+  -> Bool
+  -> Bool
+  -> RIO env (Map MungedPackageId GhcPkgId, ConfigCache)
+getConfigCache ee task installedMap enableTest enableBench = do
+  let extra =
+        -- We enable tests if the test suite dependencies are already
+        -- installed, so that we avoid unnecessary recompilation based on
+        -- cabal_macros.h changes when switching between 'stack build' and
+        -- 'stack test'. See:
+        -- https://github.com/commercialhaskell/stack/issues/805
+        case task.taskType of
+          TTLocalMutable _ ->
+            -- FIXME: make this work with exact-configuration.
+            -- Not sure how to plumb the info atm. See
+            -- https://github.com/commercialhaskell/stack/issues/2049
+            [ "--enable-tests" | enableTest] ++
+            [ "--enable-benchmarks" | enableBench]
+          TTRemotePackage{} -> []
+  idMap <- liftIO $ readTVarIO ee.ghcPkgIds
+  let getMissing ident =
+        case Map.lookup ident idMap of
+          Nothing
+              -- Expect to instead find it in installedMap if it's
+              -- an initialBuildSteps target.
+              | ee.buildOptsCLI.initialBuildSteps && taskIsTarget task
+              , Just (_, installed) <- Map.lookup (pkgName ident) installedMap
+                  -> pure $ installedPackageToGhcPkgId ident installed
+          Just installed -> pure $ installedPackageToGhcPkgId ident installed
+          _ -> throwM $ PackageIdMissingBug ident
+  let cOpts = task.configOpts
+  missingMapList <- traverse getMissing $ toList cOpts.missing
+  let pcOpts = cOpts.pkgConfigOpts
+      missing' = Map.unions missingMapList
+      -- Historically the leftermost was missing' for union preference in case of
+      -- collision for the return here. But unifying things with configureOpts
+      -- where it was the opposite resulted in this. It doesn't seem to make any
+      -- difference anyway.
+      allDeps = Map.union missing' task.present
+      configureOpts' = configureOptsFromBase
+        cOpts.envConfig
+        cOpts.baseConfigOpts
+        allDeps
+        cOpts.isLocalNonExtraDep
+        cOpts.isMutable
+        pcOpts
+      instWithOpts =
+        mkInstantiateWithOpts task.backpackInstEntries allDeps
+      configureOpts = configureOpts'
+        { nonPathRelated =
+            configureOpts'.nonPathRelated
+            ++ map T.unpack extra
+            ++ instWithOpts
+        }
+      deps = Set.fromList $ Map.elems missing' ++ Map.elems task.present
+      components = case task.taskType of
+        TTLocalMutable lp ->
+          Set.map (encodeUtf8 . renderComponent) lp.components
+        TTRemotePackage{} -> Set.empty
+      cache = ConfigCache
+        { configureOpts
+        , deps
+        , components
+        , buildHaddocks = task.buildHaddocks
+        , pkgSrc = task.cachePkgSrc
+        , pathEnvVar = ee.pathEnvVar
+        }
+  pure (allDeps, cache)
+
+-- | Look up the 'GhcPkgId' of a package's main library by its 'PackageName' in
+-- a dependency map keyed by 'MungedPackageId'. Used to resolve implementing
+-- packages for Backpack @--instantiate-with@ flags. Only matches the main
+-- library; sublibrary entries (LSubLibName) are ignored.
+findGhcPkgId ::
+     Map MungedPackageId GhcPkgId
+  -> PackageName
+  -> Maybe GhcPkgId
+findGhcPkgId depsMap pn =
+  case [ gid
+       | (MungedPackageId (MungedPackageName n LMainLibName) _, gid)
+           <- Map.toList depsMap
+       , n == pn
+       ] of
+    (gid:_) -> Just gid
+    [] -> Nothing
+
+-- | Generate @--instantiate-with@ configure flags for CInst (Backpack
+-- instantiation) tasks. Each entry maps a signature name to an implementing
+-- module identified by its package's 'GhcPkgId'.
+--
+-- Format: @--instantiate-with=SigName=\<unit-id\>:ImplModuleName@
+mkInstantiateWithOpts ::
+     [(ModuleName, PackageName, ModuleName)]
+     -- ^ Backpack instantiation entries: (sigName, implPkgName, implModuleName)
+  -> Map MungedPackageId GhcPkgId
+     -- ^ All dependency GhcPkgIds, keyed by munged identifier
+  -> [String]
+mkInstantiateWithOpts entries depsMap =
+  [ "--instantiate-with="
+    ++ C.display sigName
+    ++ "="
+    ++ ghcPkgIdString implGhcPkgId
+    ++ ":"
+    ++ C.display implModuleName
+  | (sigName, implPkgName, implModuleName) <- entries
+  , Just implGhcPkgId <- [findGhcPkgId depsMap implPkgName]
+  ]
+
+-- | Ensure that the configuration for the package matches what is given
+ensureConfig ::
+     HasEnvConfig env
+  => ConfigCache
+     -- ^ newConfigCache
+  -> Path Abs Dir
+     -- ^ package directory
+  -> BuildOpts
+  -> Maybe Text
+     -- ^ CInst hash suffix (Nothing for normal builds)
+  -> RIO env ()
+     -- ^ announce
+  -> (ExcludeTHLoading -> [String] -> RIO env ())
+     -- ^ cabal
+  -> Path Abs File
+     -- ^ Cabal file
+  -> Task
+  -> RIO env Bool
+ensureConfig newConfigCache pkgDir buildOpts mInstSuffix announce cabal cabalFP task = do
+  -- CInst (Backpack instantiation) tasks share a source directory with the
+  -- indefinite package but use a separate --builddir. They use a separate
+  -- config cache entry (ConfigCacheTypeInstantiation) to avoid colliding with
+  -- the indefinite build's cache. File-based caches (cabalMod,
+  -- projectRoot) are shared since the .cabal file is the same, but
+  -- setup-config lives in the inst builddir and must be checked there.
+  let configCacheType =
+        maybe ConfigCacheTypeConfig ConfigCacheTypeInstantiation mInstSuffix
+  newCabalMod <-
+    liftIO $ modificationTime <$> getFileStatus (toFilePath cabalFP)
+  setupConfigfp <- case mInstSuffix of
+    Nothing -> setupConfigFromDir pkgDir
+    Just suffix -> do
+      dist <- distDirFromDir pkgDir
+      instSubDir <- parseRelDir ("inst-" ++ T.unpack suffix)
+      setupConfig <- parseRelFile "setup-config"
+      pure $ dist </> instSubDir </> setupConfig
+  let getNewSetupConfigMod =
+        liftIO $ either (const Nothing) (Just . modificationTime) <$>
+        tryJust
+          (guard . isDoesNotExistError)
+          (getFileStatus (toFilePath setupConfigfp))
+  newSetupConfigMod <- getNewSetupConfigMod
+  newConfigFileRoot <- S8.pack . toFilePath <$> view configFileRootL
+  needConfig <-
+    if buildOpts.reconfigure
+          -- The reason 'taskAnyMissing' is necessary is a bug in Cabal. See:
+          -- <https://github.com/haskell/cabal/issues/4728#issuecomment-337937673>.
+          -- The problem is that Cabal may end up generating the same package ID
+          -- for a dependency, even if the ABI has changed. As a result, without
+          -- check, Stack would think that a reconfigure is unnecessary, when in
+          -- fact we _do_ need to reconfigure. The details here suck. We really
+          -- need proper hashes for package identifiers.
+      then pure True
+      else do
+        -- We can ignore the components field of the Cabal configuration cache,
+        -- because it is only used to inform 'construct plan' that we need to
+        -- plan to build additional components. These components don't affect
+        -- the Cabal configuration for the package.
+        let ignoreComponents :: ConfigCache -> ConfigCache
+            ignoreComponents cc = cc { ConfigCache.components = Set.empty }
+        -- Determine the old and new Cabal configuration for the package
+        -- directory, to determine if we need to reconfigure.
+        mOldConfigCache <- tryGetConfigCache pkgDir configCacheType
+
+        mOldCabalMod <- tryGetCabalMod pkgDir
+
+        -- Cabal's setup-config is created per OS/Cabal version, multiple
+        -- projects using the same package could get a conflict because of this
+        mOldSetupConfigMod <- tryGetSetupConfigMod pkgDir
+        mOldProjectRoot <- tryGetPackageProjectRoot pkgDir
+
+        pure $
+                fmap ignoreComponents mOldConfigCache
+             /= Just (ignoreComponents newConfigCache)
+          || mOldCabalMod /= Just newCabalMod
+          || mOldSetupConfigMod /= newSetupConfigMod
+          || mOldProjectRoot /= Just newConfigFileRoot
+
+  when task.buildTypeConfig $
+    -- When build-type is Configure, we need to have a configure script in the
+    -- local directory. If it doesn't exist, build it with autoreconf -i. See:
+    -- https://github.com/commercialhaskell/stack/issues/3534
+    ensureConfigureScript pkgDir
+
+  when needConfig $ do
+    deleteCaches pkgDir configCacheType
+    announce
+    cp <- view compilerPathsL
+    let (GhcPkgExe pkgPath) = cp.pkg
+    let programNames =
+          case cpWhich cp of
+            Ghc ->
+              [ ("ghc", toFilePath cp.compiler)
+              , ("ghc-pkg", toFilePath pkgPath)
+              ]
+    exes <- forM programNames $ \(name, file) ->
+      findExecutable file <&> \case
+        Left _ -> []
+        Right x -> pure $ concat ["--with-", name, "=", x]
+    let allOpts =
+             concat exes
+          <> renderConfigureOpts newConfigCache.configureOpts
+    -- Configure cabal with arguments determined by
+    -- Stack.Types.Build.configureOpts
+    cabal KeepTHLoading $ "configure" : allOpts
+    -- Only write the cache for local packages. Remote packages are built in a
+    -- temporary directory so the cache would never be used anyway.
+    case task.taskType of
+      TTLocalMutable{} -> writeConfigCache pkgDir configCacheType newConfigCache
+      TTRemotePackage{} -> pure ()
+    -- File-based caches are shared with the indefinite build (same .cabal
+    -- file, same pkgDir). Only write them for normal (non-CInst) tasks to
+    -- avoid redundant writes.
+    when (isNothing mInstSuffix) $ do
+      writeCabalMod pkgDir newCabalMod
+      -- This file gets updated one more time by the configure step, so get the
+      -- most recent value. We could instead change our logic above to check if
+      -- our config mod file is newer than the file above, but this seems
+      -- reasonable too.
+      getNewSetupConfigMod >>= writeSetupConfigMod pkgDir
+      writePackageProjectRoot pkgDir newConfigFileRoot
+  pure needConfig
+
+-- | Make a padded prefix for log messages
+packageNamePrefix :: ExecuteEnv -> PackageName -> String
+packageNamePrefix ee name' =
+  let name = packageNameString name'
+      paddedName =
+        case ee.largestPackageName of
+          Nothing -> name
+          Just len ->
+            assert (len >= length name) $ take len $ name ++ L.repeat ' '
+  in  paddedName <> "> "
+
+announceTask ::
+     HasLogFunc env
+  => ExecuteEnv
+  -> TaskType
+  -> Utf8Builder
+  -> RIO env ()
+announceTask ee taskType action = logInfo $
+     fromString
+       (packageNamePrefix ee (pkgName (taskTypePackageIdentifier taskType)))
+  <> action
+
+-- | Implements running a package's build, used to implement
+-- 'Control.Concurrent.Execute.ATBuild' tasks.
+--
+-- In particular this does the following:
+--
+-- * Checks if the package exists in the precompiled cache, and if so, add it to
+--   the database instead of performing the build.
+--
+-- * Runs the configure step if needed (@ensureConfig@)
+--
+-- * Runs the build step
+--
+-- * Generates haddocks
+--
+-- * Registers the library and copies the built executables into the local
+--   install directory. Note that this is literally invoking Cabal with @copy@,
+--   and not the copying done by @stack install@ - that is handled by
+--   'Stack.Build.copyExecutables'.
+singleBuild ::
+     forall env. (HasEnvConfig env, HasRunner env)
+  => ActionContext
+  -> ExecuteEnv
+  -> Task
+  -> InstalledMap
+  -> Bool
+     -- ^ Is this a final build? (Controls enable-tests/--enable-benchmarks.)
+  -> Bool
+     -- ^ Is this a merged primary+final build? True only when a non-split
+     --   package's primary task is folded together with its final task in a
+     --   single Setup invocation, so lib/exe components are also built and
+     --   installed. Ignored when isFinalBuild is False.
+  -> ComponentKey
+     -- ^ The component key identifying which component this build is for.
+  -> RIO env ()
+singleBuild
+    ac
+    ee
+    task
+    installedMap
+    isFinalBuild
+    isMergedBuild
+    ck
+  = do
+    (allDeps, cache) <-
+      getConfigCache ee task installedMap enableTests enableBenchmarks
+    let bcoSnapInstallRoot = ee.baseConfigOpts.snapInstallRoot
+        isCInstTask = case ck of
+          ComponentKey _ (CInst _) -> True
+          _ -> False
+    mprecompiled <- getPrecompiled isCInstTask cache task.taskType bcoSnapInstallRoot
+    minstalled <-
+      case mprecompiled of
+        Just precompiled ->
+          copyPreCompiled isCInstTask ee task pkgId precompiled
+        Nothing -> do
+          curator <- view $ buildConfigL . to (.curator)
+          realConfigAndBuild
+            ac
+            ee
+            task
+            installedMap
+            (enableTests, enableBenchmarks)
+            (isFinalBuild, buildingFinals, isMergedBuild)
+            cache
+            curator
+            allDeps
+            ck
+    -- For CInst (Backpack instantiation) tasks, do NOT update the ghcPkgIds
+    -- TVar. The consumer's --dependency flag must reference the indefinite
+    -- GhcPkgId (stored by the CLib task). Cabal resolves the instantiation
+    -- by looking up the package DB using mixin declarations. Writing the
+    -- flag cache is also skipped to avoid clobbering the indefinite build's
+    -- cache.
+    unless isCInstTask $
+      whenJust minstalled $ \installed -> do
+        writeFlagCache installed cache
+        liftIO $ atomically $ modifyTVar ee.ghcPkgIds $ Map.insert pkgId installed
+ where
+  pkgId = taskProvides task
+  buildingFinals = isFinalBuild
+  enableTests = buildingFinals
+    && componentEnableTests ck (taskComponents task)
+  enableBenchmarks = buildingFinals
+    && componentEnableBenchmarks ck (taskComponents task)
+
+realConfigAndBuild ::
+     forall env a. HasEnvConfig env
+  => ActionContext
+  -> ExecuteEnv
+  -> Task
+  -> Map PackageName (a, Installed)
+  -> (Bool, Bool)
+     -- ^ (enableTests, enableBenchmarks)
+  -> (Bool, Bool, Bool)
+     -- ^ (isFinalBuild, buildingFinals, isMergedBuild)
+  -> ConfigCache
+  -> Maybe Curator
+  -> Map MungedPackageId GhcPkgId
+     -- ^ Ids of installed packages that are assumed to be available to build a
+     -- package's custom @Setup.hs@, given its dependencies specified in its
+     -- @custom-setup@ stanza of its Cabal file.
+  -> ComponentKey
+  -> RIO env (Maybe Installed)
+realConfigAndBuild
+    ac
+    ee
+    task
+    installedMap
+    (enableTests, enableBenchmarks)
+    (isFinalBuild, buildingFinals, isMergedBuild)
+    cache
+    mcurator0
+    allDepsMap
+    ck
+  = withSingleContext ac ee task.taskType allDepsMap Nothing mInstSuffix $
+      \package cabalFP pkgDir cabal0 announce _outputType -> do
+        let cabal = cabal0 CloseOnException
+        _neededConfig <-
+          ensureConfig
+            cache
+            pkgDir
+            ee.buildOpts
+            mInstSuffix
+            (announce ("configure" <> display annSuffix))
+            cabal
+            cabalFP
+            task
+        let installedMapHasThisPkg :: Bool
+            installedMapHasThisPkg =
+              case Map.lookup package.name installedMap of
+                Just (_, Library ident _) -> ident == pkgId
+                Just (_, Executable _) -> True
+                _ -> False
+
+        case ( ee.buildOptsCLI.onlyConfigure
+             , ee.buildOptsCLI.initialBuildSteps && taskIsTarget task
+             ) of
+          -- A full build is done if there are downstream actions,
+          -- because their configure step will require that this
+          -- package is built. See
+          -- https://github.com/commercialhaskell/stack/issues/2787
+          (True, _) | null ac.downstream -> pure Nothing
+          (_, True) | null ac.downstream || installedMapHasThisPkg -> do
+            initialBuildSteps cabal announce
+            pure Nothing
+          _ -> fulfillCuratorBuildExpectations
+                 pname
+                 mcurator0
+                 enableTests
+                 enableBenchmarks
+                 Nothing
+                 (Just <$> realBuild package pkgDir cabal0 announce)
+ where
+  pkgId = taskProvides task
+  PackageIdentifier pname _ = pkgId
+  mInstSuffix = case ck of
+    ComponentKey _ (CInst hashSuffix) -> Just hashSuffix
+    _ -> Nothing
+  doHaddock curator =
+       task.buildHaddocks
+       -- Skip haddock only for pure finals-only builds (split CTest/CBench
+       -- or the non-split finalBuild action with no primary to go with).
+       -- Merged non-split builds still produce primary components, so run
+       -- haddock for them as we would for a plain primary build.
+    && not (isFinalBuild && not isMergedBuild)
+       -- Special help for the curator tool to avoid haddocks that are known
+       -- to fail
+    && maybe True (Set.notMember pname . (.skipHaddock)) curator
+
+  annSuffix = buildAnnSuffix ck task enableTests enableBenchmarks
+  initialBuildSteps cabal announce = do
+    announce ("initial-build-steps" <> display annSuffix)
+    cabal KeepTHLoading ["repl", "stack-initial-build-steps"]
+
+  realBuild ::
+       Package
+    -> Path Abs Dir
+    -> RunCabalWithArgs env
+       -- ^ Function to run Cabal (the library) with arguments.
+    -> (Utf8Builder -> RIO env ())
+       -- ^ A plain 'announce' function.
+    -> RIO env Installed
+  realBuild package pkgDir cabal0 announce = do
+    let cabal = cabal0 CloseOnException
+    wc <- view $ actualCompilerVersionL . whichCompilerL
+
+    markExeNotInstalled (taskLocation task) pkgId
+    case task.taskType of
+      TTLocalMutable lp -> do
+        when enableTests $ setTestStatus pkgDir TSUnknown
+        caches <- runMemoizedWith lp.newBuildCaches
+        mapM_
+          (uncurry (writeBuildCache pkgDir))
+          (Map.toList caches)
+      TTRemotePackage{} -> pure ()
+
+    -- FIXME: only output these if they're in the build plan.
+    let postBuildCheck _succeeded = do
+          mlocalWarnings <- case task.taskType of
+            TTLocalMutable lp -> do
+                warnings <- checkForUnlistedFiles task.taskType pkgDir
+                -- TODO: Perhaps only emit these warnings for non extra-dep?
+                pure (Just (lp.cabalFP, warnings))
+            _ -> pure Nothing
+          -- NOTE: once
+          -- https://github.com/commercialhaskell/stack/issues/2649
+          -- is resolved, we will want to partition the warnings
+          -- based on variety, and output in different lists.
+          let showModuleWarning (UnlistedModulesWarning comp modules) =
+                "- In" <+>
+                fromString (T.unpack (renderComponent comp)) <>
+                ":" <> line <>
+                indent 4 ( mconcat
+                         $ L.intersperse line
+                         $ map
+                             (style Good . fromString . C.display)
+                             modules
+                         )
+          forM_ mlocalWarnings $ \(cabalFP, warnings) ->
+            unless (null warnings) $ prettyWarn $
+                 flow "The following modules should be added to \
+                      \exposed-modules or other-modules in" <+>
+                      pretty cabalFP
+              <> ":"
+              <> line
+              <> indent 4 ( mconcat
+                          $ L.intersperse line
+                          $ map showModuleWarning warnings
+                          )
+              <> blankLine
+              <> flow "Missing modules in the Cabal file are likely to cause \
+                      \undefined reference errors from the linker, along with \
+                      \other problems."
+
+    actualCompiler <- view actualCompilerVersionL
+    () <- announce
+      (  "build"
+      <> display annSuffix
+      <> " with "
+      <> display actualCompiler
+      )
+    config <- view configL
+    extraOpts <- extraBuildOptions wc ee.buildOpts ee.semaphore
+    let stripTHLoading
+          | config.hideTHLoading = ExcludeTHLoading
+          | otherwise                  = KeepTHLoading
+    let (buildOpts, copyOpts) =
+          buildAndCopyOpts task.taskType ck isFinalBuild isMergedBuild
+    cabal stripTHLoading ("build" : buildOpts <> extraOpts)
+      `catch` \ex -> case ex of
+        CabalExitedUnsuccessfully{} ->
+          postBuildCheck False >> prettyThrowM ex
+        _ -> throwM ex
+    postBuildCheck True
+
+    mcurator <- view $ buildConfigL . to (.curator)
+    when (doHaddock mcurator) $ do
+      let isTaskTargetMutable = taskTargetIsMutable task == Mutable
+          isHaddockForHackage =
+            ee.buildOpts.haddockForHackage && isTaskTargetMutable
+      announce $ if isHaddockForHackage
+        then "haddock for Hackage"
+        else "haddock"
+
+      -- For GHC 8.4 and later, provide the --quickjump option.
+      let quickjump = ["--haddock-option=--quickjump"]
+
+      fulfillHaddockExpectations pname mcurator $ \keep -> do
+        let args = concat
+              (  ( if isHaddockForHackage
+                    then
+                      [ [ "--for-hackage" ] ]
+                    else
+                      [ [ "--html"
+                        , "--hoogle"
+                        , "--html-location=../$pkg-$version/"
+                        ]
+                      , [ "--haddock-option=--hyperlinked-source"
+                        | ee.buildOpts.haddockHyperlinkSource
+                        ]
+                      , [ "--executables" | ee.buildOpts.haddockExecutables ]
+                      , [ "--tests" | ee.buildOpts.haddockTests ]
+                      , [ "--benchmarks" | ee.buildOpts.haddockBenchmarks ]
+                      , [ "--internal" | ee.buildOpts.haddockInternal  ]
+                      , quickjump
+                      ]
+                 )
+              <> [ [ "--haddock-option=" <> opt
+                   | opt <- ee.buildOpts.haddockOpts.additionalArgs
+                   ]
+                 ]
+              )
+
+        cabal0 keep KeepTHLoading $ "haddock" : args
+
+    let hasLibrary = hasBuildableMainLibrary package
+        hasSubLibraries = not $ null package.subLibraries
+        hasExecutables = not $ null package.executables
+        -- Skip copy/install only for pure finals-only builds: split
+        -- CTest/CBench components and non-split finalBuild actions that
+        -- follow a clean primary. Every other path — plain primary
+        -- builds, split primary components, merged primary+final non-split
+        -- builds, and intra-package Backpack CLib/CInst builds — copies
+        -- and registers as before.
+        shouldCopy =
+             not (isFinalBuild && not isMergedBuild)
+          && (hasLibrary || hasSubLibraries || hasExecutables)
+    when shouldCopy $ withMVar ee.installLock $ \() -> do
+      announce "copy/register"
+      try (cabal KeepTHLoading $ "copy" : copyOpts) >>= \case
+        Left err@CabalExitedUnsuccessfully{} ->
+          prettyThrowM $ CabalCopyFailed
+            (package.buildType == C.Simple)
+            err
+        _ -> pure ()
+      when (hasLibrary || hasSubLibraries) $ cabal KeepTHLoading ["register"]
+
+    copyDdumpFilesIfNeeded buildingFinals ee.buildOpts.ddumpDir
+    installedPkg <-
+      fetchAndMarkInstalledPackage ee (taskLocation task) package pkgId
+    postProcessRemotePackage
+      task.taskType
+      ac
+      cache
+      ee
+      installedPkg
+      package
+      pkgId
+      pkgDir
+    pure installedPkg
+
+-- | Action in the case that the task relates to a remote package.
+postProcessRemotePackage ::
+     (HasEnvConfig env)
+  => TaskType
+  -> ActionContext
+  -> ConfigCache
+  -> ExecuteEnv
+  -> Installed
+  -> Package
+  -> PackageIdentifier
+  -> Path b Dir
+  -> RIO env ()
+postProcessRemotePackage
+    taskType
+    ac
+    cache
+    ee
+    installedPackage
+    package
+    pkgId
+    pkgDir
+  = case taskType of
+      TTRemotePackage isMutable _ loc -> do
+        when (isMutable == Immutable) $ writePrecompiledCache
+          ee.baseConfigOpts
+          loc
+          cache.configureOpts
+          cache.buildHaddocks
+          installedPackage
+          (buildableExes package)
+        -- For packages from a package index, pkgDir is in the tmp directory. We
+        -- eagerly delete it if no other tasks require it, to reduce space usage
+        -- in tmp (#3018).
+        let remaining =
+              Set.filter
+                (\(ActionId ck _) -> componentKeyPkgName ck == pkgName pkgId)
+                ac.remaining
+        when (null remaining) $ removeDirRecur pkgDir
+      _ -> pure ()
+
+-- | Once all the Cabal-related tasks have run for a package, we should be able
+-- to gather the information needed to create an 'Installed' package value. For
+-- now, either there's a main library (in which case we consider the 'GhcPkgId'
+-- values of the package's libraries) or we just consider it's an executable
+-- (and mark all the executables as installed, if any).
+--
+-- Note that this also modifies the installedDumpPkgsTVar which is used for
+-- generating Haddocks.
+--
+fetchAndMarkInstalledPackage ::
+     (HasEnvConfig env, HasTerm env)
+  => ExecuteEnv
+  -> InstallLocation
+  -> Package
+  -> PackageIdentifier
+  -> RIO env Installed
+fetchAndMarkInstalledPackage ee taskInstallLocation package pkgId = do
+  let hasMainLibrary = hasBuildableMainLibrary package
+      subLibs = package.subLibraries
+  if not hasMainLibrary && null subLibs
+    then do
+      markExeInstalled taskInstallLocation pkgId
+      -- TODO: Unify the above somehow with writeFlagCache?
+      pure $ Executable pkgId
+    else do
+      ghcPkgId <- if hasMainLibrary
+        then ghcPkgIdLoader Nothing
+        else pure Nothing
+      subLibsPkgIds <-
+        foldComponentToAnotherCollection subLibs foldSubLibToMap mempty
+      pure $ simpleInstalledLib pkgId ghcPkgId subLibsPkgIds
+ where
+  ghcPkgIdLoader = fetchGhcPkgIdForLib ee taskInstallLocation package.name
+
+  foldSubLibToMap subLib mapInMonad = do
+    maybeGhcpkgId <- ghcPkgIdLoader (Just subLib.name)
+    mapInMonad <&> case maybeGhcpkgId of
+      Just v -> Map.insert subLib.name v
+      _ -> id
+
+fetchGhcPkgIdForLib ::
+     (HasTerm env, HasEnvConfig env)
+  => ExecuteEnv
+  -> InstallLocation
+  -> PackageName
+  -> Maybe Component.StackUnqualCompName
+  -> RIO env (Maybe GhcPkgId)
+fetchGhcPkgIdForLib ee installLocation pkgName mLibName = do
+  let baseConfigOpts = ee.baseConfigOpts
+      (installedPkgDb, installedDumpPkgsTVar) =
+        case installLocation of
+          Snap ->
+            ( baseConfigOpts.snapDB
+            , ee.snapshotDumpPkgs )
+          Local ->
+            ( baseConfigOpts.localDB
+            , ee.localDumpPkgs )
+  let commonLoader = loadInstalledPkg [installedPkgDb] installedDumpPkgsTVar
+      mungedPkgName = toCabalMungedPackageName pkgName mLibName
+      encodedPkgName = encodeCompatPackageName mungedPkgName
+  commonLoader encodedPkgName
+
+-- | Copy ddump-* files, if we are building finals and a non-empty ddump-dir
+-- has been specified.
+copyDdumpFilesIfNeeded :: HasEnvConfig env => Bool -> Maybe Text -> RIO env ()
+copyDdumpFilesIfNeeded buildingFinals mDdumpPath = when buildingFinals $
+  whenJust mDdumpPath $ \ddumpPath -> unless (T.null ddumpPath) $ do
+    distDir <- distRelativeDir
+    ddumpRelDir <- parseRelDir $ T.unpack ddumpPath
+    prettyDebugL
+      [ "ddump-dir:"
+      , pretty ddumpRelDir
+      ]
+    prettyDebugL
+      [ "dist-dir:"
+      , pretty distDir
+      ]
+    runConduitRes
+      $ CF.sourceDirectoryDeep False (toFilePath distDir)
+      .| CL.filter (L.isInfixOf ".dump-")
+      .| CL.mapM_ (\src -> liftIO $ do
+          parentDir <- parent <$> parseRelDir src
+          destBaseDir <-
+            (ddumpRelDir </>) <$> stripProperPrefix distDir parentDir
+          -- exclude .stack-work dir
+          unless (".stack-work" `L.isInfixOf` toFilePath destBaseDir) $ do
+            ensureDir destBaseDir
+            src' <- parseRelFile src
+            copyFile src' (destBaseDir </> filename src'))
+
+getPrecompiled ::
+     HasEnvConfig env
+  => Bool
+     -- ^ Is this a CInst (Backpack instantiation) task? CInst tasks are
+     -- always created by addInstantiationTasks even when the instantiated
+     -- package is already registered. Skip the self-reference check so
+     -- the precompiled cache can short-circuit the build.
+  -> ConfigCache
+  -> TaskType
+  -> Path Abs Dir
+  -> RIO env (Maybe (PrecompiledCache Abs))
+getPrecompiled isCInst cache taskType bcoSnapInstallRoot =
+  case taskType of
+    TTRemotePackage Immutable _ loc ->
+      readPrecompiledCache loc cache.configureOpts cache.buildHaddocks >>= \case
+        Nothing -> pure Nothing
+        -- Only pay attention to precompiled caches that refer to packages
+        -- within the snapshot. For CInst tasks, skip this check: CInst
+        -- tasks are always created regardless of whether the instantiated
+        -- package is already installed, and re-registering with --force is
+        -- harmless.
+        Just pc
+          | not isCInst
+          , maybe False
+              (bcoSnapInstallRoot `isProperPrefixOf`)
+              pc.library -> pure Nothing
+        -- If old precompiled cache files are left around but snapshots are
+        -- deleted, it is possible for the precompiled file to refer to the
+        -- very library we're building, and if flags are changed it may try to
+        -- copy the library to itself. This check prevents that from
+        -- happening.
+        Just pc -> do
+          let allM _ [] = pure True
+              allM f (x:xs) = do
+                b <- f x
+                if b then allM f xs else pure False
+          b <- liftIO $
+                  allM doesFileExist $ maybe id (:) pc.library pc.exes
+          pure $ if b then Just pc else Nothing
+    _ -> pure Nothing
+
+copyPreCompiled ::
+     ( HasLogFunc env
+     , HasCompiler env
+     , HasTerm env
+     , HasProcessContext env
+     , HasEnvConfig env
+     )
+  => Bool
+     -- ^ Is this a CInst (Backpack instantiation) task? If so, skip
+     -- unregistration — the indefinite package and other instantiations
+     -- must remain in the DB.
+  -> ExecuteEnv
+  -> Task
+  -> PackageIdentifier
+  -> PrecompiledCache b0
+  -> RIO env (Maybe Installed)
+copyPreCompiled isCInst ee task pkgId (PrecompiledCache mlib subLibs exes) = do
+  let PackageIdentifier pname pversion = pkgId
+  announceTask ee task.taskType "using precompiled package"
+
+  -- We need to copy .conf files for the main library and all sub-libraries
+  -- which exist in the cache, from their old snapshot to the new one.
+  -- However, we must unregister any such library in the new snapshot, in case
+  -- it was built with different flags. For CInst tasks, we skip unregistration
+  -- because the indefinite package and other instantiations share the same
+  -- package name and must remain in the DB. The --force flag on register
+  -- handles any conflicts.
+  let
+    subLibNames = Set.toList $ buildableSubLibs $ case task.taskType of
+      TTLocalMutable lp -> lp.package
+      TTRemotePackage _ p _ -> p
+    toMungedPackageId :: StackUnqualCompName -> MungedPackageId
+    toMungedPackageId subLib =
+      let subLibName = LSubLibName $ toCabalName subLib
+      in  MungedPackageId (MungedPackageName pname subLibName) pversion
+    toPackageId :: MungedPackageId -> PackageIdentifier
+    toPackageId (MungedPackageId n v) =
+      PackageIdentifier (encodeCompatPackageName n) v
+    allToUnregister :: [Either PackageIdentifier GhcPkgId]
+    allToUnregister = mcons
+      (Left pkgId <$ mlib)
+      (map (Left . toPackageId . toMungedPackageId) subLibNames)
+    allToRegister = mcons mlib subLibs
+
+  unless (null allToRegister) $
+    withMVar ee.installLock $ \() -> do
+      -- We want to ignore the global and user package databases. ghc-pkg
+      -- allows us to specify --no-user-package-db and --package-db=<db> on
+      -- the command line.
+      let pkgDb = ee.baseConfigOpts.snapDB
+      ghcPkgExe <- getGhcPkgExe
+      -- First unregister, silently, everything that needs to be unregistered.
+      -- Skip for CInst tasks to preserve the indefinite and other instantiated
+      -- entries.
+      unless isCInst $
+        whenJust (nonEmpty allToUnregister) $ \allToUnregister' -> do
+          logLevel <- view $ globalOptsL . to (.logLevel)
+          let isDebug = logLevel == LevelDebug
+          catchAny
+            (unregisterGhcPkgIds isDebug ghcPkgExe pkgDb allToUnregister')
+            (const (pure ()))
+      -- There appears to be a bug in the ghc-pkg executable such that, on
+      -- Windows only, it cannot register a package into a package database that
+      -- is also listed in the GHC_PACKAGE_PATH environment variable. See:
+      -- https://gitlab.haskell.org/ghc/ghc/-/issues/25962. We work around that
+      -- by removing GHC_PACKAGE_PATH from the environment for the register
+      -- step.
+      wc <- view $ envConfigL . to (.sourceMap.compiler) . to whichCompiler
+      withModifyEnvVars (Map.delete $ ghcPkgPathEnvVar wc) $
+        forM_ allToRegister $ \libpath -> do
+          let args = ["register", "--force", toFilePath libpath]
+          ghcPkg ghcPkgExe [pkgDb] args >>= \case
+            Left e -> prettyWarn $
+              "[S-4541]"
+              <> line
+              <> fillSep
+                   [ flow "While registering"
+                   , pretty libpath
+                   , "in"
+                   , pretty pkgDb <> ","
+                   , flow "Stack encountered the following error:"
+                   ]
+              <> blankLine
+              <> string (displayException e)
+            Right _ -> pure ()
+  liftIO $ forM_ exes $ \exe -> do
+    ensureDir bindir
+    let dst = bindir </> filename exe
+    createLink (toFilePath exe) (toFilePath dst) `catchIO` \_ -> copyFile exe dst
+  case (mlib, exes) of
+    (Nothing, _:_) -> markExeInstalled (taskLocation task) pkgId
+    _ -> pure ()
+
+  -- Find the package in the database
+  let pkgDbs = [ee.baseConfigOpts.snapDB]
+
+  case mlib of
+    Nothing -> pure $ Just $ Executable pkgId
+    Just _ -> do
+      mpkgid <- loadInstalledPkg pkgDbs ee.snapshotDumpPkgs pname
+
+      pure $ Just $
+        case mpkgid of
+          Nothing -> assert False $ Executable pkgId
+          _ -> simpleInstalledLib pkgId mpkgid mempty
+ where
+  bindir = ee.baseConfigOpts.snapInstallRoot </> bindirSuffix
+
+loadInstalledPkg ::
+     (HasCompiler env, HasProcessContext env, HasTerm env)
+  => [Path Abs Dir]
+  -> TVar (Map GhcPkgId DumpPackage)
+  -> PackageName
+  -> RIO env (Maybe GhcPkgId)
+loadInstalledPkg pkgDbs tvar name = do
+  pkgexe <- getGhcPkgExe
+  dps <- ghcPkgDescribe pkgexe name pkgDbs $ conduitDumpPackage .| CL.consume
+  case dps of
+    [] -> pure Nothing
+    [dp] -> do
+      liftIO $ atomically $ modifyTVar' tvar (Map.insert dp.ghcPkgId dp)
+      pure $ Just dp.ghcPkgId
+    -- For Backpack packages, ghc-pkg may return multiple entries for the same
+    -- component name: an indefinite (signature-only) package and one or more
+    -- instantiated packages. Pick the last instantiated one (has '+' in its
+    -- ID) since that contains the compiled code. Multiple instantiations
+    -- arise when different consumers fill the same signature with different
+    -- implementations. Register all entries in the dump.
+    _ -> case NE.nonEmpty $ filter isInstantiated dps of
+      Nothing -> throwM $ MultipleResultsBug name dps
+      Just instantiated -> do
+        forM_ dps $ \d ->
+          liftIO $ atomically $ modifyTVar' tvar (Map.insert d.ghcPkgId d)
+        -- Pick the last instantiated entry. With multiple instantiations, the
+        -- order doesn't matter — the caller (CInst) discards the result anyway.
+        let dp = NE.last instantiated
+        pure $ Just dp.ghcPkgId
+ where
+  isInstantiated dp =
+    '+' `elem` ghcPkgIdString dp.ghcPkgId
+
+fulfillHaddockExpectations ::
+     (MonadUnliftIO m, HasTerm env, MonadReader env m)
+  => PackageName
+  -> Maybe Curator
+  -> (KeepOutputOpen -> m ())
+  -> m ()
+fulfillHaddockExpectations pname mcurator action
+  | expectHaddockFailure mcurator =
+      tryAny (action KeepOpen) >>= \case
+        Right () -> prettyWarnL
+          [ style Current (fromPackageName pname) <> ":"
+          , flow "unexpected Haddock success."
+          ]
+        Left _ -> pure ()
+ where
+  expectHaddockFailure = maybe False (Set.member pname . (.expectHaddockFailure))
+fulfillHaddockExpectations _ _ action = action CloseOnException
+
+-- | Check if any unlisted files have been found, and add them to the build cache.
+checkForUnlistedFiles ::
+     HasEnvConfig env
+  => TaskType
+  -> Path Abs Dir
+  -> RIO env [PackageWarning]
+checkForUnlistedFiles (TTLocalMutable lp) pkgDir = do
+  caches <- runMemoizedWith lp.newBuildCaches
+  (addBuildCache,warnings) <-
+    addUnlistedToBuildCache
+      lp.package
+      lp.cabalFP
+      lp.components
+      caches
+  forM_ (Map.toList addBuildCache) $ \(component, newToCache) -> do
+    let cache = Map.findWithDefault Map.empty component caches
+    writeBuildCache pkgDir component $
+      Map.unions (cache : newToCache)
+  pure warnings
+checkForUnlistedFiles TTRemotePackage{} _ = pure []
+
+-- | Implements running a package's tests. Also handles producing
+-- coverage reports if coverage is enabled.
+singleTest ::
+     HasEnvConfig env
+  => TestOpts
+  -> [StackUnqualCompName]
+  -> ActionContext
+  -> ExecuteEnv
+  -> Task
+  -> InstalledMap
+  -> RIO env ()
+singleTest topts testsToRun ac ee task installedMap = do
+  -- FIXME: Since this doesn't use cabal, we should be able to avoid using a
+  -- full blown 'withSingleContext'.
+  (allDeps, _cache) <- getConfigCache ee task installedMap True False
+  mcurator <- view $ buildConfigL . to (.curator)
+  let pname = pkgName $ taskProvides task
+      expectFailure = expectTestFailure pname mcurator
+  withSingleContext ac ee task.taskType allDeps (Just "test") Nothing $
+    \package _cabalfp pkgDir _cabal announce outputType -> do
+      config <- view configL
+      let needHpc = topts.coverage
+      toRun <-
+        if topts.runTests
+          then if topts.rerunTests
+            then pure True
+            else
+              getTestStatus pkgDir >>= \case
+                TSSuccess -> do
+                  unless (null testsToRun) $
+                    announce "skipping already passed test"
+                  pure False
+                TSFailure
+                  | expectFailure -> do
+                      announce "skipping already failed test that's expected to fail"
+                      pure False
+                  | otherwise -> do
+                      announce "rerunning previously failed test"
+                      pure True
+                TSUnknown -> pure True
+          else prettyThrowM $ ActionNotFilteredBug "singleTest"
+      when toRun $ do
+        buildDir <- distDirFromDir pkgDir
+        hpcDir <- hpcDirFromDir pkgDir
+        when needHpc (ensureDir hpcDir)
+
+        let suitesToRun
+              = [ testSuitePair
+                | testSuitePair <-
+                    ((fmap . fmap) (.interface) <$> collectionKeyValueList)
+                      package.testSuites
+                , let testName = fst testSuitePair
+                , testName `elem` testsToRun
+                ]
+
+        errs <- fmap Map.unions $ forM suitesToRun $ \(testName, suiteInterface) -> do
+          let stestName = unqualCompToString testName
+          (testName', isTestTypeLib) <-
+            case suiteInterface of
+              C.TestSuiteLibV09{} -> pure (stestName ++ "Stub", True)
+              C.TestSuiteExeV10{} -> pure (stestName, False)
+              interface -> throwM (TestSuiteTypeUnsupported interface)
+
+          let exeName = testName' ++
+                case config.platform of
+                  Platform _ Windows -> ".exe"
+                  _ -> ""
+          tixPath <- fmap (pkgDir </>) $ parseRelFile $ exeName ++ ".tix"
+          exePath <-
+            fmap (buildDir </>) $ parseRelFile $
+              "build/" ++ testName' ++ "/" ++ exeName
+          exists <- doesFileExist exePath
+          -- in Stack.Package.packageFromPackageDescription we filter out
+          -- package itself of any dependencies so any tests requiring loading
+          -- of their own package library will fail so to prevent this we return
+          -- it back here but unfortunately unconditionally
+          installed <- case Map.lookup pname installedMap of
+            Just (_, installed) -> pure $ Just installed
+            Nothing -> do
+              idMap <- liftIO $ readTVarIO ee.ghcPkgIds
+              pure $ Map.lookup (taskProvides task) idMap
+          let pkgGhcIdList = case installed of
+                Just (Library _ libInfo) -> maybeToList libInfo.mMainGhcPkgId
+                _ -> []
+          -- doctest relies on template-haskell in QuickCheck-based tests
+          thGhcId <-
+            case L.find ((== "template-haskell") . pkgName . (.packageIdent) . snd)
+                   (Map.toList ee.globalDumpPkgs) of
+              Just (ghcId, _) -> pure ghcId
+              Nothing -> throwIO TemplateHaskellNotFoundBug
+          -- env variable GHC_ENVIRONMENT is set for doctest so module names for
+          -- packages with proper dependencies should no longer get ambiguous
+          -- see e.g. https://github.com/doctest/issues/119
+          -- also we set HASKELL_DIST_DIR to a package dist directory so
+          -- doctest will be able to load modules autogenerated by Cabal
+          let setEnv f pc = modifyEnvVars pc $ \envVars ->
+                Map.insert "HASKELL_DIST_DIR" (T.pack $ toFilePath buildDir) $
+                Map.insert "GHC_ENVIRONMENT" (T.pack f) envVars
+              fp' = ee.tempDir </> testGhcEnvRelFile
+          -- Add a random suffix to avoid conflicts between parallel jobs
+          -- See https://github.com/commercialhaskell/stack/issues/5024
+          randomInt <- liftIO (randomIO :: IO Int)
+          let randomSuffix = "." <> show (abs randomInt)
+          fp <- toFilePath <$> addExtension randomSuffix fp'
+          let snapDBPath =
+                toFilePathNoTrailingSep ee.baseConfigOpts.snapDB
+              localDBPath =
+                toFilePathNoTrailingSep ee.baseConfigOpts.localDB
+              ghcEnv =
+                   "clear-package-db\n"
+                <> "global-package-db\n"
+                <> "package-db "
+                <> fromString snapDBPath
+                <> "\n"
+                <> "package-db "
+                <> fromString localDBPath
+                <> "\n"
+                <> foldMap
+                     ( \ghcId ->
+                            "package-id "
+                         <> display (ghcPkgIdToText ghcId)
+                         <> "\n"
+                     )
+                     (pkgGhcIdList ++ thGhcId : Map.elems allDeps)
+          writeFileUtf8Builder fp ghcEnv
+          menv <- liftIO $
+            setEnv fp =<< config.processContextSettings EnvSettings
+              { includeLocals = taskLocation task == Local
+              , includeGhcPackagePath = True
+              , stackExe = True
+              , localeUtf8 = False
+              , keepGhcRts = False
+              }
+          let emptyResult = Map.singleton testName Nothing
+          withProcessContext menv $ if exists
+            then do
+                -- We clear out the .tix files before doing a run.
+                when needHpc $ do
+                  tixexists <- doesFileExist tixPath
+                  when tixexists $
+                    prettyWarnL
+                      [ flow "Removing HPC file"
+                      , pretty tixPath <> "."
+                      ]
+                  liftIO $ ignoringAbsence (removeFile tixPath)
+
+                let args = topts.additionalArgs
+                    argsDisplay = case args of
+                      [] -> ""
+                      _ ->    ", args: "
+                           <> T.intercalate " " (map showProcessArgDebug args)
+                announce $
+                     "test (suite: "
+                  <> display (unqualCompToText testName)
+                  <> display argsDisplay
+                  <> ")"
+
+                -- Clear "Progress: ..." message before
+                -- redirecting output.
+                case outputType of
+                  OTConsole _ -> do
+                    logStickyDone ""
+                    liftIO $ hFlush stdout
+                    liftIO $ hFlush stderr
+                  OTLogFile _ _ -> pure ()
+
+                let output = case outputType of
+                      OTConsole Nothing -> Nothing <$ inherit
+                      OTConsole (Just prefix) -> fmap
+                        ( \src -> Just $
+                               runConduit $ src
+                            .| CT.decodeUtf8Lenient
+                            .| CT.lines
+                            .| CL.map stripCR
+                            .| CL.mapM_ (\t -> logInfo $ prefix <> display t)
+                        )
+                        createSource
+                      OTLogFile _ h -> Nothing <$ useHandleOpen h
+                    runOutput p =
+                      case (getStdout p, getStderr p) of
+                        (Nothing, Nothing) -> pure ()
+                        (Just x, Just y) -> concurrently_ x y
+                        (x, y) -> assert False $
+                          concurrently_
+                            (fromMaybe (pure ()) x)
+                            (fromMaybe (pure ()) y)
+                    timeoutWithGrace p maxSecs graceSecs = do
+                      mExit <- timeout (maxSecs * 1000000) (waitExitCode p)
+                      case mExit of
+                        Just ec -> pure (Just ec)
+                        Nothing -> do
+                          terminateGracefully p
+                          mGraceExit <- timeout (graceSecs * 1000000)
+                            (waitExitCode p)
+                          case mGraceExit of
+                            Just _ -> pure Nothing
+                            Nothing -> do
+                              forceKill p
+                              void $ waitExitCode p
+                              pure Nothing
+                    runWithTimeout pc
+                      | Just maxSecs <- topts.maximumTimeSeconds, maxSecs > 0
+                      , Just graceSecs <- topts.timeoutGraceSeconds
+                      , graceSecs > 0 =
+                          withProcessWait (prepareForEscalation pc) $ \p -> do
+                            (_, mec') <- concurrently
+                              (runOutput p)
+                              (timeoutWithGrace p maxSecs graceSecs)
+                            pure mec'
+                      | Just maxSecs <- topts.maximumTimeSeconds, maxSecs > 0 =
+                          timeout (maxSecs * 1000000) $
+                            withProcessWait pc $ \p -> do
+                              runOutput p
+                              waitExitCode p
+                      | otherwise =
+                          Just <$> withProcessWait pc (\p -> runOutput p *> waitExitCode p)
+
+                mec <- withWorkingDir (toFilePath pkgDir) $
+                  proc (toFilePath exePath) args $ \pc0 -> do
+                    changeStdin <-
+                      if isTestTypeLib
+                        then do
+                          logPath <- buildLogPath package (Just stestName)
+                          ensureDir (parent logPath)
+                          pure $
+                              setStdin
+                            $ byteStringInput
+                            $ BL.fromStrict
+                            $ encodeUtf8 $ fromString $
+                            show ( logPath
+                                 , toCabalName testName
+                                 )
+                        else do
+                          isTerminal <- view $ globalOptsL . to (.terminal)
+                          if topts.allowStdin && isTerminal
+                            then pure id
+                            else pure $ setStdin $ byteStringInput mempty
+                    let pc = changeStdin
+                           $ setStdout output
+                           $ setStderr output
+                             pc0
+                    runWithTimeout pc
+                -- Add a trailing newline, incase the test
+                -- output didn't finish with a newline.
+                case outputType of
+                  OTConsole Nothing -> prettyInfo blankLine
+                  _ -> pure ()
+                -- Move the .tix file out of the package
+                -- directory into the hpc work dir, for
+                -- tidiness.
+                when needHpc $
+                  updateTixFile package.name tixPath testName'
+                let announceResult result =
+                      announce $
+                           "Test suite "
+                        <> display (unqualCompToText testName)
+                        <> " "
+                        <> result
+                case mec of
+                  Just ExitSuccess -> do
+                    announceResult "passed"
+                    pure Map.empty
+                  Nothing -> do
+                    announceResult "timed out"
+                    if expectFailure
+                    then pure Map.empty
+                    else pure $ Map.singleton testName Nothing
+                  Just ec -> do
+                    announceResult "failed"
+                    if expectFailure
+                    then pure Map.empty
+                    else pure $ Map.singleton testName (Just ec)
+              else do
+                unless expectFailure $
+                  prettyError $
+                    pretty $ TestSuiteExeMissing
+                      (package.buildType == C.Simple)
+                      exeName
+                      package.name
+                      testName
+                pure emptyResult
+
+        when needHpc $ do
+          let testsToRun' = map f testsToRun
+              f tName =
+                case (.interface) <$> mComponent of
+                  Just C.TestSuiteLibV09{} -> unqualCompToText tName <> "Stub"
+                  _ -> unqualCompToText tName
+               where
+                mComponent = collectionLookup tName package.testSuites
+          generateHpcReport pkgDir package testsToRun'
+
+        bs <- liftIO $
+          case outputType of
+            OTConsole _ -> pure ""
+            OTLogFile logFile h -> do
+              hClose h
+              S.readFile $ toFilePath logFile
+
+        let succeeded = Map.null errs
+        unless (succeeded || expectFailure) $
+          throwM $ TestSuiteFailure
+            (taskProvides task)
+            errs
+            (case outputType of
+               OTLogFile fp _ -> Just fp
+               OTConsole _ -> Nothing)
+            bs
+
+        setTestStatus pkgDir $ if succeeded then TSSuccess else TSFailure
+
+-- | Implements running a package's benchmarks.
+singleBench ::
+     HasEnvConfig env
+  => BenchmarkOpts
+  -> [StackUnqualCompName]
+  -> ActionContext
+  -> ExecuteEnv
+  -> Task
+  -> InstalledMap
+  -> RIO env ()
+singleBench beopts benchesToRun ac ee task installedMap = do
+  (allDeps, _cache) <- getConfigCache ee task installedMap False True
+  withSingleContext ac ee task.taskType allDeps (Just "bench") Nothing $
+    \_package _cabalfp _pkgDir cabal announce _outputType -> do
+      let args = map unqualCompToString benchesToRun <> maybe []
+                       ((:[]) . ("--benchmark-options=" <>))
+                       beopts.additionalArgs
+      toRun <-
+        if beopts.runBenchmarks
+          then pure True
+          else prettyThrowM $ ActionNotFilteredBug "singleBench"
+      when toRun $ do
+        announce "benchmarks"
+        cabal CloseOnException KeepTHLoading ("bench" : args)
+
+-- Do not pass `-hpcdir` as GHC option if the coverage is not enabled.
+-- This helps running stack-compiled programs with dynamic interpreters like
+-- `hint`. Cfr: https://github.com/commercialhaskell/stack/issues/997
+extraBuildOptions ::
+     (HasEnvConfig env, HasRunner env)
+  => WhichCompiler
+  -> BuildOpts
+  -> Maybe Semaphore
+  -> RIO env [String]
+extraBuildOptions wc bopts semaphore = do
+  colorOpt <- appropriateGhcColorFlag
+  let optsFlag = compilerOptionsCabalFlag wc
+      semaphoreFlag = maybe
+        []
+        (("--semaphore":) . L.singleton . getSemaphoreName . semaphoreName)
+        semaphore
+      baseOpts = maybe "" (" " ++) colorOpt
+  if bopts.testOpts.coverage
+    then do
+      hpcIndexDir <- toFilePathNoTrailingSep <$> hpcRelativeDir
+      pure $ semaphoreFlag ++ [optsFlag, "-hpcdir " ++ hpcIndexDir ++ baseOpts]
+    else
+      pure $ semaphoreFlag ++ [optsFlag, baseOpts]
+
+-- | Compute the announce suffix for build/configure log messages. For CInst
+-- tasks, shows the instantiation details (e.g. @inst:941095d7: Str = impl-pkg@).
+-- For other per-component builds, shows the component type. For final builds,
+-- shows test/bench.
+buildAnnSuffix ::
+     ComponentKey
+  -> Task
+  -> Bool -- ^ enableTests
+  -> Bool -- ^ enableBenchmarks
+  -> Text
+buildAnnSuffix ck task enableTests enableBenchmarks = case ck of
+  ComponentKey _ (CInst hash) ->
+    " (inst:" <> T.take 8 hash <> instDetail <> ")"
+  ComponentKey _ comp
+    | not (isCLib comp) -> " (" <> renderComponent comp <> ")"
+  _ | result /= "" -> " (" <> result <> ")"
+  _ -> ""
+ where
+  instDetail
+    | null task.backpackInstEntries = ""
+    | otherwise = ": " <> T.intercalate ", "
+        [ T.pack (C.display sig)
+          <> " = "
+          <> T.pack (packageNameString impl)
+          <> if sig == implMod then "" else ":" <> T.pack (C.display implMod)
+        | (sig, impl, implMod) <- task.backpackInstEntries
+        ]
+  result = T.intercalate " + " $ concat
+    [ ["lib"     | task.allInOne && hasLib]
+    , ["sub-lib" | task.allInOne && hasSubLib]
+    , ["exe"     | task.allInOne && hasExe]
+    , ["test"    | enableTests]
+    , ["bench"   | enableBenchmarks]
+    ]
+  (hasLib, hasSubLib, hasExe) = case task.taskType of
+    TTLocalMutable lp ->
+      let package = lp.package
+          hasLibrary = hasBuildableMainLibrary package
+          hasSubLibraries = not $ null package.subLibraries
+          hasExecutables = not . Set.null $ exesToBuild lp
+      in  (hasLibrary, hasSubLibraries, hasExecutables)
+    _ -> (False, False, False)
+  isCLib CLib = True
+  isCLib _ = False
+
+-- | Compute the Cabal build and copy target options for a component. For
+-- packages with intra-package deps (e.g. Backpack), omits targets so Cabal
+-- handles ordering. For per-component builds, passes a single target. For
+-- remote packages, no targets are needed.
+buildAndCopyOpts ::
+     TaskType
+  -> ComponentKey
+  -> Bool -- ^ isFinalBuild
+  -> Bool -- ^ isMergedBuild (primary+final folded together)
+  -> ([String], [String])
+     -- ^ (buildOpts, copyOpts)
+buildAndCopyOpts taskType ck isFinalBuild isMergedBuild = case taskType of
+  TTLocalMutable lp
+    | hasIntraPackageDeps lp.package -> ([], [])
+    | shouldSplitComponents lp.package
+    , ComponentKey pn comp <- ck ->
+        dispatchBuildOpts
+          (Just (componentTarget pn comp))
+          isFinalBuild
+          isMergedBuild
+          []
+          []
+    | otherwise ->
+        dispatchBuildOpts
+          Nothing
+          isFinalBuild
+          isMergedBuild
+          (primaryComponentOptions lp)
+          (finalComponentOptions lp)
+  TTRemotePackage{} -> ([], [])
+
+-- | Pure dispatcher for 'buildAndCopyOpts'. Given the build mode and the
+-- pre-computed Cabal target lists, decide which targets to pass to
+-- @setup build@ and which to @setup copy@. Exported for unit testing —
+-- 'buildAndCopyOpts' is the production caller.
+--
+-- Mode summary:
+--
+-- * @Just target@ + @isFinalBuild=False@ (split primary): build and copy
+--   the single target.
+-- * @Just target@ + @isFinalBuild=True@ (split final): build the single
+--   target, skip copy.
+-- * @Nothing@ + @isFinalBuild=False@ (non-split primary-only): build and
+--   copy all primary components.
+-- * @Nothing@ + @isFinalBuild=True@ + @isMergedBuild=True@ (non-split
+--   primary+final folded into one Setup invocation): build primary and
+--   final components together, copy only primary.
+-- * @Nothing@ + @isFinalBuild=True@ + @isMergedBuild=False@ (non-split
+--   finals-only, primary was clean): build final components, skip copy.
+dispatchBuildOpts ::
+     Maybe String
+     -- ^ Split-component target (rendered Cabal target string) when
+     --   'shouldSplitComponents' holds; 'Nothing' for non-split packages.
+  -> Bool     -- ^ isFinalBuild
+  -> Bool     -- ^ isMergedBuild
+  -> [String] -- ^ primary component options (ignored on the split path)
+  -> [String] -- ^ final component options (ignored on the split path)
+  -> ([String], [String])
+     -- ^ (buildOpts, copyOpts)
+dispatchBuildOpts (Just target) isFinalBuild _ _ _ =
+  if isFinalBuild then ([target], []) else ([target], [target])
+dispatchBuildOpts Nothing True True primary finals =
+  (primary ++ finals, primary)
+dispatchBuildOpts Nothing True False _ finals =
+  (finals, [])
+dispatchBuildOpts Nothing False _ primary _ =
+  (primary, primary)
+
+-- | Render a 'NamedComponent' as a Cabal build target string. This uses
+-- Cabal's target syntax (e.g. @lib:pkg-name@, @exe:my-exe@, @test:my-test@).
+componentTarget :: PackageName -> NamedComponent -> String
+componentTarget pn CLib = "lib:" ++ packageNameString pn
+componentTarget _ (CSubLib x) = "lib:" ++ unqualCompToString x
+componentTarget _ (CFlib x) = "flib:" ++ unqualCompToString x
+componentTarget _ (CExe x) = "exe:" ++ unqualCompToString x
+componentTarget _ (CTest x) = "test:" ++ unqualCompToString x
+componentTarget _ (CBench x) = "bench:" ++ unqualCompToString x
+componentTarget _ (CInst _) = ""
+
+-- | Should tests be enabled (Cabal @--enable-tests@) for a given
+-- 'ComponentKey'? For per-component CTest keys, always True. For non-split
+-- CLib keys, checks the full component set. For all other keys, False.
+componentEnableTests :: ComponentKey -> Set NamedComponent -> Bool
+componentEnableTests ck comps = case ck of
+  ComponentKey _ (CTest _) -> True
+  ComponentKey _ CLib -> any isCTest comps
+  _ -> False
+
+-- | Should benchmarks be enabled (Cabal @--enable-benchmarks@) for a given
+-- 'ComponentKey'? For per-component CBench keys, always True. For non-split
+-- CLib keys, checks the full component set. For all other keys, False.
+componentEnableBenchmarks :: ComponentKey -> Set NamedComponent -> Bool
+componentEnableBenchmarks ck comps = case ck of
+  ComponentKey _ (CBench _) -> True
+  ComponentKey _ CLib -> any isCBench comps
+  _ -> False
+
+-- Library, sub-library, foreign library and executable build components.
+primaryComponentOptions :: LocalPackage -> [String]
+primaryComponentOptions lp =
+  -- TODO: get this information from target parsing instead, which will allow
+  -- users to turn off library building if desired
+     ( if hasBuildableMainLibrary package
+         then map T.unpack
+           $ T.append "lib:" (T.pack (packageNameString package.name))
+           : map
+               (T.append "flib:")
+               (getBuildableListText package.foreignLibraries)
+         else []
+     )
+  ++ map
+       (T.unpack . T.append "lib:")
+       (getBuildableListText package.subLibraries)
+  ++ Set.toList
+       ( Set.mapMonotonic
+           (\s -> "exe:" ++ unqualCompToString s)
+           (exesToBuild lp)
+       )
+ where
+  package = lp.package
+
+-- | Either build all executables or, if the user specifies requested
+-- components, just build them.
+exesToBuild :: LocalPackage -> Set StackUnqualCompName
+exesToBuild lp = if lp.wanted
+  then exeComponents lp.components
+  else buildableExes lp.package
+
+-- Test-suite and benchmark build components.
+finalComponentOptions :: LocalPackage -> [String]
+finalComponentOptions lp =
+  map (T.unpack . renderComponent) $
+  Set.toList $
+  Set.filter (\c -> isCTest c || isCBench c) lp.components
+
+taskComponents :: Task -> Set NamedComponent
+taskComponents task =
+  case task.taskType of
+    TTLocalMutable lp -> lp.components -- FIXME probably just want lpWanted
+    TTRemotePackage{} -> Set.empty
+
+expectTestFailure :: PackageName -> Maybe Curator -> Bool
+expectTestFailure pname =
+  maybe False (Set.member pname . (.expectTestFailure))
+
+expectBenchmarkFailure :: PackageName -> Maybe Curator -> Bool
+expectBenchmarkFailure pname =
+  maybe False (Set.member pname . (.expectBenchmarkFailure))
+
+fulfillCuratorBuildExpectations ::
+     (HasCallStack, HasTerm env)
+  => PackageName
+  -> Maybe Curator
+  -> Bool
+  -> Bool
+  -> b
+  -> RIO env b
+  -> RIO env b
+fulfillCuratorBuildExpectations pname mcurator enableTests _ defValue action
+  | enableTests && expectTestFailure pname mcurator =
+      tryAny action >>= \case
+        Right res -> do
+          prettyWarnL
+            [ style Current (fromPackageName pname) <> ":"
+            , flow "unexpected test build success."
+            ]
+          pure res
+        Left _ -> pure defValue
+fulfillCuratorBuildExpectations pname mcurator _ enableBench defValue action
+  | enableBench && expectBenchmarkFailure pname mcurator =
+      tryAny action >>= \case
+        Right res -> do
+          prettyWarnL
+            [ style Current (fromPackageName pname) <> ":"
+            , flow "unexpected benchmark build success."
+            ]
+          pure res
+        Left _ -> pure defValue
+fulfillCuratorBuildExpectations _ _ _ _ _ action = action
diff --git a/src/Stack/Build/Haddock.hs b/src/Stack/Build/Haddock.hs
index ca82d7c783..9b1712c261 100644
--- a/src/Stack/Build/Haddock.hs
+++ b/src/Stack/Build/Haddock.hs
@@ -1,292 +1,476 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE RecordWildCards       #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Build.Haddock
+Description : Generate Haddock documentation.
+License     : BSD-3-Clause
+
+Generate Haddock documentation.
+-}
 
--- | Generate haddocks
 module Stack.Build.Haddock
-    ( generateLocalHaddockIndex
-    , generateDepsHaddockIndex
-    , generateSnapHaddockIndex
-    , openHaddocksInBrowser
-    , shouldHaddockPackage
-    , shouldHaddockDeps
-    ) where
+  ( generateDepsHaddockIndex
+  , generateLocalHaddockIndex
+  , generateSnapHaddockIndex
+  , openHaddocksInBrowser
+  , shouldHaddockDeps
+  , shouldHaddockPackage
+  , generateLocalHaddockForHackageArchives
+  ) where
 
-import           Stack.Prelude
+import qualified Codec.Archive.Tar as Tar
+import qualified Codec.Compression.GZip as GZip
 import qualified Data.Foldable as F
 import qualified Data.HashSet as HS
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
-import           Data.Time (UTCTime)
+import qualified Data.Text as T
+import           Distribution.Text ( display )
 import           Path
+                   ( (</>), addExtension, dirname, fileExtension, filename
+                   , fromAbsDir, fromAbsFile, fromRelDir, parent, parseRelDir
+                   , parseRelFile
+                   )
 import           Path.Extra
+                   ( parseCollapsedAbsFile, toFilePathNoTrailingSep
+                   , tryGetModificationTime
+                   )
 import           Path.IO
-import           RIO.List (intercalate)
-import           RIO.PrettyPrint
+                   ( copyDirRecur, copyDirRecur', doesDirExist, doesFileExist
+                   , ensureDir, ignoringAbsence, listDir, removeDirRecur
+                   )
+import qualified RIO.ByteString.Lazy as BL
+import           RIO.List ( intercalate, intersperse )
+import           RIO.Process ( HasProcessContext, withWorkingDir )
 import           Stack.Constants
-import           Stack.PackageDump
-import           Stack.Types.Build
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
+                   ( docDirSuffix, htmlDirSuffix, relDirAll, relFileIndexHtml )
+import           Stack.Constants.Config ( distDirFromDir )
+import           Stack.Prelude hiding ( Display (..) )
+import           Stack.Types.Build.Exception ( BuildException (..) )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), HasCompiler (..) )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts (..) )
+import           Stack.Types.BuildOpts ( BuildOpts (..), HaddockOpts (..) )
+import           Stack.Types.BuildOptsCLI ( BuildOptsCLI (..), BuildSubset (BSOnlyDependencies, BSOnlySnapshot) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig ( EnvConfig (..), HasEnvConfig (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.InterfaceOpt ( InterfaceOpt (..) )
 import           Stack.Types.Package
+                   ( InstallLocation (..), LocalPackage (..), Package (..) )
 import qualified System.FilePath as FP
-import           RIO.Process
-import           Web.Browser (openBrowser)
+import           Web.Browser ( openBrowser )
+import RIO.FilePath (dropTrailingPathSeparator)
 
-openHaddocksInBrowser
-    :: HasTerm env
-    => BaseConfigOpts
-    -> Map PackageName (PackageIdentifier, InstallLocation)
-    -- ^ Available packages and their locations for the current project
-    -> Set PackageName
-    -- ^ Build targets as determined by 'Stack.Build.Source.loadSourceMap'
-    -> RIO env ()
+openHaddocksInBrowser ::
+     HasTerm env
+  => BaseConfigOpts
+  -> Map PackageName (PackageIdentifier, InstallLocation)
+  -- ^ Available packages and their locations for the current project
+  -> Set PackageName
+  -- ^ Build targets as determined by 'Stack.Build.Source.loadSourceMap'
+  -> RIO env ()
 openHaddocksInBrowser bco pkgLocations buildTargets = do
-    let cliTargets = (boptsCLITargets . bcoBuildOptsCLI) bco
-        getDocIndex = do
-            let localDocs = haddockIndexFile (localDepsDocDir bco)
-            localExists <- doesFileExist localDocs
-            if localExists
-                then pure localDocs
-                else do
-                    let snapDocs = haddockIndexFile (snapDocDir bco)
-                    snapExists <- doesFileExist snapDocs
-                    if snapExists
-                        then pure snapDocs
-                        else throwString "No local or snapshot doc index found to open."
-    docFile <-
-        case (cliTargets, map (`Map.lookup` pkgLocations) (Set.toList buildTargets)) of
-            ([_], [Just (pkgId, iloc)]) -> do
-                pkgRelDir <- (parseRelDir . packageIdentifierString) pkgId
-                let docLocation =
-                        case iloc of
-                            Snap -> snapDocDir bco
-                            Local -> localDocDir bco
-                let docFile = haddockIndexFile (docLocation </> pkgRelDir)
-                exists <- doesFileExist docFile
-                if exists
-                    then pure docFile
-                    else do
-                        logWarn $
-                            "Expected to find documentation at " <>
-                            fromString (toFilePath docFile) <>
-                            ", but that file is missing.  Opening doc index instead."
-                        getDocIndex
-            _ -> getDocIndex
-    prettyInfo $ "Opening" <+> pretty docFile <+> "in the browser."
-    _ <- liftIO $ openBrowser (toFilePath docFile)
-    pure ()
+  let cliTargets = bco.buildOptsCLI.targetsCLI
+      getDocIndex = do
+        let localDocs = haddockIndexFile (localDepsDocDir bco)
+        localExists <- doesFileExist localDocs
+        if localExists
+          then pure localDocs
+          else do
+            let snapDocs = haddockIndexFile (snapDocDir bco)
+            snapExists <- doesFileExist snapDocs
+            if snapExists
+              then pure snapDocs
+              else throwIO HaddockIndexNotFound
+  docFile <-
+    case (cliTargets, map (`Map.lookup` pkgLocations) (Set.toList buildTargets)) of
+      ([_], [Just (pkgId, iloc)]) -> do
+        pkgRelDir <- (parseRelDir . packageIdentifierString) pkgId
+        let docLocation =
+              case iloc of
+                Snap -> snapDocDir bco
+                Local -> localDocDir bco
+        let docFile = haddockIndexFile (docLocation </> pkgRelDir)
+        exists <- doesFileExist docFile
+        if exists
+            then pure docFile
+            else do
+              prettyWarnL
+                [ flow "Expected to find documentation at"
+                , pretty docFile <> ","
+                , flow "but that file is missing. Opening doc index instead."
+                ]
+              getDocIndex
+      _ -> getDocIndex
+  prettyInfo $ "Opening" <+> pretty docFile <+> "in the browser."
+  void $ liftIO $ openBrowser (toFilePath docFile)
 
 -- | Determine whether we should haddock for a package.
-shouldHaddockPackage :: BuildOpts
-                     -> Set PackageName  -- ^ Packages that we want to generate haddocks for
-                                         -- in any case (whether or not we are going to generate
-                                         -- haddocks for dependencies)
-                     -> PackageName
-                     -> Bool
+shouldHaddockPackage ::
+     BuildOpts
+  -> Set PackageName
+     -- ^ Packages that we want to generate haddocks for in any case (whether or
+     -- not we are going to generate haddocks for dependencies)
+  -> PackageName
+  -> Bool
 shouldHaddockPackage bopts wanted name =
-    if Set.member name wanted
-        then boptsHaddock bopts
-        else shouldHaddockDeps bopts
+  if Set.member name wanted
+    then bopts.buildHaddocks
+    else shouldHaddockDeps bopts
 
 -- | Determine whether to build haddocks for dependencies.
 shouldHaddockDeps :: BuildOpts -> Bool
-shouldHaddockDeps bopts = fromMaybe (boptsHaddock bopts) (boptsHaddockDeps bopts)
+shouldHaddockDeps bopts = fromMaybe bopts.buildHaddocks bopts.haddockDeps
 
--- | Generate Haddock index and contents for local packages.
-generateLocalHaddockIndex
-    :: (HasProcessContext env, HasLogFunc env, HasCompiler env)
-    => BaseConfigOpts
-    -> Map GhcPkgId DumpPackage  -- ^ Local package dump
-    -> [LocalPackage]
-    -> RIO env ()
+-- | Generate Haddock index and contents for project packages.
+generateLocalHaddockIndex ::
+     (HasCompiler env, HasProcessContext env, HasTerm env)
+  => BaseConfigOpts
+  -> Map GhcPkgId DumpPackage  -- ^ Local package dump
+  -> [LocalPackage]
+  -> RIO env ()
 generateLocalHaddockIndex bco localDumpPkgs locals = do
-    let dumpPackages =
-            mapMaybe
-                (\LocalPackage{lpPackage = Package{..}} ->
-                    F.find
-                        (\dp -> dpPackageIdent dp == PackageIdentifier packageName packageVersion)
-                        localDumpPkgs)
-                locals
-    generateHaddockIndex
-        "local packages"
-        bco
-        dumpPackages
-        "."
-        (localDocDir bco)
+  let dumpPackages =
+        mapMaybe
+          ( \LocalPackage {package = Package {name, version}} ->
+              F.find
+                ( \dp -> dp.packageIdent ==
+                         PackageIdentifier name version
+                )
+                localDumpPkgs
+          )
+          locals
+  generateHaddockIndex
+    "project packages"
+    bco
+    dumpPackages
+    "."
+    (localDocDir bco)
 
--- | Generate Haddock index and contents for local packages and their dependencies.
-generateDepsHaddockIndex
-    :: (HasProcessContext env, HasLogFunc env, HasCompiler env)
-    => BaseConfigOpts
-    -> Map GhcPkgId DumpPackage  -- ^ Global dump information
-    -> Map GhcPkgId DumpPackage  -- ^ Snapshot dump information
-    -> Map GhcPkgId DumpPackage  -- ^ Local dump information
-    -> [LocalPackage]
-    -> RIO env ()
+-- | Generate Haddock index and contents for project packages and their
+-- dependencies.
+generateDepsHaddockIndex ::
+     (HasCompiler env, HasProcessContext env, HasTerm env)
+  => BaseConfigOpts
+  -> Map GhcPkgId DumpPackage  -- ^ Global dump information
+  -> Map GhcPkgId DumpPackage  -- ^ Snapshot dump information
+  -> Map GhcPkgId DumpPackage  -- ^ Local dump information
+  -> [LocalPackage]
+  -> RIO env ()
 generateDepsHaddockIndex bco globalDumpPkgs snapshotDumpPkgs localDumpPkgs locals = do
-    let deps = (mapMaybe (`lookupDumpPackage` allDumpPkgs) . nubOrd . findTransitiveDepends . mapMaybe getGhcPkgId) locals
-        depDocDir = localDepsDocDir bco
-    generateHaddockIndex
-        "local packages and dependencies"
-        bco
-        deps
-        ".."
-        depDocDir
-  where
-    getGhcPkgId :: LocalPackage -> Maybe GhcPkgId
-    getGhcPkgId LocalPackage{lpPackage = Package{..}} =
-        let pkgId = PackageIdentifier packageName packageVersion
-            mdpPkg = F.find (\dp -> dpPackageIdent dp == pkgId) localDumpPkgs
-        in fmap dpGhcPkgId mdpPkg
-    findTransitiveDepends :: [GhcPkgId] -> [GhcPkgId]
-    findTransitiveDepends = (`go` HS.empty) . HS.fromList
-      where
-        go todo checked =
-            case HS.toList todo of
-                [] -> HS.toList checked
-                (ghcPkgId:_) ->
-                    let deps =
-                            case lookupDumpPackage ghcPkgId allDumpPkgs of
-                                Nothing -> HS.empty
-                                Just pkgDP -> HS.fromList (dpDepends pkgDP)
-                        deps' = deps `HS.difference` checked
-                        todo' = HS.delete ghcPkgId (deps' `HS.union` todo)
-                        checked' = HS.insert ghcPkgId checked
-                    in go todo' checked'
-    allDumpPkgs = [localDumpPkgs, snapshotDumpPkgs, globalDumpPkgs]
+  let deps = ( mapMaybe
+                 (`lookupDumpPackage` allDumpPkgs)
+                 . nubOrd
+                 . findTransitiveDepends
+                 . mapMaybe getGhcPkgId
+             ) locals
+      depDocDir = localDepsDocDir bco
+  generateHaddockIndex
+    "project packages and dependencies"
+    bco
+    deps
+    ".."
+    depDocDir
+ where
+  getGhcPkgId :: LocalPackage -> Maybe GhcPkgId
+  getGhcPkgId LocalPackage {package = Package {name, version}} =
+    let pkgId = PackageIdentifier name version
+        mdpPkg = F.find (\dp -> dp.packageIdent == pkgId) localDumpPkgs
+    in  fmap (.ghcPkgId) mdpPkg
+  findTransitiveDepends :: [GhcPkgId] -> [GhcPkgId]
+  findTransitiveDepends = (`go` HS.empty) . HS.fromList
+   where
+    go todo checked =
+      case HS.toList todo of
+        [] -> HS.toList checked
+        (ghcPkgId:_) ->
+          let deps = case lookupDumpPackage ghcPkgId allDumpPkgs of
+                       Nothing -> HS.empty
+                       Just pkgDP -> HS.fromList pkgDP.depends
+              deps' = deps `HS.difference` checked
+              todo' = HS.delete ghcPkgId (deps' `HS.union` todo)
+              checked' = HS.insert ghcPkgId checked
+          in  go todo' checked'
+  allDumpPkgs = [localDumpPkgs, snapshotDumpPkgs, globalDumpPkgs]
 
 -- | Generate Haddock index and contents for all snapshot packages.
-generateSnapHaddockIndex
-    :: (HasProcessContext env, HasLogFunc env, HasCompiler env)
-    => BaseConfigOpts
-    -> Map GhcPkgId DumpPackage  -- ^ Global package dump
-    -> Map GhcPkgId DumpPackage  -- ^ Snapshot package dump
-    -> RIO env ()
+generateSnapHaddockIndex ::
+     (HasCompiler env, HasProcessContext env, HasTerm env)
+  => BaseConfigOpts
+  -> Map GhcPkgId DumpPackage  -- ^ Global package dump
+  -> Map GhcPkgId DumpPackage  -- ^ Snapshot package dump
+  -> RIO env ()
 generateSnapHaddockIndex bco globalDumpPkgs snapshotDumpPkgs =
-    generateHaddockIndex
-        "snapshot packages"
-        bco
-        (Map.elems snapshotDumpPkgs ++ Map.elems globalDumpPkgs)
-        "."
-        (snapDocDir bco)
+  generateHaddockIndex
+    "snapshot packages"
+    bco
+    (Map.elems snapshotDumpPkgs ++ Map.elems globalDumpPkgs)
+    "."
+    (snapDocDir bco)
 
 -- | Generate Haddock index and contents for specified packages.
-generateHaddockIndex
-    :: (HasProcessContext env, HasLogFunc env, HasCompiler env)
-    => Text
-    -> BaseConfigOpts
-    -> [DumpPackage]
-    -> FilePath
-    -> Path Abs Dir
-    -> RIO env ()
+generateHaddockIndex ::
+     (HasCompiler env, HasProcessContext env, HasTerm env)
+  => Text
+  -> BaseConfigOpts
+  -> [DumpPackage]
+  -> FilePath
+  -> Path Abs Dir
+  -> RIO env ()
 generateHaddockIndex descr bco dumpPackages docRelFP destDir = do
-    ensureDir destDir
-    interfaceOpts <- (liftIO . fmap nubOrd . mapMaybeM toInterfaceOpt) dumpPackages
-    unless (null interfaceOpts) $ do
-        let destIndexFile = haddockIndexFile destDir
-        eindexModTime <- liftIO (tryGetModificationTime destIndexFile)
-        let needUpdate =
-                case eindexModTime of
-                    Left _ -> True
-                    Right indexModTime ->
-                        or [mt > indexModTime | (_,mt,_,_) <- interfaceOpts]
-        if needUpdate
-            then do
-                logInfo $
-                  "Updating Haddock index for " <>
-                  Stack.Prelude.display descr <>
-                  " in\n" <>
-                  fromString (toFilePath destIndexFile)
-                liftIO (mapM_ copyPkgDocs interfaceOpts)
-                haddockExeName <- view $ compilerPathsL.to (toFilePath . cpHaddock)
-                withWorkingDir (toFilePath destDir) $ readProcessNull
-                    haddockExeName
-                    (map (("--optghc=-package-db=" ++ ) . toFilePathNoTrailingSep)
-                        [bcoSnapDB bco, bcoLocalDB bco] ++
-                     hoAdditionalArgs (boptsHaddockOpts (bcoBuildOpts bco)) ++
-                     ["--gen-contents", "--gen-index"] ++
-                     [x | (xs,_,_,_) <- interfaceOpts, x <- xs])
-            else
-              logInfo $
-                "Haddock index for " <>
-                Stack.Prelude.display descr <>
-                " already up to date at:\n" <>
-                fromString (toFilePath destIndexFile)
-  where
-    toInterfaceOpt :: DumpPackage -> IO (Maybe ([String], UTCTime, Path Abs File, Path Abs File))
-    toInterfaceOpt DumpPackage {..} =
-        case dpHaddockInterfaces of
-            [] -> pure Nothing
-            srcInterfaceFP:_ -> do
-                srcInterfaceAbsFile <- parseCollapsedAbsFile srcInterfaceFP
-                let (PackageIdentifier name _) = dpPackageIdent
-                    destInterfaceRelFP =
-                        docRelFP FP.</>
-                        packageIdentifierString dpPackageIdent FP.</>
-                        (packageNameString name FP.<.> "haddock")
-                    docPathRelFP =
-                        fmap ((docRelFP FP.</>) . FP.takeFileName) dpHaddockHtml
-                    interfaces = intercalate "," $
-                        maybeToList docPathRelFP ++ [srcInterfaceFP]
-
-                destInterfaceAbsFile <- parseCollapsedAbsFile (toFilePath destDir FP.</> destInterfaceRelFP)
-                esrcInterfaceModTime <- tryGetModificationTime srcInterfaceAbsFile
-                pure $
-                    case esrcInterfaceModTime of
-                        Left _ -> Nothing
-                        Right srcInterfaceModTime ->
-                            Just
-                                ( [ "-i", interfaces ]
-                                , srcInterfaceModTime
-                                , srcInterfaceAbsFile
-                                , destInterfaceAbsFile )
-    copyPkgDocs :: (a, UTCTime, Path Abs File, Path Abs File) -> IO ()
-    copyPkgDocs (_,srcInterfaceModTime,srcInterfaceAbsFile,destInterfaceAbsFile) = do
-        -- Copy dependencies' haddocks to documentation directory.  This way, relative @../$pkg-$ver@
-        -- links work and it's easy to upload docs to a web server or otherwise view them in a
-        -- non-local-filesystem context. We copy instead of symlink for two reasons: (1) symlinks
-        -- aren't reliably supported on Windows, and (2) the filesystem containing dependencies'
-        -- docs may not be available where viewing the docs (e.g. if building in a Docker
-        -- container).
-        edestInterfaceModTime <- tryGetModificationTime destInterfaceAbsFile
-        case edestInterfaceModTime of
-            Left _ -> doCopy
-            Right destInterfaceModTime
-                | destInterfaceModTime < srcInterfaceModTime -> doCopy
-                | otherwise -> pure ()
-      where
-        doCopy = do
-            ignoringAbsence (removeDirRecur destHtmlAbsDir)
-            ensureDir destHtmlAbsDir
-            onException
-                (copyDirRecur' (parent srcInterfaceAbsFile) destHtmlAbsDir)
-                (ignoringAbsence (removeDirRecur destHtmlAbsDir))
-        destHtmlAbsDir = parent destInterfaceAbsFile
+  ensureDir destDir
+  interfaceOpts <-
+    (liftIO . fmap nubOrd . mapMaybeM toInterfaceOpt) dumpPackages
+  unless (null interfaceOpts) $ do
+    let destIndexFile = haddockIndexFile destDir
+        prettyDescr = style Current (fromString $ T.unpack descr)
+    needUpdate <- liftIO (tryGetModificationTime destIndexFile) <&> \case
+      Left _ -> True
+      Right indexModTime ->
+        or [ mt > indexModTime
+           | mt <- map (.srcInterfaceFileModTime) interfaceOpts
+           ]
+    if needUpdate
+      then do
+        prettyInfo $
+             fillSep
+               [ flow "Updating Haddock index for"
+               , prettyDescr
+               , "in:"
+               ]
+          <> line
+          <> pretty destIndexFile
+        liftIO (mapM_ copyPkgDocs interfaceOpts)
+        haddockExeName <- view $ compilerPathsL . to (toFilePath . (.haddock))
+        withWorkingDir (toFilePath destDir) $ readProcessNull
+          haddockExeName
+          ( map
+              (("--optghc=-package-db=" ++ ) . toFilePathNoTrailingSep)
+                 [bco.snapDB, bco.localDB]
+              ++ bco.buildOpts.haddockOpts.additionalArgs
+              ++ ["--gen-contents", "--gen-index"]
+              ++ [x | xs <- map (.readInterfaceArgs) interfaceOpts, x <- xs]
+          )
+      else
+        prettyInfo $
+             fillSep
+               [ flow "Haddock index for"
+               , prettyDescr
+               , flow "already up to date at:"
+               ]
+          <> line
+          <> pretty destIndexFile
+ where
+  toInterfaceOpt ::
+       DumpPackage
+    -> IO (Maybe InterfaceOpt)
+  toInterfaceOpt dp =
+    case dp.haddockInterfaces of
+      [] -> pure Nothing
+      srcInterfaceFP:_ -> do
+        srcInterfaceFile <- parseCollapsedAbsFile srcInterfaceFP
+        let (PackageIdentifier name _) = dp.packageIdent
+            srcInterfaceDir = parent srcInterfaceFile
+        compInterfaceDirsAndFiles <- do
+          -- It is possible that the *.haddock file specified by the
+          -- haddock-interfaces key for an installed package may not exist. For
+          -- example, with GHC 9.6.6 on Windows, there is no
+          --
+          -- ${pkgroot}/../doc/html/libraries/rts-1.0.2\rts.haddock
+          (srcInterfaceSubDirs, _) <- doesDirExist srcInterfaceDir >>= \case
+            True -> listDir srcInterfaceDir
+            False -> pure ([], [])
+          -- This assumes that Cabal (the library) `haddock --executables` for
+          -- component my-component of package my-package puts one *.haddock
+          -- file and associated files in directory:
+          --
+          -- my-package/my-component
+          --
+          -- Not all directories in directory my-package relate to components.
+          -- For example, my-package/src relates to the files for the
+          -- colourised code of the main library of package my-package.
+          let isCompInterfaceDir dir = do
+                (_, files) <- listDir dir
+                pure $ (dir, ) <$> F.find isInterface files
+               where
+                isInterface file = fileExtension file == Just ".haddock"
+          mapMaybeM isCompInterfaceDir srcInterfaceSubDirs
+        -- Lift a copy of the component's Haddock directory up to the same level
+        -- as the main library's Haddock directory. For compontent my-component
+        -- of package my-package we name the directory my-package_my-component.
+        let liftcompInterfaceDir dir file = do
+              let parentDir = parent dir
+                  parentName = dirname parentDir
+                  compName = dirname dir
+              uniqueName <- do
+                let parentName' =
+                      dropTrailingPathSeparator $ toFilePath parentName
+                    compName' =
+                      dropTrailingPathSeparator $ toFilePath compName
+                parseRelDir $ parentName' <> "_" <> compName'
+              let destCompDir = parent parentDir </> uniqueName
+                  destCompFile = destCompDir </> filename file
+              ignoringAbsence (removeDirRecur destCompDir)
+              ensureDir destCompDir
+              onException
+                (copyDirRecur dir destCompDir)
+                (ignoringAbsence (removeDirRecur destCompDir))
+              pure (destCompFile, uniqueName)
+            destInterfaceRelFP =
+              docRelFP FP.</>
+              packageIdentifierString dp.packageIdent FP.</>
+              (packageNameString name FP.<.> "haddock")
+            docPathRelFP =
+              fmap ((docRelFP FP.</>) . FP.takeFileName) dp.haddockHtml
+            mkInterface :: Maybe FilePath -> FilePath -> String
+            mkInterface mDocPath file =
+              intercalate "," $ mcons mDocPath [file]
+            compInterface :: (Path Abs Dir, Path Abs File) -> IO String
+            compInterface (dir, file) = do
+              (file', uniqueName) <- liftcompInterfaceDir dir file
+              let compDir = dropTrailingPathSeparator $ toFilePath uniqueName
+                  docDir = docRelFP FP.</> compDir
+              pure $ mkInterface (Just docDir) (toFilePath file')
+            interfaces = mkInterface docPathRelFP srcInterfaceFP
+        compInterfaces <- forM compInterfaceDirsAndFiles compInterface
+        let readInterfaceArgs =
+              "-i" : intersperse "-i" (interfaces : compInterfaces)
+        destInterfaceFile <-
+          parseCollapsedAbsFile (toFilePath destDir FP.</> destInterfaceRelFP)
+        tryGetModificationTime srcInterfaceFile <&> \case
+          Left _ -> Nothing
+          Right srcInterfaceFileModTime ->
+            Just InterfaceOpt
+              { readInterfaceArgs
+              , srcInterfaceFileModTime
+              , srcInterfaceFile
+              , destInterfaceFile
+              }
+  copyPkgDocs :: InterfaceOpt -> IO ()
+  copyPkgDocs opts =
+  -- Copy dependencies' haddocks to documentation directory.  This way,
+  -- relative @../$pkg-$ver@ links work and it's easy to upload docs to a web
+  -- server or otherwise view them in a non-local-filesystem context. We copy
+  -- instead of symlink for two reasons: (1) symlinks aren't reliably supported
+  -- on Windows, and (2) the filesystem containing dependencies' docs may not be
+  -- available where viewing the docs (e.g. if building in a Docker container).
+    tryGetModificationTime opts.destInterfaceFile >>= \case
+      Left _ -> doCopy
+      Right destInterfaceModTime
+        | destInterfaceModTime < opts.srcInterfaceFileModTime -> doCopy
+        | otherwise -> pure ()
+   where
+    doCopy = do
+      ignoringAbsence (removeDirRecur destHtmlAbsDir)
+      ensureDir destHtmlAbsDir
+      onException
+        (copyDirRecur' (parent opts.srcInterfaceFile) destHtmlAbsDir)
+        (ignoringAbsence (removeDirRecur destHtmlAbsDir))
+    destHtmlAbsDir = parent opts.destInterfaceFile
 
 -- | Find first DumpPackage matching the GhcPkgId
-lookupDumpPackage :: GhcPkgId
-                  -> [Map GhcPkgId DumpPackage]
-                  -> Maybe DumpPackage
+lookupDumpPackage ::
+     GhcPkgId
+  -> [Map GhcPkgId DumpPackage]
+  -> Maybe DumpPackage
 lookupDumpPackage ghcPkgId dumpPkgs =
-    listToMaybe $ mapMaybe (Map.lookup ghcPkgId) dumpPkgs
+  listToMaybe $ mapMaybe (Map.lookup ghcPkgId) dumpPkgs
 
 -- | Path of haddock index file.
 haddockIndexFile :: Path Abs Dir -> Path Abs File
 haddockIndexFile destDir = destDir </> relFileIndexHtml
 
--- | Path of local packages documentation directory.
+-- | Path of project packages documentation directory.
 localDocDir :: BaseConfigOpts -> Path Abs Dir
-localDocDir bco = bcoLocalInstallRoot bco </> docDirSuffix
+localDocDir bco = bco.localInstallRoot </> docDirSuffix
 
--- | Path of documentation directory for the dependencies of local packages
+-- | Path of documentation directory for the dependencies of project packages
 localDepsDocDir :: BaseConfigOpts -> Path Abs Dir
 localDepsDocDir bco = localDocDir bco </> relDirAll
 
 -- | Path of snapshot packages documentation directory.
 snapDocDir :: BaseConfigOpts -> Path Abs Dir
-snapDocDir bco = bcoSnapInstallRoot bco </> docDirSuffix
+snapDocDir bco = bco.snapInstallRoot </> docDirSuffix
+
+generateLocalHaddockForHackageArchives ::
+     (HasEnvConfig env, HasTerm env)
+  => [LocalPackage]
+  -> RIO env ()
+generateLocalHaddockForHackageArchives lps = do
+  buildSubset <- view $ envConfigL . to (.buildOptsCLI.buildSubset)
+  let localsExcluded =
+        buildSubset == BSOnlyDependencies || buildSubset == BSOnlySnapshot
+  unless localsExcluded $
+    forM_ lps $ \lp ->
+      let pkg = lp.package
+          pkgId = PackageIdentifier pkg.name pkg.version
+          pkgDir = parent lp.cabalFP
+      in  when lp.wanted $
+            generateLocalHaddockForHackageArchive pkgDir pkgId
+
+-- | Generate an archive file containing local Haddock documentation for
+-- Hackage, in a form accepted by Hackage.
+generateLocalHaddockForHackageArchive ::
+     (HasEnvConfig env, HasTerm env)
+  => Path Abs Dir
+     -- ^ The package directory.
+  -> PackageIdentifier
+     -- ^ The package name and version.
+  -> RIO env ()
+generateLocalHaddockForHackageArchive pkgDir pkgId = do
+  distDir <- distDirFromDir pkgDir
+  let pkgIdName = display pkgId
+      name = pkgIdName <> "-docs"
+      (nameRelDir, tarGzFileName) = fromMaybe
+        (error "impossible")
+        ( do relDir <- parseRelDir name
+             nameRelFile <- parseRelFile name
+             tarGz <- addExtension ".gz" =<< addExtension ".tar" nameRelFile
+             pure (relDir, tarGz)
+        )
+      tarGzFile = distDir </> tarGzFileName
+      docDir = distDir </> docDirSuffix </> htmlDirSuffix
+  tarGzFileCreated <- createTarGzFile tarGzFile docDir nameRelDir
+  if tarGzFileCreated
+    then
+      prettyInfo $
+           fillSep
+             [ flow "Archive of Haddock documentation for Hackage for"
+             , style Current (fromString pkgIdName)
+             , flow "created at:"
+             ]
+        <> line
+        <> pretty tarGzFile
+    else
+      prettyWarnL
+        [ flow "No Haddock documentation for Hackage available for"
+        , style Error (fromString pkgIdName) <> "."
+        ]
+
+createTarGzFile ::
+     Path Abs File
+     -- ^ Full path to archive file
+  -> Path Abs Dir
+     -- ^ Base directory
+  -> Path Rel Dir
+     -- ^ Directory to archive, relative to base directory
+  -> RIO env Bool
+createTarGzFile tar base dir = do
+  dirExists <- doesDirExist $ base </> dir
+  if dirExists
+    then do
+      entries <- liftIO $ Tar.pack base' [dir']
+      if null entries
+        then pure False
+        else do
+          ensureDir $ parent tar
+          BL.writeFile tar' $ GZip.compress $ Tar.write entries
+          pure True
+    else pure False
+ where
+  base' = fromAbsDir base
+  dir' = fromRelDir dir
+  tar' = fromAbsFile tar
diff --git a/src/Stack/Build/Installed.hs b/src/Stack/Build/Installed.hs
index 3fb771e41a..609175df4d 100644
--- a/src/Stack/Build/Installed.hs
+++ b/src/Stack/Build/Installed.hs
@@ -1,236 +1,338 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 {-# LANGUAGE OverloadedStrings     #-}
 
--- Determine which packages are already installed
+{-|
+Module      : Stack.Build.Installed
+Description : Determine which packages are already installed.
+License     : BSD-3-Clause
+
+Determine which packages are already installed.
+-}
+
 module Stack.Build.Installed
-    ( InstalledMap
-    , Installed (..)
-    , getInstalled
-    , InstallMap
-    , toInstallMap
-    ) where
-
-import           Data.Conduit
+  ( getInstalled
+  , toInstallMap
+  ) where
+
+import           Data.Conduit ( ZipSink (..), getZipSink )
 import qualified Data.Conduit.List as CL
 import qualified Data.Set as Set
 import qualified Data.Map.Strict as Map
-import           Path
-import           Stack.Build.Cache
-import           Stack.Constants
+import           Stack.Build.Cache ( getInstalledExes )
+import           Stack.Constants ( wiredInPackages )
 import           Stack.PackageDump
+                   ( conduitDumpPackage, ghcPkgDump, pruneDeps )
 import           Stack.Prelude
-import           Stack.SourceMap (getPLIVersion, loadVersion)
-import           Stack.Types.Build
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
-import           Stack.Types.Package
+import           Stack.SourceMap ( getPLIVersion, loadVersion )
+import           Stack.Types.Compiler ( ActualCompiler )
+import           Stack.Types.CompilerPaths ( getGhcPkgExe )
+import           Stack.Types.DumpPackage
+                   ( DumpPackage (..), SublibDump (..), sublibParentPkgId )
+import           Stack.Types.EnvConfig
+                    ( HasEnvConfig, HasSourceMap (..), packageDatabaseDeps
+                    , packageDatabaseExtra, packageDatabaseLocal
+                    )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.Installed
+                   ( InstallLocation (..), InstallMap, Installed (..)
+                   , InstalledLibraryInfo (..), InstalledMap
+                   , InstalledPackageLocation (..), PackageDatabase (..)
+                   , PackageDbVariety (..), toPackageDbVariety
+                   )
 import           Stack.Types.SourceMap
+                   ( DepPackage (..), ProjectPackage (..), SourceMap (..) )
 
+-- | For the given t'SourceMap', yield a dictionary of package names for a
+-- project's packages and dependencies, and pairs of their relevant database
+-- (write-only or mutable) and package versions.
 toInstallMap :: MonadIO m => SourceMap -> m InstallMap
 toInstallMap sourceMap = do
-    projectInstalls <-
-        for (smProject sourceMap) $ \pp -> do
-            version <- loadVersion (ppCommon pp)
-            pure (Local, version)
-    depInstalls <-
-        for (smDeps sourceMap) $ \dp ->
-            case dpLocation dp of
-                PLImmutable pli -> pure (Snap, getPLIVersion pli)
-                PLMutable _ -> do
-                    version <- loadVersion (dpCommon dp)
-                    pure (Local, version)
-    pure $ projectInstalls <> depInstalls
+  projectInstalls <-
+    for sourceMap.project $ \pp -> do
+      version <- loadVersion pp.projectCommon
+      pure (Local, version)
+  depInstalls <-
+    for sourceMap.deps $ \dp ->
+      case dp.location of
+        PLImmutable pli -> pure (Snap, getPLIVersion pli)
+        PLMutable _ -> do
+          version <- loadVersion dp.depCommon
+          pure (Local, version)
+  pure $ projectInstalls <> depInstalls
 
 -- | Returns the new InstalledMap and all of the locally registered packages.
-getInstalled :: HasEnvConfig env
-             => InstallMap -- ^ does not contain any installed information
-             -> RIO env
-                  ( InstalledMap
-                  , [DumpPackage] -- globally installed
-                  , [DumpPackage] -- snapshot installed
-                  , [DumpPackage] -- locally installed
-                  )
+getInstalled ::
+     HasEnvConfig env
+  => InstallMap -- ^ does not contain any installed information
+  -> RIO env
+       ( InstalledMap
+       , [DumpPackage] -- globally installed
+       , [DumpPackage] -- snapshot installed
+       , [DumpPackage] -- locally installed
+       )
 getInstalled {-opts-} installMap = do
-    logDebug "Finding out which packages are already installed"
-    snapDBPath <- packageDatabaseDeps
-    localDBPath <- packageDatabaseLocal
-    extraDBPaths <- packageDatabaseExtra
-
-    let loadDatabase' = loadDatabase {-opts mcache-} installMap
-
-    (installedLibs0, globalDumpPkgs) <- loadDatabase' Nothing []
-    (installedLibs1, _extraInstalled) <-
-      foldM (\lhs' pkgdb ->
-        loadDatabase' (Just (ExtraGlobal, pkgdb)) (fst lhs')
-        ) (installedLibs0, globalDumpPkgs) extraDBPaths
-    (installedLibs2, snapshotDumpPkgs) <-
-        loadDatabase' (Just (InstalledTo Snap, snapDBPath)) installedLibs1
-    (installedLibs3, localDumpPkgs) <-
-        loadDatabase' (Just (InstalledTo Local, localDBPath)) installedLibs2
-    let installedLibs = Map.fromList $ map lhPair installedLibs3
-
-    -- Add in the executables that are installed, making sure to only trust a
-    -- listed installation under the right circumstances (see below)
-    let exesToSM loc = Map.unions . map (exeToSM loc)
-        exeToSM loc (PackageIdentifier name version) =
-            case Map.lookup name installMap of
-                -- Doesn't conflict with anything, so that's OK
-                Nothing -> m
-                Just (iLoc, iVersion)
-                    -- Not the version we want, ignore it
-                    | version /= iVersion || mismatchingLoc loc iLoc -> Map.empty
-
-                    | otherwise -> m
-          where
-            m = Map.singleton name (loc, Executable $ PackageIdentifier name version)
-            mismatchingLoc installed target | target == installed = False
-                                            | installed == Local = False -- snapshot dependency could end up
-                                                                         -- in a local install as being mutable
-                                            | otherwise = True
-    exesSnap <- getInstalledExes Snap
-    exesLocal <- getInstalledExes Local
-    let installedMap = Map.unions
-            [ exesToSM Local exesLocal
-            , exesToSM Snap exesSnap
-            , installedLibs
-            ]
-
-    pure ( installedMap
-           , globalDumpPkgs
-           , snapshotDumpPkgs
-           , localDumpPkgs
-           )
-
--- | Outputs both the modified InstalledMap and the Set of all installed packages in this database
+  logDebug "Finding out which packages are already installed"
+  snapDBPath <- packageDatabaseDeps
+  localDBPath <- packageDatabaseLocal
+  extraDBPaths <- packageDatabaseExtra
+
+  let loadDatabase' = loadDatabase {-opts mcache-} installMap
+
+  (installedLibs0, globalDumpPkgs) <- loadDatabase' GlobalPkgDb []
+  (installedLibs1, _extraInstalled) <-
+    foldM (\lhs' pkgdb ->
+      loadDatabase' (UserPkgDb ExtraPkgDb pkgdb) (fst lhs')
+      ) (installedLibs0, globalDumpPkgs) extraDBPaths
+  (installedLibs2, snapshotDumpPkgs) <-
+    loadDatabase' (UserPkgDb (InstalledTo Snap) snapDBPath) installedLibs1
+  (installedLibs3, localDumpPkgs) <-
+    loadDatabase' (UserPkgDb (InstalledTo Local) localDBPath) installedLibs2
+  let installedLibs =
+        foldr' gatherAndTransformSubLoadHelper mempty installedLibs3
+
+  -- Add in the executables that are installed, making sure to only trust a
+  -- listed installation under the right circumstances (see below)
+  let exesToSM loc = Map.unions . map (exeToSM loc)
+      exeToSM loc (PackageIdentifier name version) =
+        case Map.lookup name installMap of
+          -- Doesn't conflict with anything, so that's OK
+          Nothing -> m
+          Just (iLoc, iVersion)
+            -- Not the version we want, ignore it
+            | version /= iVersion || mismatchingLoc loc iLoc -> Map.empty
+            | otherwise -> m
+       where
+        m = Map.singleton name (loc, Executable $ PackageIdentifier name version)
+        mismatchingLoc installed target
+          | target == installed = False
+          | installed == Local = False -- snapshot dependency could end up
+                                       -- in a local install as being mutable
+          | otherwise = True
+  exesSnap <- getInstalledExes Snap
+  exesLocal <- getInstalledExes Local
+  let installedMap = Map.unions
+        [ exesToSM Local exesLocal
+        , exesToSM Snap exesSnap
+        , installedLibs
+        ]
+
+  pure ( installedMap
+       , globalDumpPkgs
+       , snapshotDumpPkgs
+       , localDumpPkgs
+       )
+
+-- | Outputs both the modified InstalledMap and the Set of all installed
+-- packages in this database
 --
 -- The goal is to ascertain that the dependencies for a package are present,
 -- that it has profiling if necessary, and that it matches the version and
--- location needed by the SourceMap
-loadDatabase :: HasEnvConfig env
-             => InstallMap -- ^ to determine which installed things we should include
-             -> Maybe (InstalledPackageLocation, Path Abs Dir) -- ^ package database, Nothing for global
-             -> [LoadHelper] -- ^ from parent databases
-             -> RIO env ([LoadHelper], [DumpPackage])
-loadDatabase installMap mdb lhs0 = do
-    pkgexe <- getGhcPkgExe
-    (lhs1', dps) <- ghcPkgDump pkgexe (fmap snd (maybeToList mdb))
-                $ conduitDumpPackage .| sink
-    lhs1 <- mapMaybeM (processLoadResult mdb) lhs1'
-    let lhs = pruneDeps
-            id
-            lhId
-            lhDeps
-            const
-            (lhs0 ++ lhs1)
-    pure (map (\lh -> lh { lhDeps = [] }) $ Map.elems lhs, dps)
-  where
-    mloc = fmap fst mdb
-    sinkDP =  CL.map (isAllowed installMap mloc &&& toLoadHelper mloc)
-           .| CL.consume
-    sink = getZipSink $ (,)
-        <$> ZipSink sinkDP
-        <*> ZipSink CL.consume
-
-processLoadResult :: HasLogFunc env
-                  => Maybe (InstalledPackageLocation, Path Abs Dir)
-                  -> (Allowed, LoadHelper)
-                  -> RIO env (Maybe LoadHelper)
-processLoadResult _ (Allowed, lh) = pure (Just lh)
-processLoadResult mdb (reason, lh) = do
+-- location needed by the SourceMap.
+loadDatabase ::
+     forall env. HasEnvConfig env
+  => InstallMap
+     -- ^ to determine which installed things we should include
+  -> PackageDatabase
+     -- ^ package database.
+  -> [LoadHelper]
+     -- ^ from parent databases
+  -> RIO env ([LoadHelper], [DumpPackage])
+loadDatabase installMap db lhs0 = do
+  sourceMap <- view sourceMapL
+  let compiler = sourceMap.compiler
+  pkgexe <- getGhcPkgExe
+  (lhs1', dps) <- ghcPkgDump pkgexe pkgDb $ conduitDumpPackage .| sink compiler
+  lhs1 <- mapMaybeM processLoadResult lhs1'
+  let lhs = pruneDeps id (.ghcPkgId) (.depsGhcPkgId) const (lhs0 ++ lhs1)
+  pure (map (\lh -> lh { depsGhcPkgId = [] }) $ Map.elems lhs, dps)
+ where
+  pkgDb = case db of
+    GlobalPkgDb -> []
+    UserPkgDb _ fp -> [fp]
+
+  sinkDP compiler =
+       CL.map (isAllowed installMap db' &&& toLoadHelper compiler db')
+    .| CL.consume
+   where
+    db' = toPackageDbVariety db
+  sink compiler =   getZipSink $ (,)
+       <$> ZipSink (sinkDP compiler)
+       <*> ZipSink CL.consume
+
+  processLoadResult :: (Allowed, LoadHelper) -> RIO env (Maybe LoadHelper)
+  processLoadResult (Allowed, lh) = pure (Just lh)
+  processLoadResult (reason, lh) = do
     logDebug $
-        "Ignoring package " <>
-        fromString (packageNameString (fst (lhPair lh))) <>
-        maybe mempty (\db -> ", from " <> displayShow db <> ",") mdb <>
-        " due to" <>
-        case reason of
-            UnknownPkg -> " it being unknown to the resolver / extra-deps."
-            WrongLocation mloc loc -> " wrong location: " <> displayShow (mloc, loc)
-            WrongVersion actual wanted ->
-                " wanting version " <>
-                fromString (versionString wanted) <>
-                " instead of " <>
-                fromString (versionString actual)
+         "Ignoring package "
+      <> fromPackageName (fst lh.pair)
+      <> case db of
+           GlobalPkgDb -> mempty
+           UserPkgDb loc fp -> ", from " <> displayShow (loc, fp) <> ","
+      <> " due to"
+      <> case reason of
+           UnknownPkg -> " it being unknown to the snapshot or extra-deps."
+           WrongLocation db' loc ->
+             " wrong location: " <> displayShow (db', loc)
+           WrongVersion actual wanted ->
+                " wanting version "
+            <> fromString (versionString wanted)
+            <> " instead of "
+            <> fromString (versionString actual)
     pure Nothing
 
+-- | Type representing results of 'isAllowed'.
 data Allowed
-    = Allowed
-    | UnknownPkg
-    | WrongLocation (Maybe InstalledPackageLocation) InstallLocation
-    | WrongVersion Version Version
-    deriving (Eq, Show)
-
--- | Check if a can be included in the set of installed packages or not, based
--- on the package selections made by the user. This does not perform any
--- dirtiness or flag change checks.
-isAllowed :: InstallMap
-          -> Maybe InstalledPackageLocation
-          -> DumpPackage
-          -> Allowed
-isAllowed installMap mloc dp =
-        case Map.lookup name installMap of
-            Nothing ->
-                -- If the sourceMap has nothing to say about this package,
-                -- check if it represents a sublibrary first
-                -- See: https://github.com/commercialhaskell/stack/issues/3899
-                case dpParentLibIdent dp of
-                  Just (PackageIdentifier parentLibName version') ->
-                    case Map.lookup parentLibName installMap of
-                      Nothing -> checkNotFound
-                      Just instInfo
-                        | version' == version -> checkFound instInfo
-                        | otherwise -> checkNotFound -- different versions
-                  Nothing -> checkNotFound
-            Just pii -> checkFound pii
-  where
-    PackageIdentifier name version = dpPackageIdent dp
-    -- Ensure that the installed location matches where the sourceMap says it
-    -- should be installed
-    checkLocation Snap = True -- snapshot deps could become mutable after getting any mutable dependency
-    checkLocation Local = mloc == Just (InstalledTo Local) || mloc == Just ExtraGlobal -- 'locally' installed snapshot packages can come from extra dbs
-    -- Check if a package is allowed if it is found in the sourceMap
-    checkFound (installLoc, installVer)
-      | not (checkLocation installLoc) = WrongLocation mloc installLoc
-      | version /= installVer = WrongVersion version installVer
-      | otherwise = Allowed
-    -- check if a package is allowed if it is not found in the sourceMap
-    checkNotFound = case mloc of
-      -- The sourceMap has nothing to say about this global package, so we can use it
-      Nothing -> Allowed
-      Just ExtraGlobal -> Allowed
-      -- For non-global packages, don't include unknown packages.
-      -- See: https://github.com/commercialhaskell/stack/issues/292
-      Just _ -> UnknownPkg
+  = Allowed
+    -- ^ The installed package can be included in the set of relevant installed
+    -- packages.
+  | UnknownPkg
+    -- ^ The installed package cannot be included in the set of relevant
+    -- installed packages because the package is unknown.
+  | WrongLocation PackageDbVariety InstallLocation
+    -- ^ The installed package cannot be included in the set of relevant
+    -- installed packages because the package is in the wrong package database.
+  | WrongVersion Version Version
+    -- ^ The installed package cannot be included in the set of relevant
+    -- installed packages because the package has the wrong version.
+  deriving (Eq, Show)
+
+-- | Check if an installed package can be included in the set of relevant
+-- installed packages or not, based on the package selections made by the user.
+-- This does not perform any dirtiness or flag change checks.
+isAllowed ::
+     InstallMap
+  -> PackageDbVariety
+     -- ^ The package database providing the installed package.
+  -> DumpPackage
+     -- ^ The installed package to check.
+  -> Allowed
+isAllowed installMap pkgDb dp = case Map.lookup name installMap of
+  Nothing ->
+    -- If the sourceMap has nothing to say about this package,
+    -- check if it represents a sub-library first
+    -- See: https://github.com/commercialhaskell/stack/issues/3899
+    case sublibParentPkgId dp of
+      Just (PackageIdentifier parentLibName version') ->
+        case Map.lookup parentLibName installMap of
+          Nothing -> checkNotFound
+          Just instInfo
+            | version' == version -> checkFound instInfo
+            | otherwise -> checkNotFound -- different versions
+      Nothing -> checkNotFound
+  Just pii -> checkFound pii
+ where
+  PackageIdentifier name version = dp.packageIdent
+  -- Ensure that the installed location matches where the sourceMap says it
+  -- should be installed.
+  checkLocation Snap =
+     -- snapshot deps could become mutable after getting any mutable dependency.
+    True
+  checkLocation Local = case pkgDb of
+    GlobalDb -> False
+    -- 'locally' installed snapshot packages can come from 'extra' package
+    -- databases.
+    ExtraDb -> True
+    WriteOnlyDb -> False
+    MutableDb -> True
+  -- Check if an installed package is allowed if it is found in the sourceMap.
+  checkFound (installLoc, installVer)
+    | not (checkLocation installLoc) = WrongLocation pkgDb installLoc
+    | version /= installVer = WrongVersion version installVer
+    | otherwise = Allowed
+  -- Check if an installed package is allowed if it is not found in the
+  -- sourceMap.
+  checkNotFound = case pkgDb of
+    -- The sourceMap has nothing to say about this global package, so we can use
+    -- it.
+    GlobalDb -> Allowed
+    ExtraDb -> Allowed
+    -- For non-global packages, don't include unknown packages.
+    -- See: https://github.com/commercialhaskell/stack/issues/292
+    WriteOnlyDb -> UnknownPkg
+    MutableDb -> UnknownPkg
 
+-- | Type representing certain information about an installed package.
 data LoadHelper = LoadHelper
-    { lhId   :: !GhcPkgId
-    , lhDeps :: ![GhcPkgId]
-    , lhPair :: !(PackageName, (InstallLocation, Installed))
-    }
-    deriving Show
-
-toLoadHelper :: Maybe InstalledPackageLocation -> DumpPackage -> LoadHelper
-toLoadHelper mloc dp = LoadHelper
-    { lhId = gid
-    , lhDeps =
-        -- We always want to consider the wired in packages as having all
-        -- of their dependencies installed, since we have no ability to
-        -- reinstall them. This is especially important for using different
-        -- minor versions of GHC, where the dependencies of wired-in
-        -- packages may change slightly and therefore not match the
-        -- snapshot.
-        if name `Set.member` wiredInPackages
-            then []
-            else dpDepends dp
-    , lhPair = (name, (toPackageLocation mloc, Library ident gid (Right <$> dpLicense dp)))
-    }
-  where
-    gid = dpGhcPkgId dp
-    ident@(PackageIdentifier name _) = dpPackageIdent dp
-
-toPackageLocation :: Maybe InstalledPackageLocation -> InstallLocation
-toPackageLocation Nothing = Snap
-toPackageLocation (Just ExtraGlobal) = Snap
-toPackageLocation (Just (InstalledTo loc)) = loc
+  { ghcPkgId :: !GhcPkgId
+    -- ^ The package's id.
+  , subLibDump :: !(Maybe SublibDump)
+  , depsGhcPkgId :: ![GhcPkgId]
+    -- ^ Unless the package's name is that of a 'wired-in' package, a list of
+    -- the ids of the installed packages that are the package's dependencies.
+  , pair :: !(PackageName, (InstallLocation, Installed))
+    -- ^ A pair of (a) the package's name and (b) a pair of the relevant
+    -- database (write-only or mutable) and information about the library
+    -- installed.
+  }
+  deriving Show
+
+toLoadHelper :: ActualCompiler -> PackageDbVariety -> DumpPackage -> LoadHelper
+toLoadHelper compiler pkgDb dp = LoadHelper
+  { ghcPkgId
+  , depsGhcPkgId
+  , subLibDump = dp.sublib
+  , pair
+  }
+ where
+  ghcPkgId = dp.ghcPkgId
+  ident@(PackageIdentifier name _) = dp.packageIdent
+  depsGhcPkgId =
+    -- We always want to consider the wired in packages as having all of their
+    -- dependencies installed, since we have no ability to reinstall them. This
+    -- is especially important for using different minor versions of GHC, where
+    -- the dependencies of wired-in packages may change slightly and therefore
+    -- not match the snapshot.
+    if name `Set.member` wiredInPackages compiler
+      then []
+      else dp.depends
+  installedLibInfo = InstalledLibraryInfo (Just ghcPkgId) mempty
+
+  toInstallLocation :: PackageDbVariety -> InstallLocation
+  toInstallLocation GlobalDb = Snap
+  toInstallLocation ExtraDb = Snap
+  toInstallLocation WriteOnlyDb = Snap
+  toInstallLocation MutableDb = Local
+
+  pair = (name, (toInstallLocation pkgDb, Library ident installedLibInfo))
+
+-- | This is where sublibraries and main libraries are assembled into a single
+-- entity Installed package, where all ghcPkgId live.
+gatherAndTransformSubLoadHelper ::
+     LoadHelper
+  -> Map PackageName (InstallLocation, Installed)
+  -> Map PackageName (InstallLocation, Installed)
+gatherAndTransformSubLoadHelper lh =
+  Map.insertWith onPreviousLoadHelper key value
+ where
+  -- Here we assume that both have the same location which already was a prior
+  -- assumption in Stack.
+  onPreviousLoadHelper
+      (pLoc, Library pn incomingLibInfo)
+      (_, Library _ existingLibInfo)
+    = ( pLoc
+      , Library pn existingLibInfo
+          { subLib = Map.union incomingLibInfo.subLib existingLibInfo.subLib
+          , mMainGhcPkgId =
+              if isJust lh.subLibDump
+                then existingLibInfo.mMainGhcPkgId
+                else incomingLibInfo.mMainGhcPkgId
+          }
+      )
+  onPreviousLoadHelper newVal _oldVal = newVal
+  (key, value) = case lh.subLibDump of
+    Nothing -> (rawPackageName, rawValue)
+    Just sd -> (sd.packageName, updateAsSublib sd <$> rawValue)
+  -- rawValue should always have a main library: see toLoadHelper.
+  (rawPackageName, rawValue) = lh.pair
+  updateAsSublib
+      sd
+      (Library (PackageIdentifier _sublibMungedPackageName version) libInfo)
+    = case libInfo.mMainGhcPkgId of
+        Nothing ->
+          error "gatherAndTransformSubLoadHelper: the impossible happened!"
+        Just ghcPkgId' -> Library
+          (PackageIdentifier key version)
+          libInfo { subLib = Map.singleton sd.libraryName ghcPkgId' }
+  updateAsSublib _ v = v
diff --git a/src/Stack/Build/Source.hs b/src/Stack/Build/Source.hs
index edf195b3fd..f981877298 100644
--- a/src/Stack/Build/Source.hs
+++ b/src/Stack/Build/Source.hs
@@ -1,491 +1,585 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 {-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE RecordWildCards       #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
 
--- Load information on package sources
+{-|
+Module      : Stack.Build.Source
+Description : Load information on package sources.
+License     : BSD-3-Clause
+
+Load information on package sources.
+-}
+
 module Stack.Build.Source
-    ( projectLocalPackages
-    , localDependencies
-    , loadCommonPackage
-    , loadLocalPackage
-    , loadSourceMap
-    , getLocalFlags
-    , addUnlistedToBuildCache
-    , hashSourceMapData
-    ) where
+  ( projectLocalPackages
+  , localDependencies
+  , loadCommonPackage
+  , loadLocalPackage
+  , loadSourceMap
+  , addUnlistedToBuildCache
+  , hashSourceMapData
+  ) where
 
-import              Stack.Prelude
-import qualified    Pantry.SHA256 as SHA256
-import              Data.ByteString.Builder (toLazyByteString)
-import              Conduit (ZipSink (..), withSourceFile)
-import qualified    Distribution.PackageDescription as C
-import qualified    Data.List as L
-import qualified    Data.Map as Map
-import qualified    Data.Map.Strict as M
-import qualified    Data.Set as Set
-import              Stack.Build.Cache
-import              Stack.Build.Haddock (shouldHaddockDeps)
-import              Stack.Build.Target
-import              Stack.Package
-import              Stack.SourceMap
-import              Stack.Types.Build
-import              Stack.Types.Config
-import              Stack.Types.NamedComponent
-import              Stack.Types.Package
-import              Stack.Types.SourceMap
-import              System.FilePath (takeFileName)
-import              System.IO.Error (isDoesNotExistError)
+import           Data.ByteString.Builder ( toLazyByteString )
+import qualified Data.List as L
+import qualified Data.Map as Map
+import qualified Data.Map.Merge.Lazy as Map
+import qualified Data.Map.Strict as M
+import qualified Data.Set as Set
+import qualified Distribution.PackageDescription as C
+import qualified Pantry.SHA256 as SHA256
+import           Stack.Build.Cache ( tryGetBuildCache )
+import           Stack.Build.Haddock ( shouldHaddockDeps )
+import           Stack.Package
+                   ( buildableBenchmarks, buildableExes, buildableTestSuites
+                   , hasBuildableMainLibrary, resolvePackage
+                   )
+import           Stack.PackageFile ( getPackageFile )
+import           Stack.Prelude
+import           Stack.SourceMap
+                   ( getCompilerInfo, immutableLocSha, mkProjectPackage
+                   , pruneGlobals
+                   )
+import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
+import           Stack.Types.ApplyProgOptions ( ApplyProgOptions (..) )
+import           Stack.Types.Build.Exception ( BuildPrettyException (..) )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.BuildOpts ( BuildOpts (..), TestOpts (..) )
+import           Stack.Types.BuildOptsCLI
+                   ( ApplyCLIFlag (..), BuildOptsCLI (..)
+                   , boptsCLIAllProgOptions
+                   )
+import           Stack.Types.CabalConfigKey ( CabalConfigKey (..) )
+import           Stack.Types.Cache ( FileCache, FileCacheInfo (..) )
+import           Stack.Types.CompilerPaths ( HasCompiler, getCompilerPath )
+import           Stack.Types.Config ( Config (..), HasConfig (..), buildOptsL )
+import           Stack.Types.Curator ( Curator (..) )
+import           Stack.Types.DumpPackage ( DumpedGlobalPackage )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), HasSourceMap (..)
+                   , actualCompilerVersionL
+                   )
+import           Stack.Types.FileDigestCache ( readFileDigest )
+import           Stack.Types.NamedComponent
+                   ( NamedComponent (..), isCSubLib, splitComponents )
+import           Stack.Types.Package
+                   ( LocalPackage (..), Package (..), PackageConfig (..)
+                   , dotCabalGetPath, memoizeRefWith, runMemoizedWith
+                   )
+import           Stack.Types.PackageFile
+                   ( PackageComponentFile (..), PackageWarning )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.SourceMap
+                   ( CommonPackage (..), DepPackage (..), ProjectPackage (..)
+                   , SMActual (..), SMTargets (..), SourceMap (..)
+                   , SourceMapHash (..), Target (..), ppRoot
+                   )
+import           Stack.Types.UnusedFlags ( FlagSource (..), UnusedFlags (..) )
+import           System.FilePath ( takeFileName )
+import           System.IO.Error ( isDoesNotExistError )
 
 -- | loads and returns project packages
-projectLocalPackages :: HasEnvConfig env
-              => RIO env [LocalPackage]
+projectLocalPackages :: HasEnvConfig env => RIO env [LocalPackage]
 projectLocalPackages = do
-    sm <- view $ envConfigL.to envConfigSourceMap
-    for (toList $ smProject sm) loadLocalPackage
+  sm <- view $ envConfigL . to (.sourceMap)
+  for (toList sm.project) loadLocalPackage
 
 -- | loads all local dependencies - project packages and local extra-deps
 localDependencies :: HasEnvConfig env => RIO env [LocalPackage]
 localDependencies = do
-    bopts <- view $ configL.to configBuild
-    sourceMap <- view $ envConfigL . to envConfigSourceMap
-    forMaybeM (Map.elems $ smDeps sourceMap) $ \dp ->
-        case dpLocation dp of
-            PLMutable dir -> do
-                pp <- mkProjectPackage YesPrintWarnings dir (shouldHaddockDeps bopts)
-                Just <$> loadLocalPackage pp
-            _ -> pure Nothing
+  bopts <- view $ configL . to (.build)
+  sourceMap <- view $ envConfigL . to (.sourceMap)
+  forMaybeM (Map.elems sourceMap.deps) $ \dp ->
+    case dp.location of
+      PLMutable dir -> do
+        pp <- mkProjectPackage YesPrintWarnings dir (shouldHaddockDeps bopts)
+        Just <$> loadLocalPackage pp
+      _ -> pure Nothing
 
--- | Given the parsed targets and build command line options constructs
---   a source map
-loadSourceMap :: HasBuildConfig env
-              => SMTargets
-              -> BuildOptsCLI
-              -> SMActual DumpedGlobalPackage
-              -> RIO env SourceMap
-loadSourceMap smt boptsCli sma = do
-    bconfig <- view buildConfigL
-    let compiler = smaCompiler sma
-        project = M.map applyOptsFlagsPP $ smaProject sma
-        bopts = configBuild (bcConfig bconfig)
-        applyOptsFlagsPP p@ProjectPackage{ppCommon = c} =
-          p{ppCommon = applyOptsFlags (M.member (cpName c) (smtTargets smt)) True c}
-        deps0 = smtDeps smt <> smaDeps sma
-        deps = M.map applyOptsFlagsDep deps0
-        applyOptsFlagsDep d@DepPackage{dpCommon = c} =
-          d{dpCommon = applyOptsFlags (M.member (cpName c) (smtDeps smt)) False c}
-        applyOptsFlags isTarget isProjectPackage common =
-            let name = cpName common
-                flags = getLocalFlags boptsCli name
-                ghcOptions =
-                  generalGhcOptions bconfig boptsCli isTarget isProjectPackage
-                cabalConfigOpts =
-                  loadCabalConfigOpts bconfig (cpName common) isTarget isProjectPackage
-            in common
-               { cpFlags =
-                     if M.null flags
-                         then cpFlags common
-                         else flags
-               , cpGhcOptions =
-                     ghcOptions ++ cpGhcOptions common
-               , cpCabalConfigOpts =
-                     cabalConfigOpts ++ cpCabalConfigOpts common
-               , cpHaddocks =
-                     if isTarget
-                         then boptsHaddock bopts
-                         else shouldHaddockDeps bopts
-               }
-        packageCliFlags = Map.fromList $
-          mapMaybe maybeProjectFlags $
-          Map.toList (boptsCLIFlags boptsCli)
-        maybeProjectFlags (ACFByName name, fs) = Just (name, fs)
-        maybeProjectFlags _ = Nothing
-        globals = pruneGlobals (smaGlobal sma) (Map.keysSet deps)
-    logDebug "Checking flags"
-    checkFlagsUsedThrowing packageCliFlags FSCommandLine project deps
-    logDebug "SourceMap constructed"
-    pure
-        SourceMap
-        { smTargets = smt
-        , smCompiler = compiler
-        , smProject = project
-        , smDeps = deps
-        , smGlobal = globals
-        }
+-- | Given the parsed targets and build command line options constructs a source
+-- map
+loadSourceMap ::
+     forall env. HasBuildConfig env
+  => SMTargets
+  -> BuildOptsCLI
+  -> SMActual DumpedGlobalPackage
+  -> RIO env SourceMap
+loadSourceMap targets boptsCli sma = do
+  logDebug "Applying and checking flags"
+  let errsPackages = mapMaybe checkPackage packagesWithCliFlags
+  eProject <- mapM applyOptsFlagsPP (M.toList sma.project)
+  eDeps <- mapM applyOptsFlagsDep (M.toList targetsAndSmaDeps)
+  let (errsProject, project') = partitionEithers eProject
+      (errsDeps, deps') = partitionEithers eDeps
+      errs = errsPackages <> errsProject <> errsDeps
+  unless (null errs) $ prettyThrowM $ InvalidFlagSpecification errs
+  let compiler = sma.compiler
+      project = M.fromList project'
+      deps = M.fromList deps'
+      globalPkgs = pruneGlobals sma.globals (Map.keysSet deps)
+  logDebug "SourceMap constructed"
+  pure SourceMap
+    { targets
+    , compiler
+    , project
+    , deps
+    , globalPkgs
+    }
+ where
+  cliFlags = boptsCli.flags
+  targetsAndSmaDeps = targets.deps <> sma.deps
+  packagesWithCliFlags = mapMaybe maybeProjectWithCliFlags $ Map.toList cliFlags
+   where
+    maybeProjectWithCliFlags (ACFByName name, _) = Just name
+    maybeProjectWithCliFlags _ = Nothing
+  checkPackage :: PackageName -> Maybe UnusedFlags
+  checkPackage name =
+    let maybeCommon =
+              fmap (.projectCommon) (Map.lookup name sma.project)
+          <|> fmap (.depCommon) (Map.lookup name targetsAndSmaDeps)
+    in  maybe
+          (Just $ UFNoPackage FSCommandLine name)
+          (const Nothing)
+           maybeCommon
+  applyOptsFlagsPP ::
+       (a, ProjectPackage)
+    -> RIO env (Either UnusedFlags (a, ProjectPackage))
+  applyOptsFlagsPP (name, p@ProjectPackage{ projectCommon = common }) = do
+    let isTarget = M.member common.name targets.targets
+    eCommon <- applyOptsFlags isTarget True common
+    pure $ (\common' -> (name, p { projectCommon = common' })) <$> eCommon
+  applyOptsFlagsDep ::
+       (a, DepPackage)
+    -> RIO env (Either UnusedFlags (a, DepPackage))
+  applyOptsFlagsDep (name, d@DepPackage{ depCommon = common }) = do
+    let isTarget = M.member common.name targets.deps
+    eCommon <- applyOptsFlags isTarget False common
+    pure $ (\common' -> (name, d { depCommon = common' })) <$> eCommon
+  applyOptsFlags ::
+       Bool
+    -> Bool
+    -> CommonPackage
+    -> RIO env (Either UnusedFlags CommonPackage)
+  applyOptsFlags isTarget isProjectPackage common = do
+    let name = common.name
+        cliFlagsByName = Map.findWithDefault Map.empty (ACFByName name) cliFlags
+        cliFlagsAll =
+          Map.findWithDefault Map.empty ACFAllProjectPackages cliFlags
+        noOptsToApply = Map.null cliFlagsByName && Map.null cliFlagsAll
+    (flags, unusedByName, pkgFlags) <- if noOptsToApply
+      then
+        pure (Map.empty, Set.empty, Set.empty)
+      else do
+        gpd <-
+          -- This action is expensive. We want to avoid it if we can.
+          liftIO common.gpd
+        let pkgFlags = Set.fromList $ map C.flagName $ C.genPackageFlags gpd
+            unusedByName = Map.keysSet $ Map.withoutKeys cliFlagsByName pkgFlags
+            cliFlagsAllRelevant =
+              Map.filterWithKey (\k _ -> k `Set.member` pkgFlags) cliFlagsAll
+            flags = cliFlagsByName <> cliFlagsAllRelevant
+        pure (flags, unusedByName, pkgFlags)
+    if Set.null unusedByName
+      -- All flags are defined, nothing to do
+      then do
+        bconfig <- view buildConfigL
+        let bopts = bconfig.config.build
+            ghcOptions =
+              generalGhcOptions bconfig boptsCli isTarget isProjectPackage
+            cabalConfigOpts = generalCabalConfigOpts
+              bconfig
+              boptsCli
+              name
+              isTarget
+              isProjectPackage
+        pure $ Right common
+          { flags =
+              if M.null flags
+                then common.flags
+                else flags
+          , ghcOptions =
+              ghcOptions ++ common.ghcOptions
+          , cabalConfigOpts =
+              cabalConfigOpts ++ common.cabalConfigOpts
+          , buildHaddocks =
+              if isTarget
+                then bopts.buildHaddocks
+                else shouldHaddockDeps bopts
+          }
+      -- Error about the undefined flags
+      else
+        pure $ Left $ UFFlagsNotDefined FSCommandLine name pkgFlags unusedByName
 
--- | Get a 'SourceMapHash' for a given 'SourceMap'
+-- | Get a t'SourceMapHash' for a given t'SourceMap'
 --
 -- Basic rules:
 --
--- * If someone modifies a GHC installation in any way after Stack
---   looks at it, they voided the warranty. This includes installing a
---   brand new build to the same directory, or registering new
---   packages to the global database.
+-- * If someone modifies a GHC installation in any way after Stack looks at it,
+--   they voided the warranty. This includes installing a brand new build to the
+--   same directory, or registering new packages to the global database.
 --
--- * We should include everything in the hash that would relate to
---   immutable packages and identifying the compiler itself. Mutable
---   packages (both project packages and dependencies) will never make
---   it into the snapshot database, and can be ignored.
+-- * We should include everything in the hash that would relate to immutable
+--   packages and identifying the compiler itself. Mutable packages (both
+--   project packages and dependencies) will never make it into the snapshot
+--   database, and can be ignored.
 --
--- * Target information is only relevant insofar as it effects the
---   dependency map. The actual current targets for this build are
---   irrelevant to the cache mechanism, and can be ignored.
+-- * Target information is only relevant insofar as it effects the dependency
+--   map. The actual current targets for this build are irrelevant to the cache
+--   mechanism, and can be ignored.
 --
 -- * Make sure things like profiling and haddocks are included in the hash
 --
-hashSourceMapData
-    :: (HasBuildConfig env, HasCompiler env)
-    => BuildOptsCLI
-    -> SourceMap
-    -> RIO env SourceMapHash
+hashSourceMapData ::
+     (HasBuildConfig env, HasCompiler env)
+  => BuildOptsCLI
+  -> SourceMap
+  -> RIO env SourceMapHash
 hashSourceMapData boptsCli sm = do
-    compilerPath <- getUtf8Builder . fromString . toFilePath <$> getCompilerPath
-    compilerInfo <- getCompilerInfo
-    immDeps <- forM (Map.elems (smDeps sm)) depPackageHashableContent
-    bc <- view buildConfigL
-    let -- extra bytestring specifying GHC options supposed to be applied to
-        -- GHC boot packages so we'll have different hashes when bare
-        -- resolver 'ghc-X.Y.Z' is used, no extra-deps and e.g. user wants builds
-        -- with profiling or without
-        bootGhcOpts = map display (generalGhcOptions bc boptsCli False False)
-        hashedContent = toLazyByteString $ compilerPath <> compilerInfo <>
-            getUtf8Builder (mconcat bootGhcOpts) <> mconcat immDeps
-    pure $ SourceMapHash (SHA256.hashLazyBytes hashedContent)
+  compilerPath <- getUtf8Builder . fromString . toFilePath <$> getCompilerPath
+  compilerInfo <- getCompilerInfo
+  immDeps <- forM (Map.elems sm.deps) depPackageHashableContent
+  bc <- view buildConfigL
+  let -- extra bytestring specifying GHC options supposed to be applied to GHC
+      -- boot packages so we'll have different hashes when bare snapshot
+      -- 'ghc-X.Y.Z' is used, no extra-deps and e.g. user wants builds with
+      -- profiling or without
+      bootGhcOpts = map display (generalGhcOptions bc boptsCli False False)
+      hashedContent =
+           toLazyByteString $ compilerPath
+        <> compilerInfo
+        <> getUtf8Builder (mconcat bootGhcOpts)
+        <> mconcat immDeps
+  pure $ SourceMapHash (SHA256.hashLazyBytes hashedContent)
 
 depPackageHashableContent :: (HasConfig env) => DepPackage -> RIO env Builder
-depPackageHashableContent DepPackage {..} = do
-    case dpLocation of
-        PLMutable _ -> pure ""
-        PLImmutable pli -> do
-            let flagToBs (f, enabled) =
-                    if enabled
-                        then ""
-                        else "-" <> fromString (C.unFlagName f)
-                flags = map flagToBs $ Map.toList (cpFlags dpCommon)
-                ghcOptions = map display (cpGhcOptions dpCommon)
-                cabalConfigOpts = map display (cpCabalConfigOpts dpCommon)
-                haddocks = if cpHaddocks dpCommon then "haddocks" else ""
-                hash = immutableLocSha pli
-            pure $ hash <> haddocks <> getUtf8Builder (mconcat flags) <>
-                getUtf8Builder (mconcat ghcOptions) <>
-                getUtf8Builder (mconcat cabalConfigOpts)
-
--- | All flags for a local package.
-getLocalFlags
-    :: BuildOptsCLI
-    -> PackageName
-    -> Map FlagName Bool
-getLocalFlags boptsCli name = Map.unions
-    [ Map.findWithDefault Map.empty (ACFByName name) cliFlags
-    , Map.findWithDefault Map.empty ACFAllProjectPackages cliFlags
-    ]
-  where
-    cliFlags = boptsCLIFlags boptsCli
+depPackageHashableContent dp =
+  case dp.location of
+    PLMutable _ -> pure ""
+    PLImmutable pli -> do
+      let flagToBs (f, enabled) =
+            (if enabled then "" else "-") <> fromString (C.unFlagName f)
+          flags = map flagToBs $ Map.toList dp.depCommon.flags
+          ghcOptions = map display dp.depCommon.ghcOptions
+          cabalConfigOpts = map display dp.depCommon.cabalConfigOpts
+          haddocks = if dp.depCommon.buildHaddocks then "haddocks" else ""
+          hash = immutableLocSha pli
+      pure
+        $  hash
+        <> haddocks
+        <> getUtf8Builder (mconcat flags)
+        <> getUtf8Builder (mconcat ghcOptions)
+        <> getUtf8Builder (mconcat cabalConfigOpts)
 
 -- | Get the options to pass to @./Setup.hs configure@
-loadCabalConfigOpts :: BuildConfig -> PackageName -> Bool -> Bool -> [Text]
-loadCabalConfigOpts bconfig name isTarget isLocal = concat
-    [ Map.findWithDefault [] CCKEverything (configCabalConfigOpts config)
-    , if isLocal
-        then Map.findWithDefault [] CCKLocals (configCabalConfigOpts config)
-        else []
-    , if isTarget
-        then Map.findWithDefault [] CCKTargets (configCabalConfigOpts config)
-        else []
-    , Map.findWithDefault [] (CCKPackage name) (configCabalConfigOpts config)
-    ]
-  where
-    config = view configL bconfig
+generalCabalConfigOpts ::
+     BuildConfig
+  -> BuildOptsCLI
+  -> PackageName
+  -> Bool
+  -> Bool
+  -> [Text]
+generalCabalConfigOpts bconfig boptsCli name isTarget isLocal = concat
+  [ Map.findWithDefault [] CCKEverything config.cabalConfigOpts
+  , if isLocal
+      then Map.findWithDefault [] CCKLocals config.cabalConfigOpts
+      else []
+  , if isTarget
+      then Map.findWithDefault [] CCKTargets config.cabalConfigOpts
+      else []
+  , Map.findWithDefault [] (CCKPackage name) config.cabalConfigOpts
+  , if includeExtraOptions
+      then boptsCLIAllProgOptions boptsCli
+      else []
+  ]
+ where
+  config = view configL bconfig
+  includeExtraOptions =
+    case config.applyProgOptions of
+      APOTargets -> isTarget
+      APOLocals -> isLocal
+      APOEverything -> True
 
 -- | Get the configured options to pass from GHC, based on the build
 -- configuration and commandline.
 generalGhcOptions :: BuildConfig -> BuildOptsCLI -> Bool -> Bool -> [Text]
 generalGhcOptions bconfig boptsCli isTarget isLocal = concat
-    [ Map.findWithDefault [] AGOEverything (configGhcOptionsByCat config)
-    , if isLocal
-        then Map.findWithDefault [] AGOLocals (configGhcOptionsByCat config)
-        else []
-    , if isTarget
-        then Map.findWithDefault [] AGOTargets (configGhcOptionsByCat config)
-        else []
-    , concat [["-fhpc"] | isLocal && toCoverage (boptsTestOpts bopts)]
-    , if boptsLibProfile bopts || boptsExeProfile bopts
-         then ["-fprof-auto","-fprof-cafs"]
-         else []
-    , if not $ boptsLibStrip bopts || boptsExeStrip bopts
-         then ["-g"]
-         else []
-    , if includeExtraOptions
-         then boptsCLIGhcOptions boptsCli
-         else []
-    ]
-  where
-    bopts = configBuild config
-    config = view configL bconfig
-    includeExtraOptions =
-        case configApplyGhcOptions config of
-            AGOTargets -> isTarget
-            AGOLocals -> isLocal
-            AGOEverything -> True
-
-splitComponents :: [NamedComponent]
-                -> (Set Text, Set Text, Set Text)
-splitComponents =
-    go id id id
-  where
-    go a b c [] = (Set.fromList $ a [], Set.fromList $ b [], Set.fromList $ c [])
-    go a b c (CLib:xs) = go a b c xs
-    go a b c (CInternalLib x:xs) = go (a . (x:)) b c xs
-    go a b c (CExe x:xs) = go (a . (x:)) b c xs
-    go a b c (CTest x:xs) = go a (b . (x:)) c xs
-    go a b c (CBench x:xs) = go a b (c . (x:)) xs
+  [ Map.findWithDefault [] AGOEverything config.ghcOptionsByCat
+  , if isLocal
+      then Map.findWithDefault [] AGOLocals config.ghcOptionsByCat
+      else []
+  , if isTarget
+      then Map.findWithDefault [] AGOTargets config.ghcOptionsByCat
+      else []
+  , concat [["-fhpc"] | isLocal && bopts.testOpts.coverage]
+  , if bopts.libProfile || bopts.exeProfile
+      then ["-fprof-auto", "-fprof-cafs"]
+      else []
+  , [ "-g" | not $ bopts.libStrip || bopts.exeStrip ]
+  , if includeExtraOptions
+      then boptsCli.ghcOptions
+      else []
+  ]
+ where
+  bopts =  config.build
+  config = view configL bconfig
+  includeExtraOptions =
+    case config.applyGhcOptions of
+      AGOTargets -> isTarget
+      AGOLocals -> isLocal
+      AGOEverything -> True
 
+-- | Yield a t'Package' from the settings common to dependency and project
+-- packages.
 loadCommonPackage ::
-       forall env. (HasBuildConfig env, HasSourceMap env)
-    => CommonPackage
-    -> RIO env Package
+     forall env. (HasBuildConfig env, HasSourceMap env)
+  => CommonPackage
+  -> RIO env Package
 loadCommonPackage common = do
-    config <- getPackageConfig (cpFlags common) (cpGhcOptions common) (cpCabalConfigOpts common)
-    gpkg <- liftIO $ cpGPD common
-    pure $ resolvePackage config gpkg
+  (_, _, pkg) <- loadCommonPackage' common
+  pure pkg
+
+loadCommonPackage' ::
+     forall env. (HasBuildConfig env, HasSourceMap env)
+  => CommonPackage
+  -> RIO env (PackageConfig, C.GenericPackageDescription, Package)
+loadCommonPackage' common = do
+  config <-
+    getPackageConfig
+      common.flags
+      common.ghcOptions
+      common.cabalConfigOpts
+  gpkg <- liftIO common.gpd
+  pure (config, gpkg, resolvePackage config gpkg)
 
 -- | Upgrade the initial project package info to a full-blown @LocalPackage@
 -- based on the selected components
 loadLocalPackage ::
-       forall env. (HasBuildConfig env, HasSourceMap env)
-    => ProjectPackage
-    -> RIO env LocalPackage
+     forall env. (HasBuildConfig env, HasSourceMap env)
+  => ProjectPackage
+  -> RIO env LocalPackage
 loadLocalPackage pp = do
-    sm <- view sourceMapL
-    let common = ppCommon pp
-    bopts <- view buildOptsL
-    mcurator <- view $ buildConfigL.to bcCurator
-    config <- getPackageConfig (cpFlags common) (cpGhcOptions common) (cpCabalConfigOpts common)
-    gpkg <- ppGPD pp
-    let name = cpName common
-        mtarget = M.lookup name (smtTargets $ smTargets sm)
-        (exeCandidates, testCandidates, benchCandidates) =
-            case mtarget of
-                Just (TargetComps comps) -> splitComponents $ Set.toList comps
-                Just (TargetAll _packageType) ->
-                    ( packageExes pkg
-                    , if boptsTests bopts && maybe True (Set.notMember name . curatorSkipTest) mcurator
-                        then Map.keysSet (packageTests pkg)
-                        else Set.empty
-                    , if boptsBenchmarks bopts && maybe True (Set.notMember name . curatorSkipBenchmark) mcurator
-                        then packageBenchmarks pkg
-                        else Set.empty
-                    )
-                Nothing -> mempty
+  sm <- view sourceMapL
+  let common = pp.projectCommon
+  bopts <- view buildOptsL
+  mcurator <- view $ buildConfigL . to (.curator)
+  (config, gpkg, pkg) <- loadCommonPackage' common
+  let name = common.name
+      mtarget = M.lookup name sm.targets.targets
+      (exeCandidates, testCandidates, benchCandidates) =
+        case mtarget of
+          Just (TargetComps comps) ->
+            -- Currently, a named library component (a sub-library) cannot be
+            -- specified as a build target.
+            let (_s, e, t, b) = splitComponents $ Set.toList comps
+            in  (e, t, b)
+          Just (TargetAll _packageType) ->
+            ( buildableExes pkg
+            , if    bopts.tests
+                 && maybe True (Set.notMember name . (.skipTest)) mcurator
+                then buildableTestSuites pkg
+                else Set.empty
+            , if    bopts.benchmarks
+                 && maybe
+                      True
+                      (Set.notMember name . (.skipBenchmark))
+                      mcurator
+                then buildableBenchmarks pkg
+                else Set.empty
+            )
+          Nothing -> mempty
 
-        -- See https://github.com/commercialhaskell/stack/issues/2862
-        isWanted = case mtarget of
-            Nothing -> False
-            -- FIXME: When issue #1406 ("stack 0.1.8 lost ability to
-            -- build individual executables or library") is resolved,
-            -- 'hasLibrary' is only relevant if the library is
-            -- part of the target spec.
-            Just _ ->
-              let hasLibrary =
-                    case packageLibraries pkg of
-                      NoLibraries -> False
-                      HasLibraries _ -> True
-               in hasLibrary
-               || not (Set.null nonLibComponents)
-               || not (Set.null $ packageInternalLibraries pkg)
+      -- See https://github.com/commercialhaskell/stack/issues/2862
+      isWanted = case mtarget of
+        Nothing -> False
+        -- FIXME: When issue #1406 ("stack 0.1.8 lost ability to build
+        -- individual executables or library") is resolved, 'hasLibrary' is only
+        -- relevant if the library is part of the target spec.
+        Just _ ->
+             hasBuildableMainLibrary pkg
+          || not (Set.null nonLibComponents)
+          || not (null pkg.subLibraries)
 
-        filterSkippedComponents = Set.filter (not . (`elem` boptsSkipComponents bopts))
+      filterSkippedComponents =
+        Set.filter (not . (`elem` bopts.skipComponents))
 
-        (exes, tests, benches) = (filterSkippedComponents exeCandidates,
-                                  filterSkippedComponents testCandidates,
-                                  filterSkippedComponents benchCandidates)
+      (exes, tests, benches) = ( filterSkippedComponents exeCandidates
+                               , filterSkippedComponents testCandidates
+                               , filterSkippedComponents benchCandidates
+                               )
 
-        nonLibComponents = toComponents exes tests benches
+      nonLibComponents = toComponents exes tests benches
 
-        toComponents e t b = Set.unions
-            [ Set.map CExe e
-            , Set.map CTest t
-            , Set.map CBench b
-            ]
+      toComponents e t b = Set.unions
+        [ Set.map CExe e
+        , Set.map CTest t
+        , Set.map CBench b
+        ]
 
-        btconfig = config
-            { packageConfigEnableTests = not $ Set.null tests
-            , packageConfigEnableBenchmarks = not $ Set.null benches
-            }
-        testconfig = config
-            { packageConfigEnableTests = True
-            , packageConfigEnableBenchmarks = False
-            }
-        benchconfig = config
-            { packageConfigEnableTests = False
-            , packageConfigEnableBenchmarks = True
-            }
+      btconfig = config
+        { enableTests = not $ Set.null tests
+        , enableBenchmarks = not $ Set.null benches
+        }
 
-        -- We resolve the package in 4 different configurations:
-        --
-        -- - pkg doesn't have tests or benchmarks enabled.
-        --
-        -- - btpkg has them enabled if they are present.
-        --
-        -- - testpkg has tests enabled, but not benchmarks.
-        --
-        -- - benchpkg has benchmarks enabled, but not tests.
-        --
-        -- The latter two configurations are used to compute the deps
-        -- when --enable-benchmarks or --enable-tests are configured.
-        -- This allows us to do an optimization where these are passed
-        -- if the deps are present. This can avoid doing later
-        -- unnecessary reconfigures.
-        pkg = resolvePackage config gpkg
-        btpkg
-            | Set.null tests && Set.null benches = Nothing
-            | otherwise = Just (resolvePackage btconfig gpkg)
-        testpkg = resolvePackage testconfig gpkg
-        benchpkg = resolvePackage benchconfig gpkg
+      -- We resolve the package in 2 different configurations:
+      --
+      -- - pkg doesn't have tests or benchmarks enabled.
+      --
+      -- - btpkg has them enabled if they are present.
+      --
+      -- The latter two configurations are used to compute the deps when
+      -- --enable-benchmarks or --enable-tests are configured. This allows us to
+      -- do an optimization where these are passed if the deps are present. This
+      -- can avoid doing later unnecessary reconfigures.
+      btpkg
+        | Set.null tests && Set.null benches = Nothing
+        | otherwise = Just (resolvePackage btconfig gpkg)
 
-    componentFiles <- memoizeRefWith $ fst <$> getPackageFilesForTargets pkg (ppCabalFP pp) nonLibComponents
+  componentFiles <- memoizeRefWith $
+    fst <$> getPackageFilesForTargets pkg pp.cabalFP nonLibComponents
 
-    checkCacheResults <- memoizeRefWith $ do
-      componentFiles' <- runMemoizedWith componentFiles
-      forM (Map.toList componentFiles') $ \(component, files) -> do
-        mbuildCache <- tryGetBuildCache (ppRoot pp) component
-        checkCacheResult <- checkBuildCache
-            (fromMaybe Map.empty mbuildCache)
-            (Set.toList files)
-        pure (component, checkCacheResult)
+  checkCacheResults <- memoizeRefWith $ do
+    componentFiles' <- runMemoizedWith componentFiles
+    forM (Map.toList componentFiles') $ \(component, files) -> do
+      mbuildCache <- tryGetBuildCache (ppRoot pp) component
+      checkCacheResult <- checkBuildCache
+        (fromMaybe Map.empty mbuildCache)
+        (Set.toList files)
+      pure (component, checkCacheResult)
 
-    let dirtyFiles = do
-          checkCacheResults' <- checkCacheResults
-          let allDirtyFiles = Set.unions $ map (\(_, (x, _)) -> x) checkCacheResults'
-          pure $
-            if not (Set.null allDirtyFiles)
-                then let tryStripPrefix y =
-                          fromMaybe y (L.stripPrefix (toFilePath $ ppRoot pp) y)
-                      in Just $ Set.map tryStripPrefix allDirtyFiles
-                else Nothing
-        newBuildCaches =
-            M.fromList . map (\(c, (_, cache)) -> (c, cache))
-            <$> checkCacheResults
+  let dirtyFiles = do
+        checkCacheResults' <- checkCacheResults
+        let allDirtyFiles =
+              Set.unions $ map (\(_, (x, _)) -> x) checkCacheResults'
+        pure $
+          if not (Set.null allDirtyFiles)
+            then let tryStripPrefix y =
+                      fromMaybe y (L.stripPrefix (toFilePath $ ppRoot pp) y)
+                 in  Just $ Set.map tryStripPrefix allDirtyFiles
+            else Nothing
+      newBuildCaches =
+        M.fromList . map (\(c, (_, cache)) -> (c, cache)) <$> checkCacheResults
 
-    pure LocalPackage
-        { lpPackage = pkg
-        , lpTestDeps = dvVersionRange <$> packageDeps testpkg
-        , lpBenchDeps = dvVersionRange <$> packageDeps benchpkg
-        , lpTestBench = btpkg
-        , lpComponentFiles = componentFiles
-        , lpBuildHaddocks = cpHaddocks (ppCommon pp)
-        , lpForceDirty = boptsForceDirty bopts
-        , lpDirtyFiles = dirtyFiles
-        , lpNewBuildCaches = newBuildCaches
-        , lpCabalFile = ppCabalFP pp
-        , lpWanted = isWanted
-        , lpComponents = nonLibComponents
-        -- TODO: refactor this so that it's easier to be sure that these
-        -- components are indeed unbuildable.
-        --
-        -- The reasoning here is that if the STLocalComps specification
-        -- made it through component parsing, but the components aren't
-        -- present, then they must not be buildable.
-        , lpUnbuildable = toComponents
-            (exes `Set.difference` packageExes pkg)
-            (tests `Set.difference` Map.keysSet (packageTests pkg))
-            (benches `Set.difference` packageBenchmarks pkg)
-        }
+  pure LocalPackage
+    { package = pkg
+    , testBench = btpkg
+    , componentFiles
+    , buildHaddocks = pp.projectCommon.buildHaddocks
+    , forceDirty = bopts.forceDirty
+    , dirtyFiles
+    , newBuildCaches
+    , cabalFP = pp.cabalFP
+    , wanted = isWanted
+    , components = nonLibComponents
+      -- TODO: refactor this so that it's easier to be sure that these
+      -- components are indeed unbuildable.
+      --
+      -- The reasoning here is that if the STLocalComps specification made it
+      -- through component parsing, but the components aren't present, then they
+      -- must not be buildable.
+    , unbuildable = toComponents
+        (exes `Set.difference` buildableExes pkg)
+        (tests `Set.difference` buildableTestSuites pkg)
+        (benches `Set.difference` buildableBenchmarks pkg)
+    }
 
 -- | Compare the current filesystem state to the cached information, and
 -- determine (1) if the files are dirty, and (2) the new cache values.
-checkBuildCache :: forall m. (MonadIO m)
-                => Map FilePath FileCacheInfo -- ^ old cache
-                -> [Path Abs File] -- ^ files in package
-                -> m (Set FilePath, Map FilePath FileCacheInfo)
+checkBuildCache ::
+     HasEnvConfig env
+  => FileCache -- ^ old cache
+  -> [Path Abs File] -- ^ files in package
+  -> RIO env (Set FilePath, FileCache)
 checkBuildCache oldCache files = do
-    fileTimes <- liftM Map.fromList $ forM files $ \fp -> do
-        mdigest <- liftIO (getFileDigestMaybe (toFilePath fp))
-        pure (toFilePath fp, mdigest)
-    liftM (mconcat . Map.elems) $ sequence $
-        Map.mergeWithKey
-            (\fp mdigest fci -> Just (go fp mdigest (Just fci)))
-            (Map.mapWithKey (\fp mdigest -> go fp mdigest Nothing))
-            (Map.mapWithKey (\fp fci -> go fp Nothing (Just fci)))
-            fileTimes
-            oldCache
-  where
-    go :: FilePath -> Maybe SHA256 -> Maybe FileCacheInfo -> m (Set FilePath, Map FilePath FileCacheInfo)
-    -- Filter out the cabal_macros file to avoid spurious recompilations
-    go fp _ _ | takeFileName fp == "cabal_macros.h" = pure (Set.empty, Map.empty)
-    -- Common case where it's in the cache and on the filesystem.
-    go fp (Just digest') (Just fci)
-        | fciHash fci == digest' = pure (Set.empty, Map.singleton fp fci)
-        | otherwise = pure (Set.singleton fp, Map.singleton fp $ FileCacheInfo digest')
-    -- Missing file. Add it to dirty files, but no FileCacheInfo.
-    go fp Nothing _ = pure (Set.singleton fp, Map.empty)
-    -- Missing cache. Add it to dirty files and compute FileCacheInfo.
-    go fp (Just digest') Nothing =
-        pure (Set.singleton fp, Map.singleton fp $ FileCacheInfo digest')
+  fileDigests <- fmap Map.fromList $ forM files $ \fp -> do
+    mdigest <- getFileDigestMaybe (toFilePath fp)
+    pure (toFilePath fp, mdigest)
+  fmap (mconcat . Map.elems) $ sequence $
+    Map.merge
+      (Map.mapMissing (\fp mdigest -> go fp mdigest Nothing))
+      (Map.mapMissing (\fp fci -> go fp Nothing (Just fci)))
+      (Map.zipWithMatched (\fp mdigest fci -> go fp mdigest (Just fci)))
+      fileDigests
+      oldCache
+ where
+  go ::
+       FilePath
+    -> Maybe SHA256
+    -> Maybe FileCacheInfo
+    -> RIO env (Set FilePath, FileCache)
+  -- Filter out the cabal_macros file to avoid spurious recompilations
+  go fp _ _ | takeFileName fp == "cabal_macros.h" = pure (Set.empty, Map.empty)
+  -- Common case where it's in the cache and on the filesystem.
+  go fp (Just digest') (Just fci)
+      | fci.hash == digest' = pure (Set.empty, Map.singleton fp fci)
+      | otherwise =
+          pure (Set.singleton fp, Map.singleton fp $ FileCacheInfo digest')
+  -- Missing file. Add it to dirty files, but no FileCacheInfo.
+  go fp Nothing _ = pure (Set.singleton fp, Map.empty)
+  -- Missing cache. Add it to dirty files and compute FileCacheInfo.
+  go fp (Just digest') Nothing =
+    pure (Set.singleton fp, Map.singleton fp $ FileCacheInfo digest')
 
--- | Returns entries to add to the build cache for any newly found unlisted modules
-addUnlistedToBuildCache
-    :: HasEnvConfig env
-    => Package
-    -> Path Abs File
-    -> Set NamedComponent
-    -> Map NamedComponent (Map FilePath a)
-    -> RIO env (Map NamedComponent [Map FilePath FileCacheInfo], [PackageWarning])
+-- | Returns entries to add to the build cache for any newly found unlisted
+-- modules
+addUnlistedToBuildCache ::
+     HasEnvConfig env
+  => Package
+  -> Path Abs File
+  -> Set NamedComponent
+  -> Map NamedComponent (Map FilePath a)
+  -> RIO env (Map NamedComponent [FileCache], [PackageWarning])
 addUnlistedToBuildCache pkg cabalFP nonLibComponents buildCaches = do
-    (componentFiles, warnings) <- getPackageFilesForTargets pkg cabalFP nonLibComponents
-    results <- forM (M.toList componentFiles) $ \(component, files) -> do
-        let buildCache = M.findWithDefault M.empty component buildCaches
-            newFiles =
-                Set.toList $
-                Set.map toFilePath files `Set.difference` Map.keysSet buildCache
-        addBuildCache <- mapM addFileToCache newFiles
-        pure ((component, addBuildCache), warnings)
-    pure (M.fromList (map fst results), concatMap snd results)
-  where
-    addFileToCache fp = do
-        mdigest <- getFileDigestMaybe fp
-        case mdigest of
-            Nothing -> pure Map.empty
-            Just digest' -> pure . Map.singleton fp $ FileCacheInfo digest'
+  (componentFiles, warnings) <-
+    getPackageFilesForTargets pkg cabalFP nonLibComponents
+  results <- forM (M.toList componentFiles) $ \(component, files) -> do
+    let buildCache = M.findWithDefault M.empty component buildCaches
+        newFiles =
+            Set.toList $
+            Set.map toFilePath files `Set.difference` Map.keysSet buildCache
+    addBuildCache <- mapM addFileToCache newFiles
+    pure ((component, addBuildCache), warnings)
+  pure (M.fromList (map fst results), concatMap snd results)
+ where
+  addFileToCache fp =
+    getFileDigestMaybe fp >>= \case
+      Nothing -> pure Map.empty
+      Just digest' -> pure $ Map.singleton fp $ FileCacheInfo digest'
 
 -- | Gets list of Paths for files relevant to a set of components in a package.
---   Note that the library component, if any, is always automatically added to the
---   set of components.
-getPackageFilesForTargets
-    :: HasEnvConfig env
-    => Package
-    -> Path Abs File
-    -> Set NamedComponent
-    -> RIO env (Map NamedComponent (Set (Path Abs File)), [PackageWarning])
+-- Note that the library component, if any, is always automatically added to the
+-- set of components.
+getPackageFilesForTargets ::
+     HasEnvConfig env
+  => Package
+  -> Path Abs File
+  -> Set NamedComponent
+  -> RIO env (Map NamedComponent (Set (Path Abs File)), [PackageWarning])
 getPackageFilesForTargets pkg cabalFP nonLibComponents = do
-    (components',compFiles,otherFiles,warnings) <-
-        getPackageFiles (packageFiles pkg) cabalFP
-    let necessaryComponents = Set.insert CLib $ Set.filter isCInternalLib (M.keysSet components')
-        components = necessaryComponents `Set.union` nonLibComponents
-        componentsFiles =
-            M.map (\files -> Set.union otherFiles (Set.map dotCabalGetPath $ Set.fromList files)) $
-                M.filterWithKey (\component _ -> component `elem` components) compFiles
-    pure (componentsFiles, warnings)
+  PackageComponentFile components' compFiles otherFiles warnings <-
+    getPackageFile pkg cabalFP
+  let necessaryComponents =
+        Set.insert CLib $ Set.filter isCSubLib (M.keysSet components')
+      components = necessaryComponents `Set.union` nonLibComponents
+      componentsFiles = M.map
+        (\files ->
+           Set.union otherFiles (Set.map dotCabalGetPath $ Set.fromList files)
+        )
+        $ M.filterWithKey (\component _ -> component `elem` components) compFiles
+  pure (componentsFiles, warnings)
 
 -- | Get file digest, if it exists
-getFileDigestMaybe :: MonadIO m => FilePath -> m (Maybe SHA256)
+getFileDigestMaybe :: HasEnvConfig env => FilePath -> RIO env (Maybe SHA256)
 getFileDigestMaybe fp = do
-    liftIO
-        (catch
-             (liftM Just . withSourceFile fp $ getDigest)
-             (\e ->
-                   if isDoesNotExistError e
-                       then pure Nothing
-                       else throwM e))
-  where
-    getDigest src = runConduit $ src .| getZipSink (ZipSink SHA256.sinkHash)
+  cache <- view $ envConfigL . to (.fileDigestCache)
+  catch
+    (Just <$> readFileDigest cache fp)
+    (\e -> if isDoesNotExistError e then pure Nothing else throwM e)
 
--- | Get 'PackageConfig' for package given its name.
-getPackageConfig
-  :: (HasBuildConfig env, HasSourceMap env)
+-- | Get t'PackageConfig' for package given its name.
+getPackageConfig ::
+     (HasBuildConfig env, HasSourceMap env)
   => Map FlagName Bool
   -> [Text] -- ^ GHC options
   -> [Text] -- ^ cabal config opts
@@ -494,11 +588,11 @@ getPackageConfig flags ghcOptions cabalConfigOpts = do
   platform <- view platformL
   compilerVersion <- view actualCompilerVersionL
   pure PackageConfig
-    { packageConfigEnableTests = False
-    , packageConfigEnableBenchmarks = False
-    , packageConfigFlags = flags
-    , packageConfigGhcOptions = ghcOptions
-    , packageConfigCabalConfigOpts = cabalConfigOpts
-    , packageConfigCompilerVersion = compilerVersion
-    , packageConfigPlatform = platform
+    { enableTests = False
+    , enableBenchmarks = False
+    , flags = flags
+    , ghcOptions = ghcOptions
+    , cabalConfigOpts = cabalConfigOpts
+    , compilerVersion = compilerVersion
+    , platform = platform
     }
diff --git a/src/Stack/Build/Target.hs b/src/Stack/Build/Target.hs
index aa1c105aac..72ac490e26 100644
--- a/src/Stack/Build/Target.hs
+++ b/src/Stack/Build/Target.hs
@@ -1,114 +1,132 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE GADTs               #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections       #-}
-{-# LANGUAGE ViewPatterns        #-}
-
--- | Parsing command line targets
---
--- There are two relevant data sources for performing this parsing:
--- the project configuration, and command line arguments. Project
--- configurations includes the resolver (defining a LoadedSnapshot of
--- global and snapshot packages), local dependencies, and project
--- packages. It also defines local flag overrides.
---
--- The command line arguments specify both additional local flag
--- overrides and targets in their raw form.
---
--- Flags are simple: we just combine CLI flags with config flags and
--- make one big map of flags, preferring CLI flags when present.
---
--- Raw targets can be a package name, a package name with component,
--- just a component, or a package name and version number. We first
--- must resolve these raw targets into both simple targets and
--- additional dependencies. This works as follows:
---
--- * If a component is specified, find a unique project package which
---   defines that component, and convert it into a name+component
---   target.
---
--- * Ensure that all name+component values refer to valid components
---   in the given project package.
---
--- * For names, check if the name is present in the snapshot, local
---   deps, or project packages. If it is not, then look up the most
---   recent version in the package index and convert to a
---   name+version.
---
--- * For name+version, first ensure that the name is not used by a
---   project package. Next, if that name+version is present in the
---   snapshot or local deps _and_ its location is PLIndex, we have the
---   package. Otherwise, add to local deps with the appropriate
---   PLIndex.
---
--- If in either of the last two bullets we added a package to local
--- deps, print a warning to the user recommending modifying the
--- extra-deps.
---
--- Combine the various 'ResolveResults's together into 'Target'
--- values, by combining various components for a single package and
--- ensuring that no conflicting statements were made about targets.
---
--- At this point, we now have a Map from package name to SimpleTarget,
--- and an updated Map of local dependencies. We still have the
--- aggregated flags, and the snapshot and project packages.
---
--- Finally, we upgrade the snapshot by using
--- calculatePackagePromotion.
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE MultiWayIf            #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE ViewPatterns          #-}
+
+{-|
+Module      : Stack.Build.Target
+Description : Parsing command line targets.
+License     : BSD-3-Clause
+
+Parsing command line targets
+
+There are two relevant data sources for performing this parsing: the project
+configuration, and command line arguments. Project configurations includes the
+snapshot (defining a LoadedSnapshot of global and snapshot packages), local
+dependencies, and project packages. It also defines local flag overrides.
+
+The command line arguments specify both additional local flag overrides and
+targets in their raw form.
+
+Flags are simple: we just combine CLI flags with config flags and make one big
+map of flags, preferring CLI flags when present.
+
+Raw targets can be a package name, a package name with component, just a
+component, or a package name and version number. We first must resolve these raw
+targets into both simple targets and additional dependencies. This works as
+follows:
+
+* If a component is specified, find a unique project package which defines that
+  component, and convert it into a name+component target.
+
+* Ensure that all name+component values refer to valid components in the given
+  project package.
+
+* For names, check if the name is present in the snapshot, local deps, or
+  project packages. If it is not, then look up the most recent version in the
+  package index and convert to a name+version.
+
+* For name+version, first ensure that the name is not used by a project
+  package. Next, if that name+version is present in the snapshot or local deps
+  _and_ its location is PLIndex, we have the package. Otherwise, add to local
+  deps with the appropriate PLIndex.
+
+If in either of the last two bullets we added a package to local deps, print a
+warning to the user recommending modifying the extra-deps.
+
+Combine the various t'ResolveResult's together into t'Target' values, by
+combining various components for a single package and ensuring that no
+conflicting statements were made about targets.
+
+At this point, we now have a Map from package name to SimpleTarget, and an
+updated Map of local dependencies. We still have the aggregated flags, and the
+snapshot and project packages.
+
+Finally, we upgrade the snapshot by using calculatePackagePromotion.
+-}
+
 module Stack.Build.Target
-    ( -- * Types
-      Target (..)
-    , NeedTargets (..)
-    , PackageType (..)
-    , parseTargets
-      -- * Convenience helpers
-    , gpdVersion
-      -- * Test suite exports
-    , parseRawTarget
-    , RawTarget (..)
-    , UnresolvedComponent (..)
-    ) where
+  ( -- * Types
+    Target (..)
+  , NeedTargets (..)
+  , parseTargets
+    -- * Convenience helpers
+  , gpdVersion
+    -- * Test suite exports
+  , parseRawTarget
+  , RawTarget (..)
+  , UnresolvedComponent (..)
+  , ComponentName
+  , ResolveResult
+  ) where
 
-import           Stack.Prelude
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 import qualified Data.Text as T
-import           Path
-import           Path.Extra (rejectMissingDir)
-import           Path.IO
-import           RIO.Process (HasProcessContext)
-import           Stack.SourceMap
-import           Stack.Types.Config
+import           Path ( isProperPrefixOf )
+import           Path.Extra ( forgivingResolveDir, rejectMissingDir )
+import           Path.IO ( getCurrentDir )
+import           RIO.Process ( HasProcessContext )
+import           Stack.SourceMap ( additionalDepPackage )
+import           Stack.Prelude
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.BuildOptsCLI ( BuildOptsCLI (..) )
+import           Stack.Types.ComponentUtils ( unqualCompFromText )
+import           Stack.Types.Config ( Config (..) )
 import           Stack.Types.NamedComponent
-import           Stack.Types.Build
+                   ( NamedComponent (..), renderComponent )
+import           Stack.Types.Build.Exception ( BuildPrettyException (..) )
+import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
 import           Stack.Types.SourceMap
+                   ( DepPackage (..), GlobalPackage (..), PackageType (..)
+                   , ProjectPackage, SMActual (..), SMTargets (..)
+                   , SMWanted (..), Target (..), ppComponents, ppRoot
+                   )
 
 -- | Do we need any targets? For example, `stack build` will fail if
 -- no targets are provided.
-data NeedTargets = NeedTargets | AllowNoTargets
+data NeedTargets
+  = NeedTargets
+  | AllowNoTargets
 
----------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 -- Get the RawInput
----------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 -- | Raw target information passed on the command line.
-newtype RawInput = RawInput { unRawInput :: Text }
+newtype RawInput = RawInput { rawInput :: Text }
 
-getRawInput :: BuildOptsCLI -> Map PackageName ProjectPackage -> ([Text], [RawInput])
+getRawInput ::
+     BuildOptsCLI
+  -> Map PackageName ProjectPackage
+  -> ([Text], [RawInput])
 getRawInput boptscli locals =
-    let textTargets' = boptsCLITargets boptscli
-        textTargets =
-            -- Handle the no targets case, which means we pass in the names of all project packages
-            if null textTargets'
-                then map (T.pack . packageNameString) (Map.keys locals)
-                else textTargets'
-     in (textTargets', map RawInput textTargets)
-
----------------------------------------------------------------------------------
+  let textTargets' = boptscli.targetsCLI
+      textTargets =
+        -- Handle the no targets case, which means we pass in the names of all
+        -- project packages
+        if null textTargets'
+          then map (T.pack . packageNameString) (Map.keys locals)
+          else textTargets'
+  in  (textTargets', map RawInput textTargets)
+
+--------------------------------------------------------------------------------
 -- Turn RawInput into RawTarget
----------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 -- | The name of a component, which applies to executables, test
 -- suites, and benchmarks
@@ -117,337 +135,445 @@ type ComponentName = Text
 -- | Either a fully resolved component, or a component name that could be
 -- either an executable, test, or benchmark
 data UnresolvedComponent
-    = ResolvedComponent !NamedComponent
-    | UnresolvedComponent !ComponentName
-    deriving (Show, Eq, Ord)
+  = ResolvedComponent !NamedComponent
+  | UnresolvedComponent !ComponentName
+  deriving (Eq, Ord, Show)
 
 -- | Raw command line input, without checking against any databases or list of
 -- locals. Does not deal with directories
 data RawTarget
-    = RTPackageComponent !PackageName !UnresolvedComponent
-    | RTComponent !ComponentName
-    | RTPackage !PackageName
-    -- Explicitly _not_ supporting revisions on the command line. If
-    -- you want that, you should be modifying your stack.yaml! (In
-    -- fact, you should probably do that anyway, we're just letting
-    -- people be lazy, since we're Haskeletors.)
-    | RTPackageIdentifier !PackageIdentifier
-  deriving (Show, Eq)
+  = RTPackageComponent !PackageName !UnresolvedComponent
+  | RTComponent !ComponentName
+  | RTPackage !PackageName
+    -- Explicitly _not_ supporting revisions on the command line. If you want
+    -- that, you should be modifying your stack.yaml! (In fact, you should
+    -- probably do that anyway, we're just letting people be lazy, since we're
+    -- Haskeletors.)
+  | RTPackageIdentifier !PackageIdentifier
+  deriving (Eq, Show)
 
 -- | Same as @parseRawTarget@, but also takes directories into account.
-parseRawTargetDirs :: MonadIO m
-                   => Path Abs Dir -- ^ current directory
-                   -> Map PackageName ProjectPackage
-                   -> RawInput -- ^ raw target information from the commandline
-                   -> m (Either Text [(RawInput, RawTarget)])
+parseRawTargetDirs ::
+     MonadIO m
+  => Path Abs Dir -- ^ current directory
+  -> Map PackageName ProjectPackage
+  -> RawInput -- ^ raw target information from the commandline
+  -> m (Either StyleDoc [(RawInput, RawTarget)])
 parseRawTargetDirs root locals ri =
-    case parseRawTarget t of
-        Just rt -> pure $ Right [(ri, rt)]
-        Nothing -> do
-            mdir <- liftIO $ forgivingAbsence (resolveDir root (T.unpack t))
-              >>= rejectMissingDir
-            case mdir of
-                Nothing -> pure $ Left $ "Directory not found: " `T.append` t
-                Just dir ->
-                    case mapMaybe (childOf dir) $ Map.toList locals of
-                        [] -> pure $ Left $
-                            "No local directories found as children of " `T.append`
-                            t
-                        names -> pure $ Right $ map ((ri, ) . RTPackage) names
-  where
-    childOf dir (name, pp) =
-        if dir == ppRoot pp || isProperPrefixOf dir (ppRoot pp)
-            then Just name
-            else Nothing
-
-    RawInput t = ri
+  case parseRawTarget t of
+    Just rt -> pure $ Right [(ri, rt)]
+    Nothing -> do
+      forgivingResolveDir root (T.unpack t) >>= rejectMissingDir >>= \case
+        Nothing -> pure $ Left $
+          if | T.isPrefixOf "stack-yaml=" t -> projectOptionTypo
+             | T.isSuffixOf ".yaml" t -> projectYamlExtTypo
+             | otherwise ->
+                fillSep
+                  [ flow "Directory not found:"
+                  , style Dir (fromString $ T.unpack t) <> "."
+                  ]
+        Just dir ->
+          case mapMaybe (childOf dir) $ Map.toList locals of
+            [] -> pure $ Left $
+              fillSep
+                [ style Dir (fromString $ T.unpack t)
+                , flow "is not a local directory for a package and it is not a \
+                       \parent directory of any such directory."
+                ]
+            names -> pure $ Right $ map ((ri, ) . RTPackage) names
+ where
+  childOf dir (name, pp) =
+    if dir == ppRoot pp || isProperPrefixOf dir (ppRoot pp)
+      then Just name
+      else Nothing
+
+  RawInput t = ri
+
+  projectOptionTypo :: StyleDoc
+  projectOptionTypo = let o = "stack-yaml=" in projectTypo 2 (length o) o
+
+  projectYamlExtTypo :: StyleDoc
+  projectYamlExtTypo = let o = "stack-yaml " in projectTypo (2 + length o) 0 o
+
+  projectTypo :: Int -> Int -> String -> StyleDoc
+  projectTypo padLength dropLength option =
+    vsep
+      [ style Dir (fromString (replicate padLength ' ') <> fromString (T.unpack t))
+        <> " is not a directory."
+      , style Highlight (fromString $ "--" <> option)
+        <> style Dir (fromString . drop dropLength $ T.unpack t)
+        <> " might work as a project option."
+      ]
 
 -- | If this function returns @Nothing@, the input should be treated as a
 -- directory.
 parseRawTarget :: Text -> Maybe RawTarget
 parseRawTarget t =
-        (RTPackageIdentifier <$> parsePackageIdentifier s)
-    <|> (RTPackage <$> parsePackageName s)
-    <|> (RTComponent <$> T.stripPrefix ":" t)
-    <|> parsePackageComponent
-  where
-    s = T.unpack t
-
-    parsePackageComponent =
-        case T.splitOn ":" t of
-            [pname, "lib"]
-                | Just pname' <- parsePackageName (T.unpack pname) ->
-                    Just $ RTPackageComponent pname' $ ResolvedComponent CLib
-            [pname, cname]
-                | Just pname' <- parsePackageName (T.unpack pname) ->
-                    Just $ RTPackageComponent pname' $ UnresolvedComponent cname
-            [pname, typ, cname]
-                | Just pname' <- parsePackageName (T.unpack pname)
-                , Just wrapper <- parseCompType typ ->
-                    Just $ RTPackageComponent pname' $ ResolvedComponent $ wrapper cname
-            _ -> Nothing
-
-    parseCompType t' =
-        case t' of
-            "exe" -> Just CExe
-            "test" -> Just CTest
-            "bench" -> Just CBench
-            _ -> Nothing
-
----------------------------------------------------------------------------------
+      (RTPackageIdentifier <$> parsePackageIdentifier s)
+  <|> (RTPackage <$> parsePackageName s)
+  <|> (RTComponent <$> T.stripPrefix ":" t)
+  <|> parsePackageComponent
+ where
+  s = T.unpack t
+
+  parsePackageComponent =
+    case T.splitOn ":" t of
+      [pname, "lib"]
+        | Just pname' <- parsePackageName (T.unpack pname) ->
+            Just $ RTPackageComponent pname' $ ResolvedComponent CLib
+      [pname, cname]
+        | Just pname' <- parsePackageName (T.unpack pname) ->
+            Just $ RTPackageComponent pname' $ UnresolvedComponent cname
+      [pname, typ, cname]
+        | Just pname' <- parsePackageName (T.unpack pname)
+        , Just wrapper <- parseCompType typ ->
+            Just $ RTPackageComponent pname' $ ResolvedComponent $ wrapper cname
+      _ -> Nothing
+
+  parseCompType t' =
+    case t' of
+      "exe" -> Just (CExe . unqualCompFromText)
+      "test" -> Just (CTest . unqualCompFromText)
+      "bench" -> Just (CBench . unqualCompFromText)
+      _ -> Nothing
+
+--------------------------------------------------------------------------------
 -- Resolve the raw targets
----------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
+-- | A type representing results of resolving a raw target.
 data ResolveResult = ResolveResult
-  { rrName :: !PackageName
-  , rrRaw :: !RawInput
-  , rrComponent :: !(Maybe NamedComponent)
-  -- ^ Was a concrete component specified?
-  , rrAddedDep :: !(Maybe PackageLocationImmutable)
-  -- ^ Only if we're adding this as a dependency
-  , rrPackageType :: !PackageType
+  { name :: !PackageName
+  , rawInput :: !RawInput
+  , component :: !(Maybe NamedComponent)
+    -- ^ Was a concrete component specified?
+  , addedDep :: !(Maybe PackageLocationImmutable)
+    -- ^ Only if we're adding this as a dependency
+  , packageType :: !PackageType
   }
 
--- | Convert a 'RawTarget' into a 'ResolveResult' (see description on
--- the module).
+-- | Convert a 'RawTarget' into a t'ResolveResult' (see description on the
+-- module).
 resolveRawTarget ::
-       (HasLogFunc env, HasPantryConfig env, HasProcessContext env)
-    => SMActual GlobalPackage
-    -> Map PackageName PackageLocation
-    -> (RawInput, RawTarget)
-    -> RIO env (Either Text ResolveResult)
-resolveRawTarget sma allLocs (ri, rt) =
+     (HasLogFunc env, HasPantryConfig env, HasProcessContext env)
+  => SMActual GlobalPackage
+  -> Map PackageName PackageLocation
+  -> (RawInput, RawTarget)
+  -> RIO env (Either StyleDoc ResolveResult)
+resolveRawTarget sma allLocs (rawInput, rt) =
   go rt
-  where
-    locals = smaProject sma
-    deps = smaDeps sma
-    globals = smaGlobal sma
-    -- Helper function: check if a 'NamedComponent' matches the given 'ComponentName'
-    isCompNamed :: ComponentName -> NamedComponent -> Bool
-    isCompNamed _ CLib = False
-    isCompNamed t1 (CInternalLib t2) = t1 == t2
-    isCompNamed t1 (CExe t2) = t1 == t2
-    isCompNamed t1 (CTest t2) = t1 == t2
-    isCompNamed t1 (CBench t2) = t1 == t2
-
-    go (RTComponent cname) = do
-        -- Associated list from component name to package that defines
-        -- it. We use an assoc list and not a Map so we can detect
-        -- duplicates.
-        allPairs <- fmap concat $ flip Map.traverseWithKey locals
-          $ \name pp -> do
-              comps <- ppComponents pp
-              pure $ map (name, ) $ Set.toList comps
-        pure $ case filter (isCompNamed cname . snd) allPairs of
-                [] -> Left $ cname `T.append` " doesn't seem to be a local target. Run 'stack ide targets' for a list of available targets"
-                [(name, comp)] -> Right ResolveResult
-                  { rrName = name
-                  , rrRaw = ri
-                  , rrComponent = Just comp
-                  , rrAddedDep = Nothing
-                  , rrPackageType = PTProject
-                  }
-                matches -> Left $ T.concat
-                    [ "Ambiguous component name "
-                    , cname
-                    , ", matches: "
-                    , T.pack $ show matches
-                    ]
-    go (RTPackageComponent name ucomp) =
-        case Map.lookup name locals of
-            Nothing -> pure $ Left $ T.pack $ "Unknown local package: " ++ packageNameString name
-            Just pp -> do
-                comps <- ppComponents pp
-                pure $ case ucomp of
-                    ResolvedComponent comp
-                        | comp `Set.member` comps -> Right ResolveResult
-                            { rrName = name
-                            , rrRaw = ri
-                            , rrComponent = Just comp
-                            , rrAddedDep = Nothing
-                            , rrPackageType = PTProject
-                            }
-                        | otherwise -> Left $ T.pack $ concat
-                            [ "Component "
-                            , show comp
-                            , " does not exist in package "
-                            , packageNameString name
-                            ]
-                    UnresolvedComponent comp ->
-                        case filter (isCompNamed comp) $ Set.toList comps of
-                            [] -> Left $ T.concat
-                                [ "Component "
-                                , comp
-                                , " does not exist in package "
-                                , T.pack $ packageNameString name
-                                ]
-                            [x] -> Right ResolveResult
-                              { rrName = name
-                              , rrRaw = ri
-                              , rrComponent = Just x
-                              , rrAddedDep = Nothing
-                              , rrPackageType = PTProject
-                              }
-                            matches -> Left $ T.concat
-                                [ "Ambiguous component name "
-                                , comp
-                                , " for package "
-                                , T.pack $ packageNameString name
-                                , ": "
-                                , T.pack $ show matches
-                                ]
-
-    go (RTPackage name)
-      | Map.member name locals = pure $ Right ResolveResult
-          { rrName = name
-          , rrRaw = ri
-          , rrComponent = Nothing
-          , rrAddedDep = Nothing
-          , rrPackageType = PTProject
-          }
-      | Map.member name deps =
-          pure $ deferToConstructPlan name
-      | Just gp <- Map.lookup name globals =
-          case gp of
-              GlobalPackage _ -> pure $ deferToConstructPlan name
-              ReplacedGlobalPackage _ -> hackageLatest name
-      | otherwise = hackageLatest name
-
-    -- Note that we use getLatestHackageRevision below, even though it's
-    -- non-reproducible, to avoid user confusion. In any event,
-    -- reproducible builds should be done by updating your config
-    -- files!
-
-    go (RTPackageIdentifier ident@(PackageIdentifier name version))
-      | Map.member name locals = pure $ Left $ T.concat
-            [ tshow (packageNameString name)
-            , " target has a specific version number, but it is a local package."
-            , "\nTo avoid confusion, we will not install the specified version or build the local one."
-            , "\nTo build the local package, specify the target without an explicit version."
-            ]
-      | otherwise =
-          case Map.lookup name allLocs of
-            -- Installing it from the package index, so we're cool
-            -- with overriding it if necessary
-            Just (PLImmutable (PLIHackage (PackageIdentifier _name versionLoc) _cfKey _treeKey)) ->
+ where
+  locals = sma.project
+  deps = sma.deps
+  globals = sma.globals
+  -- Helper function: check if a 'NamedComponent' matches the given
+  -- 'ComponentName'
+  isCompNamed :: ComponentName -> NamedComponent -> Bool
+  isCompNamed _ CLib = False
+  isCompNamed _ CInst{} = False
+  isCompNamed t1 t2 = case t2 of
+    (CSubLib t2') -> t1' == t2'
+    (CExe t2') -> t1' == t2'
+    (CFlib t2') -> t1' == t2'
+    (CTest t2') -> t1' == t2'
+    (CBench t2') -> t1' == t2'
+   where
+    t1' = unqualCompFromText t1
+
+  go (RTComponent cname) = do
+    -- Associated list from component name to package that defines it. We use an
+    -- assoc list and not a Map so we can detect duplicates.
+    allPairs <- fmap concat $ flip Map.traverseWithKey locals
+      $ \name pp -> do
+          comps <- ppComponents pp
+          pure $ map (name, ) $ Set.toList comps
+    pure $ case filter (isCompNamed cname . snd) allPairs of
+      [] -> Left $
+        fillSep
+          [ style Target . fromString . T.unpack $ cname
+          , flow "doesn't seem to be a local target. Run"
+          , style Shell $ flow "stack ide targets"
+          , flow "for a list of available targets."
+          ]
+      [(name, component)] -> Right ResolveResult
+        { name
+        , rawInput
+        , component = Just component
+        , addedDep = Nothing
+        , packageType = PTProject
+        }
+      matches -> Left $
+           fillSep
+             [ flow "Ambiguous component name"
+             , style Target (fromString $ T.unpack cname) <> ","
+             , "matches:"
+             ]
+        <> line
+        <> bulletedList
+             ( map
+                 ( \(pn, nc) -> fillSep
+                     [ "component"
+                     , style
+                         PkgComponent
+                         (fromString $ T.unpack $ renderComponent nc)
+                     , flow "of package"
+                     , style PkgComponent (fromPackageName pn)
+                     ]
+                 )
+                 matches
+             )
+
+  go (RTPackageComponent name ucomp) =
+    case Map.lookup name locals of
+      Nothing -> pure $ Left $
+        fillSep
+          [ flow "Unknown project package:"
+          , style Target (fromPackageName name) <> "."
+          ]
+      Just pp -> do
+        comps <- ppComponents pp
+        pure $ case ucomp of
+          ResolvedComponent component
+            | component `Set.member` comps -> Right ResolveResult
+                { name
+                , rawInput
+                , component = Just component
+                , addedDep = Nothing
+                , packageType = PTProject
+                }
+            | otherwise -> Left $
+                fillSep
+                  [ "Component"
+                  , style
+                      Target
+                      (fromString $ T.unpack $ renderComponent component)
+                  , flow "does not exist in package"
+                  , style Target (fromPackageName name) <> "."
+                  ]
+          UnresolvedComponent comp' ->
+            case filter (isCompNamed comp') $ Set.toList comps of
+              [] -> Left $
+                fillSep
+                  [ "Component"
+                  , style Target (fromString $ T.unpack comp')
+                  , flow "does not exist in package"
+                  , style Target (fromPackageName name) <> "."
+                  ]
+              [component] -> Right ResolveResult
+                { name
+                , rawInput
+                , component = Just component
+                , addedDep = Nothing
+                , packageType = PTProject
+                }
+              matches -> Left $
+                fillSep
+                  [ flow "Ambiguous component name"
+                  , style Target (fromString $ T.unpack comp')
+                  , flow "for package"
+                  , style Target (fromPackageName name)
+                  , flow "matches components:"
+                  , fillSep $
+                      mkNarrativeList (Just PkgComponent) False
+                        (map ncToStyleDoc matches)
+                  ]
+   where
+    ncToStyleDoc :: NamedComponent -> StyleDoc
+    ncToStyleDoc = fromString . T.unpack . renderComponent
+
+  go (RTPackage name)
+    | Map.member name locals = pure $ Right ResolveResult
+        { name
+        , rawInput
+        , component = Nothing
+        , addedDep = Nothing
+        , packageType = PTProject
+        }
+    | Map.member name deps =
+        pure $ deferToConstructPlan name
+    | Just gp <- Map.lookup name globals =
+        case gp of
+          GlobalPackage _ -> pure $ deferToConstructPlan name
+          ReplacedGlobalPackage _ -> hackageLatest name
+    | otherwise = hackageLatest name
+
+  -- Note that we use getLatestHackageRevision below, even though it's
+  -- non-reproducible, to avoid user confusion. In any event, reproducible
+  -- builds should be done by updating your config files!
+
+  go (RTPackageIdentifier ident@(PackageIdentifier name version))
+    | Map.member name locals = pure $ Left $
+        fillSep
+          [ style Target (fromPackageId ident)
+          , flow "is a specific package version, but"
+          , style Target (fromPackageName name)
+          , flow "is the name of a project package. To avoid confusion, Stack \
+                 \will not try to build the specified version or the project \
+                 \package. To build the project package, specify only"
+          , style Current (fromPackageName name) <> "."
+          ]
+    | otherwise =
+        case Map.lookup name allLocs of
+          -- Installing it from the package index, so we're cool with overriding
+          -- it if necessary
+          Just
+            ( PLImmutable
+                ( PLIHackage
+                    (PackageIdentifier _name versionLoc) _cfKey _treeKey
+                )
+            ) ->
               if version == versionLoc
-              then pure $ deferToConstructPlan name
-              else hackageLatestRevision name version
-            -- The package was coming from something besides the
-            -- index, so refuse to do the override
-            Just loc' -> pure $ Left $ T.concat
-              [ "Package with identifier was targeted on the command line: "
-              , T.pack $ packageIdentifierString ident
-              , ", but it was specified from a non-index location: "
-              , T.pack $ show loc'
-              , ".\nRecommendation: add the correctly desired version to extra-deps."
+                then pure $ deferToConstructPlan name
+                else hackageLatestRevision name version versionLoc
+          -- The package was coming from something besides the index, so refuse
+          -- to do the override
+          Just loc' -> pure $ Left $
+            fillSep
+              [ style Target (fromPackageId ident)
+              , flow "was specified from a non-index location, namely:"
+              , flow $ T.unpack $ textDisplay loc' <> "."
+              , flow "Recommendation: add the correctly desired version to \
+                     \extra-deps."
               ]
-            -- Not present at all, add it from Hackage
-            Nothing -> do
-              mrev <- getLatestHackageRevision YesRequireHackageIndex name version
-              pure $ case mrev of
-                Nothing -> deferToConstructPlan name
-                Just (_rev, cfKey, treeKey) -> Right ResolveResult
-                  { rrName = name
-                  , rrRaw = ri
-                  , rrComponent = Nothing
-                  , rrAddedDep = Just $ PLIHackage (PackageIdentifier name version) cfKey treeKey
-                  , rrPackageType = PTDependency
-                  }
-
-    hackageLatest name = do
-        mloc <- getLatestHackageLocation YesRequireHackageIndex name UsePreferredVersions
-        pure $ case mloc of
-          Nothing -> deferToConstructPlan name
-          Just loc -> do
-            Right ResolveResult
-                  { rrName = name
-                  , rrRaw = ri
-                  , rrComponent = Nothing
-                  , rrAddedDep = Just loc
-                  , rrPackageType = PTDependency
-                  }
-
-    hackageLatestRevision name version = do
-        mrev <- getLatestHackageRevision YesRequireHackageIndex name version
-        pure $ case mrev of
-          Nothing -> deferToConstructPlan name
-          Just (_rev, cfKey, treeKey) -> Right ResolveResult
-            { rrName = name
-            , rrRaw = ri
-            , rrComponent = Nothing
-            , rrAddedDep = Just $ PLIHackage (PackageIdentifier name version) cfKey treeKey
-            , rrPackageType = PTDependency
-            }
-
-    -- This is actually an error case. We _could_ pure a
-    -- Left value here, but it turns out to be better to defer
-    -- this until the ConstructPlan phase, and let it complain
-    -- about the missing package so that we get more errors
-    -- together, plus the fancy colored output from that
-    -- module.
-    deferToConstructPlan name = Right ResolveResult
-              { rrName = name
-              , rrRaw = ri
-              , rrComponent = Nothing
-              , rrAddedDep = Nothing
-              , rrPackageType = PTDependency
-              }
----------------------------------------------------------------------------------
+          -- Not present at all, add it from Hackage
+          Nothing ->
+            getLatestHackageRevision YesRequireHackageIndex name version <&> \case
+              Nothing -> Left $
+                fillSep
+                  [ flow "Stack did not know the location of a package named"
+                  , style Target (fromPackageName name)
+                  , "and could not find"
+                  , style Target (fromPackageId ident)
+                  , flow "in the package index."
+                  ]
+              Just (_rev, cfKey, treeKey) -> Right ResolveResult
+                { name
+                , rawInput
+                , component = Nothing
+                , addedDep = Just $
+                    PLIHackage (PackageIdentifier name version) cfKey treeKey
+                , packageType = PTDependency
+                }
+
+  hackageLatest name =
+    getLatestHackageLocation YesRequireHackageIndex name UsePreferredVersions <&> \case
+      Nothing -> deferToConstructPlan name
+      Just loc ->
+        Right ResolveResult
+          { name
+          , rawInput
+          , component = Nothing
+          , addedDep = Just loc
+          , packageType = PTDependency
+          }
+
+  hackageLatestRevision name version versionLoc =
+    getLatestHackageRevision YesRequireHackageIndex name version <&> \case
+      Nothing -> Left $
+        fillSep
+          [ flow "Stack knows the location of"
+          , style Current (fromPackageId pkgId')
+          , flow "but did not know the location of"
+          , style Target (fromPackageId pkgId) <>","
+          , flow "and did not find it in the package index."
+          ]
+       where
+        pkgId = PackageIdentifier name version
+        pkgId' = PackageIdentifier name versionLoc
+      Just (_rev, cfKey, treeKey) -> Right ResolveResult
+        { name
+        , rawInput
+        , component = Nothing
+        , addedDep =
+            Just $ PLIHackage (PackageIdentifier name version) cfKey treeKey
+        , packageType = PTDependency
+        }
+
+  -- This is actually an error case. We _could_ pure a Left value here, but it
+  -- turns out to be better to defer this until the ConstructPlan phase, and let
+  -- it complain about the missing package so that we get more errors together,
+  -- plus the fancy colored output from that module.
+  deferToConstructPlan name = Right ResolveResult
+    { name
+    , rawInput
+    , component = Nothing
+    , addedDep = Nothing
+    , packageType = PTDependency
+    }
+--------------------------------------------------------------------------------
 -- Combine the ResolveResults
----------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
-combineResolveResults
-  :: forall env. HasLogFunc env
+combineResolveResults ::
+     forall env. HasLogFunc env
   => [ResolveResult]
-  -> RIO env ([Text], Map PackageName Target, Map PackageName PackageLocationImmutable)
+  -> RIO
+       env
+       ( [StyleDoc]
+       , Map PackageName Target
+       , Map PackageName PackageLocationImmutable
+       )
 combineResolveResults results = do
-    addedDeps <- fmap Map.unions $ forM results $ \result ->
-      case rrAddedDep result of
-        Nothing -> pure Map.empty
-        Just pl -> do
-          pure $ Map.singleton (rrName result) pl
-
-    let m0 = Map.unionsWith (++) $ map (\rr -> Map.singleton (rrName rr) [rr]) results
-        (errs, ms) = partitionEithers $ flip map (Map.toList m0) $ \(name, rrs) ->
-            let mcomps = map rrComponent rrs in
-            -- Confirm that there is either exactly 1 with no component, or
-            -- that all rrs are components
-            case rrs of
-                [] -> assert False $ Left "Somehow got no rrComponent values, that can't happen"
-                [rr] | isNothing (rrComponent rr) -> Right $ Map.singleton name $ TargetAll $ rrPackageType rr
-                _
-                  | all isJust mcomps -> Right $ Map.singleton name $ TargetComps $ Set.fromList $ catMaybes mcomps
-                  | otherwise -> Left $ T.concat
-                      [ "The package "
-                      , T.pack $ packageNameString name
-                      , " was specified in multiple, incompatible ways: "
-                      , T.unwords $ map (unRawInput . rrRaw) rrs
-                      ]
-
-    pure (errs, Map.unions ms, addedDeps)
-
----------------------------------------------------------------------------------
+  addedDeps <- fmap Map.unions $ forM results $ \result ->
+    case result.addedDep of
+      Nothing -> pure Map.empty
+      Just pl -> pure $ Map.singleton result.name pl
+
+  let m0 = Map.unionsWith (++) $
+        map (\rr -> Map.singleton rr.name [rr]) results
+      (errs, ms) = partitionEithers $ flip map (Map.toList m0) $
+        \(name, rrs) ->
+          let mcomps = map (.component) rrs in
+          -- Confirm that there is either exactly 1 with no component, or that
+          -- all rrs are components
+          case rrs of
+            [] -> assert False $
+              Left $
+                flow "Somehow got no rrComponent values, that can't happen."
+            [rr] | isNothing rr.component ->
+              Right $ Map.singleton name $ TargetAll rr.packageType
+            _
+              | all isJust mcomps ->
+                  Right $ Map.singleton name $ TargetComps $ Set.fromList $
+                    catMaybes mcomps
+              | otherwise -> Left $ fillSep
+                  [ flow "The package"
+                  , style Target $ fromPackageName name
+                  , flow "was specified in multiple, incompatible ways:"
+                  , fillSep $
+                      mkNarrativeList (Just Target) False
+                        (map rrToStyleDoc rrs)
+                  ]
+  pure (errs, Map.unions ms, addedDeps)
+ where
+  rrToStyleDoc :: ResolveResult -> StyleDoc
+  rrToStyleDoc = fromString . T.unpack . (.rawInput.rawInput)
+
+--------------------------------------------------------------------------------
 -- OK, let's do it!
----------------------------------------------------------------------------------
-
-parseTargets :: HasBuildConfig env
-    => NeedTargets
-    -> Bool
-    -> BuildOptsCLI
-    -> SMActual GlobalPackage
-    -> RIO env SMTargets
+--------------------------------------------------------------------------------
+
+-- | Parse targets and dependencies from the given command line arguments and
+-- source map.
+parseTargets ::
+     HasBuildConfig env
+  => NeedTargets
+  -> Bool
+     -- ^ Should Haddock documentation be built for the package?
+  -> BuildOptsCLI
+  -> SMActual GlobalPackage
+  -> RIO env SMTargets
 parseTargets needTargets haddockDeps boptscli smActual = do
   logDebug "Parsing the targets"
   bconfig <- view buildConfigL
   workingDir <- getCurrentDir
-  locals <- view $ buildConfigL.to (smwProject . bcSMWanted)
+  locals <- view $ buildConfigL . to (.smWanted.project)
   let (textTargets', rawInput) = getRawInput boptscli locals
 
   (errs1, concat -> rawTargets) <- fmap partitionEithers $ forM rawInput $
     parseRawTargetDirs workingDir locals
 
-  let depLocs = Map.map dpLocation $ smaDeps smActual
+  let depLocs = Map.map (.location) smActual.deps
 
   (errs2, resolveResults) <- fmap partitionEithers $ forM rawTargets $
     resolveRawTarget smActual depLocs
@@ -456,28 +582,37 @@ parseTargets needTargets haddockDeps boptscli smActual = do
 
   case concat [errs1, errs2, errs3] of
     [] -> pure ()
-    errs -> throwIO $ TargetParseException errs
+    errs -> prettyThrowIO $ TargetParseException errs
 
   case (Map.null targets, needTargets) of
     (False, _) -> pure ()
     (True, AllowNoTargets) -> pure ()
     (True, NeedTargets)
-      | null textTargets' && bcImplicitGlobal bconfig -> throwIO $ TargetParseException
-          ["The specified targets matched no packages.\nPerhaps you need to run 'stack init'?"]
-      | null textTargets' && Map.null locals -> throwIO $ TargetParseException
-          ["The project contains no local packages (packages not marked with 'extra-dep')"]
-      | otherwise -> throwIO $ TargetParseException
-          ["The specified targets matched no packages"]
+      | null textTargets' && bcImplicitGlobal bconfig ->
+          prettyThrowIO $ TargetParseException
+            [ fillSep
+                [ flow "The specified targets matched no packages. Perhaps you \
+                       \need to run"
+                , style Shell (flow "stack init") <> "?"
+                ]
+            ]
+      | null textTargets' && Map.null locals ->
+          prettyThrowIO $ TargetParseException
+            [ flow "The project contains no project packages (packages other \
+                   \than extra-deps)."
+            ]
+      | otherwise -> prettyThrowIO $ TargetParseException
+          [ flow "The specified targets matched no packages." ]
 
   addedDeps' <- mapM (additionalDepPackage haddockDeps . PLImmutable) addedDeps
 
   pure SMTargets
-    { smtTargets = targets
-    , smtDeps = addedDeps'
+    { targets = targets
+    , deps = addedDeps'
     }
-  where
-    bcImplicitGlobal bconfig =
-      case configProject $ bcConfig bconfig of
-        PCProject _ -> False
-        PCGlobalProject -> True
-        PCNoProject _ -> False
+ where
+  bcImplicitGlobal bconfig =
+    case bconfig.config.project of
+      PCProject _ -> False
+      PCGlobalProject -> True
+      PCNoProject _ -> False
diff --git a/src/Stack/BuildInfo.hs b/src/Stack/BuildInfo.hs
new file mode 100644
index 0000000000..9600771a8c
--- /dev/null
+++ b/src/Stack/BuildInfo.hs
@@ -0,0 +1,106 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE CPP               #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+#ifdef USE_GIT_INFO
+{-# LANGUAGE TemplateHaskell   #-}
+#endif
+
+{-|
+Module      : Stack.BuildInfo
+License     : BSD-3-Clause
+
+Extracted from "Stack" so that module does not use CPP or Template Haskell, and
+therefore doesn't need to be recompiled as often.
+-}
+
+module Stack.BuildInfo
+  ( versionString'
+  , hpackVersion
+  , maybeGitHash
+  ) where
+
+#ifndef HIDE_DEP_VERSIONS
+import qualified Build_stack
+#endif
+import           Data.Version ( versionBranch )
+import           Distribution.System ( buildArch )
+import qualified Distribution.Text as Cabal ( display )
+#ifdef USE_GIT_INFO
+import           GitHash ( giCommitCount, giHash, tGitInfoCwdTry )
+import           Options.Applicative.Simple ( simpleVersion )
+#endif
+import qualified Paths_stack as Meta
+import           Stack.Constants ( isStackUploadDisabled )
+import           Stack.Prelude
+#ifndef USE_GIT_INFO
+import           Stack.Types.Version ( showStackVersion )
+#endif
+
+-- | The output of @stack --version@.
+versionString' :: String
+#ifdef USE_GIT_INFO
+versionString' = concat $ concat
+  [ [$(simpleVersion Meta.version)]
+    -- Leave out number of commits for --depth=1 clone
+    -- See https://github.com/commercialhaskell/stack/issues/792
+  , case giCommitCount <$> $$tGitInfoCwdTry of
+      Left _ -> []
+      Right 1 -> []
+      Right count -> [" (", show count, " commits)"]
+  , [afterVersion]
+  ]
+#else
+versionString' = showStackVersion ++ afterVersion
+#endif
+ where
+  afterVersion = concat
+    [ preReleaseString
+    , ' ' : Cabal.display buildArch
+    , depsString
+    , warningString
+    , stackUploadDisabledWarningString
+    ]
+  preReleaseString =
+    case versionBranch Meta.version of
+      (_:y:_) | even y -> " PRE-RELEASE"
+      (_:_:z:_) | even z -> " RELEASE-CANDIDATE"
+      _ -> ""
+#ifdef HIDE_DEP_VERSIONS
+  depsString = " hpack-" ++ VERSION_hpack
+#else
+  depsString = "\nCompiled with:\n" ++ unlines (map ("- " ++) Build_stack.deps)
+#endif
+#ifdef SUPPORTED_BUILD
+  warningString = ""
+#else
+  warningString = unlines
+    [ ""
+    , "Warning: this is an unsupported build that may use different versions of"
+    , "dependencies and GHC than the officially released binaries, and therefore may"
+    , "not behave identically.  If you encounter problems, please try the latest"
+    , "official build by running 'stack upgrade --force-download'."
+    ]
+#endif
+  stackUploadDisabledWarningString = if isStackUploadDisabled
+    then unlines
+      [ ""
+      , "Warning: 'stack upload' is disabled and will not make HTTP request(s). It will"
+      , "output information about the HTTP request(s) that would have been made if it"
+      , "was enabled."
+      ]
+    else ""
+
+-- | Hpack version we're compiled against
+hpackVersion :: String
+hpackVersion = VERSION_hpack
+
+-- | If USE_GIT_INFO is enabled, the Git hash in the build directory, otherwise
+-- Nothing.
+maybeGitHash :: Maybe String
+maybeGitHash =
+#ifdef USE_GIT_INFO
+  (either (const Nothing) (Just . giHash) $$tGitInfoCwdTry)
+#else
+  Nothing
+#endif
diff --git a/src/Stack/BuildOpts.hs b/src/Stack/BuildOpts.hs
new file mode 100644
index 0000000000..b843a5b4a8
--- /dev/null
+++ b/src/Stack/BuildOpts.hs
@@ -0,0 +1,92 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+
+{-|
+Module      : Stack.BuildOpts
+Description : Default configuration options for building.
+License     : BSD-3-Clause
+
+Default configuration options for building.
+-}
+
+module Stack.BuildOpts
+  ( defaultBuildOpts
+  , defaultTestOpts
+  , defaultHaddockOpts
+  , defaultBenchmarkOpts
+  ) where
+
+import           Distribution.Verbosity ( normal )
+import           Stack.Prelude
+import           Stack.Types.BuildOpts
+                   ( BenchmarkOpts (..), BuildOpts (..), HaddockOpts (..)
+                   , TestOpts (..)
+                   )
+import           Stack.Types.BuildOptsMonoid
+                   ( BenchmarkOptsMonoid (..), BuildOptsMonoid (..)
+                   , CabalVerbosity (..), ProgressBarFormat (..)
+                   , TestOptsMonoid (..)
+                   )
+
+defaultBuildOpts :: BuildOpts
+defaultBuildOpts = BuildOpts
+  { libProfile = defaultFirstFalse buildMonoid.libProfile
+  , exeProfile = defaultFirstFalse buildMonoid.exeProfile
+  , libStrip = defaultFirstTrue buildMonoid.libStrip
+  , exeStrip = defaultFirstTrue buildMonoid.exeStrip
+  , buildHaddocks = False
+  , haddockOpts = defaultHaddockOpts
+  , openHaddocks = defaultFirstFalse buildMonoid.openHaddocks
+  , haddockDeps = Nothing
+  , haddockExecutables = defaultFirstFalse buildMonoid.haddockExecutables
+  , haddockTests = defaultFirstFalse buildMonoid.haddockTests
+  , haddockBenchmarks = defaultFirstFalse buildMonoid.haddockBenchmarks
+  , haddockInternal = defaultFirstFalse buildMonoid.haddockInternal
+  , haddockHyperlinkSource = defaultFirstTrue buildMonoid.haddockHyperlinkSource
+  , haddockForHackage = defaultFirstFalse buildMonoid.haddockForHackage
+  , installExes = defaultFirstFalse buildMonoid.installExes
+  , installCompilerTool = defaultFirstFalse buildMonoid.installCompilerTool
+  , preFetch = defaultFirstFalse buildMonoid.preFetch
+  , keepGoing = Nothing
+  , keepTmpFiles = defaultFirstFalse buildMonoid.keepTmpFiles
+  , forceDirty = defaultFirstFalse buildMonoid.forceDirty
+  , tests = defaultFirstFalse buildMonoid.tests
+  , testOpts = defaultTestOpts
+  , benchmarks = defaultFirstFalse buildMonoid.benchmarks
+  , benchmarkOpts = defaultBenchmarkOpts
+  , reconfigure = defaultFirstFalse buildMonoid.reconfigure
+  , cabalVerbose = CabalVerbosity normal
+  , splitObjs = defaultFirstFalse buildMonoid.splitObjs
+  , skipComponents = []
+  , interleavedOutput = defaultFirstTrue buildMonoid.interleavedOutput
+  , progressBar = CappedBar
+  , ddumpDir = Nothing
+  , semaphore = defaultFirstFalse buildMonoid.semaphore
+  }
+ where
+  buildMonoid = undefined :: BuildOptsMonoid
+
+defaultTestOpts :: TestOpts
+defaultTestOpts = TestOpts
+  { rerunTests = defaultFirstTrue toMonoid.rerunTests
+  , additionalArgs = []
+  , coverage = defaultFirstFalse toMonoid.coverage
+  , runTests = defaultFirstTrue toMonoid.runTests
+  , maximumTimeSeconds = Nothing
+  , timeoutGraceSeconds = Nothing
+  , allowStdin = defaultFirstTrue toMonoid.allowStdin
+  }
+ where
+  toMonoid = undefined :: TestOptsMonoid
+
+defaultHaddockOpts :: HaddockOpts
+defaultHaddockOpts = HaddockOpts { additionalArgs = [] }
+
+defaultBenchmarkOpts :: BenchmarkOpts
+defaultBenchmarkOpts = BenchmarkOpts
+  { additionalArgs = Nothing
+  , runBenchmarks = defaultFirstTrue beoMonoid.runBenchmarks
+  }
+ where
+  beoMonoid = undefined :: BenchmarkOptsMonoid
diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs
index 98cd2d47b7..03a474d0a1 100644
--- a/src/Stack/BuildPlan.hs
+++ b/src/Stack/BuildPlan.hs
@@ -1,328 +1,369 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE DeriveDataTypeable  #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE GADTs               #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
--- | Resolving a build plan for a set of packages in a given Stackage
--- snapshot.
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.BuildPlan
+License     : BSD-3-Clause
+
+Resolving a build plan for a set of packages in a given Stackage snapshot.
+-}
 
 module Stack.BuildPlan
-    ( BuildPlanException (..)
-    , BuildPlanCheck (..)
-    , checkSnapBuildPlan
-    , DepError(..)
-    , DepErrors
-    , removeSrcPkgDefaultFlags
-    , selectBestSnapshot
-    , showItems
-    ) where
-
-import           Stack.Prelude hiding (Display (..))
+  ( BuildPlanException (..)
+  , BuildPlanCheck (..)
+  , checkSnapBuildPlan
+  , DepError (..)
+  , DepErrors
+  , removeSrcPkgDefaultFlags
+  , selectBestSnapshot
+  ) where
+
 import qualified Data.Foldable as F
-import qualified Data.Set as Set
 import           Data.List (intercalate)
-import qualified Data.List.NonEmpty as NonEmpty
 import qualified Data.Map as Map
+import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Distribution.Package as C
-import           Distribution.PackageDescription (GenericPackageDescription,
-                                                  flagDefault, flagManual,
-                                                  flagName, genPackageFlags)
+import           Distribution.PackageDescription
+                   ( GenericPackageDescription, flagDefault, flagName
+                   , flagManual, genPackageFlags
+                   )
 import qualified Distribution.PackageDescription as C
-import           Distribution.System (Platform)
-import           Distribution.Text (display)
-import           Distribution.Types.UnqualComponentName (unUnqualComponentName)
+import           Distribution.System ( Platform )
+import           Distribution.Text ( display )
+import           Distribution.Types.UnqualComponentName
+                   ( unUnqualComponentName )
 import qualified Distribution.Version as C
-import qualified RIO
-import           Stack.Constants
+import qualified RIO.NonEmpty as NE
+import           Stack.Constants ( wiredInPackages )
 import           Stack.Package
+                   ( PackageConfig (..), packageDependencies
+                   , resolvePackageDescription
+                   )
+import           Stack.Prelude hiding ( Display (..) )
 import           Stack.SourceMap
-import           Stack.Types.SourceMap
-import           Stack.Types.Version
-import           Stack.Types.Config
+                   ( SnapshotCandidate, loadProjectSnapshotCandidate )
 import           Stack.Types.Compiler
-
+                   ( ActualCompiler, WhichCompiler (..), compilerVersionText
+                   , whichCompiler
+                   )
+import           Stack.Types.Config ( HasConfig )
+import           Stack.Types.GHCVariant ( HasGHCVariant )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.SourceMap
+                   ( CommonPackage (..), DepPackage (..)
+                   , GlobalPackageVersion (..), ProjectPackage (..)
+                   , SMActual (..)
+                   )
+import           Stack.Types.Version ( VersionRange, withinRange )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.BuildPlan" module.
 data BuildPlanException
-    = UnknownPackages
-        (Path Abs File) -- stack.yaml file
-        (Map PackageName (Maybe Version, Set PackageName)) -- truly unknown
-        (Map PackageName (Set PackageIdentifier)) -- shadowed
-    | SnapshotNotFound SnapName
-    | NeitherCompilerOrResolverSpecified T.Text
-    deriving (Typeable)
-instance Exception BuildPlanException
-instance Show BuildPlanException where
-    show (SnapshotNotFound snapName) = unlines
-        [ "SnapshotNotFound " ++ snapName'
-        , "Non existing resolver: " ++ snapName' ++ "."
-        , "For a complete list of available snapshots see https://www.stackage.org/snapshots"
+  = UnknownPackages
+      (Path Abs File) -- stack.yaml file
+      (Map PackageName (Maybe Version, Set PackageName)) -- truly unknown
+      (Map PackageName (Set PackageIdentifier)) -- shadowed
+  | SnapshotNotFound SnapName
+  | NeitherCompilerOrSnapshotSpecified T.Text
+  | DuplicatePackagesBug
+  deriving Show
+
+instance Exception BuildPlanException where
+  displayException (SnapshotNotFound snapName) = unlines
+    [ "Error: [S-2045]"
+    , "SnapshotNotFound " ++ snapName'
+    , "Non existing snapshot: " ++ snapName' ++ "."
+    , "For a complete list of available snapshots see https://www.stackage.org/snapshots"
+    ]
+   where
+    snapName' = show snapName
+  displayException (UnknownPackages stackYaml unknown shadowed) =
+    "Error: [S-7571]\n"
+    ++ unlines (unknown' ++ shadowed')
+   where
+    unknown' :: [String]
+    unknown'
+      | Map.null unknown = []
+      | otherwise = concat
+          [ ["The following packages do not exist in the build plan:"]
+          , map go (Map.toList unknown)
+          , case mapMaybe goRecommend $ Map.toList unknown of
+              [] -> []
+              rec ->
+                  ("Recommended action: modify the value of the extra-deps key of " ++
+                  toFilePath stackYaml ++
+                  " to include the following:")
+                  : (rec
+                  ++ ["Note: further dependencies may need to be added"])
+          , case mapMaybe getNoKnown $ Map.toList unknown of
+              [] -> []
+              noKnown ->
+                  [ "There are no known versions of the following packages:"
+                  , intercalate ", " $ map packageNameString noKnown
+                  ]
+          ]
+     where
+      go (dep, (_, users)) | Set.null users = packageNameString dep
+      go (dep, (_, users)) = concat
+        [ packageNameString dep
+        , " (used by "
+        , intercalate ", " $ map packageNameString $ Set.toList users
+        , ")"
         ]
-        where snapName' = show snapName
-    show (UnknownPackages stackYaml unknown shadowed) =
-        unlines $ unknown' ++ shadowed'
-      where
-        unknown' :: [String]
-        unknown'
-            | Map.null unknown = []
-            | otherwise = concat
-                [ ["The following packages do not exist in the build plan:"]
-                , map go (Map.toList unknown)
-                , case mapMaybe goRecommend $ Map.toList unknown of
-                    [] -> []
-                    rec ->
-                        ("Recommended action: modify the extra-deps field of " ++
-                        toFilePath stackYaml ++
-                        " to include the following:")
-                        : (rec
-                        ++ ["Note: further dependencies may need to be added"])
-                , case mapMaybe getNoKnown $ Map.toList unknown of
-                    [] -> []
-                    noKnown ->
-                        [ "There are no known versions of the following packages:"
-                        , intercalate ", " $ map packageNameString noKnown
-                        ]
-                ]
-          where
-            go (dep, (_, users)) | Set.null users = packageNameString dep
-            go (dep, (_, users)) = concat
-                [ packageNameString dep
-                , " (used by "
-                , intercalate ", " $ map packageNameString $ Set.toList users
-                , ")"
-                ]
-
-            goRecommend (name, (Just version, _)) =
-                Just $ "- " ++ packageIdentifierString (PackageIdentifier name version)
-            goRecommend (_, (Nothing, _)) = Nothing
-
-            getNoKnown (name, (Nothing, _)) = Just name
-            getNoKnown (_, (Just _, _)) = Nothing
-
-        shadowed' :: [String]
-        shadowed'
-            | Map.null shadowed = []
-            | otherwise = concat
-                [ ["The following packages are shadowed by local packages:"]
-                , map go (Map.toList shadowed)
-                , ["Recommended action: modify the extra-deps field of " ++
-                   toFilePath stackYaml ++
-                   " to include the following:"]
-                , extraDeps
-                , ["Note: further dependencies may need to be added"]
-                ]
-          where
-            go (dep, users) | Set.null users = packageNameString dep ++ " (internal Stack error: this should never be null)"
-            go (dep, users) = concat
-                [ packageNameString dep
-                , " (used by "
-                , intercalate ", "
-                    $ map (packageNameString . pkgName)
-                    $ Set.toList users
-                , ")"
-                ]
-
-            extraDeps = map (\ident -> "- " ++ packageIdentifierString ident)
-                      $ Set.toList
-                      $ Set.unions
-                      $ Map.elems shadowed
-    show (NeitherCompilerOrResolverSpecified url) =
-        "Failed to load custom snapshot at " ++
-        T.unpack url ++
-        ", because no 'compiler' or 'resolver' is specified."
+
+      goRecommend (name, (Just version, _)) =
+        Just $ "- " ++ packageIdentifierString (PackageIdentifier name version)
+      goRecommend (_, (Nothing, _)) = Nothing
+
+      getNoKnown (name, (Nothing, _)) = Just name
+      getNoKnown (_, (Just _, _)) = Nothing
+
+    shadowed' :: [String]
+    shadowed'
+      | Map.null shadowed = []
+      | otherwise = concat
+          [ ["The following packages are shadowed by project packages:"]
+          , map go (Map.toList shadowed)
+          , ["Recommended action: modify the value of the extra-deps key of " ++
+             toFilePath stackYaml ++
+             " to include the following:"]
+          , extraDeps
+          , ["Note: further dependencies may need to be added"]
+          ]
+     where
+      go (dep, users) | Set.null users = packageNameString dep ++ " (internal Stack error: this should never be null)"
+      go (dep, users) = concat
+        [ packageNameString dep
+        , " (used by "
+        , intercalate ", "
+            $ map (packageNameString . pkgName)
+            $ Set.toList users
+        , ")"
+        ]
+
+      extraDeps = map (\ident -> "- " ++ packageIdentifierString ident)
+                $ Set.toList
+                $ Set.unions
+                $ Map.elems shadowed
+  displayException (NeitherCompilerOrSnapshotSpecified url) = concat
+    [ "Error: [S-8559]\n"
+    , "Failed to load custom snapshot at "
+    , T.unpack url
+    , ", because no 'compiler' or 'snapshot' is specified."
+    ]
+  displayException DuplicatePackagesBug = bugReport "[S-5743]"
+    "Duplicate packages are not expected here."
 
 gpdPackages :: [GenericPackageDescription] -> Map PackageName Version
 gpdPackages = Map.fromList . map (toPair . C.package . C.packageDescription)
-    where
-        toPair (C.PackageIdentifier name version) = (name, version)
-
-gpdPackageDeps
-    :: GenericPackageDescription
-    -> ActualCompiler
-    -> Platform
-    -> Map FlagName Bool
-    -> Map PackageName VersionRange
-gpdPackageDeps gpd ac platform flags =
-    Map.filterWithKey (const . not . isLocalLibrary) (packageDependencies pkgConfig pkgDesc)
-    where
-        isLocalLibrary name' = name' == name || name' `Set.member` subs
-
-        name = gpdPackageName gpd
-        subs = Set.fromList
-             $ map (C.mkPackageName . unUnqualComponentName . fst)
-             $ C.condSubLibraries gpd
-
-        -- Since tests and benchmarks are both enabled, doesn't matter
-        -- if we choose modified or unmodified
-        pkgDesc = pdpModifiedBuildable $ resolvePackageDescription pkgConfig gpd
-        pkgConfig = PackageConfig
-            { packageConfigEnableTests = True
-            , packageConfigEnableBenchmarks = True
-            , packageConfigFlags = flags
-            , packageConfigGhcOptions = []
-            , packageConfigCabalConfigOpts = []
-            , packageConfigCompilerVersion = ac
-            , packageConfigPlatform = platform
-            }
-
--- Remove any src package flags having default values
--- Remove any package entries with no flags set
-removeSrcPkgDefaultFlags :: [C.GenericPackageDescription]
-                         -> Map PackageName (Map FlagName Bool)
-                         -> Map PackageName (Map FlagName Bool)
+ where
+  toPair (C.PackageIdentifier name version) = (name, version)
+
+gpdPackageDeps ::
+     GenericPackageDescription
+  -> ActualCompiler
+  -> Platform
+  -> Map FlagName Bool
+  -> Map PackageName VersionRange
+gpdPackageDeps gpd compilerVersion platform flags =
+  Map.filterWithKey (const . not . isLocalLibrary) (packageDependencies pkgDesc)
+ where
+  isLocalLibrary name' = name' == name || name' `Set.member` subs
+
+  name = gpdPackageName gpd
+  subs = Set.fromList
+       $ map (C.mkPackageName . unUnqualComponentName . fst)
+       $ C.condSubLibraries gpd
+
+  -- Since tests and benchmarks are both enabled, doesn't matter if we choose
+  -- modified or unmodified
+  pkgDesc = resolvePackageDescription pkgConfig gpd
+  pkgConfig = PackageConfig
+    { enableTests = True
+    , enableBenchmarks = True
+    , flags
+    , ghcOptions = []
+    , cabalConfigOpts = []
+    , compilerVersion
+    , platform
+    }
+
+-- | For the given list of packages and dictionary of packages and Cabal flags,
+-- remove flags that have defaults and packages with no remaining flags.
+removeSrcPkgDefaultFlags ::
+     [C.GenericPackageDescription]
+  -> Map PackageName (Map FlagName Bool)
+  -> Map PackageName (Map FlagName Bool)
 removeSrcPkgDefaultFlags gpds flags =
-    let defaults = Map.unions (map gpdDefaultFlags gpds)
-        flags'   = Map.differenceWith removeSame flags defaults
-    in  Map.filter (not . Map.null) flags'
-    where
-        removeSame f1 f2 =
-            let diff v v' = if v == v' then Nothing else Just v
-            in Just $ Map.differenceWith diff f1 f2
-
-        gpdDefaultFlags gpd =
-            let tuples = map getDefault (C.genPackageFlags gpd)
-            in Map.singleton (gpdPackageName gpd) (Map.fromList tuples)
-
-        getDefault f
-            | C.flagDefault f = (C.flagName f, True)
-            | otherwise       = (C.flagName f, False)
+  let defaults = Map.unions (map gpdDefaultFlags gpds)
+      flags'   = Map.differenceWith removeSame flags defaults
+  in  Map.filter (not . Map.null) flags'
+ where
+  removeSame f1 f2 =
+    let diff v v' = if v == v' then Nothing else Just v
+    in  Just $ Map.differenceWith diff f1 f2
+
+  gpdDefaultFlags gpd =
+    let pairs = map (C.flagName &&& C.flagDefault) (C.genPackageFlags gpd)
+    in  Map.singleton (gpdPackageName gpd) (Map.fromList pairs)
 
 -- | Find the set of @FlagName@s necessary to get the given
 -- @GenericPackageDescription@ to compile against the given @BuildPlan@. Will
 -- only modify non-manual flags, and will prefer default values for flags.
 -- Returns the plan which produces least number of dep errors
-selectPackageBuildPlan
-    :: Platform
-    -> ActualCompiler
-    -> Map PackageName Version
-    -> GenericPackageDescription
-    -> (Map PackageName (Map FlagName Bool), DepErrors)
+selectPackageBuildPlan ::
+     Platform
+  -> ActualCompiler
+  -> Map PackageName Version
+  -> GenericPackageDescription
+  -> (Map PackageName (Map FlagName Bool), DepErrors)
 selectPackageBuildPlan platform compiler pool gpd =
-    (selectPlan . limitSearchSpace . NonEmpty.map makePlan) flagCombinations
-  where
-    selectPlan :: NonEmpty (a, DepErrors) -> (a, DepErrors)
-    selectPlan = F.foldr1 fewerErrors
-      where
-        fewerErrors p1 p2
-            | nErrors p1 == 0 = p1
-            | nErrors p1 <= nErrors p2 = p1
-            | otherwise = p2
-          where nErrors = Map.size . snd
-
-    -- Avoid exponential complexity in flag combinations making us sad pandas.
-    -- See: https://github.com/commercialhaskell/stack/issues/543
-    limitSearchSpace :: NonEmpty a -> NonEmpty a
-    limitSearchSpace (x :| xs) = x :| take (maxFlagCombinations - 1) xs
-      where maxFlagCombinations = 128
-
-    makePlan :: [(FlagName, Bool)] -> (Map PackageName (Map FlagName Bool), DepErrors)
-    makePlan flags = checkPackageBuildPlan platform compiler pool (Map.fromList flags) gpd
-
-    flagCombinations :: NonEmpty [(FlagName, Bool)]
-    flagCombinations = mapM getOptions (genPackageFlags gpd)
-      where
-        getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool)
-        getOptions f
-            | flagManual f = (fname, flagDefault f) :| []
-            | flagDefault f = (fname, True) :| [(fname, False)]
-            | otherwise = (fname, False) :| [(fname, True)]
-          where fname = flagName f
+  (selectPlan . limitSearchSpace . NE.map makePlan) flagCombinations
+ where
+  selectPlan :: NonEmpty (a, DepErrors) -> (a, DepErrors)
+  selectPlan = F.foldr1 fewerErrors
+   where
+    fewerErrors p1 p2
+        | nErrors p1 == 0 = p1
+        | nErrors p1 <= nErrors p2 = p1
+        | otherwise = p2
+     where
+      nErrors = Map.size . snd
+
+  -- Avoid exponential complexity in flag combinations making us sad pandas.
+  -- See: https://github.com/commercialhaskell/stack/issues/543
+  limitSearchSpace :: NonEmpty a -> NonEmpty a
+  limitSearchSpace (x :| xs) = x :| take (maxFlagCombinations - 1) xs
+   where
+    maxFlagCombinations = 128
+
+  makePlan ::
+       [(FlagName, Bool)]
+    -> (Map PackageName (Map FlagName Bool), DepErrors)
+  makePlan flags =
+    checkPackageBuildPlan platform compiler pool (Map.fromList flags) gpd
+
+  flagCombinations :: NonEmpty [(FlagName, Bool)]
+  flagCombinations = mapM getOptions (genPackageFlags gpd)
+   where
+    getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool)
+    getOptions f
+      | flagManual f = (fname, flagDefault f) :| []
+      | flagDefault f = (fname, True) :| [(fname, False)]
+      | otherwise = (fname, False) :| [(fname, True)]
+     where
+      fname = flagName f
 
 -- | Check whether with the given set of flags a package's dependency
 -- constraints can be satisfied against a given build plan or pool of packages.
-checkPackageBuildPlan
-    :: Platform
-    -> ActualCompiler
-    -> Map PackageName Version
-    -> Map FlagName Bool
-    -> GenericPackageDescription
-    -> (Map PackageName (Map FlagName Bool), DepErrors)
+checkPackageBuildPlan ::
+     Platform
+  -> ActualCompiler
+  -> Map PackageName Version
+  -> Map FlagName Bool
+  -> GenericPackageDescription
+  -> (Map PackageName (Map FlagName Bool), DepErrors)
 checkPackageBuildPlan platform compiler pool flags gpd =
-    (Map.singleton pkg flags, errs)
-    where
-        pkg         = gpdPackageName gpd
-        errs        = checkPackageDeps pkg constraints pool
-        constraints = gpdPackageDeps gpd compiler platform flags
+  (Map.singleton pkg flags, errs)
+ where
+  pkg = gpdPackageName gpd
+  errs = checkPackageDeps pkg constraints pool
+  constraints = gpdPackageDeps gpd compiler platform flags
 
 -- | Checks if the given package dependencies can be satisfied by the given set
 -- of packages. Will fail if a package is either missing or has a version
 -- outside of the version range.
-checkPackageDeps
-    :: PackageName -- ^ package using dependencies, for constructing DepErrors
-    -> Map PackageName VersionRange -- ^ dependency constraints
-    -> Map PackageName Version -- ^ Available package pool or index
-    -> DepErrors
+checkPackageDeps ::
+     PackageName -- ^ package using dependencies, for constructing DepErrors
+  -> Map PackageName VersionRange -- ^ dependency constraints
+  -> Map PackageName Version -- ^ Available package pool or index
+  -> DepErrors
 checkPackageDeps myName deps packages =
-    Map.unionsWith combineDepError $ map go $ Map.toList deps
-  where
-    go :: (PackageName, VersionRange) -> DepErrors
-    go (name, range) =
-        case Map.lookup name packages of
-            Nothing -> Map.singleton name DepError
-                { deVersion = Nothing
-                , deNeededBy = Map.singleton myName range
-                }
-            Just v
-                | withinRange v range -> Map.empty
-                | otherwise -> Map.singleton name DepError
-                    { deVersion = Just v
-                    , deNeededBy = Map.singleton myName range
-                    }
+  Map.unionsWith combineDepError $ map go $ Map.toList deps
+ where
+  go :: (PackageName, VersionRange) -> DepErrors
+  go (name, range) =
+    case Map.lookup name packages of
+      Nothing -> Map.singleton name DepError
+        { version = Nothing
+        , neededBy = Map.singleton myName range
+        }
+      Just v
+        | withinRange v range -> Map.empty
+        | otherwise -> Map.singleton name DepError
+            { version = Just v
+            , neededBy = Map.singleton myName range
+            }
 
+-- | A type synoynm for a dictionary of packages and failures to satisfy
+-- packages' dependency constraints.
 type DepErrors = Map PackageName DepError
-data DepError = DepError
-    { deVersion :: !(Maybe Version)
-    , deNeededBy :: !(Map PackageName VersionRange)
-    } deriving Show
 
--- | Combine two 'DepError's for the same 'Version'.
+-- | A type representing failures to satisfy packages' dependency constraints.
+data DepError = DepError
+  { version :: !(Maybe Version)
+    -- ^ If available, the available version of the package.
+  , neededBy :: !(Map PackageName VersionRange)
+    -- ^ A dictionary of the packages requiring the package and the permitted
+    -- range of versions.
+  }
+  deriving Show
+
+-- | Combine two t'DepError's for the same 'Version'.
 combineDepError :: DepError -> DepError -> DepError
 combineDepError (DepError a x) (DepError b y) =
-    assert (a == b) $ DepError a (Map.unionWith C.intersectVersionRanges x y)
+  assert (a == b) $ DepError a (Map.unionWith C.intersectVersionRanges x y)
 
 -- | Given a bundle of packages (a list of @GenericPackageDescriptions@'s) to
 -- build and an available package pool (snapshot) check whether the bundle's
 -- dependencies can be satisfied. If flags is passed as Nothing flag settings
 -- will be chosen automatically.
-checkBundleBuildPlan
-    :: Platform
-    -> ActualCompiler
-    -> Map PackageName Version
-    -> Maybe (Map PackageName (Map FlagName Bool))
-    -> [GenericPackageDescription]
-    -> (Map PackageName (Map FlagName Bool), DepErrors)
+checkBundleBuildPlan ::
+     Platform
+  -> ActualCompiler
+  -> Map PackageName Version
+  -> Maybe (Map PackageName (Map FlagName Bool))
+  -> [GenericPackageDescription]
+  -> (Map PackageName (Map FlagName Bool), DepErrors)
 checkBundleBuildPlan platform compiler pool flags gpds =
-    (Map.unionsWith dupError (map fst plans)
-    , Map.unionsWith combineDepError (map snd plans))
-
-    where
-        plans = map (pkgPlan flags) gpds
-        pkgPlan Nothing gpd =
-            selectPackageBuildPlan platform compiler pool' gpd
-        pkgPlan (Just f) gpd =
-            checkPackageBuildPlan platform compiler pool' (flags' f gpd) gpd
-        flags' f gpd = fromMaybe Map.empty (Map.lookup (gpdPackageName gpd) f)
-        pool' = Map.union (gpdPackages gpds) pool
-
-        dupError _ _ = error "Bug: Duplicate packages are not expected here"
-
-data BuildPlanCheck =
-      BuildPlanCheckOk      (Map PackageName (Map FlagName Bool))
-    | BuildPlanCheckPartial (Map PackageName (Map FlagName Bool)) DepErrors
-    | BuildPlanCheckFail    (Map PackageName (Map FlagName Bool)) DepErrors
-                            ActualCompiler
+  ( Map.unionsWith dupError (map fst plans)
+  , Map.unionsWith combineDepError (map snd plans)
+  )
+ where
+  plans = map (pkgPlan flags) gpds
+  pkgPlan Nothing gpd =
+    selectPackageBuildPlan platform compiler pool' gpd
+  pkgPlan (Just f) gpd =
+    checkPackageBuildPlan platform compiler pool' (flags' f gpd) gpd
+  flags' f gpd = fromMaybe Map.empty (Map.lookup (gpdPackageName gpd) f)
+  pool' = Map.union (gpdPackages gpds) pool
+
+  dupError _ _ = impureThrow DuplicatePackagesBug
+
+-- | A type representing the results of evaluating how well a snapshot satisfies
+-- the dependencies of a set of packages and a set of Cabal flags.
+data BuildPlanCheck
+  = BuildPlanCheckOk (Map PackageName (Map FlagName Bool))
+  | BuildPlanCheckPartial (Map PackageName (Map FlagName Bool)) DepErrors
+  | BuildPlanCheckFail
+      (Map PackageName (Map FlagName Bool))
+      DepErrors
+      ActualCompiler
 
 -- | Compare 'BuildPlanCheck', where GT means a better plan.
 compareBuildPlanCheck :: BuildPlanCheck -> BuildPlanCheck -> Ordering
-compareBuildPlanCheck (BuildPlanCheckPartial _ e1) (BuildPlanCheckPartial _ e2) =
+compareBuildPlanCheck
+    (BuildPlanCheckPartial _ e1)
+    (BuildPlanCheckPartial _ e2)
+  =
     -- Note: order of comparison flipped, since it's better to have fewer errors.
     compare (Map.size e2) (Map.size e1)
 compareBuildPlanCheck (BuildPlanCheckFail _ e1 _) (BuildPlanCheckFail _ e2 _) =
-    let numUserPkgs e = Map.size $ Map.unions (Map.elems (fmap deNeededBy e))
-    in compare (numUserPkgs e2) (numUserPkgs e1)
+  let numUserPkgs e = Map.size $ Map.unions (Map.elems (fmap (.neededBy) e))
+  in  compare (numUserPkgs e2) (numUserPkgs e1)
 compareBuildPlanCheck BuildPlanCheckOk{}      BuildPlanCheckOk{}      = EQ
 compareBuildPlanCheck BuildPlanCheckOk{}      BuildPlanCheckPartial{} = GT
 compareBuildPlanCheck BuildPlanCheckOk{}      BuildPlanCheckFail{}    = GT
@@ -330,167 +371,181 @@ compareBuildPlanCheck BuildPlanCheckPartial{} BuildPlanCheckFail{}    = GT
 compareBuildPlanCheck _                       _                       = LT
 
 instance Show BuildPlanCheck where
-    show BuildPlanCheckOk {} = ""
-    show (BuildPlanCheckPartial f e)  = T.unpack $ showDepErrors f e
-    show (BuildPlanCheckFail f e c) = T.unpack $ showCompilerErrors f e c
+  show BuildPlanCheckOk {} = ""
+  show (BuildPlanCheckPartial f e)  = T.unpack $ showDepErrors f e
+  show (BuildPlanCheckFail f e c) = T.unpack $ showCompilerErrors f e c
 
 -- | Check a set of 'GenericPackageDescription's and a set of flags against a
 -- given snapshot. Returns how well the snapshot satisfies the dependencies of
 -- the packages.
-checkSnapBuildPlan
-    :: (HasConfig env, HasGHCVariant env)
-    => [ResolvedPath Dir]
-    -> Maybe (Map PackageName (Map FlagName Bool))
-    -> SnapshotCandidate env
-    -> RIO env BuildPlanCheck
+checkSnapBuildPlan ::
+     (HasConfig env, HasGHCVariant env)
+  => [ResolvedPath Dir]
+  -> Maybe (Map PackageName (Map FlagName Bool))
+  -> SnapshotCandidate env
+  -> RIO env BuildPlanCheck
 checkSnapBuildPlan pkgDirs flags snapCandidate = do
-    platform <- view platformL
-    sma <- snapCandidate pkgDirs
-    gpds <- liftIO $ forM (Map.elems $ smaProject sma) (cpGPD . ppCommon)
-
-    let
-        compiler = smaCompiler sma
-        globalVersion (GlobalPackageVersion v) = v
-        depVersion dep | PLImmutable loc <- dpLocation dep =
-                           Just $ packageLocationVersion loc
-                       | otherwise =
-                           Nothing
-        snapPkgs = Map.union
-          (Map.mapMaybe depVersion $ smaDeps sma)
-          (Map.map globalVersion $ smaGlobal sma)
-        (f, errs) = checkBundleBuildPlan platform compiler snapPkgs flags gpds
-        cerrs = compilerErrors compiler errs
-
-    if Map.null errs then
-        pure $ BuildPlanCheckOk f
-    else if Map.null cerrs then do
-            pure $ BuildPlanCheckPartial f errs
-        else
-            pure $ BuildPlanCheckFail f cerrs compiler
-    where
-        compilerErrors compiler errs
-            | whichCompiler compiler == Ghc = ghcErrors errs
-            | otherwise = Map.empty
-
-        isGhcWiredIn p _ = p `Set.member` wiredInPackages
-        ghcErrors = Map.filterWithKey isGhcWiredIn
+  platform <- view platformL
+  sma <- snapCandidate pkgDirs
+  gpds <- liftIO $ forM (Map.elems sma.project) (.projectCommon.gpd)
+
+  let compiler = sma.compiler
+      globalVersion (GlobalPackageVersion v) = v
+      depVersion dep
+        | PLImmutable loc <- dep.location = Just $ packageLocationVersion loc
+        | otherwise = Nothing
+      snapPkgs = Map.union
+        (Map.mapMaybe depVersion sma.deps)
+        (Map.map globalVersion sma.globals)
+      (f, errs) = checkBundleBuildPlan platform compiler snapPkgs flags gpds
+      cerrs = compilerErrors compiler errs
+
+  if Map.null errs
+    then pure $ BuildPlanCheckOk f
+    else if Map.null cerrs
+      then pure $ BuildPlanCheckPartial f errs
+      else pure $ BuildPlanCheckFail f cerrs compiler
+ where
+  compilerErrors compiler errs
+    | whichCompiler compiler == Ghc = ghcErrors compiler errs
+    | otherwise = Map.empty
+
+  isGhcWiredIn compiler p _ = p `Set.member` wiredInPackages compiler
+  ghcErrors compiler = Map.filterWithKey (isGhcWiredIn compiler)
 
 -- | Find a snapshot and set of flags that is compatible with and matches as
 -- best as possible with the given 'GenericPackageDescription's.
-selectBestSnapshot
-    :: (HasConfig env, HasGHCVariant env)
-    => [ResolvedPath Dir]
-    -> NonEmpty SnapName
-    -> RIO env (SnapshotCandidate env, RawSnapshotLocation, BuildPlanCheck)
+selectBestSnapshot ::
+     (HasConfig env, HasGHCVariant env)
+  => [ResolvedPath Dir]
+  -> NonEmpty SnapName
+  -> RIO env (SnapshotCandidate env, RawSnapshotLocation, BuildPlanCheck)
 selectBestSnapshot pkgDirs snaps = do
-    logInfo $ "Selecting the best among "
-               <> displayShow (NonEmpty.length snaps)
-               <> " snapshots...\n"
-    F.foldr1 go (NonEmpty.map (getResult <=< snapshotLocation) snaps)
-    where
-        go mold mnew = do
-            old@(_snap, _loc, bpc) <- mold
-            case bpc of
-                BuildPlanCheckOk {} -> pure old
-                _ -> fmap (betterSnap old) mnew
-
-        getResult loc = do
-            candidate <- loadProjectSnapshotCandidate loc NoPrintWarnings False
-            result <- checkSnapBuildPlan pkgDirs Nothing candidate
-            reportResult result loc
-            pure (candidate, loc, result)
-
-        betterSnap (s1, l1, r1) (s2, l2, r2)
-          | compareBuildPlanCheck r1 r2 /= LT = (s1, l1, r1)
-          | otherwise = (s2, l2, r2)
-
-        reportResult BuildPlanCheckOk {} loc = do
-            logInfo $ "* Matches " <> RIO.display loc
-            logInfo ""
-
-        reportResult r@BuildPlanCheckPartial {} loc = do
-            logWarn $ "* Partially matches " <> RIO.display loc
-            logWarn $ RIO.display $ indent $ T.pack $ show r
-
-        reportResult r@BuildPlanCheckFail {} loc = do
-            logWarn $ "* Rejected " <> RIO.display loc
-            logWarn $ RIO.display $ indent $ T.pack $ show r
-
-        indent t = T.unlines $ fmap ("    " <>) (T.lines t)
+  prettyInfo $
+       fillSep
+         [ flow "Selecting the best among"
+         , fromString $ show (NE.length snaps)
+         , "snapshots..."
+         ]
+    <> line
+  F.foldr1 go (NE.map (getResult <=< snapshotLocation) snaps)
+ where
+  go mold mnew = do
+    old@(_snap, _loc, bpc) <- mold
+    case bpc of
+      BuildPlanCheckOk {} -> pure old
+      _ -> fmap (betterSnap old) mnew
+
+  getResult loc = do
+    candidate <- loadProjectSnapshotCandidate loc NoPrintWarnings False
+    result <- checkSnapBuildPlan pkgDirs Nothing candidate
+    reportResult result loc
+    pure (candidate, loc, result)
+
+  betterSnap (s1, l1, r1) (s2, l2, r2)
+    | compareBuildPlanCheck r1 r2 /= LT = (s1, l1, r1)
+    | otherwise = (s2, l2, r2)
+
+  reportResult BuildPlanCheckOk {} loc =
+    prettyNote $
+         fillSep
+           [ flow "Matches"
+           , pretty $ PrettyRawSnapshotLocation loc
+           ]
+      <> line
+
+  reportResult r@BuildPlanCheckPartial {} loc =
+    prettyWarn $
+         fillSep
+           [ flow "Partially matches"
+           , pretty $ PrettyRawSnapshotLocation loc
+           ]
+      <> blankLine
+      <> indent 4 (string (show r))
+
+  reportResult r@BuildPlanCheckFail {} loc =
+    prettyWarn $
+         fillSep
+           [ flow "Rejected"
+           , pretty $ PrettyRawSnapshotLocation loc
+           ]
+      <> blankLine
+      <> indent 4 (string (show r))
 
 showItems :: [String] -> Text
 showItems items = T.concat (map formatItem items)
-    where
-        formatItem item = T.concat
-            [ "    - "
-            , T.pack item
-            , "\n"
-            ]
+ where
+  formatItem item = T.concat
+    [ "    - "
+    , T.pack item
+    , "\n"
+    ]
 
 showPackageFlags :: PackageName -> Map FlagName Bool -> Text
 showPackageFlags pkg fl =
-    if not $ Map.null fl then
-        T.concat
-            [ "    - "
-            , T.pack $ packageNameString pkg
-            , ": "
-            , T.pack $ intercalate ", "
-                     $ map formatFlags (Map.toList fl)
-            , "\n"
-            ]
+  if not $ Map.null fl
+    then
+      T.concat
+        [ "    - "
+        , T.pack $ packageNameString pkg
+        , ": "
+        , T.pack $ intercalate ", "
+                 $ map formatFlags (Map.toList fl)
+        , "\n"
+        ]
     else ""
-    where
-        formatFlags (f, v) = show f ++ " = " ++ show v
+ where
+  formatFlags (f, v) = show f ++ " = " ++ show v
 
 showMapPackages :: Map PackageName a -> Text
 showMapPackages mp = showItems $ map packageNameString $ Map.keys mp
 
-showCompilerErrors
-    :: Map PackageName (Map FlagName Bool)
-    -> DepErrors
-    -> ActualCompiler
-    -> Text
+showCompilerErrors ::
+     Map PackageName (Map FlagName Bool)
+  -> DepErrors
+  -> ActualCompiler
+  -> Text
 showCompilerErrors flags errs compiler =
-    T.concat
-        [ compilerVersionText compiler
-        , " cannot be used for these packages:\n"
-        , showMapPackages $ Map.unions (Map.elems (fmap deNeededBy errs))
-        , showDepErrors flags errs -- TODO only in debug mode
-        ]
+  T.concat
+    [ compilerVersionText compiler
+    , " cannot be used for these packages:\n"
+    , showMapPackages $ Map.unions (Map.elems (fmap (.neededBy) errs))
+    , showDepErrors flags errs -- TODO only in debug mode
+    ]
 
 showDepErrors :: Map PackageName (Map FlagName Bool) -> DepErrors -> Text
 showDepErrors flags errs =
-    T.concat
-        [ T.concat $ map formatError (Map.toList errs)
-        , if T.null flagVals then ""
-          else "Using package flags:\n" <> flagVals
-        ]
-    where
-        formatError (depName, DepError mversion neededBy) = T.concat
-            [ showDepVersion depName mversion
-            , T.concat (map showRequirement (Map.toList neededBy))
-            ]
-
-        showDepVersion depName mversion = T.concat
-            [ T.pack $ packageNameString depName
-            , case mversion of
-                Nothing -> " not found"
-                Just version -> T.concat
-                    [ " version "
-                    , T.pack $ versionString version
-                    , " found"
-                    ]
-            , "\n"
+  T.concat
+    [ T.concat $ map formatError (Map.toList errs)
+    , if T.null flagVals then ""
+      else "Using package flags:\n" <> flagVals
+    ]
+ where
+  formatError (depName, DepError mversion neededBy) = T.concat
+    [ showDepVersion depName mversion
+    , T.concat (map showRequirement (Map.toList neededBy))
+    ]
+
+  showDepVersion depName mversion = T.concat
+    [ T.pack $ packageNameString depName
+    , case mversion of
+        Nothing -> " not found"
+        Just version -> T.concat
+            [ " version "
+            , T.pack $ versionString version
+            , " found"
             ]
-
-        showRequirement (user, range) = T.concat
-            [ "    - "
-            , T.pack $ packageNameString user
-            , " requires "
-            , T.pack $ display range
-            , "\n"
-            ]
-
-        flagVals = T.concat (map showFlags userPkgs)
-        userPkgs = Map.keys $ Map.unions (Map.elems (fmap deNeededBy errs))
-        showFlags pkg = maybe "" (showPackageFlags pkg) (Map.lookup pkg flags)
+    , "\n"
+    ]
+
+  showRequirement (user, range) = T.concat
+    [ "    - "
+    , T.pack $ packageNameString user
+    , " requires "
+    , T.pack $ display range
+    , "\n"
+    ]
+
+  flagVals = T.concat (map showFlags userPkgs)
+  userPkgs = Map.keys $ Map.unions (Map.elems (fmap (.neededBy) errs))
+  showFlags pkg = maybe "" (showPackageFlags pkg) (Map.lookup pkg flags)
diff --git a/src/Stack/CLI.hs b/src/Stack/CLI.hs
new file mode 100644
index 0000000000..2fff57727e
--- /dev/null
+++ b/src/Stack/CLI.hs
@@ -0,0 +1,751 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.CLI
+License     : BSD-3-Clause
+-}
+
+module Stack.CLI
+  ( commandLineHandler
+  ) where
+
+import           Data.Attoparsec.Interpreter ( getInterpreterArgs )
+import           Data.Char ( toLower )
+import qualified Data.List as L
+import           Data.List.NonEmpty ( prependList )
+import           Options.Applicative
+                   ( Parser, ParserFailure, ParserHelp, ParserResult (..)
+                   , handleParseResult, help, helpError, idm, long, metavar
+                   , overFailure, renderFailure, strArgument, switch
+                   )
+import           Options.Applicative.Help ( errorHelp, stringChunk, vcatChunks )
+import           Options.Applicative.Builder.Extra
+                   ( boolFlags, extraHelpOption )
+import           Options.Applicative.Complicated
+                   ( addCommand, addSubCommands, complicatedOptions )
+import           Path ( filename )
+import           RIO.NonEmpty ( (<|) )
+import qualified RIO.NonEmpty as NE
+import qualified RIO.Process ( exec )
+import           RIO.Process ( withProcessContextNoLogging )
+import           Stack.Build ( buildCmd )
+import           Stack.BuildInfo ( hpackVersion, versionString' )
+import           Stack.Clean ( CleanCommand (..), cleanCmd )
+import           Stack.ConfigCmd
+                   ( cfgCmdBuildFiles, cfgCmdBuildFilesName, cfgCmdCompilerTools
+                   , cfgCmdCompilerToolsName, cfgCmdEnv, cfgCmdEnvName
+                   , cfgCmdName, cfgCmdSet, cfgCmdSetName
+                   )
+import           Stack.Constants
+                   ( globalFooter, osIsWindows, relFileStack, relFileStackDotExe
+                   , stackProgName
+                   )
+import           Stack.Coverage ( hpcReportCmd )
+import           Stack.Docker
+                   ( dockerCmdName, dockerHelpOptName, dockerPullCmdName )
+import           Stack.DockerCmd ( dockerPullCmd, dockerResetCmd )
+import           Stack.Dot ( dotCmd )
+import           Stack.Exec ( SpecialExecCmd (..), execCmd )
+import           Stack.Eval ( evalCmd )
+import           Stack.Ghci ( ghciCmd )
+import           Stack.Hoogle ( hoogleCmd )
+import           Stack.IDE ( idePackagesCmd, ideTargetsCmd )
+import           Stack.Init ( initCmd )
+import           Stack.List ( listCmd )
+import           Stack.Ls ( lsCmd )
+import           Stack.New ( newCmd )
+import qualified Stack.Nix as Nix
+import           Stack.Options.BuildParser ( buildOptsParser )
+import           Stack.Options.CleanParser ( cleanOptsParser )
+import           Stack.Options.ConfigEnvParser ( configCmdEnvParser )
+import           Stack.Options.ConfigSetParser ( configCmdSetParser )
+import           Stack.Options.DotParser ( dotOptsParser )
+import           Stack.Options.EvalParser ( evalOptsParser )
+import           Stack.Options.ExecParser ( execOptsParser )
+import           Stack.Options.GhciParser ( ghciOptsParser )
+import           Stack.Options.GlobalParser ( globalOptsParser )
+import           Stack.Options.HpcReportParser ( hpcReportOptsParser )
+import           Stack.Options.IdeParser ( idePackagesParser, ideTargetsParser )
+import           Stack.Options.InitParser ( initOptsParser )
+import           Stack.Options.LsParser ( lsOptsParser )
+import           Stack.Options.NewParser ( newOptsParser )
+import           Stack.Options.PathParser ( pathParser )
+import           Stack.Options.SDistParser ( sdistOptsParser )
+import           Stack.Options.ScriptParser ( scriptOptsParser )
+import           Stack.Options.SetupParser ( setupOptsParser )
+import           Stack.Options.UnpackParser ( unpackOptsParser )
+import           Stack.Options.UpgradeParser ( upgradeOptsParser )
+import           Stack.Options.UploadParser ( uploadOptsParser )
+import           Stack.Options.Utils ( GlobalOptsContext (..) )
+import qualified Stack.Path ( path )
+import           Stack.Prelude
+import           Stack.Query ( queryCmd )
+import           Stack.Runners
+                   ( ShouldReexec (..), withBuildConfig, withConfig
+                   , withDefaultEnvConfig
+                   )
+import           Stack.SDist ( sdistCmd )
+import           Stack.Script ( ScriptOpts (..), scriptCmd )
+import           Stack.SetupCmd ( setupCmd )
+import           Stack.Templates ( templatesCmd )
+import           Stack.Types.AddCommand ( AddCommand )
+import           Stack.Types.BuildOptsCLI ( BuildCommand (..) )
+import           Stack.Types.GlobalOptsMonoid ( GlobalOptsMonoid (..) )
+import           Stack.Types.Runner ( Runner )
+import           Stack.Types.Version ( stackVersion )
+import           Stack.Uninstall ( uninstallCmd )
+import           Stack.Unpack ( unpackCmd )
+import           Stack.Update ( updateCmd )
+import           Stack.Upgrade ( upgradeCmd )
+import           Stack.Upload ( uploadCmd )
+import qualified System.Directory as D
+import           System.Environment ( withArgs )
+import           System.FilePath ( pathSeparator, takeDirectory )
+
+-- | Type representing \'pretty\' exceptions thrown by functions in the
+-- "Stack.CLI" module.
+data CliPrettyException
+  = NoArgumentsBug
+  deriving Show
+
+instance Pretty CliPrettyException where
+  pretty NoArgumentsBug = bugPrettyReport "[S-4639]" $
+    flow "commandLineHandler: no command line arguments on event of failure."
+
+instance Exception CliPrettyException
+
+-- | Stack's command line handler.
+commandLineHandler ::
+     FilePath
+  -> String
+     -- ^ The name of the current Stack executable, as it was invoked.
+  -> Maybe (Path Abs File)
+     -- ^ The path to the current Stack executable, if the operating system
+     -- provides a reliable way to determine it and where a result was
+     -- available.
+  -> Bool
+  -> IO (GlobalOptsMonoid, RIO Runner ())
+commandLineHandler currentDir progName mExecutablePath isInterpreter =
+  -- Append the relevant default (potentially affecting the LogLevel) *after*
+  -- appending the global options of the `stack` command to the global options
+  -- of the subcommand - see #5326.
+  first (<> defaultGlobalOpts) <$> complicatedOptions
+    stackVersion
+    (Just versionString')
+    hpackVersion
+    "stack - The Haskell Tool Stack"
+    ""
+    ("Stack's documentation is available at https://docs.haskellstack.org/. \
+    \Command '" <> progName <> " COMMAND --help' for help about a Stack command. Stack also \
+    \supports the Haskell Error Index at https://errors.haskell.org/.")
+    (globalOpts OuterGlobalOpts)
+    (Just failureCallback)
+    addCommands
+ where
+  defaultGlobalOpts = if isInterpreter
+    then
+      -- Silent except when errors occur - see #2879
+      mempty { logLevel = First (Just LevelError) }
+    else mempty
+  failureCallback f args =
+    case L.stripPrefix "Invalid argument" (fst (renderFailure f "")) of
+      Just _ -> maybe
+        (prettyThrowIO NoArgumentsBug)
+        ( \args' -> if isInterpreter
+            then
+              parseResultHandler (NE.toList args') f
+            else
+              secondaryCommandHandler args' f
+                >>= interpreterHandler progName mExecutablePath currentDir args'
+        )
+        (NE.nonEmpty args)
+      Nothing -> parseResultHandler args f
+
+  parseResultHandler args f =
+    if isInterpreter
+    then do
+      let hlp = errorHelp $ stringChunk
+            (unwords ["Error executing interpreter command:"
+                      , progName
+                      , unwords args])
+      handleParseResult (overFailure (vcatErrorHelp hlp) (Failure f))
+    else handleParseResult (Failure f)
+
+  -- The order of commands below determines the order in which they are listed
+  -- in `stack --help`.
+  addCommands = do
+    unless isInterpreter $ do
+      build
+      install
+      uninstall
+      test
+      bench
+      haddock
+      new
+      templates
+      init
+      setup
+      path
+      ls
+      unpack
+      update
+      upgrade
+      upload
+      sdist
+      dot
+      ghc
+      hoogle
+    -- These are the only commands allowed in interpreter mode as well
+    exec
+    run
+    ghci
+    repl
+    runghc
+    runhaskell
+    script
+    unless isInterpreter $ do
+      eval
+      clean
+      purge
+      query
+      list
+      ide
+      docker
+      config
+      hpc
+
+  -- Stack's subcommands are listed below in alphabetical order
+
+  bench = addBuildCommand'
+    "bench"
+    "Shortcut for 'build --bench'."
+    buildCmd
+    (buildOptsParser Bench)
+
+  build = addBuildCommand'
+    "build"
+    "Build the package(s) in this directory/configuration."
+    buildCmd
+    (buildOptsParser Build)
+
+  clean = addCommand'
+    "clean"
+    "Delete build artefacts for project packages."
+    cleanCmd
+    (cleanOptsParser Clean)
+
+  config = addSubCommands'
+      cfgCmdName
+        "Subcommands for accessing and modifying configuration values."
+        ( do
+            addCommand'
+              cfgCmdSetName
+              "Set a key in a configuration file to value."
+              (withConfig NoReexec . cfgCmdSet)
+              configCmdSetParser
+            addCommandWithLocalInstallRootFooter
+              cfgCmdEnvName
+              "Print environment variables for use in a shell."
+              (withConfig YesReexec . withDefaultEnvConfig . cfgCmdEnv)
+              configCmdEnvParser
+            addCommand'
+              cfgCmdBuildFilesName
+              "Generate (when applicable) a Cabal file from a package \
+              \ description in the Hpack format and/or a lock file for Stack's \
+              \project-level configuration."
+              -- It is withBuildConfig that yields the desired actions;
+              -- cfgCmdBuildFiles itself yields nothing of interest.
+              (withConfig YesReexec . withBuildConfig . cfgCmdBuildFiles)
+              (pure ())
+            addCommand'
+              cfgCmdCompilerToolsName
+              "Create (when applicable) the compiler tools directory for the \
+              \specified compiler version (implies 'config build-files')."
+              (withConfig YesReexec . withDefaultEnvConfig . cfgCmdCompilerTools)
+              (pure ())
+        )
+
+  docker = addSubCommands'
+    dockerCmdName
+    "Subcommands specific to Docker use."
+    ( do
+        addCommand'
+          dockerPullCmdName
+          "Pull latest version of Docker image from registry."
+          dockerPullCmd
+          (pure ())
+        addCommand'
+          "reset"
+          "Reset the Docker sandbox."
+          dockerResetCmd
+          ( switch
+              (  long "keep-home"
+              <> help "Do not delete sandbox's home directory."
+              )
+          )
+    )
+
+  dot = addCommand'
+    "dot"
+    "Visualize your project's dependency graph using Graphviz dot."
+    dotCmd
+    (dotOptsParser False) -- Default for --external is False.
+
+  eval = addCommand'
+    "eval"
+    "Evaluate some Haskell code inline. Shortcut for \
+    \'stack exec ghc -- -e CODE'."
+    evalCmd
+    (evalOptsParser "CODE")
+
+  exec = addCommandWithLocalInstallRootFooter
+    "exec"
+    "Execute a command. If the command is absent, the first of any arguments \
+    \is taken as the command."
+    execCmd
+    (execOptsParser Nothing)
+
+  ghc = addCommand'
+    "ghc"
+    "Run ghc."
+    execCmd
+    (execOptsParser $ Just ExecGhc)
+
+  ghci = addGhciCommand'
+    "ghci"
+    "Run ghci in the context of package(s)."
+    ghciCmd
+    ghciOptsParser
+
+  haddock = addBuildCommand'
+    "haddock"
+    "Shortcut for 'build --haddock'."
+    buildCmd
+    (buildOptsParser Haddock)
+
+  hoogle = addCommand'
+    "hoogle"
+    "Run hoogle, the Haskell API search engine. Use the '-- ARGUMENT(S)' \
+    \syntax to pass Hoogle arguments, e.g. 'stack hoogle -- --count=20', \
+    \or 'stack hoogle -- server --local'."
+    hoogleCmd
+    ( (,,,)
+        <$> many (strArgument
+              ( metavar "-- ARGUMENT(S) (e.g. 'stack hoogle -- server --local')"
+              ))
+        <*> boolFlags
+              True
+              "setup"
+              "If needed: install Hoogle, build Haddock documentation and \
+              \generate a Hoogle database."
+              idm
+        <*> switch
+              (  long "rebuild"
+              <> help "Rebuild the Hoogle database."
+              )
+        <*> switch
+              (  long "server"
+              <> help "Start local Hoogle server."
+              )
+      )
+
+  hpc = addSubCommands'
+    "hpc"
+    "Subcommands specific to Haskell Program Coverage."
+    ( addCommand'
+        "report"
+        "Generate unified HPC coverage report from tix files and project \
+        \targets."
+        hpcReportCmd
+        hpcReportOptsParser
+    )
+
+  ide = addSubCommands'
+    "ide"
+    "IDE-specific commands."
+    ( do
+        addCommand'
+          "packages"
+          "List all available local loadable packages."
+          idePackagesCmd
+          idePackagesParser
+        addCommand'
+          "targets"
+          "List all targets or pick component types to list."
+          ideTargetsCmd
+          ideTargetsParser
+    )
+
+  init = addCommand'
+    "init"
+    "Create Stack project configuration from Cabal or Hpack package \
+    \specifications. If a snapshot is specified at the command line, the \
+    \command will try to use it."
+    initCmd
+    initOptsParser
+
+  install = addBuildCommand'
+    "install"
+    "Shortcut for 'build --copy-bins'."
+    buildCmd
+    (buildOptsParser Install)
+
+  list = addCommand'
+    "list"
+    "List package versions included in the package index, or in a specified \
+    \snapshot (directly or indirectly)."
+    listCmd
+    (many $ strArgument $ metavar "PACKAGE")
+
+  ls = addCommand'
+    "ls"
+    "List command. (Supports snapshots, global packages, dependencies, Stack's \
+    \styles and installed tools.)"
+    lsCmd
+    lsOptsParser
+
+  new = addCommand'
+    "new"
+    "Create a new project from a template. Run 'stack templates' to see \
+    \available templates. A local file or a remote URL can be specified as a \
+    \template. Will initialise if there is no stack.yaml file. Initialisation \
+    \may be forced. If a snapshot is specified at the command line, \
+    \initialisation will try to use it."
+    newCmd
+    newOptsParser
+
+  path = addCommandWithLocalInstallRootFooter
+    "path"
+    "Print out handy path information."
+    Stack.Path.path
+    pathParser
+
+  purge = addCommand'
+    "purge"
+    "Delete the project Stack working directories (.stack-work by \
+    \default). Shortcut for 'stack clean --full'."
+    cleanCmd
+    (cleanOptsParser Purge)
+
+  query = addCommand'
+    "query"
+    "Query general build information (experimental)."
+    queryCmd
+    (many $ strArgument $ metavar "SELECTOR...")
+
+  repl = addGhciCommand'
+    "repl"
+    "Run ghci in the context of package(s) (alias for 'ghci')."
+    ghciCmd
+    ghciOptsParser
+
+  run = addCommand'
+    "run"
+    "Build and run an executable. Defaults to the first available \
+    \executable if none is provided as the first argument."
+    execCmd
+    (execOptsParser $ Just ExecRun)
+
+  runghc = addCommand'
+    "runghc"
+    "Run runghc."
+    execCmd
+    (execOptsParser $ Just ExecRunGhc)
+
+  runhaskell = addCommand'
+    "runhaskell"
+    "Run runghc (alias for 'runghc')."
+    execCmd
+    (execOptsParser $ Just ExecRunGhc)
+
+  script = addCommand
+    "script"
+    "Run a Stack script."
+    globalFooter
+    scriptCmd
+    (\so gom -> gom { snapshotRoot = First $ Just $ takeDirectory so.file })
+    (globalOpts OtherCmdGlobalOpts)
+    scriptOptsParser
+
+  sdist = addCommand'
+    "sdist"
+    "Create source distribution tarballs."
+    sdistCmd
+    sdistOptsParser
+
+  setup = addCommand'
+    "setup"
+    "Get the appropriate GHC for your project."
+    setupCmd
+    setupOptsParser
+
+  templates = addCommand'
+    "templates"
+    "Show how to find templates available for 'stack new'. 'stack new' \
+    \can accept a template from a remote repository (default: github), \
+    \local file or remote URL. Note: this downloads the help file."
+    templatesCmd
+    (pure ())
+
+  test = addBuildCommand'
+    "test"
+    "Shortcut for 'build --test'."
+    buildCmd
+    (buildOptsParser Test)
+
+  uninstall = addCommand'
+    "uninstall"
+    "Show how to uninstall Stack or a Stack-supplied tool. This command does \
+    \not itself uninstall Stack or a Stack-supplied tool."
+    uninstallCmd
+    (pure ())
+
+  unpack = addCommand'
+    "unpack"
+    "Unpack one or more packages, or one or more package candidates, locally."
+    unpackCmd
+    unpackOptsParser
+
+  update = addCommand'
+    "update"
+    "Update the package index."
+    updateCmd
+    (pure ())
+
+  upgrade = addCommand''
+    "upgrade"
+    "Upgrade Stack, installing to Stack's local-bin directory and, if \
+    \different and permitted, the directory of the current Stack \
+    \executable."
+    upgradeCmd
+    "Warning: if you use GHCup to install Stack, use only GHCup to \
+    \upgrade Stack."
+    (upgradeOptsParser onlyLocalBins)
+   where
+    isProgNameStack =
+         (lowercase progName == lowercase stackProgName)
+      || (  osIsWindows
+         && lowercase progName == lowercase (stackProgName <> ".EXE")
+         )
+    isRelFileNameStack relFile =
+         (relFile == relFileStack)
+      || (osIsWindows && relFile == relFileStackDotExe )
+    isExecutableNameStack =
+      let mExecutableName = filename <$> mExecutablePath
+      in  maybe False isRelFileNameStack mExecutableName
+    onlyLocalBins = not (isProgNameStack && isExecutableNameStack)
+    lowercase = map toLower
+
+  upload = addCommand'
+    "upload"
+    "Upload one or more packages, or documentation for one or more packages, \
+    \to Hackage."
+    uploadCmd
+    uploadOptsParser
+
+  -- addCommand hiding global options
+  addCommand' ::
+       String
+    -> String
+    -> (a -> RIO Runner ())
+    -> Parser a
+    -> AddCommand
+  addCommand' cmd title constr =
+    addCommand
+      cmd
+      title
+      globalFooter
+      constr
+      (\_ gom -> gom)
+      (globalOpts OtherCmdGlobalOpts)
+
+  -- addCommand with custom footer hiding global options
+  addCommand'' ::
+       String
+    -> String
+    -> (a -> RIO Runner ())
+    -> String
+    -> Parser a
+    -> AddCommand
+  addCommand'' cmd title constr cmdFooter =
+    addCommand
+      cmd
+      title
+      (globalFooter <> " " <> cmdFooter)
+      constr
+      (\_ gom -> gom)
+      (globalOpts OtherCmdGlobalOpts)
+
+  -- addCommand with custom footer about options affecting the local install
+  --root and hiding global options
+  addCommandWithLocalInstallRootFooter ::
+       String
+    -> String
+    -> (a -> RIO Runner ())
+    -> Parser a
+    -> AddCommand
+  addCommandWithLocalInstallRootFooter cmd title constr =
+    addCommand''
+      cmd
+      title
+      constr
+      "This command also accepts 'stack build' flags and options that affect \
+      \the location of the local project installation root directory."
+
+  addSubCommands' ::
+       String
+    -> String
+    -> AddCommand
+    -> AddCommand
+  addSubCommands' cmd title =
+    addSubCommands
+      cmd
+      title
+      globalFooter
+      (globalOpts OtherCmdGlobalOpts)
+
+  -- Additional helper that hides global options and shows build options
+  addBuildCommand' ::
+       String
+    -> String
+    -> (a -> RIO Runner ())
+    -> Parser a
+    -> AddCommand
+  addBuildCommand' cmd title constr =
+      addCommand
+        cmd
+        title
+        globalFooter
+        constr
+        (\_ gom -> gom)
+        (globalOpts BuildCmdGlobalOpts)
+
+  -- Additional helper that hides global options and shows some ghci options
+  addGhciCommand' ::
+       String
+    -> String
+    -> (a -> RIO Runner ())
+    -> Parser a
+    -> AddCommand
+  addGhciCommand' cmd title constr =
+      addCommand
+        cmd
+        title
+        globalFooter
+        constr
+        (\_ gom -> gom)
+        (globalOpts GhciCmdGlobalOpts)
+
+  globalOpts :: GlobalOptsContext -> Parser GlobalOptsMonoid
+  globalOpts kind =
+        extraHelpOption
+          hide
+          progName
+          (dockerCmdName ++ "*")
+          dockerHelpOptName
+    <*> extraHelpOption
+          hide
+          progName
+          (Nix.nixCmdName ++ "*")
+          Nix.nixHelpOptName
+    <*> globalOptsParser currentDir kind
+   where
+    hide = kind /= OuterGlobalOpts
+
+-- | fall-through to external executables in \'git\' style if they exist
+-- (i.e. @stack something@ looks for @stack-something@ before failing with
+-- "Invalid argument \'something\'".)
+secondaryCommandHandler ::
+     NonEmpty String
+  -> ParserFailure ParserHelp
+  -> IO (ParserFailure ParserHelp)
+secondaryCommandHandler args f =
+  -- don't even try when the argument looks like a path or flag
+  if elem pathSeparator cmd || "-" `L.isPrefixOf` NE.head args
+     then pure f
+  else do
+    D.findExecutable cmd >>= \case
+      Just ex -> withProcessContextNoLogging $ do
+        -- TODO show the command in verbose mode
+        -- hPutStrLn stderr $ unwords $
+        --   ["Running", "[" ++ ex, unwords (tail args) ++ "]"]
+        _ <- RIO.Process.exec ex (NE.tail args)
+        pure f
+      Nothing -> pure $ fmap (vcatErrorHelp (noSuchCmd cmd)) f
+ where
+  -- FIXME this is broken when any options are specified before the command
+  -- e.g. stack --verbosity silent cmd
+  cmd = stackProgName <> "-" <> NE.head args
+  noSuchCmd name = errorHelp $ stringChunk
+    ("Auxiliary command not found in path '" ++ name ++ "'.")
+
+interpreterHandler ::
+     Monoid t
+  => String
+     -- ^ The name of the current Stack executable, as it was invoked.
+  -> Maybe (Path Abs File)
+     -- ^ The path to the current Stack executable, if the operating system
+     -- provides a reliable way to determine it and where a result was
+     -- available.
+  -> FilePath
+  -> NonEmpty String
+  -> ParserFailure ParserHelp
+  -> IO (GlobalOptsMonoid, (RIO Runner (), t))
+interpreterHandler progName mExecutablePath currentDir args f = do
+  -- args can include top-level config such as --extra-lib-dirs=... (set by
+  -- nix-shell) - we need to find the first argument which is a file, everything
+  -- afterwards is an argument to the script, everything before is an argument
+  -- to Stack
+  (stackArgs, fileArgs) <- spanM (fmap not . D.doesFileExist) args
+  case fileArgs of
+    (file:fileArgs') -> runInterpreterCommand file stackArgs fileArgs'
+    [] -> parseResultHandler (errorCombine (noSuchFile firstArg))
+ where
+  firstArg = NE.head args
+
+  spanM p xs@(x :| rest) = do
+    r <- p x
+    if r
+      then case rest of
+        [] -> pure ([x], [])
+        (x': rest') -> do
+          (ys, zs) <- spanM p (x' :| rest')
+          pure (x : ys, zs)
+      else
+        pure ([], NE.toList xs)
+
+  -- if the first argument contains a path separator then it might be a file,
+  -- or a Stack option referencing a file. In that case we only show the
+  -- interpreter error message and exclude the command related error messages.
+  errorCombine =
+    if pathSeparator `elem` firstArg
+      then overrideErrorHelp
+      else vcatErrorHelp
+
+  overrideErrorHelp h1 h2 = h2 { helpError = helpError h1 }
+
+  parseResultHandler fn = handleParseResult (overFailure fn (Failure f))
+  noSuchFile name = errorHelp $ stringChunk
+    ("File does not exist or is not a regular file '" ++ name ++ "'.")
+
+  runInterpreterCommand path stackArgs fileArgs = do
+    iargs <- getInterpreterArgs path
+    let parseCmdLine =
+          commandLineHandler currentDir progName mExecutablePath True
+        -- Implicit file arguments are put before other arguments that
+        -- occur after "--". See #3658
+        cmdArgs = prependList stackArgs $ case NE.break (== "--") iargs of
+          (beforeSep, []) -> prependList beforeSep $ "--" <| path :| fileArgs
+          (beforeSep, optSep : afterSep) ->
+            prependList beforeSep $ optSep <| path :| fileArgs <> afterSep
+     -- TODO show the command in verbose mode
+     -- hPutStrLn stderr $ unwords $
+     --   ["Running", "[" ++ progName, unwords cmdArgs ++ "]"]
+    (a,b) <- withArgs (NE.toList cmdArgs) parseCmdLine
+    pure (a,(b,mempty))
+
+-- Vertically combine only the error component of the first argument with the
+-- error component of the second.
+vcatErrorHelp :: ParserHelp -> ParserHelp -> ParserHelp
+vcatErrorHelp h1 h2 = h2 { helpError = vcatChunks [helpError h2, helpError h1] }
diff --git a/src/Stack/Clean.hs b/src/Stack/Clean.hs
index b34aeb4f8e..0778bfc672 100644
--- a/src/Stack/Clean.hs
+++ b/src/Stack/Clean.hs
@@ -1,83 +1,174 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE ConstraintKinds    #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Clean
+Description : Types and functions related to Stack's @clean@ and @purge@ commands.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @clean@ and @purge@ commands.
+-}
 
--- | Clean a project.
 module Stack.Clean
-    (clean
-    ,CleanOpts(..)
-    ,CleanCommand(..)
-    ,StackCleanException(..)
-    ) where
+  ( CleanOpts (..)
+  , CleanDepth (..)
+  , CleanCommand (..)
+  , cleanCmd
+  , clean
+  ) where
 
-import           Stack.Prelude
-import           Data.List ((\\),intercalate)
+import           Control.Monad.Extra ( concatMapM )
+import           Data.List ( (\\) )
 import qualified Data.Map.Strict as Map
-import           Path.IO (ignoringAbsence, removeDirRecur)
-import           Stack.Config (withBuildConfig)
-import           Stack.Constants.Config (rootDistDirFromDir, workDirFromDir)
-import           Stack.Types.Config
-import           Stack.Types.SourceMap
+import           Path ( (</>), isProperPrefixOf )
+import           Path.IO ( ignoringAbsence, listDirRecur, removeDirRecur )
+import           Stack.Config ( withBuildConfig )
+import           Stack.Constants.Config
+                   ( distRelativeDir, rootDistDirFromDir, workDirFromDir )
+import           Stack.Prelude
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..), getWorkDir )
+import           Stack.Types.Config ( Config )
+import           Stack.Types.EnvConfig ( EnvConfig )
+import           Stack.Types.Runner ( Runner )
+import           Stack.Types.SourceMap ( ProjectPackage, SMWanted (..), ppRoot )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Clean" module.
+data CleanPrettyException
+  = NonLocalPackages [PackageName]
+  | DeletionFailures [(Path Abs Dir, SomeException)]
+  deriving Show
+
+instance Pretty CleanPrettyException where
+  pretty (NonLocalPackages pkgs) =
+    "[S-9463]"
+    <> line
+    <> fillSep
+         ( flow "The following are not project packages:"
+         : mkNarrativeList (Just Current) False
+             (map fromPackageName pkgs :: [StyleDoc])
+         )
+  pretty (DeletionFailures failures) =
+    "[S-6321]"
+    <> line
+    <> flow "Exception while recursively deleting:"
+    <> line
+    <> mconcat (map prettyFailure failures)
+    <> flow "Perhaps you do not have permission to delete these files or they \
+            \are in use?"
+   where
+    prettyFailure (dir, e) =
+         pretty dir
+      <> line
+      <> string (displayException e)
+      <> line
+
+instance Exception CleanPrettyException
+
+-- | Type representing command line options for the @stack clean@ command.
+data CleanOpts = CleanOpts
+  { depth    :: !CleanDepth
+  , omitThis :: !Bool
+  }
+
+-- | Type representing depths of cleaning for the @stack clean@ command.
+data CleanDepth
+  = CleanShallow [PackageName]
+    -- ^ Delete the "dist directories" as defined in
+    -- 'Stack.Constants.Config.distRelativeDir' for the given project packages.
+    -- If no project packages are given, all project packages should be cleaned.
+  | CleanFull
+    -- ^ Delete all work directories in the project.
+
+-- | Type representing Stack's cleaning commands.
+data CleanCommand
+  = Clean
+  | Purge
+
+-- | Function underlying the @stack clean@ command.
+cleanCmd :: CleanOpts -> RIO Runner ()
+cleanCmd = withConfig NoReexec . clean
 
 -- | Deletes build artifacts in the current project.
---
--- Throws 'StackCleanException'.
 clean :: CleanOpts -> RIO Config ()
 clean cleanOpts = do
-    toDelete <- withBuildConfig $ dirsToDelete cleanOpts
-    logDebug $ "Need to delete: " <> fromString (show (map toFilePath toDelete))
-    failures <- mapM cleanDir toDelete
-    when (or failures) exitFailure
-  where
-    cleanDir dir = do
-      logDebug $ "Deleting directory: " <> fromString (toFilePath dir)
-      liftIO (ignoringAbsence (removeDirRecur dir) >> pure False) `catchAny` \ex -> do
-        logError $ "Exception while recursively deleting " <> fromString (toFilePath dir) <> "\n" <> displayShow ex
-        logError "Perhaps you do not have permission to delete these files or they are in use?"
-        pure True
-
-dirsToDelete :: CleanOpts -> RIO BuildConfig [Path Abs Dir]
-dirsToDelete cleanOpts = do
-    packages <- view $ buildConfigL.to (smwProject . bcSMWanted)
-    case cleanOpts of
-        CleanShallow [] ->
-            -- Filter out packages listed as extra-deps
-            mapM (rootDistDirFromDir . ppRoot) $ Map.elems packages
-        CleanShallow targets -> do
-            let localPkgNames = Map.keys packages
-                getPkgDir pkgName' = fmap ppRoot (Map.lookup pkgName' packages)
-            case targets \\ localPkgNames of
-                [] -> mapM rootDistDirFromDir (mapMaybe getPkgDir targets)
-                xs -> throwM (NonLocalPackages xs)
-        CleanFull -> do
-            pkgWorkDirs <- mapM (workDirFromDir . ppRoot) $ Map.elems packages
-            projectWorkDir <- getProjectWorkDir
-            pure (projectWorkDir : pkgWorkDirs)
-
--- | Options for @stack clean@.
-data CleanOpts
-    = CleanShallow [PackageName]
-    -- ^ Delete the "dist directories" as defined in 'Stack.Constants.Config.distRelativeDir'
-    -- for the given local packages. If no packages are given, all project packages
-    -- should be cleaned.
-    | CleanFull
-    -- ^ Delete all work directories in the project.
+  toDelete <- if cleanOpts.omitThis
+    then
+      withDefaultEnvConfig $ dirsToDeleteGivenConfig cleanOpts.depth
+    else
+      withBuildConfig $ dirsToDeleteSimple cleanOpts.depth
+  logDebug $ "Need to delete: " <> fromString (show (map toFilePath toDelete))
+  failures <- catMaybes <$> mapM cleanDir toDelete
+  case failures of
+    [] -> pure ()
+    _  -> prettyThrowIO $ DeletionFailures failures
 
--- | Clean commands
-data CleanCommand
-    = Clean
-    | Purge
+cleanDir :: Path Abs Dir -> RIO Config (Maybe (Path Abs Dir, SomeException))
+cleanDir dir = do
+  logDebug $ "Deleting directory: " <> fromString (toFilePath dir)
+  liftIO (ignoringAbsence (removeDirRecur dir) >> pure Nothing) `catchAny` \ex ->
+    pure $ Just (dir, ex)
+
+dirsToDeleteSimple :: CleanDepth -> RIO BuildConfig [Path Abs Dir]
+dirsToDeleteSimple depth = do
+  packages <- view $ buildConfigL . to (.smWanted.project)
+  case depth of
+    CleanShallow [] -> do
+      -- Filter out packages listed as extra-deps
+      let pkgNames = Map.elems packages
+      mapM (rootDistDirFromDir . ppRoot) pkgNames
+    CleanShallow targets -> do
+      let localPkgNames = Map.keys packages
+          getPkgDir pkgName' = fmap ppRoot (Map.lookup pkgName' packages)
+          pkgNames = mapMaybe getPkgDir targets
+      case targets \\ localPkgNames of
+        [] -> mapM rootDistDirFromDir pkgNames
+        xs -> prettyThrowM (NonLocalPackages xs)
+    CleanFull -> allWorkDirs $ Map.elems packages
+
+dirsToDeleteGivenConfig :: CleanDepth -> RIO EnvConfig [Path Abs Dir]
+dirsToDeleteGivenConfig depth = do
+  packages <- view $ buildConfigL . to (.smWanted.project)
+  case depth of
+    CleanShallow [] -> do
+      -- Filter out packages listed as extra-deps
+      let pkgNames = Map.elems packages
+      concatMapM (unusedRootDistDirsFromDir . ppRoot) pkgNames
+    CleanShallow targets -> do
+      let localPkgNames = Map.keys packages
+          getPkgDir pkgName' = fmap ppRoot (Map.lookup pkgName' packages)
+          pkgNames = mapMaybe getPkgDir targets
+      case targets \\ localPkgNames of
+        [] -> concatMapM unusedRootDistDirsFromDir pkgNames
+        xs -> prettyThrowM (NonLocalPackages xs)
+    CleanFull -> allWorkDirs $ Map.elems packages
 
--- | Exceptions during cleanup.
-newtype StackCleanException
-    = NonLocalPackages [PackageName]
-    deriving (Typeable)
+allWorkDirs :: HasBuildConfig env => [ProjectPackage] -> RIO env [Path Abs Dir]
+allWorkDirs pps = do
+  pkgWorkDirs <- mapM (workDirFromDir . ppRoot) pps
+  projectWorkDir <- getWorkDir
+  pure (projectWorkDir : pkgWorkDirs)
 
-instance Show StackCleanException where
-    show (NonLocalPackages pkgs) =
-        "The following packages are not part of this project: " ++
-        intercalate ", " (map show pkgs)
+unusedRootDistDirsFromDir :: Path Abs Dir -> RIO EnvConfig [Path Abs Dir]
+unusedRootDistDirsFromDir pkgDir = do
+  rootDistDir <- rootDistDirFromDir pkgDir
+  omitDir <- fmap (pkgDir </>) distRelativeDir
+  allDirsOmittingDirs rootDistDir omitDir
 
-instance Exception StackCleanException
+allDirsOmittingDirs ::
+     MonadIO m
+  => Path Abs Dir
+  -> Path Abs Dir
+  -> m [Path Abs Dir]
+allDirsOmittingDirs topDir subDir = do
+  allDirs <- (topDir :) . fst <$> listDirRecur topDir
+  let isNotInSubDir dir = not
+        ( isProperPrefixOf dir subDir
+        || subDir == dir
+        || isProperPrefixOf subDir dir
+        )
+  pure $ filter isNotInSubDir allDirs
diff --git a/src/Stack/Component.hs b/src/Stack/Component.hs
new file mode 100644
index 0000000000..9b92d3df4a
--- /dev/null
+++ b/src/Stack/Component.hs
@@ -0,0 +1,215 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Component
+License     : BSD-3-Clause
+
+All utility functions for Components in Stack (library, internal library,
+foreign library, executable, tests, benchmarks). In particular, this module
+gathers all the Cabal-to-Stack component translations, which previously occurred
+in the "Stack.Package" module. See "Stack.Types.Component" for more details
+about the design choices.
+-}
+
+module Stack.Component
+  ( isComponentBuildable
+  , stackLibraryFromCabal
+  , stackExecutableFromCabal
+  , stackForeignLibraryFromCabal
+  , stackBenchmarkFromCabal
+  , stackTestFromCabal
+  , foldOnNameAndBuildInfo
+  , componentDependencyMap
+  , fromCabalName
+  ) where
+
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import           Data.Text ( pack )
+import           Distribution.PackageDescription
+                   ( Benchmark (..), Executable, ForeignLib, Library (..)
+                   , TestSuite (..)
+                   )
+import           Distribution.Types.BuildInfo ( BuildInfo )
+import           Distribution.Package ( mkPackageName )
+import qualified Distribution.PackageDescription as Cabal
+import           Distribution.Utils.Path (interpretSymbolicPathCWD)
+import           GHC.Records ( HasField )
+import           Stack.Prelude
+import           Stack.Types.Component
+                   ( HasBuildInfo, StackBenchmark (..), StackBuildInfo (..)
+                   , StackExecutable (..), StackForeignLibrary (..)
+                   , StackLibrary (..), StackTestSuite (..)
+                   , StackUnqualCompName (..)
+                   )
+import           Stack.Types.ComponentUtils ( fromCabalName )
+import           Stack.Types.Dependency ( cabalExeToStackDep, cabalToStackDep )
+
+foldOnNameAndBuildInfo ::
+     ( HasField "buildInfo" a StackBuildInfo
+     , HasField "name" a StackUnqualCompName
+     , Foldable c
+     )
+  => c a
+  -> (StackUnqualCompName -> StackBuildInfo -> t -> t)
+  -> t
+  -> t
+foldOnNameAndBuildInfo initialCollection accumulator input =
+  foldr' iterator input initialCollection
+ where
+  iterator comp = accumulator comp.name comp.buildInfo
+
+stackLibraryFromCabal :: Library -> StackLibrary
+stackLibraryFromCabal cabalLib = StackLibrary
+  { name = case cabalLib.libName of
+      LMainLibName -> StackUnqualCompName mempty
+      LSubLibName v -> fromCabalName v
+  , buildInfo = stackBuildInfoFromCabal cabalLib.libBuildInfo
+  , exposedModules = cabalLib.exposedModules
+  , signatures = cabalLib.signatures
+  }
+
+stackExecutableFromCabal :: Executable -> StackExecutable
+stackExecutableFromCabal cabalExecutable = StackExecutable
+  { name = fromCabalName cabalExecutable.exeName
+  , buildInfo = stackBuildInfoFromCabal cabalExecutable.buildInfo
+  , modulePath = interpretSymbolicPathCWD cabalExecutable.modulePath
+  }
+
+stackForeignLibraryFromCabal :: ForeignLib -> StackForeignLibrary
+stackForeignLibraryFromCabal cabalForeignLib = StackForeignLibrary
+  { name = fromCabalName cabalForeignLib.foreignLibName
+  , buildInfo=stackBuildInfoFromCabal cabalForeignLib.foreignLibBuildInfo
+  }
+
+stackBenchmarkFromCabal :: Benchmark -> StackBenchmark
+stackBenchmarkFromCabal cabalBenchmark = StackBenchmark
+  { name = fromCabalName cabalBenchmark.benchmarkName
+  , interface = cabalBenchmark.benchmarkInterface
+  , buildInfo = stackBuildInfoFromCabal cabalBenchmark.benchmarkBuildInfo
+  }
+
+stackTestFromCabal :: TestSuite -> StackTestSuite
+stackTestFromCabal cabalTest = StackTestSuite
+  { name = fromCabalName cabalTest.testName
+  , interface = cabalTest.testInterface
+  , buildInfo = stackBuildInfoFromCabal cabalTest.testBuildInfo
+  }
+
+isComponentBuildable :: HasBuildInfo component => component -> Bool
+isComponentBuildable componentRec = componentRec.buildInfo.buildable
+
+stackBuildInfoFromCabal :: BuildInfo -> StackBuildInfo
+stackBuildInfoFromCabal buildInfoV = gatherComponentToolsAndDepsFromCabal
+  buildInfoV.buildTools
+  buildInfoV.buildToolDepends
+  buildInfoV.targetBuildDepends
+  StackBuildInfo
+    { buildable = buildInfoV.buildable
+    , otherModules = buildInfoV.otherModules
+    , jsSources = map interpretSymbolicPathCWD buildInfoV.jsSources
+    , hsSourceDirs = buildInfoV.hsSourceDirs
+    , cSources = map interpretSymbolicPathCWD buildInfoV.cSources
+    , dependency = mempty
+    , unknownTools = mempty
+    , cppOptions = buildInfoV.cppOptions
+    , targetBuildDepends = buildInfoV.targetBuildDepends
+    , options = buildInfoV.options
+    , allLanguages = Cabal.allLanguages buildInfoV
+    , usedExtensions = Cabal.usedExtensions buildInfoV
+    , includeDirs = map interpretSymbolicPathCWD buildInfoV.includeDirs
+    , extraLibs = buildInfoV.extraLibs
+    , extraLibDirs = map interpretSymbolicPathCWD buildInfoV.extraLibDirs
+    , frameworks = map interpretSymbolicPathCWD buildInfoV.frameworks
+    , mixins = buildInfoV.mixins
+    }
+
+-- | Iterate on all three dependency list given, and transform and sort them
+-- between 'Stack.Types.Component.unknownTools' and
+-- legitimate t'Stack.Types.Dependency.DepValue'
+-- 'Stack.Types.Component.dependency'. Bear in mind that this only gathers the
+-- component level dependencies.
+gatherComponentToolsAndDepsFromCabal ::
+    [Cabal.LegacyExeDependency]
+     -- ^ Legacy build tools dependency from
+     -- 'Distribution.Types.BuildInfo.buildTools'.
+  -> [Cabal.ExeDependency]
+     -- ^ Build tools dependency from
+     -- `Distribution.Types.BuildInfo.buildToolDepends'.
+  -> [Cabal.Dependency]
+     -- ^ Cabal-syntax defines
+     -- 'Distribution.Types.BuildInfo.targetBuildDepends'. These are the
+     -- simplest dependencies for a component extracted from the Cabal file such
+     -- as:
+     -- @
+     --  build-depends:
+     --      foo ^>= 1.2.3.4,
+     --      bar ^>= 1
+     -- @
+  -> StackBuildInfo
+  -> StackBuildInfo
+gatherComponentToolsAndDepsFromCabal legacyBuildTools buildTools targetDeps =
+  gatherTargetDependency . gatherToolsDependency . gatherUnknownTools
+ where
+  gatherUnknownTools sbi = foldl' processLegacyExeDepency sbi legacyBuildTools
+  gatherToolsDependency sbi = foldl' processExeDependency sbi buildTools
+  gatherTargetDependency sbi = foldl' processDependency sbi targetDeps
+  -- This is similar to Cabal's
+  -- 'Distribution.Simple.BuildToolDepends.desugarBuildTool', however it uses
+  -- our own hard-coded map which drops tools shipped with GHC (like hsc2hs),
+  -- and includes some tools from Stackage.
+  processLegacyExeDepency sbi (Cabal.LegacyExeDependency exeName range) =
+    case isKnownLegacyExe exeName of
+      Just pName ->
+        processExeDependency
+          sbi
+          (Cabal.ExeDependency pName (Cabal.mkUnqualComponentName exeName) range)
+      Nothing -> sbi
+        { unknownTools = Set.insert (pack exeName) sbi.unknownTools }
+  processExeDependency sbi exeDep@(Cabal.ExeDependency pName _ _)
+    | isPreInstalledPackages pName = sbi
+    | otherwise = sbi
+        { dependency =
+            Map.insert pName (cabalExeToStackDep exeDep) sbi.dependency
+        }
+  processDependency sbi dep@(Cabal.Dependency pName _ _) = sbi
+    { dependency = Map.insert pName (cabalToStackDep dep) sbi.dependency }
+
+componentDependencyMap ::
+     (HasField "buildInfo" r1 r2, HasField "dependency" r2 a)
+  => r1
+  -> a
+componentDependencyMap component = component.buildInfo.dependency
+
+-- | A hard-coded map for tool dependencies. If a dependency is within this map
+-- it's considered "known" (the exe will be found at the execution stage). The
+-- corresponding Cabal function is
+-- 'Distribution.Simple.BuildToolDepends.desugarBuildTool'.
+isKnownLegacyExe :: String -> Maybe PackageName
+isKnownLegacyExe input = case input of
+  "alex" -> justPck "alex"
+  "happy" -> justPck "happy"
+  "cpphs" -> justPck "cpphs"
+  "greencard" -> justPck "greencard"
+  "c2hs" -> justPck "c2hs"
+  "hscolour" -> justPck "hscolour"
+  "hspec-discover" -> justPck "hspec-discover"
+  "hsx2hs" -> justPck "hsx2hs"
+  "gtk2hsC2hs" -> justPck "gtk2hs-buildtools"
+  "gtk2hsHookGenerator" -> justPck "gtk2hs-buildtools"
+  "gtk2hsTypeGen" -> justPck "gtk2hs-buildtools"
+  _ -> Nothing
+ where
+  justPck = Just . mkPackageName
+
+-- | Executable-only packages which come pre-installed with GHC and do not need
+-- to be built. Without this exception, we would either end up unnecessarily
+-- rebuilding these packages, or failing because the packages do not appear in
+-- the Stackage snapshot.
+isPreInstalledPackages :: PackageName -> Bool
+isPreInstalledPackages input = case input of
+  "hsc2hs" -> True
+  "haddock" -> True
+  _ -> False
diff --git a/src/Stack/ComponentFile.hs b/src/Stack/ComponentFile.hs
new file mode 100644
index 0000000000..476994744b
--- /dev/null
+++ b/src/Stack/ComponentFile.hs
@@ -0,0 +1,697 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.ComponentFile
+License     : BSD-3-Clause
+
+A module which exports all component-level file-gathering logic. It also
+includes utility functions for handling paths and directories.
+-}
+
+module Stack.ComponentFile
+  ( resolveOrWarn
+  , componentOutputDir
+  , componentBuildDir
+  , packageAutogenDir
+  , buildDir
+  , componentAutogenDir
+  , ComponentFile (..)
+  , stackLibraryFiles
+  , stackExecutableFiles
+  , stackTestSuiteFiles
+  , stackBenchmarkFiles
+  ) where
+
+import           Control.Exception ( throw )
+import           Data.Foldable ( foldrM )
+import           Data.List ( find, isPrefixOf )
+import qualified Data.Map.Strict as M
+import qualified Data.Set as S
+import qualified Data.Text as T
+import           Distribution.ModuleName ( ModuleName )
+import qualified Distribution.ModuleName as Cabal
+import           Distribution.PackageDescription
+                   ( BenchmarkInterface (..), TestSuiteInterface (..) )
+import           Distribution.Text ( display )
+import           Distribution.Utils.Path
+                   ( Pkg, Source, SymbolicPath, getSymbolicPath )
+import qualified Distribution.Utils.Path as Cabal
+import           GHC.Records ( HasField )
+import qualified HiFileParser as Iface
+import           Path
+                   ( (</>), fileExtension, filename, isProperPrefixOf, parent
+                   , parseRelDir, stripProperPrefix
+                   )
+import           Path.Extra
+                   ( forgivingResolveDir, forgivingResolveFile
+                   , parseCollapsedAbsFile, rejectMissingDir, rejectMissingFile
+                   )
+import           Path.IO
+                   ( doesDirExist, doesFileExist, getCurrentDir, listDir )
+import           Stack.Constants
+                   ( haskellDefaultPreprocessorExts, haskellFileExts
+                   , relDirAutogen, relDirBuild, relDirGlobalAutogen
+                   )
+import           Stack.Prelude hiding ( Display (..) )
+import           Stack.Types.Component
+                   ( StackBenchmark (..), StackBuildInfo (..)
+                   , StackExecutable (..), StackLibrary (..)
+                   , StackTestSuite (..), StackUnqualCompName (..)
+                   )
+import           Stack.Types.ComponentUtils
+                   ( emptyCompName, unqualCompFromText, unqualCompToString )
+import           Stack.Types.Config
+                   ( Config (..), HasConfig (..), prettyStackDevL )
+import           Stack.Types.NamedComponent ( NamedComponent (..) )
+import           Stack.Types.Package ( PackageException (..), dotCabalModule )
+import           Stack.Types.PackageFile
+                   ( GetPackageFileContext (..), DotCabalDescriptor (..)
+                   , DotCabalPath (..), PackageWarning (..)
+                   )
+import qualified System.Directory as D ( doesFileExist )
+import qualified System.FilePath as FilePath
+
+data ComponentFile = ComponentFile
+  { moduleFileMap :: !(Map ModuleName (Path Abs File))
+  , otherFile :: ![DotCabalPath]
+  , packageWarning :: ![PackageWarning]
+  }
+
+-- | Get all files referenced by the benchmark.
+stackBenchmarkFiles ::
+     StackBenchmark
+  -> RIO GetPackageFileContext (NamedComponent, ComponentFile)
+stackBenchmarkFiles bench =
+  resolveComponentFiles (CBench bench.name) build names []
+ where
+  names :: [DotCabalDescriptor]
+  names = bnames <> exposed
+
+  exposed :: [DotCabalDescriptor]
+  exposed =
+    case bench.interface of
+      BenchmarkExeV10 _ fp -> [DotCabalMain $ getSymbolicPath fp]
+      BenchmarkUnsupported _ -> []
+
+  bnames :: [DotCabalDescriptor]
+  bnames = map DotCabalModule build.otherModules
+
+  build :: StackBuildInfo
+  build = bench.buildInfo
+
+-- | Get all files referenced by the test.
+stackTestSuiteFiles ::
+     StackTestSuite
+  -> RIO GetPackageFileContext (NamedComponent, ComponentFile)
+stackTestSuiteFiles test =
+  resolveComponentFiles (CTest test.name) build names []
+ where
+  names :: [DotCabalDescriptor]
+  names = bnames <> exposed
+
+  exposed :: [DotCabalDescriptor]
+  exposed =
+    case test.interface of
+      TestSuiteExeV10 _ fp -> [DotCabalMain $ getSymbolicPath fp]
+      TestSuiteLibV09 _ mn -> [DotCabalModule mn]
+      TestSuiteUnsupported _ -> []
+
+  bnames :: [DotCabalDescriptor]
+  bnames = map DotCabalModule build.otherModules
+
+  build :: StackBuildInfo
+  build = test.buildInfo
+
+-- | Get all files referenced by the executable.
+stackExecutableFiles ::
+     StackExecutable
+  -> RIO GetPackageFileContext (NamedComponent, ComponentFile)
+stackExecutableFiles exe =
+  resolveComponentFiles (CExe exe.name) build names []
+ where
+  build :: StackBuildInfo
+  build = exe.buildInfo
+
+  names :: [DotCabalDescriptor]
+  names =
+    map DotCabalModule build.otherModules ++ [DotCabalMain exe.modulePath]
+
+-- | Get all files referenced by the library. Handle all libraries (CLib and
+-- SubLib), based on empty name or not.
+stackLibraryFiles ::
+     StackLibrary
+  -> RIO GetPackageFileContext (NamedComponent, ComponentFile)
+stackLibraryFiles lib =
+  resolveComponentFiles componentName build names lib.signatures
+ where
+  componentRawName :: StackUnqualCompName
+  componentRawName = lib.name
+
+  componentName :: NamedComponent
+  componentName
+    | componentRawName == emptyCompName = CLib
+    | otherwise = CSubLib componentRawName
+
+  build :: StackBuildInfo
+  build = lib.buildInfo
+
+  names :: [DotCabalDescriptor]
+  names = bnames ++ exposed
+
+  exposed :: [DotCabalDescriptor]
+  exposed = map DotCabalModule lib.exposedModules
+
+  bnames :: [DotCabalDescriptor]
+  bnames = map DotCabalModule build.otherModules
+
+-- | Get all files referenced by the component.
+resolveComponentFiles ::
+     ( CAndJsSources rec
+     , HasField "hsSourceDirs" rec [SymbolicPath Pkg (Cabal.Dir Source)]
+     )
+  => NamedComponent
+  -> rec
+  -> [DotCabalDescriptor]
+  -> [ModuleName]
+  -> RIO GetPackageFileContext (NamedComponent, ComponentFile)
+resolveComponentFiles component build names signatureNames = do
+  dirs <- mapMaybeM (resolveDirOrWarn . getSymbolicPath) build.hsSourceDirs
+  dir <- asks (parent . (.file))
+  agdirs <- autogenDirs
+  let allDirs = (if null dirs then [dir] else dirs) ++ agdirs
+  (modules,files,warnings) <-
+    resolveFilesAndDeps
+      component
+      allDirs
+      names
+      (S.fromList signatureNames)
+  sigFiles <- resolveSignatureFiles allDirs signatureNames
+  cfiles <- buildOtherSources build
+  pure (component, ComponentFile modules (files <> sigFiles <> cfiles) warnings)
+ where
+  autogenDirs :: RIO GetPackageFileContext [Path Abs Dir]
+  autogenDirs = do
+    distDir <- asks (.distDir)
+    let compDir = componentAutogenDir component distDir
+        pkgDir = [packageAutogenDir distDir]
+    filterM doesDirExist $ compDir : pkgDir
+
+-- | Try to resolve the list of base names in the given directory by looking for
+-- unique instances of base names applied with the given extensions, plus find
+-- any of their module and TemplateHaskell dependencies.
+resolveFilesAndDeps ::
+     NamedComponent       -- ^ Package component name
+  -> [Path Abs Dir]       -- ^ Directories to look in.
+  -> [DotCabalDescriptor] -- ^ Base names.
+  -> Set ModuleName       -- ^ Backpack signatures already accounted for.
+  -> RIO
+       GetPackageFileContext
+       (Map ModuleName (Path Abs File), [DotCabalPath], [PackageWarning])
+resolveFilesAndDeps component dirs names0 signatureModules = do
+  (dotCabalPaths, foundModules, missingModules, _) <-
+    loop names0 signatureModules M.empty
+  warnings <-
+    liftM2 (++) (warnUnlisted foundModules) (warnMissing missingModules)
+  pure (foundModules, dotCabalPaths, warnings)
+ where
+  loop ::
+       [DotCabalDescriptor]
+    -> Set ModuleName
+    -> Map FilePath (Path Abs File)
+       -- ^ Known file usages, where the file path has already been resolved.
+    -> RIO
+         GetPackageFileContext
+         ( [DotCabalPath]
+         , Map ModuleName (Path Abs File)
+         , [ModuleName]
+         , Map k a
+         )
+  loop [] _ _ = pure ([], M.empty, [], M.empty)
+  loop names doneModules0 knownUsages = do
+    resolved <- resolveFiles dirs signatureModules names
+    let foundFiles = mapMaybe snd resolved
+        foundModules = mapMaybe toResolvedModule resolved
+        missingModules = mapMaybe toMissingModule resolved
+        getDependenciesFold c (ps, ku) = do
+          p <- getDependencies ku component dirs c
+          pure (p : ps, ku <> snd p)
+    (pairs, foundUsages) <- foldrM getDependenciesFold ([], knownUsages) foundFiles
+    let doneModules = S.union
+                        doneModules0
+                        (S.fromList (mapMaybe dotCabalModule names))
+        moduleDeps = S.unions (map fst pairs)
+        thDepFiles = concatMap (M.elems . snd) pairs
+        modulesRemaining = S.difference moduleDeps doneModules
+      -- Ignore missing modules discovered as dependencies - they may
+      -- have been deleted.
+    (resolvedFiles, resolvedModules, _, foundUsages') <-
+      loop (map DotCabalModule (S.toList modulesRemaining)) doneModules foundUsages
+    pure
+      ( nubOrd $ foundFiles <> map DotCabalFilePath thDepFiles <> resolvedFiles
+      , M.union (M.fromList foundModules) resolvedModules
+      , missingModules
+      , foundUsages'
+      )
+  warnUnlisted foundModules = do
+    let unlistedModules =
+          foundModules `M.difference`
+          M.fromList (mapMaybe (fmap (, ()) . dotCabalModule) names0)
+    pure $
+      [ UnlistedModulesWarning
+          component
+          (map fst (M.toList unlistedModules))
+      | not (M.null unlistedModules)
+      ]
+  warnMissing _missingModules =
+    pure []
+      -- TODO: bring this back - see
+      -- https://github.com/commercialhaskell/stack/issues/2649
+      {-
+      cabalfp <- asks ctxFile
+      pure $
+          if null missingModules
+             then []
+             else [ MissingModulesWarning
+                         cabalfp
+                         component
+                         missingModules]
+      -}
+  -- TODO: In usages of toResolvedModule / toMissingModule, some sort
+  -- of map + partition would probably be better.
+  toResolvedModule ::
+       (DotCabalDescriptor, Maybe DotCabalPath)
+    -> Maybe (ModuleName, Path Abs File)
+  toResolvedModule (DotCabalModule mn, Just (DotCabalModulePath fp)) =
+    Just (mn, fp)
+  toResolvedModule _ =
+    Nothing
+  toMissingModule ::
+       (DotCabalDescriptor, Maybe DotCabalPath)
+    -> Maybe ModuleName
+  toMissingModule (DotCabalModule mn, Nothing) =
+    Just mn
+  toMissingModule _ =
+    Nothing
+
+-- | Resolve Backpack signature files declared by a library component. Signature
+-- files are tracked for rebuilds, but they are not ordinary implementation
+-- modules and should not feed unlisted-module warnings.
+resolveSignatureFiles ::
+     [Path Abs Dir]
+  -> [ModuleName]
+  -> RIO GetPackageFileContext [DotCabalPath]
+resolveSignatureFiles dirs =
+  fmap concat . mapM resolveSignatureFile
+ where
+  resolveSignatureFile mn = do
+    let relFile = Cabal.toFilePath mn ++ ".hsig"
+    matches <-
+      nubOrd . catMaybes <$> mapM (`resolveDirFile` relFile) dirs
+    pure $ map DotCabalFilePath matches
+
+-- | Get the dependencies of a Haskell module file.
+getDependencies ::
+     Map FilePath (Path Abs File)
+     -- ^ Known file usages, where the file path has already been resolved.
+  -> NamedComponent
+  -> [Path Abs Dir]
+  -> DotCabalPath
+  -> RIO GetPackageFileContext (Set ModuleName, Map FilePath (Path Abs File))
+getDependencies knownUsages component dirs dotCabalPath =
+  case dotCabalPath of
+    DotCabalModulePath resolvedFile -> readResolvedHi resolvedFile
+    DotCabalMainPath resolvedFile -> readResolvedHi resolvedFile
+    DotCabalFilePath{} -> pure (S.empty, M.empty)
+    DotCabalCFilePath{} -> pure (S.empty, M.empty)
+ where
+  readResolvedHi resolvedFile = do
+    dumpHIDir <- componentOutputDir component <$> asks (.distDir)
+    dir <- asks (parent . (.file))
+    let sourceDir = fromMaybe dir $ find (`isProperPrefixOf` resolvedFile) dirs
+        stripSourceDir d = stripProperPrefix d resolvedFile
+    case stripSourceDir sourceDir of
+      Nothing -> pure (S.empty, M.empty)
+      Just fileRel -> do
+        let hiPath = FilePath.replaceExtension
+                       (toFilePath (dumpHIDir </> fileRel))
+                       ".hi"
+        dumpHIExists <- liftIO $ D.doesFileExist hiPath
+        if dumpHIExists
+          then parseHI knownUsages hiPath
+          else pure (S.empty, M.empty)
+
+-- | Parse a .hi file into a set of modules and files (a map from a given path
+-- to a file to the resolved absolute path to the file).
+parseHI ::
+     Map FilePath (Path Abs File)
+     -- ^ Known file usages, where the file path has already been resolved.
+  -> FilePath
+     -- ^ The path to the *.hi file to be parsed
+  -> RIO GetPackageFileContext (Set ModuleName, Map FilePath (Path Abs File))
+parseHI knownUsages hiPath = do
+  dir <- asks (parent . (.file))
+  result <-
+    liftIO $ catchAnyDeep
+      (Iface.fromFile hiPath)
+      (pure . Left . displayException)
+  case result of
+    Left msg -> do
+      prettyStackDevL
+        [ flow "Failed to decode module interface:"
+        , style File $ fromString hiPath
+        , flow "Decoding failure:"
+        , style Error $ fromString msg
+        ]
+      pure (S.empty, M.empty)
+    Right iface -> do
+      let moduleNames = fmap (fromString . T.unpack . decodeUtf8Lenient . fst) .
+                        Iface.unList . Iface.dmods . Iface.deps
+          resolveFileDependency file =
+            case M.lookup file knownUsages of
+              Just p ->
+                pure $ Just (file, p)
+              Nothing -> do
+                resolved <- forgivingResolveFile dir file >>= rejectMissingFile
+                when (isNothing resolved) $
+                  prettyWarnL
+                    [ flow "Dependent file listed in:"
+                    , style File $ fromString hiPath
+                    , flow "does not exist:"
+                    , style File $ fromString file
+                    ]
+                pure $ (file,) <$> resolved
+          resolveUsages = traverse
+            (resolveFileDependency . Iface.unUsage) . Iface.unList . Iface.usage
+      resolvedUsages <- catMaybes <$> resolveUsages iface
+      pure (S.fromList $ moduleNames iface, M.fromList resolvedUsages)
+
+-- | The directory where generated files are put like .o or .hs (from .x files).
+componentOutputDir :: NamedComponent -> Path Abs Dir -> Path Abs Dir
+componentOutputDir namedComponent distDir =
+  case namedComponent of
+    CLib -> buildDir distDir
+    CSubLib name -> makeTmp name
+    CFlib name -> makeTmp name
+    CExe name -> makeTmp name
+    CTest name -> makeTmp name
+    CBench name -> makeTmp name
+    CInst x -> makeTmp (unqualCompFromText x)
+ where
+  makeTmp name =
+    buildDir distDir </> componentNameToDirNormOrTmp True name
+
+-- | Try to resolve the list of base names in the given directory by
+-- looking for unique instances of base names applied with the given
+-- extensions.
+resolveFiles ::
+     [Path Abs Dir] -- ^ Directories to look in.
+  -> Set ModuleName -- ^ Backpack signatures declared by the component.
+  -> [DotCabalDescriptor] -- ^ Base names.
+  -> RIO GetPackageFileContext [(DotCabalDescriptor, Maybe DotCabalPath)]
+resolveFiles dirs signatureModules names =
+  forM names (\name -> fmap (name, ) (findCandidate dirs signatureModules name))
+
+-- | Find a candidate for the given module-or-filename from the list
+-- of directories and given extensions.
+findCandidate ::
+     [Path Abs Dir]
+  -> Set ModuleName
+  -> DotCabalDescriptor
+  -> RIO GetPackageFileContext (Maybe DotCabalPath)
+findCandidate dirs signatureModules name = do
+  pkg <- asks (.file) >>= parsePackageNameFromFilePath
+  customPreprocessorExts <- view $ configL . to (.customPreprocessorExts)
+  let haskellPreprocessorExts =
+        filter
+          (not . isBackpackSignatureExt)
+          (haskellDefaultPreprocessorExts ++ customPreprocessorExts)
+  liftIO (makeNameCandidates haskellPreprocessorExts) >>= \case
+    [candidate] -> pure (Just (cons candidate))
+    [] -> do
+      case name of
+        DotCabalModule mn
+          | display mn /= paths_pkg pkg ->
+              logPossibilities dirs signatureModules mn
+        _ -> pure ()
+      pure Nothing
+    (candidate:rest) -> do
+      warnMultiple name candidate rest
+      pure (Just (cons candidate))
+ where
+  cons =
+    case name of
+      DotCabalModule{} -> DotCabalModulePath
+      DotCabalMain{} -> DotCabalMainPath
+      DotCabalFile{} -> DotCabalFilePath
+      DotCabalCFile{} -> DotCabalCFilePath
+  paths_pkg pkg = "Paths_" ++ packageNameString pkg
+  makeNameCandidates haskellPreprocessorExts =
+    fmap
+      (nubOrd . concat)
+      (mapM (makeDirCandidates haskellPreprocessorExts) dirs)
+  makeDirCandidates ::
+       [Text]
+    -> Path Abs Dir
+    -> IO [Path Abs File]
+  makeDirCandidates haskellPreprocessorExts dir =
+    case name of
+      DotCabalMain fp -> resolveCandidate dir fp
+      DotCabalFile fp -> resolveCandidate dir fp
+      DotCabalCFile fp -> resolveCandidate dir fp
+      DotCabalModule mn -> do
+        let perExt ext =
+              resolveCandidate
+                dir (Cabal.toFilePath mn ++ "." ++ T.unpack ext)
+        withHaskellExts <- mapM perExt haskellFileExts
+        withPPExts <- mapM perExt haskellPreprocessorExts
+        pure $
+          case (concat withHaskellExts, concat withPPExts) of
+            -- If we have exactly 1 Haskell extension and exactly
+            -- 1 preprocessor extension, assume the former file is
+            -- generated from the latter
+            --
+            -- See https://github.com/commercialhaskell/stack/issues/4076
+            ([_], [y]) -> [y]
+            -- Otherwise, return everything
+            (xs, ys) -> xs ++ ys
+  resolveCandidate dir = fmap maybeToList . resolveDirFile dir
+
+isBackpackSignatureExt :: Text -> Bool
+isBackpackSignatureExt ext =
+  T.toLower (fromMaybe ext $ T.stripPrefix "." ext) == "hsig"
+
+isBackpackSignatureFile :: Path b File -> Bool
+isBackpackSignatureFile file =
+  maybe False (isBackpackSignatureExt . T.pack) $ fileExtension file
+
+-- | Log that we couldn't find a candidate, but there are possibilities for
+-- custom preprocessor extensions or an undeclared Backpack signature.
+--
+-- For example: .erb for a Ruby file might exist in one of the directories.
+logPossibilities ::
+     HasTerm env
+  => [Path Abs Dir]
+  -> Set ModuleName
+  -> ModuleName
+  -> RIO env ()
+logPossibilities dirs signatureModules mn = do
+  possibilities <- concat <$> makePossibilities
+  let nonSignaturePossibilities =
+        filter (not . isBackpackSignatureFile) possibilities
+      signaturePossibilities =
+        filter isBackpackSignatureFile possibilities
+      isSignaturePossibilities = not (null signaturePossibilities)
+  unless (null nonSignaturePossibilities) $ prettyWarn $
+       fillSep
+         [ flow "Unable to find a known candidate for the Cabal entry"
+         , (style Module . fromString $ display mn) <> ","
+         , flow "but did find:"
+         ]
+    <> line
+    <> bulletedList (map pretty nonSignaturePossibilities)
+    <> blankLine
+    <> fillSep
+         [ flow "If you are using a custom preprocessor for this module with \
+                \its own file extension, consider adding the extension to the \
+                \value of the"
+         , style Shell "custom-preprocessor-extensions"
+         , flow "key in Stack's project-level configuration file"
+         , "(" <> style File "stack.yaml" <> ")."
+         ]
+  when (mn `S.notMember` signatureModules && isSignaturePossibilities) $
+    prettyWarn $
+         fillSep
+           [ flow "Found Backpack signature file for Cabal entry"
+           , (style Module . fromString $ display mn) <> ","
+           , flow "but that module is not listed in the component's"
+           , style Shell "signatures"
+           , flow "field:"
+           ]
+      <> line
+      <> bulletedList (map pretty signaturePossibilities)
+      <> blankLine
+      <> fillSep
+           [ flow "If this file is meant to be a Backpack signature, add"
+           , style Module (fromString $ display mn)
+           , flow "to the"
+           , style Shell "signatures"
+           , flow "field in the package description."
+           ]
+ where
+  makePossibilities = mapM makePossibility dirs
+
+  makePossibility dir = do
+    (_, files) <- listDir dir
+    pure $ map
+      filename
+      (filter (isPrefixOf (display mn) . toFilePath . filename) files)
+
+type CAndJsSources rec =
+  (HasField "cSources" rec [FilePath], HasField "jsSources" rec [FilePath])
+
+-- | Get all C sources and extra source files in a build.
+buildOtherSources ::
+     CAndJsSources rec
+  => rec
+  -> RIO GetPackageFileContext [DotCabalPath]
+buildOtherSources build = do
+  cwd <- liftIO getCurrentDir
+  dir <- asks (parent . (.file))
+  file <- asks (.file)
+  let resolveDirFiles files toCabalPath =
+        forMaybeM files $ \fp ->
+          resolveDirFile dir fp >>= \case
+            Nothing -> do
+              warnMissingFile "File" cwd fp file
+              pure Nothing
+            Just p -> pure $ Just (toCabalPath p)
+  csources <- resolveDirFiles build.cSources DotCabalCFilePath
+  jsources <- resolveDirFiles build.jsSources DotCabalFilePath
+  pure (csources <> jsources)
+
+-- | Resolve file as a child of a specified directory, symlinks
+-- don't get followed.
+resolveDirFile ::
+     (MonadIO m, MonadThrow m)
+  => Path Abs Dir
+  -> FilePath.FilePath
+  -> m (Maybe (Path Abs File))
+resolveDirFile x y = do
+  -- The standard canonicalizePath does not work for this case
+  p <- parseCollapsedAbsFile (toFilePath x FilePath.</> y)
+  exists <- doesFileExist p
+  pure $ if exists then Just p else Nothing
+
+-- | Warn the user that multiple candidates are available for an
+-- entry, but that we picked one anyway and continued.
+warnMultiple ::
+     DotCabalDescriptor
+  -> Path b t
+  -> [Path b t]
+  -> RIO GetPackageFileContext ()
+warnMultiple name candidate rest =
+  -- TODO: figure out how to style 'name' and the dispOne stuff
+  prettyWarnL
+    [ flow "There were multiple candidates for the Cabal entry"
+    , fromString . showName $ name
+    , line <> bulletedList (map dispOne (candidate:rest))
+    , line <> flow "picking:"
+    , dispOne candidate
+    ]
+ where
+  showName (DotCabalModule name') = display name'
+  showName (DotCabalMain fp) = fp
+  showName (DotCabalFile fp) = fp
+  showName (DotCabalCFile fp) = fp
+  dispOne = fromString . toFilePath
+    -- TODO: figure out why dispOne can't be just `display`
+    --       (remove the .hlint.yaml exception if it can be)
+
+-- | Parse a package name from a file path.
+parsePackageNameFromFilePath :: MonadThrow m => Path a File -> m PackageName
+parsePackageNameFromFilePath fp = do
+  base <- clean $ toFilePath $ filename fp
+  case parsePackageName base of
+    Nothing -> throwM $ CabalFileNameInvalidPackageName $ toFilePath fp
+    Just x -> pure x
+ where
+  clean = fmap reverse . strip . reverse
+  strip ('l':'a':'b':'a':'c':'.':xs) = pure xs
+  strip _ = throwM (CabalFileNameParseFail (toFilePath fp))
+
+-- | Resolve the directory, if it can't be resolved, warn for the user
+-- (purely to be helpful).
+resolveDirOrWarn ::
+     FilePath.FilePath
+  -> RIO GetPackageFileContext (Maybe (Path Abs Dir))
+resolveDirOrWarn = resolveOrWarn "Directory" f
+ where
+  f p x = forgivingResolveDir p x >>= rejectMissingDir
+
+-- | Make the global autogen dir if Cabal version is new enough.
+packageAutogenDir :: Path Abs Dir -> Path Abs Dir
+packageAutogenDir distDir = buildDir distDir </> relDirGlobalAutogen
+
+-- | Make the autogen dir.
+componentAutogenDir :: NamedComponent -> Path Abs Dir -> Path Abs Dir
+componentAutogenDir component distDir =
+  componentBuildDir component distDir </> relDirAutogen
+
+-- | Make the build dir. Note that Cabal >= 2.0 uses the
+-- 'componentBuildDir' above for some things.
+buildDir :: Path Abs Dir -> Path Abs Dir
+buildDir distDir = distDir </> relDirBuild
+
+-- NOTE: don't export this, only use it for valid paths based on
+-- component names.
+componentNameToDir :: StackUnqualCompName -> Path Rel Dir
+componentNameToDir = componentNameToDirNormOrTmp False
+
+componentNameToDirNormOrTmp :: Bool -> StackUnqualCompName -> Path Rel Dir
+componentNameToDirNormOrTmp isTemp name =
+  fromMaybe (throw $ ComponentNotParsedBug sName) (parseRelDir fullName)
+ where
+  fullName = if isTemp then sName <> "/" <> sName <> "-tmp" else sName
+  sName = unqualCompToString name
+
+-- | See 'Distribution.Simple.LocalBuildInfo.componentBuildDir'
+componentBuildDir :: NamedComponent -> Path Abs Dir -> Path Abs Dir
+componentBuildDir component distDir = case component of
+  CLib -> buildDir distDir
+  CSubLib name -> buildDir distDir </> componentNameToDir name
+  CFlib name -> buildDir distDir </> componentNameToDir name
+  CExe name -> buildDir distDir </> componentNameToDir name
+  CTest name -> buildDir distDir </> componentNameToDir name
+  CBench name -> buildDir distDir </> componentNameToDir name
+  CInst x -> buildDir distDir </> componentNameToDir (unqualCompFromText x)
+
+-- Internal helper to define resolveFileOrWarn and resolveDirOrWarn
+resolveOrWarn ::
+     Text
+  -> (Path Abs Dir -> String -> RIO GetPackageFileContext (Maybe a))
+  -> FilePath.FilePath
+  -> RIO GetPackageFileContext (Maybe a)
+resolveOrWarn subject resolver path = do
+  cwd <- liftIO getCurrentDir
+  file <- asks (.file)
+  dir <- asks (parent . (.file))
+  result <- resolver dir path
+  when (isNothing result) $ warnMissingFile subject cwd path file
+  pure result
+
+warnMissingFile ::
+     Text
+  -> Path Abs Dir
+  -> FilePath
+  -> Path Abs File
+  -> RIO GetPackageFileContext ()
+warnMissingFile subject cwd path fromFile =
+  prettyWarnL
+    [ fromString . T.unpack $ subject -- TODO: needs style?
+    , flow "listed in"
+    , maybe (pretty fromFile) pretty (stripProperPrefix cwd fromFile)
+    , flow "file does not exist:"
+    , style Dir . fromString $ path
+    ]
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
index 75be5da737..3e26f49674 100644
--- a/src/Stack/Config.hs
+++ b/src/Stack/Config.hs
@@ -1,431 +1,682 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE LambdaCase          #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE RecordWildCards     #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeFamilies        #-}
-
--- | The general Stack configuration that starts everything off. This should
--- be smart to fallback if there is no stack.yaml, instead relying on
--- whatever files are available.
---
--- If there is no stack.yaml, and there is a cabal.config, we
--- read in those constraints, and if there's a cabal.sandbox.config,
--- we read any constraints from there and also find the package
--- database from there, etc. And if there's nothing, we should
--- probably default to behaving like cabal, possibly with spitting out
--- a warning that "you should run `stk init` to make things better".
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE TypeFamilies          #-}
+
+{-|
+Module      : Stack.Config
+Description : The general Stack configuration.
+License     : BSD-3-Clause
+
+The general Stack configuration that starts everything off. This should be smart
+to fallback if there is no stack.yaml, instead relying on whatever files are
+available.
+
+If there is no stack.yaml, and there is a cabal.config, we read in those
+constraints, and if there's a cabal.sandbox.config, we read any constraints from
+there and also find the package database from there, etc. And if there's
+nothing, we should probably default to behaving like cabal, possibly with
+spitting out a warning that "you should run `stk init` to make things better".
+-}
+
 module Stack.Config
-  (loadConfig
-  ,loadConfigYaml
-  ,packagesParser
-  ,getImplicitGlobalProjectDir
-  ,getSnapshots
-  ,makeConcreteResolver
-  ,checkOwnership
-  ,getInContainer
-  ,getInNixShell
-  ,defaultConfigYaml
-  ,getProjectConfig
-  ,withBuildConfig
-  ,withNewLogFunc
+  ( loadConfig
+  , loadConfigYaml
+  , getImplicitGlobalProjectDir
+  , getSnapshots
+  , makeConcreteSnapshot
+  , getRawSnapshot
+  , checkOwnership
+  , getInContainer
+  , getInNixShell
+  , defaultConfigYaml
+  , getProjectConfig
+  , withBuildConfig
+  , withConfigExtra
+  , withNewLogFunc
+  , determineStackRootAndOwnership
   ) where
 
-import           Control.Monad.Extra (firstJustM)
-import           Stack.Prelude
-import           Pantry.Internal.AesonExtended
-import           Data.Array.IArray ((!), (//))
+import           Control.Monad.Extra ( firstJustM )
+import           Data.Aeson.Types ( Value )
+import           Data.Aeson.WarningParser
+                    ( WithJSONWarnings (..), logJSONWarnings )
+import           Data.Array.IArray ( (!), (//) )
 import qualified Data.ByteString as S
-import           Data.ByteString.Builder (byteString)
-import           Data.Coerce (coerce)
+import           Data.ByteString.Builder ( byteString )
+import           Data.Char ( isLatin1 )
+import           Data.Coerce ( coerce )
+import qualified Data.Either.Extra as EE
 import qualified Data.IntMap as IntMap
 import qualified Data.Map as Map
 import qualified Data.Map.Merge.Strict as MS
 import qualified Data.Monoid
-import           Data.Monoid.Map (MonoidMap(..))
+import           Data.Monoid.Map ( MonoidMap (..) )
+import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Data.Yaml as Yaml
-import           Distribution.System (OS (..), Platform (..), buildPlatform, Arch(OtherArch))
-import qualified Distribution.Text
-import           Distribution.Version (simplifyVersionRange, mkVersion')
-import           GHC.Conc (getNumProcessors)
-import           Network.HTTP.StackClient (httpJSON, parseUrlThrow, getResponseBody)
-import           Options.Applicative (Parser, help, long, metavar, strOption)
+import qualified Data.Yaml.Include as YamlInclude
+import qualified Distribution.PackageDescription as PD
+import           Distribution.System
+                   ( Arch (..), OS (..), Platform (..), buildPlatform )
+import qualified Distribution.Text ( simpleParse )
+import           Distribution.Version ( simplifyVersionRange )
+import qualified Hpack
+import           GHC.Conc ( getNumProcessors )
+import           Network.HTTP.StackClient
+                   ( httpJSON, parseUrlThrow, getResponseBody )
+import           Pantry ( loadSnapshot )
 import           Path
-import           Path.Extra (toFilePathNoTrailingSep)
-import           Path.Find (findInParents)
+                   ( PathException (..), (</>), parent, parseAbsDir
+                   , parseAbsFile, parseRelDir, stripProperPrefix
+                   )
+import           Path.Extra ( toFilePathNoTrailingSep )
+import           Path.Find ( findInParents )
 import           Path.IO
-import qualified Paths_stack as Meta
-import           Stack.Config.Build
-import           Stack.Config.Docker
-import           Stack.Config.Nix
+                   ( XdgDirectory (..), canonicalizePath, doesFileExist
+                   , ensureDir, forgivingAbsence, getAppUserDataDir
+                   , getCurrentDir, getXdgDir, resolveDir, resolveDir'
+                   , resolveFile, resolveFile'
+                   )
+import           RIO.List ( unzip, intersperse )
+import           RIO.Process
+                   ( HasProcessContext (..), ProcessContext, augmentPathMap
+                   , envVarsL
+                   , mkProcessContext
+                   )
+import           RIO.Time ( toGregorian )
+import           Stack.Build.Haddock ( shouldHaddockDeps )
+import           Stack.Config.Build ( buildOptsFromMonoid )
+import           Stack.Config.Docker ( dockerOptsFromMonoid )
+import           Stack.Config.Nix ( nixOptsFromMonoid )
 import           Stack.Constants
-import           Stack.Build.Haddock (shouldHaddockDeps)
-import           Stack.Lock (lockCachedWanted)
-import           Stack.Storage.Project (initProjectStorage)
-import           Stack.Storage.User (initUserStorage)
-import           Stack.SourceMap
-import           Stack.Types.Build
+                   ( defaultGlobalConfigPath, defaultUserConfigPath
+                   , implicitGlobalProjectDir, inContainerEnvVar
+                   , inNixShellEnvVar, osIsWindows, pantryRootEnvVar
+                   , platformVariantEnvVar, relDirBin, relDirStackWork
+                   , relFileReadmeTxt, relFileStorage, relDirPantry
+                   , relDirPrograms, relDirStackProgName, relDirUpperPrograms
+                   , stackDeveloperModeDefault, stackDotYaml, stackProgName
+                   , stackRootEnvVar, stackWorkEnvVar, stackXdgEnvVar
+                   )
+import qualified Stack.Constants as Constants
+import           Stack.Lock ( lockCachedWanted )
+import           Stack.Prelude
+import           Stack.SourceMap ( additionalDepPackage, mkProjectPackage )
+import           Stack.Storage.Project ( initProjectStorage )
+import           Stack.Storage.User ( initUserStorage )
+import           Stack.Storage.Util ( handleMigrationException )
+import           Stack.Types.AllowNewerDeps ( AllowNewerDeps (..) )
+import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
+import           Stack.Types.ApplyProgOptions ( ApplyProgOptions (..) )
+import           Stack.Types.Build.Exception
+                   ( BuildException (..), BuildPrettyException (..) )
+import           Stack.Types.BuildConfig ( BuildConfig (..) )
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
+import           Stack.Types.ColorWhen ( ColorWhen (..) )
 import           Stack.Types.Compiler
+                   ( defaultCompilerBindistPath, defaultCompilerRepository
+                   , defaultCompilerTarget
+                   )
 import           Stack.Types.Config
-import           Stack.Types.Docker
-import           Stack.Types.Nix
-import           Stack.Types.Resolver
+                   ( Config (..), HasConfig (..), askLatestSnapshotUrl
+                   , configProjectRoot, stackRootL, workDirL
+                   )
+import           Stack.Types.Config.Exception
+                   ( ConfigException (..), ConfigPrettyException (..)
+                   , ParseAbsolutePathException (..)
+                   )
+import           Stack.Types.ConfigExtra ( ConfigExtra (..) )
+import           Stack.Types.ConfigMonoid
+                   ( ConfigMonoid (..), parseConfigMonoid )
+import           Stack.Types.Casa ( CasaOptsMonoid (..) )
+import           Stack.Types.Docker ( DockerOpts (..), DockerOptsMonoid (..) )
+import           Stack.Types.DumpLogs ( DumpLogs (..) )
+import           Stack.Types.GlobalOpts (  GlobalOpts (..) )
+import           Stack.Types.MsysEnvironment
+                   ( MsysEnvironment (..), msysEnvArch )
+import           Stack.Types.Nix ( NixOpts (..) )
+import           Stack.Types.Platform
+                   ( PlatformVariant (..), platformOnlyRelDir )
+import           Stack.Types.Project ( Project (..) )
+import qualified Stack.Types.Project as Project ( Project (..) )
+import           Stack.Types.ProjectAndConfigMonoid
+                   ( ProjectAndConfigMonoid (..), parseProjectAndConfigMonoid )
+import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
+import           Stack.Types.PvpBounds ( PvpBounds (..), PvpBoundsType (..) )
+import           Stack.Types.Runner
+                   ( HasRunner (..), Runner (..), globalOptsL, terminalL )
+import           Stack.Types.Snapshot ( AbstractSnapshot (..), Snapshots (..) )
 import           Stack.Types.SourceMap
+                   ( CommonPackage (..), DepPackage (..), ProjectPackage (..)
+                   , SMWanted (..)
+                   )
+import           Stack.Types.StackYamlLoc ( StackYamlLoc (..) )
+import           Stack.Types.UnusedFlags ( FlagSource (..), UnusedFlags (..) )
 import           Stack.Types.Version
-import           System.Console.ANSI (hSupportsANSIWithoutEmulation, setSGRCode)
-import           System.Environment
-import           System.Info.ShortPathName (getShortPathName)
-import           System.PosixCompat.Files (fileOwner, getFileStatus)
-import           System.PosixCompat.User (getEffectiveUserID)
-import           RIO.List (unzip)
-import           RIO.PrettyPrint (Style (Highlight, Secondary),
-                   logLevelToStyle, stylesUpdateL, useColorL)
-import           RIO.PrettyPrint.StylesUpdate (StylesUpdate (..))
-import           RIO.PrettyPrint.DefaultStyles (defaultStyles)
-import           RIO.Process
-import           RIO.Time (toGregorian)
-
--- | If deprecated path exists, use it and print a warning.
--- Otherwise, return the new path.
-tryDeprecatedPath
-    :: HasLogFunc env
-    => Maybe T.Text -- ^ Description of file for warning (if Nothing, no deprecation warning is displayed)
-    -> (Path Abs a -> RIO env Bool) -- ^ Test for existence
-    -> Path Abs a -- ^ New path
-    -> Path Abs a -- ^ Deprecated path
-    -> RIO env (Path Abs a, Bool) -- ^ (Path to use, whether it already exists)
-tryDeprecatedPath mWarningDesc exists new old = do
-    newExists <- exists new
-    if newExists
-        then pure (new, True)
-        else do
-            oldExists <- exists old
-            if oldExists
-                then do
-                    case mWarningDesc of
-                        Nothing -> pure ()
-                        Just desc ->
-                            logWarn $
-                                "Warning: Location of " <> display desc <> " at '" <>
-                                fromString (toFilePath old) <>
-                                "' is deprecated; rename it to '" <>
-                                fromString (toFilePath new) <>
-                                "' instead"
-                    pure (old, True)
-                else pure (new, False)
+                   ( IntersectingVersionRange (..), VersionCheck (..)
+                   , stackVersion, withinRange
+                   )
+import           System.Console.ANSI ( hNowSupportsANSI, setSGRCode )
+import           System.Environment ( getEnvironment, lookupEnv )
+import           System.Info.ShortPathName ( getShortPathName )
+import           System.PosixCompat.Files ( fileOwner, getFileStatus )
+import           System.Posix.User ( getEffectiveUserID )
 
 -- | Get the location of the implicit global project directory.
--- If the directory already exists at the deprecated location, its location is returned.
--- Otherwise, the new location is returned.
-getImplicitGlobalProjectDir
-    :: HasLogFunc env
-    => Config -> RIO env (Path Abs Dir)
-getImplicitGlobalProjectDir config =
-    --TEST no warning printed
-    liftM fst $ tryDeprecatedPath
-        Nothing
-        doesDirExist
-        (implicitGlobalProjectDir stackRoot)
-        (implicitGlobalProjectDirDeprecated stackRoot)
-  where
-    stackRoot = view stackRootL config
-
--- | Download the 'Snapshots' value from stackage.org.
+getImplicitGlobalProjectDir :: HasConfig env => RIO env (Path Abs Dir)
+getImplicitGlobalProjectDir = view $ stackRootL . to implicitGlobalProjectDir
+
+-- | Download the t'Snapshots' value from stackage.org.
 getSnapshots :: HasConfig env => RIO env Snapshots
 getSnapshots = do
-    latestUrlText <- askLatestSnapshotUrl
-    latestUrl <- parseUrlThrow (T.unpack latestUrlText)
-    logDebug $ "Downloading snapshot versions file from " <> display latestUrlText
-    result <- httpJSON latestUrl
-    logDebug "Done downloading and parsing snapshot versions file"
-    pure $ getResponseBody result
-
--- | Turn an 'AbstractResolver' into a 'Resolver'.
-makeConcreteResolver
-    :: HasConfig env
-    => AbstractResolver
-    -> RIO env RawSnapshotLocation
-makeConcreteResolver (ARResolver r) = pure r
-makeConcreteResolver ar = do
-    r <-
-        case ar of
-            ARGlobal -> do
-                config <- view configL
-                implicitGlobalDir <- getImplicitGlobalProjectDir config
-                let fp = implicitGlobalDir </> stackDotYaml
-                iopc <- loadConfigYaml (parseProjectAndConfigMonoid (parent fp)) fp
-                ProjectAndConfigMonoid project _ <- liftIO iopc
-                pure $ projectResolver project
-            ARLatestNightly -> RSLSynonym . Nightly . snapshotsNightly <$> getSnapshots
-            ARLatestLTSMajor x -> do
-                snapshots <- getSnapshots
-                case IntMap.lookup x $ snapshotsLts snapshots of
-                    Nothing -> throwString $ "No LTS release found with major version " ++ show x
-                    Just y -> pure $ RSLSynonym $ LTS x y
-            ARLatestLTS -> do
-                snapshots <- getSnapshots
-                if IntMap.null $ snapshotsLts snapshots
-                   then throwString "No LTS releases found"
-                   else let (x, y) = IntMap.findMax $ snapshotsLts snapshots
-                        in pure $ RSLSynonym $ LTS x y
-    logInfo $ "Selected resolver: " <> display r
-    pure r
-
--- | Get the latest snapshot resolver available.
-getLatestResolver :: HasConfig env => RIO env RawSnapshotLocation
-getLatestResolver = do
-    snapshots <- getSnapshots
-    let mlts = uncurry LTS <$>
-               listToMaybe (reverse (IntMap.toList (snapshotsLts snapshots)))
-    pure $ RSLSynonym $ fromMaybe (Nightly (snapshotsNightly snapshots)) mlts
+  latestUrlText <- askLatestSnapshotUrl
+  latestUrl <- parseUrlThrow (T.unpack latestUrlText)
+  logDebug $ "Downloading snapshot versions file from " <> display latestUrlText
+  result <- httpJSON latestUrl
+  logDebug "Done downloading and parsing snapshot versions file"
+  pure $ getResponseBody result
+
+-- | Turn an 'AbstractSnapshot' into a 'RawSnapshotLocation'.
+makeConcreteSnapshot ::
+     HasConfig env
+  => AbstractSnapshot
+  -> RIO env RawSnapshotLocation
+makeConcreteSnapshot (ASSnapshot s) = pure s
+makeConcreteSnapshot as = do
+  s <-
+    case as of
+      ASGlobal -> do
+        fp <- getImplicitGlobalProjectDir <&> (</> stackDotYaml)
+        iopc <- loadConfigYaml (parseProjectAndConfigMonoid (parent fp)) fp
+        ProjectAndConfigMonoid project _ <- liftIO iopc
+        pure project.snapshot
+      ASLatestNightly ->
+        RSLSynonym . Nightly . (.nightly) <$> getSnapshots
+      ASLatestLTSMajor x -> do
+        snapshots <- getSnapshots
+        case IntMap.lookup x snapshots.lts of
+          Nothing -> throwIO $ NoLTSWithMajorVersion x
+          Just y -> pure $ RSLSynonym $ LTS x y
+      ASLatestLTS -> do
+        snapshots <- getSnapshots
+        if IntMap.null snapshots.lts
+          then throwIO NoLTSFound
+          else let (x, y) = IntMap.findMax snapshots.lts
+               in  pure $ RSLSynonym $ LTS x y
+  prettyInfoL
+    [ flow "Selected snapshot:"
+    , style Current (fromString $ T.unpack $ textDisplay s) <> "."
+    ]
+  pure s
+
+-- | Get the raw snapshot from the global options.
+getRawSnapshot :: HasConfig env => RIO env (Maybe RawSnapshot)
+getRawSnapshot = do
+  mASnapshot <- view $ globalOptsL . to (.snapshot)
+  forM mASnapshot $ \aSnapshot -> do
+    concrete <- makeConcreteSnapshot aSnapshot
+    loc <- completeSnapshotLocation concrete
+    loadSnapshot loc
+
+-- | Get the latest snapshot available.
+getLatestSnapshot :: HasConfig env => RIO env RawSnapshotLocation
+getLatestSnapshot = do
+  snapshots <- getSnapshots
+  let mlts = uncurry LTS <$>
+             listToMaybe (reverse (IntMap.toList snapshots.lts))
+  pure $ RSLSynonym $ fromMaybe (Nightly snapshots.nightly) mlts
 
 -- Interprets ConfigMonoid options.
+configFromConfigMonoid ::
+     (HasRunner env, HasTerm env)
+  => Path Abs Dir -- ^ Stack root, e.g. ~/.stack
+  -> Path Abs File
+     -- ^ User-specific global configuration file.
+  -> Maybe AbstractSnapshot
+  -> ProjectConfig (Project, Path Abs File)
+  -> ConfigMonoid
+  -> (Config -> RIO env a)
+  -> RIO env a
 configFromConfigMonoid
-    :: HasRunner env
-    => Path Abs Dir -- ^ Stack root, e.g. ~/.stack
-    -> Path Abs File -- ^ user config file path, e.g. ~/.stack/config.yaml
-    -> Maybe AbstractResolver
-    -> ProjectConfig (Project, Path Abs File)
-    -> ConfigMonoid
-    -> (Config -> RIO env a)
-    -> RIO env a
-configFromConfigMonoid
-    configStackRoot configUserConfigPath configResolver
-    configProject ConfigMonoid{..} inner = do
-     -- If --stack-work is passed, prefer it. Otherwise, if STACK_WORK
-     -- is set, use that. If neither, use the default ".stack-work"
-     mstackWorkEnv <- liftIO $ lookupEnv stackWorkEnvVar
-     let mproject =
-           case configProject of
-             PCProject pair -> Just pair
-             PCGlobalProject -> Nothing
-             PCNoProject _deps -> Nothing
-         configAllowLocals =
-           case configProject of
-             PCProject _ -> True
-             PCGlobalProject -> True
-             PCNoProject _ -> False
-     configWorkDir0 <- maybe (pure relDirStackWork) (liftIO . parseRelDir) mstackWorkEnv
-     let configWorkDir = fromFirst configWorkDir0 configMonoidWorkDir
-         configLatestSnapshot = fromFirst
-           "https://s3.amazonaws.com/haddock.stackage.org/snapshots.json"
-           configMonoidLatestSnapshot
-         clConnectionCount = fromFirst 8 configMonoidConnectionCount
-         configHideTHLoading = fromFirstTrue configMonoidHideTHLoading
-         configPrefixTimestamps = fromFirst False configMonoidPrefixTimestamps
-
-         configGHCVariant = getFirst configMonoidGHCVariant
-         configCompilerRepository = fromFirst
-            defaultCompilerRepository
-            configMonoidCompilerRepository
-         configGHCBuild = getFirst configMonoidGHCBuild
-         configInstallGHC = fromFirstTrue configMonoidInstallGHC
-         configSkipGHCCheck = fromFirstFalse configMonoidSkipGHCCheck
-         configSkipMsys = fromFirstFalse configMonoidSkipMsys
-
-         configExtraIncludeDirs = configMonoidExtraIncludeDirs
-         configExtraLibDirs = configMonoidExtraLibDirs
-         configCustomPreprocessorExts = configMonoidCustomPreprocessorExts
-         configOverrideGccPath = getFirst configMonoidOverrideGccPath
-
-         -- Only place in the codebase where platform is hard-coded. In theory
-         -- in the future, allow it to be configured.
-         (Platform defArch defOS) = buildPlatform
-         arch = fromMaybe defArch
-              $ getFirst configMonoidArch >>= Distribution.Text.simpleParse
-         os = defOS
-         configPlatform = Platform arch os
-
-         configRequireStackVersion = simplifyVersionRange (getIntersectingVersionRange configMonoidRequireStackVersion)
-
-         configCompilerCheck = fromFirst MatchMinor configMonoidCompilerCheck
-
-     case arch of
-         OtherArch "aarch64" -> pure ()
-         OtherArch unk -> logWarn $ "Warning: Unknown value for architecture setting: " <> displayShow unk
-         _ -> pure ()
-
-     configPlatformVariant <- liftIO $
-         maybe PlatformVariantNone PlatformVariant <$> lookupEnv platformVariantEnvVar
-
-     let configBuild = buildOptsFromMonoid configMonoidBuildOpts
-     configDocker <-
-         dockerOptsFromMonoid (fmap fst mproject) configResolver configMonoidDockerOpts
-     configNix <- nixOptsFromMonoid configMonoidNixOpts os
-
-     configSystemGHC <-
-         case (getFirst configMonoidSystemGHC, nixEnable configNix) of
-             (Just False, True) ->
-                 throwM NixRequiresSystemGhc
-             _ ->
-                 pure
-                     (fromFirst
-                         (dockerEnable configDocker || nixEnable configNix)
-                         configMonoidSystemGHC)
-
-     when (isJust configGHCVariant && configSystemGHC) $
-         throwM ManualGHCVariantSettingsAreIncompatibleWithSystemGHC
-
-     rawEnv <- liftIO getEnvironment
-     pathsEnv <- either throwM pure
-               $ augmentPathMap (map toFilePath configMonoidExtraPath)
-                                (Map.fromList (map (T.pack *** T.pack) rawEnv))
-     origEnv <- mkProcessContext pathsEnv
-     let configProcessContextSettings _ = pure origEnv
-
-     configLocalProgramsBase <- case getFirst configMonoidLocalProgramsBase of
-       Nothing -> getDefaultLocalProgramsBase configStackRoot configPlatform origEnv
-       Just path -> pure path
-     let localProgramsFilePath = toFilePath configLocalProgramsBase
-     when (osIsWindows && ' ' `elem` localProgramsFilePath) $ do
-       ensureDir configLocalProgramsBase
-       -- getShortPathName returns the long path name when a short name does not
-       -- exist.
-       shortLocalProgramsFilePath <-
-         liftIO $ getShortPathName localProgramsFilePath
-       when (' ' `elem` shortLocalProgramsFilePath) $ do
-         logError $ "Stack's 'programs' path contains a space character and " <>
-           "has no alternative short ('8 dot 3') name. This will cause " <>
-           "problems with packages that use the GNU project's 'configure' " <>
-           "shell script. Use the 'local-programs-path' configuration option " <>
-           "to specify an alternative path. The current path is: " <>
-           display (T.pack localProgramsFilePath)
-     platformOnlyDir <- runReaderT platformOnlyRelDir (configPlatform, configPlatformVariant)
-     let configLocalPrograms = configLocalProgramsBase </> platformOnlyDir
-
-     configLocalBin <-
-         case getFirst configMonoidLocalBinPath of
-             Nothing -> do
-                 localDir <- getAppUserDataDir "local"
-                 pure $ localDir </> relDirBin
-             Just userPath ->
-                 (case mproject of
-                     -- Not in a project
-                     Nothing -> resolveDir' userPath
-                     -- Resolves to the project dir and appends the user path if it is relative
-                     Just (_, configYaml) -> resolveDir (parent configYaml) userPath)
-                 -- TODO: Either catch specific exceptions or add a
-                 -- parseRelAsAbsDirMaybe utility and use it along with
-                 -- resolveDirMaybe.
-                 `catchAny`
-                 const (throwIO (NoSuchDirectory userPath))
-
-     configJobs <-
-        case getFirst configMonoidJobs of
-            Nothing -> liftIO getNumProcessors
-            Just i -> pure i
-     let configConcurrentTests = fromFirst True configMonoidConcurrentTests
-
-     let configTemplateParams = configMonoidTemplateParameters
-         configScmInit = getFirst configMonoidScmInit
-         configCabalConfigOpts = coerce configMonoidCabalConfigOpts
-         configGhcOptionsByName = coerce configMonoidGhcOptionsByName
-         configGhcOptionsByCat = coerce configMonoidGhcOptionsByCat
-         configSetupInfoLocations = configMonoidSetupInfoLocations
-         configSetupInfoInline = configMonoidSetupInfoInline
-         configPvpBounds = fromFirst (PvpBounds PvpBoundsNone False) configMonoidPvpBounds
-         configModifyCodePage = fromFirstTrue configMonoidModifyCodePage
-         configRebuildGhcOptions = fromFirstFalse configMonoidRebuildGhcOptions
-         configApplyGhcOptions = fromFirst AGOLocals configMonoidApplyGhcOptions
-         configAllowNewer = fromFirst False configMonoidAllowNewer
-         configDefaultTemplate = getFirst configMonoidDefaultTemplate
-         configDumpLogs = fromFirst DumpWarningLogs configMonoidDumpLogs
-         configSaveHackageCreds = fromFirst True configMonoidSaveHackageCreds
-         configHackageBaseUrl = fromFirst "https://hackage.haskell.org/" configMonoidHackageBaseUrl
-         configHideSourcePaths = fromFirstTrue configMonoidHideSourcePaths
-         configRecommendUpgrade = fromFirstTrue configMonoidRecommendUpgrade
-         configNoRunCompile = fromFirstFalse configMonoidNoRunCompile
-
-     configAllowDifferentUser <-
-        case getFirst configMonoidAllowDifferentUser of
-            Just True -> pure True
-            _ -> getInContainer
-
-     configRunner' <- view runnerL
-
-     useAnsi <- liftIO $ fromMaybe True <$>
-                         hSupportsANSIWithoutEmulation stderr
-
-     let stylesUpdate' = (configRunner' ^. stylesUpdateL) <>
-           configMonoidStyles
-         useColor' = runnerUseColor configRunner'
-         mUseColor = do
-            colorWhen <- getFirst configMonoidColorWhen
-            pure $ case colorWhen of
-                ColorNever  -> False
-                ColorAlways -> True
-                ColorAuto  -> useAnsi
-         useColor'' = fromMaybe useColor' mUseColor
-         configRunner'' = configRunner'
-               & processContextL .~ origEnv
-               & stylesUpdateL .~ stylesUpdate'
-               & useColorL .~ useColor''
-         go = runnerGlobalOpts configRunner'
-
-     pic <-
-       case getFirst configMonoidPackageIndices of
-         Nothing -> pure defaultPackageIndexConfig
-         Just [pic] -> pure pic
-         Just x -> error $ "When overriding the default package index, you must provide exactly one value, received: " ++ show x
-     mpantryRoot <- liftIO $ lookupEnv "PANTRY_ROOT"
-     pantryRoot <-
-       case mpantryRoot of
-         Just dir ->
-           case parseAbsDir dir of
-             Nothing -> throwString $ "Failed to parse PANTRY_ROOT environment variable (expected absolute directory): " ++ show dir
-             Just x -> pure x
-         Nothing -> pure $ configStackRoot </> relDirPantry
-
-     let snapLoc =
-            case getFirst configMonoidSnapshotLocation of
-                Nothing -> defaultSnapshotLocation
-                Just addr -> customSnapshotLocation
-                                where
-                    customSnapshotLocation (LTS x y) =
-                        mkRSLUrl $ addr'
-                            <> "/lts/" <> display x
-                            <> "/" <> display y <> ".yaml"
-                    customSnapshotLocation (Nightly date) =
-                        let (year, month, day) = toGregorian date
-                        in mkRSLUrl $ addr'
-                            <> "/nightly/"
-                            <> display year
-                            <> "/" <> display month
-                            <> "/" <> display day <> ".yaml"
-                    mkRSLUrl builder = RSLUrl (utf8BuilderToText builder) Nothing
-                    addr' = display $ T.dropWhileEnd (=='/') addr
-
-     let configStackDeveloperMode = fromFirst stackDeveloperModeDefault configMonoidStackDeveloperMode
-
-     withNewLogFunc go useColor'' stylesUpdate' $ \logFunc -> do
-       let configRunner = configRunner'' & logFuncL .~ logFunc
-       withLocalLogFunc logFunc $ withPantryConfig
-         pantryRoot
-         pic
-         (maybe HpackBundled HpackCommand $ getFirst configMonoidOverrideHpack)
-         clConnectionCount
-         (fromFirst defaultCasaRepoPrefix configMonoidCasaRepoPrefix)
-         defaultCasaMaxPerRequest
-         snapLoc
-         (\configPantryConfig -> initUserStorage
-           (configStackRoot </> relFileStorage)
-           (\configUserStorage -> inner Config {..}))
+  stackRoot
+  userGlobalConfigFile
+  snapshot
+  project
+  configMonoid
+  inner
+  = do
+    -- If --stack-work is passed, prefer it. Otherwise, if STACK_WORK
+    -- is set, use that. If neither, use the default ".stack-work"
+    mstackWorkEnv <- liftIO $ lookupEnv stackWorkEnvVar
+    let mproject =
+          case project of
+            PCProject pair -> Just pair
+            PCGlobalProject -> Nothing
+            PCNoProject _deps -> Nothing
+        allowLocals =
+          case project of
+            PCProject _ -> True
+            PCGlobalProject -> True
+            PCNoProject _ -> False
+    configWorkDir0 <-
+      let parseStackWorkEnv x =
+            catch
+              (parseRelDir x)
+              ( \e -> case e of
+                  InvalidRelDir _ ->
+                    prettyThrowIO $ StackWorkEnvNotRelativeDir x
+                  _ -> throwIO e
+              )
+      in  maybe (pure relDirStackWork) (liftIO . parseStackWorkEnv) mstackWorkEnv
+    let workDir = fromFirst configWorkDir0 configMonoid.workDir
+        -- The history of the URL below is as follows:
+        --
+        -- * Before Stack 1.3.0 it was
+        --   https://www.stackage.org/download/snapshots.json.
+        -- * From Stack 1.3.0 to 2.15.3 it was
+        --   https://s3.amazonaws.com/haddock.stackage.org/snapshots.json. The
+        --   change was made because S3 was expected to have greater uptime than
+        --   stackage.org.
+        -- * In early 2024, the Stackage project was handed over to the Haskell
+        --   Foundation. Following that handover, the URL below was considered
+        --   the most reliable source of the file in question.
+        latestSnapshot = fromFirst
+          "https://stackage-haddock.haskell.org/snapshots.json"
+          configMonoid.latestSnapshot
+        recentSnapshots = fromFirst
+          "https://www.stackage.org/api/v1/snapshots"
+          configMonoid.recentSnapshots
+        clConnectionCount = fromFirst 8 configMonoid.connectionCount
+        hideTHLoading = fromFirstTrue configMonoid.hideTHLoading
+        prefixTimestamps = fromFirst False configMonoid.prefixTimestamps
+        ghcVariant = getFirst configMonoid.ghcVariant
+        compilerRepository = fromFirst
+          defaultCompilerRepository
+          configMonoid.compilerRepository
+        compilerTarget = fromFirst
+          defaultCompilerTarget
+          configMonoid.compilerTarget
+        compilerBindistPath = fromFirst
+          defaultCompilerBindistPath
+          configMonoid.compilerBindistPath
+        ghcBuild = getFirst configMonoid.ghcBuild
+        installGHC = fromFirstTrue configMonoid.installGHC
+        installMsys = fromFirst installGHC configMonoid.installMsys
+        skipGHCCheck = fromFirstFalse configMonoid.skipGHCCheck
+        skipMsys = fromFirstFalse configMonoid.skipMsys
+        extraIncludeDirs = configMonoid.extraIncludeDirs
+        extraLibDirs = configMonoid.extraLibDirs
+        customPreprocessorExts = configMonoid.customPreprocessorExts
+        overrideGccPath = getFirst configMonoid.overrideGccPath
+        -- Only place in the codebase where platform is hard-coded. In theory in
+        -- the future, allow it to be configured.
+        (Platform defArch defOS) = buildPlatform
+        arch = fromMaybe defArch
+          $ getFirst configMonoid.arch >>= Distribution.Text.simpleParse
+        os = defOS
+        platform = Platform arch os
+        requireStackVersion = simplifyVersionRange
+          configMonoid.requireStackVersion.intersectingVersionRange
+        compilerCheck = fromFirst MatchMinor configMonoid.compilerCheck
+        mMsysEnv = case platform of
+          Platform X86_64 Windows ->
+            -- Default CLANG64 on 64-bit Windows:
+            Just $ fromFirst CLANG64 configMonoid.msysEnvironment
+          Platform _ Windows ->
+            -- No default on unsupported 32-bit Windows:
+            getFirst configMonoid.msysEnvironment
+          _ -> Nothing
+    msysEnvironment <- case mMsysEnv of
+      Nothing -> pure Nothing
+      Just msysEnv
+        | msysEnvArch msysEnv == arch -> pure $ Just msysEnv
+        | otherwise -> prettyThrowM $ BadMsysEnvironment msysEnv arch
+    platformVariant <- liftIO $
+      maybe PlatformVariantNone PlatformVariant <$> lookupEnv platformVariantEnvVar
+    let build = buildOptsFromMonoid configMonoid.buildOpts
+    docker <-
+      dockerOptsFromMonoid (fmap fst mproject) snapshot configMonoid.dockerOpts
+    nix <- nixOptsFromMonoid configMonoid.nixOpts os
+    systemGHC <-
+      case (getFirst configMonoid.systemGHC, nix.enable) of
+        (Just False, True) ->
+          throwM NixRequiresSystemGhc
+        _ ->
+          pure
+            (fromFirst
+              (docker.enable || nix.enable)
+              configMonoid.systemGHC)
+    when (isJust ghcVariant && systemGHC) $
+      throwM ManualGHCVariantSettingsAreIncompatibleWithSystemGHC
+    rawEnv <- liftIO getEnvironment
+    pathsEnv <- either throwM pure
+      $ augmentPathMap (map toFilePath configMonoid.extraPath)
+                       (Map.fromList (map (T.pack *** T.pack) rawEnv))
+    origEnv <- mkProcessContext pathsEnv
+    let processContextSettings _ = pure origEnv
+    localProgramsBase <- case getFirst configMonoid.localProgramsBase of
+      Nothing -> getDefaultLocalProgramsBase stackRoot platform origEnv
+      Just path -> pure path
+    let localProgramsFilePath = toFilePath localProgramsBase
+        spaceInLocalProgramsPath = ' ' `elem` localProgramsFilePath
+        nonLatin1InLocalProgramsPath = not $ all isLatin1 localProgramsFilePath
+        problematicLocalProgramsPath =
+             nonLatin1InLocalProgramsPath
+          || (osIsWindows && spaceInLocalProgramsPath)
+    when problematicLocalProgramsPath $ do
+      let msgSpace =
+            [ flow "It contains a space character. This will prevent building \
+                   \with GHC 9.4.1 or later."
+            | osIsWindows && spaceInLocalProgramsPath
+            ]
+      msgNoShort <- if osIsWindows && spaceInLocalProgramsPath
+        then do
+          ensureDir localProgramsBase
+          -- getShortPathName returns the long path name when a short name does not
+          -- exist.
+          shortLocalProgramsFilePath <-
+            liftIO $ getShortPathName localProgramsFilePath
+          pure [ flow "It also has no alternative short ('8 dot 3') name. This \
+                      \will cause problems with packages that use the GNU \
+                      \project's 'configure' shell script."
+               | ' ' `elem` shortLocalProgramsFilePath
+               ]
+        else pure []
+      let msgNonLatin1 = if nonLatin1InLocalProgramsPath
+            then
+              [ flow "It contains at least one non-ISO/IEC 8859-1 (Latin-1) \
+                     \character (Unicode code point > 255). This will cause \
+                     \problems with packages that build using the"
+              , style Shell "hsc2hs"
+              , flow "tool with its default template"
+              , style Shell "template-hsc.h" <> "."
+              ]
+            else []
+      prettyWarn $
+          "[S-8432]"
+          <> line
+          <> fillSep
+               (  [ flow "Stack's 'programs' path is"
+                  , style File (fromString localProgramsFilePath) <> "."
+                  ]
+               <> msgSpace
+               <> msgNoShort
+               <> msgNonLatin1
+               )
+          <> blankLine
+          <> fillSep
+               [ flow "To avoid such problems, use the"
+               , style Shell "local-programs-path"
+               , flow "non-project specific configuration option to specify an \
+                      \alternative path without those characteristics."
+               ]
+          <> line
+    platformOnlyDir <-
+      runReaderT platformOnlyRelDir (platform, platformVariant)
+    let localPrograms = localProgramsBase </> platformOnlyDir
+    localBin <-
+      case getFirst configMonoid.localBinPath of
+        Nothing -> do
+          localDir <- getAppUserDataDir "local"
+          pure $ localDir </> relDirBin
+        Just userPath ->
+          (case mproject of
+            -- Not in a project
+            Nothing -> resolveDir' userPath
+            -- Resolves to the project dir and appends the user path if it is
+            -- relative
+            Just (_, configYaml) -> resolveDir (parent configYaml) userPath)
+          -- TODO: Either catch specific exceptions or add a
+          -- parseRelAsAbsDirMaybe utility and use it along with
+          -- resolveDirMaybe.
+          `catchAny`
+          const (throwIO (NoSuchDirectory userPath))
+    fileWatchHook <-
+      case getFirst configMonoid.fileWatchHook of
+        Nothing -> pure Nothing
+        Just userPath ->
+          ( case mproject of
+              -- Not in a project
+              Nothing -> Just <$> resolveFile' userPath
+              -- Resolves to the project dir and appends the user path if it is
+              -- relative
+              Just (_, configYaml) ->
+                Just <$> resolveFile (parent configYaml) userPath
+          )
+          -- TODO: Either catch specific exceptions or add a
+          -- parseRelAsAbsFileMaybe utility and use it along with
+          -- resolveFileMaybe.
+          `catchAny`
+          const (throwIO (NoSuchFile userPath))
+    jobs <-
+      case getFirst configMonoid.jobs of
+        Nothing -> liftIO getNumProcessors
+        Just i -> pure i
+    let concurrentTests =
+          fromFirst True configMonoid.concurrentTests
+        templateParams = configMonoid.templateParameters
+        scmInit = getFirst configMonoid.scmInit
+        cabalConfigOpts = coerce configMonoid.cabalConfigOpts
+        ghcOptionsByName = coerce configMonoid.ghcOptionsByName
+        ghcOptionsByCat = coerce configMonoid.ghcOptionsByCat
+        setupInfoLocations = configMonoid.setupInfoLocations
+        setupInfoInline = configMonoid.setupInfoInline
+        pvpBounds =
+          fromFirst (PvpBounds PvpBoundsNone False) configMonoid.pvpBounds
+        modifyCodePage = fromFirstTrue configMonoid.modifyCodePage
+        rebuildGhcOptions =
+          fromFirstFalse configMonoid.rebuildGhcOptions
+        applyGhcOptions =
+          fromFirst AGOLocals configMonoid.applyGhcOptions
+        applyProgOptions =
+          fromFirst APOLocals configMonoid.applyProgOptions
+        allowNewer = configMonoid.allowNewer
+        allowNewerDeps = coerce configMonoid.allowNewerDeps
+    defaultInitSnapshot <- do
+      root <- getCurrentDir
+      let resolve = (First <$>) . traverse (resolvePaths (Just root)) . getFirst
+      resolve configMonoid.defaultInitSnapshot
+    let defaultTemplate = getFirst configMonoid.defaultTemplate
+        dumpLogs = fromFirst DumpWarningLogs configMonoid.dumpLogs
+        saveHackageCreds = configMonoid.saveHackageCreds
+        hackageBaseUrl =
+          fromFirst Constants.hackageBaseUrl configMonoid.hackageBaseUrl
+        hideSourcePaths = fromFirstTrue configMonoid.hideSourcePaths
+        recommendStackUpgrade = fromFirstTrue configMonoid.recommendStackUpgrade
+        notifyIfNixOnPath = fromFirstTrue configMonoid.notifyIfNixOnPath
+        notifyIfGhcUntested = fromFirstTrue configMonoid.notifyIfGhcUntested
+        notifyIfCabalUntested = fromFirstTrue configMonoid.notifyIfCabalUntested
+        notifyIfArchUnknown = fromFirstTrue configMonoid.notifyIfArchUnknown
+        notifyIfNoRunTests = fromFirstTrue configMonoid.notifyIfNoRunTests
+        notifyIfNoRunBenchmarks =
+          fromFirstTrue configMonoid.notifyIfNoRunBenchmarks
+        notifyIfBaseNotBoot =
+          fromFirstTrue configMonoid.notifyIfBaseNotBoot
+        noRunCompile = fromFirstFalse configMonoid.noRunCompile
+    allowDifferentUser <-
+      case getFirst configMonoid.allowDifferentUser of
+        Just True -> pure True
+        _ -> getInContainer
+    configRunner' <- view runnerL
+    useAnsi <- liftIO $ hNowSupportsANSI stderr
+    let stylesUpdate' = (configRunner' ^. stylesUpdateL) <>
+          configMonoid.styles
+        useColor' = configRunner'.useColor
+        mUseColor =
+          getFirst configMonoid.colorWhen <&> \case
+            ColorNever  -> False
+            ColorAlways -> True
+            ColorAuto  -> useAnsi
+        useColor'' = fromMaybe useColor' mUseColor
+        configRunner'' = configRunner'
+          & processContextL .~ origEnv
+          & stylesUpdateL .~ stylesUpdate'
+          & useColorL .~ useColor''
+        go = configRunner'.globalOpts
+        pic = fromFirst  defaultPackageIndexConfig configMonoid.packageIndex
+    pantryRoot <- liftIO (lookupEnv pantryRootEnvVar) >>= \case
+      Just dir ->
+        case parseAbsDir dir of
+          Nothing -> throwIO $ ParseAbsolutePathException pantryRootEnvVar dir
+          Just x -> pure x
+      Nothing -> pure $ stackRoot </> relDirPantry
+    let snapLoc =
+          case getFirst configMonoid.snapshotLocation of
+            Nothing -> defaultSnapshotLocation
+            Just addr ->
+              customSnapshotLocation
+               where
+                customSnapshotLocation (LTS x y) =
+                  mkRSLUrl $ addr'
+                    <> "/lts/" <> display x
+                    <> "/" <> display y <> ".yaml"
+                customSnapshotLocation (Nightly date) =
+                  let (year, month, day) = toGregorian date
+                  in  mkRSLUrl $ addr'
+                        <> "/nightly/"
+                        <> display year
+                        <> "/" <> display month
+                        <> "/" <> display day <> ".yaml"
+                mkRSLUrl builder = RSLUrl (utf8BuilderToText builder) Nothing
+                addr' = display $ T.dropWhileEnd (=='/') addr
+    globalHintsLoc <- case getFirst configMonoid.globalHintsLocation of
+      Nothing -> pure defaultGlobalHintsLocation
+      Just unresolverGlobalHintsLoc -> do
+        resolvedGlobalHintsLocation <-
+          resolvePaths (Just stackRoot) unresolverGlobalHintsLoc
+        pure $ const resolvedGlobalHintsLocation
+    let stackDeveloperMode = fromFirst
+          stackDeveloperModeDefault
+          configMonoid.stackDeveloperMode
+        hpackForce = if fromFirstFalse configMonoid.hpackForce
+          then Hpack.Force
+          else Hpack.NoForce
+        casa =
+          if fromFirstTrue configMonoid.casaOpts.enable
+            then
+              let casaRepoPrefix = fromFirst
+                    (fromFirst defaultCasaRepoPrefix configMonoid.casaRepoPrefix)
+                    configMonoid.casaOpts.repoPrefix
+                  casaMaxKeysPerRequest = fromFirst
+                    defaultCasaMaxPerRequest
+                    configMonoid.casaOpts.maxKeysPerRequest
+              in  Just (casaRepoPrefix, casaMaxKeysPerRequest)
+            else Nothing
+    withNewLogFunc go useColor'' stylesUpdate' $ \logFunc -> do
+      let runner = configRunner'' & logFuncL .~ logFunc
+      withLocalLogFunc logFunc $ handleMigrationException $ do
+        logDebug $ case casa of
+          Nothing -> "Use of Casa server disabled."
+          Just (repoPrefix, maxKeys) ->
+               "Use of Casa server enabled: ("
+            <> fromString (show repoPrefix)
+            <> ", "
+            <> fromString (show maxKeys)
+            <> ")."
+        withPantryConfig'
+          pantryRoot
+          pic
+          (maybe HpackBundled HpackCommand $ getFirst configMonoid.overrideHpack)
+          hpackForce
+          clConnectionCount
+          casa
+          snapLoc
+          globalHintsLoc
+          (\pantryConfig -> initUserStorage
+            (stackRoot </> relFileStorage)
+            ( \userStorage -> inner Config
+                { workDir
+                , userGlobalConfigFile
+                , build
+                , docker
+                , nix
+                , processContextSettings
+                , localProgramsBase
+                , localPrograms
+                , hideTHLoading
+                , prefixTimestamps
+                , platform
+                , platformVariant
+                , ghcVariant
+                , ghcBuild
+                , latestSnapshot
+                , recentSnapshots
+                , systemGHC
+                , installGHC
+                , installMsys
+                , skipGHCCheck
+                , skipMsys
+                , msysEnvironment
+                , compilerCheck
+                , compilerRepository
+                , compilerTarget
+                , compilerBindistPath
+                , localBin
+                , fileWatchHook
+                , requireStackVersion
+                , jobs
+                , overrideGccPath
+                , extraIncludeDirs
+                , extraLibDirs
+                , customPreprocessorExts
+                , concurrentTests
+                , templateParams
+                , scmInit
+                , ghcOptionsByName
+                , ghcOptionsByCat
+                , cabalConfigOpts
+                , setupInfoLocations
+                , setupInfoInline
+                , pvpBounds
+                , modifyCodePage
+                , rebuildGhcOptions
+                , applyGhcOptions
+                , applyProgOptions
+                , allowNewer
+                , allowNewerDeps
+                , defaultInitSnapshot
+                , defaultTemplate
+                , allowDifferentUser
+                , dumpLogs
+                , project
+                , allowLocals
+                , saveHackageCreds
+                , hackageBaseUrl
+                , runner
+                , pantryConfig
+                , stackRoot
+                , snapshot
+                , userStorage
+                , hideSourcePaths
+                , recommendStackUpgrade
+                , notifyIfNixOnPath
+                , notifyIfGhcUntested
+                , notifyIfCabalUntested
+                , notifyIfArchUnknown
+                , notifyIfNoRunTests
+                , notifyIfNoRunBenchmarks
+                , notifyIfBaseNotBoot
+                , noRunCompile
+                , stackDeveloperMode
+                , casa
+                }
+            )
+          )
 
 -- | Runs the provided action with the given 'LogFunc' in the environment
 withLocalLogFunc :: HasLogFunc env => LogFunc -> RIO env a -> RIO env a
 withLocalLogFunc logFunc = local (set logFuncL logFunc)
 
--- | Runs the provided action with a new 'LogFunc', given a 'StylesUpdate'.
-withNewLogFunc :: MonadUnliftIO m
-               => GlobalOpts
-               -> Bool  -- ^ Use color
-               -> StylesUpdate
-               -> (LogFunc -> m a)
-               -> m a
+-- | Runs the provided action with a new 'LogFunc', given a t'StylesUpdate'.
+withNewLogFunc ::
+     MonadUnliftIO m
+  => GlobalOpts
+  -> Bool  -- ^ Use color
+  -> StylesUpdate
+  -> (LogFunc -> m a)
+  -> m a
 withNewLogFunc go useColor (StylesUpdate update) inner = do
   logOptions0 <- logOptionsHandle stderr False
   let logOptions
@@ -433,10 +684,10 @@ withNewLogFunc go useColor (StylesUpdate update) inner = do
         $ setLogLevelColors logLevelColors
         $ setLogSecondaryColor secondaryColor
         $ setLogAccentColors (const highlightColor)
-        $ setLogUseTime (globalTimeInLog go)
-        $ setLogMinLevel (globalLogLevel go)
-        $ setLogVerboseFormat (globalLogLevel go <= LevelDebug)
-        $ setLogTerminal (globalTerminal go)
+        $ setLogUseTime go.timeInLog
+        $ setLogMinLevel go.logLevel
+        $ setLogVerboseFormat (go.logLevel <= LevelDebug)
+        $ setLogTerminal go.terminal
           logOptions0
   withLogFunc logOptions inner
  where
@@ -448,540 +699,651 @@ withNewLogFunc go useColor (StylesUpdate update) inner = do
   highlightColor = fromString $ setSGRCode $ snd $ styles ! Highlight
 
 -- | Get the default location of the local programs directory.
-getDefaultLocalProgramsBase :: MonadThrow m
-                            => Path Abs Dir
-                            -> Platform
-                            -> ProcessContext
-                            -> m (Path Abs Dir)
+getDefaultLocalProgramsBase ::
+     MonadThrow m
+  => Path Abs Dir
+  -> Platform
+  -> ProcessContext
+  -> m (Path Abs Dir)
 getDefaultLocalProgramsBase configStackRoot configPlatform override =
-  let
-    defaultBase = configStackRoot </> relDirPrograms
-  in
-    case configPlatform of
-      -- For historical reasons, on Windows a subdirectory of LOCALAPPDATA is
-      -- used instead of a subdirectory of STACK_ROOT. Unifying the defaults would
-      -- mean that Windows users would manually have to move data from the old
-      -- location to the new one, which is undesirable.
-      Platform _ Windows ->
-        case Map.lookup "LOCALAPPDATA" $ view envVarsL override of
-          Just t ->
-            case parseAbsDir $ T.unpack t of
-              Nothing -> throwM $ stringException ("Failed to parse LOCALAPPDATA environment variable (expected absolute directory): " ++ show t)
-              Just lad ->
-                pure $ lad </> relDirUpperPrograms </> relDirStackProgName
-          Nothing -> pure defaultBase
-      _ -> pure defaultBase
+  case configPlatform of
+    -- For historical reasons, on Windows a subdirectory of LOCALAPPDATA is
+    -- used instead of a subdirectory of STACK_ROOT. Unifying the defaults would
+    -- mean that Windows users would manually have to move data from the old
+    -- location to the new one, which is undesirable.
+    Platform _ Windows -> do
+      let envVars = view envVarsL override
+      case T.unpack <$> Map.lookup "LOCALAPPDATA" envVars of
+        Just t -> case parseAbsDir t of
+          Nothing ->
+            throwM $ ParseAbsolutePathException "LOCALAPPDATA" t
+          Just lad ->
+            pure $ lad </> relDirUpperPrograms </> relDirStackProgName
+        Nothing -> pure defaultBase
+    _ -> pure defaultBase
+ where
+  defaultBase = configStackRoot </> relDirPrograms
 
 -- | Load the configuration, using current directory, environment variables,
 -- and defaults as necessary.
-loadConfig :: HasRunner env => (Config -> RIO env a) -> RIO env a
+loadConfig ::
+     (HasRunner env, HasTerm env)
+  => (Config -> RIO env a)
+  -> RIO env a
 loadConfig inner = do
-    mstackYaml <- view $ globalOptsL.to globalStackYaml
-    mproject <- loadProjectConfig mstackYaml
-    mresolver <- view $ globalOptsL.to globalResolver
-    configArgs <- view $ globalOptsL.to globalConfigMonoid
-    (stackRoot, userOwnsStackRoot) <- determineStackRootAndOwnership configArgs
-
-    let (mproject', addConfigMonoid) =
-          case mproject of
-            PCProject (proj, fp, cm) -> (PCProject (proj, fp), (cm:))
-            PCGlobalProject -> (PCGlobalProject, id)
-            PCNoProject deps -> (PCNoProject deps, id)
-
-    userConfigPath <- getDefaultUserConfigPath stackRoot
-    extraConfigs0 <- getExtraConfigs userConfigPath >>=
-        mapM (\file -> loadConfigYaml (parseConfigMonoid (parent file)) file)
-    let extraConfigs =
-          -- non-project config files' existence of a docker section should never default docker
-          -- to enabled, so make it look like they didn't exist
-          map (\c -> c {configMonoidDockerOpts =
-                            (configMonoidDockerOpts c) {dockerMonoidDefaultEnable = Any False}})
-              extraConfigs0
-
-    let withConfig =
-          configFromConfigMonoid
-            stackRoot
-            userConfigPath
-            mresolver
-            mproject'
-            (mconcat $ configArgs : addConfigMonoid extraConfigs)
-
-    withConfig $ \config -> do
-      unless (mkVersion' Meta.version `withinRange` configRequireStackVersion config)
-          (throwM (BadStackVersionException (configRequireStackVersion config)))
-      unless (configAllowDifferentUser config) $ do
-          unless userOwnsStackRoot $
-              throwM (UserDoesn'tOwnDirectory stackRoot)
-          forM_ (configProjectRoot config) $ \dir ->
-              checkOwnership (dir </> configWorkDir config)
-      inner config
-
--- | Load the build configuration, adds build-specific values to config loaded by @loadConfig@.
--- values.
-withBuildConfig
-  :: RIO BuildConfig a
-  -> RIO Config a
+  mstackYaml <- view $ globalOptsL . to (.stackYaml)
+  mproject <- loadProjectConfig mstackYaml
+  mASnapshot <- view $ globalOptsL . to (.snapshot)
+  configArgs <- view $ globalOptsL . to (.configMonoid)
+  (configRoot, stackRoot, userOwnsStackRoot) <-
+    determineStackRootAndOwnership configArgs
+
+  let (mproject', addConfigMonoid) =
+        case mproject of
+          PCProject (proj, fp, cm) -> (PCProject (proj, fp), (cm:))
+          PCGlobalProject -> (PCGlobalProject, id)
+          PCNoProject deps -> (PCNoProject deps, id)
+
+  userConfigPath <- getDefaultUserConfigPath configRoot
+  extraConfigs0 <- getExtraConfigs userConfigPath >>=
+    mapM (\file -> loadConfigYaml (parseConfigMonoid (parent file)) file)
+  let extraConfigs =
+        -- non-project config files' existence of a docker section should never
+        -- default docker to enabled, so make it look like they didn't exist
+        map
+          (\c -> c {dockerOpts = c.dockerOpts { defaultEnable = Any False }})
+          extraConfigs0
+
+  let withConfig =
+        configFromConfigMonoid
+          stackRoot
+          userConfigPath
+          mASnapshot
+          mproject'
+          (mconcat $ configArgs : addConfigMonoid extraConfigs)
+
+  withConfig $ \config -> do
+    let Platform arch _ = config.platform
+    case arch of
+      OtherArch unknownArch
+        | config.notifyIfArchUnknown ->
+            prettyWarnL
+              [ flow "Unknown value for architecture setting:"
+              , style Shell (fromString unknownArch) <> "."
+              , flow "To mute this message in future, set"
+              , style Shell (flow "notify-if-arch-unknown: false")
+              , flow "in Stack's configuration."
+              ]
+      _ -> pure ()
+    unless (stackVersion `withinRange` config.requireStackVersion)
+      (throwM (BadStackVersionException config.requireStackVersion))
+    unless config.allowDifferentUser $ do
+      unless userOwnsStackRoot $
+        throwM (UserDoesn'tOwnDirectory stackRoot)
+      forM_ (configProjectRoot config) $ \dir ->
+        checkOwnership (dir </> config.workDir)
+    inner config
+
+-- | Load the build configuration, adds build-specific values to config loaded
+-- by @loadConfig@. values.
+withBuildConfig :: RIO BuildConfig a -> RIO Config a
 withBuildConfig inner = do
-    config <- ask
-
-    -- If provided, turn the AbstractResolver from the command line
-    -- into a Resolver that can be used below.
-
-    -- The configResolver and mcompiler are provided on the command
-    -- line. In order to properly deal with an AbstractResolver, we
-    -- need a base directory (to deal with custom snapshot relative
-    -- paths). We consider the current working directory to be the
-    -- correct base. Let's calculate the mresolver first.
-    mresolver <- forM (configResolver config) $ \aresolver -> do
-      logDebug ("Using resolver: " <> display aresolver <> " specified on command line")
-      makeConcreteResolver aresolver
-
-    (project', stackYamlFP) <- case configProject config of
-      PCProject (project, fp) -> do
-          forM_ (projectUserMsg project) (logWarn . fromString)
-          pure (project, fp)
-      PCNoProject extraDeps -> do
-          p <-
-            case mresolver of
-              Nothing -> throwIO NoResolverWhenUsingNoProject
-              Just _ -> getEmptyProject mresolver extraDeps
-          pure (p, configUserConfigPath config)
-      PCGlobalProject -> do
-            logDebug "Run from outside a project, using implicit global project config"
-            destDir <- getImplicitGlobalProjectDir config
-            let dest :: Path Abs File
-                dest = destDir </> stackDotYaml
-                dest' :: FilePath
-                dest' = toFilePath dest
-            ensureDir destDir
-            exists <- doesFileExist dest
-            if exists
-               then do
-                   iopc <- loadConfigYaml (parseProjectAndConfigMonoid destDir) dest
-                   ProjectAndConfigMonoid project _ <- liftIO iopc
-                   when (view terminalL config) $
-                       case configResolver config of
-                           Nothing ->
-                               logDebug $
-                                 "Using resolver: " <>
-                                 display (projectResolver project) <>
-                                 " from implicit global project's config file: " <>
-                                 fromString dest'
-                           Just _ -> pure ()
-                   pure (project, dest)
-               else do
-                   logInfo ("Writing implicit global project config file to: " <> fromString dest')
-                   logInfo "Note: You can change the snapshot via the resolver field there."
-                   p <- getEmptyProject mresolver []
-                   liftIO $ do
-                       writeBinaryFileAtomic dest $ byteString $ S.concat
-                           [ "# This is the implicit global project's config file, which is only used when\n"
-                           , "# 'stack' is run outside of a real project. Settings here do _not_ act as\n"
-                           , "# defaults for all projects. To change Stack's default settings, edit\n"
-                           , "# '", encodeUtf8 (T.pack $ toFilePath $ configUserConfigPath config), "' instead.\n"
-                           , "#\n"
-                           , "# For more information about Stack's configuration, see\n"
-                           , "# http://docs.haskellstack.org/en/stable/yaml_configuration/\n"
-                           , "#\n"
-                           , Yaml.encode p]
-                       writeBinaryFileAtomic (parent dest </> relFileReadmeTxt) $
-                           "This is the implicit global project, which is " <>
-                           "used only when 'stack' is run\noutside of a " <>
-                           "real project.\n"
-                   pure (p, dest)
-    mcompiler <- view $ globalOptsL.to globalCompiler
-    let project = project'
-            { projectCompiler = mcompiler <|> projectCompiler project'
-            , projectResolver = fromMaybe (projectResolver project') mresolver
-            }
-    extraPackageDBs <- mapM resolveDir' (projectExtraPackageDBs project)
+  withConfigExtra True $ \configExtra -> do
+    -- The mcompiler is provided on the command line.
+    mcompiler <- view $ globalOptsL . to (.compiler)
+    let config = configExtra.config
+        project' = configExtra.project
+        configFile = configExtra.configFile
+        project :: Project
+        project = project'
+          { Project.compiler = mcompiler <|> project'.compiler
+          , Project.snapshot = fromMaybe project'.snapshot configExtra.mSnapshot
+          }
+        -- We are indifferent as to whether the configuration file is a
+        -- user-specific global or a project-level one.
+        eitherConfigFile = EE.fromEither configFile
+    extraPackageDBs <- mapM resolveDir' project.extraPackageDBs
 
-    wanted <- lockCachedWanted stackYamlFP (projectResolver project) $
-        fillProjectWanted stackYamlFP config project
+    smWanted <- lockCachedWanted eitherConfigFile project.snapshot $
+      fillProjectWanted eitherConfigFile config project
 
-    -- Unfortunately redoes getProjectWorkDir, since we don't have a BuildConfig yet
+    -- Unfortunately redoes getWorkDir, since we don't have a BuildConfig yet
     workDir <- view workDirL
-    let projectStorageFile = parent stackYamlFP </> workDir </> relFileStorage
+    let projectStorageFile =
+          parent eitherConfigFile </> workDir </> relFileStorage
 
     initProjectStorage projectStorageFile $ \projectStorage -> do
       let bc = BuildConfig
-            { bcConfig = config
-            , bcSMWanted = wanted
-            , bcExtraPackageDBs = extraPackageDBs
-            , bcStackYaml = stackYamlFP
-            , bcCurator = projectCurator project
-            , bcProjectStorage = projectStorage
+            { config
+            , smWanted
+            , extraPackageDBs
+            , configFile
+            , curator = project.curator
+            , projectStorage
             }
       runRIO bc inner
-  where
-    getEmptyProject :: Maybe RawSnapshotLocation -> [PackageIdentifierRevision] -> RIO Config Project
-    getEmptyProject mresolver extraDeps = do
-      r <- case mresolver of
-            Just resolver -> do
-                logInfo ("Using resolver: " <> display resolver <> " specified on command line")
-                pure resolver
-            Nothing -> do
-                r'' <- getLatestResolver
-                logInfo ("Using latest snapshot resolver: " <> display r'')
-                pure r''
-      pure Project
-        { projectUserMsg = Nothing
-        , projectPackages = []
-        , projectDependencies = map (RPLImmutable . flip RPLIHackage Nothing) extraDeps
-        , projectFlags = mempty
-        , projectResolver = r
-        , projectCompiler = Nothing
-        , projectExtraPackageDBs = []
-        , projectCurator = Nothing
-        , projectDropPackages = mempty
-        }
+
+-- | Adds certain build-specific values to the configuration loaded by
+-- @loadConfig@ values.
+withConfigExtra ::
+     forall a env. (HasConfig env, HasTerm env)
+  => Bool
+     -- ^ Report user message in the project-level configuration file, if
+     -- a user message is present?
+  -> (ConfigExtra -> RIO env a)
+  -> RIO env a
+withConfigExtra reportUserMessage inner = do
+  config <- view configL
+  -- If provided, turn the AbstractSnapshot from the command line into a
+  -- snapshot that can be used.
+
+  -- The snapshot is provided on the command line. In order to properly deal
+  -- with an AbstractSnapshot, we need a base directory (to deal with custom
+  -- snapshot relative paths). We consider the current working directory to be
+  -- the correct base. We calculate the mSnapshot first.
+  mSnapshot <- forM config.snapshot $ \aSnapshot -> do
+    logDebug $
+         "Using snapshot: "
+      <> display aSnapshot
+      <> " specified on command line"
+    makeConcreteSnapshot aSnapshot
+
+  (project, configFile) <- case config.project of
+    PCProject (project, fp) -> do
+      when reportUserMessage $
+        forM_ project.userMsg prettyUserMessage
+      pure (project, Right fp)
+    PCNoProject extraDeps -> do
+      project <-
+        case mSnapshot of
+          Nothing -> throwIO NoSnapshotWhenUsingNoProject
+          Just _ -> getEmptyProject mSnapshot extraDeps
+      pure (project, Left config.userGlobalConfigFile)
+    PCGlobalProject -> do
+      logDebug "Run from outside a project, using implicit global project config"
+      destDir <- getImplicitGlobalProjectDir
+      let dest :: Path Abs File
+          dest = destDir </> stackDotYaml
+          dest' :: FilePath
+          dest' = toFilePath dest
+      ensureDir destDir
+      exists <- doesFileExist dest
+      if exists
+        then do
+          iopc <- loadConfigYaml (parseProjectAndConfigMonoid destDir) dest
+          ProjectAndConfigMonoid project _ <- liftIO iopc
+          when (view terminalL config) $
+            case config.snapshot of
+              Nothing ->
+                logDebug $
+                     "Using snapshot: "
+                  <> display project.snapshot
+                  <> " from implicit global project's config file: "
+                  <> fromString dest'
+              Just _ -> pure ()
+          pure (project, Right dest)
+        else do
+          prettyInfoL
+            [ flow "Writing the configuration file for the implicit \
+                   \global project to:"
+            , pretty dest <> "."
+            , flow "Note: You can change the snapshot via the"
+            , style Shell "snapshot"
+            , flow "key there."
+            ]
+          project <- getEmptyProject mSnapshot []
+          liftIO $ do
+            writeBinaryFileAtomic dest $ byteString $ S.concat
+              [ "# This is the implicit global project's configuration file, which is only used\n"
+              , "# when 'stack' is run outside of a real project. Settings here do _not_ act as\n"
+              , "# defaults for all projects. To change Stack's default settings, edit\n"
+              , "# '", encodeUtf8 (T.pack $ toFilePath config.userGlobalConfigFile), "' instead.\n"
+              , "#\n"
+              , "# For more information about Stack's configuration, see\n"
+              , "# http://docs.haskellstack.org/en/stable/configure/yaml/\n"
+              , "#\n"
+              , Yaml.encode project
+              ]
+            writeBinaryFileAtomic (parent dest </> relFileReadmeTxt) $ mconcat
+              [ "This is the implicit global project, which is used only when 'stack' is run\n"
+              , "outside of a real project.\n"
+              ]
+          pure (project, Right dest)
+  inner $ ConfigExtra
+    { config
+    , mSnapshot
+    , project
+    , configFile
+    }
+ where
+  getEmptyProject ::
+       Maybe RawSnapshotLocation
+    -> [RawPackageLocationImmutable]
+    -> RIO env Project
+  getEmptyProject mSnapshot extraDeps = do
+    snapshot <- case mSnapshot of
+      Just snapshot -> do
+        prettyInfoL
+          [ flow "Using the snapshot"
+          , style Current (fromString $ T.unpack $ textDisplay snapshot)
+          , flow "specified on the command line."
+          ]
+        pure snapshot
+      Nothing -> do
+        r'' <- getLatestSnapshot
+        prettyInfoL
+          [ flow "Using the latest snapshot"
+          , style Current (fromString $ T.unpack $ textDisplay r'') <> "."
+          ]
+        pure r''
+    pure Project
+      { userMsg = Nothing
+      , packages = []
+      , extraDeps = map RPLImmutable extraDeps
+      , flagsByPkg = mempty
+      , snapshot
+      , compiler = Nothing
+      , extraPackageDBs = []
+      , curator = Nothing
+      , dropPackages = mempty
+      }
+  prettyUserMessage :: String -> RIO env ()
+  prettyUserMessage userMsg = do
+    let userMsgs = map flow $ splitAtLineEnds userMsg
+        warningDoc = mconcat $ intersperse blankLine userMsgs
+    prettyWarn warningDoc
+   where
+    splitAtLineEnds = reverse . map reverse . go []
+     where
+      go :: [String] -> String -> [String]
+      go ss [] = ss
+      go ss s = case go' [] s of
+        ([], rest) -> go ss rest
+        (s', rest) -> go (s' : ss) rest
+      go' :: String -> String -> (String, String)
+      go' s [] = (s, [])
+      go' s [c] = (c:s, [])
+      go' s "\n\n" = (s, [])
+      go' s [c1, c2] = (c2:c1:s, [])
+      go' s ('\n':'\n':rest) = (s, stripLineEnds rest)
+      go' s ('\n':'\r':'\n':rest) = (s, stripLineEnds rest)
+      go' s ('\r':'\n':'\n':rest) = (s, stripLineEnds rest)
+      go' s ('\r':'\n':'\r':'\n':rest) = (s, stripLineEnds rest)
+      go' s (c:rest) = go' (c:s) rest
+      stripLineEnds :: String -> String
+      stripLineEnds ('\n':rest) = stripLineEnds rest
+      stripLineEnds ('\r':'\n':rest) = stripLineEnds rest
+      stripLineEnds rest = rest
 
 fillProjectWanted ::
-       (HasProcessContext env, HasLogFunc env, HasPantryConfig env)
-    => Path Abs t
-    -> Config
-    -> Project
-    -> Map RawPackageLocationImmutable PackageLocationImmutable
-    -> WantedCompiler
-    -> Map PackageName (Bool -> RIO env DepPackage)
-    -> RIO env (SMWanted, [CompletedPLI])
-fillProjectWanted stackYamlFP config project locCache snapCompiler snapPackages = do
-    let bopts = configBuild config
-
-    packages0 <- for (projectPackages project) $ \fp@(RelFilePath t) -> do
-      abs' <- resolveDir (parent stackYamlFP) (T.unpack t)
-      let resolved = ResolvedPath fp abs'
-      pp <- mkProjectPackage YesPrintWarnings resolved (boptsHaddock bopts)
-      pure (cpName $ ppCommon pp, pp)
-
-    -- prefetch git repos to avoid cloning per subdirectory
-    -- see https://github.com/commercialhaskell/stack/issues/5411
-    let gitRepos = mapMaybe (\case
-                              (RPLImmutable (RPLIRepo repo rpm)) -> Just (repo, rpm)
-                              _ -> Nothing) (projectDependencies project)
-    logDebug ("Prefetching git repos: " <> display (T.pack (show gitRepos)))
-    fetchReposRaw gitRepos
-
-    (deps0, mcompleted) <- fmap unzip . forM (projectDependencies project) $ \rpl -> do
-      (pl, mCompleted) <- case rpl of
-         RPLImmutable rpli -> do
-           (compl, mcompl) <-
-             case Map.lookup rpli locCache of
-               Just compl -> pure (compl, Just compl)
-               Nothing -> do
-                 cpl <- completePackageLocation rpli
-                 if cplHasCabalFile cpl
-                   then pure (cplComplete cpl, Just $ cplComplete cpl)
-                   else do
-                     warnMissingCabalFile rpli
-                     pure (cplComplete cpl, Nothing)
-           pure (PLImmutable compl, CompletedPLI rpli <$> mcompl)
-         RPLMutable p ->
-           pure (PLMutable p, Nothing)
-      dp <- additionalDepPackage (shouldHaddockDeps bopts) pl
-      pure ((cpName $ dpCommon dp, dp), mCompleted)
-
-    checkDuplicateNames $
-      map (second (PLMutable . ppResolvedDir)) packages0 ++
-      map (second dpLocation) deps0
-
-    let packages1 = Map.fromList packages0
-        snPackages = snapPackages
-          `Map.difference` packages1
-          `Map.difference` Map.fromList deps0
-          `Map.withoutKeys` projectDropPackages project
-
-    snDeps <- for snPackages $ \getDep -> getDep (shouldHaddockDeps bopts)
-
-    let deps1 = Map.fromList deps0 `Map.union` snDeps
-
-    let mergeApply m1 m2 f =
-          MS.merge MS.preserveMissing MS.dropMissing (MS.zipWithMatched f) m1 m2
-        pFlags = projectFlags project
-        packages2 = mergeApply packages1 pFlags $
-          \_ p flags -> p{ppCommon=(ppCommon p){cpFlags=flags}}
-        deps2 = mergeApply deps1 pFlags $
-          \_ d flags -> d{dpCommon=(dpCommon d){cpFlags=flags}}
-
-    checkFlagsUsedThrowing pFlags FSStackYaml packages1 deps1
-
-    let pkgGhcOptions = configGhcOptionsByName config
-        deps = mergeApply deps2 pkgGhcOptions $
-          \_ d options -> d{dpCommon=(dpCommon d){cpGhcOptions=options}}
-        packages = mergeApply packages2 pkgGhcOptions $
-          \_ p options -> p{ppCommon=(ppCommon p){cpGhcOptions=options}}
-        unusedPkgGhcOptions = pkgGhcOptions `Map.restrictKeys` Map.keysSet packages2
+     (HasLogFunc env, HasPantryConfig env, HasProcessContext env)
+  => Path Abs File
+     -- ^ Location of the configuration file, which may be either a
+     -- user-specific global or a project-level one.
+  -> Config
+  -> Project
+  -> Map RawPackageLocationImmutable PackageLocationImmutable
+  -> WantedCompiler
+  -> Map PackageName (Bool -> RIO env DepPackage)
+  -> RIO env (SMWanted, [CompletedPLI])
+fillProjectWanted configFile config project locCache snapCompiler snapPackages = do
+  let bopts = config.build
+
+  packages0 <- for project.packages $ \fp@(RelFilePath t) -> do
+    abs' <- resolveDir (parent configFile) (T.unpack t)
+    let resolved = ResolvedPath fp abs'
+    pp <- mkProjectPackage YesPrintWarnings resolved bopts.buildHaddocks
+    pure (pp.projectCommon.name, pp)
+
+  -- prefetch git repos to avoid cloning per subdirectory
+  -- see https://github.com/commercialhaskell/stack/issues/5411
+  let gitRepos = mapMaybe
+        ( \case
+            (RPLImmutable (RPLIRepo repo rpm)) -> Just (repo, rpm)
+            _ -> Nothing
+        )
+        project.extraDeps
+  logDebug ("Prefetching git repos: " <> display (T.pack (show gitRepos)))
+  fetchReposRaw gitRepos
+
+  (deps0, mcompleted) <- fmap unzip . forM project.extraDeps $ \rpl -> do
+    (pl, mCompleted) <- case rpl of
+       RPLImmutable rpli -> do
+         (compl, mcompl) <-
+           case Map.lookup rpli locCache of
+             Just compl -> pure (compl, Just compl)
+             Nothing -> do
+               cpl <- completePackageLocation rpli
+               if cplHasCabalFile cpl
+                 then pure (cplComplete cpl, Just $ cplComplete cpl)
+                 else do
+                   warnMissingCabalFile rpli
+                   pure (cplComplete cpl, Nothing)
+         pure (PLImmutable compl, CompletedPLI rpli <$> mcompl)
+       RPLMutable p ->
+         pure (PLMutable p, Nothing)
+    dp <- additionalDepPackage (shouldHaddockDeps bopts) pl
+    pure ((dp.depCommon.name, dp), mCompleted)
+
+  checkDuplicateNames $
+    map (second (PLMutable . (.resolvedDir))) packages0 ++
+    map (second (.location)) deps0
+
+  let packages1 = Map.fromList packages0
+      snPackages = snapPackages
+        `Map.difference` packages1
+        `Map.difference` Map.fromList deps0
+        `Map.withoutKeys` project.dropPackages
+
+  snDeps <- for snPackages $ \getDep -> getDep (shouldHaddockDeps bopts)
+
+  let deps1 = Map.fromList deps0 `Map.union` snDeps
+
+  let mergeApply m1 m2 f =
+        MS.merge MS.preserveMissing MS.dropMissing (MS.zipWithMatched f) m1 m2
+      pFlags = project.flagsByPkg
+      packages2 = mergeApply packages1 pFlags $ \_ p flags ->
+        p { projectCommon = p.projectCommon { flags = flags } }
+      deps2 = mergeApply deps1 pFlags $ \_ d flags ->
+        d { depCommon = d.depCommon { flags = flags } }
+
+  checkFlagsUsedThrowing pFlags packages1 deps1
+
+  let pkgGhcOptions = config.ghcOptionsByName
+      deps = mergeApply deps2 pkgGhcOptions $ \_ d options ->
+        d { depCommon = d.depCommon { ghcOptions = options } }
+      packages = mergeApply packages2 pkgGhcOptions $ \_ p options ->
+        p { projectCommon = p.projectCommon { ghcOptions = options } }
+      unusedPkgGhcOptions =
+        pkgGhcOptions `Map.restrictKeys` Map.keysSet packages2
           `Map.restrictKeys` Map.keysSet deps2
 
-    unless (Map.null unusedPkgGhcOptions) $
-      throwM $ InvalidGhcOptionsSpecification (Map.keys unusedPkgGhcOptions)
+  unless (Map.null unusedPkgGhcOptions) $
+    throwM $ InvalidGhcOptionsSpecification (Map.keys unusedPkgGhcOptions)
 
-    let wanted = SMWanted
-          { smwCompiler = fromMaybe snapCompiler (projectCompiler project)
-          , smwProject = packages
-          , smwDeps = deps
-          , smwSnapshotLocation = projectResolver project
-          }
-
-    pure (wanted, catMaybes mcompleted)
+  let wanted = SMWanted
+        { compiler = fromMaybe snapCompiler project.compiler
+        , project = packages
+        , deps = deps
+        , snapshotLocation = project.snapshot
+        }
 
+  pure (wanted, catMaybes mcompleted)
+
+-- | Check if a package is a project package or a dependency and, if it is,
+-- if all the specified flags are defined in the package's Cabal file.
+checkFlagsUsedThrowing ::
+     forall m. (MonadIO m, MonadThrow m)
+  => Map PackageName (Map FlagName Bool)
+  -> Map PackageName ProjectPackage
+  -> Map PackageName DepPackage
+  -> m ()
+checkFlagsUsedThrowing packageFlags projectPackages deps = do
+  unusedFlags <- forMaybeM (Map.toList packageFlags) getUnusedPackageFlags
+  unless (null unusedFlags) $
+    prettyThrowM $ InvalidFlagSpecification unusedFlags
+ where
+  getUnusedPackageFlags ::
+       (PackageName, Map FlagName Bool)
+    -> m (Maybe UnusedFlags)
+  getUnusedPackageFlags (name, userFlags) = case maybeCommon of
+    -- Package is not available as project or dependency
+    Nothing -> pure $ Just $ UFNoPackage FSStackYaml name
+    -- Package exists, let's check if the flags are defined
+    Just common -> do
+      gpd <- liftIO common.gpd
+      let pname = pkgName $ PD.package $ PD.packageDescription gpd
+          pkgFlags = Set.fromList $ map PD.flagName $ PD.genPackageFlags gpd
+          unused = Map.keysSet $ Map.withoutKeys userFlags pkgFlags
+      pure $ if Set.null unused
+        -- All flags are defined, nothing to do
+        then Nothing
+        -- Error about the undefined flags
+        else Just $ UFFlagsNotDefined FSStackYaml pname pkgFlags unused
+   where
+    maybeCommon =     fmap (.projectCommon) (Map.lookup name projectPackages)
+                  <|> fmap (.depCommon) (Map.lookup name deps)
 
 -- | Check if there are any duplicate package names and, if so, throw an
 -- exception.
 checkDuplicateNames :: MonadThrow m => [(PackageName, PackageLocation)] -> m ()
 checkDuplicateNames locals =
-    case filter hasMultiples $ Map.toList $ Map.fromListWith (++) $ map (second pure) locals of
-        [] -> pure ()
-        x -> throwM $ DuplicateLocalPackageNames x
-  where
-    hasMultiples (_, _:_:_) = True
-    hasMultiples _ = False
-
+  case filter hasMultiples $ Map.toList $ Map.fromListWith (++) $ map (second pure) locals of
+    [] -> pure ()
+    x -> prettyThrowM $ DuplicateLocalPackageNames x
+ where
+  hasMultiples (_, _:_:_) = True
+  hasMultiples _ = False
 
 -- | Get the Stack root, e.g. @~/.stack@, and determine whether the user owns it.
 --
 -- On Windows, the second value is always 'True'.
-determineStackRootAndOwnership
-    :: (MonadIO m)
-    => ConfigMonoid
-    -- ^ Parsed command-line arguments
-    -> m (Path Abs Dir, Bool)
+determineStackRootAndOwnership ::
+     MonadIO m
+  => ConfigMonoid
+  -- ^ Parsed command-line arguments
+  -> m (Path Abs Dir, Path Abs Dir, Bool)
 determineStackRootAndOwnership clArgs = liftIO $ do
-    stackRoot <- do
-        case getFirst (configMonoidStackRoot clArgs) of
-            Just x -> pure x
-            Nothing -> do
-                mstackRoot <- lookupEnv stackRootEnvVar
-                case mstackRoot of
-                    Nothing -> getAppUserDataDir stackProgName
-                    Just x -> case parseAbsDir x of
-                        Nothing -> throwString ("Failed to parse STACK_ROOT environment variable (expected absolute directory): " ++ show x)
-                        Just parsed -> pure parsed
-
-    (existingStackRootOrParentDir, userOwnsIt) <- do
-        mdirAndOwnership <- findInParents getDirAndOwnership stackRoot
-        case mdirAndOwnership of
-            Just x -> pure x
-            Nothing -> throwIO (BadStackRoot stackRoot)
-
-    when (existingStackRootOrParentDir /= stackRoot) $
-        if userOwnsIt
-            then ensureDir stackRoot
-            else throwIO $
-                Won'tCreateStackRootInDirectoryOwnedByDifferentUser
-                    stackRoot
-                    existingStackRootOrParentDir
-
-    stackRoot' <- canonicalizePath stackRoot
-    pure (stackRoot', userOwnsIt)
-
--- | @'checkOwnership' dir@ throws 'UserDoesn'tOwnDirectory' if @dir@
--- isn't owned by the current user.
+  (configRoot, stackRoot) <-
+    case getFirst clArgs.stackRoot of
+      Just x -> pure (x, x)
+      Nothing ->
+        lookupEnv stackRootEnvVar >>= \case
+          Nothing -> do
+            wantXdg <- fromMaybe "" <$> lookupEnv stackXdgEnvVar
+            if not (null wantXdg)
+              then do
+                xdgRelDir <- parseRelDir stackProgName
+                (,)
+                  <$> getXdgDir XdgConfig (Just xdgRelDir)
+                  <*> getXdgDir XdgData (Just xdgRelDir)
+              else do
+                oldStyleRoot <- getAppUserDataDir stackProgName
+                pure (oldStyleRoot, oldStyleRoot)
+          Just x -> case parseAbsDir x of
+            Nothing ->
+              throwIO $ ParseAbsolutePathException stackRootEnvVar x
+            Just parsed -> pure (parsed, parsed)
+
+  (existingStackRootOrParentDir, userOwnsIt) <-
+    findInParents getDirAndOwnership stackRoot >>= \case
+      Just x -> pure x
+      Nothing -> throwIO (BadStackRoot stackRoot)
+
+  when (existingStackRootOrParentDir /= stackRoot) $
+    if userOwnsIt
+      then ensureDir stackRoot
+      else throwIO $
+        Won'tCreateStackRootInDirectoryOwnedByDifferentUser
+          stackRoot
+          existingStackRootOrParentDir
+
+  configRoot' <- canonicalizePath configRoot
+  stackRoot' <- canonicalizePath stackRoot
+  pure (configRoot', stackRoot', userOwnsIt)
+
+-- | @'checkOwnership' dir@ throws 'UserDoesn'tOwnDirectory' if @dir@ isn't
+-- owned by the current user.
 --
 -- If @dir@ doesn't exist, its parent directory is checked instead.
--- If the parent directory doesn't exist either, @'NoSuchDirectory' ('parent' dir)@
--- is thrown.
-checkOwnership :: (MonadIO m) => Path Abs Dir -> m ()
-checkOwnership dir = do
-    mdirAndOwnership <- firstJustM getDirAndOwnership [dir, parent dir]
-    case mdirAndOwnership of
-        Just (_, True) -> pure ()
-        Just (dir', False) -> throwIO (UserDoesn'tOwnDirectory dir')
-        Nothing ->
-            (throwIO . NoSuchDirectory) $ (toFilePathNoTrailingSep . parent) dir
+-- If the parent directory doesn't exist either,
+-- @'NoSuchDirectory' ('parent' dir)@ is thrown.
+checkOwnership :: MonadIO m => Path Abs Dir -> m ()
+checkOwnership dir =
+  firstJustM getDirAndOwnership [dir, parent dir] >>= \case
+    Just (_, True) -> pure ()
+    Just (dir', False) -> throwIO (UserDoesn'tOwnDirectory dir')
+    Nothing ->
+      throwIO . NoSuchDirectory $ (toFilePathNoTrailingSep . parent) dir
 
 -- | @'getDirAndOwnership' dir@ returns @'Just' (dir, 'True')@ when @dir@
 -- exists and the current user owns it in the sense of 'isOwnedByUser'.
-getDirAndOwnership
-    :: (MonadIO m)
-    => Path Abs Dir
-    -> m (Maybe (Path Abs Dir, Bool))
+getDirAndOwnership ::
+     MonadIO m
+  => Path Abs Dir
+  -> m (Maybe (Path Abs Dir, Bool))
 getDirAndOwnership dir = liftIO $ forgivingAbsence $ do
     ownership <- isOwnedByUser dir
     pure (dir, ownership)
 
--- | Check whether the current user (determined with 'getEffectiveUserId') is
--- the owner for the given path.
+-- | Check whether the current user (determined with
+-- 'System.Posix.User.getEffectiveUserId') is the owner for the given path.
 --
 -- Will always pure 'True' on Windows.
 isOwnedByUser :: MonadIO m => Path Abs t -> m Bool
-isOwnedByUser path = liftIO $ do
-    if osIsWindows
-        then pure True
-        else do
-            fileStatus <- getFileStatus (toFilePath path)
-            user <- getEffectiveUserID
-            pure (user == fileOwner fileStatus)
+isOwnedByUser path = liftIO $
+  if osIsWindows
+    then pure True
+    else do
+      fileStatus <- getFileStatus (toFilePath path)
+      user <- getEffectiveUserID
+      pure (user == fileOwner fileStatus)
 
 -- | 'True' if we are currently running inside a Docker container.
-getInContainer :: (MonadIO m) => m Bool
+getInContainer :: MonadIO m => m Bool
 getInContainer = liftIO (isJust <$> lookupEnv inContainerEnvVar)
 
 -- | 'True' if we are currently running inside a Nix.
-getInNixShell :: (MonadIO m) => m Bool
+getInNixShell :: MonadIO m => m Bool
 getInNixShell = liftIO (isJust <$> lookupEnv inNixShellEnvVar)
 
 -- | Determine the extra config file locations which exist.
 --
 -- Returns most local first
-getExtraConfigs :: HasLogFunc env
-                => Path Abs File -- ^ use config path
-                -> RIO env [Path Abs File]
-getExtraConfigs userConfigPath = do
-  defaultStackGlobalConfigPath <- getDefaultGlobalConfigPath
-  liftIO $ do
-    env <- getEnvironment
-    mstackConfig <-
-        maybe (pure Nothing) (fmap Just . parseAbsFile)
-      $ lookup "STACK_CONFIG" env
-    mstackGlobalConfig <-
-        maybe (pure Nothing) (fmap Just . parseAbsFile)
-      $ lookup "STACK_GLOBAL_CONFIG" env
-    filterM doesFileExist
-        $ fromMaybe userConfigPath mstackConfig
-        : maybe [] pure (mstackGlobalConfig <|> defaultStackGlobalConfigPath)
+getExtraConfigs ::
+     HasTerm env
+  => Path Abs File -- ^ use config path
+  -> RIO env [Path Abs File]
+getExtraConfigs userConfigPath = liftIO $ do
+  env <- getEnvironment
+  mstackConfig <-
+      maybe (pure Nothing) (fmap Just . parseAbsFile)
+    $ lookup "STACK_CONFIG" env
+  mstackGlobalConfig <-
+      maybe (pure Nothing) (fmap Just . parseAbsFile)
+    $ lookup "STACK_GLOBAL_CONFIG" env
+  filterM doesFileExist
+    $ fromMaybe userConfigPath mstackConfig
+    : maybe [] pure (mstackGlobalConfig <|> defaultGlobalConfigPath)
 
 -- | Load and parse YAML from the given config file. Throws
 -- 'ParseConfigFileException' when there's a decoding error.
-loadConfigYaml
-    :: HasLogFunc env
-    => (Value -> Yaml.Parser (WithJSONWarnings a)) -> Path Abs File -> RIO env a
-loadConfigYaml parser path = do
-    eres <- loadYaml parser path
-    case eres of
-        Left err -> liftIO $ throwM (ParseConfigFileException path err)
-        Right res -> pure res
+loadConfigYaml ::
+     HasLogFunc env
+  => (Value -> Yaml.Parser (WithJSONWarnings a))
+  -> Path Abs File -> RIO env a
+loadConfigYaml parser path = loadYaml parser path >>= \case
+  Left err -> prettyThrowM (ParseConfigFileException path err)
+  Right res -> pure res
 
 -- | Load and parse YAML from the given file.
-loadYaml
-    :: HasLogFunc env
-    => (Value -> Yaml.Parser (WithJSONWarnings a)) -> Path Abs File -> RIO env (Either Yaml.ParseException a)
-loadYaml parser path = do
-    eres <- liftIO $ Yaml.decodeFileEither (toFilePath path)
-    case eres  of
-        Left err -> pure (Left err)
-        Right val ->
-            case Yaml.parseEither parser val of
-                Left err -> pure (Left (Yaml.AesonException err))
-                Right (WithJSONWarnings res warnings) -> do
-                    logJSONWarnings (toFilePath path) warnings
-                    pure (Right res)
+loadYaml ::
+     HasLogFunc env
+  => (Value -> Yaml.Parser (WithJSONWarnings a))
+  -> Path Abs File
+  -> RIO env (Either Yaml.ParseException a)
+loadYaml parser path =
+  liftIO (YamlInclude.decodeFileEither (toFilePath path)) >>= \case
+    Left err -> pure (Left err)
+    Right val ->
+      case Yaml.parseEither parser val of
+        Left err -> pure (Left (Yaml.AesonException err))
+        Right (WithJSONWarnings res warnings) -> do
+          logJSONWarnings (toFilePath path) warnings
+          pure (Right res)
 
 -- | Get the location of the project config file, if it exists.
-getProjectConfig :: HasLogFunc env
-                 => StackYamlLoc
-                 -- ^ Override stack.yaml
-                 -> RIO env (ProjectConfig (Path Abs File))
+getProjectConfig ::
+     HasTerm env
+  => StackYamlLoc
+     -- ^ Override stack.yaml
+  -> RIO env (ProjectConfig (Path Abs File))
 getProjectConfig (SYLOverride stackYaml) = pure $ PCProject stackYaml
 getProjectConfig SYLGlobalProject = pure PCGlobalProject
 getProjectConfig SYLDefault = do
-    env <- liftIO getEnvironment
-    case lookup "STACK_YAML" env of
-        Just fp -> do
-            logInfo "Getting project config file from STACK_YAML environment"
-            liftM PCProject $ resolveFile' fp
-        Nothing -> do
-            currDir <- getCurrentDir
-            maybe PCGlobalProject PCProject <$> findInParents getStackDotYaml currDir
-  where
-    getStackDotYaml dir = do
-        let fp = dir </> stackDotYaml
-            fp' = toFilePath fp
-        logDebug $ "Checking for project config at: " <> fromString fp'
-        exists <- doesFileExist fp
-        if exists
-            then pure $ Just fp
-            else pure Nothing
+  env <- liftIO getEnvironment
+  case lookup "STACK_YAML" env of
+    Just fp -> do
+      prettyInfoS
+        "Getting the project-level configuration file from the \
+        \STACK_YAML environment variable."
+      PCProject <$> resolveFile' fp
+    Nothing -> do
+      currDir <- getCurrentDir
+      maybe PCGlobalProject PCProject <$> findInParents getStackDotYaml currDir
+ where
+  getStackDotYaml dir = do
+    let fp = dir </> stackDotYaml
+        fp' = toFilePath fp
+    logDebug $ "Checking for project config at: " <> fromString fp'
+    exists <- doesFileExist fp
+    if exists
+      then pure $ Just fp
+      else pure Nothing
 getProjectConfig (SYLNoProject extraDeps) = pure $ PCNoProject extraDeps
 
 -- | Find the project config file location, respecting environment variables
 -- and otherwise traversing parents. If no config is found, we supply a default
 -- based on current directory.
-loadProjectConfig :: HasLogFunc env
-                  => StackYamlLoc
-                  -- ^ Override stack.yaml
-                  -> RIO env (ProjectConfig (Project, Path Abs File, ConfigMonoid))
-loadProjectConfig mstackYaml = do
-    mfp <- getProjectConfig mstackYaml
-    case mfp of
-        PCProject fp -> do
-            currDir <- getCurrentDir
-            logDebug $ "Loading project config file " <>
-                        fromString (maybe (toFilePath fp) toFilePath (stripProperPrefix currDir fp))
-            PCProject <$> load fp
-        PCGlobalProject -> do
-            logDebug "No project config file found, using defaults."
-            pure PCGlobalProject
-        PCNoProject extraDeps -> do
-            logDebug "Ignoring config files"
-            pure $ PCNoProject extraDeps
-  where
-    load fp = do
-        iopc <- loadConfigYaml (parseProjectAndConfigMonoid (parent fp)) fp
-        ProjectAndConfigMonoid project config <- liftIO iopc
-        pure (project, fp, config)
-
--- | Get the location of the default Stack configuration file.
--- If a file already exists at the deprecated location, its location is returned.
--- Otherwise, the new location is returned.
-getDefaultGlobalConfigPath
-    :: HasLogFunc env
-    => RIO env (Maybe (Path Abs File))
-getDefaultGlobalConfigPath =
-    case (defaultGlobalConfigPath, defaultGlobalConfigPathDeprecated) of
-        (Just new,Just old) ->
-            liftM (Just . fst ) $
-            tryDeprecatedPath
-                (Just "non-project global configuration file")
-                doesFileExist
-                new
-                old
-        (Just new,Nothing) -> pure (Just new)
-        _ -> pure Nothing
-
--- | Get the location of the default user configuration file.
--- If a file already exists at the deprecated location, its location is returned.
--- Otherwise, the new location is returned.
-getDefaultUserConfigPath
-    :: HasLogFunc env
-    => Path Abs Dir -> RIO env (Path Abs File)
-getDefaultUserConfigPath stackRoot = do
-    (path, exists) <- tryDeprecatedPath
-        (Just "non-project configuration file")
-        doesFileExist
-        (defaultUserConfigPath stackRoot)
-        (defaultUserConfigPathDeprecated stackRoot)
-    unless exists $ do
-        ensureDir (parent path)
-        liftIO $ writeBinaryFileAtomic path defaultConfigYaml
-    pure path
-
-packagesParser :: Parser [String]
-packagesParser = many (strOption
-                   (long "package" <>
-                     metavar "PACKAGE" <>
-                     help "Add a package (can be specified multiple times)"))
-
+loadProjectConfig ::
+     HasTerm env
+  => StackYamlLoc
+     -- ^ Override stack.yaml
+  -> RIO env (ProjectConfig (Project, Path Abs File, ConfigMonoid))
+loadProjectConfig mstackYaml = getProjectConfig mstackYaml >>= \case
+  PCProject fp -> do
+    currDir <- getCurrentDir
+    logDebug $
+         "Loading project config file "
+      <> fromString
+           (maybe (toFilePath fp) toFilePath (stripProperPrefix currDir fp))
+    PCProject <$> load fp
+  PCGlobalProject -> do
+    logDebug "No project config file found, using defaults."
+    pure PCGlobalProject
+  PCNoProject extraDeps -> do
+    logDebug "Ignoring config files"
+    pure $ PCNoProject extraDeps
+ where
+  load fp = do
+    iopc <- loadConfigYaml (parseProjectAndConfigMonoid (parent fp)) fp
+    ProjectAndConfigMonoid project config <- liftIO iopc
+    pure (project, fp, config)
+
+-- | Get the location of the default user global configuration file.
+getDefaultUserConfigPath ::
+     HasTerm env
+  => Path Abs Dir
+  -> RIO env (Path Abs File)
+getDefaultUserConfigPath configRoot = do
+  let userConfigPath = defaultUserConfigPath configRoot
+  userConfigExists <- doesFileExist userConfigPath
+  unless userConfigExists $ do
+    ensureDir (parent userConfigPath)
+    liftIO $ writeBinaryFileAtomic userConfigPath defaultConfigYaml
+  pure userConfigPath
+
+-- | The contents of the default Stack global configuration file.
 defaultConfigYaml :: (IsString s, Semigroup s) => s
 defaultConfigYaml =
-  "# This file contains default non-project-specific settings for Stack, used\n" <>
-  "# in all projects. For more information about Stack's configuration, see\n" <>
-  "# http://docs.haskellstack.org/en/stable/yaml_configuration/\n" <>
-  "\n" <>
-  "# The following parameters are used by 'stack new' to automatically fill fields\n" <>
-  "# in the Cabal file. We recommend uncommenting them and filling them out if\n" <>
-  "# you intend to use 'stack new'.\n" <>
-  "# See https://docs.haskellstack.org/en/stable/yaml_configuration/#templates\n" <>
-  "templates:\n" <>
-  "  params:\n" <>
-  "#    author-name:\n" <>
-  "#    author-email:\n" <>
-  "#    copyright:\n" <>
-  "#    github-username:\n" <>
-  "\n" <>
-  "# The following parameter specifies Stack's output styles; STYLES is a\n" <>
-  "# colon-delimited sequence of key=value, where 'key' is a style name and\n" <>
-  "# 'value' is a semicolon-delimited list of 'ANSI' SGR (Select Graphic\n" <>
-  "# Rendition) control codes (in decimal). Use 'stack ls stack-colors --basic'\n" <>
-  "# to see the current sequence.\n" <>
-  "# stack-colors: STYLES\n"
+  "# This file contains default non-project-specific settings for Stack, used\n\
+  \# in all projects. For more information about Stack's configuration, see\n\
+  \# http://docs.haskellstack.org/en/stable/configure/yaml/\n\
+  \\n\
+  \# The following parameters are used by 'stack new' to automatically fill fields\n\
+  \# in the Cabal file. We recommend uncommenting them and filling them out if\n\
+  \# you intend to use 'stack new'.\n\
+  \# See https://docs.haskellstack.org/en/stable/configure/yaml/non-project/#templates\n\
+  \templates:\n\
+  \  params:\n\
+  \#    author-name:\n\
+  \#    author-email:\n\
+  \#    copyright:\n\
+  \#    github-username:\n\
+  \\n\
+  \# The following parameter specifies Stack's output styles; STYLES is a\n\
+  \# colon-delimited sequence of key=value, where 'key' is a style name and\n\
+  \# 'value' is a semicolon-delimited list of 'ANSI' SGR (Select Graphic\n\
+  \# Rendition) control codes (in decimal). Use 'stack ls stack-colors --basic'\n\
+  \# to see the current sequence.\n\
+  \# stack-colors: STYLES\n"
diff --git a/src/Stack/Config/Build.hs b/src/Stack/Config/Build.hs
index c3b17e8322..3731527744 100644
--- a/src/Stack/Config/Build.hs
+++ b/src/Stack/Config/Build.hs
@@ -1,95 +1,155 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 
--- | Build configuration
-module Stack.Config.Build where
+{-|
+Module      : Stack.Config.Build
+Description : Build configuration.
+License     : BSD-3-Clause
 
+Build configuration.
+-}
+
+module Stack.Config.Build
+ ( buildOptsFromMonoid
+ , haddockOptsFromMonoid
+ , testOptsFromMonoid
+ , benchmarkOptsFromMonoid
+ ) where
+
+import           Distribution.Verbosity ( normal )
+import           Stack.BuildOpts
+                   ( defaultBenchmarkOpts, defaultHaddockOpts, defaultTestOpts )
 import           Stack.Prelude
-import           Stack.Types.Config
-import           Distribution.Verbosity   (normal)
+import           Stack.Types.BuildOpts
+                   ( BenchmarkOpts (..), BuildOpts (..), HaddockOpts (..)
+                   , TestOpts (..)
+                   )
+import qualified Stack.Types.BuildOpts as BenchmarkOpts ( BenchmarkOpts (..) )
+import qualified Stack.Types.BuildOpts as HaddockOpts ( HaddockOpts (..) )
+import qualified Stack.Types.BuildOpts as TestOpts ( TestOpts (..) )
+import           Stack.Types.BuildOptsMonoid
+                   ( BenchmarkOptsMonoid (..), BuildOptsMonoid (..)
+                   , CabalVerbosity (..), HaddockOptsMonoid (..)
+                   , ProgressBarFormat (..), TestOptsMonoid (..)
+                   )
 
 -- | Interprets BuildOptsMonoid options.
 buildOptsFromMonoid :: BuildOptsMonoid -> BuildOpts
-buildOptsFromMonoid BuildOptsMonoid{..} = BuildOpts
-    { boptsLibProfile = fromFirstFalse
-          (buildMonoidLibProfile <>
-           FirstFalse (if tracing || profiling then Just True else Nothing))
-    , boptsExeProfile = fromFirstFalse
-          (buildMonoidExeProfile <>
-           FirstFalse (if tracing || profiling then Just True else Nothing))
-    , boptsLibStrip = fromFirstTrue
-          (buildMonoidLibStrip <>
-           FirstTrue (if noStripping then Just False else Nothing))
-    , boptsExeStrip = fromFirstTrue
-          (buildMonoidExeStrip <>
-           FirstTrue (if noStripping then Just False else Nothing))
-    , boptsHaddock = fromFirstFalse buildMonoidHaddock
-    , boptsHaddockOpts = haddockOptsFromMonoid buildMonoidHaddockOpts
-    , boptsOpenHaddocks = fromFirstFalse buildMonoidOpenHaddocks
-    , boptsHaddockDeps = getFirst buildMonoidHaddockDeps
-    , boptsHaddockInternal = fromFirstFalse buildMonoidHaddockInternal
-    , boptsHaddockHyperlinkSource = fromFirstTrue buildMonoidHaddockHyperlinkSource
-    , boptsInstallExes = fromFirstFalse buildMonoidInstallExes
-    , boptsInstallCompilerTool = fromFirstFalse buildMonoidInstallCompilerTool
-    , boptsPreFetch = fromFirstFalse buildMonoidPreFetch
-    , boptsKeepGoing = getFirst buildMonoidKeepGoing
-    , boptsKeepTmpFiles = fromFirstFalse buildMonoidKeepTmpFiles
-    , boptsForceDirty = fromFirstFalse buildMonoidForceDirty
-    , boptsTests = fromFirstFalse buildMonoidTests
-    , boptsTestOpts =
-          testOptsFromMonoid buildMonoidTestOpts additionalArgs
-    , boptsBenchmarks = fromFirstFalse buildMonoidBenchmarks
-    , boptsBenchmarkOpts =
-          benchmarkOptsFromMonoid buildMonoidBenchmarkOpts additionalArgs
-    , boptsReconfigure = fromFirstFalse buildMonoidReconfigure
-    , boptsCabalVerbose = fromFirst (CabalVerbosity normal) buildMonoidCabalVerbose
-    , boptsSplitObjs = fromFirstFalse buildMonoidSplitObjs
-    , boptsSkipComponents = buildMonoidSkipComponents
-    , boptsInterleavedOutput = fromFirstTrue buildMonoidInterleavedOutput
-    , boptsDdumpDir = getFirst buildMonoidDdumpDir
-    }
-  where
-    -- These options are not directly used in bopts, instead they
-    -- transform other options.
-    tracing = getAny buildMonoidTrace
-    profiling = getAny buildMonoidProfile
-    noStripping = getAny buildMonoidNoStrip
-    -- Additional args for tracing / profiling
-    additionalArgs =
-        if tracing || profiling
-            then Just $ "+RTS" : catMaybes [trac, prof, Just "-RTS"]
-            else Nothing
-    trac =
-        if tracing
-            then Just "-xc"
-            else Nothing
-    prof =
-        if profiling
-            then Just "-p"
-            else Nothing
+buildOptsFromMonoid buildMonoid = BuildOpts
+  { libProfile = fromFirstFalse
+      (  buildMonoid.libProfile
+      <> FirstFalse (if tracing || profiling then Just True else Nothing)
+      )
+  , exeProfile = fromFirstFalse
+      (  buildMonoid.exeProfile
+      <> FirstFalse (if tracing || profiling then Just True else Nothing)
+      )
+  , libStrip = fromFirstTrue
+      (  buildMonoid.libStrip
+      <> FirstTrue (if noStripping then Just False else Nothing)
+      )
+  , exeStrip = fromFirstTrue
+      (  buildMonoid.exeStrip
+      <> FirstTrue (if noStripping then Just False else Nothing)
+      )
+  , buildHaddocks = fromFirstFalse buildMonoid.buildHaddocks
+  , haddockOpts = haddockOptsFromMonoid buildMonoid.haddockOpts
+  , openHaddocks =
+         not isHaddockFromHackage
+      && fromFirstFalse buildMonoid.openHaddocks
+  , haddockDeps = if isHaddockFromHackage
+      then Nothing
+      else getFirst buildMonoid.haddockDeps
+  , haddockExecutables =
+         not isHaddockFromHackage
+      && fromFirstFalse buildMonoid.haddockExecutables
+  , haddockTests =
+         not isHaddockFromHackage
+      && fromFirstFalse buildMonoid.haddockTests
+  , haddockBenchmarks =
+         not isHaddockFromHackage
+      && fromFirstFalse buildMonoid.haddockBenchmarks
+  , haddockInternal =
+         not isHaddockFromHackage
+      && fromFirstFalse buildMonoid.haddockInternal
+  , haddockHyperlinkSource =
+         isHaddockFromHackage
+      || fromFirstTrue buildMonoid.haddockHyperlinkSource
+  , haddockForHackage = isHaddockFromHackage
+  , installExes = fromFirstFalse buildMonoid.installExes
+  , installCompilerTool = fromFirstFalse buildMonoid.installCompilerTool
+  , preFetch = fromFirstFalse buildMonoid.preFetch
+  , keepGoing = getFirst buildMonoid.keepGoing
+  , keepTmpFiles = fromFirstFalse buildMonoid.keepTmpFiles
+  , forceDirty = isHaddockFromHackage || fromFirstFalse buildMonoid.forceDirty
+  , tests = fromFirstFalse buildMonoid.tests
+  , testOpts = testOptsFromMonoid buildMonoid.testOpts additionalArgs
+  , benchmarks = fromFirstFalse buildMonoid.benchmarks
+  , benchmarkOpts =
+      benchmarkOptsFromMonoid buildMonoid.benchmarkOpts additionalArgs
+  , reconfigure = fromFirstFalse buildMonoid.reconfigure
+  , cabalVerbose = fromFirst (CabalVerbosity normal) buildMonoid.cabalVerbose
+  , splitObjs = fromFirstFalse buildMonoid.splitObjs
+  , skipComponents = buildMonoid.skipComponents
+  , interleavedOutput = fromFirstTrue buildMonoid.interleavedOutput
+  , progressBar = fromFirst CappedBar buildMonoid.progressBar
+  , ddumpDir = getFirst buildMonoid.ddumpDir
+  , semaphore = fromFirstFalse buildMonoid.semaphore
+  }
+ where
+  isHaddockFromHackage = fromFirstFalse buildMonoid.haddockForHackage
+  -- These options are not directly used in bopts, instead they
+  -- transform other options.
+  tracing = getAny buildMonoid.trace
+  profiling = getAny buildMonoid.profile
+  noStripping = getAny buildMonoid.noStrip
+  -- Additional args for tracing / profiling
+  additionalArgs =
+    if tracing || profiling
+      then Just $ "+RTS" : catMaybes [trac, prof, Just "-RTS"]
+      else Nothing
+  trac =
+    if tracing
+      then Just "-xc"
+      else Nothing
+  prof =
+    if profiling
+      then Just "-p"
+      else Nothing
 
+-- | Interprets HaddockOptsMonoid options.
 haddockOptsFromMonoid :: HaddockOptsMonoid -> HaddockOpts
-haddockOptsFromMonoid HaddockOptsMonoid{..} =
-    defaultHaddockOpts
-    {hoAdditionalArgs = hoMonoidAdditionalArgs}
+haddockOptsFromMonoid hoMonoid = defaultHaddockOpts
+  { HaddockOpts.additionalArgs = hoMonoid.additionalArgs }
 
+-- | Interprets TestOptsMonoid options.
 testOptsFromMonoid :: TestOptsMonoid -> Maybe [String] -> TestOpts
-testOptsFromMonoid TestOptsMonoid{..} madditional =
-    defaultTestOpts
-    { toRerunTests = fromFirstTrue toMonoidRerunTests
-    , toAdditionalArgs = fromMaybe [] madditional <> toMonoidAdditionalArgs
-    , toCoverage = fromFirstFalse toMonoidCoverage
-    , toDisableRun = fromFirstFalse toMonoidDisableRun
-    , toMaximumTimeSeconds = fromFirst (toMaximumTimeSeconds defaultTestOpts) toMonoidMaximumTimeSeconds
-    }
+testOptsFromMonoid toMonoid madditional = defaultTestOpts
+  { TestOpts.rerunTests = fromFirstTrue toMonoid.rerunTests
+  , TestOpts.additionalArgs =
+      fromMaybe [] madditional <> toMonoid.additionalArgs
+  , TestOpts.coverage = fromFirstFalse toMonoid.coverage
+  , TestOpts.runTests = fromFirstTrue toMonoid.runTests
+  , TestOpts.maximumTimeSeconds =
+      fromFirst
+        defaultTestOpts.maximumTimeSeconds
+        toMonoid.maximumTimeSeconds
+  , TestOpts.timeoutGraceSeconds =
+      fromFirst
+        defaultTestOpts.timeoutGraceSeconds
+        toMonoid.timeoutGraceSeconds
+  , TestOpts.allowStdin = fromFirstTrue toMonoid.allowStdin
+  }
 
-benchmarkOptsFromMonoid :: BenchmarkOptsMonoid -> Maybe [String] -> BenchmarkOpts
-benchmarkOptsFromMonoid BenchmarkOptsMonoid{..} madditional =
-    defaultBenchmarkOpts
-    { beoAdditionalArgs =
-          fmap (\args -> unwords args <> " ") madditional <>
-          getFirst beoMonoidAdditionalArgs
-    , beoDisableRun = fromFirst
-          (beoDisableRun defaultBenchmarkOpts)
-          beoMonoidDisableRun
-    }
+-- | Interprets BenchmarkOptsMonoid options.
+benchmarkOptsFromMonoid ::
+     BenchmarkOptsMonoid
+  -> Maybe [String]
+  -> BenchmarkOpts
+benchmarkOptsFromMonoid beoMonoid madditional = defaultBenchmarkOpts
+  { BenchmarkOpts.additionalArgs =
+      fmap (\args -> unwords args <> " ") madditional <>
+      getFirst beoMonoid.additionalArgs
+  , BenchmarkOpts.runBenchmarks = fromFirstTrue beoMonoid.runBenchmarks
+  }
diff --git a/src/Stack/Config/ConfigureScript.hs b/src/Stack/Config/ConfigureScript.hs
new file mode 100644
index 0000000000..03ec7f6ca4
--- /dev/null
+++ b/src/Stack/Config/ConfigureScript.hs
@@ -0,0 +1,128 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Config.ConfigureScript
+License     : BSD-3-Clause
+-}
+
+module Stack.Config.ConfigureScript
+  ( ensureConfigureScript
+  ) where
+
+import           Path ( (</>) )
+import           Path.IO ( doesFileExist )
+import           RIO.Process ( withWorkingDir )
+import           Stack.Constants ( osIsWindows, relFileConfigure )
+import           Stack.DefaultColorWhen ( defaultColorWhen )
+import           Stack.Prelude
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.MsysEnvironment ( MsysEnvironment (..) )
+
+-- | For the given directory, yields an action that trys to generate a
+-- @configure@ script with @autoreconf@, if one does not exist in the directory.
+ensureConfigureScript ::
+     HasConfig env
+  => Path b Dir
+  -> RIO env ()
+ensureConfigureScript dir = do
+  let fp = dir </> relFileConfigure
+  exists <- doesFileExist fp
+  unless exists $ do
+    prettyInfoL
+      [ flow "Trying to generate"
+      , style Shell "configure"
+      , "with"
+      , style Shell "autoreconf"
+      , "in"
+      , pretty dir <> "."
+      ]
+    let autoreconf = if osIsWindows
+                       then readProcessNull "sh" ["autoreconf", "-i"]
+                       else readProcessNull "autoreconf" ["-i"]
+        -- On Windows 10, an upstream issue with the `sh autoreconf -i`
+        -- command means that command clears, but does not then restore, the
+        -- ENABLE_VIRTUAL_TERMINAL_PROCESSING flag for native terminals. The
+        -- following hack re-enables the lost ANSI-capability.
+        fixupOnWindows = when osIsWindows (void $ liftIO defaultColorWhen)
+    withWorkingDir (toFilePath dir) $ autoreconf `catchAny` \ex -> do
+      fixupOnWindows
+      prettyWarn $
+           fillSep
+             [ flow "Stack failed to run"
+             , style Shell "autoreconf" <> "."
+             ]
+        <> blankLine
+        <> flow "Stack encountered the following error:"
+        <> blankLine
+        <> string (displayException ex)
+      when osIsWindows $ do
+        config <- view configL
+        prettyInfo $
+             fillSep
+               [ flow "Check that executable"
+               , style File "perl"
+               , flow "is on the path in Stack's MSYS2"
+               , style Dir "\\usr\\bin"
+               , flow "folder, and working, and that script files"
+               , style File "autoreconf"
+               , "and"
+               , style File "aclocal"
+               , flow "are on the path in that location. To check that"
+               , style File "perl" <> ","
+               , style File "autoreconf"
+               , "or"
+               , style File "aclocal"
+               , flow "are on the path in the required location, run commands:"
+               ]
+          <> blankLine
+          <> indent 4 (style Shell $ flow "stack exec where.exe -- perl")
+          <> line
+          <> indent 4 (style Shell $ flow "stack exec where.exe -- autoreconf")
+          <> line
+          <> indent 4 (style Shell $ flow "stack exec where.exe -- aclocal")
+          <> blankLine
+          <> maybe mempty advice config.msysEnvironment
+          <> fillSep
+               [ flow "Some versions of"
+               , style File "perl"
+               , flow "from MSYS2 are broken. See"
+               , style Url "https://github.com/msys2/MSYS2-packages/issues/1611"
+               , "and"
+               , style Url "https://github.com/commercialhaskell/stack/pull/4781" <> "."
+               , "To test if"
+               , style File "perl"
+               , flow "in the required location is working, try command:"
+               ]
+          <> blankLine
+          <> indent 4 (style Shell "stack exec perl -- --version")
+          <> blankLine
+    fixupOnWindows
+ where
+  advice :: MsysEnvironment -> StyleDoc
+  advice CLANG32 = mempty
+  advice MINGW32 = mempty
+  advice CLANG64 = adviceWith "mingw-w64-clang-x86_64-autotools"
+  advice CLANGARM64 = adviceWith "mingw-w64-clang-aarch64-autotools"
+  advice MINGW64 = adviceWith "mingw-w64-x86_64-autotools"
+  advice UCRT64 = adviceWith "mingw-w64-ucrt-x86_64-autotools"
+
+  adviceWith :: StyleDoc -> StyleDoc
+  adviceWith msysPackage =
+       fillSep
+         [ "If"
+         , style File "perl" <> ","
+         , style File "autoreconf"
+         , "or"
+         , style File "aclocal"
+         , flow "is not on the path in the required location, add them \
+                \with command (note that the relevant package name is"
+         , style File "autotools"
+         , "not"
+         , style File "autoreconf" <> "):"
+         ]
+    <> blankLine
+    <> indent 4
+         (style Shell $ "stack exec pacman -- --sync --refresh " <> msysPackage)
+    <> blankLine
diff --git a/src/Stack/Config/Docker.hs b/src/Stack/Config/Docker.hs
index 570b039d2e..bc91cb037a 100644
--- a/src/Stack/Config/Docker.hs
+++ b/src/Stack/Config/Docker.hs
@@ -1,100 +1,140 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
 
--- | Docker configuration
-module Stack.Config.Docker where
+{-|
+Module      : Stack.Config.Docker
+Description : Docker configuration.
+License     : BSD-3-Clause
 
-import           Stack.Prelude
-import           Data.List (find)
+Docker configuration.
+-}
+
+module Stack.Config.Docker
+  ( ConfigDockerException (..)
+  , addDefaultTag
+  , dockerOptsFromMonoid
+  ) where
+
+import           Data.List ( find )
 import qualified Data.Text as T
-import           Distribution.Version (simplifyVersionRange)
-import           Stack.Types.Version
-import           Stack.Types.Config
+import           Distribution.Version ( simplifyVersionRange )
+import           Stack.Prelude
+import           Stack.Types.Project ( Project (..) )
 import           Stack.Types.Docker
-import           Stack.Types.Resolver
+                   ( DockerOpts (..), DockerMonoidRepoOrImage (..)
+                   , DockerOptsMonoid (..), dockerImageArgName
+                   )
+import           Stack.Types.Snapshot ( AbstractSnapshot (..) )
+import           Stack.Types.Version ( IntersectingVersionRange (..) )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Config.Docker" module.
+data ConfigDockerException
+  = SnapshotNotSupportedException !(Maybe Project) !(Maybe AbstractSnapshot)
+  -- ^ Only LTS snapshots are supported for default image tag.
+  deriving Show
+
+instance Exception ConfigDockerException where
+  displayException (SnapshotNotSupportedException mproject mASnapshot) =
+    concat
+      [ "Error: [S-8575]\n"
+      , "Snapshot not supported for Docker images:\n    "
+      , case (mproject, mASnapshot) of
+          (Nothing, Nothing) -> "no snapshot specified"
+          (_, Just aSnapshot) ->
+            T.unpack $ utf8BuilderToText $ display aSnapshot
+          (Just project, Nothing) ->
+            T.unpack $ utf8BuilderToText $ display project.snapshot
+      , "\nUse an LTS snapshot, or set the '"
+      , T.unpack dockerImageArgName
+      , "' explicitly, in your configuration file."]
 
 -- | Add a default Docker tag name to a given base image.
-addDefaultTag
-  :: MonadThrow m
+addDefaultTag ::
+     MonadThrow m
   => String -- ^ base
   -> Maybe Project
-  -> Maybe AbstractResolver
+  -> Maybe AbstractSnapshot
   -> m String
-addDefaultTag base mproject maresolver = do
-  let exc = throwM $ ResolverNotSupportedException mproject maresolver
-  lts <- case maresolver of
-    Just (ARResolver (RSLSynonym lts@(LTS _ _))) -> pure lts
-    Just _aresolver -> exc
+addDefaultTag base mproject mASnapshot = do
+  let exc = throwM $ SnapshotNotSupportedException mproject mASnapshot
+  lts <- case mASnapshot of
+    Just (ASSnapshot (RSLSynonym lts@(LTS _ _))) -> pure lts
+    Just _aSnapshot -> exc
     Nothing ->
-      case projectResolver <$> mproject of
+      case (.snapshot) <$> mproject of
         Just (RSLSynonym lts@(LTS _ _)) -> pure lts
         _ -> exc
   pure $ base ++ ":" ++ show lts
 
 -- | Interprets DockerOptsMonoid options.
-dockerOptsFromMonoid
-    :: MonadThrow m
-    => Maybe Project
-    -> Maybe AbstractResolver
-    -> DockerOptsMonoid
-    -> m DockerOpts
-dockerOptsFromMonoid mproject maresolver DockerOptsMonoid{..} = do
-    let dockerImage =
-          case getFirst dockerMonoidRepoOrImage of
-            Nothing -> addDefaultTag "fpco/stack-build" mproject maresolver
-            Just (DockerMonoidImage image) -> pure image
-            Just (DockerMonoidRepo repo) ->
-              case find (`elem` (":@" :: String)) repo of
-                Nothing -> addDefaultTag repo mproject maresolver
-                -- Repo already specified a tag or digest, so don't append default
-                Just _ -> pure repo
-    let dockerEnable =
-            fromFirst (getAny dockerMonoidDefaultEnable) dockerMonoidEnable
-        dockerRegistryLogin =
-            fromFirst
-                (isJust (emptyToNothing (getFirst dockerMonoidRegistryUsername)))
-                dockerMonoidRegistryLogin
-        dockerRegistryUsername = emptyToNothing (getFirst dockerMonoidRegistryUsername)
-        dockerRegistryPassword = emptyToNothing (getFirst dockerMonoidRegistryPassword)
-        dockerAutoPull = fromFirstTrue dockerMonoidAutoPull
-        dockerDetach = fromFirstFalse dockerMonoidDetach
-        dockerPersist = fromFirstFalse dockerMonoidPersist
-        dockerContainerName = emptyToNothing (getFirst dockerMonoidContainerName)
-        dockerNetwork = emptyToNothing (getFirst dockerMonoidNetwork)
-        dockerRunArgs = dockerMonoidRunArgs
-        dockerMount = dockerMonoidMount
-        dockerMountMode = emptyToNothing (getFirst dockerMonoidMountMode)
-        dockerEnv = dockerMonoidEnv
-        dockerSetUser = getFirst dockerMonoidSetUser
-        dockerRequireDockerVersion =
-            simplifyVersionRange (getIntersectingVersionRange dockerMonoidRequireDockerVersion)
-        dockerStackExe = getFirst dockerMonoidStackExe
-
-    pure DockerOpts{..}
-  where emptyToNothing Nothing = Nothing
-        emptyToNothing (Just s) | null s = Nothing
-                                | otherwise = Just s
-
--- | Exceptions thrown by Stack.Docker.Config.
-data StackDockerConfigException
-    = ResolverNotSupportedException !(Maybe Project) !(Maybe AbstractResolver)
-    -- ^ Only LTS resolvers are supported for default image tag.
-    deriving (Typeable)
-
--- | Exception instance for StackDockerConfigException.
-instance Exception StackDockerConfigException
-
--- | Show instance for StackDockerConfigException.
-instance Show StackDockerConfigException where
-    show (ResolverNotSupportedException mproject maresolver) =
-        concat
-            [ "Resolver not supported for Docker images:\n    "
-            , case (mproject, maresolver) of
-                (Nothing, Nothing) -> "no resolver specified"
-                (_, Just aresolver) -> T.unpack $ utf8BuilderToText $ display aresolver
-                (Just project, Nothing) -> T.unpack $ utf8BuilderToText $ display $ projectResolver project
-            , "\nUse an LTS resolver, or set the '"
-            , T.unpack dockerImageArgName
-            , "' explicitly, in your configuration file."]
+dockerOptsFromMonoid ::
+     MonadThrow m
+  => Maybe Project
+  -> Maybe AbstractSnapshot
+  -> DockerOptsMonoid
+  -> m DockerOpts
+dockerOptsFromMonoid mproject mASnapshot dockerMonoid = do
+  let image =
+        case getFirst dockerMonoid.repoOrImage of
+          Nothing -> addDefaultTag "fpco/stack-build" mproject mASnapshot
+          Just (DockerMonoidImage image') -> pure image'
+          Just (DockerMonoidRepo repo) ->
+            case find (`elem` (":@" :: String)) repo of
+              Nothing -> addDefaultTag repo mproject mASnapshot
+              -- Repo already specified a tag or digest, so don't append default
+              Just _ -> pure repo
+  let enable =
+        fromFirst
+          (getAny dockerMonoid.defaultEnable)
+          dockerMonoid.enable
+      registryLogin =
+        fromFirst
+          (isJust (emptyToNothing (getFirst dockerMonoid.registryUsername)))
+          dockerMonoid.registryLogin
+      registryUsername =
+        emptyToNothing (getFirst dockerMonoid.registryUsername)
+      registryPassword =
+        emptyToNothing (getFirst dockerMonoid.registryPassword)
+      autoPull = fromFirstTrue dockerMonoid.autoPull
+      detach = fromFirstFalse dockerMonoid.detach
+      persist = fromFirstFalse dockerMonoid.persist
+      containerName =
+        emptyToNothing (getFirst dockerMonoid.containerName)
+      network = emptyToNothing (getFirst dockerMonoid.network)
+      runArgs = dockerMonoid.runArgs
+      mount = dockerMonoid.mount
+      mountMode =
+        emptyToNothing (getFirst dockerMonoid.mountMode)
+      env = dockerMonoid.env
+      setUser = getFirst dockerMonoid.setUser
+      requireDockerVersion =
+        simplifyVersionRange
+          dockerMonoid.requireDockerVersion.intersectingVersionRange
+      stackExe = getFirst dockerMonoid.stackExe
+  pure DockerOpts
+    { enable
+    , image
+    , registryLogin
+    , registryUsername
+    , registryPassword
+    , autoPull
+    , detach
+    , persist
+    , containerName
+    , network
+    , runArgs
+    , mount
+    , mountMode
+    , env
+    , stackExe
+    , setUser
+    , requireDockerVersion
+    }
+ where
+  emptyToNothing Nothing = Nothing
+  emptyToNothing (Just s)
+    | null s = Nothing
+    | otherwise = Just s
diff --git a/src/Stack/Config/Nix.hs b/src/Stack/Config/Nix.hs
index 7dd9c74f73..4830f4fb20 100644
--- a/src/Stack/Config/Nix.hs
+++ b/src/Stack/Config/Nix.hs
@@ -1,60 +1,123 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Config.Nix
+Description : Nix configuration.
+License     : BSD-3-Clause
+
+Nix configuration.
+-}
 
--- | Nix configuration
 module Stack.Config.Nix
-       (nixOptsFromMonoid
-       ,nixCompiler
-       ,nixCompilerVersion
-       ,StackNixException(..)
-       ) where
+  ( ConfigNixPrettyException
+  , nixCompiler
+  , nixCompilerVersion
+  , nixOptsFromMonoid
+  ) where
 
-import Stack.Prelude
-import Control.Monad.Extra (ifM)
+import           Control.Monad.Extra ( ifM, whenJust )
 import qualified Data.Text as T
 import qualified Data.Text.IO as TIO
-import Distribution.System (OS (..))
-import Stack.Constants
-import Stack.Types.Config
-import Stack.Types.Nix
-import System.Directory (doesFileExist)
+import           Distribution.System ( OS (..) )
+import           Stack.Constants ( osIsWindows )
+import           Stack.Prelude
+import           Stack.Types.Runner ( HasRunner )
+import           Stack.Types.Nix ( NixOpts (..), NixOptsMonoid (..) )
+import           System.Directory ( doesFileExist )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Config.Nix" module.
+data ConfigNixPrettyException
+  = NixCannotUseShellFileAndPackagesException !FilePath ![Text]
+    -- ^ Nix can't be given packages and a shell file at the same time
+  | GHCMajorVersionUnspecified
+  | OnlyGHCSupported
+  deriving Show
+
+instance Pretty ConfigNixPrettyException where
+  pretty (NixCannotUseShellFileAndPackagesException initFile packages) =
+    "[S-2726]"
+    <> line
+    <> flow "The configuration of Stack's Nix integration cannot specify both \
+            \a Nix shell file and Nix packages. You have specified:"
+    <> blankLine
+    <> spacedBulletedList
+         [ fillSep
+             [ flow "Shell file:"
+             , style File (fromString initFile) <> ";"
+             , "and"
+             ]
+         , fillSep $
+               flow "Nix packages:"
+             : mkNarrativeList (Just Shell) False prettyPackages
+         ]
+   where
+    prettyPackages :: [StyleDoc]
+    prettyPackages = map (fromString . T.unpack) packages
+  pretty GHCMajorVersionUnspecified =
+    "[S-9317]"
+    <> line
+    <> flow "Stack's Nix integration requires at least a major version of GHC \
+            \to be specified. No major version is specified."
+  pretty OnlyGHCSupported =
+    "[S-8605]"
+    <> line
+    <> flow "Stack's Nix integration supports only GHC binary distributions as \
+            \compiler."
+
+instance Exception ConfigNixPrettyException
 
 -- | Interprets NixOptsMonoid options.
-nixOptsFromMonoid
-    :: HasRunner env
-    => NixOptsMonoid
-    -> OS
-    -> RIO env NixOpts
-nixOptsFromMonoid NixOptsMonoid{..} os = do
-    let defaultPure = case os of
-          OSX -> False
-          _ -> True
-        nixPureShell = fromFirst defaultPure nixMonoidPureShell
-        nixPackages = fromFirst [] nixMonoidPackages
-        nixInitFile = getFirst nixMonoidInitFile
-        nixShellOptions = fromFirst [] nixMonoidShellOptions
-                          ++ prefixAll (T.pack "-I") (fromFirst [] nixMonoidPath)
-        nixAddGCRoots   = fromFirstFalse nixMonoidAddGCRoots
+nixOptsFromMonoid ::
+     (HasRunner env, HasTerm env)
+  => NixOptsMonoid
+  -> OS
+  -> RIO env NixOpts
+nixOptsFromMonoid nixMonoid os = do
+  let defaultPure = case os of
+        OSX -> False
+        _ -> True
+      pureShell = fromFirst defaultPure nixMonoid.pureShell
+      packages = fromFirst [] nixMonoid.packages
+      initFile = getFirst nixMonoid.initFile
+      includePaths = prefixAll (T.pack "-I") (fromFirst [] nixMonoid.path)
+      instantiateOptions =
+        fromFirst [] nixMonoid.instantiateOptions ++ includePaths
+      shellOptions = fromFirst [] nixMonoid.shellOptions ++ includePaths
+      addGCRoots = fromFirstFalse nixMonoid.addGCRoots
 
-    -- Enable Nix-mode by default on NixOS, unless Docker-mode was specified
-    osIsNixOS <- isNixOS
-    let nixEnable0 = fromFirst osIsNixOS nixMonoidEnable
+  -- Enable Nix-mode by default on NixOS, unless Docker-mode was specified
+  osIsNixOS <- isNixOS
+  let nixEnable0 = fromFirst osIsNixOS nixMonoid.enable
 
-    nixEnable <- case () of _
-                                | nixEnable0 && osIsWindows -> do
-                                      logInfo "Note: Disabling nix integration, since this is being run in Windows"
-                                      pure False
-                                | otherwise                 -> pure nixEnable0
+  enable <-
+    if nixEnable0 && osIsWindows
+      then do
+        prettyNoteS
+          "Disabling Nix integration, since this is being run in Windows."
+        pure False
+      else pure nixEnable0
 
-    when (not (null nixPackages) && isJust nixInitFile) $
-       throwIO NixCannotUseShellFileAndPackagesException
-    pure NixOpts{..}
-  where prefixAll p (x:xs) = p : x : prefixAll p xs
-        prefixAll _ _      = []
+  unless (null packages) $ whenJust initFile $ \fp ->
+    prettyThrowIO $ NixCannotUseShellFileAndPackagesException fp packages
 
-nixCompiler :: WantedCompiler -> Either StringException T.Text
+  pure NixOpts
+    { enable
+    , pureShell
+    , packages
+    , initFile
+    , instantiateOptions
+    , shellOptions
+    , addGCRoots
+    }
+ where
+  prefixAll p (x:xs) = p : x : prefixAll p xs
+  prefixAll _ _      = []
+
+nixCompiler :: WantedCompiler -> Either ConfigNixPrettyException T.Text
 nixCompiler compilerVersion =
   case compilerVersion of
     WCGhc version ->
@@ -76,35 +139,23 @@ nixCompiler compilerVersion =
               <> T.pack (versionString version) <> "\"\
               \else haskell.compiler.${builtins.head compilers})"
             _ -> "haskell.compiler.ghc" <> T.concat (x : y : minor)
-        _ -> Left $ stringException "GHC major version not specified"
-    WCGhcjs{} -> Left $ stringException "Only GHC is supported by stack --nix"
-    WCGhcGit{} -> Left $ stringException "Only GHC is supported by stack --nix"
+        _ -> Left GHCMajorVersionUnspecified
+    WCGhcjs{} -> Left OnlyGHCSupported
+    WCGhcGit{} -> Left OnlyGHCSupported
 
-nixCompilerVersion :: WantedCompiler -> Either StringException T.Text
+nixCompilerVersion :: WantedCompiler -> Either ConfigNixPrettyException T.Text
 nixCompilerVersion compilerVersion =
   case compilerVersion of
     WCGhc version ->
       case T.split (== '.') (fromString $ versionString version) of
         x : y : minor -> Right $ "ghc" <> T.concat (x : y : minor)
-        _ -> Left $ stringException "GHC major version not specified"
-    WCGhcjs{} -> Left $ stringException "Only GHC is supported by stack --nix"
-    WCGhcGit{} -> Left $ stringException "Only GHC is supported by stack --nix"
-
--- Exceptions thrown specifically by Stack.Nix
-data StackNixException
-  = NixCannotUseShellFileAndPackagesException
-    -- ^ Nix can't be given packages and a shell file at the same time
-    deriving (Typeable)
-
-instance Exception StackNixException
-
-instance Show StackNixException where
-  show NixCannotUseShellFileAndPackagesException =
-    "You cannot have packages and a shell-file filled at the same time in your nix-shell configuration."
+        _ -> Left GHCMajorVersionUnspecified
+    WCGhcjs{} -> Left OnlyGHCSupported
+    WCGhcGit{} -> Left OnlyGHCSupported
 
 isNixOS :: MonadIO m => m Bool
 isNixOS = liftIO $ do
-    let fp = "/etc/os-release"
-    ifM (doesFileExist fp)
-        (T.isInfixOf "ID=nixos" <$> TIO.readFile fp)
-        (pure False)
+  let fp = "/etc/os-release"
+  ifM (doesFileExist fp)
+      (T.isInfixOf "ID=nixos" <$> TIO.readFile fp)
+      (pure False)
diff --git a/src/Stack/ConfigCmd.hs b/src/Stack/ConfigCmd.hs
index 26533c5131..95f824237f 100644
--- a/src/Stack/ConfigCmd.hs
+++ b/src/Stack/ConfigCmd.hs
@@ -1,261 +1,357 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE GADTs               #-}
+{-# LANGUAGE OverloadedLists     #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
--- | Make changes to project or global configuration.
+{-|
+Module      : Stack.ConfigCmd
+Description : Make changes to project or global configuration.
+License     : BSD-3-Clause
+
+Make changes to project or global configuration.
+-}
+
 module Stack.ConfigCmd
-       (ConfigCmdSet(..)
-       ,configCmdSetParser
-       ,cfgCmdSet
-       ,cfgCmdSetName
-       ,configCmdEnvParser
-       ,cfgCmdEnv
-       ,cfgCmdEnvName
-       ,cfgCmdName) where
+  ( cfgCmdSet
+  , cfgCmdSetName
+  , cfgCmdEnv
+  , cfgCmdEnvName
+  , cfgCmdBuildFiles
+  , cfgCmdBuildFilesName
+  , cfgCmdCompilerTools
+  , cfgCmdCompilerToolsName
+  , cfgCmdName
+  , yamlContainsInclude
+  ) where
 
-import           Stack.Prelude
 import qualified Data.Aeson.Key as Key
 import qualified Data.Aeson.KeyMap as KeyMap
-import           Data.Attoparsec.Text as P (Parser, parseOnly, skip, skipWhile,
-                                           string, takeText, takeWhile)
+import           Data.Attoparsec.Text as P
+                   ( Parser, parseOnly, skip, string, takeText, takeWhile
+                   , takeWhile1
+                   )
 import qualified Data.Map.Merge.Strict as Map
 import qualified Data.Text as T
 import qualified Data.Yaml as Yaml
-import qualified Options.Applicative as OA
-import qualified Options.Applicative.Types as OA
-import           Options.Applicative.Builder.Extra
-import           Pantry (loadSnapshot)
-import           Path
+import           Pantry ( loadSnapshot )
+import           Path ( parent )
+import           Path.IO ( ensureDir )
 import qualified RIO.Map as Map
-import           RIO.Process (envVarsL)
-import           Stack.Config (makeConcreteResolver, getProjectConfig,
-                              getImplicitGlobalProjectDir)
-import           Stack.Constants
-import           Stack.Types.Config
-import           Stack.Types.Resolver
-import           System.Environment (getEnvironment)
-
-data ConfigCmdSet
-    = ConfigCmdSetResolver (Unresolved AbstractResolver)
-    | ConfigCmdSetSystemGhc CommandScope
-                            Bool
-    | ConfigCmdSetInstallGhc CommandScope
-                             Bool
-
-data CommandScope
-    = CommandScopeGlobal
-      -- ^ Apply changes to the global configuration,
-      --   typically at @~/.stack/config.yaml@.
-    | CommandScopeProject
-      -- ^ Apply changes to the project @stack.yaml@.
-
-configCmdSetScope :: ConfigCmdSet -> CommandScope
-configCmdSetScope (ConfigCmdSetResolver _) = CommandScopeProject
-configCmdSetScope (ConfigCmdSetSystemGhc scope _) = scope
-configCmdSetScope (ConfigCmdSetInstallGhc scope _) = scope
-
-cfgCmdSet
-    :: (HasConfig env, HasGHCVariant env)
-    => ConfigCmdSet -> RIO env ()
-cfgCmdSet cmd = do
-    conf <- view configL
-    configFilePath <-
-             case configCmdSetScope cmd of
-                 CommandScopeProject -> do
-                     mstackYamlOption <- view $ globalOptsL.to globalStackYaml
-                     mstackYaml <- getProjectConfig mstackYamlOption
-                     case mstackYaml of
-                         PCProject stackYaml -> pure stackYaml
-                         PCGlobalProject -> liftM (</> stackDotYaml) (getImplicitGlobalProjectDir conf)
-                         PCNoProject _extraDeps -> throwString "config command used when no project configuration available" -- maybe modify the ~/.stack/config.yaml file instead?
-                 CommandScopeGlobal -> pure (configUserConfigPath conf)
-    rawConfig <- liftIO (readFileUtf8 (toFilePath configFilePath))
-    config <- either throwM pure (Yaml.decodeEither' $ encodeUtf8 rawConfig)
-    newValue <- cfgCmdSetValue (parent configFilePath) cmd
-    let yamlLines = T.lines rawConfig
-        cmdKey = cfgCmdSetOptionName cmd  -- Text
-        cmdKey' = Key.fromText cmdKey     -- Data.Aeson.Key.Key
-        newValue' = T.stripEnd $
-            decodeUtf8With lenientDecode $ Yaml.encode newValue  -- Text
-        file = toFilePath configFilePath  -- String
-        file' = display $ T.pack file     -- Utf8Builder
-    newYamlLines <- case KeyMap.lookup cmdKey' config of
-        Nothing -> do
-            logInfo $ file' <> " has been extended."
-            pure $ yamlLines <> [cmdKey <> ": " <> newValue']
-        Just oldValue -> if oldValue == newValue
-            then do
-                logInfo $ file' <> " already contained the intended \
-                    \configuration and remains unchanged."
-                pure yamlLines
-            else switchLine file' cmdKey newValue' [] yamlLines
-    liftIO $ writeFileUtf8 file (T.unlines newYamlLines)
-  where
-    switchLine file cmdKey _ searched [] = do
-        logWarn $ display cmdKey <> " not found in YAML file " <> file <>
-            " as a single line. Multi-line key:value formats are not supported."
-        pure $ reverse searched
-    switchLine file cmdKey newValue searched (oldLine:rest) =
-        case parseOnly (parseLine cmdKey) oldLine of
-            Left _ ->
-                switchLine file cmdKey newValue (oldLine:searched) rest
-            Right (kt, spaces1, spaces2, comment) -> do
-                let newLine = renderKey cmdKey kt <> spaces1 <> ":" <>
-                        spaces2 <> newValue <> comment
-                logInfo $ file <> " has been updated."
-                pure $ reverse searched <> (newLine:rest)
-
-    -- This assumes that a top-level key will not be indented in the YAML file.
-    parseLine :: Text -> Parser (KeyType, Text, Text, Text)
-    parseLine key = do
-        kt <- parseKey key
-        spaces1 <- P.takeWhile (== ' ')
-        skip (== ':')
-        spaces2 <- P.takeWhile (== ' ')
-        skipWhile (/= ' ')
-        comment <- takeText
-        pure (kt, spaces1, spaces2, comment)
-
-    -- If the key is, for example, install-ghc, this recognises install-ghc,
-    -- 'install-ghc' or "install-ghc".
-    parseKey :: Text -> Parser KeyType
-    parseKey k =   parsePlainKey k
-               <|> parseSingleQuotedKey k
-               <|> parseDoubleQuotedKey k
-
-    parsePlainKey :: Text -> Parser KeyType
-    parsePlainKey key = do
-      _ <- string key
-      pure PlainKey
-
-    parseSingleQuotedKey :: Text -> Parser KeyType
-    parseSingleQuotedKey = parseQuotedKey SingleQuotedKey '\''
-
-    parseDoubleQuotedKey :: Text -> Parser KeyType
-    parseDoubleQuotedKey = parseQuotedKey DoubleQuotedKey '"'
-
-    parseQuotedKey :: KeyType -> Char -> Text -> Parser KeyType
-    parseQuotedKey kt c key = do
-        skip (==c)
-        _ <- string key
-        skip (==c)
-        pure kt
-
-    renderKey :: Text -> KeyType -> Text
-    renderKey key kt = case kt of
-        PlainKey -> key
-        SingleQuotedKey -> '\'' `T.cons` key `T.snoc` '\''
-        DoubleQuotedKey -> '"' `T.cons` key `T.snoc` '"'
+import           RIO.NonEmpty ( nonEmpty )
+import qualified RIO.NonEmpty as NE
+import           RIO.Process ( envVarsL )
+import           Stack.Config ( makeConcreteSnapshot, withConfigExtra )
+import           Stack.Prelude
+import           Stack.Types.BuildConfig ( BuildConfig )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.ConfigExtra ( ConfigExtra (..) )
+import           Stack.Types.ConfigMonoid
+                   ( configMonoidInstallGHCName, configMonoidInstallMsysName
+                   , configMonoidRecommendStackUpgradeName
+                   , configMonoidSystemGHCName
+                   )
+import           Stack.Types.ConfigSetOpts
+                   ( CommandScope (..), ConfigCmdSet (..) ,configCmdSetScope )
+import           Stack.Types.EnvConfig ( EnvConfig, bindirCompilerTools )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
+import           Stack.Types.GHCVariant ( HasGHCVariant )
+import           Stack.Types.Snapshot ( AbstractSnapshot )
+import           System.Environment ( getEnvironment )
+
+-- | Type repesenting \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.ConfigCmd" module.
+data ConfigCmdPrettyException
+  = NoProjectConfigAvailable
+  | ConfigFileContainsIncludes !(Path Abs File)
+  deriving Show
+
+instance Pretty ConfigCmdPrettyException where
+  pretty NoProjectConfigAvailable =
+    "[S-3136]"
+    <> line
+    <> fillSep
+         [ style Shell "config"
+         , flow "command used when no project configuration available."
+         ]
+  pretty (ConfigFileContainsIncludes configFile) =
+    "[S-6088]"
+    <> line
+    <> fillSep
+         [ "The"
+         , style Shell "config set"
+         , flow "command cannot add a new key to a configuration file that uses"
+         , style Shell "!include"
+         , "directives:"
+         , pretty configFile
+         ]
+
+instance Exception ConfigCmdPrettyException
+
+-- | Function underlying Stack's @config set@ command.
+cfgCmdSet ::
+     (HasConfig env, HasGHCVariant env)
+  => ConfigCmdSet -> RIO env ()
+-- We ignore any user message in the project-level configuration file:
+cfgCmdSet cmd = withConfigExtra False $ \configExtra -> do
+  let conf = configExtra.config
+  configFilePath <- case configCmdSetScope cmd of
+      CommandScopeProject -> case configExtra.configFile of
+        Left _ -> prettyThrowIO NoProjectConfigAvailable
+        -- Maybe modify the global configuration file (config.yaml) instead?
+        Right fp -> pure fp
+      CommandScopeGlobal -> pure conf.userGlobalConfigFile
+  rawConfig <- liftIO (readFileUtf8 (toFilePath configFilePath))
+  config <- either throwM pure (Yaml.decodeEither' $ encodeUtf8 rawConfig)
+  newValue <- cfgCmdSetValue (parent configFilePath) cmd
+  let yamlLines = T.lines rawConfig
+      cmdKeys = cfgCmdSetKeys cmd  -- Text
+      newValue' = T.stripEnd $
+        decodeUtf8With lenientDecode $ Yaml.encode newValue  -- Text
+      file = toFilePath configFilePath  -- String
+      hits = catMaybes $ NE.toList $ NE.map (inConfig config) cmdKeys
+      primaryCmdKey = NE.last $ NE.head cmdKeys
+  newYamlLines <- case hits of
+    [] -> do
+      when (yamlContainsInclude rawConfig) $
+        prettyThrowIO (ConfigFileContainsIncludes configFilePath)
+      prettyInfoL
+        [ pretty configFilePath
+        , flow "has been extended."
+        ]
+      pure $ writeLines yamlLines "" (NE.head cmdKeys) newValue'
+    [(cmdKey, oldValue)] -> if oldValue == newValue && cmdKey == primaryCmdKey
+      then do
+        prettyInfoL
+          [ pretty configFilePath
+          , flow "already contained the intended configuration and remains \
+                 \unchanged."
+          ]
+        pure yamlLines
+      else do
+        when (cmdKey /= primaryCmdKey) $
+          prettyWarn $
+               fillSep
+                 [ pretty configFilePath
+                 , flow "contained a synonym for"
+                 , style Target (fromString $ T.unpack primaryCmdKey)
+                 , parens (style Current (fromString $ T.unpack cmdKey))
+                 , flow "which has been replaced."
+                 ]
+            <> line
+        switchLine configFilePath cmdKey primaryCmdKey newValue' [] yamlLines
+    _ -> do
+      -- In practice, this warning should not be encountered because with
+      -- snapshot and resolver (deprecated) present, Stack will not parse the
+      -- YAML file.
+      prettyWarnL
+        [ pretty configFilePath
+        , flow "contains more than one possible existing configuration and, \
+               \consequently, remains unchanged."
+        ]
+      pure yamlLines
+  liftIO $ writeFileUtf8 file (T.unlines newYamlLines)
+ where
+  -- This assumes that if the key does not exist, the lines that can be
+  -- appended to include it are of a form like:
+  --
+  -- key1:
+  --   key2:
+  --     key3: value
+  --
+  writeLines yamlLines spaces cmdKeys value =
+    case nonEmpty $ NE.tail cmdKeys of
+      Nothing -> yamlLines <> [spaces <> NE.head cmdKeys <> ": " <> value]
+      Just ks -> writeLines
+                   (yamlLines <> [spaces <> NE.head cmdKeys <> ":"])
+                   (spaces <> "  ")
+                   ks
+                   value
+
+  inConfig v cmdKeys = case v of
+    Yaml.Object obj ->
+      let cmdKey = NE.head cmdKeys
+      in  case KeyMap.lookup (Key.fromText cmdKey) obj of
+            Nothing -> Nothing
+            Just v' -> case nonEmpty $ NE.tail cmdKeys of
+              Nothing -> Just (cmdKey, v')
+              Just ks -> inConfig v' ks
+    _ -> Nothing
+
+  switchLine file cmdKey _ _ searched [] = do
+    prettyWarnL
+      [ style Current (fromString $ T.unpack cmdKey)
+      , flow "was not found in YAML file"
+      , pretty file
+      , flow "in the form"
+      , style Shell "key: value"
+      , flow "on a single line. Multi-line formats for existing keys are not \
+             \supported by the"
+      , style Shell "config set"
+      , flow "commands. The file's contents have not been changed."
+      ]
+    pure $ reverse searched
+  switchLine file cmdKey cmdKey' newValue searched (oldLine:rest) =
+    case parseOnly (parseLine cmdKey) oldLine of
+      Left _ -> switchLine file cmdKey cmdKey' newValue (oldLine:searched) rest
+      Right (kt, spaces1, spaces2, spaces3, comment) -> do
+        let newLine = spaces1 <> renderKey cmdKey' kt <> spaces2 <>
+                ":" <> spaces3 <> newValue <> comment
+        prettyInfoL
+          [ pretty file
+          , flow "has been updated."
+          ]
+        pure $ reverse searched <> (newLine:rest)
+
+  parseLine :: Text -> Parser (KeyType, Text, Text, Text, Text)
+  parseLine key = do
+    spaces1 <- P.takeWhile (== ' ')
+    kt <- parseKey key
+    spaces2 <- P.takeWhile (== ' ')
+    skip (== ':')
+    spaces3 <- P.takeWhile1 (== ' ')
+    -- This assumes that the existing value contains no space characters, which
+    -- is tolerable for current purposes.
+    void $ takeWhile1 (/= ' ')
+    -- This assumes that anything that follows the existing value is a comment,
+    -- which is tolerable for current purposes.
+    comment <- takeText
+    pure (kt, spaces1, spaces2, spaces3, comment)
+
+  -- If the key is, for example, install-ghc, this recognises install-ghc,
+  -- 'install-ghc' or "install-ghc".
+  parseKey :: Text -> Parser KeyType
+  parseKey k =   parsePlainKey k
+    <|> parseSingleQuotedKey k
+    <|> parseDoubleQuotedKey k
+
+  parsePlainKey :: Text -> Parser KeyType
+  parsePlainKey key = do
+    _ <- P.string key
+    pure PlainKey
+
+  parseSingleQuotedKey :: Text -> Parser KeyType
+  parseSingleQuotedKey = parseQuotedKey SingleQuotedKey '\''
+
+  parseDoubleQuotedKey :: Text -> Parser KeyType
+  parseDoubleQuotedKey = parseQuotedKey DoubleQuotedKey '"'
+
+  parseQuotedKey :: KeyType -> Char -> Text -> Parser KeyType
+  parseQuotedKey kt c key = do
+    skip (==c)
+    _ <- P.string key
+    skip (==c)
+    pure kt
+
+  renderKey :: Text -> KeyType -> Text
+  renderKey key kt = case kt of
+    PlainKey -> key
+    SingleQuotedKey -> '\'' `T.cons` key `T.snoc` '\''
+    DoubleQuotedKey -> '"' `T.cons` key `T.snoc` '"'
 
 -- |Type representing types of representations of keys in YAML files.
 data KeyType
-    = PlainKey  -- ^ For example: install-ghc
-    | SingleQuotedKey  -- ^ For example: 'install-ghc'
-    | DoubleQuotedKey  -- ^ For example: "install-ghc"
-    deriving (Eq, Show)
-
-cfgCmdSetValue
-    :: (HasConfig env, HasGHCVariant env)
-    => Path Abs Dir -- ^ root directory of project
-    -> ConfigCmdSet -> RIO env Yaml.Value
-cfgCmdSetValue root (ConfigCmdSetResolver newResolver) = do
-    newResolver' <- resolvePaths (Just root) newResolver
-    concreteResolver <- makeConcreteResolver newResolver'
-    -- Check that the snapshot actually exists
-    void $ loadSnapshot =<< completeSnapshotLocation concreteResolver
-    pure (Yaml.toJSON concreteResolver)
-cfgCmdSetValue _ (ConfigCmdSetSystemGhc _ bool') =
-    pure (Yaml.Bool bool')
-cfgCmdSetValue _ (ConfigCmdSetInstallGhc _ bool') =
-    pure (Yaml.Bool bool')
-
-cfgCmdSetOptionName :: ConfigCmdSet -> Text
-cfgCmdSetOptionName (ConfigCmdSetResolver _) = "resolver"
-cfgCmdSetOptionName (ConfigCmdSetSystemGhc _ _) = configMonoidSystemGHCName
-cfgCmdSetOptionName (ConfigCmdSetInstallGhc _ _) = configMonoidInstallGHCName
+  = PlainKey  -- ^ For example: install-ghc
+  | SingleQuotedKey  -- ^ For example: 'install-ghc'
+  | DoubleQuotedKey  -- ^ For example: "install-ghc"
+  deriving (Eq, Show)
+
+cfgCmdSetValue ::
+     (HasConfig env, HasGHCVariant env)
+  => Path Abs Dir -- ^ root directory of project
+  -> ConfigCmdSet -> RIO env Yaml.Value
+cfgCmdSetValue root (ConfigCmdSetSnapshot newSnapshot) =
+  snapshotValue root newSnapshot
+cfgCmdSetValue root (ConfigCmdSetResolver newSnapshot) =
+  snapshotValue root newSnapshot
+cfgCmdSetValue _ (ConfigCmdSetSystemGhc _ bool') = pure $ Yaml.Bool bool'
+cfgCmdSetValue _ (ConfigCmdSetInstallGhc _ bool') = pure $ Yaml.Bool bool'
+cfgCmdSetValue _ (ConfigCmdSetInstallMsys _ bool') = pure $ Yaml.Bool bool'
+cfgCmdSetValue _ (ConfigCmdSetRecommendStackUpgrade _ bool') =
+  pure $ Yaml.Bool bool'
+cfgCmdSetValue _ (ConfigCmdSetDownloadPrefix _ url) = pure $ Yaml.String url
+
+snapshotValue ::
+     HasConfig env
+  => Path Abs Dir -- ^ root directory of project
+  -> Unresolved AbstractSnapshot
+  -> RIO env Yaml.Value
+snapshotValue root snapshot = do
+  snapshot' <- resolvePaths (Just root) snapshot
+  concreteSnapshot <- makeConcreteSnapshot snapshot'
+  -- Check that the snapshot actually exists
+  void $ loadSnapshot =<< completeSnapshotLocation concreteSnapshot
+  rslValue concreteSnapshot
+
+rslValue :: HasConfig env => RawSnapshotLocation -> RIO env Yaml.Value
+rslValue (RSLCompiler compiler) = pure $ Yaml.toJSON compiler
+rslValue (RSLUrl url Nothing) = pure $ Yaml.toJSON url
+rslValue (RSLUrl url _) = do
+  -- I can't see how this would ever arise, but it is added for completeness:
+  prettyWarnL
+    [ flow "The specified snapshot value is a URL. The associated SHA256 hash \
+           \and file size will be ignored."
+    ]
+  pure $ Yaml.toJSON url
+rslValue (RSLFilePath rp) = pure $ Yaml.toJSON $ resolvedRelative rp
+rslValue rsl = pure $ Yaml.toJSON rsl
 
+cfgCmdSetKeys :: ConfigCmdSet -> NonEmpty (NonEmpty Text)
+cfgCmdSetKeys (ConfigCmdSetSnapshot _) = [["snapshot"], ["resolver"]]
+cfgCmdSetKeys (ConfigCmdSetResolver _) = [["resolver"], ["snapshot"]]
+cfgCmdSetKeys (ConfigCmdSetSystemGhc _ _) = [[configMonoidSystemGHCName]]
+cfgCmdSetKeys (ConfigCmdSetInstallGhc _ _) = [[configMonoidInstallGHCName]]
+cfgCmdSetKeys (ConfigCmdSetInstallMsys _ _) = [[configMonoidInstallMsysName]]
+cfgCmdSetKeys (ConfigCmdSetRecommendStackUpgrade _ _) =
+  [[configMonoidRecommendStackUpgradeName]]
+cfgCmdSetKeys (ConfigCmdSetDownloadPrefix _ _) =
+  [["package-index", "download-prefix"]]
+
+-- | Check if YAML content contains a @!include@ directive in value position.
+-- This covers both inline values (e.g. @key: !include path@) and values on
+-- the next line after indentation. Stack config keys do not contain spaces or
+-- colons, so the first @:@ is always the value separator.
+yamlContainsInclude :: Text -> Bool
+yamlContainsInclude =
+ let lineContainsInclude yamlLine =
+       let stripped = T.stripStart yamlLine
+       in  includeAsValue stripped || includeOnOwnLine stripped
+
+     includeAsValue strippedLine =
+       let (_key, rest) = T.breakOn ":" strippedLine
+       in  "!include" `T.isPrefixOf` T.stripStart (T.drop 1 rest)
+
+     includeOnOwnLine strippedLine =
+       "!include" `T.isPrefixOf` strippedLine
+ in  any lineContainsInclude . T.lines
+
+-- | The name of Stack's @config@ command.
 cfgCmdName :: String
 cfgCmdName = "config"
 
+-- | The name of Stack's @config@ command's @set@ subcommand.
 cfgCmdSetName :: String
 cfgCmdSetName = "set"
 
+-- | The name of Stack's @config@ command's @env@ subcommand.
 cfgCmdEnvName :: String
 cfgCmdEnvName = "env"
 
-configCmdSetParser :: OA.Parser ConfigCmdSet
-configCmdSetParser = OA.hsubparser $
-  mconcat
-    [ OA.command "resolver"
-        ( OA.info
-            (ConfigCmdSetResolver <$>
-             OA.argument
-                 readAbstractResolver
-                 (OA.metavar "SNAPSHOT" <>
-                  OA.help "E.g. \"nightly\" or \"lts-7.2\""))
-            (OA.progDesc
-               "Change the resolver of the current project."))
-    , OA.command (T.unpack configMonoidSystemGHCName)
-        ( OA.info
-            (ConfigCmdSetSystemGhc <$> scopeFlag <*> boolArgument)
-            (OA.progDesc
-               "Configure whether Stack should use a system GHC installation \
-               \or not."))
-    , OA.command (T.unpack configMonoidInstallGHCName)
-        ( OA.info
-            (ConfigCmdSetInstallGhc <$> scopeFlag <*> boolArgument)
-            (OA.progDesc
-               "Configure whether Stack should automatically install GHC when \
-               \necessary."))
-    ]
+-- | The name of Stack's @config@ command's @build-files@ subcommand.
+cfgCmdBuildFilesName :: String
+cfgCmdBuildFilesName = "build-files"
 
-scopeFlag :: OA.Parser CommandScope
-scopeFlag = OA.flag
-  CommandScopeProject
-  CommandScopeGlobal
-  (  OA.long "global"
-  <> OA.help
-       "Modify the user-specific global configuration file ('config.yaml') \
-       \instead of the project-level configuration file ('stack.yaml')."
-  )
-
-readBool :: OA.ReadM Bool
-readBool = do
-  s <- OA.readerAsk
-  case s of
-    "true" -> pure True
-    "false" -> pure False
-    _ -> OA.readerError ("Invalid value " ++ show s ++
-           ": Expected \"true\" or \"false\"")
-
-boolArgument :: OA.Parser Bool
-boolArgument = OA.argument
-  readBool
-  (  OA.metavar "true|false"
-  <> OA.completeWith ["true", "false"]
-  )
-
-configCmdEnvParser :: OA.Parser EnvSettings
-configCmdEnvParser = EnvSettings
-  <$> boolFlags True "locals" "include local package information" mempty
-  <*> boolFlags True
-        "ghc-package-path" "set GHC_PACKAGE_PATH environment variable" mempty
-  <*> boolFlags True "stack-exe" "set STACK_EXE environment variable" mempty
-  <*> boolFlags False
-        "locale-utf8" "set the GHC_CHARENC environment variable to UTF-8" mempty
-  <*> boolFlags False
-        "keep-ghc-rts" "keep any GHCRTS environment variable" mempty
+-- | The name of Stack's @config@ command's @compiler-tools-bin@ subcommand.
+cfgCmdCompilerToolsName :: String
+cfgCmdCompilerToolsName = "compiler-tools"
 
 data EnvVarAction = EVASet !Text | EVAUnset
   deriving Show
 
+-- | Function underlying Stack's @config env@ command.
 cfgCmdEnv :: EnvSettings -> RIO EnvConfig ()
 cfgCmdEnv es = do
   origEnv <- liftIO $ Map.fromList . map (first fromString) <$> getEnvironment
-  mkPC <- view $ configL.to configProcessContextSettings
+  mkPC <- view $ configL . to (.processContextSettings)
   pc <- liftIO $ mkPC es
   let newEnv = pc ^. envVarsL
       actions = Map.merge
@@ -275,4 +371,13 @@ cfgCmdEnv es = do
         encodeUtf8Builder key <> ";\n"
       escape '\'' = "'\"'\"'"
       escape c = T.singleton c
-  hPutBuilder stdout $ Map.foldMapWithKey toLine actions
+  putBuilder $ Map.foldMapWithKey toLine actions
+
+-- | This function takes no settings and yields no action of interest. It is
+-- 'Stack.Config.withBuildConfig' that yields the desired actions.
+cfgCmdBuildFiles :: () -> RIO BuildConfig ()
+cfgCmdBuildFiles () = pure ()
+
+-- | This function takes no settings.
+cfgCmdCompilerTools :: () -> RIO EnvConfig ()
+cfgCmdCompilerTools () = bindirCompilerTools >>= ensureDir
diff --git a/src/Stack/ConfigureOpts.hs b/src/Stack/ConfigureOpts.hs
new file mode 100644
index 0000000000..6a31ed3740
--- /dev/null
+++ b/src/Stack/ConfigureOpts.hs
@@ -0,0 +1,213 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.ConfigureOpts
+License     : BSD-3-Clause
+-}
+
+module Stack.ConfigureOpts
+  ( configureOptsFromBase
+  , configureOptsFromDb
+  , renderConfigureOpts
+  , packageConfigureOptsFromPackage
+  ) where
+
+import qualified Data.Map as Map
+import qualified Data.Text as T
+import           Database.Persist ( Entity, entityVal )
+import           Distribution.Types.PackageName ( unPackageName )
+import           Distribution.Types.UnqualComponentName
+                   ( unUnqualComponentName )
+import           GHC.Records ( HasField )
+import           Path ( (</>), parseRelDir )
+import           Path.Extra ( toFilePathNoTrailingSep )
+import           Stack.Constants
+                   ( bindirSuffix, compilerOptionsCabalFlag, docDirSuffix
+                   , relDirEtc, relDirLib, relDirLibexec, relDirShare
+                   )
+import           Stack.Prelude
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
+import           Stack.Types.Compiler ( whichCompiler )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.ConfigureOpts
+                   ( BaseConfigOpts (..), ConfigureOpts (..)
+                   , PackageConfigureOpts (..) )
+import           Stack.Types.EnvConfig ( EnvConfig, actualCompilerVersionL )
+import           Stack.Types.GhcPkgId ( GhcPkgId, ghcPkgIdString )
+import           Stack.Types.IsMutable ( IsMutable (..) )
+import           Stack.Types.Package ( Package(..), packageIdentifier )
+import           System.FilePath ( pathSeparator )
+
+packageConfigureOptsFromPackage ::
+     Package
+  -> PackageConfigureOpts
+packageConfigureOptsFromPackage pkg = PackageConfigureOpts
+  { pkgCabalConfigOpts = pkg.cabalConfigOpts
+  , pkgGhcOptions = pkg.ghcOptions
+  , pkgFlags = pkg.flags
+  , pkgDefaultFlags = pkg.defaultFlags
+  , pkgIdentifier = packageIdentifier pkg
+  }
+
+configureOptsFromDb ::
+     ( HasField "configCacheDirOptionValue" b1 String
+     , HasField "configCacheNoDirOptionValue" b2 String
+     )
+  => [Entity b1]
+  -> [Entity b2]
+  -> ConfigureOpts
+configureOptsFromDb x y = ConfigureOpts
+  { pathRelated = map ((.configCacheDirOptionValue) . entityVal) x
+  , nonPathRelated = map ((.configCacheNoDirOptionValue) . entityVal) y
+  }
+
+-- | Render a @BaseConfigOpts@ to an actual list of options
+configureOptsFromBase ::
+     EnvConfig
+  -> BaseConfigOpts
+  -> Map MungedPackageId GhcPkgId -- ^ dependencies
+  -> Bool -- ^ local non-extra-dep?
+  -> IsMutable
+  -> PackageConfigureOpts
+  -> ConfigureOpts
+configureOptsFromBase econfig bco deps isLocal isMutable pkgConfigureOpts =
+  ConfigureOpts
+    { pathRelated = configureOptsPathRelated bco isMutable pkgConfigureOpts
+    , nonPathRelated =
+        configureOptsNonPathRelated econfig bco deps isLocal pkgConfigureOpts
+    }
+
+configureOptsPathRelated ::
+     BaseConfigOpts
+  -> IsMutable
+  -> PackageConfigureOpts
+  -> [String]
+configureOptsPathRelated bco isMutable pkgOpts = concat
+  [ ["--user", "--package-db=clear", "--package-db=global"]
+  , map (("--package-db=" ++) . toFilePathNoTrailingSep) $ case isMutable of
+      Immutable -> bco.extraDBs ++ [bco.snapDB]
+      Mutable -> bco.extraDBs ++ [bco.snapDB] ++ [bco.localDB]
+  , [ "--libdir=" ++ toFilePathNoTrailingSep (installRoot </> relDirLib)
+    , "--bindir=" ++ toFilePathNoTrailingSep (installRoot </> bindirSuffix)
+    , "--datadir=" ++ toFilePathNoTrailingSep (installRoot </> relDirShare)
+    , "--libexecdir=" ++ toFilePathNoTrailingSep (installRoot </> relDirLibexec)
+    , "--sysconfdir=" ++ toFilePathNoTrailingSep (installRoot </> relDirEtc)
+    , "--docdir=" ++ toFilePathNoTrailingSep docDir
+    , "--htmldir=" ++ toFilePathNoTrailingSep docDir
+    , "--haddockdir=" ++ toFilePathNoTrailingSep docDir]
+  ]
+ where
+  installRoot =
+    case isMutable of
+      Immutable -> bco.snapInstallRoot
+      Mutable -> bco.localInstallRoot
+  docDir =
+    case pkgVerDir of
+      Nothing -> installRoot </> docDirSuffix
+      Just dir -> installRoot </> docDirSuffix </> dir
+  pkgVerDir = parseRelDir
+    (  packageIdentifierString pkgOpts.pkgIdentifier
+    ++ [pathSeparator]
+    )
+
+-- | Same as 'configureOpts', but does not include directory path options
+configureOptsNonPathRelated ::
+     EnvConfig
+  -> BaseConfigOpts
+  -> Map MungedPackageId GhcPkgId -- ^ Dependencies.
+  -> Bool -- ^ Is this a local, non-extra-dep?
+  -> PackageConfigureOpts
+  -> [String]
+configureOptsNonPathRelated econfig bco deps isLocal package = concat
+  [ depOptions
+  , [ "--enable-library-profiling"
+    | bopts.libProfile || bopts.exeProfile
+    ]
+  , ["--enable-profiling" | bopts.exeProfile && isLocal]
+  , ["--enable-split-objs" | bopts.splitObjs]
+  , [ "--disable-library-stripping"
+    | not $ bopts.libStrip || bopts.exeStrip
+    ]
+  , ["--disable-executable-stripping" | not bopts.exeStrip && isLocal]
+  , flags
+  , map T.unpack package.pkgCabalConfigOpts
+  , processGhcOptions package.pkgGhcOptions
+  , map ("--extra-include-dirs=" ++) config.extraIncludeDirs
+  , map ("--extra-lib-dirs=" ++) config.extraLibDirs
+  , maybe
+      []
+      (\customGcc -> ["--with-gcc=" ++ toFilePath customGcc])
+      config.overrideGccPath
+  , ["--exact-configuration"]
+  , ["--ghc-option=-fhide-source-paths" | hideSourcePaths]
+  ]
+ where
+  -- This function parses the GHC options that are providing in the
+  -- stack.yaml file. In order to handle RTS arguments correctly, we need
+  -- to provide the RTS arguments as a single argument.
+  processGhcOptions :: [Text] -> [String]
+  processGhcOptions args =
+    let (preRtsArgs, mid) = break ("+RTS" ==) args
+        (rtsArgs, end) = break ("-RTS" ==) mid
+        fullRtsArgs =
+          case rtsArgs of
+            [] ->
+              -- This means that we didn't have any RTS args - no `+RTS` - and
+              -- therefore no need for a `-RTS`.
+              []
+            _ ->
+              -- In this case, we have some RTS args. `break` puts the `"-RTS"`
+              -- string in the `snd` list, so we want to append it on the end of
+              -- `rtsArgs` here.
+              --
+              -- We're not checking that `-RTS` is the first element of `end`.
+              -- This is because the GHC RTS allows you to omit a trailing -RTS
+              -- if that's the last of the arguments. This permits a GHC options
+              -- in stack.yaml that matches what you might pass directly to GHC.
+              [T.unwords $ rtsArgs ++ ["-RTS"]]
+        -- We drop the first element from `end`, because it is always either
+        -- `"-RTS"` (and we don't want that as a separate argument) or the list
+        -- is empty (and `drop _ [] = []`).
+        postRtsArgs = drop 1 end
+        newArgs = concat [preRtsArgs, fullRtsArgs, postRtsArgs]
+    in  concatMap (\x -> [compilerOptionsCabalFlag wc, T.unpack x]) newArgs
+
+  wc = view (actualCompilerVersionL . to whichCompiler) econfig
+
+  hideSourcePaths = config.hideSourcePaths
+
+  config = view configL econfig
+  bopts = bco.buildOpts
+  mapAndAppend fn = Map.foldrWithKey' (fmap (:) . fn)
+  -- Unioning atop defaults is needed so that all flags are specified with
+  -- --exact-configuration.
+  flags = mapAndAppend
+    renderFlags
+    []
+    (package.pkgFlags `Map.union` package.pkgDefaultFlags)
+  renderFlags name enabled =
+       "-f"
+    <> (if enabled then "" else "-")
+    <> flagNameString name
+
+  depOptions = mapAndAppend toDepOption [] deps
+
+  toDepOption (MungedPackageId name _) gid = concat
+    [ "--dependency="
+    , depOptionKey
+    , "="
+    , ghcPkgIdString gid
+    ]
+   where
+    MungedPackageName pkgName libName = name
+    pkgName' = unPackageName pkgName
+    depOptionKey = case libName of
+      LMainLibName -> pkgName'
+      LSubLibName cn -> pkgName' <> ":" <> unUnqualComponentName cn
+
+-- | Render configure options as a single list of options.
+renderConfigureOpts :: ConfigureOpts -> [String]
+renderConfigureOpts copts = copts.pathRelated ++ copts.nonPathRelated
diff --git a/src/Stack/Constants.hs b/src/Stack/Constants.hs
index 8092882825..6ddfea5b19 100644
--- a/src/Stack/Constants.hs
+++ b/src/Stack/Constants.hs
@@ -3,140 +3,194 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-} -- keep TH usage here
 
--- | Constants used throughout the project.
+{-|
+Module      : Stack.Constants
+Description : Constants used throughout the project.
+License     : BSD-3-Clause
+
+Constants used throughout the project.
+-}
 
 module Stack.Constants
-    (buildPlanDir
-    ,buildPlanCacheDir
-    ,haskellFileExts
-    ,haskellDefaultPreprocessorExts
-    ,stackDotYaml
-    ,stackWorkEnvVar
-    ,stackRootEnvVar
-    ,stackRootOptionName
-    ,deprecatedStackRootOptionName
-    ,inContainerEnvVar
-    ,inNixShellEnvVar
-    ,stackProgNameUpper
-    ,wiredInPackages
-    ,cabalPackageName
-    ,implicitGlobalProjectDirDeprecated
-    ,implicitGlobalProjectDir
-    ,defaultUserConfigPathDeprecated
-    ,defaultUserConfigPath
-    ,defaultGlobalConfigPathDeprecated
-    ,defaultGlobalConfigPath
-    ,platformVariantEnvVar
-    ,compilerOptionsCabalFlag
-    ,ghcColorForceFlag
-    ,minTerminalWidth
-    ,maxTerminalWidth
-    ,defaultTerminalWidth
-    ,osIsWindows
-    ,relFileSetupHs
-    ,relFileSetupLhs
-    ,relFileHpackPackageConfig
-    ,relDirGlobalAutogen
-    ,relDirAutogen
-    ,relDirLogs
-    ,relFileCabalMacrosH
-    ,relDirBuild
-    ,relDirBin
-    ,relDirPantry
-    ,relDirPrograms
-    ,relDirUpperPrograms
-    ,relDirStackProgName
-    ,relDirStackWork
-    ,relFileReadmeTxt
-    ,relDirScript
-    ,relFileConfigYaml
-    ,relDirSnapshots
-    ,relDirGlobalHints
-    ,relFileGlobalHintsYaml
-    ,relDirInstall
-    ,relDirCompilerTools
-    ,relDirHoogle
-    ,relFileDatabaseHoo
-    ,relDirPkgdb
-    ,relFileStorage
-    ,relDirLoadedSnapshotCache
-    ,bindirSuffix
-    ,docDirSuffix
-    ,relDirHpc
-    ,relDirLib
-    ,relDirShare
-    ,relDirLibexec
-    ,relDirEtc
-    ,setupGhciShimCode
-    ,relDirSetupExeCache
-    ,relDirSetupExeSrc
-    ,relFileConfigure
-    ,relDirDist
-    ,relFileSetupMacrosH
-    ,relDirSetup
-    ,relFileSetupLower
-    ,relDirMingw
-    ,relDirMingw32
-    ,relDirMingw64
-    ,relDirLocal
-    ,relDirUsr
-    ,relDirInclude
-    ,relFileIndexHtml
-    ,relDirAll
-    ,relFilePackageCache
-    ,relFileDockerfile
-    ,relDirHaskellStackGhci
-    ,relFileGhciScript
-    ,relDirCombined
-    ,relFileHpcIndexHtml
-    ,relDirCustom
-    ,relDirPackageConfInplace
-    ,relDirExtraTixFiles
-    ,relDirInstalledPackages
-    ,backupUrlRelPath
-    ,relDirDotLocal
-    ,relDirDotSsh
-    ,relDirDotStackProgName
-    ,relDirUnderHome
-    ,relDirSrc
-    ,relFileLibtinfoSo5
-    ,relFileLibtinfoSo6
-    ,relFileLibncurseswSo6
-    ,relFileLibgmpSo10
-    ,relFileLibgmpSo3
-    ,relDirNewCabal
-    ,relFileSetupExe
-    ,relFileSetupUpper
-    ,relFile7zexe
-    ,relFile7zdll
-    ,relFileMainHs
-    ,relFileStack
-    ,relFileStackDotExe
-    ,relFileStackDotTmpDotExe
-    ,relFileStackDotTmp
-    ,ghcShowOptionsOutput
-    ,hadrianScriptsWindows
-    ,hadrianScriptsPosix
-    ,usrLibDirs
-    ,testGhcEnvRelFile
-    ,relFileBuildLock
-    ,stackDeveloperModeDefault
-    ,globalFooter
-    )
-    where
-
-import           Data.ByteString.Builder (byteString)
-import           Data.Char (toUpper)
-import           Data.FileEmbed (embedFile, makeRelativeToProject)
+  ( buildPlanDir
+  , buildPlanCacheDir
+  , haskellFileExts
+  , haskellDefaultPreprocessorExts
+  , stackProgName
+  , stackProgName'
+  , nixProgName
+  , stackDotYaml
+  , stackWorkEnvVar
+  , stackRootEnvVar
+  , stackXdgEnvVar
+  , stackRootOptionName
+  , stackGlobalConfigOptionName
+  , pantryRootEnvVar
+  , inContainerEnvVar
+  , inNixShellEnvVar
+  , stackProgNameUpper
+  , wiredInPackages
+  , allWiredInPackages
+  , cabalPackageName
+  , implicitGlobalProjectDir
+  , defaultUserConfigPath
+  , defaultGlobalConfigPath
+  , platformVariantEnvVar
+  , compilerOptionsCabalFlag
+  , ghcColorForceFlag
+  , minTerminalWidth
+  , maxTerminalWidth
+  , defaultTerminalWidth
+  , osIsMacOS
+  , osIsWindows
+  , relFileSetupHs
+  , relFileSetupLhs
+  , relFileHpackPackageConfig
+  , relDirGlobalAutogen
+  , relDirAutogen
+  , relDirLogs
+  , relFileCabalMacrosH
+  , relDirBuild
+  , relDirBin
+  , relDirGhci
+  , relDirGhciScript
+  , relDirPantry
+  , relDirPrograms
+  , relDirRoot
+  , relDirUpperPrograms
+  , relDirStackProgName
+  , relDirStackWork
+  , relFileReadmeTxt
+  , relDirScript
+  , relDirScripts
+  , relFileConfigYaml
+  , relDirSnapshots
+  , relDirGlobalHints
+  , relFileGlobalHintsYaml
+  , relDirInstall
+  , relDirCompilerTools
+  , relDirHoogle
+  , relFileDatabaseHoo
+  , relDirPkgdb
+  , relFileStorage
+  , relDirLoadedSnapshotCache
+  , bindirSuffix
+  , docDirSuffix
+  , htmlDirSuffix
+  , relDirHpc
+  , relDirLib
+  , relDirShare
+  , relDirLibexec
+  , relDirEtc
+  , setupGhciShimCode
+  , relDirSetupExeCache
+  , relDirSetupExeSrc
+  , relFileConfigure
+  , relDirDist
+  , relFileSetupMacrosH
+  , relDirSetup
+  , relFileSetupLower
+  , relDirMingw
+  , relDirMingw32
+  , relDirMingw64
+  , relDirClang32
+  , relDirClang64
+  , relDirClangArm64
+  , relDirUcrt64
+  , relDirLocal
+  , relDirUsr
+  , relDirInclude
+  , relFileIndexHtml
+  , relDirAll
+  , relFilePackageCache
+  , relFileDockerfile
+  , relFileGhciScript
+  , relDirCombined
+  , relFileHpcIndexHtml
+  , relDirCustom
+  , relDirPackageConfInplace
+  , relDirExtraTixFiles
+  , relDirInstalledPackages
+  , backupUrlRelPath
+  , relDirDotLocal
+  , relDirDotSsh
+  , relDirDotStackProgName
+  , relDirUnderHome
+  , relDirSrc
+  , relFileLibcMuslx86_64So1
+  , relFileLibtinfoSo5
+  , relFileLibtinfoSo6
+  , relFileLibncurseswSo6
+  , relFileLibgmpSo10
+  , relFileLibgmpSo3
+  , relDirNewCabal
+  , relFileSetupExe
+  , relFileSetupUpper
+  , relFile7zexe
+  , relFile7zdll
+  , relFileMainHs
+  , relFileStack
+  , relFileStackDotExe
+  , relFileStackDotTmpDotExe
+  , relFileStackDotTmp
+  , ghcShowOptionsOutput
+  , ghcBootScript
+  , ghcConfigureScript
+  , ghcConfigureWindows
+  , ghcConfigureMacOS
+  , ghcConfigurePosix
+  , relDirHadrian
+  , relFileHadrianStackDotYaml
+  , hadrianScriptsWindows
+  , hadrianScriptsPosix
+  , libDirs
+  , usrLibDirs
+  , testGhcEnvRelFile
+  , relFileBuildLock
+  , stackDeveloperModeDefault
+  , isStackUploadDisabled
+  , globalFooter
+  , gitHubBasicAuthType
+  , gitHubTokenEnvVar
+  , altGitHubTokenEnvVar
+  , hackageBaseUrl
+  ) where
+
+import           Data.ByteString.Builder ( byteString )
+import           Data.Char ( toUpper )
+import           Data.FileEmbed ( embedFile, makeRelativeToProject )
 import qualified Data.Set as Set
-import           Distribution.Package (mkPackageName)
-import qualified Hpack.Config as Hpack
-import qualified Language.Haskell.TH.Syntax as TH (runIO, lift)
-import           Path as FL
+import qualified Data.Text as T
+import           Distribution.Package ( mkPackageName )
+import           Distribution.Version ( mkVersion )
+import           Hpack.Config ( packageConfig )
+import qualified Language.Haskell.TH.Syntax as TH ( runIO, lift )
+import           Path ( (</>), mkRelDir, mkRelFile, parseAbsFile )
+import           Stack.Constants.StackProgName ( stackProgName )
+import           Stack.Constants.UsrLibDirs ( libDirs, usrLibDirs )
 import           Stack.Prelude
 import           Stack.Types.Compiler
-import           System.Permissions (osIsWindows)
-import           System.Process (readProcess)
+                   ( ActualCompiler (..), WhichCompiler (..) )
+import           System.Permissions ( osIsMacOS, osIsWindows )
+import           System.Process ( readProcess )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Constants" module.
+data ConstantsException
+  = WiredInPackagesNotParsedBug
+  deriving Show
+
+instance Exception ConstantsException where
+  displayException WiredInPackagesNotParsedBug = bugReport "[S-6057]"
+    "Parse error in wiredInPackages."
+
+-- | Name of the Stack program.
+stackProgName' :: Text
+stackProgName' = T.pack stackProgName
+
+-- | Name of the Nix package manager command
+nixProgName :: String
+nixProgName = "nix"
 
 -- | Extensions used for Haskell modules. Excludes preprocessor ones.
 haskellFileExts :: [Text]
@@ -146,7 +200,7 @@ haskellFileExts = ["hs", "hsc", "lhs"]
 haskellDefaultPreprocessorExts :: [Text]
 haskellDefaultPreprocessorExts = ["gc", "chs", "hsc", "x", "y", "ly", "cpphs"]
 
--- | Name of the 'stack' program, uppercased
+-- | Name of the \'stack\' program, uppercased
 stackProgNameUpper :: String
 stackProgNameUpper = map toUpper stackProgName
 
@@ -162,18 +216,21 @@ stackWorkEnvVar = "STACK_WORK"
 stackRootEnvVar :: String
 stackRootEnvVar = "STACK_ROOT"
 
+-- | Environment variable used to indicate XDG directories should be used.
+stackXdgEnvVar :: String
+stackXdgEnvVar = "STACK_XDG"
+
 -- | Option name for the global Stack root.
 stackRootOptionName :: String
 stackRootOptionName = "stack-root"
 
--- | Deprecated option name for the global Stack root.
---
--- Deprecated since stack-1.1.0.
---
--- TODO: Remove occurrences of this variable and use 'stackRootOptionName' only
--- after an appropriate deprecation period.
-deprecatedStackRootOptionName :: String
-deprecatedStackRootOptionName = "global-stack-root"
+-- | Option name for the global Stack configuration file.
+stackGlobalConfigOptionName :: String
+stackGlobalConfigOptionName = "global-config"
+
+-- | Environment variable used to override the location of the Pantry store
+pantryRootEnvVar :: String
+pantryRootEnvVar = "PANTRY_ROOT"
 
 -- | Environment variable used to indicate Stack is running in container.
 inContainerEnvVar :: String
@@ -185,72 +242,109 @@ inContainerEnvVar = stackProgNameUpper ++ "_IN_CONTAINER"
 inNixShellEnvVar :: String
 inNixShellEnvVar = map toUpper stackProgName ++ "_IN_NIX_SHELL"
 
--- See https://downloads.haskell.org/~ghc/7.10.1/docs/html/libraries/ghc/src/Module.html#integerPackageKey
-wiredInPackages :: Set PackageName
-wiredInPackages =
-    maybe (error "Parse error in wiredInPackages") Set.fromList mparsed
-  where
-    mparsed = mapM parsePackageName
-      [ "ghc-prim"
-      , "integer-gmp"
-      , "integer-simple"
-      , "base"
-      , "rts"
-      , "template-haskell"
-      , "dph-seq"
-      , "dph-par"
-      , "ghc"
-      , "interactive"
-      ]
+-- | The comment to \'see
+-- https://downloads.haskell.org/~ghc/7.10.1/docs/html/libraries/ghc/src/Module.html#integerPackageKey\'
+-- appears to be out of date.
+--
+-- See \'Note [About units]\' and \'Wired-in units\' at
+-- https://gitlab.haskell.org/ghc/ghc/-/blob/master/compiler/GHC/Unit.hs.
+--
+-- The \'wired-in packages\' appear to have been replaced by those that have (e.g)
+--
+-- > ghc-options: -this-unit-id ghc-prim
+--
+-- in their Cabal file because they are \'magic\'.
+--
+-- Cabal (the tool) also treats certain packages as non-reinstallable. See
+-- @Distribution.Client.Dependency.nonReinstallablePackages@.
+wiredInPackages ::
+     ActualCompiler
+     -- ^ The actual compiler being used. (Not yet implemented.)
+  -> Set PackageName
+-- When building the GHC compiler from source, we know nothing about its
+-- wired-in packages. We take a cautious approach.
+wiredInPackages (ACGhcGit _ _) = allWiredInPackages
+wiredInPackages (ACGhc ghcVersion) = case mparsed of
+  Just parsed -> Set.fromList parsed
+  Nothing -> impureThrow WiredInPackagesNotParsedBug
+ where
+  mparsed = mapM parsePackageName $
+       [ "rts"
+         -- Said to be not a \'real\' package.
+       , "ghc"
+         -- A magic package.
+       , "ghc-prim"
+         -- A magic package.
+       , "integer-simple"
+         -- A magic package.
+       , "interactive"
+         -- Type and class declarations at the GHCi command prompt are treated
+         -- as if they were defined in modules all sharing a common package
+         -- interactive. See 'Note [The interactive package]' at
+         -- https://gitlab.haskell.org/ghc/ghc/-/blob/master/compiler/GHC/Runtime/Context.hs
+         -- With GHC 9.10.3 at least, there seems to be no problem in using it.
+       ]
+    <> [ "base" | ghcVersion < mkVersion [9, 12] ]
+         -- A formerly magic package.
+    <> [ "ghc-bignum" | ghcVersion >= mkVersion [9, 0, 1] ]
+         -- A magic package from GHC 9.0.1.
+    <> [ "ghc-internal" | ghcVersion >= mkVersion [9, 10, 1] ]
+         -- A magic package from GHC 9.10.1.
+    <> [ "integer-gmp" | ghcVersion < mkVersion [9, 0] ]
+         -- No longer magic > 1.0.3.0 (GHC >= 9.0) and deprecated in favour of
+         -- ghc-bignum.
+    <> [ "template-haskell" | ghcVersion < mkVersion [9, 12] ]
+         -- No longer magic > 2.22.0.0 (GHC >= 9.12).
+
+-- | A set of all package names that have been GHC wired-in packages for
+-- versions of GHC supported by Stack.
+allWiredInPackages :: Set PackageName
+allWiredInPackages = Set.unions $ map wiredInPackages supportedCompilers
+ where
+  supportedCompilers = map (ACGhc . mkVersion)
+    [ [8, 4, 4]
+    , [8, 6, 5]
+    , [8, 8, 4]
+    , [8, 10, 7]
+    , [9, 0, 2]
+    , [9, 2, 8]
+    , [9, 4, 8]
+    , [9, 6, 7]
+    , [9, 8, 4]
+    , [9, 10, 2]
+    , [9, 12, 2]
+    ]
 
 -- | Just to avoid repetition and magic strings.
 cabalPackageName :: PackageName
 cabalPackageName =
     mkPackageName "Cabal"
 
--- | Deprecated implicit global project directory used when outside of a project.
-implicitGlobalProjectDirDeprecated :: Path Abs Dir -- ^ Stack root.
-                                   -> Path Abs Dir
-implicitGlobalProjectDirDeprecated p =
-    p </>
-    $(mkRelDir "global")
-
 -- | Implicit global project directory used when outside of a project.
 -- Normally, @getImplicitGlobalProjectDir@ should be used instead.
-implicitGlobalProjectDir :: Path Abs Dir -- ^ Stack root.
-                         -> Path Abs Dir
-implicitGlobalProjectDir p =
-    p </>
-    $(mkRelDir "global-project")
-
--- | Deprecated default global config path.
-defaultUserConfigPathDeprecated :: Path Abs Dir -> Path Abs File
-defaultUserConfigPathDeprecated = (</> $(mkRelFile "stack.yaml"))
-
--- | Default global config path.
--- Normally, @getDefaultUserConfigPath@ should be used instead.
+implicitGlobalProjectDir ::
+     Path Abs Dir -- ^ Stack root.
+  -> Path Abs Dir
+implicitGlobalProjectDir p = p </> $(mkRelDir "global-project")
+
+-- | Default user global configuration path. Normally,
+-- @getDefaultUserConfigPath@ should be used instead.
 defaultUserConfigPath :: Path Abs Dir -> Path Abs File
 defaultUserConfigPath = (</> $(mkRelFile "config.yaml"))
 
--- | Deprecated default global config path.
--- Note that this will be @Nothing@ on Windows, which is by design.
-defaultGlobalConfigPathDeprecated :: Maybe (Path Abs File)
-defaultGlobalConfigPathDeprecated = parseAbsFile "/etc/stack/config"
-
--- | Default global config path.
--- Normally, @getDefaultGlobalConfigPath@ should be used instead.
--- Note that this will be @Nothing@ on Windows, which is by design.
+-- | Default global config path. On Windows, by design, this will be @Nothing@.
 defaultGlobalConfigPath :: Maybe (Path Abs File)
 defaultGlobalConfigPath = parseAbsFile "/etc/stack/config.yaml"
 
 -- | Path where build plans are stored.
-buildPlanDir :: Path Abs Dir -- ^ Stack root
-             -> Path Abs Dir
+buildPlanDir ::
+     Path Abs Dir -- ^ Stack root
+  -> Path Abs Dir
 buildPlanDir = (</> $(mkRelDir "build-plan"))
 
 -- | Path where binary caches of the build plans are stored.
-buildPlanCacheDir
-  :: Path Abs Dir -- ^ Stack root
+buildPlanCacheDir ::
+     Path Abs Dir -- ^ Stack root
   -> Path Abs Dir
 buildPlanCacheDir = (</> $(mkRelDir "build-plan-cache"))
 
@@ -288,7 +382,7 @@ relFileSetupLhs :: Path Rel File
 relFileSetupLhs = $(mkRelFile "Setup.lhs")
 
 relFileHpackPackageConfig :: Path Rel File
-relFileHpackPackageConfig = $(mkRelFile Hpack.packageConfig)
+relFileHpackPackageConfig = $(mkRelFile packageConfig)
 
 relDirGlobalAutogen :: Path Rel Dir
 relDirGlobalAutogen = $(mkRelDir "global-autogen")
@@ -308,12 +402,21 @@ relDirBuild = $(mkRelDir "build")
 relDirBin :: Path Rel Dir
 relDirBin = $(mkRelDir "bin")
 
+relDirGhci :: Path Rel Dir
+relDirGhci = $(mkRelDir "ghci")
+
+relDirGhciScript :: Path Rel Dir
+relDirGhciScript = $(mkRelDir "ghci-script")
+
 relDirPantry :: Path Rel Dir
 relDirPantry = $(mkRelDir "pantry")
 
 relDirPrograms :: Path Rel Dir
 relDirPrograms = $(mkRelDir "programs")
 
+relDirRoot :: Path Rel Dir
+relDirRoot = $(mkRelDir ".")
+
 relDirUpperPrograms :: Path Rel Dir
 relDirUpperPrograms = $(mkRelDir "Programs")
 
@@ -329,6 +432,9 @@ relFileReadmeTxt = $(mkRelFile "README.txt")
 relDirScript :: Path Rel Dir
 relDirScript = $(mkRelDir "script")
 
+relDirScripts :: Path Rel Dir
+relDirScripts = $(mkRelDir "scripts")
+
 relFileConfigYaml :: Path Rel File
 relFileConfigYaml = $(mkRelFile "config.yaml")
 
@@ -370,6 +476,10 @@ bindirSuffix = relDirBin
 docDirSuffix :: Path Rel Dir
 docDirSuffix = $(mkRelDir "doc")
 
+-- | Suffix applied to a path to get the @html@ directory.
+htmlDirSuffix :: Path Rel Dir
+htmlDirSuffix = $(mkRelDir "html")
+
 relDirHpc :: Path Rel Dir
 relDirHpc = $(mkRelDir "hpc")
 
@@ -420,6 +530,18 @@ relDirMingw32 = $(mkRelDir "mingw32")
 relDirMingw64 :: Path Rel Dir
 relDirMingw64 = $(mkRelDir "mingw64")
 
+relDirClang32 :: Path Rel Dir
+relDirClang32 = $(mkRelDir "clang32")
+
+relDirClang64 :: Path Rel Dir
+relDirClang64 = $(mkRelDir "clang64")
+
+relDirClangArm64 :: Path Rel Dir
+relDirClangArm64 = $(mkRelDir "clangarm64")
+
+relDirUcrt64 :: Path Rel Dir
+relDirUcrt64 = $(mkRelDir "ucrt64")
+
 relDirLocal :: Path Rel Dir
 relDirLocal = $(mkRelDir "local")
 
@@ -441,9 +563,6 @@ relFilePackageCache = $(mkRelFile "package.cache")
 relFileDockerfile :: Path Rel File
 relFileDockerfile = $(mkRelFile "Dockerfile")
 
-relDirHaskellStackGhci :: Path Rel Dir
-relDirHaskellStackGhci = $(mkRelDir "haskell-stack-ghci")
-
 relFileGhciScript :: Path Rel File
 relFileGhciScript = $(mkRelFile "ghci-script")
 
@@ -483,6 +602,9 @@ relDirUnderHome = $(mkRelDir "_home")
 relDirSrc :: Path Rel Dir
 relDirSrc = $(mkRelDir "src")
 
+relFileLibcMuslx86_64So1 :: Path Rel File
+relFileLibcMuslx86_64So1 = $(mkRelFile "libc.musl-x86_64.so.1")
+
 relFileLibtinfoSo5 :: Path Rel File
 relFileLibtinfoSo5 = $(mkRelFile "libtinfo.so.5")
 
@@ -534,23 +656,48 @@ ghcShowOptionsOutput :: [String]
 ghcShowOptionsOutput =
   $(TH.runIO (readProcess "ghc" ["--show-options"] "") >>= TH.lift . lines)
 
+-- | Relative paths inside a GHC repo to the boot script.
+ghcBootScript :: Path Rel File
+ghcBootScript = $(mkRelFile "boot")
+
+-- | Relative paths inside a GHC repo to the configure script.
+ghcConfigureScript :: Path Rel File
+ghcConfigureScript = $(mkRelFile "configure")
+
+-- | Command applicable to GHC's configure script on Windows. See:
+-- https://gitlab.haskell.org/ghc/ghc/-/blob/master/hadrian/README.md
+ghcConfigureWindows :: [String]
+ghcConfigureWindows = ["sh", "configure", "--enable-tarballs-autodownload"]
+
+-- | Command applicable to GHC's configure script on macOS. See:
+-- https://gitlab.haskell.org/ghc/ghc/-/blob/master/hadrian/README.md
+ghcConfigureMacOS :: [String]
+ghcConfigureMacOS = ["./configure", "--with-intree-gmp"]
+
+-- | Command applicable to GHC's configure script on non-Windows, non-macOS.
+-- See: https://gitlab.haskell.org/ghc/ghc/-/blob/master/hadrian/README.md
+ghcConfigurePosix :: [String]
+ghcConfigurePosix = ["./configure"]
+
+relDirHadrian :: Path Rel Dir
+relDirHadrian = $(mkRelDir "hadrian")
+
+relFileHadrianStackDotYaml :: Path Rel File
+relFileHadrianStackDotYaml = relDirHadrian </> stackDotYaml
+
 -- | Relative paths inside a GHC repo to the Hadrian build batch script.
 -- The second path is maintained for compatibility with older GHC versions.
 hadrianScriptsWindows :: [Path Rel File]
-hadrianScriptsWindows = [$(mkRelFile "hadrian/build-stack.bat"), $(mkRelFile "hadrian/build.stack.bat")]
+hadrianScriptsWindows =
+  [ $(mkRelFile "hadrian/build-stack.bat")
+  , $(mkRelFile "hadrian/build.stack.bat")
+  ]
 
 -- | Relative paths inside a GHC repo to the Hadrian build shell script
 -- The second path is maintained for compatibility with older GHC versions.
 hadrianScriptsPosix :: [Path Rel File]
-hadrianScriptsPosix = [$(mkRelFile "hadrian/build-stack"), $(mkRelFile "hadrian/build.stack.sh")]
-
--- | Used in Stack.Setup for detecting libtinfo, see comments at use site
-usrLibDirs :: [Path Abs Dir]
-#if WINDOWS
-usrLibDirs = []
-#else
-usrLibDirs = [$(mkAbsDir "/usr/lib"),$(mkAbsDir "/usr/lib64")]
-#endif
+hadrianScriptsPosix =
+  [$(mkRelFile "hadrian/build-stack"), $(mkRelFile "hadrian/build.stack.sh")]
 
 -- | Relative file path for a temporary GHC environment file for tests
 testGhcEnvRelFile :: Path Rel File
@@ -564,7 +711,29 @@ relFileBuildLock = $(mkRelFile "build-lock")
 stackDeveloperModeDefault :: Bool
 stackDeveloperModeDefault = STACK_DEVELOPER_MODE_DEFAULT
 
+-- | What should the default be for stack-developer-mode
+isStackUploadDisabled :: Bool
+isStackUploadDisabled = STACK_DISABLE_STACK_UPLOAD
+
 -- | The footer to the help for Stack's subcommands
 globalFooter :: String
 globalFooter =
-  "Command 'stack --help' for global options that apply to all subcommands."
+     "Command 'stack --help' (or '-h') for global options that apply to all "
+  <> "subcommands."
+
+-- | The type for GitHub REST API HTTP \'Basic\' authentication.
+gitHubBasicAuthType :: ByteString
+gitHubBasicAuthType = "Bearer"
+
+-- | Environment variable to hold credentials for GitHub REST API HTTP \'Basic\'
+-- authentication.
+gitHubTokenEnvVar :: String
+gitHubTokenEnvVar = "GH_TOKEN"
+
+-- | Alternate environment variable to hold credentials for GitHub REST API HTTP
+-- \'Basic\' authentication.
+altGitHubTokenEnvVar :: String
+altGitHubTokenEnvVar = "GITHUB_TOKEN"
+
+hackageBaseUrl :: Text
+hackageBaseUrl = "https://hackage.haskell.org/"
diff --git a/src/Stack/Constants/Config.hs b/src/Stack/Constants/Config.hs
index 6020a79d39..0140c1b8ce 100644
--- a/src/Stack/Constants/Config.hs
+++ b/src/Stack/Constants/Config.hs
@@ -2,151 +2,172 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 
+{-|
+Module      : Stack.Constants.Config
+License     : BSD-3-Clause
+-}
+
 module Stack.Constants.Config
-  ( distDirFromDir
-  , rootDistDirFromDir
-  , setupConfigFromDir
-  , workDirFromDir
-  , distRelativeDir
-  , imageStagingDir
-  , projectDockerSandboxDir
+  ( buildCachesDir
   , configCabalMod
-  , configSetupConfigMod
   , configPackageProjectRoot
-  , buildCachesDir
-  , testSuccessFile
-  , testBuiltFile
-  , hpcRelativeDir
+  , configSetupConfigMod
+  , distDirFromDir
+  , distRelativeDir
+  , ghciDirL
   , hpcDirFromDir
+  , hpcRelativeDir
+  , imageStagingDir
   , objectInterfaceDirL
-  , ghciDirL
+  , projectDockerSandboxDir
+  , rootDistDirFromDir
+  , setupConfigFromDir
   , templatesDir
+  , testBuiltFile
+  , testSuccessFile
+  , workDirFromDir
   ) where
 
-import Stack.Prelude
-import Stack.Constants
-import Stack.Types.Config
-import Path
+import           Path ( (</>), mkRelDir, mkRelFile, parseRelDir )
+import           Stack.Constants ( relDirDist, relDirGhci, relDirHpc )
+import           Stack.Prelude
+import           Stack.Types.BuildConfig ( HasBuildConfig, configFileRootL )
+import           Stack.Types.Compiler ( compilerVersionString )
+import           Stack.Types.CompilerPaths ( compilerVersionL )
+import           Stack.Types.Config ( Config, HasConfig, stackRootL, workDirL )
+import           Stack.Types.EnvConfig
+                   ( HasEnvConfig, platformGhcRelDir, useShaPathOnWindows )
 
 -- | Output .o/.hi directory.
 objectInterfaceDirL :: HasBuildConfig env => Getting r env (Path Abs Dir)
 objectInterfaceDirL = to $ \env -> -- FIXME is this idiomatic lens code?
   let workDir = view workDirL env
-      root = view projectRootL env
-   in root </> workDir </> $(mkRelDir "odir/")
+      configFileRoot = view configFileRootL env
+  in  configFileRoot </> workDir </> $(mkRelDir "odir/")
 
 -- | GHCi files directory.
 ghciDirL :: HasBuildConfig env => Getting r env (Path Abs Dir)
 ghciDirL = to $ \env -> -- FIXME is this idiomatic lens code?
   let workDir = view workDirL env
-      root = view projectRootL env
-   in root </> workDir </> $(mkRelDir "ghci/")
-
--- | The directory containing the files used for dirtiness check of source files.
-buildCachesDir :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-               => Path Abs Dir      -- ^ Package directory.
-               -> m (Path Abs Dir)
+      configFileRoot = view configFileRootL env
+  in  configFileRoot </> workDir </> relDirGhci
+
+-- | The directory containing the files used for dirtiness check of source
+-- files.
+buildCachesDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir  -- ^ Package directory.
+  -> m (Path Abs Dir)
 buildCachesDir dir =
-    liftM
-        (</> $(mkRelDir "stack-build-caches"))
-        (distDirFromDir dir)
-
--- | The filename used to mark tests as having succeeded
-testSuccessFile :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-                => Path Abs Dir -- ^ Package directory
-                -> m (Path Abs File)
+  fmap
+    (</> $(mkRelDir "stack-build-caches"))
+    (distDirFromDir dir)
+
+-- | The filename used to mark tests as having succeeded.
+testSuccessFile ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir  -- ^ Package directory
+  -> m (Path Abs File)
 testSuccessFile dir =
-    liftM
-        (</> $(mkRelFile "stack-test-success"))
-        (distDirFromDir dir)
-
--- | The filename used to mark tests as having built
-testBuiltFile :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-              => Path Abs Dir -- ^ Package directory
-              -> m (Path Abs File)
+  fmap
+    (</> $(mkRelFile "stack-test-success"))
+    (distDirFromDir dir)
+
+-- | The filename used to mark tests as having built.
+testBuiltFile ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir  -- ^ Package directory
+  -> m (Path Abs File)
 testBuiltFile dir =
-    liftM
-        (</> $(mkRelFile "stack-test-built"))
-        (distDirFromDir dir)
-
--- | The filename used for modification check of .cabal
-configCabalMod :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-               => Path Abs Dir      -- ^ Package directory.
-               -> m (Path Abs File)
+  fmap
+    (</> $(mkRelFile "stack-test-built"))
+    (distDirFromDir dir)
+
+-- | The filename used for modification check of a Cabal file.
+configCabalMod ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir  -- ^ Package directory.
+  -> m (Path Abs File)
 configCabalMod dir =
-    liftM
-        (</> $(mkRelFile "stack-cabal-mod"))
-        (distDirFromDir dir)
-
--- | The filename used for modification check of setup-config
-configSetupConfigMod :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-                     => Path Abs Dir      -- ^ Package directory.
-                     -> m (Path Abs File)
+  fmap
+    (</> $(mkRelFile "stack-cabal-mod"))
+    (distDirFromDir dir)
+
+-- | The filename used for modification check of setup-config.
+configSetupConfigMod ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir  -- ^ Package directory.
+  -> m (Path Abs File)
 configSetupConfigMod dir =
-    liftM
-        (</> $(mkRelFile "stack-setup-config-mod"))
-        (distDirFromDir dir)
-
--- | The filename used for the project root from the last build of a package
-configPackageProjectRoot :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-                     => Path Abs Dir      -- ^ Package directory.
-                     -> m (Path Abs File)
+  fmap
+    (</> $(mkRelFile "stack-setup-config-mod"))
+    (distDirFromDir dir)
+
+-- | The filename used for the project root from the last build of a package.
+configPackageProjectRoot ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir  -- ^ Package directory.
+  -> m (Path Abs File)
 configPackageProjectRoot dir =
-    liftM
-        (</> $(mkRelFile "stack-project-root"))
-        (distDirFromDir dir)
+  fmap
+    (</> $(mkRelFile "stack-project-root"))
+    (distDirFromDir dir)
 
 -- | Directory for HPC work.
-hpcDirFromDir
-    :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-    => Path Abs Dir  -- ^ Package directory.
-    -> m (Path Abs Dir)
+hpcDirFromDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir  -- ^ Package directory.
+  -> m (Path Abs Dir)
 hpcDirFromDir fp =
-    liftM (fp </>) hpcRelativeDir
+  fmap (fp </>) hpcRelativeDir
 
 -- | Relative location of directory for HPC work.
-hpcRelativeDir :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-               => m (Path Rel Dir)
+hpcRelativeDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => m (Path Rel Dir)
 hpcRelativeDir =
-    liftM (</> $(mkRelDir "hpc")) distRelativeDir
+  fmap (</> relDirHpc) distRelativeDir
 
--- | Package's setup-config storing Cabal configuration
-setupConfigFromDir :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-                   => Path Abs Dir
-                   -> m (Path Abs File)
+-- | Package's setup-config storing Cabal configuration.
+setupConfigFromDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir
+  -> m (Path Abs File)
 setupConfigFromDir fp = do
-    dist <- distDirFromDir fp
-    pure $ dist </> $(mkRelFile "setup-config")
+  dist <- distDirFromDir fp
+  pure $ dist </> $(mkRelFile "setup-config")
 
 -- | Package's build artifacts directory.
-distDirFromDir :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-               => Path Abs Dir
-               -> m (Path Abs Dir)
+distDirFromDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => Path Abs Dir
+  -> m (Path Abs Dir)
 distDirFromDir fp =
-    liftM (fp </>) distRelativeDir
+  fmap (fp </>) distRelativeDir
 
 -- | The directory containing all dist directories, including all
--- different GHC/Cabal combos.
-rootDistDirFromDir
-  :: (MonadReader env m, HasConfig env)
+-- different platform/compiler combinations.
+rootDistDirFromDir ::
+     (HasConfig env, MonadReader env m)
   => Path Abs Dir
   -> m (Path Abs Dir)
 rootDistDirFromDir fp =
-    liftM (fp </>) rootDistRelativeDir
+  fmap (fp </>) rootDistRelativeDir
 
 -- | Relative directory to the top dist directory, containing
--- individual GHC/Cabal combo as subdirs.
-rootDistRelativeDir
-  :: (MonadReader env m, HasConfig env)
+-- individual platform/compiler combinations as subdirs.
+rootDistRelativeDir ::
+     (HasConfig env, MonadReader env m)
   => m (Path Rel Dir)
 rootDistRelativeDir = do
-    workDir <- view workDirL
-    pure $ workDir </> $(mkRelDir "dist")
+  workDir <- view workDirL
+  pure $ workDir </> relDirDist
 
 -- | Package's working directory.
-workDirFromDir :: (MonadReader env m, HasConfig env)
-               => Path Abs Dir
-               -> m (Path Abs Dir)
+workDirFromDir ::
+     (HasConfig env, MonadReader env m)
+  => Path Abs Dir
+  -> m (Path Abs Dir)
 workDirFromDir fp = view $ workDirL.to (fp </>)
 
 -- | Directory for project templates.
@@ -154,22 +175,21 @@ templatesDir :: Config -> Path Abs Dir
 templatesDir config = view stackRootL config </> $(mkRelDir "templates")
 
 -- | Relative location of build artifacts.
-distRelativeDir :: (MonadThrow m, MonadReader env m, HasEnvConfig env)
-                => m (Path Rel Dir)
+distRelativeDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => m (Path Rel Dir)
 distRelativeDir = do
-    cabalPkgVer <- view cabalVersionL
-    platform <- platformGhcRelDir
-    -- Cabal version
-    envDir <-
-        parseRelDir $
-        packageIdentifierString $
-        PackageIdentifier cabalPackageName cabalPkgVer
-    platformAndCabal <- useShaPathOnWindows (platform </> envDir)
-    allDist <- rootDistRelativeDir
-    pure $ allDist </> platformAndCabal
+  compilerVer <- view compilerVersionL
+  platform <- platformGhcRelDir
+  -- Compiler version: allows build artefacts to be distinguished by compiler
+  -- version, which will also distinguish one Cabal version from another.
+  compilerDir <- parseRelDir $ compilerVersionString compilerVer
+  platformAndCompiler <- useShaPathOnWindows (platform </> compilerDir)
+  allDist <- rootDistRelativeDir
+  pure $ allDist </> platformAndCompiler
 
 -- | Docker sandbox from project root.
-projectDockerSandboxDir :: (MonadReader env m, HasConfig env)
+projectDockerSandboxDir :: (HasConfig env, MonadReader env m)
   => Path Abs Dir      -- ^ Project root
   -> m (Path Abs Dir)  -- ^ Docker sandbox
 projectDockerSandboxDir projectRoot = do
@@ -177,7 +197,8 @@ projectDockerSandboxDir projectRoot = do
   pure $ projectRoot </> workDir </> $(mkRelDir "docker/")
 
 -- | Image staging dir from project root.
-imageStagingDir :: (MonadReader env m, HasConfig env, MonadThrow m)
+imageStagingDir ::
+     (HasConfig env, MonadReader env m, MonadThrow m)
   => Path Abs Dir      -- ^ Project root
   -> Int               -- ^ Index of image
   -> m (Path Abs Dir)  -- ^ Docker sandbox
diff --git a/src/Stack/Constants/StackProgName.hs b/src/Stack/Constants/StackProgName.hs
new file mode 100644
index 0000000000..0387d2e29a
--- /dev/null
+++ b/src/Stack/Constants/StackProgName.hs
@@ -0,0 +1,19 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Constants.StackProgName
+License     : BSD-3-Clause
+
+'stackProgName' is defined in this module rather than in "Stack.Constants", due
+to GHC stage restrictions and the use of Template Haskell.
+-}
+
+module Stack.Constants.StackProgName
+  ( stackProgName
+  ) where
+
+import           Stack.Prelude ( String )
+
+-- | Name of the Stack program.
+stackProgName :: String
+stackProgName = "stack"
diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs
index a4f617b34a..db804c0b4f 100644
--- a/src/Stack/Coverage.hs
+++ b/src/Stack/Coverage.hs
@@ -1,421 +1,591 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 {-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-{-# LANGUAGE TupleSections         #-}
 
--- | Generate HPC (Haskell Program Coverage) reports
+{-|
+Module      : Stack.Coverage
+Description : Generate HPC (Haskell Program Coverage) reports.
+License     : BSD-3-Clause
+
+Generate HPC (Haskell Program Coverage) reports.
+-}
+
 module Stack.Coverage
-    ( deleteHpcReports
-    , updateTixFile
-    , generateHpcReport
-    , HpcReportOpts(..)
-    , generateHpcReportForTargets
-    , generateHpcUnifiedReport
-    , generateHpcMarkupIndex
-    ) where
+  ( hpcReportCmd
+  , deleteHpcReports
+  , updateTixFile
+  , generateHpcReport
+  , generateHpcUnifiedReport
+  , generateHpcMarkupIndex
+  ) where
 
-import           Stack.Prelude hiding (Display (..))
-import qualified Data.ByteString.Char8 as S8
-import qualified Data.ByteString.Lazy as BL
+import qualified Data.ByteString.Lazy.Char8 as L8
+import           Data.Conduit ( await )
 import qualified Data.List as L
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Data.Text.Lazy as LT
-import           Distribution.Version (mkVersion)
+import           Distribution.Types.MungedPackageId ( computeCompatPackageId )
+import           Distribution.Types.UnqualComponentName
+                   ( mkUnqualComponentName )
 import           Path
-import           Path.Extra (toFilePathNoTrailingSep)
+                   ( (</>), dirname, parent, parseAbsFile, parseRelDir
+                   , parseRelFile, stripProperPrefix
+                   )
+import           Path.Extra ( toFilePathNoTrailingSep )
 import           Path.IO
-import           Stack.Build.Target
+                   ( copyFile, doesDirExist, doesFileExist, ensureDir
+                   , ignoringAbsence, listDir, removeDirRecur, removeFile
+                   , resolveDir', resolveFile'
+                   )
+import           RIO.ByteString.Lazy ( putStrLn )
+import           RIO.Process
+                   ( ExitCodeException, ProcessException, proc, readProcess_ )
+import           Stack.Build.Target ( NeedTargets (..) )
 import           Stack.Constants
-import           Stack.Constants.Config
-import           Stack.Package
-import           Stack.Types.Compiler
-import           Stack.Types.Config
-import           Stack.Types.NamedComponent
-import           Stack.Types.Package
+                   ( relDirAll, relDirCombined, relDirCustom
+                   , relDirExtraTixFiles, relDirPackageConfInplace
+                   , relFileHpcIndexHtml, relFileIndexHtml
+                   )
+import           Stack.Constants.Config ( distDirFromDir, hpcRelativeDir )
+import           Stack.Package ( hasBuildableMainLibrary )
+import           Stack.PackageDump ( ghcPkgField )
+import           Stack.Prelude
+import           Stack.Runners ( ShouldReexec (..), withConfig, withEnvConfig )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.CompilerPaths ( getGhcPkgExe )
+import           Stack.Types.CompCollection ( getBuildableSetText )
+import           Stack.Types.ComponentUtils ( unqualCompToString )
+import           Stack.Types.BuildOptsCLI
+                   ( BuildOptsCLI (..), defaultBuildOptsCLI )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), hpcReportDir )
+import           Stack.Types.HpcReportOpts ( HpcReportOpts (..) )
+import           Stack.Types.NamedComponent ( NamedComponent (..) )
+import           Stack.Types.Package ( Package (..), packageIdentifier )
+import           Stack.Types.Runner ( Runner )
 import           Stack.Types.SourceMap
-import           System.FilePath (isPathSeparator)
-import qualified RIO
-import           RIO.PrettyPrint
-import           RIO.Process
-import           Trace.Hpc.Tix
-import           Web.Browser (openBrowser)
+                   ( PackageType (..), SMTargets (..), SMWanted (..)
+                   , SourceMap (..), Target (..), ppRoot
+                   )
+import           System.FilePath ( isPathSeparator )
+import           Trace.Hpc.Tix ( Tix (..), TixModule (..), readTix, writeTix )
+import           Web.Browser ( openBrowser )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Coverage" module.
+data CoveragePrettyException
+  = NonTestSuiteTarget PackageName
+  | NoTargetsOrTixSpecified
+  | NotLocalPackage PackageName
+  deriving Show
 
-newtype CoverageException = NonTestSuiteTarget PackageName deriving Typeable
+instance Pretty CoveragePrettyException where
+  pretty (NonTestSuiteTarget name) =
+    "[S-6361]"
+    <> line
+    <> fillSep
+         [ flow "Can't specify anything except test-suites as hpc report \
+                \targets"
+         , parens (style Target . fromPackageName $ name)
+         , flow "is used with a non test-suite target."
+         ]
+  pretty NoTargetsOrTixSpecified =
+    "[S-2321]"
+    <> line
+    <> flow "Not generating combined report, because no targets or tix files \
+            \are specified."
+  pretty (NotLocalPackage name) =
+    "[S-9975]"
+    <> line
+    <> fillSep
+         [ flow "Expected a project package, but"
+         , style Target . fromPackageName $ name
+         , flow "is either an extra-dep or in the snapshot."
+         ]
 
-instance Exception CoverageException
-instance Show CoverageException where
-    show (NonTestSuiteTarget name) =
-        "Can't specify anything except test-suites as hpc report targets (" ++
-        packageNameString name ++
-        " is used with a non test-suite target)"
+instance Exception CoveragePrettyException
+
+-- | Function underlying the @stack hpc report@ command.
+hpcReportCmd :: HpcReportOpts -> RIO Runner ()
+hpcReportCmd hropts = do
+  let (tixFiles, targetNames) =
+        L.partition (".tix" `T.isSuffixOf`) hropts.inputs
+      boptsCLI = defaultBuildOptsCLI
+        { targetsCLI = if hropts.all then [] else targetNames }
+  withConfig YesReexec $ withEnvConfig AllowNoTargets boptsCLI $
+    generateHpcReportForTargets hropts tixFiles targetNames
 
 -- | Invoked at the beginning of running with "--coverage"
 deleteHpcReports :: HasEnvConfig env => RIO env ()
 deleteHpcReports = do
-    hpcDir <- hpcReportDir
-    liftIO $ ignoringAbsence (removeDirRecur hpcDir)
+  hpcDir <- hpcReportDir
+  liftIO $ ignoringAbsence (removeDirRecur hpcDir)
 
--- | Move a tix file into a sub-directory of the hpc report directory. Deletes the old one if one is
--- present.
-updateTixFile :: HasEnvConfig env => PackageName -> Path Abs File -> String -> RIO env ()
+-- | Move a tix file into a sub-directory of the hpc report directory. Deletes
+-- the old one if one is present.
+updateTixFile ::
+     HasEnvConfig env
+  => PackageName
+  -> Path Abs File
+  -> String
+  -> RIO env ()
 updateTixFile pkgName' tixSrc testName = do
-    exists <- doesFileExist tixSrc
-    when exists $ do
-        tixDest <- tixFilePath pkgName' testName
-        liftIO $ ignoringAbsence (removeFile tixDest)
-        ensureDir (parent tixDest)
-        -- Remove exe modules because they are problematic. This could be revisited if there's a GHC
-        -- version that fixes https://ghc.haskell.org/trac/ghc/ticket/1853
-        mtix <- readTixOrLog tixSrc
-        case mtix of
-            Nothing -> logError $ "Failed to read " <> fromString (toFilePath tixSrc)
-            Just tix -> do
-                liftIO $ writeTix (toFilePath tixDest) (removeExeModules tix)
-                -- TODO: ideally we'd do a file move, but IIRC this can
-                -- have problems. Something about moving between drives
-                -- on windows?
-                copyFile tixSrc =<< parseAbsFile (toFilePath tixDest ++ ".premunging")
-                liftIO $ ignoringAbsence (removeFile tixSrc)
+  exists <- doesFileExist tixSrc
+  when exists $ do
+    tixDest <- tixFilePath pkgName' testName
+    liftIO $ ignoringAbsence (removeFile tixDest)
+    ensureDir (parent tixDest)
+    -- Remove exe modules because they are problematic. This could be
+    -- revisited if there's a GHC version that fixes
+    -- https://ghc.haskell.org/trac/ghc/ticket/1853
+    readTixOrLog tixSrc >>= \case
+      Nothing -> prettyError $
+        "[S-2887]"
+        <> line
+        <> fillSep
+             [ flow "Failed to read"
+             , pretty tixSrc <> "."
+             ]
+      Just tix -> do
+        liftIO $ writeTix (toFilePath tixDest) (removeExeModules tix)
+        -- TODO: ideally we'd do a file move, but IIRC this can
+        -- have problems. Something about moving between drives
+        -- on windows?
+        copyFile tixSrc =<< parseAbsFile (toFilePath tixDest ++ ".premunging")
+        liftIO $ ignoringAbsence (removeFile tixSrc)
 
 -- | Get the directory used for hpc reports for the given pkgId.
 hpcPkgPath :: HasEnvConfig env => PackageName -> RIO env (Path Abs Dir)
 hpcPkgPath pkgName' = do
-    outputDir <- hpcReportDir
-    pkgNameRel <- parseRelDir (packageNameString pkgName')
-    pure (outputDir </> pkgNameRel)
+  outputDir <- hpcReportDir
+  pkgNameRel <- parseRelDir (packageNameString pkgName')
+  pure (outputDir </> pkgNameRel)
 
--- | Get the tix file location, given the name of the file (without extension), and the package
--- identifier string.
+-- | Get the tix file location, given the name of the file (without extension),
+-- and the package identifier string.
 tixFilePath :: HasEnvConfig env
             => PackageName -> String -> RIO env (Path Abs File)
 tixFilePath pkgName' testName = do
-    pkgPath <- hpcPkgPath pkgName'
-    tixRel <- parseRelFile (testName ++ "/" ++ testName ++ ".tix")
-    pure (pkgPath </> tixRel)
+  pkgPath <- hpcPkgPath pkgName'
+  tixRel <- parseRelFile (testName ++ "/" ++ testName ++ ".tix")
+  pure (pkgPath </> tixRel)
 
--- | Generates the HTML coverage report and shows a textual coverage summary for a package.
+-- | Generates the HTML coverage report and shows a textual coverage summary for
+-- a package.
 generateHpcReport :: HasEnvConfig env
                   => Path Abs Dir -> Package -> [Text] -> RIO env ()
 generateHpcReport pkgDir package tests = do
-    compilerVersion <- view actualCompilerVersionL
-    -- If we're using > GHC 7.10, the hpc 'include' parameter must specify a ghc package key. See
-    -- https://github.com/commercialhaskell/stack/issues/785
-    let pkgName' = T.pack $ packageNameString (packageName package)
-        pkgId = packageIdentifierString (packageIdentifier package)
-        ghcVersion = getGhcVersion compilerVersion
-        hasLibrary =
-          case packageLibraries package of
-            NoLibraries -> False
-            HasLibraries _ -> True
-        internalLibs = packageInternalLibraries package
-    eincludeName <-
-        -- Pre-7.8 uses plain PKG-version in tix files.
-        if ghcVersion < mkVersion [7, 10] then pure $ Right $ Just [pkgId]
-        -- We don't expect to find a package key if there is no library.
-        else if not hasLibrary && Set.null internalLibs then pure $ Right Nothing
-        -- Look in the inplace DB for the package key.
-        -- See https://github.com/commercialhaskell/stack/issues/1181#issuecomment-148968986
-        else do
+  -- If we're using > GHC 7.10, the hpc 'include' parameter must specify a ghc
+  -- package key. See
+  -- https://github.com/commercialhaskell/stack/issues/785
+  let pkgName' = packageNameString package.name
+      hasLibrary = hasBuildableMainLibrary package
+      subLibs = package.subLibraries
+  eincludeName <-
+    if not hasLibrary && null subLibs
+      -- We don't expect to find a package key if there is no library.
+      then pure $ Right Nothing
+      -- Look in the inplace DB for the package key.
+      -- See https://github.com/commercialhaskell/stack/issues/1181#issuecomment-148968986
+      else do
+        eincludeName <-
+          findPackageFieldForBuiltPackage
+            pkgDir
+            (packageIdentifier package)
+            (getBuildableSetText subLibs)
             -- GHC 8.0 uses package id instead of package key.
             -- See https://github.com/commercialhaskell/stack/issues/2424
-            let hpcNameField = if ghcVersion >= mkVersion [8, 0] then "id" else "key"
-            eincludeName <- findPackageFieldForBuiltPackage pkgDir (packageIdentifier package) internalLibs hpcNameField
-            case eincludeName of
-                Left err -> do
-                    logError $ RIO.display err
-                    pure $ Left err
-                Right includeNames -> pure $ Right $ Just $ map T.unpack includeNames
-    forM_ tests $ \testName -> do
-        tixSrc <- tixFilePath (packageName package) (T.unpack testName)
-        let report = "coverage report for " <> pkgName' <> "'s test-suite \"" <> testName <> "\""
-            reportDir = parent tixSrc
+            "id"
         case eincludeName of
-            Left err -> generateHpcErrorReport reportDir (RIO.display (sanitize (T.unpack err)))
-            -- Restrict to just the current library code, if there is a library in the package (see
-            -- #634 - this will likely be customizable in the future)
-            Right mincludeName -> do
-                let extraArgs = case mincludeName of
-                        Nothing -> []
-                        Just includeNames ->
-                            "--include" : L.intersperse "--include" (map (\n -> n ++ ":") includeNames)
-                mreportPath <- generateHpcReportInternal tixSrc reportDir report extraArgs extraArgs
-                forM_ mreportPath (displayReportPath "The" report . pretty)
+          Left err -> do
+            logError $ display err
+            pure $ Left err
+          Right includeNames -> pure $ Right $ Just $ map T.unpack includeNames
+  forM_ tests $ \testName -> do
+    tixSrc <- tixFilePath package.name (T.unpack testName)
+    let report = fillSep
+          [ flow "coverage report for"
+          , style Current (fromString pkgName') <> "'s"
+          , "test-suite"
+          , style PkgComponent (fromString $ T.unpack testName)
+          ]
+        reportHtml =
+             "coverage report for"
+          <> T.pack pkgName'
+          <> "'s test-suite \""
+          <> testName
+          <> "\""
+        reportDir = parent tixSrc
+    case eincludeName of
+      Left err -> generateHpcErrorReport reportDir (display (sanitize (T.unpack err)))
+      -- Restrict to just the current library code, if there is a library in the package (see
+      -- #634 - this will likely be customizable in the future)
+      Right mincludeName -> do
+        let extraArgs = case mincludeName of
+              Nothing -> []
+              Just includeNames ->
+                  "--include"
+                : L.intersperse "--include" (map (++ ":") includeNames)
+        mreportPath <-
+          generateHpcReportInternal tixSrc reportDir report reportHtml extraArgs extraArgs
+        forM_ mreportPath (displayReportPath "The" report . pretty)
 
-generateHpcReportInternal :: HasEnvConfig env
-                          => Path Abs File -> Path Abs Dir -> Text -> [String] -> [String]
-                          -> RIO env (Maybe (Path Abs File))
-generateHpcReportInternal tixSrc reportDir report extraMarkupArgs extraReportArgs = do
-    -- If a .tix file exists, move it to the HPC output directory and generate a report for it.
-    tixFileExists <- doesFileExist tixSrc
-    if not tixFileExists
+generateHpcReportInternal ::
+     HasEnvConfig env
+  => Path Abs File
+  -> Path Abs Dir
+  -> StyleDoc
+     -- ^ The pretty name for the report
+  -> Text
+     -- ^ The plain name for the report, used in HTML output
+  -> [String]
+  -> [String]
+  -> RIO env (Maybe (Path Abs File))
+generateHpcReportInternal
+    tixSrc
+    reportDir
+    report
+    reportHtml
+    extraMarkupArgs
+    extraReportArgs
+  = do
+      -- If a .tix file exists, move it to the HPC output directory and generate
+      -- a report for it.
+      tixFileExists <- doesFileExist tixSrc
+      if not tixFileExists
         then do
-            logError $
-                 "Didn't find .tix for " <>
-                 RIO.display report <>
-                 " - expected to find it at " <>
-                 fromString (toFilePath tixSrc) <>
-                 "."
-            pure Nothing
+          prettyError $
+            "[S-4634]"
+            <> line
+            <> fillSep
+                 [ flow "Didn't find"
+                 , style File ".tix"
+                 , "for"
+                 , report
+                 , flow "- expected to find it at"
+                 , pretty tixSrc <> "."
+                 ]
+          pure Nothing
         else (`catch` \(err :: ProcessException) -> do
-                 logError $ displayShow err
-                 generateHpcErrorReport reportDir $ RIO.display $ sanitize $ show err
-                 pure Nothing) $
-             (`onException` logError ("Error occurred while producing " <> RIO.display report)) $ do
-            -- Directories for .mix files.
-            hpcRelDir <- hpcRelativeDir
-            -- Compute arguments used for both "hpc markup" and "hpc report".
-            pkgDirs <- view $ buildConfigL.to (map ppRoot . Map.elems . smwProject . bcSMWanted)
-            let args =
-                    -- Use index files from all packages (allows cross-package coverage results).
-                    concatMap (\x -> ["--srcdir", toFilePathNoTrailingSep x]) pkgDirs ++
-                    -- Look for index files in the correct dir (relative to each pkgdir).
-                    ["--hpcdir", toFilePathNoTrailingSep hpcRelDir, "--reset-hpcdirs"]
-            logInfo $ "Generating " <> RIO.display report
-            outputLines <- liftM (map (S8.filter (/= '\r')) . S8.lines . BL.toStrict . fst) $
-                proc "hpc"
-                ( "report"
+               logError $ displayShow err
+               generateHpcErrorReport reportDir $ display $ sanitize $
+                   displayException err
+               pure Nothing) $
+           (`onException`
+               prettyError
+                 ( "[S-8215]"
+                   <> line
+                   <> fillSep
+                        [ flow "Error occurred while producing"
+                        , report <> "."
+                        ]
+                 )) $ do
+          -- Directories for .mix files.
+          hpcRelDir <- hpcRelativeDir
+          -- Compute arguments used for both "hpc markup" and "hpc report".
+          pkgDirs <- view $ buildConfigL . to
+            (map ppRoot . Map.elems . (.smWanted.project))
+          let args =
+                -- Use index files from all packages (allows cross-package
+                -- coverage results).
+                concatMap (\x -> ["--srcdir", toFilePathNoTrailingSep x]) pkgDirs ++
+                -- Look for index files in the correct dir (relative to each pkgdir).
+                ["--hpcdir", toFilePathNoTrailingSep hpcRelDir, "--reset-hpcdirs"]
+          prettyInfoL
+            [ "Generating"
+            , report <> "."
+            ]
+          -- Strip @\r@ characters because Windows.
+          outputLines <- map (L8.filter (/= '\r')) . L8.lines . fst <$>
+            proc "hpc"
+            ( "report"
+            : toFilePath tixSrc
+            : (args ++ extraReportArgs)
+            )
+            readProcess_
+          if all ("(0/0)" `L8.isSuffixOf`) outputLines
+            then do
+              let msgHtml =
+                       "Error: [S-6829]\n\
+                       \The "
+                    <> display reportHtml
+                    <> " did not consider any code. One possible cause of this is \
+                       \if your test-suite builds the library code (see Stack \
+                       \<a href='https://github.com/commercialhaskell/stack/issues/1008'>\
+                       \issue #1008\
+                       \</a>\
+                       \). It may also indicate a bug in Stack or the hpc program. \
+                       \Please report this issue if you think your coverage report \
+                       \should have meaningful results."
+              prettyError $
+                "[S-6829]"
+                <> line
+                <> fillSep
+                     [ "The"
+                     , report
+                     , flow "did not consider any code. One possible cause of this \
+                            \is if your test-suite builds the library code (see \
+                            \Stack issue #1008). It may also indicate a bug in \
+                            \Stack or the hpc program. Please report this issue if \
+                            \you think your coverage report should have meaningful \
+                            \results."
+                     ]
+              generateHpcErrorReport reportDir msgHtml
+              pure Nothing
+            else do
+              let reportPath = reportDir </> relFileHpcIndexHtml
+              -- Print the summary report to the standard output stream.
+              putUtf8Builder =<< displayWithColor
+                (  fillSep
+                     [ "Summary"
+                     , report <> ":"
+                     ]
+                <> line
+                )
+              forM_ outputLines putStrLn
+              -- Generate the HTML markup.
+              void $ proc "hpc"
+                ( "markup"
                 : toFilePath tixSrc
-                : (args ++ extraReportArgs)
+                : ("--destdir=" ++ toFilePathNoTrailingSep reportDir)
+                : (args ++ extraMarkupArgs)
                 )
                 readProcess_
-            if all ("(0/0)" `S8.isSuffixOf`) outputLines
-                then do
-                    let msg html =
-                            "Error: The " <>
-                            RIO.display report <>
-                            " did not consider any code. One possible cause of this is" <>
-                            " if your test-suite builds the library code (see Stack " <>
-                            (if html then "<a href='https://github.com/commercialhaskell/stack/issues/1008'>" else "") <>
-                            "issue #1008" <>
-                            (if html then "</a>" else "") <>
-                            "). It may also indicate a bug in Stack or" <>
-                            " the hpc program. Please report this issue if you think" <>
-                            " your coverage report should have meaningful results."
-                    logError (msg False)
-                    generateHpcErrorReport reportDir (msg True)
-                    pure Nothing
-                else do
-                    let reportPath = reportDir </> relFileHpcIndexHtml
-                    -- Print output, stripping @\r@ characters because Windows.
-                    forM_ outputLines (logInfo . displayBytesUtf8)
-                    -- Generate the markup.
-                    void $ proc "hpc"
-                        ( "markup"
-                        : toFilePath tixSrc
-                        : ("--destdir=" ++ toFilePathNoTrailingSep reportDir)
-                        : (args ++ extraMarkupArgs)
-                        )
-                        readProcess_
-                    pure (Just reportPath)
-
-data HpcReportOpts = HpcReportOpts
-    { hroptsInputs :: [Text]
-    , hroptsAll :: Bool
-    , hroptsDestDir :: Maybe String
-    , hroptsOpenBrowser :: Bool
-    } deriving (Show)
+              pure (Just reportPath)
 
 generateHpcReportForTargets :: HasEnvConfig env
                             => HpcReportOpts -> [Text] -> [Text] -> RIO env ()
 generateHpcReportForTargets opts tixFiles targetNames = do
-    targetTixFiles <-
-         -- When there aren't any package component arguments, and --all
-         -- isn't passed, default to not considering any targets.
-         if not (hroptsAll opts) && null targetNames
-         then pure []
-         else do
-             when (hroptsAll opts && not (null targetNames)) $
-                 logWarn $ "Since --all is used, it is redundant to specify these targets: " <> displayShow targetNames
-             targets <- view $ envConfigL.to envConfigSourceMap.to smTargets.to smtTargets
-             liftM concat $ forM (Map.toList targets) $ \(name, target) ->
-                 case target of
-                     TargetAll PTDependency -> throwString $
-                         "Error: Expected a local package, but " ++
-                         packageNameString name ++
-                         " is either an extra-dep or in the snapshot."
-                     TargetComps comps -> do
-                         pkgPath <- hpcPkgPath name
-                         forM (toList comps) $ \nc ->
-                             case nc of
-                                 CTest testName ->
-                                     liftM (pkgPath </>) $ parseRelFile (T.unpack testName ++ "/" ++ T.unpack testName ++ ".tix")
-                                 _ -> throwIO $ NonTestSuiteTarget name
-
-                     TargetAll PTProject -> do
-                         pkgPath <- hpcPkgPath name
-                         exists <- doesDirExist pkgPath
-                         if exists
-                             then do
-                                 (dirs, _) <- listDir pkgPath
-                                 liftM concat $ forM dirs $ \dir -> do
-                                     (_, files) <- listDir dir
-                                     pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
-                             else pure []
-    tixPaths <- liftM (\xs -> xs ++ targetTixFiles) $ mapM (resolveFile' . T.unpack) tixFiles
-    when (null tixPaths) $
-        throwString "Not generating combined report, because no targets or tix files are specified."
-    outputDir <- hpcReportDir
-    reportDir <- case hroptsDestDir opts of
-        Nothing -> pure (outputDir </> relDirCombined </> relDirCustom)
-        Just destDir -> do
-            dest <- resolveDir' destDir
-            ensureDir dest
-            pure dest
-    let report = "combined report"
-    mreportPath <- generateUnionReport report reportDir tixPaths
-    forM_ mreportPath $ \reportPath ->
-        if hroptsOpenBrowser opts
-            then do
-                prettyInfo $ "Opening" <+> pretty reportPath <+> "in the browser."
-                void $ liftIO $ openBrowser (toFilePath reportPath)
-            else displayReportPath "The" report (pretty reportPath)
+  targetTixFiles <-
+    -- When there aren't any package component arguments, and --all
+    -- isn't passed, default to not considering any targets.
+    if not opts.all && null targetNames
+    then pure []
+    else do
+      when (opts.all && not (null targetNames)) $
+        prettyWarnL
+          $ "Since"
+          : style Shell "--all"
+          : flow "is used, it is redundant to specify these targets:"
+          : mkNarrativeList (Just Target) False
+              (map (fromString . T.unpack) targetNames :: [StyleDoc])
+      targets <-
+        view $ envConfigL . to (.sourceMap.targets.targets)
+      fmap concat $ forM (Map.toList targets) $ \(name, target) ->
+        case target of
+          TargetAll PTDependency -> prettyThrowIO $ NotLocalPackage name
+          TargetComps comps -> do
+            pkgPath <- hpcPkgPath name
+            forM (toList comps) $
+              \case
+                CTest testName -> (pkgPath </>) <$>
+                  parseRelFile
+                    (  testName'
+                    ++ "/"
+                    ++ testName'
+                    ++ ".tix"
+                    )
+                 where
+                  testName' = unqualCompToString testName
+                _ -> prettyThrowIO $ NonTestSuiteTarget name
+          TargetAll PTProject -> do
+            pkgPath <- hpcPkgPath name
+            exists <- doesDirExist pkgPath
+            if exists
+              then do
+                (dirs, _) <- listDir pkgPath
+                fmap concat $ forM dirs $ \dir -> do
+                  (_, files) <- listDir dir
+                  pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
+              else pure []
+  tixPaths <- (++ targetTixFiles) <$>
+    mapM (resolveFile' . T.unpack) tixFiles
+  when (null tixPaths) $ prettyThrowIO NoTargetsOrTixSpecified
+  outputDir <- hpcReportDir
+  reportDir <- case opts.destDir of
+    Nothing -> pure (outputDir </> relDirCombined </> relDirCustom)
+    Just destDir -> do
+      dest <- resolveDir' destDir
+      ensureDir dest
+      pure dest
+  let report = flow "combined coverage report"
+      reportHtml = "combined coverage report"
+  mreportPath <- generateUnionReport report reportHtml reportDir tixPaths
+  forM_ mreportPath $ \reportPath ->
+    if opts.openBrowser
+      then do
+        prettyInfo $ "Opening" <+> pretty reportPath <+> "in the browser."
+        void $ liftIO $ openBrowser (toFilePath reportPath)
+      else displayReportPath "The" report (pretty reportPath)
 
+-- | Generates the HTML unified coverage report.
 generateHpcUnifiedReport :: HasEnvConfig env => RIO env ()
 generateHpcUnifiedReport = do
-    outputDir <- hpcReportDir
-    ensureDir outputDir
-    (dirs, _) <- listDir outputDir
-    tixFiles0 <- liftM (concat . concat) $ forM (filter (("combined" /=) . dirnameString) dirs) $ \dir -> do
-        (dirs', _) <- listDir dir
-        forM dirs' $ \dir' -> do
-            (_, files) <- listDir dir'
-            pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
-    extraTixFiles <- findExtraTixFiles
-    let tixFiles = tixFiles0  ++ extraTixFiles
-        reportDir = outputDir </> relDirCombined </> relDirAll
--- Previously, the test below was:
---
---  if length tixFiles < 2
---      then logInfo $
---          (if null tixFiles then "No tix files" else "Only one tix file") <>
---          " found in " <>
---          fromString (toFilePath outputDir) <>
---          ", so not generating a unified coverage report."
---      else ...
---
--- However, a single *.tix file does not necessarily mean that a unified
--- coverage report is redundant. For example, one package may test the library
--- of another package that does not test its own library. See
+  outputDir <- hpcReportDir
+  ensureDir outputDir
+  (dirs, _) <- listDir outputDir
+  tixFiles0 <-
+    fmap (concat . concat) $ forM (filter (("combined" /=) . dirnameString) dirs) $ \dir -> do
+      (dirs', _) <- listDir dir
+      forM dirs' $ \dir' -> do
+        (_, files) <- listDir dir'
+        pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
+  extraTixFiles <- findExtraTixFiles
+  let tixFiles = tixFiles0  ++ extraTixFiles
+      reportDir = outputDir </> relDirCombined </> relDirAll
+-- A single *.tix file does not necessarily mean that a unified coverage report
+-- is redundant. For example, one package may test the library of another
+-- package that does not test its own library. See
 -- https://github.com/commercialhaskell/stack/issues/5713
 --
 -- As an interim solution, a unified coverage report will always be produced
 -- even if may be redundant in some circumstances.
-    if null tixFiles
-        then logInfo $ "No tix files found in " <>
-            fromString (toFilePath outputDir) <>
-            ", so not generating a unified coverage report."
-        else do
-            let report = "unified report"
-            mreportPath <- generateUnionReport report reportDir tixFiles
-            forM_ mreportPath (displayReportPath "The" report . pretty)
+  if null tixFiles
+    then prettyInfoL
+      [ flow "No tix files found in"
+      , pretty outputDir <> ","
+      , flow "so not generating a unified coverage report."
+      ]
+    else do
+      let report = flow "unified coverage report"
+          reportHtml = "unified coverage report"
+      mreportPath <- generateUnionReport report reportHtml reportDir tixFiles
+      forM_ mreportPath (displayReportPath "The" report . pretty)
 
-generateUnionReport :: HasEnvConfig env
-                    => Text -> Path Abs Dir -> [Path Abs File]
-                    -> RIO env (Maybe (Path Abs File))
-generateUnionReport report reportDir tixFiles = do
-    (errs, tix) <- fmap (unionTixes . map removeExeModules) (mapMaybeM readTixOrLog tixFiles)
-    logDebug $ "Using the following tix files: " <> fromString (show tixFiles)
-    unless (null errs) $ logWarn $
-        "The following modules are left out of the " <>
-        RIO.display report <>
-        " due to version mismatches: " <>
-        mconcat (L.intersperse ", " (map fromString errs))
-    tixDest <- liftM (reportDir </>) $ parseRelFile (dirnameString reportDir ++ ".tix")
-    ensureDir (parent tixDest)
-    liftIO $ writeTix (toFilePath tixDest) tix
-    generateHpcReportInternal tixDest reportDir report [] []
+generateUnionReport ::
+     HasEnvConfig env
+  => StyleDoc
+     -- ^ Pretty description of the report.
+  -> Text
+     -- ^ Plain description of the report, used in HTML reporting.
+  -> Path Abs Dir
+  -> [Path Abs File]
+  -> RIO env (Maybe (Path Abs File))
+generateUnionReport report reportHtml reportDir tixFiles = do
+  (errs, tix) <- fmap (unionTixes . map removeExeModules) (mapMaybeM readTixOrLog tixFiles)
+  logDebug $ "Using the following tix files: " <> fromString (show tixFiles)
+  unless (null errs) $
+    prettyWarn $
+      fillSep
+         [ flow "The following modules are left out of the"
+         , report
+         , flow "due to version mismatches:"
+         ]
+    <> line
+    <> bulletedList (map fromString errs :: [StyleDoc])
+  tixDest <-
+    (reportDir </>) <$> parseRelFile (dirnameString reportDir ++ ".tix")
+  ensureDir (parent tixDest)
+  liftIO $ writeTix (toFilePath tixDest) tix
+  generateHpcReportInternal tixDest reportDir report reportHtml [] []
 
-readTixOrLog :: HasLogFunc env => Path b File -> RIO env (Maybe Tix)
+readTixOrLog :: HasTerm env => Path b File -> RIO env (Maybe Tix)
 readTixOrLog path = do
-    mtix <- liftIO (readTix (toFilePath path)) `catchAny` \errorCall -> do
-        logError $ "Error while reading tix: " <> fromString (show errorCall)
-        pure Nothing
-    when (isNothing mtix) $
-        logError $ "Failed to read tix file " <> fromString (toFilePath path)
-    pure mtix
+  mtix <- liftIO (readTix (toFilePath path)) `catchAny` \errorCall -> do
+    prettyError $
+      "[S-3521]"
+      <> line
+      <> flow "Error while reading tix:"
+      <> line
+      <> string (displayException errorCall)
+    pure Nothing
+  when (isNothing mtix) $
+    prettyError $
+      "[S-7786]"
+      <> line
+      <> fillSep
+           [ flow "Failed to read tix file"
+           , pretty path <> "."
+           ]
+  pure mtix
 
--- | Module names which contain '/' have a package name, and so they weren't built into the
--- executable.
+-- | Module names which contain '/' have a package name, and so they weren't
+-- built into the executable.
 removeExeModules :: Tix -> Tix
-removeExeModules (Tix ms) = Tix (filter (\(TixModule name _ _ _) -> '/' `elem` name) ms)
+removeExeModules (Tix ms) =
+  Tix (filter (\(TixModule name _ _ _) -> '/' `elem` name) ms)
 
 unionTixes :: [Tix] -> ([String], Tix)
 unionTixes tixes = (Map.keys errs, Tix (Map.elems outputs))
-  where
-    (errs, outputs) = Map.mapEither id $ Map.unionsWith merge $ map toMap tixes
-    toMap (Tix ms) = Map.fromList (map (\x@(TixModule k _ _ _) -> (k, Right x)) ms)
-    merge (Right (TixModule k hash1 len1 tix1))
-          (Right (TixModule _ hash2 len2 tix2))
-        | hash1 == hash2 && len1 == len2 = Right (TixModule k hash1 len1 (zipWith (+) tix1 tix2))
-    merge _ _ = Left ()
+ where
+  (errs, outputs) = Map.mapEither id $ Map.unionsWith merge $ map toMap tixes
+  toMap (Tix ms) = Map.fromList (map (\x@(TixModule k _ _ _) -> (k, Right x)) ms)
+  merge (Right (TixModule k hash1 len1 tix1))
+      (Right (TixModule _ hash2 len2 tix2))
+    | hash1 == hash2 && len1 == len2 =
+        Right (TixModule k hash1 len1 (zipWith (+) tix1 tix2))
+  merge _ _ = Left ()
 
+-- | Generates the HTML index report.
 generateHpcMarkupIndex :: HasEnvConfig env => RIO env ()
 generateHpcMarkupIndex = do
-    outputDir <- hpcReportDir
-    let outputFile = outputDir </> relFileIndexHtml
-    ensureDir outputDir
-    (dirs, _) <- listDir outputDir
-    rows <- liftM (catMaybes . concat) $ forM dirs $ \dir -> do
-        (subdirs, _) <- listDir dir
-        forM subdirs $ \subdir -> do
-            let indexPath = subdir </> relFileHpcIndexHtml
-            exists' <- doesFileExist indexPath
-            if not exists' then pure Nothing else do
-                relPath <- stripProperPrefix outputDir indexPath
-                let package = dirname dir
-                    testsuite = dirname subdir
-                pure $ Just $ T.concat
-                  [ "<tr><td>"
-                  , pathToHtml package
-                  , "</td><td><a href=\""
-                  , pathToHtml relPath
-                  , "\">"
-                  , pathToHtml testsuite
-                  , "</a></td></tr>"
-                  ]
-    writeBinaryFileAtomic outputFile $
-        "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">" <>
-        -- Part of the css from HPC's output HTML
-        "<style type=\"text/css\">" <>
-        "table.dashboard { border-collapse: collapse; border: solid 1px black }" <>
-        ".dashboard td { border: solid 1px black }" <>
-        ".dashboard th { border: solid 1px black }" <>
-        "</style>" <>
-        "</head>" <>
-        "<body>" <>
-        (if null rows
-            then
-                "<b>No hpc_index.html files found in \"" <>
-                encodeUtf8Builder (pathToHtml outputDir) <>
-                "\".</b>"
-            else
-                "<table class=\"dashboard\" width=\"100%\" border=\"1\"><tbody>" <>
-                "<p><b>NOTE: This is merely a listing of the html files found in the coverage reports directory.  Some of these reports may be old.</b></p>" <>
-                "<tr><th>Package</th><th>TestSuite</th><th>Modification Time</th></tr>" <>
-                foldMap encodeUtf8Builder rows <>
-                "</tbody></table>") <>
-        "</body></html>"
-    unless (null rows) $
-        displayReportPath "\nAn" "index of the generated HTML coverage reports"
-            (pretty outputFile)
+  outputDir <- hpcReportDir
+  let outputFile = outputDir </> relFileIndexHtml
+  ensureDir outputDir
+  (dirs, _) <- listDir outputDir
+  rows <- fmap (concatMap catMaybes) $ forM dirs $ \dir -> do
+    (subdirs, _) <- listDir dir
+    forM subdirs $ \subdir -> do
+      let indexPath = subdir </> relFileHpcIndexHtml
+      exists' <- doesFileExist indexPath
+      if not exists' then pure Nothing else do
+        relPath <- stripProperPrefix outputDir indexPath
+        let package = dirname dir
+            testsuite = dirname subdir
+        pure $ Just $ T.concat
+          [ "<tr><td>"
+          , pathToHtml package
+          , "</td><td><a href=\""
+          , pathToHtml relPath
+          , "\">"
+          , pathToHtml testsuite
+          , "</a></td></tr>"
+          ]
+  writeBinaryFileAtomic outputFile $
+       "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"
+    <>
+    -- Part of the css from HPC's output HTML
+       "<style type=\"text/css\">"
+    <> "table.dashboard { border-collapse: collapse; border: solid 1px black }"
+    <> ".dashboard td { border: solid 1px black }"
+    <> ".dashboard th { border: solid 1px black }"
+    <> "</style>"
+    <> "</head>"
+    <> "<body>"
+    <> ( if null rows
+           then
+                "<b>No hpc_index.html files found in \""
+             <> encodeUtf8Builder (pathToHtml outputDir)
+             <> "\".</b>"
+           else
+                "<table class=\"dashboard\" width=\"100%\" border=\"1\"><tbody>"
+             <> "<p><b>NOTE: This is merely a listing of the html files found in the coverage reports directory.  Some of these reports may be old.</b></p>"
+             <> "<tr><th>Package</th><th>TestSuite</th><th>Modification Time</th></tr>"
+             <> foldMap encodeUtf8Builder rows
+             <> "</tbody></table>"
+       )
+    <> "</body></html>"
+  unless (null rows) $
+    displayReportPath
+      "\nAn" "index of the generated HTML coverage reports"
+      (pretty outputFile)
 
 generateHpcErrorReport :: MonadIO m => Path Abs Dir -> Utf8Builder -> m ()
 generateHpcErrorReport dir err = do
-    ensureDir dir
-    let fp = toFilePath (dir </> relFileHpcIndexHtml)
-    writeFileUtf8Builder fp $
-        "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>" <>
-        "<h1>HPC Report Generation Error</h1>" <>
-        "<p>" <>
-        err <>
-        "</p>" <>
-        "</body></html>"
+  ensureDir dir
+  let fp = toFilePath (dir </> relFileHpcIndexHtml)
+  writeFileUtf8Builder fp $
+       "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>"
+    <> "<h1>HPC Report Generation Error</h1>"
+    <> "<p>"
+    <> err
+    <> "</p>"
+    <> "</body></html>"
 
 pathToHtml :: Path b t -> Text
 pathToHtml = T.dropWhileEnd (=='/') . sanitize . toFilePath
@@ -423,14 +593,14 @@ pathToHtml = T.dropWhileEnd (=='/') . sanitize . toFilePath
 -- | Escape HTML symbols (copied from Text.Hastache)
 htmlEscape :: LT.Text -> LT.Text
 htmlEscape = LT.concatMap proc_
-  where
-    proc_ '&'  = "&amp;"
-    proc_ '\\' = "&#92;"
-    proc_ '"'  = "&quot;"
-    proc_ '\'' = "&#39;"
-    proc_ '<'  = "&lt;"
-    proc_ '>'  = "&gt;"
-    proc_ h    = LT.singleton h
+ where
+  proc_ '&'  = "&amp;"
+  proc_ '\\' = "&#92;"
+  proc_ '"'  = "&quot;"
+  proc_ '\'' = "&#39;"
+  proc_ '<'  = "&lt;"
+  proc_ '>'  = "&gt;"
+  proc_ h    = LT.singleton h
 
 sanitize :: String -> Text
 sanitize = LT.toStrict . htmlEscape . LT.pack
@@ -438,74 +608,62 @@ sanitize = LT.toStrict . htmlEscape . LT.pack
 dirnameString :: Path r Dir -> String
 dirnameString = L.dropWhileEnd isPathSeparator . toFilePath . dirname
 
-findPackageFieldForBuiltPackage
-    :: HasEnvConfig env
-    => Path Abs Dir -> PackageIdentifier -> Set.Set Text -> Text
-    -> RIO env (Either Text [Text])
-findPackageFieldForBuiltPackage pkgDir pkgId internalLibs field = do
-    distDir <- distDirFromDir pkgDir
-    let inplaceDir = distDir </> relDirPackageConfInplace
-        pkgIdStr = packageIdentifierString pkgId
-        notFoundErr = pure $ Left $ "Failed to find package key for " <> T.pack pkgIdStr
-        extractField path = do
-            contents <- readFileUtf8 (toFilePath path)
-            case asum (map (T.stripPrefix (field <> ": ")) (T.lines contents)) of
-                Just result -> pure $ Right $ T.strip result
-                Nothing -> notFoundErr
-    cabalVer <- view cabalVersionL
-    if cabalVer < mkVersion [1, 24]
-        then do
-            -- here we don't need to handle internal libs
-            path <- liftM (inplaceDir </>) $ parseRelFile (pkgIdStr ++ "-inplace.conf")
-            logDebug $ "Parsing config in Cabal < 1.24 location: " <> fromString (toFilePath path)
-            exists <- doesFileExist path
-            if exists then fmap (:[]) <$> extractField path else notFoundErr
-        else do
-            -- With Cabal-1.24, it's in a different location.
-            logDebug $ "Scanning " <> fromString (toFilePath inplaceDir) <> " for files matching " <> fromString pkgIdStr
-            (_, files) <- handleIO (const $ pure ([], [])) $ listDir inplaceDir
-            logDebug $ displayShow files
-            -- From all the files obtained from the scanning process above, we
-            -- need to identify which are .conf files and then ensure that
-            -- there is at most one .conf file for each library and internal
-            -- library (some might be missing if that component has not been
-            -- built yet). We should error if there are more than one .conf
-            -- file for a component or if there are no .conf files at all in
-            -- the searched location.
-            let toFilename = T.pack . toFilePath . filename
-                -- strip known prefix and suffix from the found files to determine only the conf files
-                stripKnown =  T.stripSuffix ".conf" <=< T.stripPrefix (T.pack (pkgIdStr ++ "-"))
-                stripped = mapMaybe (\file -> fmap (,file) . stripKnown . toFilename $ file) files
-                -- which component could have generated each of these conf files
-                stripHash n = let z = T.dropWhile (/= '-') n in if T.null z then "" else T.tail z
-                matchedComponents = map (\(n, f) -> (stripHash n, [f])) stripped
-                byComponents = Map.restrictKeys (Map.fromListWith (++) matchedComponents) $ Set.insert "" internalLibs
-            logDebug $ displayShow byComponents
-            if Map.null $ Map.filter (\fs -> length fs > 1) byComponents
-            then case concat $ Map.elems byComponents of
-                [] -> notFoundErr
-                -- for each of these files, we need to extract the requested field
-                paths -> do
-                  (errors, keys) <-  partitionEithers <$> traverse extractField paths
-                  case errors of
-                    (a:_) -> pure $ Left a -- the first error only, since they're repeated anyway
-                    [] -> pure $ Right keys
-            else pure $ Left $ "Multiple files matching " <> T.pack (pkgIdStr ++ "-*.conf") <> " found in " <>
-                    T.pack (toFilePath inplaceDir) <> ". Maybe try 'stack clean' on this package?"
+findPackageFieldForBuiltPackage ::
+     HasEnvConfig env
+  => Path Abs Dir -> PackageIdentifier -> Set.Set Text -> Text
+  -> RIO env (Either Text [Text])
+findPackageFieldForBuiltPackage pkgDir pkgId subLibs field = do
+  let subLibNames =
+        Set.map (LSubLibName . mkUnqualComponentName . T.unpack) subLibs
+      libraryNames = Set.insert LMainLibName subLibNames
+      mungedPackageIds = Set.map (computeCompatPackageId pkgId) libraryNames
+  distDir <- distDirFromDir pkgDir
+  ghcPkgExe <- getGhcPkgExe
+  let inplaceDir = distDir </> relDirPackageConfInplace
+      pkgIdStr = packageIdentifierString pkgId
+      notFoundErr = pure $
+        Left $ "Failed to find package key for " <> T.pack pkgIdStr
+      extractField mungedPkgId = do
+        mContents <- catch
+          (ghcPkgField ghcPkgExe inplaceDir mungedPkgId (T.unpack field) await)
+          -- A .conf file may not exist in the package database for a library or
+          -- sub-library, if that component has not been built yet.
+          (\(_ :: ExitCodeException) -> pure Nothing)
+        case mContents of
+          Just result -> pure $ Right $ T.strip result
+          Nothing -> notFoundErr
+  logDebug $
+       "Scanning "
+    <> fromString (toFilePath inplaceDir)
+    <> " for munged packages matching "
+    <> fromString pkgIdStr
+  (errors, keys) <-
+    partitionEithers <$> traverse extractField (Set.toList mungedPackageIds)
+  case errors of
+    (a:_) -> pure $ Left a -- the first error only, since they're repeated anyway
+    [] -> pure $ Right keys
 
-displayReportPath :: (HasTerm env)
-                  => StyleDoc -> Text -> StyleDoc -> RIO env ()
+displayReportPath ::
+     HasTerm env
+  => StyleDoc
+  -> StyleDoc
+  -> StyleDoc
+  -> RIO env ()
 displayReportPath prefix report reportPath =
-     prettyInfo $ prefix <+> fromString (T.unpack report) <+>
-                  "is available at" <+> reportPath
+  prettyInfoL
+    [ prefix
+    , report
+    , flow "is available at"
+    , reportPath <> "."
+    ]
 
 findExtraTixFiles :: HasEnvConfig env => RIO env [Path Abs File]
 findExtraTixFiles = do
-    outputDir <- hpcReportDir
-    let dir = outputDir </> relDirExtraTixFiles
-    dirExists <- doesDirExist dir
-    if dirExists
-        then do
-            (_, files) <- listDir dir
-            pure $ filter ((".tix" `L.isSuffixOf`) . toFilePath) files
-        else pure []
+  outputDir <- hpcReportDir
+  let dir = outputDir </> relDirExtraTixFiles
+  dirExists <- doesDirExist dir
+  if dirExists
+    then do
+      (_, files) <- listDir dir
+      pure $ filter ((".tix" `L.isSuffixOf`) . toFilePath) files
+    else pure []
diff --git a/src/Stack/DefaultColorWhen.hs b/src/Stack/DefaultColorWhen.hs
index 25d614afec..5c9440a71b 100644
--- a/src/Stack/DefaultColorWhen.hs
+++ b/src/Stack/DefaultColorWhen.hs
@@ -1,27 +1,23 @@
+{-|
+Module      : Stack.DefaultColorWhen
+License     : BSD-3-Clause
+-}
+
 module Stack.DefaultColorWhen
   ( defaultColorWhen
   ) where
 
-import Stack.Prelude (stdout)
-import Stack.Types.Config (ColorWhen (ColorAuto, ColorNever))
-
-import System.Console.ANSI (hSupportsANSIWithoutEmulation)
-import System.Environment (lookupEnv)
+import           Stack.Prelude ( stdout )
+import           Stack.Types.ColorWhen ( ColorWhen (..) )
+import           System.Console.ANSI ( hNowSupportsANSI )
+import           System.Environment ( lookupEnv )
 
 -- | The default adopts the standard proposed at http://no-color.org/, that
 -- color should not be added by default if the @NO_COLOR@ environment variable
 -- is present.
 defaultColorWhen :: IO ColorWhen
-defaultColorWhen = do
-  -- On Windows, 'hSupportsANSIWithoutEmulation' has the side effect of enabling
-  -- ANSI for ANSI-capable native (ConHost) terminals, if not already
-  -- ANSI-enabled. Consequently, it is actioned even if @NO_COLOR@ might exist,
-  -- as @NO_COLOR@ might be overridden in a yaml configuration file or at the
-  -- command line.
-  supportsANSI <- hSupportsANSIWithoutEmulation stdout
-  mIsNoColor <- lookupEnv "NO_COLOR"
-  pure $ case mIsNoColor of
-    Just _ -> ColorNever
-    _      -> case supportsANSI of
-      Just False -> ColorNever
-      _          -> ColorAuto
+defaultColorWhen = lookupEnv "NO_COLOR" >>= \case
+  Just _ -> pure ColorNever
+  _ -> hNowSupportsANSI stdout >>= \case
+    False -> pure ColorNever
+    _ -> pure ColorAuto
diff --git a/src/Stack/DependencyGraph.hs b/src/Stack/DependencyGraph.hs
new file mode 100644
index 0000000000..b5a484d572
--- /dev/null
+++ b/src/Stack/DependencyGraph.hs
@@ -0,0 +1,449 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.DependencyGraph
+License     : BSD-3-Clause
+
+Module exporting a function to create a pruned dependency graph given
+a t'DotOpts' value.
+-}
+
+module Stack.DependencyGraph
+  ( createPrunedDependencyGraph
+  , resolveDependencies
+  , pruneGraph
+  ) where
+
+import qualified Data.Foldable as F
+import qualified Data.Set as Set
+import qualified Data.Map as Map
+import qualified Data.Traversable as T
+import           Distribution.License ( License (..) )
+import qualified Distribution.PackageDescription as PD
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Path ( parent )
+import           Stack.Build ( loadPackage )
+import           Stack.Build.Installed ( getInstalled, toInstallMap )
+import           Stack.Build.Source
+                   ( loadCommonPackage, loadLocalPackage, loadSourceMap )
+import           Stack.Build.Target( NeedTargets (..), parseTargets )
+import           Stack.Package ( Package (..), setOfPackageDeps )
+import           Stack.Prelude hiding ( Display (..), pkgName, loadPackage )
+import qualified Stack.Prelude ( pkgName )
+import           Stack.Runners
+                   ( ShouldReexec (..), withBuildConfig, withConfig
+                   , withEnvConfig
+                   )
+import           Stack.SourceMap
+                   ( globalsFromHints, mkProjectPackage, pruneGlobals )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.BuildOptsCLI
+                   ( BuildOptsCLI (..), defaultBuildOptsCLI )
+import           Stack.Types.BuildOptsMonoid
+                   ( buildOptsMonoidBenchmarksL, buildOptsMonoidTestsL )
+import           Stack.Types.Compiler ( ActualCompiler, wantedToActual )
+import           Stack.Types.DependencyTree ( DependencyGraph, DotPayload (..) )
+import           Stack.Types.DotConfig ( DotConfig (..) )
+import           Stack.Types.DotOpts ( DotOpts (..) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig ( EnvConfig (..), HasSourceMap (..) )
+import           Stack.Types.GhcPkgId
+                   ( GhcPkgId, ghcPkgIdString, parseGhcPkgId )
+import           Stack.Types.GlobalOpts ( globalOptsBuildOptsMonoidL )
+import           Stack.Types.Package ( LocalPackage (..) )
+import           Stack.Types.Runner ( Runner, globalOptsL )
+import           Stack.Types.SourceMap
+                   ( CommonPackage (..), DepPackage (..), ProjectPackage (..)
+                   , SMActual (..), SMWanted (..), SourceMap (..)
+                   )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.DependencyGraph" module.
+newtype DependencyGraphException
+  = DependencyNotFoundBug GhcPkgId
+  deriving Show
+
+instance Exception DependencyGraphException where
+  displayException (DependencyNotFoundBug depId) = bugReport "[S-7071]" $ concat
+    [ "Expected to find "
+    , ghcPkgIdString depId
+    , " in global DB."
+    ]
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.DependencyGraph" module.
+newtype DependencyGraphPrettyException
+  = PackageNotFound PackageName
+  deriving Show
+
+instance Pretty DependencyGraphPrettyException where
+
+  pretty (PackageNotFound pkgName) =
+       "[S-7151]"
+    <> line
+    <> fillSep
+         [ flow "The package"
+         , style Error . fromPackageName $ pkgName
+         , flow "was not identified as a project package, an extra-dep, or a \
+                \package specified by the snapshot."
+         ]
+    <> blankLine
+    <> fillSep
+         [ "Command"
+         , style Shell "stack build --dry-run"
+         , flow "for information about why Stack fails to construct a build \
+                \plan."
+         ]
+
+instance Exception DependencyGraphPrettyException
+
+-- | Create the dependency graph and also prune it as specified in the dot
+-- options. Returns a set of local names and a map from package names to
+-- dependencies.
+createPrunedDependencyGraph ::
+     DotOpts
+  -> RIO
+       Runner
+       ( ActualCompiler
+       , Set PackageName
+       , DependencyGraph
+       )
+createPrunedDependencyGraph dotOpts = withDotConfig dotOpts $ do
+  localNames <- view $ buildConfigL . to (Map.keysSet . (.smWanted.project))
+  logDebug "Creating dependency graph"
+  (compiler, resultGraph) <- createDependencyGraph dotOpts
+  let pkgsToPrune = Set.union
+        ( if dotOpts.includeBase
+            then dotOpts.prune
+            else Set.insert "base" dotOpts.prune
+        )
+        (nonParentDependencies resultGraph dotOpts.reach)
+      prunedGraph = pruneGraph localNames pkgsToPrune resultGraph
+  logDebug "Returning pruned dependency graph"
+  pure (compiler, localNames, prunedGraph)
+
+-- Plumbing for --test and --bench flags
+withDotConfig ::
+     DotOpts
+  -> RIO DotConfig a
+  -> RIO Runner a
+withDotConfig opts inner =
+  local (over globalOptsL modifyGO) $
+    if opts.globalHints
+      then withConfig NoReexec $ withBuildConfig withGlobalHints
+      else withConfig YesReexec withReal
+ where
+  withGlobalHints = do
+    buildConfig <- view buildConfigL
+    globals <- globalsFromHints buildConfig.smWanted.compiler
+    fakeGhcPkgId <- parseGhcPkgId "ignored"
+    actual <- either throwIO pure $
+      wantedToActual buildConfig.smWanted.compiler
+    let smActual = SMActual
+          { compiler = actual
+          , project = buildConfig.smWanted.project
+          , deps =  buildConfig.smWanted.deps
+          , globals = Map.mapWithKey toDump globals
+          }
+        toDump :: PackageName -> Version -> DumpPackage
+        toDump pkgName pkgVersion = DumpPackage
+          { ghcPkgId = fakeGhcPkgId
+          , packageIdent = PackageIdentifier
+              { pkgName
+              , pkgVersion
+              }
+          , sublib = Nothing
+          , license = Nothing
+          , libDirs = []
+          , libraries = []
+          , hasExposedModules = True
+          , exposedModules = mempty
+          , depends = []
+          , haddockInterfaces = []
+          , haddockHtml = Nothing
+          , isExposed = True
+          }
+        actualPkgs =
+          Map.keysSet smActual.deps <> Map.keysSet smActual.project
+        prunedActual = smActual
+          { globals = pruneGlobals smActual.globals actualPkgs }
+    targets <- parseTargets NeedTargets False boptsCLI prunedActual
+    logDebug "Loading source map"
+    sourceMap <- loadSourceMap targets boptsCLI smActual
+    let dc = DotConfig
+          { buildConfig
+          , sourceMap
+          , globalDump = toList smActual.globals
+          }
+    logDebug "DotConfig fully loaded"
+    runRIO dc inner
+
+  withReal = withEnvConfig NeedTargets boptsCLI $ do
+    envConfig <- ask
+    let sourceMap = envConfig.sourceMap
+    installMap <- toInstallMap sourceMap
+    (_, globalDump, _, _) <- getInstalled installMap
+    let dc = DotConfig
+          { buildConfig = envConfig.buildConfig
+          , sourceMap
+          , globalDump
+          }
+    runRIO dc inner
+
+  boptsCLI = defaultBuildOptsCLI
+    { targetsCLI = opts.dotTargets
+    , flags = opts.flags
+    }
+  modifyGO =
+      ( if opts.testTargets
+          then
+            set
+              (globalOptsBuildOptsMonoidL . buildOptsMonoidTestsL)
+              (Just True)
+          else id
+      )
+    . ( if opts.benchTargets
+          then
+            set
+              (globalOptsBuildOptsMonoidL . buildOptsMonoidBenchmarksL)
+              (Just True)
+          else id
+      )
+
+-- | Create the dependency graph, the result is a map from a package name to a
+-- tuple of dependencies and payload if available. This function mainly gathers
+-- the required arguments for @resolveDependencies@.
+createDependencyGraph ::
+     DotOpts
+  -> RIO DotConfig (ActualCompiler, DependencyGraph)
+createDependencyGraph dotOpts = do
+  sourceMap <- view sourceMapL
+  locals <- for (toList sourceMap.project) loadLocalPackage
+  let graph = Map.fromList $
+        projectPackageDependencies dotOpts (filter (.wanted) locals)
+  globalDump <- view $ to (.globalDump)
+  -- TODO: Can there be multiple entries for wired-in-packages? If so, this will
+  -- choose one arbitrarily..
+  let globalDumpMap = Map.fromList $
+        map (\dp -> (Stack.Prelude.pkgName dp.packageIdent, dp)) globalDump
+      globalIdMap =
+        Map.fromList $ map ((.ghcPkgId) &&& (.packageIdent)) globalDump
+  let depLoader =
+        createDepLoader sourceMap globalDumpMap globalIdMap loadPackageDeps
+      loadPackageDeps name version loc flags ghcOptions cabalConfigOpts
+        -- Skip packages that can't be loaded - see
+        -- https://github.com/commercialhaskell/stack/issues/2967
+        | name `elem` [mkPackageName "rts", mkPackageName "ghc"] =
+            pure
+              ( Set.empty
+              , DotPayload
+                  { version = Just version
+                  , license = Just $ Right BSD3
+                  , location = Nothing
+                  }
+              )
+        | otherwise = fmap
+            (setOfPackageDeps &&& makePayload loc)
+            (loadPackage loc flags ghcOptions cabalConfigOpts)
+  resultGraph <- resolveDependencies dotOpts.dependencyDepth graph depLoader
+  pure (sourceMap.compiler, resultGraph)
+ where
+  makePayload loc pkg = DotPayload
+    { version = Just pkg.version
+    , license = Just pkg.license
+    , location = Just $ PLImmutable loc
+    }
+
+-- | Resolve the direct (depth 0) external dependencies of the given local
+-- packages (assumed to come from project packages)
+projectPackageDependencies ::
+     DotOpts
+  -> [LocalPackage]
+  -> [(PackageName, (Set PackageName, DotPayload))]
+projectPackageDependencies dotOpts locals =
+  map
+    ( \lp -> let pkg = localPackageToPackage lp
+                 pkgDir = parent lp.cabalFP
+                 packageDepsSet = setOfPackageDeps pkg
+                 loc = PLMutable $ ResolvedPath
+                   { resolvedRelative = RelFilePath "N/A"
+                   , resolvedAbsolute = pkgDir
+                   }
+             in  (pkg.name, (deps pkg packageDepsSet, lpPayload pkg loc))
+    )
+    locals
+ where
+  deps pkg packageDepsSet = if dotOpts.includeExternal
+    then Set.delete pkg.name packageDepsSet
+    else Set.intersection localNames packageDepsSet
+  localNames = Set.fromList $ map (.package.name) locals
+  lpPayload pkg loc =  DotPayload
+    { version = Just pkg.version
+    , license = Just pkg.license
+    , location = Just loc
+    }
+
+-- | Given a SourceMap and a dependency loader, load the set of dependencies for
+-- a package
+createDepLoader ::
+     SourceMap
+  -> Map PackageName DumpPackage
+  -> Map GhcPkgId PackageIdentifier
+  -> (  PackageName
+     -> Version
+     -> PackageLocationImmutable
+     -> Map FlagName Bool
+     -> [Text]
+     -> [Text]
+     -> RIO DotConfig (Set PackageName, DotPayload)
+     )
+  -> PackageName
+  -> RIO DotConfig (Set PackageName, DotPayload)
+createDepLoader sourceMap globalDumpMap globalIdMap loadPackageDeps pkgName =
+  fromMaybe (prettyThrowIO $ PackageNotFound pkgName)
+    (projectPackageDeps <|> dependencyDeps <|> globalDeps)
+ where
+  projectPackageDeps = loadDeps <$> Map.lookup pkgName sourceMap.project
+   where
+    loadDeps pp = do
+      pkg <- loadCommonPackage pp.projectCommon
+      pure (setOfPackageDeps pkg, payloadFromLocal pkg Nothing)
+
+  dependencyDeps =
+    loadDeps <$> Map.lookup pkgName sourceMap.deps
+   where
+    loadDeps DepPackage{ location = PLMutable dir } = do
+      pp <- mkProjectPackage YesPrintWarnings dir False
+      pkg <- loadCommonPackage pp.projectCommon
+      pure (setOfPackageDeps pkg, payloadFromLocal pkg (Just $ PLMutable dir))
+
+    loadDeps dp@DepPackage{ location = PLImmutable loc } = do
+      let common = dp.depCommon
+      gpd <- liftIO common.gpd
+      let PackageIdentifier name version =
+            PD.package $ PD.packageDescription gpd
+          flags = common.flags
+          ghcOptions = common.ghcOptions
+          cabalConfigOpts = common.cabalConfigOpts
+      assert
+        (pkgName == name)
+        (loadPackageDeps pkgName version loc flags ghcOptions cabalConfigOpts)
+
+  -- If package is a global package, use info from ghc-pkg (#4324, #3084)
+  globalDeps =
+    pure . getDepsFromDump <$> Map.lookup pkgName globalDumpMap
+   where
+    getDepsFromDump dump = (Set.fromList deps, payloadFromDump dump)
+     where
+      deps = map ghcIdToPackageName dump.depends
+      ghcIdToPackageName depId =
+        maybe
+          (impureThrow $ DependencyNotFoundBug depId)
+          Stack.Prelude.pkgName
+          (Map.lookup depId globalIdMap)
+
+  payloadFromLocal pkg location = DotPayload
+    { version = Just pkg.version
+    , license = Just pkg.license
+    , location
+    }
+
+  payloadFromDump dp = DotPayload
+    { version = Just $ pkgVersion dp.packageIdent
+    , license = Right <$> dp.license
+    , location = Nothing
+    }
+
+-- | Resolve the dependency graph up to (Just depth) or until fixpoint is
+-- reached
+resolveDependencies ::
+     (Applicative m, Monad m)
+  => Maybe Int
+  -> DependencyGraph
+  -> (PackageName -> m (Set PackageName, DotPayload))
+  -> m DependencyGraph
+resolveDependencies (Just 0) graph _ = pure graph
+resolveDependencies limit graph loadPackageDeps = do
+  let values = Set.unions (fst <$> Map.elems graph)
+      keys = Map.keysSet graph
+      next = Set.difference values keys
+  if Set.null next
+    then pure graph
+    else do
+      x <- T.traverse (\name -> (name,) <$> loadPackageDeps name) (F.toList next)
+      resolveDependencies
+        (subtract 1 <$> limit)
+        (Map.unionWith unifier graph (Map.fromList x))
+        loadPackageDeps
+ where
+  unifier (pkgs1, v1) (pkgs2, _) = (Set.union pkgs1 pkgs2, v1)
+
+-- | @pruneGraph dontPrune toPrune graph@ prunes all packages in @graph@ with a
+-- name in @toPrune@ and removes resulting orphans unless they are in
+-- @dontPrune@
+pruneGraph ::
+     (F.Foldable f, F.Foldable g, Eq a)
+  => f PackageName
+  -> g PackageName
+  -> Map PackageName (Set PackageName, a)
+  -> Map PackageName (Set PackageName, a)
+pruneGraph dontPrune names =
+  pruneUnreachable dontPrune . Map.mapMaybeWithKey (\pkg (pkgDeps, x) ->
+    if pkg `F.elem` names
+      then Nothing
+      else let filtered = Set.filter (`F.notElem` names) pkgDeps
+           in  Just (filtered, x))
+
+-- | Make sure that all unreachable nodes (orphans) are pruned
+pruneUnreachable ::
+     (Eq a, F.Foldable f)
+  => f PackageName
+  -> Map PackageName (Set PackageName, a)
+  -> Map PackageName (Set PackageName, a)
+pruneUnreachable dontPrune = fixpoint prune
+ where
+  fixpoint :: Eq a => (a -> a) -> a -> a
+  fixpoint f v = if f v == v then v else fixpoint f (f v)
+  prune graph' = Map.filterWithKey (\k _ -> reachable k) graph'
+   where
+    reachable k = k `F.elem` dontPrune || k `Set.member` reachables
+    reachables = F.fold (fst <$> graph')
+
+nonParentDependencies ::
+     F.Foldable f
+  => Map PackageName (Set PackageName, a)
+  -> f PackageName
+  -> Set PackageName
+nonParentDependencies graph names
+  | F.null names = Set.empty
+  | otherwise =
+      Set.difference (Map.keysSet graph) (backwardReachable names graph)
+
+backwardReachable ::
+     F.Foldable f
+  => f PackageName
+  -> Map PackageName (Set PackageName, a)
+  -> Set PackageName
+backwardReachable names graph = go Set.empty (F.toList names)
+  where
+    reverseGraph =
+      Map.fromListWith Set.union
+        [ (dep, Set.singleton name)
+        | (name, (deps, _)) <- Map.toList graph
+        , dep <- Set.toList deps
+        ]
+
+    go seen [] = seen
+    go seen (x : xs)
+      | x `Set.member` seen = go seen xs
+      | otherwise =
+          let parents = Map.findWithDefault Set.empty x reverseGraph
+          in go (Set.insert x seen) (Set.toList parents <> xs)
+
+localPackageToPackage :: LocalPackage -> Package
+localPackageToPackage lp = fromMaybe lp.package lp.testBench
diff --git a/src/Stack/Docker.hs b/src/Stack/Docker.hs
index 8bc5565383..bacb1dcb80 100644
--- a/src/Stack/Docker.hs
+++ b/src/Stack/Docker.hs
@@ -1,119 +1,154 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE CPP                 #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE RankNTypes          #-}
-{-# LANGUAGE RecordWildCards     #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
--- | Run commands in Docker containers
+{-|
+Module      : Stack.Docker
+Description : Run commands in Docker containers.
+License     : BSD-3-Clause
+
+Run commands in Docker containers.
+-}
+
 module Stack.Docker
-  (dockerCmdName
-  ,dockerHelpOptName
-  ,dockerPullCmdName
-  ,entrypoint
-  ,preventInContainer
-  ,pull
-  ,reset
-  ,reExecArgName
-  ,StackDockerException(..)
-  ,getProjectRoot
-  ,runContainerAndExit
+  ( dockerCmdName
+  , dockerHelpOptName
+  , dockerPullCmdName
+  , entrypoint
+  , preventInContainer
+  , pull
+  , reset
+  , reExecArgName
+  , DockerException (..)
+  , getProjectRoot
+  , runContainerAndExit
   ) where
 
-import           Stack.Prelude
-import qualified Crypto.Hash as Hash (Digest, MD5, hash)
-import           Pantry.Internal.AesonExtended (FromJSON(..),(.:),(.:?),(.!=),eitherDecode)
+import           Control.Monad.Extra ( whenJust )
+import qualified Crypto.Hash as Hash ( Digest, MD5, hash )
+import           Data.Aeson ( eitherDecode )
+import           Data.Aeson.Types ( FromJSON (..), (.!=) )
+import           Data.Aeson.WarningParser ( (.:), (.:?) )
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Char (isAscii,isDigit)
-import           Data.Conduit.List (sinkNull)
-import           Data.Conduit.Process.Typed hiding (proc)
-import           Data.List (dropWhileEnd,isPrefixOf,isInfixOf)
-import           Data.List.Extra (trim)
+import           Data.Char ( isAscii, isDigit )
+import           Data.Conduit.List ( sinkNull )
+import           Data.List ( dropWhileEnd, isInfixOf, isPrefixOf )
+import           Data.List.Extra ( trim )
 import qualified Data.Map.Strict as Map
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
-import           Data.Time (UTCTime)
-import qualified Data.Version (showVersion, parseVersion)
-import           Distribution.Version (mkVersion, mkVersion')
+import           Data.Time ( UTCTime )
+import qualified Data.Version ( parseVersion )
+import           Distribution.Version ( mkVersion, mkVersion' )
 import           Path
-import           Path.Extra (toFilePathNoTrailingSep)
-import           Path.IO hiding (canonicalizePath)
-import qualified Paths_stack as Meta
-import           Stack.Config (getInContainer)
+                   ( (</>), dirname, filename, parent, parseAbsDir
+                   , splitExtension
+                   )
+import           Path.Extra ( toFilePathNoTrailingSep )
+import           Path.IO
+                   ( copyFile, doesDirExist, doesFileExist, ensureDir
+                   , getCurrentDir, getHomeDir, getModificationTime, listDir
+                   , removeDirRecur, removeFile
+                   )
+import qualified RIO.Directory ( makeAbsolute )
+import           RIO.Process
+                   ( ExitCodeException (..), HasProcessContext, augmentPath
+                   , closed, doesExecutableExist, proc, processContextL
+                   , readProcessStdout_, readProcess_, runProcess, runProcess_
+                   , setStderr, setStdin, setStdout, useHandleOpen
+                   , withWorkingDir
+                   )
+import           Stack.Config ( getInContainer )
 import           Stack.Constants
-import           Stack.Constants.Config
-import           Stack.Setup (ensureDockerStackExe)
-import           Stack.Storage.User (loadDockerImageExeCache,saveDockerImageExeCache)
-import           Stack.Types.Version
+                   ( buildPlanDir, inContainerEnvVar, platformVariantEnvVar
+                   , relDirBin, relDirDotLocal, relDirDotSsh
+                   , relDirDotStackProgName, relDirUnderHome, stackRootEnvVar
+                   )
+import           Stack.Constants.Config ( projectDockerSandboxDir )
+import           Stack.Docker.Handlers ( handleSetGroups, handleSignals )
+import           Stack.Prelude
+import           Stack.Setup ( ensureDockerStackExe )
+import           Stack.Storage.User
+                   ( loadDockerImageExeCache, saveDockerImageExeCache )
 import           Stack.Types.Config
+                   ( Config (..), HasConfig (..), configProjectRoot, stackRootL
+                   )
 import           Stack.Types.Docker
-import           System.Environment (getEnv,getEnvironment,getProgName,getArgs,getExecutablePath)
+                  ( DockerException (..), DockerOpts (..), DockerStackExe (..)
+                  , Mount (..), dockerCmdName, dockerContainerPlatform
+                  , dockerEntrypointArgName, dockerHelpOptName
+                  , dockerPullCmdName, reExecArgName
+                  )
+import           Stack.Types.DockerEntrypoint
+                   ( DockerEntrypoint (..), DockerUser (..) )
+import           Stack.Types.Runner
+                   ( HasDockerEntrypointMVar (..), progNameL, terminalL
+                   , viewExecutablePath
+                   )
+import           Stack.Types.Version ( showStackVersion, withinRange )
+import           System.Environment ( getArgs, getEnv, getEnvironment )
 import qualified System.FilePath as FP
-import           System.IO.Error (isDoesNotExistError)
-import           System.IO.Unsafe (unsafePerformIO)
-import qualified System.PosixCompat.User as User
+import           System.IO.Error ( isDoesNotExistError )
+import qualified System.Posix.User as User
 import qualified System.PosixCompat.Files as Files
-import           System.Terminal (hIsTerminalDeviceOrMinTTY)
-import           Text.ParserCombinators.ReadP (readP_to_S)
-import           RIO.Process
-import qualified RIO.Directory
-
-#ifndef WINDOWS
-import           System.Posix.Signals
-import qualified System.Posix.User as PosixUser
-#endif
+import           System.Terminal ( hIsTerminalDeviceOrMinTTY )
+import           Text.ParserCombinators.ReadP ( readP_to_S )
 
 -- | Function to get command and arguments to run in Docker container
-getCmdArgs
-  :: HasConfig env
+getCmdArgs ::
+     HasConfig env
   => DockerOpts
   -> Inspect
   -> Bool
   -> RIO env (FilePath,[String],[(String,String)],[Mount])
 getCmdArgs docker imageInfo isRemoteDocker = do
     config <- view configL
-    deUser <-
-        if fromMaybe (not isRemoteDocker) (dockerSetUser docker)
+    user <-
+        if fromMaybe (not isRemoteDocker) docker.setUser
             then liftIO $ do
-              duUid <- User.getEffectiveUserID
-              duGid <- User.getEffectiveGroupID
-              duGroups <- nubOrd <$> User.getGroups
-              duUmask <- Files.setFileCreationMask 0o022
+              uid <- User.getEffectiveUserID
+              gid <- User.getEffectiveGroupID
+              groups <- nubOrd <$> User.getGroups
+              umask <- Files.setFileCreationMask 0o022
               -- Only way to get old umask seems to be to change it, so set it back afterward
-              _ <- Files.setFileCreationMask duUmask
-              pure (Just DockerUser{..})
+              _ <- Files.setFileCreationMask umask
+              pure $ Just DockerUser
+                { uid
+                , gid
+                , groups
+                , umask
+                }
             else pure Nothing
     args <-
         fmap
-            (["--" ++ reExecArgName ++ "=" ++ Data.Version.showVersion Meta.version
-             ,"--" ++ dockerEntrypointArgName
-             ,show DockerEntrypoint{..}] ++)
-            (liftIO getArgs)
-    case dockerStackExe (configDocker config) of
+          (  [ "--" ++ reExecArgName ++ "=" ++ showStackVersion
+             , "--" ++ dockerEntrypointArgName
+             , show DockerEntrypoint { user }
+             ] ++
+          )
+          (liftIO getArgs)
+    case config.docker.stackExe of
         Just DockerStackExeHost
-          | configPlatform config == dockerContainerPlatform -> do
-              exePath <- resolveFile' =<< liftIO getExecutablePath
+          | config.platform == dockerContainerPlatform -> do
+              exePath <- viewExecutablePath
               cmdArgs args exePath
           | otherwise -> throwIO UnsupportedStackExeHostPlatformException
         Just DockerStackExeImage -> do
-            progName <- liftIO getProgName
+            progName <- view progNameL
             pure (FP.takeBaseName progName, args, [], [])
-        Just (DockerStackExePath path) -> do
-            cmdArgs args path
+        Just (DockerStackExePath path) -> cmdArgs args path
         Just DockerStackExeDownload -> exeDownload args
         Nothing
-          | configPlatform config == dockerContainerPlatform -> do
-              (exePath,exeTimestamp,misCompatible) <-
-                  do exePath <- resolveFile' =<< liftIO getExecutablePath
+          | config.platform == dockerContainerPlatform -> do
+              (exePath, exeTimestamp, misCompatible) <-
+                  do exePath <- viewExecutablePath
                      exeTimestamp <- getModificationTime exePath
                      isKnown <-
                          loadDockerImageExeCache
-                             (iiId imageInfo)
+                             imageInfo.iiId
                              exePath
                              exeTimestamp
                      pure (exePath, exeTimestamp, isKnown)
@@ -128,7 +163,7 @@ getCmdArgs docker imageInfo isRemoteDocker = do
                               [ "run"
                               , "-v"
                               , toFilePath exePath ++ ":" ++ "/tmp/stack"
-                              , T.unpack (iiId imageInfo)
+                              , T.unpack imageInfo.iiId
                               , "/tmp/stack"
                               , "--version"]
                               sinkNull
@@ -138,7 +173,7 @@ getCmdArgs docker imageInfo isRemoteDocker = do
                                   Left ExitCodeException{} -> False
                                   Right _ -> True
                       saveDockerImageExeCache
-                          (iiId imageInfo)
+                          imageInfo.iiId
                           exePath
                           exeTimestamp
                           compatible
@@ -172,265 +207,274 @@ preventInContainer inner =
 -- | Run a command in a new Docker container, then exit the process.
 runContainerAndExit :: HasConfig env => RIO env void
 runContainerAndExit = do
-     config <- view configL
-     let docker = configDocker config
-     checkDockerVersion docker
-     (env,isStdinTerminal,isStderrTerminal,homeDir) <- liftIO $
-       (,,,)
-       <$> getEnvironment
-       <*> hIsTerminalDeviceOrMinTTY stdin
-       <*> hIsTerminalDeviceOrMinTTY stderr
-       <*> getHomeDir
-     isStdoutTerminal <- view terminalL
-     let dockerHost = lookup "DOCKER_HOST" env
-         dockerCertPath = lookup "DOCKER_CERT_PATH" env
-         bamboo = lookup "bamboo_buildKey" env
-         jenkins = lookup "JENKINS_HOME" env
-         msshAuthSock = lookup "SSH_AUTH_SOCK" env
-         muserEnv = lookup "USER" env
-         isRemoteDocker = maybe False (isPrefixOf "tcp://") dockerHost
-     mstackYaml <- for (lookup "STACK_YAML" env) RIO.Directory.makeAbsolute
-     image <- either throwIO pure (dockerImage docker)
-     when (isRemoteDocker &&
-           maybe False (isInfixOf "boot2docker") dockerCertPath)
-          (logWarn "Warning: Using boot2docker is NOT supported, and not likely to perform well.")
-     maybeImageInfo <- inspect image
-     imageInfo@Inspect{..} <- case maybeImageInfo of
-       Just ii -> pure ii
-       Nothing
-         | dockerAutoPull docker ->
-             do pullImage docker image
-                mii2 <- inspect image
-                case mii2 of
-                  Just ii2 -> pure ii2
-                  Nothing -> throwM (InspectFailedException image)
-         | otherwise -> throwM (NotPulledException image)
-     projectRoot <- getProjectRoot
-     sandboxDir <- projectDockerSandboxDir projectRoot
-     let ImageConfig {..} = iiConfig
-         imageEnvVars = map (break (== '=')) icEnv
-         platformVariant = show $ hashRepoName image
-         stackRoot = view stackRootL config
-         sandboxHomeDir = sandboxDir </> homeDirName
-         isTerm = not (dockerDetach docker) &&
-                  isStdinTerminal &&
-                  isStdoutTerminal &&
-                  isStderrTerminal
-         keepStdinOpen = not (dockerDetach docker) &&
-                         -- Workaround for https://github.com/docker/docker/issues/12319
-                         -- This is fixed in Docker 1.9.1, but will leave the workaround
-                         -- in place for now, for users who haven't upgraded yet.
-                         (isTerm || (isNothing bamboo && isNothing jenkins))
-     let mpath = T.pack <$> lookupImageEnv "PATH" imageEnvVars
-     when (isNothing mpath) $ do
-       logWarn "The Docker image does not set the PATH env var"
-       logWarn "This will likely fail, see https://github.com/commercialhaskell/stack/issues/2742"
-     newPathEnv <- either throwM pure $ augmentPath
-                      [ hostBinDir
-                      , toFilePath (sandboxHomeDir </> relDirDotLocal </> relDirBin)]
-                      mpath
-     (cmnd,args,envVars,extraMount) <- getCmdArgs docker imageInfo isRemoteDocker
-     pwd <- getCurrentDir
-     liftIO $ mapM_ ensureDir [sandboxHomeDir, stackRoot]
-     -- Since $HOME is now mounted in the same place in the container we can
-     -- just symlink $HOME/.ssh to the right place for the stack docker user
-     let sshDir = homeDir </> sshRelDir
-     sshDirExists <- doesDirExist sshDir
-     sshSandboxDirExists <-
-         liftIO
-             (Files.fileExist
-                 (toFilePathNoTrailingSep (sandboxHomeDir </> sshRelDir)))
-     when (sshDirExists && not sshSandboxDirExists)
-         (liftIO
-             (Files.createSymbolicLink
-                 (toFilePathNoTrailingSep sshDir)
-                 (toFilePathNoTrailingSep (sandboxHomeDir </> sshRelDir))))
-     let mountSuffix = maybe "" (":" ++) (dockerMountMode docker)
-     containerID <- withWorkingDir (toFilePath projectRoot) $ trim . decodeUtf8 <$> readDockerProcess
-       (concat
-         [["create"
-          ,"-e",inContainerEnvVar ++ "=1"
-          ,"-e",stackRootEnvVar ++ "=" ++ toFilePathNoTrailingSep stackRoot
-          ,"-e",platformVariantEnvVar ++ "=dk" ++ platformVariant
-          ,"-e","HOME=" ++ toFilePathNoTrailingSep sandboxHomeDir
-          ,"-e","PATH=" ++ T.unpack newPathEnv
-          ,"-e","PWD=" ++ toFilePathNoTrailingSep pwd
-          ,"-v",toFilePathNoTrailingSep homeDir ++ ":" ++ toFilePathNoTrailingSep homeDir ++ mountSuffix
-          ,"-v",toFilePathNoTrailingSep stackRoot ++ ":" ++ toFilePathNoTrailingSep stackRoot ++ mountSuffix
-          ,"-v",toFilePathNoTrailingSep projectRoot ++ ":" ++ toFilePathNoTrailingSep projectRoot ++ mountSuffix
-          ,"-v",toFilePathNoTrailingSep sandboxHomeDir ++ ":" ++ toFilePathNoTrailingSep sandboxHomeDir ++ mountSuffix
-          ,"-w",toFilePathNoTrailingSep pwd]
-         ,case dockerNetwork docker of
+  config <- view configL
+  let docker = config.docker
+  checkDockerVersion docker
+  (env, isStdinTerminal, isStderrTerminal, homeDir) <- liftIO $
+    (,,,)
+    <$> getEnvironment
+    <*> hIsTerminalDeviceOrMinTTY stdin
+    <*> hIsTerminalDeviceOrMinTTY stderr
+    <*> getHomeDir
+  isStdoutTerminal <- view terminalL
+  let dockerHost = lookup "DOCKER_HOST" env
+      dockerCertPath = lookup "DOCKER_CERT_PATH" env
+      msshAuthSock = lookup "SSH_AUTH_SOCK" env
+      muserEnv = lookup "USER" env
+      isRemoteDocker = maybe False (isPrefixOf "tcp://") dockerHost
+  mstackYaml <- for (lookup "STACK_YAML" env) RIO.Directory.makeAbsolute
+  image <- either throwIO pure docker.image
+  when
+    ( isRemoteDocker && maybe False (isInfixOf "boot2docker") dockerCertPath )
+    ( prettyWarnS
+        "Using boot2docker is NOT supported, and not likely to perform well."
+    )
+  imageInfo <- inspect image >>= \case
+    Just ii -> pure ii
+    Nothing
+      | docker.autoPull -> do
+          pullImage docker image
+          inspect image >>= \case
+            Just ii2 -> pure ii2
+            Nothing -> throwM (InspectFailedException image)
+      | otherwise -> throwM (NotPulledException image)
+  projectRoot <- getProjectRoot
+  sandboxDir <- projectDockerSandboxDir projectRoot
+  let ic = imageInfo.config
+      imageEnvVars = map (break (== '=')) ic.env
+      platformVariant = show $ hashRepoName image
+      stackRoot = view stackRootL config
+      sandboxHomeDir = sandboxDir </> homeDirName
+      isTerm = isStdinTerminal && isStdoutTerminal && isStderrTerminal
+      allocatePseudoTty = not docker.detach && isTerm
+      keepStdinOpen = not docker.detach
+  let mpath = T.pack <$> lookupImageEnv "PATH" imageEnvVars
+  when (isNothing mpath) $ do
+    prettyWarnL
+      [ flow "The Docker image does not set the PATH environment variable. \
+             \This will likely fail. For further information, see"
+      , style Url "https://github.com/commercialhaskell/stack/issues/2742" <> "."
+      ]
+  newPathEnv <- either throwM pure $ augmentPath
+    [ hostBinDir
+    , toFilePath (sandboxHomeDir </> relDirDotLocal </> relDirBin)
+    ]
+    mpath
+  (cmnd,args,envVars,extraMount) <- getCmdArgs docker imageInfo isRemoteDocker
+  pwd <- getCurrentDir
+  liftIO $ mapM_ ensureDir [sandboxHomeDir, stackRoot]
+  -- Since $HOME is now mounted in the same place in the container we can
+  -- just symlink $HOME/.ssh to the right place for the stack docker user
+  let sshDir = homeDir </> sshRelDir
+  sshDirExists <- doesDirExist sshDir
+  sshSandboxDirExists <-
+    liftIO
+      (Files.fileExist
+        (toFilePathNoTrailingSep (sandboxHomeDir </> sshRelDir)))
+  when (sshDirExists && not sshSandboxDirExists)
+    (liftIO
+      (Files.createSymbolicLink
+        (toFilePathNoTrailingSep sshDir)
+        (toFilePathNoTrailingSep (sandboxHomeDir </> sshRelDir))))
+  let mountSuffix = maybe "" (":" ++) docker.mountMode
+  containerID <- withWorkingDir (toFilePath projectRoot) $
+    trim . decodeUtf8 <$> readDockerProcess
+      ( concat
+        [ [ "create"
+          , "-e", inContainerEnvVar ++ "=1"
+          , "-e", stackRootEnvVar ++ "=" ++ toFilePathNoTrailingSep stackRoot
+          , "-e", platformVariantEnvVar ++ "=dk" ++ platformVariant
+          , "-e", "HOME=" ++ toFilePathNoTrailingSep sandboxHomeDir
+          , "-e", "PATH=" ++ T.unpack newPathEnv
+          , "-e", "PWD=" ++ toFilePathNoTrailingSep pwd
+          , "-v"
+          , toFilePathNoTrailingSep homeDir ++ ":" ++
+              toFilePathNoTrailingSep homeDir ++ mountSuffix
+          , "-v"
+          , toFilePathNoTrailingSep stackRoot ++ ":" ++
+              toFilePathNoTrailingSep stackRoot ++ mountSuffix
+          , "-v"
+          , toFilePathNoTrailingSep projectRoot ++ ":" ++
+              toFilePathNoTrailingSep projectRoot ++ mountSuffix
+          , "-v"
+          , toFilePathNoTrailingSep sandboxHomeDir ++ ":" ++
+              toFilePathNoTrailingSep sandboxHomeDir ++ mountSuffix
+          , "-w", toFilePathNoTrailingSep pwd
+          ]
+        , case docker.network of
             Nothing -> ["--net=host"]
             Just name -> ["--net=" ++ name]
-         ,case muserEnv of
+        , case muserEnv of
             Nothing -> []
             Just userEnv -> ["-e","USER=" ++ userEnv]
-         ,case msshAuthSock of
+        , case msshAuthSock of
             Nothing -> []
             Just sshAuthSock ->
-              ["-e","SSH_AUTH_SOCK=" ++ sshAuthSock
-              ,"-v",sshAuthSock ++ ":" ++ sshAuthSock]
-         ,case mstackYaml of
+              [ "-e","SSH_AUTH_SOCK=" ++ sshAuthSock
+              , "-v",sshAuthSock ++ ":" ++ sshAuthSock
+              ]
+        , case mstackYaml of
             Nothing -> []
             Just stackYaml ->
-              ["-e","STACK_YAML=" ++ stackYaml
-              ,"-v",stackYaml++ ":" ++ stackYaml ++ ":ro"]
+              [ "-e","STACK_YAML=" ++ stackYaml
+              , "-v",stackYaml++ ":" ++ stackYaml ++ ":ro"
+              ]
            -- Disable the deprecated entrypoint in FP Complete-generated images
-         ,["--entrypoint=/usr/bin/env"
-             | isJust (lookupImageEnv oldSandboxIdEnvVar imageEnvVars) &&
-               (icEntrypoint == ["/usr/local/sbin/docker-entrypoint"] ||
-                 icEntrypoint == ["/root/entrypoint.sh"])]
-         ,concatMap (\(k,v) -> ["-e", k ++ "=" ++ v]) envVars
-         ,concatMap (mountArg mountSuffix) (extraMount ++ dockerMount docker)
-         ,concatMap (\nv -> ["-e", nv]) (dockerEnv docker)
-         ,case dockerContainerName docker of
+        , [ "--entrypoint=/usr/bin/env"
+          |  isJust (lookupImageEnv oldSandboxIdEnvVar imageEnvVars)
+          && (  ic.entrypoint == ["/usr/local/sbin/docker-entrypoint"]
+             || ic.entrypoint == ["/root/entrypoint.sh"]
+             )
+          ]
+        , concatMap (\(k,v) -> ["-e", k ++ "=" ++ v]) envVars
+        , concatMap (mountArg mountSuffix) (extraMount ++ docker.mount)
+        , concatMap (\nv -> ["-e", nv]) docker.env
+        , case docker.containerName of
             Just name -> ["--name=" ++ name]
             Nothing -> []
-         ,["-t" | isTerm]
-         ,["-i" | keepStdinOpen]
-         ,dockerRunArgs docker
-         ,[image]
-         ,[cmnd]
-         ,args])
--- MSS 2018-08-30 can the CPP below be removed entirely, and instead exec the
--- `docker` process so that it can handle the signals directly?
-#ifndef WINDOWS
-     run <- askRunInIO
-     oldHandlers <- forM [sigINT,sigABRT,sigHUP,sigPIPE,sigTERM,sigUSR1,sigUSR2] $ \sig -> do
-       let sigHandler = run $ do
-             readProcessNull "docker" ["kill","--signal=" ++ show sig,containerID]
-             when (sig `elem` [sigTERM,sigABRT]) $ do
-               -- Give the container 30 seconds to exit gracefully, then send a sigKILL to force it
-               threadDelay 30000000
-               readProcessNull "docker" ["kill",containerID]
-       oldHandler <- liftIO $ installHandler sig (Catch sigHandler) Nothing
-       pure (sig, oldHandler)
-#endif
-     let args' = concat [["start"]
-                        ,["-a" | not (dockerDetach docker)]
-                        ,["-i" | keepStdinOpen]
-                        ,[containerID]]
-     e <- try (proc "docker" args' $ runProcess_ . setDelegateCtlc False)
-         `finally`
-         (do unless (dockerPersist docker || dockerDetach docker) $
-                 readProcessNull "docker" ["rm","-f",containerID]
-                 `catch` (\(_::ExitCodeException) -> pure ())
-#ifndef WINDOWS
-             forM_ oldHandlers $ \(sig,oldHandler) ->
-               liftIO $ installHandler sig oldHandler Nothing
-#endif
-         )
-     case e of
-       Left ExitCodeException{eceExitCode} -> exitWith eceExitCode
-       Right () -> exitSuccess
-  where
-    -- This is using a hash of the Docker repository (without tag or digest) to ensure
-    -- binaries/libraries aren't shared between Docker and host (or incompatible Docker images)
-    hashRepoName :: String -> Hash.Digest Hash.MD5
-    hashRepoName = Hash.hash . BS.pack . takeWhile (\c -> c /= ':' && c /= '@')
-    lookupImageEnv name vars =
-      case lookup name vars of
-        Just ('=':val) -> Just val
-        _ -> Nothing
-    mountArg mountSuffix (Mount host container) =
-      ["-v",host ++ ":" ++ container ++ mountSuffix]
-    sshRelDir = relDirDotSsh
+        , ["-t" | allocatePseudoTty]
+        , ["-i" | keepStdinOpen]
+        , docker.runArgs
+        , [image]
+        , [cmnd]
+        , args
+        ]
+      )
+  handleSignals docker keepStdinOpen containerID >>= \case
+    Left ExitCodeException{eceExitCode} -> exitWith eceExitCode
+    Right () -> exitSuccess
+ where
+  -- This is using a hash of the Docker repository (without tag or digest) to
+  -- ensure binaries/libraries aren't shared between Docker and host (or
+  -- incompatible Docker images)
+  hashRepoName :: String -> Hash.Digest Hash.MD5
+  hashRepoName = Hash.hash . BS.pack . takeWhile (\c -> c /= ':' && c /= '@')
+  lookupImageEnv name vars =
+    case lookup name vars of
+      Just ('=':val) -> Just val
+      _ -> Nothing
+  mountArg mountSuffix (Mount host container) =
+    ["-v",host ++ ":" ++ container ++ mountSuffix]
+  sshRelDir = relDirDotSsh
 
 -- | Inspect Docker image or container.
-inspect :: (HasProcessContext env, HasLogFunc env)
-        => String -> RIO env (Maybe Inspect)
-inspect image =
-  do results <- inspects [image]
-     case Map.toList results of
-       [] -> pure Nothing
-       [(_,i)] -> pure (Just i)
-       _ -> throwIO (InvalidInspectOutputException "expect a single result")
+inspect ::
+     (HasProcessContext env, HasLogFunc env)
+  => String
+  -> RIO env (Maybe Inspect)
+inspect image = do
+  results <- inspects [image]
+  case Map.toList results of
+    [] -> pure Nothing
+    [(_,i)] -> pure (Just i)
+    _ -> throwIO (InvalidInspectOutputException "expect a single result")
 
 -- | Inspect multiple Docker images and/or containers.
-inspects :: (HasProcessContext env, HasLogFunc env)
-         => [String] -> RIO env (Map Text Inspect)
+inspects ::
+     (HasProcessContext env, HasLogFunc env)
+  => [String]
+  -> RIO env (Map Text Inspect)
 inspects [] = pure Map.empty
-inspects images =
-  do maybeInspectOut <-
-       -- not using 'readDockerProcess' as the error from a missing image
-       -- needs to be recovered.
-       try (BL.toStrict . fst <$> proc "docker" ("inspect" : images) readProcess_)
-     case maybeInspectOut of
-       Right inspectOut ->
-         -- filtering with 'isAscii' to workaround @docker inspect@ output containing invalid UTF-8
-         case eitherDecode (LBS.pack (filter isAscii (decodeUtf8 inspectOut))) of
-           Left msg -> throwIO (InvalidInspectOutputException msg)
-           Right results -> pure (Map.fromList (map (\r -> (iiId r,r)) results))
-       Left ece
-         |  any (`LBS.isPrefixOf` eceStderr ece) missingImagePrefixes -> pure Map.empty
-       Left e -> throwIO e
-  where missingImagePrefixes = ["Error: No such image", "Error: No such object:"]
+inspects images = do
+  maybeInspectOut <-
+    -- not using 'readDockerProcess' as the error from a missing image
+    -- needs to be recovered.
+    try (BL.toStrict . fst <$> proc "docker" ("inspect" : images) readProcess_)
+  case maybeInspectOut of
+    Right inspectOut ->
+      -- filtering with 'isAscii' to workaround @docker inspect@ output
+      -- containing invalid UTF-8
+      case eitherDecode (LBS.pack (filter isAscii (decodeUtf8 inspectOut))) of
+        Left msg -> throwIO (InvalidInspectOutputException msg)
+        Right results -> pure (Map.fromList (map (\r -> (r.iiId, r)) results))
+    Left ece
+      | any (`LBS.isPrefixOf` eceStderr ece) missingImagePrefixes ->
+          pure Map.empty
+    Left e -> throwIO e
+ where
+  missingImagePrefixes =
+    [ -- Docker >= 29.0.0. See:
+      -- https://github.com/docker/cli/commit/9ba1314d3acc5bd59417049c26275f33e3d54021
+      "error: no such object:"
+    , "Error: No such image"
+    , "Error: No such object:"
+    ]
 
 -- | Pull latest version of configured Docker image from registry.
 pull :: HasConfig env => RIO env ()
-pull =
-  do config <- view configL
-     let docker = configDocker config
-     checkDockerVersion docker
-     either throwIO (pullImage docker) (dockerImage docker)
+pull = do
+  config <- view configL
+  let docker = config.docker
+  checkDockerVersion docker
+  either throwIO (pullImage docker) docker.image
 
 -- | Pull Docker image from registry.
-pullImage :: (HasProcessContext env, HasLogFunc env)
-          => DockerOpts -> String -> RIO env ()
-pullImage docker image =
-  do logInfo ("Pulling image from registry: '" <> fromString image <> "'")
-     when (dockerRegistryLogin docker)
-          (do logInfo "You may need to log in."
-              proc
-                "docker"
-                (concat
-                   [["login"]
-                   ,maybe [] (\n -> ["--username=" ++ n]) (dockerRegistryUsername docker)
-                   ,maybe [] (\p -> ["--password=" ++ p]) (dockerRegistryPassword docker)
-                   ,[takeWhile (/= '/') image]])
-                runProcess_)
-     -- We redirect the stdout of the process to stderr so that the output
-     -- of @docker pull@ will not interfere with the output of other
-     -- commands when using --auto-docker-pull. See issue #2733.
-     ec <- proc "docker" ["pull", image] $ \pc0 -> do
-       let pc = setStdout (useHandleOpen stderr)
-              $ setStderr (useHandleOpen stderr)
-              $ setStdin closed
-                pc0
-       runProcess pc
-     case ec of
-       ExitSuccess -> pure ()
-       ExitFailure _ -> throwIO (PullFailedException image)
+pullImage ::
+     (HasProcessContext env, HasTerm env)
+  => DockerOpts
+  -> String
+  -> RIO env ()
+pullImage docker image = do
+  prettyInfoL
+    [ flow "Pulling image from registry:"
+    , style Current (fromString image) <> "."
+    ]
+  when docker.registryLogin $ do
+    prettyInfoS "You may need to log in."
+    proc
+      "docker"
+      ( concat
+          [ ["login"]
+          , maybe [] (\n -> ["--username=" ++ n]) docker.registryUsername
+          , maybe [] (\p -> ["--password=" ++ p]) docker.registryPassword
+          , [takeWhile (/= '/') image]
+          ]
+      )
+      runProcess_
+  -- We redirect the stdout of the process to stderr so that the output
+  -- of @docker pull@ will not interfere with the output of other
+  -- commands when using --auto-docker-pull. See issue #2733.
+  ec <- proc "docker" ["pull", image] $ \pc0 -> do
+    let pc = setStdout (useHandleOpen stderr)
+           $ setStderr (useHandleOpen stderr)
+           $ setStdin closed
+             pc0
+    runProcess pc
+  case ec of
+    ExitSuccess -> pure ()
+    ExitFailure _ -> throwIO (PullFailedException image)
 
 -- | Check docker version (throws exception if incorrect)
-checkDockerVersion
-    :: (HasProcessContext env, HasLogFunc env)
-    => DockerOpts -> RIO env ()
-checkDockerVersion docker =
-  do dockerExists <- doesExecutableExist "docker"
-     unless dockerExists (throwIO DockerNotInstalledException)
-     dockerVersionOut <- readDockerProcess ["--version"]
-     case words (decodeUtf8 dockerVersionOut) of
-       (_:_:v:_) ->
-         case fmap mkVersion' $ parseVersion' $ stripVersion v of
-           Just v'
-             | v' < minimumDockerVersion ->
-               throwIO (DockerTooOldException minimumDockerVersion v')
-             | v' `elem` prohibitedDockerVersions ->
-               throwIO (DockerVersionProhibitedException prohibitedDockerVersions v')
-             | not (v' `withinRange` dockerRequireDockerVersion docker) ->
-               throwIO (BadDockerVersionException (dockerRequireDockerVersion docker) v')
-             | otherwise ->
-               pure ()
-           _ -> throwIO InvalidVersionOutputException
-       _ -> throwIO InvalidVersionOutputException
-  where minimumDockerVersion = mkVersion [1, 6, 0]
-        prohibitedDockerVersions = []
-        stripVersion v = takeWhile (/= '-') (dropWhileEnd (not . isDigit) v)
-        -- version is parsed by Data.Version provided code to avoid
-        -- Cabal's Distribution.Version lack of support for leading zeros in version
-        parseVersion' = fmap fst . listToMaybe . reverse . readP_to_S Data.Version.parseVersion
+checkDockerVersion ::
+     (HasProcessContext env, HasLogFunc env)
+  => DockerOpts
+  -> RIO env ()
+checkDockerVersion docker = do
+  dockerExists <- doesExecutableExist "docker"
+  unless dockerExists (throwIO DockerNotInstalledException)
+  dockerVersionOut <- readDockerProcess ["--version"]
+  case words (decodeUtf8 dockerVersionOut) of
+    (_:_:v:_) ->
+      case fmap mkVersion' $ parseVersion' $ stripVersion v of
+        Just v'
+          | v' < minimumDockerVersion ->
+            throwIO (DockerTooOldException minimumDockerVersion v')
+          | v' `elem` prohibitedDockerVersions ->
+            throwIO (DockerVersionProhibitedException prohibitedDockerVersions v')
+          | not (v' `withinRange` docker.requireDockerVersion) ->
+            throwIO (BadDockerVersionException docker.requireDockerVersion v')
+          | otherwise ->
+            pure ()
+        _ -> throwIO InvalidVersionOutputException
+    _ -> throwIO InvalidVersionOutputException
+ where
+  minimumDockerVersion = mkVersion [1, 6, 0]
+  prohibitedDockerVersions = []
+  stripVersion v = takeWhile (/= '-') (dropWhileEnd (not . isDigit) v)
+  -- version is parsed by Data.Version provided code to avoid
+  -- Cabal's Distribution.Version lack of support for leading zeros in version
+  parseVersion' =
+    fmap fst . listToMaybe . reverse . readP_to_S Data.Version.parseVersion
 
 -- | Remove the project's Docker sandbox.
 reset :: HasConfig env => Bool -> RIO env ()
@@ -442,11 +486,16 @@ reset keepHome = do
             [homeDirName | keepHome]
             [])
 
--- | The Docker container "entrypoint": special actions performed when first entering
--- a container, such as switching the UID/GID to the "outside-Docker" user's.
-entrypoint :: (HasProcessContext env, HasLogFunc env)
-           => Config -> DockerEntrypoint -> RIO env ()
-entrypoint config@Config{} DockerEntrypoint{..} =
+-- | The Docker container "entrypoint": special actions performed when first
+-- entering a container, such as switching the UID/GID to the "outside-Docker"
+-- user's.
+entrypoint ::
+     (HasDockerEntrypointMVar env, HasProcessContext env, HasLogFunc env)
+  => Config
+  -> DockerEntrypoint
+  -> RIO env ()
+entrypoint config@Config{} de = do
+  entrypointMVar <- view dockerEntrypointMVarL
   modifyMVar_ entrypointMVar $ \alreadyRan -> do
     -- Only run the entrypoint once
     unless alreadyRan $ do
@@ -456,110 +505,111 @@ entrypoint config@Config{} DockerEntrypoint{..} =
       estackUserEntry0 <- liftIO $ tryJust (guard . isDoesNotExistError) $
         User.getUserEntryForName stackUserName
       -- Switch UID/GID if needed, and update user's home directory
-      case deUser of
-        Nothing -> pure ()
-        Just (DockerUser 0 _ _ _) -> pure ()
-        Just du -> withProcessContext envOverride $ updateOrCreateStackUser estackUserEntry0 homeDir du
+      whenJust de.user $ \du -> case du of
+        DockerUser 0 _ _ _ -> pure ()
+        _ -> withProcessContext envOverride $
+          updateOrCreateStackUser estackUserEntry0 homeDir du
       case estackUserEntry0 of
         Left _ -> pure ()
         Right ue -> do
-          -- If the 'stack' user exists in the image, copy any build plans and package indices from
-          -- its original home directory to the host's Stack root, to avoid needing to download them
+          -- If the 'stack' user exists in the image, copy any build plans and
+          -- package indices from its original home directory to the host's
+          -- Stack root, to avoid needing to download them
           origStackHomeDir <- liftIO $ parseAbsDir (User.homeDirectory ue)
           let origStackRoot = origStackHomeDir </> relDirDotStackProgName
           buildPlanDirExists <- doesDirExist (buildPlanDir origStackRoot)
           when buildPlanDirExists $ do
             (_, buildPlans) <- listDir (buildPlanDir origStackRoot)
             forM_ buildPlans $ \srcBuildPlan -> do
-              let destBuildPlan = buildPlanDir (view stackRootL config) </> filename srcBuildPlan
+              let destBuildPlan =
+                    buildPlanDir (view stackRootL config) </> filename srcBuildPlan
               exists <- doesFileExist destBuildPlan
               unless exists $ do
                 ensureDir (parent destBuildPlan)
                 copyFile srcBuildPlan destBuildPlan
     pure True
-  where
-    updateOrCreateStackUser estackUserEntry homeDir DockerUser{..} = do
-      case estackUserEntry of
-        Left _ -> do
-          -- If no 'stack' user in image, create one with correct UID/GID and home directory
-          readProcessNull "groupadd"
-            ["-o"
-            ,"--gid",show duGid
-            ,stackUserName]
-          readProcessNull "useradd"
-            ["-oN"
-            ,"--uid",show duUid
-            ,"--gid",show duGid
-            ,"--home",toFilePathNoTrailingSep homeDir
-            ,stackUserName]
-        Right _ -> do
-          -- If there is already a 'stack' user in the image, adjust its UID/GID and home directory
-          readProcessNull "usermod"
-            ["-o"
-            ,"--uid",show duUid
-            ,"--home",toFilePathNoTrailingSep homeDir
-            ,stackUserName]
-          readProcessNull "groupmod"
-            ["-o"
-            ,"--gid",show duGid
-            ,stackUserName]
-      forM_ duGroups $ \gid -> do
+ where
+  updateOrCreateStackUser estackUserEntry homeDir du = do
+    case estackUserEntry of
+      Left _ -> do
+        -- If no 'stack' user in image, create one with correct UID/GID and home
+        -- directory
         readProcessNull "groupadd"
-          ["-o"
-          ,"--gid",show gid
-          ,"group" ++ show gid]
-      -- 'setuid' to the wanted UID and GID
-      liftIO $ do
-        User.setGroupID duGid
-#ifndef WINDOWS
-        PosixUser.setGroups duGroups
-#endif
-        User.setUserID duUid
-        _ <- Files.setFileCreationMask duUmask
-        pure ()
-    stackUserName = "stack"::String
-
--- | MVar used to ensure the Docker entrypoint is performed exactly once
-entrypointMVar :: MVar Bool
-{-# NOINLINE entrypointMVar #-}
-entrypointMVar = unsafePerformIO (newMVar False)
+          [ "-o"
+          , "--gid",show du.gid
+          , stackUserName
+          ]
+        readProcessNull "useradd"
+          [ "-oN"
+          , "--uid", show du.uid
+          , "--gid", show du.gid
+          , "--home", toFilePathNoTrailingSep homeDir
+          , stackUserName
+          ]
+      Right _ -> do
+        -- If there is already a 'stack' user in the image, adjust its UID/GID
+        -- and home directory
+        readProcessNull "usermod"
+          [ "-o"
+          , "--uid", show du.uid
+          , "--home", toFilePathNoTrailingSep homeDir
+          , stackUserName
+          ]
+        readProcessNull "groupmod"
+          [ "-o"
+          , "--gid", show du.gid
+          , stackUserName
+          ]
+    forM_ du.groups $ \gid ->
+      readProcessNull "groupadd"
+        [ "-o"
+        , "--gid", show gid
+        , "group" ++ show gid
+        ]
+    -- 'setuid' to the wanted UID and GID
+    liftIO $ do
+      User.setGroupID du.gid
+      handleSetGroups du.groups
+      User.setUserID du.uid
+      void $ Files.setFileCreationMask du.umask
+  stackUserName = "stack" :: String
 
 -- | Remove the contents of a directory, without removing the directory itself.
--- This is used instead of 'FS.removeTree' to clear bind-mounted directories, since
--- removing the root of the bind-mount won't work.
-removeDirectoryContents :: Path Abs Dir -- ^ Directory to remove contents of
-                        -> [Path Rel Dir] -- ^ Top-level directory names to exclude from removal
-                        -> [Path Rel File] -- ^ Top-level file names to exclude from removal
-                        -> IO ()
-removeDirectoryContents path excludeDirs excludeFiles =
-  do isRootDir <- doesDirExist path
-     when isRootDir
-          (do (lsd,lsf) <- listDir path
-              forM_ lsd
-                    (\d -> unless (dirname d `elem` excludeDirs)
-                                  (removeDirRecur d))
-              forM_ lsf
-                    (\f -> unless (filename f `elem` excludeFiles)
-                                  (removeFile f)))
+-- This is used instead of 'FS.removeTree' to clear bind-mounted directories,
+-- since removing the root of the bind-mount won't work.
+removeDirectoryContents ::
+     Path Abs Dir -- ^ Directory to remove contents of
+  -> [Path Rel Dir] -- ^ Top-level directory names to exclude from removal
+  -> [Path Rel File] -- ^ Top-level file names to exclude from removal
+  -> IO ()
+removeDirectoryContents path excludeDirs excludeFiles = do
+  isRootDir <- doesDirExist path
+  when isRootDir $ do
+    (lsd,lsf) <- listDir path
+    forM_ lsd
+          (\d -> unless (dirname d `elem` excludeDirs)
+                        (removeDirRecur d))
+    forM_ lsf
+          (\f -> unless (filename f `elem` excludeFiles)
+                        (removeFile f))
 
--- | Produce a strict 'S.ByteString' from the stdout of a
--- process. Throws a 'ReadProcessException' exception if the
--- process fails.
+-- | Produce a strict 'S.ByteString' from the stdout of a process. Throws a
+-- 'Rio.Process.ReadProcessException' exception if the process fails.
 --
--- The stderr output is passed straight through, which is desirable for some cases
--- e.g. docker pull, in which docker uses stderr for progress output.
+-- The stderr output is passed straight through, which is desirable for some
+-- cases e.g. docker pull, in which docker uses stderr for progress output.
 --
 -- Use 'readProcess_' directly to customize this.
-readDockerProcess
-    :: (HasProcessContext env, HasLogFunc env)
-    => [String] -> RIO env BS.ByteString
+readDockerProcess ::
+     (HasProcessContext env, HasLogFunc env)
+  => [String] -> RIO env BS.ByteString
 readDockerProcess args = BL.toStrict <$> proc "docker" args readProcessStdout_
 
 -- | Name of home directory within docker sandbox.
 homeDirName :: Path Rel Dir
 homeDirName = relDirUnderHome
 
--- | Directory where 'stack' executable is bind-mounted in Docker container
+-- | Directory where \'stack\' executable is bind-mounted in Docker container
 -- This refers to a path in the Linux *container*, and so should remain a
 -- 'FilePath' (not 'Path Abs Dir') so that it works when the host runs Windows.
 hostBinDir :: FilePath
@@ -572,7 +622,7 @@ decodeUtf8 bs = T.unpack (T.decodeUtf8 bs)
 -- | Fail with friendly error if project root not set.
 getProjectRoot :: HasConfig env => RIO env (Path Abs Dir)
 getProjectRoot = do
-  mroot <- view $ configL.to configProjectRoot
+  mroot <- view $ configL . to configProjectRoot
   maybe (throwIO CannotDetermineProjectRootException) pure mroot
 
 -- | Environment variable that contained the old sandbox ID.
@@ -582,31 +632,34 @@ oldSandboxIdEnvVar = "DOCKER_SANDBOX_ID"
 
 -- | Parsed result of @docker inspect@.
 data Inspect = Inspect
-  {iiConfig      :: ImageConfig
-  ,iiCreated     :: UTCTime
-  ,iiId          :: Text
-  ,iiVirtualSize :: Maybe Integer}
-  deriving (Show)
+  { config      :: ImageConfig
+  , created     :: UTCTime
+  , iiId        :: Text
+  , virtualSize :: Maybe Integer
+  }
+  deriving Show
 
 -- | Parse @docker inspect@ output.
 instance FromJSON Inspect where
-  parseJSON v =
-    do o <- parseJSON v
-       Inspect <$> o .: "Config"
-               <*> o .: "Created"
-               <*> o .: "Id"
-               <*> o .:? "VirtualSize"
+  parseJSON v = do
+    o <- parseJSON v
+    Inspect
+      <$> o .: "Config"
+      <*> o .: "Created"
+      <*> o .: "Id"
+      <*> o .:? "VirtualSize"
 
 -- | Parsed @Config@ section of @docker inspect@ output.
 data ImageConfig = ImageConfig
-  {icEnv :: [String]
-  ,icEntrypoint :: [String]}
-  deriving (Show)
+  { env :: [String]
+  , entrypoint :: [String]
+  }
+  deriving Show
 
 -- | Parse @Config@ section of @docker inspect@ output.
 instance FromJSON ImageConfig where
-  parseJSON v =
-    do o <- parseJSON v
-       ImageConfig
-         <$> fmap join (o .:? "Env") .!= []
-         <*> fmap join (o .:? "Entrypoint") .!= []
+  parseJSON v = do
+    o <- parseJSON v
+    ImageConfig
+      <$> fmap join (o .:? "Env") .!= []
+      <*> fmap join (o .:? "Entrypoint") .!= []
diff --git a/src/Stack/DockerCmd.hs b/src/Stack/DockerCmd.hs
new file mode 100644
index 0000000000..be9f167001
--- /dev/null
+++ b/src/Stack/DockerCmd.hs
@@ -0,0 +1,33 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.DockerCmd
+Description : Functions related to Stack's @docker pull@ and @docker reset@
+              commands.
+License     : BSD-3-Clause
+
+Functions related to Stack's @docker pull@ and @docker reset@ commands.
+-}
+
+module Stack.DockerCmd
+  ( dockerPullCmd
+  , dockerResetCmd
+  ) where
+
+import           Stack.Docker ( preventInContainer, pull, reset )
+import           Stack.Prelude
+import           Stack.Runners ( ShouldReexec (..), withConfig )
+import           Stack.Types.Runner ( Runner )
+
+-- | Function underlying the @stack docker pull@ command. Pull the current
+-- Docker image.
+dockerPullCmd :: () -> RIO Runner ()
+dockerPullCmd () = withConfig NoReexec $ preventInContainer pull
+
+-- | Function underlying the @stack docker reset@ command. Reset the Docker
+-- sandbox.
+dockerResetCmd ::
+     Bool
+     -- ^ Delete the sandbox's home directory?
+  -> RIO Runner ()
+dockerResetCmd = withConfig NoReexec . preventInContainer . reset
diff --git a/src/Stack/Dot.hs b/src/Stack/Dot.hs
index 2fe6e0f60e..adec65cc79 100644
--- a/src/Stack/Dot.hs
+++ b/src/Stack/Dot.hs
@@ -1,554 +1,136 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE ConstraintKinds   #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TupleSections     #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
 
-module Stack.Dot (dot
-                 ,listDependencies
-                 ,DotOpts(..)
-                 ,DotPayload(..)
-                 ,ListDepsOpts(..)
-                 ,ListDepsFormat(..)
-                 ,ListDepsFormatOpts(..)
-                 ,resolveDependencies
-                 ,printGraph
-                 ,pruneGraph
-                 ) where
+{-|
+Module      : Stack.Dot
+Description : Functions related to Stack's @dot@ command.
+License     : BSD-3-Clause
+
+Functions related to Stack's @dot@ command.
+-}
+
+module Stack.Dot
+  ( dotCmd
+  , printGraph
+  ) where
 
-import           Data.Aeson
-import qualified Data.ByteString.Lazy.Char8 as LBC8
 import qualified Data.Foldable as F
-import qualified Data.Sequence as Seq
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 import qualified Data.Text as Text
 import qualified Data.Text.IO as Text
-import qualified Data.Traversable as T
-import           Distribution.Text (display)
-import qualified Distribution.PackageDescription as PD
-import qualified Distribution.SPDX.License as SPDX
-import           Distribution.License (License(BSD3), licenseFromSPDX)
-import           Distribution.Types.PackageName (mkPackageName)
-import qualified Path
-import           RIO.PrettyPrint (HasTerm (..), HasStylesUpdate (..))
-import           RIO.Process (HasProcessContext (..))
-import           Stack.Build (loadPackage)
-import           Stack.Build.Installed (getInstalled, toInstallMap)
-import           Stack.Build.Source
-import           Stack.Constants
-import           Stack.Package
-import           Stack.Prelude hiding (Display (..), pkgName, loadPackage)
-import qualified Stack.Prelude (pkgName)
-import           Stack.Runners
-import           Stack.SourceMap
-import           Stack.Types.Build
-import           Stack.Types.Compiler (wantedToActual)
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
-import           Stack.Types.SourceMap
-import           Stack.Build.Target(NeedTargets(..), parseTargets)
-
--- | Options record for @stack dot@
-data DotOpts = DotOpts
-    { dotIncludeExternal :: !Bool
-    -- ^ Include external dependencies
-    , dotIncludeBase :: !Bool
-    -- ^ Include dependencies on base
-    , dotDependencyDepth :: !(Maybe Int)
-    -- ^ Limit the depth of dependency resolution to (Just n) or continue until fixpoint
-    , dotPrune :: !(Set PackageName)
-    -- ^ Package names to prune from the graph
-    , dotTargets :: [Text]
-    -- ^ Stack TARGETs to trace dependencies for
-    , dotFlags :: !(Map ApplyCLIFlag (Map FlagName Bool))
-    -- ^ Flags to apply when calculating dependencies
-    , dotTestTargets :: Bool
-    -- ^ Like the "--test" flag for build, affects the meaning of 'dotTargets'.
-    , dotBenchTargets :: Bool
-    -- ^ Like the "--bench" flag for build, affects the meaning of 'dotTargets'.
-    , dotGlobalHints :: Bool
-    -- ^ Use global hints instead of relying on an actual GHC installation.
-    }
-
-data ListDepsFormatOpts = ListDepsFormatOpts { listDepsSep :: !Text
-                                             -- ^ Separator between the package name and details.
-                                             , listDepsLicense :: !Bool
-                                             -- ^ Print dependency licenses instead of versions.
-                                             }
-
-data ListDepsFormat = ListDepsText ListDepsFormatOpts
-                    | ListDepsTree ListDepsFormatOpts
-                    | ListDepsJSON
-
-data ListDepsOpts = ListDepsOpts
-    { listDepsFormat :: !ListDepsFormat
-    -- ^ Format of printing dependencies
-    , listDepsDotOpts :: !DotOpts
-    -- ^ The normal dot options.
-    }
+import           Stack.Constants ( wiredInPackages )
+import           Stack.DependencyGraph ( createPrunedDependencyGraph )
+import           Stack.Prelude
+import           Stack.Types.Compiler ( ActualCompiler )
+import           Stack.Types.DependencyTree ( DependencyGraph )
+import           Stack.Types.DotOpts ( DotOpts (..) )
+import           Stack.Types.Runner ( Runner )
 
 -- | Visualize the project's dependencies as a graphviz graph
-dot :: DotOpts -> RIO Runner ()
-dot dotOpts = do
-  (localNames, prunedGraph) <- createPrunedDependencyGraph dotOpts
-  printGraph dotOpts localNames prunedGraph
-
--- | Information about a package in the dependency graph, when available.
-data DotPayload = DotPayload
-  { payloadVersion :: Maybe Version
-  -- ^ The package version.
-  , payloadLicense :: Maybe (Either SPDX.License License)
-  -- ^ The license the package was released under.
-  , payloadLocation :: Maybe PackageLocation
-  -- ^ The location of the package.
-  } deriving (Eq, Show)
-
--- | Create the dependency graph and also prune it as specified in the dot
--- options. Returns a set of local names and a map from package names to
--- dependencies.
-createPrunedDependencyGraph :: DotOpts
-                            -> RIO Runner
-                                 (Set PackageName,
-                                  Map PackageName (Set PackageName, DotPayload))
-createPrunedDependencyGraph dotOpts = withDotConfig dotOpts $ do
-  localNames <- view $ buildConfigL.to (Map.keysSet . smwProject . bcSMWanted)
-  logDebug "Creating dependency graph"
-  resultGraph <- createDependencyGraph dotOpts
-  let pkgsToPrune = if dotIncludeBase dotOpts
-                       then dotPrune dotOpts
-                       else Set.insert "base" (dotPrune dotOpts)
-      prunedGraph = pruneGraph localNames pkgsToPrune resultGraph
-  logDebug "Returning pruned dependency graph"
-  pure (localNames, prunedGraph)
-
--- | Create the dependency graph, the result is a map from a package
--- name to a tuple of dependencies and payload if available. This
--- function mainly gathers the required arguments for
--- @resolveDependencies@.
-createDependencyGraph
-  :: DotOpts
-  -> RIO DotConfig (Map PackageName (Set PackageName, DotPayload))
-createDependencyGraph dotOpts = do
-  sourceMap <- view sourceMapL
-  locals <- for (toList $ smProject sourceMap) loadLocalPackage
-  let graph = Map.fromList $ projectPackageDependencies dotOpts (filter lpWanted locals)
-  globalDump <- view $ to dcGlobalDump
-  -- TODO: Can there be multiple entries for wired-in-packages? If so,
-  -- this will choose one arbitrarily..
-  let globalDumpMap = Map.fromList $ map (\dp -> (Stack.Prelude.pkgName (dpPackageIdent dp), dp)) globalDump
-      globalIdMap = Map.fromList $ map (\dp -> (dpGhcPkgId dp, dpPackageIdent dp)) globalDump
-  let depLoader = createDepLoader sourceMap globalDumpMap globalIdMap loadPackageDeps
-      loadPackageDeps name version loc flags ghcOptions cabalConfigOpts
-          -- Skip packages that can't be loaded - see
-          -- https://github.com/commercialhaskell/stack/issues/2967
-          | name `elem` [mkPackageName "rts", mkPackageName "ghc"] =
-              pure (Set.empty, DotPayload (Just version) (Just $ Right BSD3) Nothing)
-          | otherwise =
-              fmap (packageAllDeps &&& makePayload loc) (loadPackage loc flags ghcOptions cabalConfigOpts)
-  resolveDependencies (dotDependencyDepth dotOpts) graph depLoader
-  where makePayload loc pkg = DotPayload (Just $ packageVersion pkg) (Just $ packageLicense pkg) (Just $ PLImmutable loc)
-
-listDependencies
-  :: ListDepsOpts
-  -> RIO Runner ()
-listDependencies opts = do
-  let dotOpts = listDepsDotOpts opts
-  (pkgs, resultGraph) <- createPrunedDependencyGraph dotOpts
-  liftIO $ case listDepsFormat opts of
-      ListDepsTree treeOpts -> Text.putStrLn "Packages" >> printTree treeOpts dotOpts 0 [] (treeRoots opts pkgs) resultGraph
-      ListDepsJSON -> printJSON pkgs resultGraph
-      ListDepsText textOpts -> void (Map.traverseWithKey go (snd <$> resultGraph))
-        where go name payload = Text.putStrLn $ listDepsLine textOpts name payload
-
-data DependencyTree = DependencyTree (Set PackageName) (Map PackageName (Set PackageName, DotPayload))
-
-instance ToJSON DependencyTree where
-  toJSON (DependencyTree _ dependencyMap) =
-    toJSON $ foldToList dependencyToJSON dependencyMap
-
-foldToList :: (k -> a -> b) -> Map k a -> [b]
-foldToList f = Map.foldrWithKey (\k a bs -> bs ++ [f k a]) []
-
-dependencyToJSON :: PackageName -> (Set PackageName, DotPayload) -> Value
-dependencyToJSON pkg (deps, payload) =  let fieldsAlwaysPresent = [ "name" .= packageNameString pkg
-                                                                  , "license" .= licenseText payload
-                                                                  , "version" .= versionText payload
-                                                                  , "dependencies" .= Set.map packageNameString deps
-                                                                  ]
-                                            loc = catMaybes [("location" .=) . pkgLocToJSON <$> payloadLocation payload]
-                                        in object $ fieldsAlwaysPresent ++ loc
-
-pkgLocToJSON :: PackageLocation -> Value
-pkgLocToJSON (PLMutable (ResolvedPath _ dir)) = object [ "type" .= ("project package" :: Text)
-                                              , "url" .= ("file://" ++ Path.toFilePath dir)]
-pkgLocToJSON (PLImmutable (PLIHackage pkgid _ _)) = object [ "type" .= ("hackage" :: Text)
-                                                  , "url" .= ("https://hackage.haskell.org/package/" ++ display pkgid)]
-pkgLocToJSON (PLImmutable (PLIArchive archive _)) = let url = case archiveLocation archive of
-                                                                ALUrl u -> u
-                                                                ALFilePath (ResolvedPath _ path) -> Text.pack $ "file://" ++ Path.toFilePath path
-                                                    in object [ "type" .= ("archive" :: Text)
-                                                              , "url" .= url
-                                                              , "sha256" .= archiveHash archive
-                                                              , "size" .= archiveSize archive ]
-pkgLocToJSON (PLImmutable (PLIRepo repo _)) = object [ "type" .= case repoType repo of
-                                                                   RepoGit -> "git" :: Text
-                                                                   RepoHg -> "hg" :: Text
-                                                     , "url" .= repoUrl repo
-                                                     , "commit" .= repoCommit repo
-                                                     , "subdir" .= repoSubdir repo
-                                                     ]
-
-printJSON :: Set PackageName
-          -> Map PackageName (Set PackageName, DotPayload)
-          -> IO ()
-printJSON pkgs dependencyMap = LBC8.putStrLn $ encode $ DependencyTree pkgs dependencyMap
-
-treeRoots :: ListDepsOpts -> Set PackageName -> Set PackageName
-treeRoots opts projectPackages' =
-  let targets = dotTargets $ listDepsDotOpts opts
-   in if null targets
-        then projectPackages'
-        else Set.fromList $ map (mkPackageName . Text.unpack) targets
-
-printTree :: ListDepsFormatOpts
-          -> DotOpts
-          -> Int
-          -> [Int]
-          -> Set PackageName
-          -> Map PackageName (Set PackageName, DotPayload)
-          -> IO ()
-printTree opts dotOpts depth remainingDepsCounts packages dependencyMap =
-  F.sequence_ $ Seq.mapWithIndex go (toSeq packages)
-  where
-    toSeq = Seq.fromList . Set.toList
-    go index name = let newDepsCounts = remainingDepsCounts ++ [Set.size packages - index - 1]
-                     in
-                      case Map.lookup name dependencyMap of
-                        Just (deps, payload) -> do
-                          printTreeNode opts dotOpts depth newDepsCounts deps payload name
-                          if Just depth == dotDependencyDepth dotOpts
-                             then pure ()
-                             else printTree opts dotOpts (depth + 1) newDepsCounts deps dependencyMap
-                        -- TODO: Define this behaviour, maybe pure an error?
-                        Nothing -> pure ()
-
-printTreeNode :: ListDepsFormatOpts
-              -> DotOpts
-              -> Int
-              -> [Int]
-              -> Set PackageName
-              -> DotPayload
-              -> PackageName
-              -> IO ()
-printTreeNode opts dotOpts depth remainingDepsCounts deps payload name =
-  let remainingDepth = fromMaybe 999 (dotDependencyDepth dotOpts) - depth
-      hasDeps = not $ null deps
-   in Text.putStrLn $ treeNodePrefix "" remainingDepsCounts hasDeps  remainingDepth  <> " " <> listDepsLine opts name payload
-
-treeNodePrefix :: Text -> [Int] -> Bool -> Int -> Text
-treeNodePrefix t [] _ _      = t
-treeNodePrefix t [0] True  0 = t <> "└──"
-treeNodePrefix t [_] True  0 = t <> "├──"
-treeNodePrefix t [0] True  _ = t <> "└─┬"
-treeNodePrefix t [_] True  _ = t <> "├─┬"
-treeNodePrefix t [0] False _ = t <> "└──"
-treeNodePrefix t [_] False _ = t <> "├──"
-treeNodePrefix t (0:ns) d remainingDepth = treeNodePrefix (t <> "  ") ns d remainingDepth
-treeNodePrefix t (_:ns) d remainingDepth = treeNodePrefix (t <> "│ ") ns d remainingDepth
-
-listDepsLine :: ListDepsFormatOpts -> PackageName -> DotPayload -> Text
-listDepsLine opts name payload = Text.pack (packageNameString name) <> listDepsSep opts <> payloadText opts payload
-
-payloadText :: ListDepsFormatOpts -> DotPayload -> Text
-payloadText opts payload =
-  if listDepsLicense opts
-    then licenseText payload
-    else versionText payload
-
-licenseText :: DotPayload -> Text
-licenseText payload = maybe "<unknown>" (Text.pack . display . either licenseFromSPDX id) (payloadLicense payload)
-
-versionText :: DotPayload -> Text
-versionText payload = maybe "<unknown>" (Text.pack . display) (payloadVersion payload)
-
--- | @pruneGraph dontPrune toPrune graph@ prunes all packages in
--- @graph@ with a name in @toPrune@ and removes resulting orphans
--- unless they are in @dontPrune@
-pruneGraph :: (F.Foldable f, F.Foldable g, Eq a)
-           => f PackageName
-           -> g PackageName
-           -> Map PackageName (Set PackageName, a)
-           -> Map PackageName (Set PackageName, a)
-pruneGraph dontPrune names =
-  pruneUnreachable dontPrune . Map.mapMaybeWithKey (\pkg (pkgDeps,x) ->
-    if pkg `F.elem` names
-      then Nothing
-      else let filtered = Set.filter (\n -> n `F.notElem` names) pkgDeps
-           in if Set.null filtered && not (Set.null pkgDeps)
-                then Nothing
-                else Just (filtered,x))
-
--- | Make sure that all unreachable nodes (orphans) are pruned
-pruneUnreachable :: (Eq a, F.Foldable f)
-                 => f PackageName
-                 -> Map PackageName (Set PackageName, a)
-                 -> Map PackageName (Set PackageName, a)
-pruneUnreachable dontPrune = fixpoint prune
-  where fixpoint :: Eq a => (a -> a) -> a -> a
-        fixpoint f v = if f v == v then v else fixpoint f (f v)
-        prune graph' = Map.filterWithKey (\k _ -> reachable k) graph'
-          where reachable k = k `F.elem` dontPrune || k `Set.member` reachables
-                reachables = F.fold (fst <$> graph')
-
-
--- | Resolve the dependency graph up to (Just depth) or until fixpoint is reached
-resolveDependencies :: (Applicative m, Monad m)
-                    => Maybe Int
-                    -> Map PackageName (Set PackageName, DotPayload)
-                    -> (PackageName -> m (Set PackageName, DotPayload))
-                    -> m (Map PackageName (Set PackageName, DotPayload))
-resolveDependencies (Just 0) graph _ = pure graph
-resolveDependencies limit graph loadPackageDeps = do
-  let values = Set.unions (fst <$> Map.elems graph)
-      keys = Map.keysSet graph
-      next = Set.difference values keys
-  if Set.null next
-     then pure graph
-     else do
-       x <- T.traverse (\name -> (name,) <$> loadPackageDeps name) (F.toList next)
-       resolveDependencies (subtract 1 <$> limit)
-                      (Map.unionWith unifier graph (Map.fromList x))
-                      loadPackageDeps
-  where unifier (pkgs1,v1) (pkgs2,_) = (Set.union pkgs1 pkgs2, v1)
-
--- | Given a SourceMap and a dependency loader, load the set of dependencies for a package
-createDepLoader :: SourceMap
-                -> Map PackageName DumpPackage
-                -> Map GhcPkgId PackageIdentifier
-                -> (PackageName -> Version -> PackageLocationImmutable ->
-                    Map FlagName Bool -> [Text] -> [Text] -> RIO DotConfig (Set PackageName, DotPayload))
-                -> PackageName
-                -> RIO DotConfig (Set PackageName, DotPayload)
-createDepLoader sourceMap globalDumpMap globalIdMap loadPackageDeps pkgName = do
-  fromMaybe noDepsErr
-    (projectPackageDeps <|> dependencyDeps <|> globalDeps)
-  where
-    projectPackageDeps =
-      loadDeps <$> Map.lookup pkgName (smProject sourceMap)
-      where
-        loadDeps pp = do
-          pkg <- loadCommonPackage (ppCommon pp)
-          pure (packageAllDeps pkg, payloadFromLocal pkg Nothing)
-
-    dependencyDeps =
-      loadDeps <$> Map.lookup pkgName (smDeps sourceMap)
-      where
-        loadDeps DepPackage{dpLocation=PLMutable dir} = do
-              pp <- mkProjectPackage YesPrintWarnings dir False
-              pkg <- loadCommonPackage (ppCommon pp)
-              pure (packageAllDeps pkg, payloadFromLocal pkg (Just $ PLMutable dir))
-
-        loadDeps dp@DepPackage{dpLocation=PLImmutable loc} = do
-          let common = dpCommon dp
-          gpd <- liftIO $ cpGPD common
-          let PackageIdentifier name version = PD.package $ PD.packageDescription gpd
-              flags = cpFlags common
-              ghcOptions = cpGhcOptions common
-              cabalConfigOpts = cpCabalConfigOpts common
-          assert (pkgName == name) (loadPackageDeps pkgName version loc flags ghcOptions cabalConfigOpts)
-
-    -- If package is a global package, use info from ghc-pkg (#4324, #3084)
-    globalDeps =
-      pure . getDepsFromDump <$> Map.lookup pkgName globalDumpMap
-      where
-        getDepsFromDump dump =
-          (Set.fromList deps, payloadFromDump dump)
-          where
-            deps = map ghcIdToPackageName (dpDepends dump)
-            ghcIdToPackageName depId =
-              let errText = "Invariant violated: Expected to find "
-              in maybe (error (errText ++ ghcPkgIdString depId ++ " in global DB"))
-                 Stack.Prelude.pkgName
-                 (Map.lookup depId globalIdMap)
-
-    noDepsErr = error ("Invariant violated: The '" ++ packageNameString pkgName
-                ++ "' package was not found in any of the dependency sources")
-
-    payloadFromLocal pkg loc = DotPayload (Just $ packageVersion pkg) (Just $ packageLicense pkg) loc
-    payloadFromDump dp = DotPayload (Just $ pkgVersion $ dpPackageIdent dp) (Right <$> dpLicense dp) Nothing
-
--- | Resolve the direct (depth 0) external dependencies of the given local packages (assumed to come from project packages)
-projectPackageDependencies :: DotOpts -> [LocalPackage] -> [(PackageName, (Set PackageName, DotPayload))]
-projectPackageDependencies dotOpts locals =
-    map (\lp -> let pkg = localPackageToPackage lp
-                    pkgDir = Path.parent $ lpCabalFile lp
-                    loc = PLMutable $ ResolvedPath (RelFilePath "N/A") pkgDir
-                 in (packageName pkg, (deps pkg, lpPayload pkg loc)))
-        locals
-  where deps pkg =
-          if dotIncludeExternal dotOpts
-            then Set.delete (packageName pkg) (packageAllDeps pkg)
-            else Set.intersection localNames (packageAllDeps pkg)
-        localNames = Set.fromList $ map (packageName . lpPackage) locals
-        lpPayload pkg loc = DotPayload (Just $ packageVersion pkg) (Just $ packageLicense pkg) (Just loc)
-
--- | Print a graphviz graph of the edges in the Map and highlight the given local packages
-printGraph :: (Applicative m, MonadIO m)
-           => DotOpts
-           -> Set PackageName -- ^ all locals
-           -> Map PackageName (Set PackageName, DotPayload)
-           -> m ()
-printGraph dotOpts locals graph = do
+dotCmd :: DotOpts -> RIO Runner ()
+dotCmd dotOpts = do
+  (compiler, localNames, prunedGraph) <- createPrunedDependencyGraph dotOpts
+  printGraph dotOpts compiler localNames prunedGraph
+
+-- | Print a graphviz graph of the edges in the Map and highlight the given
+-- project packages
+printGraph ::
+     (Applicative m, MonadIO m)
+  => DotOpts
+  -> ActualCompiler
+  -> Set PackageName -- ^ All project packages.
+  -> DependencyGraph
+  -> m ()
+printGraph dotOpts compiler locals graph = do
   liftIO $ Text.putStrLn "strict digraph deps {"
   printLocalNodes dotOpts filteredLocals
-  printLeaves graph
-  void (Map.traverseWithKey printEdges (fst <$> graph))
+  printLeaves compiler graph
+  let allNodes = Map.keysSet graph
+  void (Map.traverseWithKey (printEdges allNodes) (fst <$> graph))
   liftIO $ Text.putStrLn "}"
-  where filteredLocals = Set.filter (\local' ->
-          local' `Set.notMember` dotPrune dotOpts) locals
-
--- | Print the local nodes with a different style depending on options
-printLocalNodes :: (F.Foldable t, MonadIO m)
-                => DotOpts
-                -> t PackageName
-                -> m ()
-printLocalNodes dotOpts locals = liftIO $ Text.putStrLn (Text.intercalate "\n" lpNodes)
-  where applyStyle :: Text -> Text
-        applyStyle n = if dotIncludeExternal dotOpts
-                         then n <> " [style=dashed];"
-                         else n <> " [style=solid];"
-        lpNodes :: [Text]
-        lpNodes = map (applyStyle . nodeName) (F.toList locals)
-
--- | Print nodes without dependencies
-printLeaves :: MonadIO m
-            => Map PackageName (Set PackageName, DotPayload)
-            -> m ()
-printLeaves = F.mapM_ printLeaf . Map.keysSet . Map.filter Set.null . fmap fst
-
--- | @printDedges p ps@ prints an edge from p to every ps
-printEdges :: MonadIO m => PackageName -> Set PackageName -> m ()
-printEdges package deps = F.forM_ deps (printEdge package)
+ where
+  filteredLocals =
+    Set.filter (\local' -> local' `Set.notMember` dotOpts.prune) locals
+
+-- | Print the project packages nodes with a different style, depending on
+-- options
+printLocalNodes ::
+     (F.Foldable t, MonadIO m)
+  => DotOpts
+  -> t PackageName
+  -> m ()
+printLocalNodes dotOpts locals =
+  liftIO $ Text.putStrLn (Text.intercalate "\n" lpNodes)
+ where
+  applyStyle :: Text -> Text
+  applyStyle n = if dotOpts.includeExternal
+                   then n <> " [style=dashed];"
+                   else n <> " [style=solid];"
+  lpNodes :: [Text]
+  lpNodes = map (applyStyle . nodeName) (F.toList locals)
+
+-- | Print relevant nodes, based on their relevant attributes.
+printLeaves :: MonadIO m => ActualCompiler -> DependencyGraph -> m ()
+printLeaves compiler graph =
+  F.mapM_ printLeaf (Map.mapWithKey nodeAttributes graph)
+ where
+  allNodes = Map.keysSet graph
+  hasNoNodes = F.all (`Set.notMember` allNodes)
+  nodeAttributes package (deps, _) =
+    let isWiredInPackage = isWiredIn compiler package
+        isBottomRow = hasNoNodes deps
+    in  (package, isWiredInPackage, isBottomRow)
+
+-- | @printDedges ps p ps'@ prints an edge from @p@ to every @ps'@, if it is a
+-- member of @ps@.
+printEdges ::
+     MonadIO m
+  => Set PackageName
+     -- ^ The nodes in the graph.
+  -> PackageName
+     -- ^ The node in question.
+  -> Set PackageName
+     -- ^ The dependencies of the node in question.
+  -> m ()
+printEdges nodes package deps = F.forM_ deps $ \dep ->
+  when (dep `elem` nodes) $ printEdge package dep
 
 -- | Print an edge between the two package names
 printEdge :: MonadIO m => PackageName -> PackageName -> m ()
-printEdge from to' = liftIO $ Text.putStrLn (Text.concat [ nodeName from, " -> ", nodeName to', ";"])
+printEdge from to' =
+  liftIO $ Text.putStrLn (Text.concat [ nodeName from
+                                      , " -> "
+                                      , nodeName to'
+                                      , ";" ])
 
 -- | Convert a package name to a graph node name.
 nodeName :: PackageName -> Text
 nodeName name = "\"" <> Text.pack (packageNameString name) <> "\""
 
--- | Print a node with no dependencies
-printLeaf :: MonadIO m => PackageName -> m ()
-printLeaf package = liftIO . Text.putStrLn . Text.concat $
-  if isWiredIn package
-    then ["{rank=max; ", nodeName package, " [shape=box]; };"]
-    else ["{rank=max; ", nodeName package, "; };"]
-
--- | Check if the package is wired in (shipped with) ghc
-isWiredIn :: PackageName -> Bool
-isWiredIn = (`Set.member` wiredInPackages)
-
-localPackageToPackage :: LocalPackage -> Package
-localPackageToPackage lp =
-  fromMaybe (lpPackage lp) (lpTestBench lp)
-
--- Plumbing for --test and --bench flags
-withDotConfig
-    :: DotOpts
-    -> RIO DotConfig a
-    -> RIO Runner a
-withDotConfig opts inner =
-  local (over globalOptsL modifyGO) $
-    if dotGlobalHints opts
-      then withConfig NoReexec $ withBuildConfig withGlobalHints
-      else withConfig YesReexec withReal
-  where
-    withGlobalHints = do
-      bconfig <- view buildConfigL
-      globals <- globalsFromHints $ smwCompiler $ bcSMWanted bconfig
-      fakeGhcPkgId <- parseGhcPkgId "ignored"
-      actual <- either throwIO pure $
-                wantedToActual $ smwCompiler $
-                bcSMWanted bconfig
-      let smActual = SMActual
-            { smaCompiler = actual
-            , smaProject = smwProject $ bcSMWanted bconfig
-            , smaDeps = smwDeps $ bcSMWanted bconfig
-            , smaGlobal = Map.mapWithKey toDump globals
-            }
-          toDump :: PackageName -> Version -> DumpPackage
-          toDump name version = DumpPackage
-            { dpGhcPkgId = fakeGhcPkgId
-            , dpPackageIdent = PackageIdentifier name version
-            , dpParentLibIdent = Nothing
-            , dpLicense = Nothing
-            , dpLibDirs = []
-            , dpLibraries = []
-            , dpHasExposedModules = True
-            , dpExposedModules = mempty
-            , dpDepends = []
-            , dpHaddockInterfaces = []
-            , dpHaddockHtml = Nothing
-            , dpIsExposed = True
-            }
-          actualPkgs = Map.keysSet (smaDeps smActual) <>
-                       Map.keysSet (smaProject smActual)
-          prunedActual = smActual { smaGlobal = pruneGlobals (smaGlobal smActual) actualPkgs }
-      targets <- parseTargets NeedTargets False boptsCLI prunedActual
-      logDebug "Loading source map"
-      sourceMap <- loadSourceMap targets boptsCLI smActual
-      let dc = DotConfig
-                  { dcBuildConfig = bconfig
-                  , dcSourceMap = sourceMap
-                  , dcGlobalDump = toList $ smaGlobal smActual
-                  }
-      logDebug "DotConfig fully loaded"
-      runRIO dc inner
-
-    withReal = withEnvConfig NeedTargets boptsCLI $ do
-      envConfig <- ask
-      let sourceMap = envConfigSourceMap envConfig
-      installMap <- toInstallMap sourceMap
-      (_, globalDump, _, _) <- getInstalled installMap
-      let dc = DotConfig
-            { dcBuildConfig = envConfigBuildConfig envConfig
-            , dcSourceMap = sourceMap
-            , dcGlobalDump = globalDump
-            }
-      runRIO dc inner
-
-    boptsCLI = defaultBuildOptsCLI
-        { boptsCLITargets = dotTargets opts
-        , boptsCLIFlags = dotFlags opts
-        }
-    modifyGO =
-        (if dotTestTargets opts then set (globalOptsBuildOptsMonoidL.buildOptsMonoidTestsL) (Just True) else id) .
-        (if dotBenchTargets opts then set (globalOptsBuildOptsMonoidL.buildOptsMonoidBenchmarksL) (Just True) else id)
-
-data DotConfig = DotConfig
-  { dcBuildConfig :: !BuildConfig
-  , dcSourceMap :: !SourceMap
-  , dcGlobalDump :: ![DumpPackage]
-  }
-instance HasLogFunc DotConfig where
-  logFuncL = runnerL.logFuncL
-instance HasPantryConfig DotConfig where
-  pantryConfigL = configL.pantryConfigL
-instance HasTerm DotConfig where
-  useColorL = runnerL.useColorL
-  termWidthL = runnerL.termWidthL
-instance HasStylesUpdate DotConfig where
-  stylesUpdateL = runnerL.stylesUpdateL
-instance HasGHCVariant DotConfig
-instance HasPlatform DotConfig
-instance HasRunner DotConfig where
-  runnerL = configL.runnerL
-instance HasProcessContext DotConfig where
-  processContextL = runnerL.processContextL
-instance HasConfig DotConfig
-instance HasBuildConfig DotConfig where
-  buildConfigL = lens dcBuildConfig (\x y -> x { dcBuildConfig = y })
-instance HasSourceMap DotConfig where
-  sourceMapL = lens dcSourceMap (\x y -> x { dcSourceMap = y })
+-- | Print a node if it (a) is a GHC wired-in package or (b) has no dependencies
+-- that are also nodes.
+printLeaf ::
+     MonadIO m
+  =>  ( PackageName
+      , Bool
+        -- Is package a GHC wired-in package?
+      , Bool
+        -- Does package have no dependencies that are are also nodes in the
+        -- graph?
+      )
+  -> m ()
+printLeaf (package, isWiredInPackage, isBottomRow) =
+  when (isWiredInPackage || isBottomRow) $
+    liftIO . Text.putStrLn . Text.concat $
+         [ "{"]
+      <> [ "rank=max; " | isBottomRow ]
+      <> [ nodeName package ]
+      <> [ " [shape=box]" | isWiredInPackage ]
+      <> [ "; };" ]
+
+-- | Check if the package is a GHC wired-in package
+isWiredIn :: ActualCompiler -> PackageName -> Bool
+isWiredIn compiler package =
+  package `Set.member` wiredInPackages compiler
diff --git a/src/Stack/Eval.hs b/src/Stack/Eval.hs
new file mode 100644
index 0000000000..5b63a72de4
--- /dev/null
+++ b/src/Stack/Eval.hs
@@ -0,0 +1,42 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+
+{-|
+Module      : Stack.Eval
+Description : Types and functions related to Stack's @eval@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @eval@ command.
+-}
+
+module Stack.Eval
+  ( EvalOpts (..)
+  , evalCmd
+  ) where
+
+import           Stack.Exec
+                   ( ExecOpts (..), ExecOptsExtra, SpecialExecCmd (..)
+                   , execCmd
+                   )
+import           Stack.Prelude
+import           Stack.Types.Runner ( Runner )
+
+-- | Type representing command line options for the @stack eval@ command.
+data EvalOpts = EvalOpts
+  { arg :: !String
+  , extra :: !ExecOptsExtra
+  }
+  deriving Show
+
+-- | Function underlying the @stack eval@ command. Evaluate some Haskell code
+-- inline.
+evalCmd :: EvalOpts -> RIO Runner ()
+evalCmd eval = execCmd execOpts
+ where
+  execOpts = ExecOpts
+    { cmd = ExecGhc
+    , args = ["-e", eval.arg]
+    , extra = eval.extra
+    }
diff --git a/src/Stack/Exec.hs b/src/Stack/Exec.hs
new file mode 100644
index 0000000000..341673c68f
--- /dev/null
+++ b/src/Stack/Exec.hs
@@ -0,0 +1,227 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Exec
+Description : Types and function related to Stack's @exec@, @ghc@, @run@,
+              @runghc@ and @runhaskell@ commands.
+License     : BSD-3-Clause
+
+Types and function related to Stack's @exec@, @ghc@, @run@, @runghc@ and
+@runhaskell@ commands.
+-}
+
+module Stack.Exec
+  ( ExecOpts (..)
+  , SpecialExecCmd (..)
+  , ExecOptsExtra (..)
+  , execCmd
+  ) where
+
+import qualified Data.List as L
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import qualified Data.Text as T
+import           Distribution.Types.PackageName ( unPackageName )
+import           RIO.NonEmpty ( head, nonEmpty )
+import           RIO.Process ( exec )
+import           Stack.Build ( build )
+import           Stack.Build.Target
+                   ( NeedTargets (..), RawTarget (..), parseRawTarget )
+import           Stack.GhcPkg ( findGhcPkgField )
+import           Stack.Setup ( withNewLocalBuildTargets )
+import           Stack.Prelude
+import           Stack.Runners ( ShouldReexec (..), withConfig, withEnvConfig )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.BuildOptsCLI
+                   ( BuildOptsCLI (..), defaultBuildOptsCLI )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), HasCompiler (..), getGhcPkgExe )
+import           Stack.Types.ComponentUtils
+                   ( unqualCompFromString, unqualCompToText )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.EnvConfig ( EnvConfig )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
+import           Stack.Types.NamedComponent ( NamedComponent (..), isCExe )
+import           Stack.Types.Runner ( Runner )
+import           Stack.Types.SourceMap ( SMWanted (..), ppComponents )
+import           System.Directory ( withCurrentDirectory )
+import           System.FilePath ( isValid )
+
+-- | Type representing exceptions thrown by functions in the "Stack.Exec"
+-- module.
+newtype ExecException
+  = InvalidPathForExec FilePath
+  deriving Show
+
+instance Exception ExecException where
+  displayException (InvalidPathForExec path) = concat
+    [ "Error: [S-1541]\n"
+    , "Got an invalid '--cwd' argument for 'stack exec' ("
+    , path
+    , ")."
+    ]
+
+-- | Type representing \'pretty\' exceptions thrown by functions in the
+-- "Stack.Exec" module.
+data ExecPrettyException
+  = PackageIdNotFoundBug !String
+  | ExecutableToRunNotFound
+  | NoPackageIdReportedBug
+  | InvalidExecTargets ![Text]
+  deriving Show
+
+instance Pretty ExecPrettyException where
+  pretty (PackageIdNotFoundBug name) = bugPrettyReport "[S-8251]" $
+    fillSep
+      [ flow "Could not find the package id of the package"
+      , style Target (fromString name) <> "."
+      ]
+  pretty ExecutableToRunNotFound =
+       "[S-2483]"
+    <> line
+    <> flow "No executables found."
+  pretty NoPackageIdReportedBug = bugPrettyReport "S-8600" $
+    flow "execCmd: findGhcPkgField returned Just \"\"."
+  pretty (InvalidExecTargets targets) =
+       "[S-7371]"
+    <> line
+    <> fillSep
+         [ flow "The following are invalid"
+         , style Shell "--package"
+         , "values for"
+         , style Shell (flow "stack ghc") <> ","
+         , style Shell (flow "stack runghc") <> ","
+         , "or"
+         , style Shell (flow "stack runhaskell") <> ":"
+         ]
+    <> line
+    <> bulletedList (map (style Target . string . T.unpack) targets )
+
+instance Exception ExecPrettyException
+
+-- | Type representing Stack's execution commands.
+data SpecialExecCmd
+  = ExecCmd String
+    -- ^ @stack exec@ command.
+  | ExecRun
+    -- ^ @stack run@ command.
+  | ExecGhc
+    -- ^ @stack ghc@ command.
+  | ExecRunGhc
+    -- ^ @stack runghc@ or @stack runhaskell@ command.
+  deriving (Eq, Show)
+
+-- | Type representing extra Stack options for Stack's execution commands.
+data ExecOptsExtra = ExecOptsExtra
+  { envSettings :: !EnvSettings
+  , packages :: ![String]
+  , rtsOptions :: ![String]
+  , cwd :: !(Maybe FilePath)
+  }
+  deriving Show
+
+-- | Type representing options for Stack's execution commands.
+data ExecOpts = ExecOpts
+  { cmd :: !SpecialExecCmd
+  , args :: ![String]
+  , extra :: !ExecOptsExtra
+  }
+  deriving Show
+
+-- | Type representing valid targets for @--package@ option.
+data ExecTarget = ExecTarget PackageName (Maybe Version)
+
+-- | The function underlying Stack's @exec@, @ghc@, @run@, @runghc@ and
+-- @runhaskell@ commands. Execute a command.
+execCmd :: ExecOpts -> RIO Runner ()
+execCmd opts =
+  withConfig YesReexec $ withEnvConfig AllowNoTargets boptsCLI $ do
+    let (errs, execTargets) = partitionEithers $ map fromTarget targets
+    unless (null errs) $ prettyThrowM $ InvalidExecTargets errs
+    unless (null execTargets) $ build Nothing
+
+    config <- view configL
+    menv <- liftIO $ config.processContextSettings eo.envSettings
+    withProcessContext menv $ do
+      -- Add RTS options to arguments
+      let argsWithRts args = if null eo.rtsOptions
+                  then args :: [String]
+                  else args ++ ["+RTS"] ++ eo.rtsOptions ++ ["-RTS"]
+      (cmd, args) <- case (opts.cmd, argsWithRts opts.args) of
+        (ExecCmd cmd, args) -> pure (cmd, args)
+        (ExecRun, args) -> getRunCmd args
+        (ExecGhc, args) -> getGhcCmd execTargets args
+        (ExecRunGhc, args) -> getRunGhcCmd execTargets args
+
+      runWithPath eo.cwd $ exec cmd args
+ where
+  eo = opts.extra
+
+  targets = concatMap (T.words . T.pack) eo.packages
+  boptsCLI = defaultBuildOptsCLI { targetsCLI = targets }
+
+  fromTarget :: Text -> Either Text ExecTarget
+  fromTarget target =
+    case parseRawTarget target >>= toExecTarget of
+      Nothing -> Left target
+      Just execTarget -> Right execTarget
+
+  toExecTarget :: RawTarget -> Maybe ExecTarget
+  toExecTarget (RTPackageComponent _ _) = Nothing
+  toExecTarget (RTComponent _) = Nothing
+  toExecTarget (RTPackage name) = Just $ ExecTarget name Nothing
+  toExecTarget (RTPackageIdentifier (PackageIdentifier name pkgId)) =
+    Just $ ExecTarget name (Just pkgId)
+
+  -- return the package-id of the first package in GHC_PACKAGE_PATH
+  getPkgId (ExecTarget pkgName _) = do
+    let name = unPackageName pkgName
+    pkg <- getGhcPkgExe
+    findGhcPkgField pkg [] name "id" >>= \case
+      Just i -> maybe
+        (prettyThrowIO NoPackageIdReportedBug)
+        (pure . head)
+        (nonEmpty $ words $ T.unpack i)
+      -- should never happen as we have already installed the packages
+      _      -> prettyThrowIO (PackageIdNotFoundBug name)
+
+  getPkgOpts pkgs =
+    map ("-package-id=" ++) <$> mapM getPkgId pkgs
+
+  getRunCmd args = do
+    packages <- view $ buildConfigL . to (.smWanted.project)
+    pkgComponents <- for (Map.elems packages) ppComponents
+    let executables = concatMap (filter isCExe . Set.toList) pkgComponents
+        (exe, args') = case args of
+          [] -> (firstExe, args)
+          x:xs -> let matchesExecutable y = y == CExe (unqualCompFromString x)
+                  in  case L.find matchesExecutable executables of
+                        Nothing -> (firstExe, args)
+                        argExe -> (argExe, xs)
+         where
+          firstExe = listToMaybe executables
+    case exe of
+      Just (CExe exe') -> do
+        let textExeName = unqualCompToText exe'
+        withNewLocalBuildTargets [T.cons ':' textExeName] $ build Nothing
+        pure (T.unpack textExeName, args')
+      _ -> prettyThrowIO ExecutableToRunNotFound
+
+  getGhcCmd pkgs args = do
+    pkgopts <- getPkgOpts pkgs
+    compiler <- view $ compilerPathsL . to (.compiler)
+    pure (toFilePath compiler, pkgopts ++ args)
+
+  getRunGhcCmd pkgs args = do
+    pkgopts <- getPkgOpts pkgs
+    interpret <- view $ compilerPathsL . to (.interpreter)
+    pure (toFilePath interpret, pkgopts ++ args)
+
+  runWithPath :: Maybe FilePath -> RIO EnvConfig () -> RIO EnvConfig ()
+  runWithPath path callback = case path of
+    Nothing -> callback
+    Just p | not (isValid p) -> throwIO $ InvalidPathForExec p
+    Just p -> withUnliftIO $ \ul -> withCurrentDirectory p $ unliftIO ul callback
diff --git a/src/Stack/FileWatch.hs b/src/Stack/FileWatch.hs
index 29decf5c0b..9a8a0c3b2a 100644
--- a/src/Stack/FileWatch.hs
+++ b/src/Stack/FileWatch.hs
@@ -1,132 +1,219 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TupleSections     #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.FileWatch
+License     : BSD-3-Clause
+-}
 
 module Stack.FileWatch
-    ( fileWatch
-    , fileWatchPoll
-    ) where
+  ( WatchMode (WatchModePoll)
+  , fileWatch
+  , fileWatchPoll
+  ) where
 
-import Control.Concurrent.STM (check)
-import Stack.Prelude
+import           Control.Concurrent.STM ( check )
+import qualified Data.Map.Merge.Strict as Map
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
-import GHC.IO.Exception
-import Path
-import System.FSNotify
-import System.IO (getLine)
-import RIO.PrettyPrint hiding (line)
-
-fileWatch
-  :: (HasLogFunc env, HasTerm env)
-  => ((Set (Path Abs File) -> IO ()) -> RIO env ())
+import qualified Data.Text as T
+import           GHC.IO.Exception
+                   ( IOErrorType (InvalidArgument), IOException (..) )
+import           Path ( fileExtension, parent )
+import           Path.IO ( doesFileExist, executable, getPermissions )
+import           RIO.Process
+                   ( EnvVars, HasProcessContext (..), proc, runProcess
+                   , withModifyEnvVars
+                   )
+import           System.Permissions ( osIsWindows )
+import           Stack.Prelude
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.Runner ( HasRunner (..), Runner (..) )
+import           System.FSNotify
+                   ( WatchConfig, WatchMode (..), confWatchMode, defaultConfig
+                   , eventPath, watchDir, withManagerConf
+                   )
+import           System.IO ( getLine )
+
+fileWatch ::
+     (HasConfig env, HasTerm env)
+  => ((Set (Path Abs File) -> IO ()) -> RIO Runner ())
   -> RIO env ()
 fileWatch = fileWatchConf defaultConfig
 
-fileWatchPoll
-  :: (HasLogFunc env, HasTerm env)
-  => ((Set (Path Abs File) -> IO ()) -> RIO env ())
+fileWatchPoll ::
+     (HasConfig env, HasTerm env)
+  => ((Set (Path Abs File) -> IO ()) -> RIO Runner ())
   -> RIO env ()
-fileWatchPoll = fileWatchConf $ defaultConfig { confUsePolling = True }
+fileWatchPoll =
+  fileWatchConf $ defaultConfig { confWatchMode = WatchModePoll 1000000 }
 
 -- | Run an action, watching for file changes
 --
 -- The action provided takes a callback that is used to set the files to be
 -- watched. When any of those files are changed, we rerun the action again.
-fileWatchConf
-  :: (HasLogFunc env, HasTerm env)
+fileWatchConf ::
+     (HasConfig env, HasTerm env)
   => WatchConfig
-  -> ((Set (Path Abs File) -> IO ()) -> RIO env ())
+  -> ((Set (Path Abs File) -> IO ()) -> RIO Runner ())
   -> RIO env ()
-fileWatchConf cfg inner = withRunInIO $ \run -> withManagerConf cfg $ \manager -> do
+fileWatchConf cfg inner = do
+  runner <- view runnerL
+  mHook <- view $ configL . to (.fileWatchHook)
+  withRunInIO $ \run -> withManagerConf cfg $ \manager -> do
     allFiles <- newTVarIO Set.empty
     dirtyVar <- newTVarIO True
     watchVar <- newTVarIO Map.empty
 
     let onChange event = atomically $ do
-            files <- readTVar allFiles
-            when (eventPath event `Set.member` files) (writeTVar dirtyVar True)
+          files <- readTVar allFiles
+          when (eventPath event `Set.member` files) (writeTVar dirtyVar True)
 
         setWatched :: Set (Path Abs File) -> IO ()
         setWatched files = do
-            atomically $ writeTVar allFiles $ Set.map toFilePath files
-            watch0 <- readTVarIO watchVar
-            let actions = Map.mergeWithKey
-                    keepListening
-                    stopListening
-                    startListening
-                    watch0
-                    newDirs
-            watch1 <- forM (Map.toList actions) $ \(k, mmv) -> do
-                mv <- mmv
-                pure $
-                    case mv of
-                        Nothing -> Map.empty
-                        Just v -> Map.singleton k v
-            atomically $ writeTVar watchVar $ Map.unions watch1
-          where
-            newDirs = Map.fromList $ map (, ())
-                    $ Set.toList
-                    $ Set.map parent files
-
-            keepListening _dir listen () = Just $ pure $ Just listen
-            stopListening = Map.map $ \f -> do
-                () <- f `catch` \ioe ->
-                    -- Ignore invalid argument error - it can happen if
-                    -- the directory is removed.
-                    case ioe_type ioe of
-                        InvalidArgument -> pure ()
-                        _ -> throwIO ioe
-                pure Nothing
-            startListening = Map.mapWithKey $ \dir () -> do
-                let dir' = fromString $ toFilePath dir
-                listen <- watchDir manager dir' (const True) onChange
-                pure $ Just listen
+          atomically $ writeTVar allFiles $ Set.map toFilePath files
+          watch0 <- readTVarIO watchVar
+          let actions = Map.merge
+                (Map.mapMissing stopListening)
+                (Map.mapMissing startListening)
+                (Map.zipWithMatched keepListening)
+                watch0
+                newDirs
+          watch1 <- forM (Map.toList actions) $ \(k, mmv) ->
+            mmv <&> \case
+              Nothing -> Map.empty
+              Just v -> Map.singleton k v
+          atomically $ writeTVar watchVar $ Map.unions watch1
+         where
+          newDirs = Map.fromList $ map (, ())
+                  $ Set.toList
+                  $ Set.map parent files
+
+          keepListening _dir listen () = pure $ Just listen
+          stopListening _ f = do
+            () <- f `catch` \ioe ->
+              -- Ignore invalid argument error - it can happen if
+              -- the directory is removed.
+              case ioe_type ioe of
+                InvalidArgument -> pure ()
+                _ -> throwIO ioe
+            pure Nothing
+          startListening dir () = do
+            let dir' = fromString $ toFilePath dir
+            listen <- watchDir manager dir' (const True) onChange
+            pure $ Just listen
 
     let watchInput = do
-            line <- getLine
-            unless (line == "quit") $ do
-                run $ case line of
-                    "help" -> do
-                        logInfo ""
-                        logInfo "help: display this help"
-                        logInfo "quit: exit"
-                        logInfo "build: force a rebuild"
-                        logInfo "watched: display watched files"
-                    "build" -> atomically $ writeTVar dirtyVar True
-                    "watched" -> do
-                        watch <- readTVarIO allFiles
-                        mapM_ (logInfo . fromString) (Set.toList watch)
-                    "" -> atomically $ writeTVar dirtyVar True
-                    _ -> logInfo $
-                        "Unknown command: " <>
-                        displayShow line <>
-                        ". Try 'help'"
-
-                watchInput
+          l <- getLine
+          unless (l == "quit") $ do
+            run $ case l of
+              "help" -> do
+                prettyInfo $
+                     line
+                  <> fillSep
+                       [ style Shell "help" <> ":"
+                       , flow "display this help."
+                       ]
+                  <> line
+                  <> fillSep
+                       [ style Shell "quit" <> ":"
+                       , "exit."
+                       ]
+                  <> line
+                  <> fillSep
+                       [ style Shell "build" <> ":"
+                       , flow "force a rebuild."
+                       ]
+                  <> line
+                  <> fillSep
+                       [ style Shell "watched" <> ":"
+                       , flow "display watched files."
+                       ]
+              "build" -> atomically $ writeTVar dirtyVar True
+              "watched" -> do
+                watch <- readTVarIO allFiles
+                mapM_ (prettyInfo . style File . fromString) (Set.toList watch)
+              "" -> atomically $ writeTVar dirtyVar True
+              _ -> prettyInfoL
+                     [ flow "Unknown command:"
+                     , style Shell (fromString l) <> "."
+                     , "Try"
+                     , style Shell "help" <> "."
+                     ]
+
+            watchInput
 
     race_ watchInput $ run $ forever $ do
-        atomically $ do
-            dirty <- readTVar dirtyVar
-            check dirty
-
-        eres <- tryAny $ inner setWatched
-
-        -- Clear dirtiness flag after the build to avoid an infinite
-        -- loop caused by the build itself triggering dirtiness. This
-        -- could be viewed as a bug, since files changed during the
-        -- build will not trigger an extra rebuild, but overall seems
-        -- like better behavior. See
-        -- https://github.com/commercialhaskell/stack/issues/822
-        atomically $ writeTVar dirtyVar False
-
-        prettyInfo $
-          case eres of
+      atomically $ do
+        dirty <- readTVar dirtyVar
+        check dirty
+
+      eres <- tryAny $ runRIO runner (inner setWatched)
+
+      -- Clear dirtiness flag after the build to avoid an infinite loop caused
+      -- by the build itself triggering dirtiness. This could be viewed as a
+      -- bug, since files changed during the build will not trigger an extra
+      -- rebuild, but overall seems like better behavior. See
+      -- https://github.com/commercialhaskell/stack/issues/822
+      atomically $ writeTVar dirtyVar False
+
+      let defaultAction = case eres of
             Left e ->
-                let theStyle = case fromException e of
-                        Just ExitSuccess -> Good
-                        _ -> Error
-                 in style theStyle $ fromString $ show e
-            _ -> style Good "Success! Waiting for next file change."
+              case fromException e of
+                Just ExitSuccess ->
+                  prettyInfo $ style Good $ fromString $ displayException e
+                _ -> case fromException e :: Maybe PrettyException of
+                  Just pe -> prettyError $ pretty pe
+                  _ -> prettyInfo $ style Error $ fromString $ displayException e
+            _ -> prettyInfo $
+                   style Good (flow "Success! Waiting for next file change.")
+
+      case mHook of
+        Nothing -> defaultAction
+        Just hook -> do
+          hookIsExecutable <- handleIO (\_ -> pure False) $ if osIsWindows
+            then
+              -- can't really detect executable on windows, only file extension
+              doesFileExist hook
+            else executable <$> getPermissions hook
+          if hookIsExecutable
+            then runFileWatchHook eres hook
+            else do
+              prettyWarn $
+                flow "File watch hook not executable. Falling back on default."
+              defaultAction
 
-        logInfo "Type help for available commands. Press enter to force a rebuild."
+      prettyInfoL
+        [ "Type"
+        , style Shell "help"
+        , flow "for the available commands. Press enter to force a rebuild."
+        ]
+
+runFileWatchHook ::
+     (HasProcessContext env, HasTerm env)
+  => Either SomeException ()
+  -> Path Abs File
+  -> RIO env ()
+runFileWatchHook buildResult hook =
+  withModifyEnvVars insertBuildResultInEnv $ do
+    let (cmd, args) = if osIsWindows && isShFile
+          then ("sh", [toFilePath hook])
+          else (toFilePath hook, [])
+    menv <- view processContextL
+    withProcessContext menv $ proc cmd args runProcess >>= \case
+      ExitSuccess -> pure ()
+      ExitFailure i -> do
+        prettyWarnL
+          [ flow "File watch hook exited with code:"
+          , style Error (fromString $ show i) <> "."
+          ]
+        pure ()
+ where
+  insertBuildResultInEnv :: EnvVars -> EnvVars
+  insertBuildResultInEnv = Map.insert "HOOK_FW_RESULT" $ case buildResult of
+    Left e -> T.pack $ displayException e
+    Right _ -> ""
+  isShFile = case fileExtension hook of
+    Just ".sh" -> True
+    _ -> False
diff --git a/src/Stack/GhcPkg.hs b/src/Stack/GhcPkg.hs
index d2110abf4e..b4bb846d75 100644
--- a/src/Stack/GhcPkg.hs
+++ b/src/Stack/GhcPkg.hs
@@ -1,103 +1,129 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
 
--- | Functions for the GHC package database.
+{-|
+Module      : Stack.GhcPkg
+Description : Functions for the GHC package database.
+License     : BSD-3-Clause
+
+Functions for the GHC package database.
+-}
 
 module Stack.GhcPkg
-  (getGlobalDB
-  ,findGhcPkgField
-  ,createDatabase
-  ,unregisterGhcPkgIds
-  ,ghcPkgPathEnvVar
-  ,mkGhcPackagePath)
-  where
+  ( createDatabase
+  , findGhcPkgField
+  , getGlobalDB
+  , ghcPkg
+  , ghcPkgPathEnvVar
+  , mkGhcPackagePath
+  , unregisterGhcPkgIds
+  ) where
 
-import           Stack.Prelude
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.ByteString.Lazy as BL
 import qualified Data.List as L
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
-import           Path (parent, (</>))
-import           Path.Extra (toFilePathNoTrailingSep)
+import           GHC.Utils.GhcPkg.Main.Compat ( ghcPkgUnregisterForce )
+import           Path ( (</>), parent )
+import           Path.Extra ( toFilePathNoTrailingSep )
 import           Path.IO
-import           Stack.Constants
-import           Stack.Types.Config (GhcPkgExe (..))
-import           Stack.Types.GhcPkgId
-import           Stack.Types.Compiler
-import           System.FilePath (searchPathSeparator)
-import           RIO.Process
+                   ( doesDirExist, doesFileExist, ensureDir, resolveDir' )
+import           RIO.Process ( HasProcessContext, proc, readProcess_ )
+import           Stack.Constants ( relFilePackageCache )
+import           Stack.Prelude
+import           Stack.Types.Compiler ( WhichCompiler (..) )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), GhcPkgExe (..), HasCompiler
+                   , compilerPathsL
+                   )
+import           Stack.Types.GhcPkgExe ( GhcPkgPrettyException (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId, ghcPkgIdString )
+import           System.FilePath ( searchPathSeparator )
 
 -- | Get the global package database
-getGlobalDB
-  :: (HasProcessContext env, HasLogFunc env)
+getGlobalDB ::
+     (HasProcessContext env, HasTerm env)
   => GhcPkgExe
   -> RIO env (Path Abs Dir)
 getGlobalDB pkgexe = do
-    logDebug "Getting global package database location"
-    -- This seems like a strange way to get the global package database
-    -- location, but I don't know of a better one
-    bs <- ghcPkg pkgexe [] ["list", "--global"] >>= either throwIO pure
-    let fp = S8.unpack $ stripTrailingColon $ firstLine bs
-    liftIO $ resolveDir' fp
-  where
-    stripTrailingColon bs
-        | S8.null bs = bs
-        | S8.last bs == ':' = S8.init bs
-        | otherwise = bs
-    firstLine = S8.takeWhile (\c -> c /= '\r' && c /= '\n')
+  logDebug "Getting global package database location"
+  -- This seems like a strange way to get the global package database
+  -- location, but I don't know of a better one
+  bs <- ghcPkg pkgexe [] ["list", "--global"] >>= either throwIO pure
+  let fp = S8.unpack $ stripTrailingColon $ firstLine bs
+  liftIO $ resolveDir' fp
+ where
+  stripTrailingColon bs
+    | S8.null bs = bs
+    | S8.last bs == ':' = S8.init bs
+    | otherwise = bs
+  firstLine = S8.takeWhile (\c -> c /= '\r' && c /= '\n')
 
 -- | Run the ghc-pkg executable
-ghcPkg
-  :: (HasProcessContext env, HasLogFunc env)
+ghcPkg ::
+     (HasProcessContext env, HasTerm env)
   => GhcPkgExe
   -> [Path Abs Dir]
   -> [String]
   -> RIO env (Either SomeException S8.ByteString)
 ghcPkg pkgexe@(GhcPkgExe pkgPath) pkgDbs args = do
-    eres <- go
-    case eres of
-      Left _ -> do
-        mapM_ (createDatabase pkgexe) pkgDbs
-        go
-      Right _ -> pure eres
-  where
-    pkg = toFilePath pkgPath
-    go = tryAny $ BL.toStrict . fst <$> proc pkg args' readProcess_
-    args' = packageDbFlags pkgDbs ++ args
+  eres <- go
+  case eres of
+    Left e -> do
+      prettyDebug $
+           fillSep
+             [ flow "While using"
+             , style Shell "ghc-pkg" <>","
+             , flow "Stack encountered the following error:"
+             ]
+        <> blankLine
+        <> string (displayException e)
+        <> flow "Trying again after considering database creation..."
+      mapM_ (createDatabase pkgexe) pkgDbs
+      go
+    Right _ -> pure eres
+ where
+  pkg = toFilePath pkgPath
+  go = tryAny $ BL.toStrict . fst <$> proc pkg args' readProcess_
+  args' = packageDbFlags pkgDbs ++ args
 
 -- | Create a package database in the given directory, if it doesn't exist.
-createDatabase
-  :: (HasProcessContext env, HasLogFunc env)
+createDatabase ::
+     (HasProcessContext env, HasTerm env)
   => GhcPkgExe
   -> Path Abs Dir
   -> RIO env ()
 createDatabase (GhcPkgExe pkgPath) db = do
-    exists <- doesFileExist (db </> relFilePackageCache)
-    unless exists $ do
-        -- ghc-pkg requires that the database directory does not exist
-        -- yet. If the directory exists but the package.cache file
-        -- does, we're in a corrupted state. Check for that state.
-        dirExists <- doesDirExist db
-        args <- if dirExists
-            then do
-                logWarn $
-                    "The package database located at " <>
-                    fromString (toFilePath db) <>
-                    " is corrupted (missing its package.cache file)."
-                logWarn "Proceeding with a recache"
-                pure ["--package-db", toFilePath db, "recache"]
-            else do
-                -- Creating the parent doesn't seem necessary, as ghc-pkg
-                -- seems to be sufficiently smart. But I don't feel like
-                -- finding out it isn't the hard way
-                ensureDir (parent db)
-                pure ["init", toFilePath db]
-        void $ proc (toFilePath pkgPath) args $ \pc ->
-          readProcess_ pc `onException`
-          logError ("Unable to create package database at " <> fromString (toFilePath db))
+  exists <- doesFileExist (db </> relFilePackageCache)
+  unless exists $ do
+    -- ghc-pkg requires that the database directory does not exist
+    -- yet. If the directory exists but the package.cache file
+    -- does, we're in a corrupted state. Check for that state.
+    dirExists <- doesDirExist db
+    args <- if dirExists
+      then do
+        prettyWarnL
+          [ flow "The package database located at"
+          , pretty db
+          , flow "is corrupted. It is missing its"
+          , style File "package.cache"
+          , flow "file. Stack is proceeding with a recache."
+          ]
+        pure ["--package-db", toFilePath db, "recache"]
+      else do
+        -- Creating the parent doesn't seem necessary, as ghc-pkg
+        -- seems to be sufficiently smart. But I don't feel like
+        -- finding out it isn't the hard way
+        ensureDir (parent db)
+        pure ["init", toFilePath db]
+    void $ proc (toFilePath pkgPath) args $ \pc ->
+      onException (readProcess_ pc) $
+        logError $
+          "Error: [S-9735]\n" <>
+           "Unable to create package database at " <>
+           fromString (toFilePath db)
 
 -- | Get the environment variable to use for the package DB paths.
 ghcPkgPathEnvVar :: WhichCompiler -> Text
@@ -106,48 +132,72 @@ ghcPkgPathEnvVar Ghc = "GHC_PACKAGE_PATH"
 -- | Get the necessary ghc-pkg flags for setting up the given package database
 packageDbFlags :: [Path Abs Dir] -> [String]
 packageDbFlags pkgDbs =
-          "--no-user-package-db"
-        : map (\x -> "--package-db=" ++ toFilePath x) pkgDbs
+    "--no-user-package-db"
+  : map (\x -> "--package-db=" ++ toFilePath x) pkgDbs
 
 -- | Get the value of a field of the package.
-findGhcPkgField
-    :: (HasProcessContext env, HasLogFunc env)
-    => GhcPkgExe
-    -> [Path Abs Dir] -- ^ package databases
-    -> String -- ^ package identifier, or GhcPkgId
-    -> Text
-    -> RIO env (Maybe Text)
-findGhcPkgField pkgexe pkgDbs name field = do
-    result <-
-        ghcPkg
-            pkgexe
-            pkgDbs
-            ["field", "--simple-output", name, T.unpack field]
-    pure $
-        case result of
-            Left{} -> Nothing
-            Right bs ->
-                fmap (stripCR . T.decodeUtf8) $ listToMaybe $ S8.lines bs
+findGhcPkgField ::
+     (HasProcessContext env, HasTerm env)
+  => GhcPkgExe
+  -> [Path Abs Dir] -- ^ package databases
+  -> String -- ^ package identifier, or GhcPkgId
+  -> Text
+  -> RIO env (Maybe Text)
+findGhcPkgField pkgexe pkgDbs name field =
+  let cmd = ["field", "--simple-output", name, T.unpack field]
+  in  ghcPkg pkgexe pkgDbs cmd <&> \case
+        Left _ -> Nothing
+        Right bs -> fmap (stripCR . T.decodeUtf8) $ listToMaybe $ S8.lines bs
 
 -- | unregister list of package ghcids, batching available from GHC 8.2.1,
 -- see https://github.com/commercialhaskell/stack/issues/2662#issuecomment-460342402
 -- using GHC package id where available (from GHC 7.9)
-unregisterGhcPkgIds
-  :: (HasProcessContext env, HasLogFunc env)
-  => GhcPkgExe
+--
+-- The version of the ghc-pkg executable supplied with GHCs published before
+-- 28 August 2023 does not efficiently bulk unregister. Until an \'efficient\'
+-- ghc-pkg is available, this function no longer uses:
+--
+-- >   eres <- ghcPkg pkgexe [pkgDb] args
+-- > where
+-- >    args = "unregister" : "--user" : "--force" :
+-- >      map packageIdentifierString idents ++
+-- >      if null gids then [] else "--ipid" : map ghcPkgIdString gids
+--
+-- but uses:
+--
+-- >   globalDb <- view $ compilerPathsL.to cpGlobalDB
+-- >   eres <- tryAny $ liftIO $
+-- >     ghcPkgUnregisterUserForce globalDb pkgDb hasIpid pkgarg_strs
+--
+unregisterGhcPkgIds ::
+     (HasCompiler env, HasProcessContext env, HasTerm env)
+  => Bool
+     -- ^ Report pretty exceptions as warnings?
+  -> GhcPkgExe
   -> Path Abs Dir -- ^ package database
   -> NonEmpty (Either PackageIdentifier GhcPkgId)
   -> RIO env ()
-unregisterGhcPkgIds pkgexe pkgDb epgids = do
-    eres <- ghcPkg pkgexe [pkgDb] args
-    case eres of
-        Left e -> logWarn $ displayShow e
-        Right _ -> pure ()
-  where
-    (idents, gids) = partitionEithers $ toList epgids
-    args = "unregister" : "--user" : "--force" :
-        map packageIdentifierString idents ++
-        if null gids then [] else "--ipid" : map ghcPkgIdString gids
+unregisterGhcPkgIds isWarn pkgexe pkgDb epgids = do
+  globalDb <- view $ compilerPathsL . to (.globalDB)
+  try (ghcPkgUnregisterForce globalDb pkgDb hasIpid pkgarg_strs) >>= \case
+    Left (PrettyException e) -> when isWarn $
+      prettyWarn $
+        "[S-8729]"
+        <> line
+        <> flow "While unregistering packages, Stack encountered the following \
+                \error:"
+        <> blankLine
+        <> pretty e
+    Right _ -> pure ()
+  -- ghcPkgUnregisterForce does not perform an effective 'ghc-pkg recache', as
+  -- that depends on a specific version of the Cabal package.
+  ghcPkg pkgexe [pkgDb] ["recache"] >>= \case
+    Left err -> prettyThrowM $ CannotRecacheAfterUnregister pkgDb err
+    Right _ -> pure ()
+ where
+  (idents, gids) = partitionEithers $ toList epgids
+  hasIpid = not (null gids)
+  pkgarg_strs = map packageIdentifierString idents <> map ghcPkgIdString gids
 
 -- | Get the value for GHC_PACKAGE_PATH
 mkGhcPackagePath :: Bool -> Path Abs Dir -> Path Abs Dir -> [Path Abs Dir] -> Path Abs Dir -> Text
diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs
index 113405146e..d6cca1d93a 100644
--- a/src/Stack/Ghci.hs
+++ b/src/Stack/Ghci.hs
@@ -1,873 +1,1163 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE ConstraintKinds    #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RecordWildCards    #-}
-{-# LANGUAGE TupleSections      #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
 
--- | Run a GHCi configured with the user's package(s).
+{-|
+Module      : Stack.Ghci
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @ghci@ and @repl@ commands.
+-}
 
 module Stack.Ghci
-    ( GhciOpts(..)
-    , GhciPkgInfo(..)
-    , GhciException(..)
-    , ghci
-    ) where
-
-import           Stack.Prelude hiding (Display (..))
-import           Control.Monad.State.Strict (State, execState, get, modify)
-import           Data.ByteString.Builder (byteString)
+  ( GhciOpts (..)
+  , GhciPkgInfo (..)
+  , GhciPrettyException (..)
+  , ModuleMap
+  , ghciCmd
+  , ghci
+  ) where
+
+import           Control.Monad.Extra ( whenJust )
+import           Control.Monad.State.Strict ( State, execState, get, modify )
+import           Data.ByteString.Builder ( byteString )
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.ByteString.Lazy as LBS
-import           Data.Foldable (foldl)
 import qualified Data.List as L
-import qualified Data.List.NonEmpty as NE
+import           Data.List.Extra ( (!?) )
+import qualified Data.Map as Map
 import qualified Data.Map.Strict as M
 import qualified Data.Set as S
 import qualified Data.Text as T
-import qualified Data.Text.Lazy as TL
-import qualified Data.Text.Lazy.Encoding as TLE
 import qualified Distribution.PackageDescription as C
-import           Path
-import           Path.Extra (toFilePathNoTrailingSep)
-import           Path.IO hiding (withSystemTempDir)
-import qualified RIO
-import           RIO.PrettyPrint
-import           RIO.Process (HasProcessContext, exec, proc, readProcess_, withWorkingDir)
-import           Stack.Build
-import           Stack.Build.Installed
-import           Stack.Build.Source
-import           Stack.Build.Target
+import           Path ((</>), parent, parseRelFile )
+import           Path.Extra ( forgivingResolveFile', toFilePathNoTrailingSep )
+import           Path.IO
+                   ( XdgDirectory (..), doesFileExist, ensureDir, getXdgDir )
+import           RIO.NonEmpty ( nonEmpty )
+import           RIO.Process ( exec, withWorkingDir )
+import           Stack.Build ( buildLocalTargets )
+import           Stack.Build.Installed ( getInstalled, toInstallMap )
+import           Stack.Build.Source ( localDependencies, projectLocalPackages )
+import           Stack.Build.Target ( NeedTargets (..), parseTargets )
 import           Stack.Constants
-import           Stack.Constants.Config
+                   ( relDirGhciScript, relDirStackProgName, relFileCabalMacrosH
+                   , relFileGhciScript, stackProgName'
+                   )
+import           Stack.Constants.Config ( ghciDirL, objectInterfaceDirL )
 import           Stack.Ghci.Script
+                   ( GhciScript, ModuleName, cmdAdd, cmdModule
+                   , scriptToLazyByteString
+                   )
 import           Stack.Package
-import           Stack.Types.Build
-import           Stack.Types.Config
+                   ( buildableExes, buildableForeignLibs, buildableSubLibs
+                   , buildableTestSuites, buildableBenchmarks, getPackageOpts
+                   , hasBuildableMainLibrary, listOfPackageDeps
+                   , packageFromPackageDescription, readDotBuildinfo
+                   , resolvePackageDescription, topSortPackageComponent
+                   )
+import           Stack.PackageFile ( getPackageFile )
+import           Stack.Prelude
+import           Stack.Runners ( ShouldReexec (..), withConfig, withEnvConfig )
+import           Stack.Types.Build.Exception
+                   ( BuildPrettyException (..), pprintTargetParseErrors )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..), configFileL )
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
+import qualified Stack.Types.BuildOpts as BenchmarkOpts ( BenchmarkOpts (..) )
+import qualified Stack.Types.BuildOpts as TestOpts ( TestOpts (..) )
+import           Stack.Types.BuildOptsCLI
+                   ( ApplyCLIFlag (..), BuildOptsCLI (..), defaultBuildOptsCLI )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), HasCompiler (..) )
+import           Stack.Types.Config ( Config (..), HasConfig (..), buildOptsL )
+import           Stack.Types.Config.Exception ( ConfigPrettyException (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
+                   , shaPathForBytes
+                   )
+import           Stack.Types.EnvSettings ( defaultEnvSettings )
+import           Stack.Types.GhciOpts ( GhciOpts (..) )
+import           Stack.Types.Installed ( InstallMap, InstalledMap )
 import           Stack.Types.NamedComponent
+                   ( NamedComponent (..), isCLib, isCSubLib, renderComponentTo
+                   , renderPkgComponent
+                   )
 import           Stack.Types.Package
+                   ( BuildInfoOpts (..), LocalPackage (..), Package (..)
+                   , PackageConfig (..), dotCabalCFilePath, dotCabalGetPath
+                   , dotCabalMainPath
+                   )
+import           Stack.Types.PackageFile ( PackageComponentFile (..) )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( HasRunner, Runner )
 import           Stack.Types.SourceMap
-import           System.IO (putStrLn)
-import           System.IO.Temp (getCanonicalTemporaryDirectory)
-import           System.Permissions (setScriptPerms)
-
--- | Command-line options for GHC.
-data GhciOpts = GhciOpts
-    { ghciTargets            :: ![Text]
-    , ghciArgs               :: ![String]
-    , ghciGhcOptions         :: ![String]
-    , ghciFlags              :: !(Map ApplyCLIFlag (Map FlagName Bool))
-    , ghciGhcCommand         :: !(Maybe FilePath)
-    , ghciNoLoadModules      :: !Bool
-    , ghciAdditionalPackages :: ![String]
-    , ghciMainIs             :: !(Maybe Text)
-    , ghciLoadLocalDeps      :: !Bool
-    , ghciSkipIntermediate   :: !Bool
-    , ghciHidePackages       :: !(Maybe Bool)
-    , ghciNoBuild            :: !Bool
-    , ghciOnlyMain           :: !Bool
-    } deriving Show
-
--- | Necessary information to load a package or its components.
+                   ( CommonPackage (..), DepPackage (..), GlobalPackage
+                   , PackageType (..), ProjectPackage (..), SMActual (..)
+                   , SMTargets (..), SMWanted (..), SourceMap (..), Target (..)
+                   )
+import           System.IO ( putStrLn )
+import           System.Permissions ( setScriptPerms )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Ghci" module.
+data GhciPrettyException
+  = GhciTargetParseException ![StyleDoc]
+  | CandidatesIndexOutOfRangeBug
+  | InvalidPackageOption !String
+  | FileTargetIsInvalidAbsFile !String
+  | Can'tSpecifyFilesAndTargets
+  | Can'tSpecifyFilesAndMainIs
+  deriving Show
+
+instance Pretty GhciPrettyException where
+  pretty (GhciTargetParseException errs) =
+       "[S-6948]"
+    <> pprintTargetParseErrors errs
+    <> blankLine
+    <> fillSep
+         [ flow "Note that to specify options to be passed to GHCi, use the"
+         , style Shell "--ghci-options"
+         , "option."
+         ]
+  pretty CandidatesIndexOutOfRangeBug = bugPrettyReport "[S-1939]" $
+    flow "figureOutMainFile: index out of range."
+  pretty (InvalidPackageOption name) =
+       "[S-6716]"
+    <> line
+    <> fillSep
+         [ flow "Failed to parse"
+         , style Shell "--package"
+         , "option"
+         , style Target (fromString name) <> "."
+         ]
+  pretty (FileTargetIsInvalidAbsFile name) =
+       "[S-3600]"
+    <> line
+    <> fillSep
+         [ flow "Cannot work out a valid path for file target"
+         , style File (fromString name) <> "."
+         ]
+  pretty Can'tSpecifyFilesAndTargets =
+       "[S-9906]"
+    <> line
+    <> fillSep
+         [ flow "Cannot use"
+         , style Shell "stack ghci"
+         , flow "with both file targets and package targets."
+         ]
+  pretty Can'tSpecifyFilesAndMainIs =
+       "[S-5188]"
+    <> line
+    <> fillSep
+         [ flow "Cannot use"
+         , style Shell "stack ghci"
+         , flow "with both file targets and"
+         , style Shell "--main-is"
+         , "flag."
+         ]
+
+instance Exception GhciPrettyException
+
+-- | Type representing information required to load a package or its components.
 --
 -- NOTE: GhciPkgInfo has paths as list instead of a Set to preserve files order
 -- as a workaround for bug https://ghc.haskell.org/trac/ghc/ticket/13786
 data GhciPkgInfo = GhciPkgInfo
-    { ghciPkgName :: !PackageName
-    , ghciPkgOpts :: ![(NamedComponent, BuildInfoOpts)]
-    , ghciPkgDir :: !(Path Abs Dir)
-    , ghciPkgModules :: !ModuleMap
-    , ghciPkgCFiles :: ![Path Abs File] -- ^ C files.
-    , ghciPkgMainIs :: !(Map NamedComponent [Path Abs File])
-    , ghciPkgTargetFiles :: !(Maybe [Path Abs File])
-    , ghciPkgPackage :: !Package
-    } deriving Show
-
--- | Loaded package description and related info.
+  { name :: !PackageName
+  , opts :: ![(NamedComponent, BuildInfoOpts)]
+  , dir :: !(Path Abs Dir)
+  , modules :: !ModuleMap
+  , cFiles :: ![Path Abs File] -- ^ C files.
+  , mainIs :: !(Map NamedComponent [Path Abs File])
+  , targetFiles :: !(Maybe [Path Abs File])
+  , package :: !Package
+  }
+  deriving Show
+
+-- | Type representing loaded package description and related information.
 data GhciPkgDesc = GhciPkgDesc
-    { ghciDescPkg :: !Package
-    , ghciDescCabalFp :: !(Path Abs File)
-    , ghciDescTarget :: !Target
-    }
+  { package :: !Package
+  , cabalFP :: !(Path Abs File)
+  , target :: !Target
+    -- ^ How the package is intended to be built.
+  }
 
--- Mapping from a module name to a map with all of the paths that use
--- that name. Each of those paths is associated with a set of components
--- that contain it. Purpose of this complex structure is for use in
+-- | Type synonym representing maps from a module name to a map with all of the
+-- paths that use that name. Each of those paths is associated with a set of
+-- components that contain it.
+
+-- The purpose of this complex structure is for use in
 -- 'checkForDuplicateModules'.
-type ModuleMap = Map ModuleName (Map (Path Abs File) (Set (PackageName, NamedComponent)))
+type ModuleMap =
+  Map ModuleName (Map (Path Abs File) (Set (PackageName, NamedComponent)))
 
 unionModuleMaps :: [ModuleMap] -> ModuleMap
 unionModuleMaps = M.unionsWith (M.unionWith S.union)
 
-data GhciException
-    = InvalidPackageOption String
-    | LoadingDuplicateModules
-    | MissingFileTarget String
-    | Can'tSpecifyFilesAndTargets
-    | Can'tSpecifyFilesAndMainIs
-    | GhciTargetParseException [Text]
-    deriving (Typeable)
-
-instance Exception GhciException
-
-instance Show GhciException where
-    show (InvalidPackageOption name) =
-        "Failed to parse --package option " ++ name
-    show LoadingDuplicateModules = unlines
-        [ "Not attempting to start ghci due to these duplicate modules."
-        , "Use --no-load to try to start it anyway, without loading any modules (but these are still likely to cause errors)"
-        ]
-    show (MissingFileTarget name) =
-        "Cannot find file target " ++ name
-    show Can'tSpecifyFilesAndTargets =
-        "Cannot use 'stack ghci' with both file targets and package targets"
-    show Can'tSpecifyFilesAndMainIs =
-        "Cannot use 'stack ghci' with both file targets and --main-is flag"
-    show (GhciTargetParseException xs) =
-        show (TargetParseException xs) ++
-        "\nNote that to specify options to be passed to GHCi, use the --ghci-options flag"
-
--- | Launch a GHCi session for the given local package targets with the
--- given options and configure it with the load paths and extensions
--- of those targets.
+-- | Function underlying the @stack ghci@ and @stack repl@ commands. Run GHCi in
+-- the context of a project.
+ghciCmd :: GhciOpts -> RIO Runner ()
+ghciCmd ghciOpts =
+  let boptsCLI = defaultBuildOptsCLI
+        -- using only additional packages, targets then get overridden in `ghci`
+        { targetsCLI = map T.pack ghciOpts.additionalPackages
+        , initialBuildSteps = True
+        , flags = ghciOpts.flags
+        , ghcOptions = map T.pack ghciOpts.ghcOptions
+        }
+  in  withConfig YesReexec $ withEnvConfig AllowNoTargets boptsCLI $ do
+        bopts <- view buildOptsL
+        -- override env so running of tests and benchmarks is disabled
+        let boptsLocal = bopts
+              { testOpts = bopts.testOpts { TestOpts.runTests = False }
+              , benchmarkOpts =
+                  bopts.benchmarkOpts { BenchmarkOpts.runBenchmarks = False }
+              }
+        local (set buildOptsL boptsLocal) (ghci ghciOpts)
+
+-- | Launch a GHCi session for the given project package targets with the given
+-- options and configure it with the load paths and extensions of those targets.
 ghci :: HasEnvConfig env => GhciOpts -> RIO env ()
-ghci opts@GhciOpts{..} = do
-    let buildOptsCLI = defaultBuildOptsCLI
-            { boptsCLITargets = []
-            , boptsCLIFlags = ghciFlags
-            }
-    sourceMap <- view $ envConfigL.to envConfigSourceMap
-    installMap <- toInstallMap sourceMap
-    locals <- projectLocalPackages
-    depLocals <- localDependencies
-    let localMap =
-          M.fromList [(packageName $ lpPackage lp, lp) | lp <- locals ++ depLocals]
-        -- FIXME:qrilka this looks wrong to go back to SMActual
-        sma = SMActual
-             { smaCompiler = smCompiler sourceMap
-             , smaProject = smProject sourceMap
-             , smaDeps = smDeps sourceMap
-             , smaGlobal = smGlobal sourceMap
-             }
-    -- Parse --main-is argument.
-    mainIsTargets <- parseMainIsTargets buildOptsCLI sma ghciMainIs
-    -- Parse to either file targets or build targets
-    etargets <- preprocessTargets buildOptsCLI sma ghciTargets
-    (inputTargets, mfileTargets) <- case etargets of
-        Right packageTargets -> pure (packageTargets, Nothing)
-        Left rawFileTargets -> do
-            case mainIsTargets of
-                Nothing -> pure ()
-                Just _ -> throwM Can'tSpecifyFilesAndMainIs
-            -- Figure out targets based on filepath targets
-            (targetMap, fileInfo, extraFiles) <- findFileTargets locals rawFileTargets
-            pure (targetMap, Just (fileInfo, extraFiles))
-    -- Get a list of all the local target packages.
-    localTargets <- getAllLocalTargets opts inputTargets mainIsTargets localMap
-    -- Get a list of all the non-local target packages.
-    nonLocalTargets <- getAllNonLocalTargets inputTargets
-    -- Check if additional package arguments are sensible.
-    addPkgs <- checkAdditionalPackages ghciAdditionalPackages
-    -- Load package descriptions.
-    pkgDescs <- loadGhciPkgDescs buildOptsCLI localTargets
-    -- If necessary, ask user about which main module to load.
-    bopts <- view buildOptsL
-    mainFile <-
-        if ghciNoLoadModules
-            then pure Nothing
-            else do
-              -- Figure out package files, in order to ask the user
-              -- about which main module to load. See the note below for
-              -- why this is done again after the build. This could
-              -- potentially be done more efficiently, because all we
-              -- need is the location of main modules, not the rest.
-              pkgs0 <- getGhciPkgInfos installMap addPkgs (fmap fst mfileTargets) pkgDescs
-              figureOutMainFile bopts mainIsTargets localTargets pkgs0
-    let pkgTargets pn targets =
-          case targets of
-            TargetAll _  -> [T.pack (packageNameString pn)]
-            TargetComps comps -> [renderPkgComponent (pn, c) | c <- toList comps]
-    -- Build required dependencies and setup local packages.
-    buildDepsAndInitialSteps opts $
-      concatMap (\(pn, (_, t)) -> pkgTargets pn t) localTargets
-    targetWarnings localTargets nonLocalTargets mfileTargets
-    -- Load the list of modules _after_ building, to catch changes in
-    -- unlisted dependencies (#1180)
-    pkgs <- getGhciPkgInfos installMap addPkgs (fmap fst mfileTargets) pkgDescs
-    checkForIssues pkgs
-    -- Finally, do the invocation of ghci
-    runGhci opts localTargets mainFile pkgs (maybe [] snd mfileTargets) (nonLocalTargets ++ addPkgs)
-
-preprocessTargets
-    :: HasEnvConfig env
-    => BuildOptsCLI
-    -> SMActual GlobalPackage
-    -> [Text]
-    -> RIO env (Either [Path Abs File] (Map PackageName Target))
+ghci opts = do
+  let buildOptsCLI = defaultBuildOptsCLI
+        { targetsCLI = []
+        , flags = opts.flags
+        }
+  sourceMap <- view $ envConfigL . to (.sourceMap)
+  installMap <- toInstallMap sourceMap
+  locals <- projectLocalPackages
+  depLocals <- localDependencies
+  let localMap =
+        M.fromList [(lp.package.name, lp) | lp <- locals ++ depLocals]
+      -- FIXME:qrilka this looks wrong to go back to SMActual
+      sma = SMActual
+        { compiler = sourceMap.compiler
+        , project = sourceMap.project
+        , deps = sourceMap.deps
+        , globals = sourceMap.globalPkgs
+        }
+  -- Parse --main-is argument.
+  mainIsTargets <- parseMainIsTargets buildOptsCLI sma opts.mainIs
+  -- Parse to either file targets or build targets
+  (inputTargets, mfileTargets) <-
+    preprocessTargets buildOptsCLI sma opts.targets >>= \case
+      Right packageTargets -> pure (packageTargets, Nothing)
+      Left rawFileTargets -> do
+        whenJust mainIsTargets $ \_ -> prettyThrowM Can'tSpecifyFilesAndMainIs
+        -- Figure out targets based on filepath targets
+        (targetMap, fileInfo, extraFiles) <-
+          findFileTargets locals rawFileTargets
+        pure (targetMap, Just (fileInfo, extraFiles))
+  -- Get a list of all the local target packages.
+  localTargets <- getAllLocalTargets opts inputTargets mainIsTargets localMap
+  -- Get a list of all the non-local target packages.
+  nonLocalTargets <- getAllNonLocalTargets inputTargets
+  let getInternalDependencies target localPackage =
+        topSortPackageComponent localPackage.package target False
+      internalDependencies =
+        M.intersectionWith getInternalDependencies inputTargets localMap
+      relevantDependencies = M.filter (any isCSubLib) internalDependencies
+  -- Check if additional package arguments are sensible.
+  addPkgs <- checkAdditionalPackages opts.additionalPackages
+  -- Load package descriptions.
+  pkgDescs <- loadGhciPkgDescs buildOptsCLI localTargets
+  -- If necessary, ask user about which main module to load.
+  bopts <- view buildOptsL
+  mainFile <- if opts.noLoadModules
+    then pure Nothing
+    else do
+      -- Figure out package files, in order to ask the user about which main
+      -- module to load. See the note below for why this is done again after the
+      -- build. This could potentially be done more efficiently, because all we
+      -- need is the location of main modules, not the rest.
+      pkgs0 <- getGhciPkgInfos installMap addPkgs (fmap fst mfileTargets) pkgDescs
+      figureOutMainFile bopts mainIsTargets localTargets pkgs0
+  let pkgTargets pn targets =
+        case targets of
+          TargetAll _  -> [T.pack (packageNameString pn)]
+          TargetComps comps -> [renderPkgComponent (pn, c) | c <- toList comps]
+  -- Build required dependencies and setup project packages.
+  buildDepsAndInitialSteps opts $
+    concatMap (\(pn, (_, t)) -> pkgTargets pn t) localTargets
+  targetWarnings localTargets nonLocalTargets mfileTargets
+  -- Load the list of modules _after_ building, to catch changes in
+  -- unlisted dependencies (#1180)
+  pkgs <- getGhciPkgInfos installMap addPkgs (fmap fst mfileTargets) pkgDescs
+  checkForIssues pkgs
+  -- Finally, do the invocation of ghci
+  runGhci
+    opts
+    localTargets
+    mainFile
+    pkgs
+    -- Files targets with unknown GHC options:
+    (maybe [] snd mfileTargets)
+    -- The names of packages to be exposed:
+    (nonLocalTargets ++ addPkgs)
+    -- A map of package names and sequences of their sublibrary components
+    -- depended upon (if any):
+    relevantDependencies
+
+preprocessTargets ::
+     HasEnvConfig env
+  => BuildOptsCLI
+  -> SMActual GlobalPackage
+  -> [Text]
+     -- ^ Raw (unprocessed) targets from the command line.
+  -> RIO env (Either [Path Abs File] (Map PackageName Target))
 preprocessTargets buildOptsCLI sma rawTargets = do
-    let (fileTargetsRaw, normalTargetsRaw) =
-            L.partition (\t -> ".hs" `T.isSuffixOf` t || ".lhs" `T.isSuffixOf` t)
-                      rawTargets
-    -- Only use file targets if we have no normal targets.
-    if not (null fileTargetsRaw) && null normalTargetsRaw
-        then do
-            fileTargets <- forM fileTargetsRaw $ \fp0 -> do
-                let fp = T.unpack fp0
-                mpath <- liftIO $ forgivingAbsence (resolveFile' fp)
-                case mpath of
-                    Nothing -> throwM (MissingFileTarget fp)
-                    Just path -> pure path
-            pure (Left fileTargets)
-        else do
-            -- Try parsing targets before checking if both file and
-            -- module targets are specified (see issue#3342).
-            let boptsCLI = buildOptsCLI { boptsCLITargets = normalTargetsRaw }
-            normalTargets <- parseTargets AllowNoTargets False boptsCLI sma
-                `catch` \ex -> case ex of
-                    TargetParseException xs -> throwM (GhciTargetParseException xs)
-                    _ -> throwM ex
-            unless (null fileTargetsRaw) $ throwM Can'tSpecifyFilesAndTargets
-            pure (Right $ smtTargets normalTargets)
-
-parseMainIsTargets
-     :: HasEnvConfig env
-     => BuildOptsCLI
-     -> SMActual GlobalPackage
-     -> Maybe Text
-     -> RIO env (Maybe (Map PackageName Target))
+  let (fileTargetsRaw, normalTargetsRaw) =
+        L.partition
+          (\t -> ".hs" `T.isSuffixOf` t || ".lhs" `T.isSuffixOf` t)
+          rawTargets
+  -- Only use file targets if we have no normal targets.
+  if not (null fileTargetsRaw) && null normalTargetsRaw
+    then do
+      fileTargets <- forM fileTargetsRaw $ \fp0 -> do
+        let fp = T.unpack fp0
+        forgivingResolveFile' fp >>= \case
+          Nothing -> prettyThrowM (FileTargetIsInvalidAbsFile fp)
+          Just path -> pure path
+      pure (Left fileTargets)
+    else do
+      -- Try parsing targets before checking if both file and
+      -- module targets are specified (see issue#3342).
+      let boptsCLI = buildOptsCLI { targetsCLI = normalTargetsRaw }
+      normalTargets <- parseTargets AllowNoTargets False boptsCLI sma
+        `catch` \pex@(PrettyException ex) ->
+          case fromException $ toException ex of
+            Just (TargetParseException xs) ->
+              prettyThrowM $ GhciTargetParseException xs
+            _ -> throwM pex
+      unless (null fileTargetsRaw) $ prettyThrowM Can'tSpecifyFilesAndTargets
+      pure (Right normalTargets.targets)
+
+parseMainIsTargets ::
+     HasEnvConfig env
+  => BuildOptsCLI
+  -> SMActual GlobalPackage
+  -> Maybe Text
+  -> RIO env (Maybe (Map PackageName Target))
 parseMainIsTargets buildOptsCLI sma mtarget = forM mtarget $ \target -> do
-     let boptsCLI = buildOptsCLI { boptsCLITargets = [target] }
-     targets <- parseTargets AllowNoTargets False boptsCLI sma
-     pure $ smtTargets targets
+  let boptsCLI = buildOptsCLI { targetsCLI = [target] }
+  targets <- parseTargets AllowNoTargets False boptsCLI sma
+  pure targets.targets
 
 -- | Display PackageName + NamedComponent
 displayPkgComponent :: (PackageName, NamedComponent) -> StyleDoc
-displayPkgComponent = style PkgComponent . fromString . T.unpack . renderPkgComponent
+displayPkgComponent =
+  style PkgComponent . fromString . T.unpack . renderPkgComponent
 
-findFileTargets
-    :: HasEnvConfig env
-    => [LocalPackage]
-    -> [Path Abs File]
-    -> RIO env (Map PackageName Target, Map PackageName [Path Abs File], [Path Abs File])
+findFileTargets ::
+     HasEnvConfig env
+  => [LocalPackage]
+  -> [Path Abs File]
+  -> RIO
+       env
+       ( Map PackageName Target
+       , Map PackageName [Path Abs File]
+       , [Path Abs File]
+       )
 findFileTargets locals fileTargets = do
-    filePackages <- forM locals $ \lp -> do
-        (_,compFiles,_,_) <- getPackageFiles (packageFiles (lpPackage lp)) (lpCabalFile lp)
-        pure (lp, M.map (map dotCabalGetPath) compFiles)
-    let foundFileTargetComponents :: [(Path Abs File, [(PackageName, NamedComponent)])]
-        foundFileTargetComponents =
-            map (\fp -> (fp, ) $ L.sort $
-                        concatMap (\(lp, files) -> map ((packageName (lpPackage lp), ) . fst)
-                                                       (filter (elem fp . snd) (M.toList files))
-                                  ) filePackages
-                ) fileTargets
-    results <- forM foundFileTargetComponents $ \(fp, xs) ->
-        case xs of
-            [] -> do
-                prettyWarn $ vsep
-                    [ "Couldn't find a component for file target" <+>
-                      pretty fp <>
-                      ". This means that the correct ghc options might not be used."
-                    , "Attempting to load the file anyway."
-                    ]
-                pure $ Left fp
-            [x] -> do
-                prettyInfo $
-                    "Using configuration for" <+> displayPkgComponent x <+>
-                    "to load" <+> pretty fp
-                pure $ Right (fp, x)
-            (x:_) -> do
-                prettyWarn $
-                    "Multiple components contain file target" <+>
-                    pretty fp <> ":" <+>
-                    mconcat (L.intersperse ", " (map displayPkgComponent xs)) <> line <>
-                    "Guessing the first one," <+> displayPkgComponent x <> "."
-                pure $ Right (fp, x)
-    let (extraFiles, associatedFiles) = partitionEithers results
-        targetMap =
-            foldl unionTargets M.empty $
-            map (\(_, (name, comp)) -> M.singleton name (TargetComps (S.singleton comp)))
-                associatedFiles
-        infoMap =
-            foldl (M.unionWith (<>)) M.empty $
-            map (\(fp, (name, _)) -> M.singleton name [fp])
-                associatedFiles
-    pure (targetMap, infoMap, extraFiles)
-
-getAllLocalTargets
-    :: HasEnvConfig env
-    => GhciOpts
-    -> Map PackageName Target
-    -> Maybe (Map PackageName Target)
-    -> Map PackageName LocalPackage
-    -> RIO env [(PackageName, (Path Abs File, Target))]
-getAllLocalTargets GhciOpts{..} targets0 mainIsTargets localMap = do
-    -- Use the 'mainIsTargets' as normal targets, for CLI concision. See
-    -- #1845. This is a little subtle - we need to do the target parsing
-    -- independently in order to handle the case where no targets are
-    -- specified.
-    let targets = maybe targets0 (unionTargets targets0) mainIsTargets
-    packages <- view $ envConfigL.to envConfigSourceMap.to smProject
-    -- Find all of the packages that are directly demanded by the
-    -- targets.
-    let directlyWanted = flip mapMaybe (M.toList packages) $
-          \(name, pp) ->
-                case M.lookup name targets of
-                  Just simpleTargets -> Just (name, (ppCabalFP pp, simpleTargets))
-                  Nothing -> Nothing
-    -- Figure out
-    let extraLoadDeps = getExtraLoadDeps ghciLoadLocalDeps localMap directlyWanted
-    if (ghciSkipIntermediate && not ghciLoadLocalDeps) || null extraLoadDeps
-        then pure directlyWanted
-        else do
-            let extraList =
-                  mconcat $ L.intersperse ", " (map (fromString . packageNameString . fst) extraLoadDeps)
-            if ghciLoadLocalDeps
-                then logInfo $
-                  "The following libraries will also be loaded into GHCi because " <>
-                  "they are local dependencies of your targets, and you specified --load-local-deps:\n    " <>
-                  extraList
-                else logInfo $
-                  "The following libraries will also be loaded into GHCi because " <>
-                  "they are intermediate dependencies of your targets:\n    " <>
-                  extraList <>
-                  "\n(Use --skip-intermediate-deps to omit these)"
-            pure (directlyWanted ++ extraLoadDeps)
-
-getAllNonLocalTargets
-    :: Map PackageName Target
-    -> RIO env [PackageName]
+  filePackages <- forM locals $ \lp -> do
+    PackageComponentFile _ compFiles _ _ <- getPackageFile lp.package lp.cabalFP
+    pure (lp, M.map (map dotCabalGetPath) compFiles)
+  let foundFileTargetComponents :: [(Path Abs File, [(PackageName, NamedComponent)])]
+      foundFileTargetComponents =
+        map (\fp -> (fp, ) $ L.sort $
+                    concatMap (\(lp, files) -> map ((lp.package.name,) . fst)
+                                                   (filter (elem fp . snd) (M.toList files))
+                              ) filePackages
+            ) fileTargets
+  results <- forM foundFileTargetComponents $ \(fp, xs) ->
+    case xs of
+      [] -> do
+        prettyWarnL
+          [ flow "Couldn't find a component for file target"
+          , pretty fp <> "."
+          , flow "This means that the correct GHC options might not be used. \
+                 \Attempting to load the file anyway."
+          ]
+        pure $ Left fp
+      [x] -> do
+        prettyInfoL
+          [ flow "Using configuration for"
+          , displayPkgComponent x
+          , flow "to load"
+          , pretty fp
+          ]
+        pure $ Right (fp, x)
+      (x:_) -> do
+        prettyWarn $
+             fillSep
+               [ flow "Multiple components contain file target"
+               , pretty fp <> ":"
+               , fillSep $ punctuate "," (map displayPkgComponent xs)
+               ]
+          <> line
+          <> fillSep
+               [ flow "Guessing the first one,"
+               , displayPkgComponent x <> "."
+               ]
+        pure $ Right (fp, x)
+  let (extraFiles, associatedFiles) = partitionEithers results
+      targetMap =
+          foldl' unionTargets M.empty $
+          map (\(_, (name, comp)) -> M.singleton name (TargetComps (S.singleton comp)))
+              associatedFiles
+      infoMap =
+          foldl' (M.unionWith (<>)) M.empty $
+          map (\(fp, (name, _)) -> M.singleton name [fp])
+              associatedFiles
+  pure (targetMap, infoMap, extraFiles)
+
+getAllLocalTargets ::
+     HasEnvConfig env
+  => GhciOpts
+  -> Map PackageName Target
+  -> Maybe (Map PackageName Target)
+  -> Map PackageName LocalPackage
+  -> RIO env [(PackageName, (Path Abs File, Target))]
+getAllLocalTargets ghciOpts targets0 mainIsTargets localMap = do
+  -- Use the 'mainIsTargets' as normal targets, for CLI concision. See
+  -- #1845. This is a little subtle - we need to do the target parsing
+  -- independently in order to handle the case where no targets are
+  -- specified.
+  let targets = maybe targets0 (unionTargets targets0) mainIsTargets
+  packages <- view $ envConfigL . to (.sourceMap.project)
+  -- Find all of the packages that are directly demanded by the
+  -- targets.
+  let directlyWanted = flip mapMaybe (M.toList packages) $
+        \(name, pp) ->
+              case M.lookup name targets of
+                Just simpleTargets -> Just (name, (pp.cabalFP, simpleTargets))
+                Nothing -> Nothing
+  -- Figure out
+  let extraLoadDeps =
+        getExtraLoadDeps ghciOpts.loadLocalDeps localMap directlyWanted
+  if null extraLoadDeps
+    then pure directlyWanted
+    else do
+      let extraList' =
+            map (fromPackageName . fst) extraLoadDeps :: [StyleDoc]
+          extraList = mkNarrativeList (Just Current) False extraList'
+      if ghciOpts.loadLocalDeps
+        then prettyInfo $
+          fillSep $
+                [ flow "The following libraries will also be loaded into \
+                       \GHCi because they are local dependencies of your \
+                       \targets, and you specified"
+                , style Shell "--load-local-deps" <> ":"
+                ]
+            <> extraList
+        else prettyInfo $
+             fillSep
+               ( flow "The following libraries will also be loaded into \
+                      \GHCi because they are intermediate dependencies of \
+                      \your targets:"
+               : extraList
+               )
+      pure (directlyWanted ++ extraLoadDeps)
+
+getAllNonLocalTargets ::
+     Map PackageName Target
+  -> RIO env [PackageName]
 getAllNonLocalTargets targets = do
   let isNonLocal (TargetAll PTDependency) = True
       isNonLocal _ = False
   pure $ map fst $ filter (isNonLocal . snd) (M.toList targets)
 
 buildDepsAndInitialSteps :: HasEnvConfig env => GhciOpts -> [Text] -> RIO env ()
-buildDepsAndInitialSteps GhciOpts{..} localTargets = do
-    let targets = localTargets ++ map T.pack ghciAdditionalPackages
-    -- If necessary, do the build, for local packagee targets, only do
-    -- 'initialBuildSteps'.
-    case NE.nonEmpty targets of
-      -- only new local targets could appear here
-      Just nonEmptyTargets | not ghciNoBuild -> do
-        eres <- buildLocalTargets nonEmptyTargets
-        case eres of
-            Right () -> pure ()
-            Left err -> do
-                prettyError $ fromString (show err)
-                prettyWarn "Build failed, but trying to launch GHCi anyway"
-      _ ->
-        pure ()
+buildDepsAndInitialSteps ghciOpts localTargets = do
+  let targets = localTargets ++ map T.pack ghciOpts.additionalPackages
+  -- If necessary, do the build, for project packagee targets, only do
+  -- 'initialBuildSteps'.
+  whenJust (nonEmpty targets) $ \nonEmptyTargets ->
+    unless ghciOpts.noBuild $ do
+      -- only new project package targets could appear here
+      buildLocalTargets nonEmptyTargets >>= \case
+        Right () -> pure ()
+        Left err -> do
+          case fromException err of
+            Just (PrettyException prettyErr) -> prettyError $ pretty prettyErr
+            Nothing -> prettyError $ fromString (displayException err)
+          prettyWarn "Build failed, but trying to launch GHCi anyway"
 
 checkAdditionalPackages :: MonadThrow m => [String] -> m [PackageName]
 checkAdditionalPackages pkgs = forM pkgs $ \name -> do
-    let mres = (pkgName <$> parsePackageIdentifier name)
-            <|> parsePackageNameThrowing name
-    maybe (throwM $ InvalidPackageOption name) pure mres
+  let mres = (pkgName <$> parsePackageIdentifier name)
+        <|> parsePackageNameThrowing name
+  maybe (prettyThrowM $ InvalidPackageOption name) pure mres
 
+runGhci ::
+     HasEnvConfig env
+  => GhciOpts
+  -> [(PackageName, (Path Abs File, Target))]
+  -> Maybe (Path Abs File)
+     -- ^ Path to source file for selected main module. 'Nothing' if no main
+     -- module is to be loaded and imported.
+  -> [GhciPkgInfo]
+  -> [Path Abs File]
+     -- ^ Files targets with unknown GHC options.
+  -> [PackageName]
+     -- ^ The names of packages to be exposed.
+  -> Map PackageName (Seq NamedComponent)
+     -- ^ A map of package names and their sublibraries depended on (if
+     -- any), the package names to be exposed if any sublibraries are
+     -- depended on.
+  -> RIO env ()
 runGhci
-    :: HasEnvConfig env
-    => GhciOpts
-    -> [(PackageName, (Path Abs File, Target))]
-    -> Maybe (Path Abs File)
-    -> [GhciPkgInfo]
-    -> [Path Abs File]
-    -> [PackageName]
-    -> RIO env ()
-runGhci GhciOpts{..} targets mainFile pkgs extraFiles exposePackages = do
-    config <- view configL
-    let pkgopts = hidePkgOpts ++ genOpts ++ ghcOpts
-        shouldHidePackages =
-          fromMaybe (not (null pkgs && null exposePackages)) ghciHidePackages
-        hidePkgOpts =
-          if shouldHidePackages
-            then
-              ["-hide-all-packages"] ++
-              -- This is necessary, because current versions of ghci
-              -- will entirely fail to start if base isn't visible. This
-              -- is because it tries to use the interpreter to set
-              -- buffering options on standard IO.
-              (if null targets then ["-package", "base"] else []) ++
-              concatMap (\n -> ["-package", packageNameString n]) exposePackages
-            else []
-        oneWordOpts bio
-            | shouldHidePackages = bioOneWordOpts bio ++ bioPackageFlags bio
-            | otherwise = bioOneWordOpts bio
-        genOpts = nubOrd (concatMap (concatMap (oneWordOpts . snd) . ghciPkgOpts) pkgs)
-        (omittedOpts, ghcOpts) = L.partition badForGhci $
-            concatMap (concatMap (bioOpts . snd) . ghciPkgOpts) pkgs ++ map T.unpack
-              ( fold (configGhcOptionsByCat config) -- include everything, locals, and targets
-             ++ concatMap (getUserOptions . ghciPkgName) pkgs
-              )
-        getUserOptions pkg = M.findWithDefault [] pkg (configGhcOptionsByName config)
-        badForGhci x =
-            L.isPrefixOf "-O" x || elem x (words "-debug -threaded -ticky -static -Werror")
-    unless (null omittedOpts) $
-        logWarn
-            ("The following GHC options are incompatible with GHCi and have not been passed to it: " <>
-             mconcat (L.intersperse " " (fromString <$> nubOrd omittedOpts)))
-    oiDir <- view objectInterfaceDirL
-    let odir =
+    ghciOpts
+    targets
+    mainFile
+    pkgs
+    extraFiles
+    exposePackages
+    exposeInternalDep
+  = do
+      config <- view configL
+      let subDepsPackageUnhide pName deps =
+            if null deps then [] else ["-package", fromPackageName pName]
+          pkgopts = hidePkgOpts ++ genOpts ++ ghcOpts
+          shouldHidePackages = fromMaybe
+            (not (null pkgs && null exposePackages))
+            ghciOpts.hidePackages
+          hidePkgOpts =
+            if shouldHidePackages
+              then
+                   ["-hide-all-packages"]
+                -- This is necessary, because current versions of ghci will
+                -- entirely fail to start if base isn't visible. This is because
+                -- it tries to use the interpreter to set buffering options on
+                -- standard IO.
+                ++ (if null targets then ["-package", "base"] else [])
+                ++ concatMap
+                     (\n -> ["-package", packageNameString n])
+                     exposePackages
+                ++ M.foldMapWithKey subDepsPackageUnhide exposeInternalDep
+              else []
+          oneWordOpts bio
+            | shouldHidePackages = bio.oneWordOpts ++ bio.packageFlags
+            | otherwise = bio.oneWordOpts
+          genOpts = nubOrd
+            (concatMap (concatMap (oneWordOpts . snd) . (.opts)) pkgs)
+          (omittedOpts, ghcOpts) = L.partition badForGhci $
+               concatMap (concatMap ((.opts) . snd) . (.opts)) pkgs
+            ++ map
+                 T.unpack
+                 (  fold config.ghcOptionsByCat
+                    -- ^ include everything, locals, and targets
+                 ++ concatMap (getUserOptions . (.name)) pkgs
+                 )
+          getUserOptions pkg =
+            M.findWithDefault [] pkg config.ghcOptionsByName
+          badForGhci x =
+               L.isPrefixOf "-O" x
+            || elem x (words "-debug -threaded -ticky -static -Werror")
+      unless (null omittedOpts) $
+        prettyWarn $
+             fillSep
+               ( flow "The following GHC options are incompatible with GHCi \
+                      \and have not been passed to it:"
+               : mkNarrativeList (Just Current) False
+                   (map fromString (nubOrd omittedOpts) :: [StyleDoc])
+               )
+          <> line
+      oiDir <- view objectInterfaceDirL
+      let odir =
             [ "-odir=" <> toFilePathNoTrailingSep oiDir
-            , "-hidir=" <> toFilePathNoTrailingSep oiDir ]
-    logInfo $
-      "Configuring GHCi with the following packages: " <>
-      mconcat (L.intersperse ", " (map (fromString . packageNameString . ghciPkgName) pkgs))
-    compilerExeName <- view $ compilerPathsL.to cpCompiler.to toFilePath
-    let execGhci extras = do
-            menv <- liftIO $ configProcessContextSettings config defaultEnvSettings
+            , "-hidir=" <> toFilePathNoTrailingSep oiDir
+            ]
+      prettyInfoL
+        ( flow "Configuring GHCi with the following packages:"
+        : mkNarrativeList (Just Current) False
+            (map (fromPackageName . (.name)) pkgs :: [StyleDoc])
+        )
+      compilerExeName <-
+        view $ compilerPathsL . to (.compiler) . to toFilePath
+      let execGhci extras = do
+            menv <-
+              liftIO $ config.processContextSettings defaultEnvSettings
             withPackageWorkingDir $ withProcessContext menv $ exec
-                 (fromMaybe compilerExeName ghciGhcCommand)
-                 (("--interactive" : ) $
-                 -- This initial "-i" resets the include directories to
-                 -- not include CWD. If there aren't any packages, CWD
-                 -- is included.
-                  (if null pkgs then id else ("-i" : )) $
-                  odir <> pkgopts <> extras <> ghciGhcOptions <> ghciArgs)
-        withPackageWorkingDir =
+              (fromMaybe compilerExeName ghciOpts.ghcCommand)
+              ( ("--interactive" : ) $
+                -- This initial "-i" resets the include directories to not
+                -- include CWD. If there aren't any packages, CWD is included.
+                (if null pkgs then id else ("-i" : )) $
+                     odir
+                  <> pkgopts
+                  <> extras
+                  <> ghciOpts.ghcOptions
+                  <> ghciOpts.args
+              )
+          withPackageWorkingDir =
             case pkgs of
-              [pkg] -> withWorkingDir (toFilePath $ ghciPkgDir pkg)
+              [pkg] -> withWorkingDir (toFilePath pkg.dir)
               _ -> id
-        -- TODO: Consider optimizing this check. Perhaps if no
-        -- "with-ghc" is specified, assume that it is not using intero.
-        checkIsIntero =
-            -- Optimization dependent on the behavior of renderScript -
-            -- it doesn't matter if it's intero or ghci when loading
-            -- multiple packages.
-            case pkgs of
-                [_] -> do
-                    menv <- liftIO $ configProcessContextSettings config defaultEnvSettings
-                    output <- withProcessContext menv
-                            $ runGrabFirstLine (fromMaybe compilerExeName ghciGhcCommand) ["--version"]
-                    pure $ "Intero" `L.isPrefixOf` output
-                _ -> pure False
-    -- Since usage of 'exec' does not pure, we cannot do any cleanup
-    -- on ghci exit. So, instead leave the generated files. To make this
-    -- more efficient and avoid gratuitous generation of garbage, the
-    -- file names are determined by hashing. This also has the nice side
-    -- effect of making it possible to copy the ghci invocation out of
-    -- the log and have it still work.
-    tmpDirectory <-
-        (</> relDirHaskellStackGhci) <$>
-        (parseAbsDir =<< liftIO getCanonicalTemporaryDirectory)
-    ghciDir <- view ghciDirL
-    ensureDir ghciDir
-    ensureDir tmpDirectory
-    macrosOptions <- writeMacrosFile ghciDir pkgs
-    if ghciNoLoadModules
+      -- Since usage of 'exec' does not pure, we cannot do any cleanup on ghci
+      -- exit. So, instead leave the generated files. To make this more
+      -- efficient and avoid gratuitous generation of garbage, the file names
+      -- are determined by hashing. This also has the nice side effect of making
+      -- it possible to copy the ghci invocation out of the log and have it
+      -- still work.
+      tmpDirectory <- getXdgDir XdgCache $
+        Just (relDirStackProgName </> relDirGhciScript)
+      ghciDir <- view ghciDirL
+      ensureDir ghciDir
+      ensureDir tmpDirectory
+      macrosOptions <- writeMacrosFile ghciDir pkgs
+      if ghciOpts.noLoadModules
         then execGhci macrosOptions
         else do
-            checkForDuplicateModules pkgs
-            isIntero <- checkIsIntero
-            scriptOptions <- writeGhciScript tmpDirectory (renderScript isIntero pkgs mainFile ghciOnlyMain extraFiles)
-            execGhci (macrosOptions ++ scriptOptions)
+          checkForDuplicateModules pkgs
+          scriptOptions <-
+            writeGhciScript
+              tmpDirectory
+              (renderScript pkgs mainFile ghciOpts.onlyMain extraFiles)
+          execGhci (macrosOptions ++ scriptOptions)
 
-writeMacrosFile :: HasTerm env => Path Abs Dir -> [GhciPkgInfo] -> RIO env [String]
+writeMacrosFile ::
+     HasTerm env
+  => Path Abs Dir
+  -> [GhciPkgInfo]
+  -> RIO env [String]
 writeMacrosFile outputDirectory pkgs = do
-    fps <- fmap (nubOrd . catMaybes . concat) $
-        forM pkgs $ \pkg -> forM (ghciPkgOpts pkg) $ \(_, bio) -> do
-            let cabalMacros = bioCabalMacros bio
-            exists <- liftIO $ doesFileExist cabalMacros
-            if exists
-                then pure $ Just cabalMacros
-                else do
-                    prettyWarnL ["Didn't find expected autogen file:", pretty cabalMacros]
-                    pure Nothing
-    files <- liftIO $ mapM (S8.readFile . toFilePath) fps
-    if null files then pure [] else do
-        out <- liftIO $ writeHashedFile outputDirectory relFileCabalMacrosH $
-            S8.concat $ map (<> "\n#undef CURRENT_PACKAGE_KEY\n#undef CURRENT_COMPONENT_ID\n") files
-        pure ["-optP-include", "-optP" <> toFilePath out]
+  fps <- fmap (nubOrd . concatMap catMaybes) $
+    forM pkgs $ \pkg -> forM pkg.opts $ \(_, bio) -> do
+      let cabalMacros = bio.cabalMacros
+      exists <- liftIO $ doesFileExist cabalMacros
+      if exists
+        then pure $ Just cabalMacros
+        else do
+          prettyWarnL ["Didn't find expected autogen file:", pretty cabalMacros]
+          pure Nothing
+  files <- liftIO $ mapM (S8.readFile . toFilePath) fps
+  if null files then pure [] else do
+    out <- liftIO $ writeHashedFile outputDirectory relFileCabalMacrosH $
+      S8.concat $ map
+        (<> "\n#undef CURRENT_PACKAGE_KEY\n#undef CURRENT_COMPONENT_ID\n")
+        files
+    pure ["-optP-include", "-optP" <> toFilePath out]
 
 writeGhciScript :: (MonadIO m) => Path Abs Dir -> GhciScript -> m [String]
 writeGhciScript outputDirectory script = do
-    scriptPath <- liftIO $ writeHashedFile outputDirectory relFileGhciScript $
-        LBS.toStrict $ scriptToLazyByteString script
-    let scriptFilePath = toFilePath scriptPath
-    setScriptPerms scriptFilePath
-    pure ["-ghci-script=" <> scriptFilePath]
+  scriptPath <- liftIO $ writeHashedFile outputDirectory relFileGhciScript $
+    LBS.toStrict $ scriptToLazyByteString script
+  let scriptFilePath = toFilePath scriptPath
+  setScriptPerms scriptFilePath
+  pure ["-ghci-script=" <> scriptFilePath]
 
-writeHashedFile :: Path Abs Dir -> Path Rel File -> ByteString -> IO (Path Abs File)
+writeHashedFile ::
+     Path Abs Dir
+  -> Path Rel File
+  -> ByteString
+  -> IO (Path Abs File)
 writeHashedFile outputDirectory relFile contents = do
-    relSha <- shaPathForBytes contents
-    let outDir = outputDirectory </> relSha
-        outFile = outDir </> relFile
-    alreadyExists <- doesFileExist outFile
-    unless alreadyExists $ do
-        ensureDir outDir
-        writeBinaryFileAtomic outFile $ byteString contents
-    pure outFile
-
-renderScript :: Bool -> [GhciPkgInfo] -> Maybe (Path Abs File) -> Bool -> [Path Abs File] -> GhciScript
-renderScript isIntero pkgs mainFile onlyMain extraFiles = do
-    let cdPhase = case (isIntero, pkgs) of
-          -- If only loading one package, set the cwd properly.
-          -- Otherwise don't try. See
-          -- https://github.com/commercialhaskell/stack/issues/3309
-          (True, [pkg]) -> cmdCdGhc (ghciPkgDir pkg)
-          _ -> mempty
-        addPhase = cmdAdd $ S.fromList (map Left allModules ++ addMain)
-        addMain = case mainFile of
-            Just path -> [Right path]
-            _ -> []
-        modulePhase = cmdModule $ S.fromList allModules
-        allModules = nubOrd $ concatMap (M.keys . ghciPkgModules) pkgs
-    case getFileTargets pkgs <> extraFiles of
-        [] ->
-          if onlyMain
-            then cdPhase <> if isJust mainFile then cmdAdd (S.fromList addMain) else mempty
-            else cdPhase <> addPhase <> modulePhase
-        fileTargets -> cmdAdd (S.fromList (map Right fileTargets))
+  relSha <- shaPathForBytes contents
+  let outDir = outputDirectory </> relSha
+      outFile = outDir </> relFile
+  alreadyExists <- doesFileExist outFile
+  unless alreadyExists $ do
+    ensureDir outDir
+    writeBinaryFileAtomic outFile $ byteString contents
+  pure outFile
+
+renderScript ::
+     [GhciPkgInfo]
+  -> Maybe (Path Abs File)
+     -- ^ Path to source file for selected main module. 'Nothing' if no main
+     -- module is to be loaded and imported.
+  -> Bool
+     -- ^ Only load and import the main module?
+  -> [Path Abs File]
+     -- ^ Files targets with unknown GHC options.
+  -> GhciScript
+renderScript pkgs mainFile onlyMain extraFiles = do
+  let allModules = S.unions $ map (M.keysSet . (.modules)) pkgs
+      addMain = maybe S.empty (S.singleton . Right) mainFile
+      -- If a main module is to be :add-ed, the context will be set to
+      -- it:
+      addPhase = cmdAdd $ S.map Left allModules <> addMain
+      modulePhase = cmdModule allModules
+  case getFileTargets pkgs <> extraFiles of
+    [] ->
+      if onlyMain
+        then
+          if isJust mainFile
+            then
+              -- If a main module is to be :add-ed, the context will be set to
+              -- it:
+              cmdAdd addMain
+            else
+              mempty
+        else addPhase <> modulePhase
+    fileTargets -> cmdAdd (S.fromList (map Right fileTargets))
 
 -- Hacky check if module / main phase should be omitted. This should be
 -- improved if / when we have a better per-component load.
 getFileTargets :: [GhciPkgInfo] -> [Path Abs File]
-getFileTargets = concatMap (concat . maybeToList . ghciPkgTargetFiles)
-
--- | Figure out the main-is file to load based on the targets. Asks the
--- user for input if there is more than one candidate main-is file.
-figureOutMainFile
-    :: HasRunner env
-    => BuildOpts
-    -> Maybe (Map PackageName Target)
-    -> [(PackageName, (Path Abs File, Target))]
-    -> [GhciPkgInfo]
-    -> RIO env (Maybe (Path Abs File))
-figureOutMainFile bopts mainIsTargets targets0 packages = do
-    case candidates of
-        [] -> pure Nothing
-        [c@(_,_,fp)] -> do logInfo ("Using main module: " <> RIO.display (renderCandidate c))
-                           pure (Just fp)
-        candidate:_ -> do
-          borderedWarning $ do
-            logWarn "The main module to load is ambiguous. Candidates are: "
-            forM_ (map renderCandidate candidates) (logWarn . RIO.display)
-            logWarn
-                "You can specify which one to pick by: "
-            logWarn
-                (" * Specifying targets to stack ghci e.g. stack ghci " <>
-                RIO.display ( sampleTargetArg candidate))
-            logWarn
-                (" * Specifying what the main is e.g. stack ghci " <>
-                 RIO.display (sampleMainIsArg candidate))
-            logWarn
-                (" * Choosing from the candidate above [1.." <>
-                RIO.display (length candidates) <> "]")
-          liftIO userOption
-  where
-    targets = fromMaybe (M.fromList $ map (\(k, (_, x)) -> (k, x)) targets0)
-                        mainIsTargets
-    candidates = do
-        pkg <- packages
-        case M.lookup (ghciPkgName pkg) targets of
-            Nothing -> []
-            Just target -> do
-                (component,mains) <-
-                    M.toList $
-                    M.filterWithKey (\k _ -> k `S.member` wantedComponents)
-                                    (ghciPkgMainIs pkg)
-                main <- mains
-                pure (ghciPkgName pkg, component, main)
-              where
-                wantedComponents =
-                    wantedPackageComponents bopts target (ghciPkgPackage pkg)
-    renderCandidate c@(pkgName,namedComponent,mainIs) =
-        let candidateIndex = T.pack . show . (+1) . fromMaybe 0 . L.elemIndex c
-            pkgNameText = T.pack (packageNameString pkgName)
-        in  candidateIndex candidates <> ". Package `" <>
-            pkgNameText <>
-            "' component " <>
-            -- This is the format that can be directly copy-pasted as
-            -- an argument to `stack ghci`.
-            pkgNameText <> ":" <> renderComp namedComponent <>
-            " with main-is file: " <>
-            T.pack (toFilePath mainIs)
-    candidateIndices = take (length candidates) [1 :: Int ..]
-    userOption = do
-      option <- prompt "Specify main module to use (press enter to load none): "
-      let selected = fromMaybe
-                      ((+1) $ length candidateIndices)
-                      (readMaybe (T.unpack option) :: Maybe Int)
-      case L.elemIndex selected candidateIndices  of
-        Nothing -> do
-            putStrLn
-              "Not loading any main modules, as no valid module selected"
-            putStrLn ""
-            pure Nothing
-        Just op -> do
-            let (_,_,fp) = candidates L.!! op
-            putStrLn
-              ("Loading main module from candidate " <>
-              show (op + 1) <> ", --main-is " <>
-              toFilePath fp)
-            putStrLn ""
-            pure $ Just fp
-    renderComp c =
-        case c of
-            CLib -> "lib"
-            CInternalLib name -> "internal-lib:" <> name
-            CExe name -> "exe:" <> name
-            CTest name -> "test:" <> name
-            CBench name -> "bench:" <> name
-    sampleTargetArg (pkg,comp,_) =
-        T.pack (packageNameString pkg) <> ":" <> renderComp comp
-    sampleMainIsArg (pkg,comp,_) =
-        "--main-is " <> T.pack (packageNameString pkg) <> ":" <> renderComp comp
-
-loadGhciPkgDescs
-    :: HasEnvConfig env
-    => BuildOptsCLI
-    -> [(PackageName, (Path Abs File, Target))]
-    -> RIO env [GhciPkgDesc]
+getFileTargets = concatMap (concat . maybeToList . (.targetFiles))
+
+-- | Figure out the main-is file to load based on the targets. Asks the user for
+-- input if there is more than one candidate main-is file.
+figureOutMainFile ::
+     (HasRunner env, HasTerm env)
+  => BuildOpts
+  -> Maybe (Map PackageName Target)
+  -> [(PackageName, (Path Abs File, Target))]
+  -> [GhciPkgInfo]
+  -> RIO env (Maybe (Path Abs File))
+figureOutMainFile bopts mainIsTargets targets0 packages =
+  case candidates of
+    [] -> pure Nothing
+    [c@(_,_,fp)] -> do
+      prettyInfo $
+           fillSep
+             [ "Using"
+             , style Current "main"
+             , "module:"
+             ]
+        <> line
+        <> renderCandidate c
+        <> line
+      pure (Just fp)
+    candidate:_ -> do
+      prettyWarn $
+           fillSep
+             [ "The"
+             , style Current "main"
+             , flow "module to load is ambiguous. Candidates are:"
+             ]
+        <> line
+        <> mconcat (L.intersperse line (map renderCandidate candidates))
+        <> blankLine
+        <> flow "You can specify which one to pick by:"
+        <> line
+        <> bulletedList
+             [ fillSep
+                 [ flow "Specifying targets to"
+                 , style Shell (flow "stack ghci")
+                 , "e.g."
+                 , style Shell ( fillSep
+                                   [ flow "stack ghci"
+                                   , sampleTargetArg candidate
+                                   ]
+                               ) <> "."
+                 ]
+             , fillSep
+                 [ flow "Specifying what the"
+                 , style Current "main"
+                 , flow "is e.g."
+                 , style Shell ( fillSep
+                                   [ flow "stack ghci"
+                                   , sampleMainIsArg candidate
+                                   ]
+                               ) <> "."
+                 ]
+              , flow
+                  $  "Choosing from the candidate above [1.."
+                  <> show (length candidates)
+                  <> "]."
+             ]
+        <> line
+      liftIO userOption
+ where
+  targets = fromMaybe
+    (M.fromList $ map (\(k, (_, x)) -> (k, x)) targets0)
+    mainIsTargets
+  candidates = do
+    pkg <- packages
+    case M.lookup pkg.name targets of
+      Nothing -> []
+      Just target -> do
+        (component,mains) <-
+          M.toList $
+          M.filterWithKey (\k _ -> k `S.member` wantedComponents)
+                          pkg.mainIs
+        main <- mains
+        pure (pkg.name, component, main)
+       where
+        wantedComponents =
+          wantedPackageComponents bopts target pkg.package
+  renderCandidate c@(pkgName, namedComponent, mainIs) =
+    let candidateIndex =
+          fromString . show . (+1) . fromMaybe 0 . L.elemIndex c
+        pkgNameText = fromPackageName pkgName
+    in  hang 4
+          $  fill 4 ( candidateIndex candidates <> ".")
+          <> fillSep
+               [ "Package"
+               , style Current pkgNameText <> ","
+               , "component"
+                 -- This is the format that can be directly copy-pasted as an
+                 -- argument to `stack ghci`.
+               , style
+                   PkgComponent
+                   (  pkgNameText
+                   <> ":"
+                   <> renderComponentTo namedComponent
+                   )
+                 <> ","
+               , "with"
+               , style Shell "main-is"
+               , "file:"
+               , pretty mainIs <> "."
+               ]
+  candidateIndices = take (length candidates) [1 :: Int ..]
+  userOption = do
+    option <- prompt "Specify main module to use (press enter to load none): "
+    let selected = fromMaybe
+          ((+1) $ length candidateIndices)
+          (readMaybe (T.unpack option) :: Maybe Int)
+    case L.elemIndex selected candidateIndices of
+      Nothing -> do
+        putStrLn
+          "Not loading any main modules, as no valid module selected"
+        putStrLn ""
+        pure Nothing
+      Just op -> do
+        (_, _, fp) <- maybe
+          (prettyThrowIO CandidatesIndexOutOfRangeBug)
+          pure
+          (candidates !? op)
+        putStrLn
+          ("Loading main module from candidate " <>
+          show (op + 1) <> ", --main-is " <>
+          toFilePath fp)
+        putStrLn ""
+        pure $ Just fp
+  sampleTargetArg (pkg, comp, _) =
+       fromPackageName pkg
+    <> ":"
+    <> renderComponentTo comp
+  sampleMainIsArg (pkg, comp, _) =
+    fillSep
+      [ "--main-is"
+      , fromPackageName pkg <> ":" <> renderComponentTo comp
+      ]
+
+loadGhciPkgDescs ::
+     HasEnvConfig env
+  => BuildOptsCLI
+  -> [(PackageName, (Path Abs File, Target))]
+  -> RIO env [GhciPkgDesc]
 loadGhciPkgDescs buildOptsCLI localTargets =
-    forM localTargets $ \(name, (cabalfp, target)) ->
-        loadGhciPkgDesc buildOptsCLI name cabalfp target
+  forM localTargets $ \(name, (cabalFP, target)) ->
+    loadGhciPkgDesc buildOptsCLI name cabalFP target
 
 -- | Load package description information for a ghci target.
-loadGhciPkgDesc
-    :: HasEnvConfig env
-    => BuildOptsCLI
-    -> PackageName
-    -> Path Abs File
-    -> Target
-    -> RIO env GhciPkgDesc
-loadGhciPkgDesc buildOptsCLI name cabalfp target = do
-    econfig <- view envConfigL
-    compilerVersion <- view actualCompilerVersionL
-    let SourceMap{..} = envConfigSourceMap econfig
-        -- Currently this source map is being build with
-        -- the default targets
-        sourceMapGhcOptions = fromMaybe [] $
-          (cpGhcOptions . ppCommon <$> M.lookup name smProject)
-          <|>
-          (cpGhcOptions . dpCommon <$> M.lookup name smDeps)
-        sourceMapCabalConfigOpts = fromMaybe [] $
-          (cpCabalConfigOpts . ppCommon <$> M.lookup name smProject)
-          <|>
-          (cpCabalConfigOpts . dpCommon <$> M.lookup name smDeps)
-        sourceMapFlags = maybe mempty (cpFlags . ppCommon) $ M.lookup name smProject
-        config =
-            PackageConfig
-            { packageConfigEnableTests = True
-            , packageConfigEnableBenchmarks = True
-            , packageConfigFlags = getLocalFlags buildOptsCLI name `M.union` sourceMapFlags
-            , packageConfigGhcOptions = sourceMapGhcOptions
-            , packageConfigCabalConfigOpts = sourceMapCabalConfigOpts
-            , packageConfigCompilerVersion = compilerVersion
-            , packageConfigPlatform = view platformL econfig
-            }
-    -- TODO we've already parsed this information, otherwise we
-    -- wouldn't have figured out the cabalfp already. In the future:
-    -- retain that GenericPackageDescription in the relevant data
-    -- structures to avoid reparsing.
-    (gpdio, _name, _cabalfp) <- loadCabalFilePath (parent cabalfp)
-    gpkgdesc <- liftIO $ gpdio YesPrintWarnings
-
-    -- Source the package's *.buildinfo file created by configure if any. See
-    -- https://www.haskell.org/cabal/users-guide/developing-packages.html#system-dependent-parameters
-    buildinfofp <- parseRelFile (packageNameString name ++ ".buildinfo")
-    hasDotBuildinfo <- doesFileExist (parent cabalfp </> buildinfofp)
-    let mbuildinfofp
-          | hasDotBuildinfo = Just (parent cabalfp </> buildinfofp)
-          | otherwise = Nothing
-    mbuildinfo <- forM mbuildinfofp readDotBuildinfo
-    let pdp = resolvePackageDescription config gpkgdesc
-        pkg =
-            packageFromPackageDescription config (C.genPackageFlags gpkgdesc) $
-            maybe
-              pdp
-              (\bi ->
-               let PackageDescriptionPair x y = pdp
-                in PackageDescriptionPair
-                    (C.updatePackageDescription bi x)
-                    (C.updatePackageDescription bi y))
-              mbuildinfo
-    pure GhciPkgDesc
-      { ghciDescPkg = pkg
-      , ghciDescCabalFp = cabalfp
-      , ghciDescTarget = target
-      }
-
-getGhciPkgInfos
-    :: HasEnvConfig env
-    => InstallMap
-    -> [PackageName]
-    -> Maybe (Map PackageName [Path Abs File])
-    -> [GhciPkgDesc]
-    -> RIO env [GhciPkgInfo]
+loadGhciPkgDesc ::
+     HasEnvConfig env
+  => BuildOptsCLI
+  -> PackageName
+  -> Path Abs File
+  -> Target
+  -> RIO env GhciPkgDesc
+loadGhciPkgDesc buildOptsCLI name cabalFP target = do
+  econfig <- view envConfigL
+  compilerVersion <- view actualCompilerVersionL
+  let sm = econfig.sourceMap
+      -- Currently this source map is being build with
+      -- the default targets
+      sourceMapGhcOptions = fromMaybe [] $
+        ((.projectCommon.ghcOptions) <$> M.lookup name sm.project)
+        <|>
+        ((.depCommon.ghcOptions) <$> M.lookup name sm.deps)
+      sourceMapCabalConfigOpts = fromMaybe [] $
+        ( (.projectCommon.cabalConfigOpts) <$> M.lookup name sm.project)
+        <|>
+        ((.depCommon.cabalConfigOpts) <$> M.lookup name sm.deps)
+      sourceMapFlags =
+        maybe mempty (.projectCommon.flags) $ M.lookup name sm.project
+      config = PackageConfig
+        { enableTests = True
+        , enableBenchmarks = True
+        , flags = getCliFlags <> sourceMapFlags
+        , ghcOptions = sourceMapGhcOptions
+        , cabalConfigOpts = sourceMapCabalConfigOpts
+        , compilerVersion = compilerVersion
+        , platform = view platformL econfig
+        }
+  -- TODO we've already parsed this information, otherwise we wouldn't have
+  -- figured out the cabalFP already. In the future: retain that
+  -- GenericPackageDescription in the relevant data structures to avoid
+  -- reparsing.
+  (gpdio, _name, _cabalFP) <-
+    loadCabalFilePath (Just stackProgName') (parent cabalFP)
+  gpkgdesc <- liftIO $ gpdio YesPrintWarnings
+
+  -- Source the package's *.buildinfo file created by configure if any. See
+  -- https://www.haskell.org/cabal/users-guide/developing-packages.html#system-dependent-parameters
+  buildinfofp <- parseRelFile (packageNameString name ++ ".buildinfo")
+  hasDotBuildinfo <- doesFileExist (parent cabalFP </> buildinfofp)
+  let mbuildinfofp
+        | hasDotBuildinfo = Just (parent cabalFP </> buildinfofp)
+        | otherwise = Nothing
+  mbuildinfo <- forM mbuildinfofp readDotBuildinfo
+  let pdp = resolvePackageDescription config gpkgdesc
+      package =
+        packageFromPackageDescription config (C.genPackageFlags gpkgdesc) $
+          maybe pdp (`C.updatePackageDescription` pdp) mbuildinfo
+  pure GhciPkgDesc
+    { package
+    , cabalFP
+    , target
+    }
+ where
+  cliFlags = buildOptsCLI.flags
+  -- | All CLI Cabal flags for a package.
+  getCliFlags :: Map FlagName Bool
+  getCliFlags = Map.unions
+    [ Map.findWithDefault Map.empty (ACFByName name) cliFlags
+    , Map.findWithDefault Map.empty ACFAllProjectPackages cliFlags
+    ]
+
+getGhciPkgInfos ::
+     HasEnvConfig env
+  => InstallMap
+  -> [PackageName]
+  -> Maybe (Map PackageName [Path Abs File])
+  -> [GhciPkgDesc]
+  -> RIO env [GhciPkgInfo]
 getGhciPkgInfos installMap addPkgs mfileTargets localTargets = do
-    (installedMap, _, _, _) <- getInstalled installMap
-    let localLibs =
-            [ packageName (ghciDescPkg desc)
-            | desc <- localTargets
-            , hasLocalComp isCLib (ghciDescTarget desc)
-            ]
-    forM localTargets $ \pkgDesc ->
-      makeGhciPkgInfo installMap installedMap localLibs addPkgs mfileTargets pkgDesc
+  (installedMap, _, _, _) <- getInstalled installMap
+  let localLibs =
+        [ desc.package.name
+        | desc <- localTargets
+        , hasLocalComp isCLib desc.target
+        ]
+  forM localTargets $ \pkgDesc ->
+    makeGhciPkgInfo installMap installedMap localLibs addPkgs mfileTargets pkgDesc
 
 -- | Make information necessary to load the given package in GHCi.
-makeGhciPkgInfo
-    :: HasEnvConfig env
-    => InstallMap
-    -> InstalledMap
-    -> [PackageName]
-    -> [PackageName]
-    -> Maybe (Map PackageName [Path Abs File])
-    -> GhciPkgDesc
-    -> RIO env GhciPkgInfo
+makeGhciPkgInfo ::
+     HasEnvConfig env
+  => InstallMap
+  -> InstalledMap
+  -> [PackageName]
+  -> [PackageName]
+  -> Maybe (Map PackageName [Path Abs File])
+  -> GhciPkgDesc
+  -> RIO env GhciPkgInfo
 makeGhciPkgInfo installMap installedMap locals addPkgs mfileTargets pkgDesc = do
-    bopts <- view buildOptsL
-    let pkg = ghciDescPkg pkgDesc
-        cabalfp = ghciDescCabalFp pkgDesc
-        target = ghciDescTarget pkgDesc
-        name = packageName pkg
-    (mods,files,opts) <- getPackageOpts (packageOpts pkg) installMap installedMap locals addPkgs cabalfp
-    let filteredOpts = filterWanted opts
-        filterWanted = M.filterWithKey (\k _ -> k `S.member` allWanted)
-        allWanted = wantedPackageComponents bopts target pkg
-    pure
-        GhciPkgInfo
-        { ghciPkgName = name
-        , ghciPkgOpts = M.toList filteredOpts
-        , ghciPkgDir = parent cabalfp
-        , ghciPkgModules = unionModuleMaps $
-          map (\(comp, mp) -> M.map (\fp -> M.singleton fp (S.singleton (packageName pkg, comp))) mp)
-              (M.toList (filterWanted mods))
-        , ghciPkgMainIs = M.map (mapMaybe dotCabalMainPath) files
-        , ghciPkgCFiles = mconcat (M.elems (filterWanted (M.map (mapMaybe dotCabalCFilePath) files)))
-        , ghciPkgTargetFiles = mfileTargets >>= M.lookup name
-        , ghciPkgPackage = pkg
-        }
+  bopts <- view buildOptsL
+  let package = pkgDesc.package
+      cabalFP = pkgDesc.cabalFP
+      target = pkgDesc.target
+      name = package.name
+      dir = parent cabalFP
+      targetFiles = mfileTargets >>= M.lookup name
+  (mods, files, allOpts) <-
+    getPackageOpts package installMap installedMap locals addPkgs cabalFP
+  let opts = M.toList $ filterWanted allOpts
+      filterWanted :: Map NamedComponent a -> Map NamedComponent a
+      filterWanted = M.filterWithKey (\k _ -> k `S.member` allWanted)
+      allWanted = wantedPackageComponents bopts target package
+      modules = unionModuleMaps $
+        map
+          ( \(comp, mp) -> M.map
+              (\fp -> M.singleton fp (S.singleton (name, comp)))
+              mp
+          )
+          (M.toList (filterWanted mods))
+      mainIs = M.map (mapMaybe dotCabalMainPath) files
+      cFiles = mconcat
+        (M.elems (filterWanted (M.map (mapMaybe dotCabalCFilePath) files)))
+  pure GhciPkgInfo
+    { name
+    , opts
+    , dir
+    , modules
+    , mainIs
+    , cFiles
+    , targetFiles
+    , package
+    }
 
 -- NOTE: this should make the same choices as the components code in
 -- 'loadLocalPackage'. Unfortunately for now we reiterate this logic
 -- (differently).
 wantedPackageComponents :: BuildOpts -> Target -> Package -> Set NamedComponent
 wantedPackageComponents _ (TargetComps cs) _ = cs
-wantedPackageComponents bopts (TargetAll PTProject) pkg = S.fromList $
-    (case packageLibraries pkg of
-       NoLibraries -> []
-       HasLibraries names -> CLib : map CInternalLib (S.toList names)) ++
-    map CExe (S.toList (packageExes pkg)) <>
-    map CInternalLib (S.toList $ packageInternalLibraries pkg) <>
-    (if boptsTests bopts then map CTest (M.keys (packageTests pkg)) else []) <>
-    (if boptsBenchmarks bopts then map CBench (S.toList (packageBenchmarks pkg)) else [])
+wantedPackageComponents bopts (TargetAll PTProject) pkg =
+     ( if hasBuildableMainLibrary pkg
+         then S.insert CLib (S.mapMonotonic CSubLib buildableForeignLibs')
+         else S.empty
+     )
+  <> S.mapMonotonic CExe buildableExes'
+  <> S.mapMonotonic CSubLib buildableSubLibs'
+  <> ( if bopts.tests
+         then S.mapMonotonic CTest buildableTestSuites'
+         else S.empty
+     )
+  <> ( if bopts.benchmarks
+         then S.mapMonotonic CBench buildableBenchmarks'
+         else S.empty
+     )
+ where
+  buildableForeignLibs' = buildableForeignLibs pkg
+  buildableSubLibs' = buildableSubLibs pkg
+  buildableExes' = buildableExes pkg
+  buildableTestSuites' = buildableTestSuites pkg
+  buildableBenchmarks' = buildableBenchmarks pkg
 wantedPackageComponents _ _ _ = S.empty
 
-checkForIssues :: HasLogFunc env => [GhciPkgInfo] -> RIO env ()
-checkForIssues pkgs = do
-    when (length pkgs > 1) $ borderedWarning $ do
-        -- Cabal flag issues could arise only when there are at least 2 packages
-        unless (null cabalFlagIssues) $ borderedWarning $ do
-            logWarn "Warning: There are cabal flags for this project which may prevent GHCi from loading your code properly."
-            logWarn "In some cases it can also load some projects which would otherwise fail to build."
-            logWarn ""
-            mapM_ (logWarn . RIO.display) $ L.intercalate [""] cabalFlagIssues
-            logWarn ""
-            logWarn "To resolve, remove the flag(s) from the Cabal file(s) and instead put them at the top of the haskell files."
-            logWarn ""
-        logWarn "It isn't yet possible to load multiple packages into GHCi in all cases - see"
-        logWarn "https://ghc.haskell.org/trac/ghc/ticket/10827"
-  where
-    cabalFlagIssues = concatMap mixedFlag
-        [ ( "-XNoImplicitPrelude"
-          , [ "-XNoImplicitPrelude will be used, but GHCi will likely fail to build things which depend on the implicit prelude."]
-          )
-        , ( "-XCPP"
-          , [ "-XCPP will be used, but it can cause issues with multiline strings."
-            , "See https://downloads.haskell.org/~ghc/7.10.2/docs/html/users_guide/options-phases.html#cpp-string-gaps"
-            ]
-          )
-        , ( "-XNoTraditionalRecordSyntax"
-          , [ "-XNoTraditionalRecordSyntax will be used, but it break modules which use record syntax." ]
-          )
-        , ( "-XTemplateHaskell"
-          , [ "-XTemplateHaskell will be used, but it may cause compilation issues due to different parsing of '$' when there's no space after it." ]
-          )
-        , ( "-XQuasiQuotes"
-          , [ "-XQuasiQuotes will be used, but it may cause parse failures due to a different meaning for list comprehension syntax like [x| ... ]" ]
-          )
-        , ( "-XSafe"
-          , [ "-XSafe will be used, but it will fail to compile unsafe modules." ]
-          )
-        , ( "-XArrows"
-          , [ "-XArrows will be used, but it will cause non-arrow usages of proc, (-<), (-<<) to fail" ]
-          )
-        , ( "-XOverloadedStrings"
-          , [ "-XOverloadedStrings will be used, but it can cause type ambiguity in code not usually compiled with it." ]
-          )
-        , ( "-XOverloadedLists"
-          , [ "-XOverloadedLists will be used, but it can cause type ambiguity in code not usually compiled with it." ]
-          )
-        , ( "-XMonoLocalBinds"
-          , [ "-XMonoLocalBinds will be used, but it can cause type errors in code which expects generalized local bindings." ]
-          )
-        , ( "-XTypeFamilies"
-          , [ "-XTypeFamilies will be used, but it implies -XMonoLocalBinds, and so can cause type errors in code which expects generalized local bindings." ]
-          )
-        , ( "-XGADTs"
-          , [ "-XGADTs will be used, but it implies -XMonoLocalBinds, and so can cause type errors in code which expects generalized local bindings." ]
-          )
-        , ( "-XNewQualifiedOperators"
-          , [ "-XNewQualifiedOperators will be used, but this will break usages of the old qualified operator syntax." ]
-          )
+checkForIssues :: HasTerm env => [GhciPkgInfo] -> RIO env ()
+checkForIssues pkgs =
+  when (length pkgs > 1) $ do
+    -- Cabal flag issues could arise only when there are at least 2 packages
+    unless (null cabalFlagIssues) $ do
+      prettyWarn $
+           flow "There are Cabal flags for this project which may prevent \
+                \GHCi from loading your code properly. In some cases it \
+                \can also load some projects which would otherwise fail to \
+                \build."
+        <> blankLine
+        <> mconcat (L.intersperse blankLine cabalFlagIssues)
+        <> blankLine
+        <> flow "To resolve, remove the flag(s) from the Cabal file(s) and \
+                \instead put them at the top of the Haskell files."
+        <> blankLine
+    prettyWarnL
+      [ flow "It isn't yet possible to load multiple packages into GHCi in \
+             \all cases. For further information, see"
+      , style Url "https://ghc.haskell.org/trac/ghc/ticket/10827" <> "."
+      ]
+ where
+  cabalFlagIssues = concatMap mixedFlag
+    [ ( "-XNoImplicitPrelude"
+      , [ flow "-XNoImplicitPrelude will be used, but GHCi will likely fail to \
+               \build things which depend on the implicit prelude."
         ]
-    mixedFlag (flag, msgs) =
-        let x = partitionComps (== flag) in
-        [ msgs ++ showWhich x | mixedSettings x ]
-    mixedSettings (xs, ys) = xs /= [] && ys /= []
-    showWhich (haveIt, don'tHaveIt) =
-        [ "It is specified for:"
-        , "    " <> renderPkgComponents haveIt
-        , "But not for: "
-        , "    " <> renderPkgComponents don'tHaveIt
+      )
+    , ( "-XCPP"
+      , [ flow "-XCPP will be used, but it can cause issues with multiline \
+               \strings. For further information, see"
+        , style Url "https://downloads.haskell.org/~ghc/7.10.2/docs/html/users_guide/options-phases.html#cpp-string-gaps" <> "."
         ]
-    partitionComps f = (map fst xs, map fst ys)
-      where
-        (xs, ys) = L.partition (any f . snd) compsWithOpts
-    compsWithOpts = map (\(k, bio) -> (k, bioOneWordOpts bio ++ bioOpts bio)) compsWithBios
-    compsWithBios =
-        [ ((ghciPkgName pkg, c), bio)
-        | pkg <- pkgs
-        , (c, bio) <- ghciPkgOpts pkg
+      )
+    , ( "-XNoTraditionalRecordSyntax"
+      , [ flow "-XNoTraditionalRecordSyntax will be used, but it break modules \
+               \which use record syntax."
         ]
-
-borderedWarning :: HasLogFunc env => RIO env a -> RIO env a
-borderedWarning f = do
-    logWarn ""
-    logWarn "* * * * * * * *"
-    x <- f
-    logWarn "* * * * * * * *"
-    logWarn ""
-    pure x
+      )
+    , ( "-XTemplateHaskell"
+      , [ flow "-XTemplateHaskell will be used, but it may cause compilation \
+               \issues due to different parsing of '$' when there's no space \
+               \after it."
+        ]
+      )
+    , ( "-XQuasiQuotes"
+      , [ flow "-XQuasiQuotes will be used, but it may cause parse failures \
+               \due to a different meaning for list comprehension syntax like \
+               \[x| ... ]"
+          ]
+      )
+    , ( "-XSafe"
+      , [ flow "-XSafe will be used, but it will fail to compile unsafe \
+               \modules."
+        ]
+      )
+    , ( "-XArrows"
+      , [ flow "-XArrows will be used, but it will cause non-arrow usages of \
+               \proc, (-<), (-<<) to fail"
+        ]
+      )
+    , ( "-XOverloadedStrings"
+      , [ flow "-XOverloadedStrings will be used, but it can cause type \
+               \ambiguity in code not usually compiled with it."
+        ]
+      )
+    , ( "-XOverloadedLists"
+      , [ flow "-XOverloadedLists will be used, but it can cause type \
+               \ambiguity in code not usually compiled with it."
+        ]
+      )
+    , ( "-XMonoLocalBinds"
+      , [ flow "-XMonoLocalBinds will be used, but it can cause type errors in \
+               \code which expects generalized local bindings." ]
+      )
+    , ( "-XTypeFamilies"
+      , [ flow "-XTypeFamilies will be used, but it implies -XMonoLocalBinds, \
+               \and so can cause type errors in code which expects generalized \
+               \local bindings." ]
+      )
+    , ( "-XGADTs"
+      , [ flow "-XGADTs will be used, but it implies -XMonoLocalBinds, and so \
+               \can cause type errors in code which expects generalized local \
+               \bindings." ]
+      )
+    , ( "-XNewQualifiedOperators"
+      , [ flow "-XNewQualifiedOperators will be used, but this will break \
+               \usages of the old qualified operator syntax." ]
+      )
+    ]
+  mixedFlag (flag, msgs) =
+    let x = partitionComps (== flag)
+    in  [ fillSep $ msgs ++ showWhich x | mixedSettings x ]
+  mixedSettings (xs, ys) = xs /= [] && ys /= []
+  showWhich (haveIt, don'tHaveIt) =
+       [ flow "It is specified for:" ]
+    <> mkNarrativeList (Just PkgComponent) False
+         (map (fromString . T.unpack . renderPkgComponent) haveIt :: [StyleDoc])
+    <> [ flow "But not for:" ]
+    <> mkNarrativeList (Just PkgComponent) False
+         (map (fromString . T.unpack . renderPkgComponent) don'tHaveIt :: [StyleDoc])
+  partitionComps f = (map fst xs, map fst ys)
+   where
+    (xs, ys) = L.partition (any f . snd) compsWithOpts
+  compsWithOpts = map (\(k, bio) ->
+    (k, bio.oneWordOpts ++ bio.opts)) compsWithBios
+  compsWithBios =
+    [ ((pkg.name, c), bio)
+    | pkg <- pkgs
+    , (c, bio) <- pkg.opts
+    ]
 
 -- TODO: Should this also tell the user the filepaths, not just the
 -- module name?
 checkForDuplicateModules :: HasTerm env => [GhciPkgInfo] -> RIO env ()
-checkForDuplicateModules pkgs = do
-    unless (null duplicates) $ do
-        borderedWarning $ do
-            prettyWarn $ "Multiple files use the same module name:" <>
-              line <> bulletedList (map prettyDuplicate duplicates)
-        -- MSS 2020-10-13 Disabling, may remove entirely in the future
-        -- See: https://github.com/commercialhaskell/stack/issues/5407#issuecomment-707339928
-        -- throwM LoadingDuplicateModules
-  where
-    duplicates :: [(ModuleName, Map (Path Abs File) (Set (PackageName, NamedComponent)))]
-    duplicates =
-      filter (\(_, mp) -> M.size mp > 1) $
-      M.toList $
-      unionModuleMaps (map ghciPkgModules pkgs)
-    prettyDuplicate :: (ModuleName, Map (Path Abs File) (Set (PackageName, NamedComponent))) -> StyleDoc
-    prettyDuplicate (mn, mp) =
-      style Error (pretty mn) <+> "found at the following paths" <> line <>
-      bulletedList (map fileDuplicate (M.toList mp))
-    fileDuplicate :: (Path Abs File, Set (PackageName, NamedComponent)) -> StyleDoc
-    fileDuplicate (fp, comps) =
-      pretty fp <+> parens (fillSep (punctuate "," (map displayPkgComponent (S.toList comps))))
-
-targetWarnings
-  :: HasBuildConfig env
+checkForDuplicateModules pkgs =
+  unless (null duplicates) $
+    -- Two or more files with the same module name are treated as a warning
+    -- rather than an error. See:
+    -- https://github.com/commercialhaskell/stack/issues/5407#issuecomment-707339928
+    prettyWarn $
+         flow "Multiple files use the same module name:"
+      <> line
+      <> bulletedList (map prettyDuplicate duplicates)
+      <> line
+ where
+  duplicates ::
+    [(ModuleName, Map (Path Abs File) (Set (PackageName, NamedComponent)))]
+  duplicates =
+    filter (\(_, mp) -> M.size mp > 1) $
+    M.toList $
+    unionModuleMaps (map (.modules) pkgs)
+  prettyDuplicate ::
+       (ModuleName, Map (Path Abs File) (Set (PackageName, NamedComponent)))
+    -> StyleDoc
+  prettyDuplicate (mn, mp) =
+       fillSep
+         [ style Error (pretty mn)
+         , flow "found at the following paths"
+         ]
+    <> line
+    <> bulletedList (map fileDuplicate (M.toList mp))
+  fileDuplicate ::
+    (Path Abs File, Set (PackageName, NamedComponent)) -> StyleDoc
+  fileDuplicate (fp, comps) =
+    fillSep
+      [ pretty fp
+      , parens $
+          fillSep $ punctuate "," (map displayPkgComponent (S.toList comps))
+      ]
+
+targetWarnings ::
+     HasBuildConfig env
   => [(PackageName, (Path Abs File, Target))]
   -> [PackageName]
   -> Maybe (Map PackageName [Path Abs File], [Path Abs File])
@@ -876,105 +1166,108 @@ targetWarnings localTargets nonLocalTargets mfileTargets = do
   unless (null nonLocalTargets) $
     prettyWarnL
       [ flow "Some targets"
-      , parens $ fillSep $ punctuate "," $ map (style Good . fromString . packageNameString) nonLocalTargets
-      , flow "are not local packages, and so cannot be directly loaded."
-      , flow "In future versions of Stack, this might be supported - see"
-      , style Url "https://github.com/commercialhaskell/stack/issues/1441"
-      , "."
-      , flow "It can still be useful to specify these, as they will be passed to ghci via -package flags."
+      , parens $ fillSep $ punctuate "," $ map
+          (style Good . fromPackageName)
+          nonLocalTargets
+      , flow "are not project packages, and so cannot be directly loaded. In \
+             \future versions of Stack, this might be supported - see"
+      , style Url "https://github.com/commercialhaskell/stack/issues/1441" <> "."
+      , flow "It can still be useful to specify these, as they will be passed \
+             \to ghci via"
+      , style Shell "-package"
+      , "flags."
       ]
   when (null localTargets && isNothing mfileTargets) $ do
-      smWanted <- view $ buildConfigL.to bcSMWanted
-      stackYaml <- view stackYamlL
-      prettyNote $ vsep
-          [ flow "No local targets specified, so a plain ghci will be started with no package hiding or package options."
-          , ""
-          , flow $ T.unpack $ utf8BuilderToText $
-                   "You are using snapshot: " <>
-                   RIO.display (smwSnapshotLocation smWanted)
-          , ""
-          , flow "If you want to use package hiding and options, then you can try one of the following:"
-          , ""
-          , bulletedList
-              [ fillSep
-                  [ flow "If you want to start a different project configuration than" <+> pretty stackYaml <> ", then you can use"
-                  , style Shell "stack init"
-                  , flow "to create a new stack.yaml for the packages in the current directory."
-                  , line
-                  ]
-              , flow "If you want to use the project configuration at" <+> pretty stackYaml <> ", then you can add to its 'packages' field."
-              ]
-          , ""
-          ]
+    smWanted <- view $ buildConfigL . to (.smWanted)
+    view configFileL >>= \case
+      -- A user-specific global configuration file
+      Left _ -> prettyThrowM ConfigFileNotProjectLevelBug
+      -- A project-level configuration file
+      Right projectConfigFile -> prettyNote $ vsep
+        [ flow "No project package targets specified, so a plain ghci will be \
+               \started with no package hiding or package options."
+        , ""
+        , flow $ T.unpack $ utf8BuilderToText $
+                 "You are using snapshot: " <>
+                 display smWanted.snapshotLocation
+        , ""
+        , flow "If you want to use package hiding and options, then you can try \
+               \one of the following:"
+        , ""
+        , bulletedList
+            [ fillSep
+                [ flow "If you want to start a different project configuration \
+                       \than"
+                , pretty projectConfigFile <> ","
+                , flow "then you can use"
+                , style Shell "stack init"
+                , flow "to create a new"
+                , style File "stack.yaml"
+                , flow "for the packages in the current directory."
+                , line
+                ]
+            , flow "If you want to use the project configuration at"
+            , pretty projectConfigFile <> ","
+            , flow "then you can add to the value of its"
+            , style Shell "packages"
+            , "key."
+            ]
+        , ""
+        ]
 
--- Adds in intermediate dependencies between ghci targets. Note that it
--- will return a Lib component for these intermediate dependencies even
--- if they don't have a library (but that's fine for the usage within
--- this module).
+-- Adds in intermediate dependencies between ghci targets. Note that it will
+-- return a Lib component for these intermediate dependencies even if they don't
+-- have a library (but that's fine for the usage within this module).
 --
--- If 'True' is passed for loadAllDeps, this loads all local deps, even
--- if they aren't intermediate.
-getExtraLoadDeps
-    :: Bool
-    -> Map PackageName LocalPackage
-    -> [(PackageName, (Path Abs File, Target))]
-    -> [(PackageName, (Path Abs File, Target))]
+-- If 'True' is passed for loadAllDeps, this loads all local deps, even if they
+-- aren't intermediate.
+getExtraLoadDeps ::
+     Bool
+  -> Map PackageName LocalPackage
+  -> [(PackageName, (Path Abs File, Target))]
+  -> [(PackageName, (Path Abs File, Target))]
 getExtraLoadDeps loadAllDeps localMap targets =
-    M.toList $
-    (\mp -> foldl' (flip M.delete) mp (map fst targets)) $
-    M.mapMaybe id $
-    execState (mapM_ (mapM_ go . getDeps . fst) targets)
-              (M.fromList (map (second Just) targets))
-  where
-    getDeps :: PackageName -> [PackageName]
-    getDeps name =
-        case M.lookup name localMap of
-            Just lp -> M.keys (packageDeps (lpPackage lp)) -- FIXME just Local?
-            _ -> []
-    go :: PackageName -> State (Map PackageName (Maybe (Path Abs File, Target))) Bool
-    go name = do
-        cache <- get
-        case (M.lookup name cache, M.lookup name localMap) of
-            (Just (Just _), _) -> pure True
-            (Just Nothing, _) | not loadAllDeps -> pure False
-            (_, Just lp) -> do
-                let deps = M.keys (packageDeps (lpPackage lp))
-                shouldLoad <- liftM or $ mapM go deps
-                if shouldLoad
-                    then do
-                        modify (M.insert name (Just (lpCabalFile lp, TargetComps (S.singleton CLib))))
-                        pure True
-                    else do
-                        modify (M.insert name Nothing)
-                        pure False
-            (_, _) -> pure False
+  M.toList $
+  (\mp -> foldl' (flip M.delete) mp (map fst targets)) $
+  M.mapMaybe id $
+  execState (mapM_ (mapM_ go . getDeps . fst) targets)
+            (M.fromList (map (second Just) targets))
+ where
+  getDeps :: PackageName -> [PackageName]
+  getDeps name =
+    case M.lookup name localMap of
+      Just lp -> listOfPackageDeps lp.package -- FIXME just Local?
+      _ -> []
+  go ::
+       PackageName
+    -> State (Map PackageName (Maybe (Path Abs File, Target))) Bool
+  go name = do
+    cache <- get
+    case (M.lookup name cache, M.lookup name localMap) of
+      (Just (Just _), _) -> pure True
+      (Just Nothing, _) | not loadAllDeps -> pure False
+      (_, Just lp) -> do
+        let deps = listOfPackageDeps lp.package
+        shouldLoad <- or <$> mapM go deps
+        if shouldLoad
+          then do
+            modify (M.insert name (Just (lp.cabalFP, TargetComps (S.singleton CLib))))
+            pure True
+          else do
+            modify (M.insert name Nothing)
+            pure False
+      (_, _) -> pure False
 
 unionTargets :: Ord k => Map k Target -> Map k Target -> Map k Target
-unionTargets = M.unionWith $ \l r ->
-    case (l, r) of
-        (TargetAll PTDependency, _) -> r
-        (TargetComps sl, TargetComps sr) -> TargetComps (S.union sl sr)
-        (TargetComps _, TargetAll PTProject) -> TargetAll PTProject
-        (TargetComps _, _) -> l
-        (TargetAll PTProject, _) -> TargetAll PTProject
+unionTargets = M.unionWith $ \l r -> case (l, r) of
+  (TargetAll PTDependency, _) -> r
+  (TargetComps sl, TargetComps sr) -> TargetComps (S.union sl sr)
+  (TargetComps _, TargetAll PTProject) -> TargetAll PTProject
+  (TargetComps _, _) -> l
+  (TargetAll PTProject, _) -> TargetAll PTProject
 
 hasLocalComp :: (NamedComponent -> Bool) -> Target -> Bool
-hasLocalComp p t =
-    case t of
-        TargetComps s -> any p (S.toList s)
-        TargetAll PTProject -> True
-        _ -> False
-
--- | Run a command and grab the first line of stdout, dropping
--- stderr's contexts completely.
-runGrabFirstLine :: (HasProcessContext env, HasLogFunc env) => String -> [String] -> RIO env String
-runGrabFirstLine cmd0 args =
-  proc cmd0 args $ \pc -> do
-    (out, _err) <- readProcess_ pc
-    pure
-      $ TL.unpack
-      $ TL.filter (/= '\r')
-      $ TL.concat
-      $ take 1
-      $ TL.lines
-      $ TLE.decodeUtf8With lenientDecode out
+hasLocalComp p t = case t of
+  TargetComps s -> any p (S.toList s)
+  TargetAll PTProject -> True
+  _ -> False
diff --git a/src/Stack/Ghci/Script.hs b/src/Stack/Ghci/Script.hs
index 8829eafbc2..36b639b25d 100644
--- a/src/Stack/Ghci/Script.hs
+++ b/src/Stack/Ghci/Script.hs
@@ -1,58 +1,64 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Ghci.Script
+License     : BSD-3-Clause
+-}
 
 module Stack.Ghci.Script
   ( GhciScript
   , ModuleName
-
   , cmdAdd
-  , cmdCdGhc
   , cmdModule
-
   , scriptToLazyByteString
   , scriptToBuilder
   , scriptToFile
   ) where
 
-import           Data.ByteString.Builder (toLazyByteString)
+import           Data.ByteString.Builder ( toLazyByteString )
 import qualified Data.List as L
 import qualified Data.Set as S
-import           Path
+import           Distribution.ModuleName ( ModuleName, components )
 import           Stack.Prelude
-import           System.IO (hSetBinaryMode)
-
-import           Distribution.ModuleName hiding (toFilePath)
+import           System.IO ( hSetBinaryMode )
 
-newtype GhciScript = GhciScript { unGhciScript :: [GhciCommand] }
+newtype GhciScript = GhciScript { ghciScript :: [GhciCommand] }
 
 instance Semigroup GhciScript where
   GhciScript xs <> GhciScript ys = GhciScript (ys <> xs)
+
 instance Monoid GhciScript where
   mempty = GhciScript []
   mappend = (<>)
 
 data GhciCommand
-  = Add (Set (Either ModuleName (Path Abs File)))
-  | CdGhc (Path Abs Dir)
-  | Module (Set ModuleName)
-  deriving (Show)
+  = AddCmd (Set (Either ModuleName (Path Abs File)))
+    -- ^ Add the specified modules (specified by module name or source file) to
+    -- the current target set and perform a reload (that is, load the target set
+    -- of modules and the all the modules they depend on in dependency order).
+    -- The modules specified by name are added first (in ascending order), then
+    -- the modules specified by source file (in ascending order). The context is
+    -- set to the most recently successfully loaded module.
+  | ModuleCmd (Set ModuleName)
+    -- ^ Add the specified modules to the context. The modules are added in
+    -- ascending order.
+  deriving Show
 
 cmdAdd :: Set (Either ModuleName (Path Abs File)) -> GhciScript
-cmdAdd = GhciScript . (:[]) . Add
-
-cmdCdGhc :: Path Abs Dir -> GhciScript
-cmdCdGhc = GhciScript . (:[]) . CdGhc
+cmdAdd = GhciScript . (:[]) . AddCmd
 
 cmdModule :: Set ModuleName -> GhciScript
-cmdModule = GhciScript . (:[]) . Module
+cmdModule = GhciScript . (:[]) . ModuleCmd
 
 scriptToLazyByteString :: GhciScript -> LByteString
 scriptToLazyByteString = toLazyByteString . scriptToBuilder
 
 scriptToBuilder :: GhciScript -> Builder
 scriptToBuilder backwardScript = mconcat $ fmap commandToBuilder script
-  where
-    script = reverse $ unGhciScript backwardScript
+ where
+  script = reverse backwardScript.ghciScript
 
 scriptToFile :: Path Abs File -> GhciScript -> IO ()
 scriptToFile path script =
@@ -60,31 +66,40 @@ scriptToFile path script =
     $ \hdl -> do hSetBuffering hdl (BlockBuffering Nothing)
                  hSetBinaryMode hdl True
                  hPutBuilder hdl (scriptToBuilder script)
-  where
-    filepath = toFilePath path
+ where
+  filepath = toFilePath path
 
 -- Command conversion
 
 commandToBuilder :: GhciCommand -> Builder
 
-commandToBuilder (Add modules)
+commandToBuilder (AddCmd modules)
   | S.null modules = mempty
   | otherwise      =
        ":add "
-    <> mconcat (L.intersperse " " $
-         fmap (fromString . quoteFileName . either (mconcat . L.intersperse "." . components) toFilePath)
-              (S.toAscList modules))
+    <> mconcat
+         ( L.intersperse " "
+             $ fmap
+                 ( fromString
+                 . quoteFileName
+                 . either (mconcat . L.intersperse "." . components) toFilePath
+                 )
+                 (S.toAscList modules)
+         )
     <> "\n"
 
-commandToBuilder (CdGhc path) =
-  ":cd-ghc " <> fromString (quoteFileName (toFilePath path)) <> "\n"
-
-commandToBuilder (Module modules)
+commandToBuilder (ModuleCmd modules)
   | S.null modules = ":module +\n"
   | otherwise      =
        ":module + "
-    <> mconcat (L.intersperse " "
-        $ fromString . quoteFileName . mconcat . L.intersperse "." . components <$> S.toAscList modules)
+    <> mconcat
+         ( L.intersperse " "
+             $ fromString
+             . quoteFileName
+             . mconcat
+             . L.intersperse "."
+             . components <$> S.toAscList modules
+         )
     <> "\n"
 
 -- | Make sure that a filename with spaces in it gets the proper quotes.
diff --git a/src/Stack/Hoogle.hs b/src/Stack/Hoogle.hs
index b6b4f4a570..3e88b845c7 100644
--- a/src/Stack/Hoogle.hs
+++ b/src/Stack/Hoogle.hs
@@ -1,206 +1,290 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Hoogle
+Description : A wrapper around hoogle.
+License     : BSD-3-Clause
+
+A wrapper around hoogle.
+-}
 
--- | A wrapper around hoogle.
 module Stack.Hoogle
-    ( hoogleCmd
-    ) where
+  ( hoogleCmd
+  ) where
 
-import           Stack.Prelude
 import qualified Data.ByteString.Lazy.Char8 as BL8
-import           Data.Char (isSpace)
+import           Data.Char ( isSpace )
+import           Data.Either.Extra ( eitherToMaybe )
 import qualified Data.Text as T
-import           Distribution.PackageDescription (packageDescription, package)
-import           Distribution.Types.PackageName (mkPackageName)
-import           Distribution.Version (mkVersion)
-import           Lens.Micro ((?~))
-import           Path (parseAbsFile)
-import           Path.IO hiding (findExecutable)
-import qualified Stack.Build
-import           Stack.Build.Target (NeedTargets(NeedTargets))
+import           Distribution.PackageDescription ( packageDescription, package )
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Version ( mkVersion )
+import           Lens.Micro ( (?~) )
+import           Path ( parseAbsFile )
+import           Path.IO ( createDirIfMissing, doesFileExist )
+import qualified RIO.Map as Map
+import           RIO.Process ( findExecutable, proc, readProcess_, runProcess_)
+import qualified Stack.Build ( build )
+import           Stack.Build.Target ( NeedTargets (..) )
+import           Stack.Constants ( stackProgName' )
+import           Stack.Prelude
 import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig
+                   , withEnvConfig
+                   )
+import           Stack.Types.BuildOptsCLI
+                   ( BuildOptsCLI (..), defaultBuildOptsCLI )
+import           Stack.Types.BuildOptsMonoid ( buildOptsMonoidHaddockL )
 import           Stack.Types.Config
-import           Stack.Types.SourceMap
-import qualified RIO.Map as Map
-import           RIO.Process
+                   ( Config (..), HasConfig (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig, HasSourceMap (..), hoogleDatabasePath
+                   , hoogleRoot
+                   )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
+import           Stack.Types.GlobalOpts
+                   ( GlobalOpts (..), globalOptsBuildOptsMonoidL )
+import           Stack.Types.Runner ( Runner, globalOptsL )
+import           Stack.Types.SourceMap ( DepPackage (..), SourceMap (..) )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Hoogle" module.
+data HoogleException
+  = HoogleOnPathNotFoundBug
+  deriving Show
+
+instance Exception HoogleException where
+  displayException HoogleOnPathNotFoundBug = bugReport "[S-9669]"
+    "Cannot find Hoogle executable on PATH, after installing."
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Hoogle" module.
+data HooglePrettyException
+  = HoogleNotFound StyleDoc
+  | HoogleDatabaseNotFound
+  deriving Show
+
+instance Pretty HooglePrettyException where
+  pretty (HoogleNotFound e) =
+    "[S-1329]"
+    <> line
+    <> e
+    <> line
+    <> fillSep
+         [ flow "Not installing Hoogle due to"
+         , style Shell "--no-setup" <> "."
+         ]
+  pretty HoogleDatabaseNotFound =
+    "[S-3025]"
+    <> line
+    <> fillSep
+         [ flow "No Hoogle database. Not building one due to"
+         , style Shell "--no-setup" <> "."
+         ]
+
+instance Exception HooglePrettyException
 
 -- | Helper type to duplicate log messages
 data Muted = Muted | NotMuted
 
 -- | Hoogle command.
-hoogleCmd :: ([String],Bool,Bool,Bool) -> RIO Runner ()
-hoogleCmd (args,setup,rebuild,startServer) =
+hoogleCmd :: ([String], Bool, Bool, Bool) -> RIO Runner ()
+hoogleCmd (args, setup, rebuild, startServer) =
   local (over globalOptsL modifyGO) $
-  withConfig YesReexec $
-  withDefaultEnvConfig $ do
-    hooglePath <- ensureHoogleInPath
-    generateDbIfNeeded hooglePath
-    runHoogle hooglePath args'
-  where
-    modifyGO :: GlobalOpts -> GlobalOpts
-    modifyGO = globalOptsBuildOptsMonoidL . buildOptsMonoidHaddockL ?~ True
-
-    args' :: [String]
-    args' = if startServer
-                 then ["server", "--local", "--port", "8080"]
-                 else []
-            ++ args
-    generateDbIfNeeded :: Path Abs File -> RIO EnvConfig ()
-    generateDbIfNeeded hooglePath = do
-        databaseExists <- checkDatabaseExists
-        if databaseExists && not rebuild
-            then pure ()
-            else if setup || rebuild
-                     then do
-                         logWarn
-                             (if rebuild
-                                  then "Rebuilding database ..."
-                                  else "No Hoogle database yet. Automatically building haddocks and hoogle database (use --no-setup to disable) ...")
-                         buildHaddocks
-                         logInfo "Built docs."
-                         generateDb hooglePath
-                         logInfo "Generated DB."
-                     else do
-                         logError
-                             "No Hoogle database. Not building one due to --no-setup"
-                         bail
-    generateDb :: Path Abs File -> RIO EnvConfig ()
-    generateDb hooglePath = do
-        do dir <- hoogleRoot
-           createDirIfMissing True dir
-           runHoogle hooglePath ["generate", "--local"]
-    buildHaddocks :: RIO EnvConfig ()
-    buildHaddocks = do
-      config <- view configL
-      runRIO config $ -- a bit weird that we have to drop down like this
-        catch (withDefaultEnvConfig $ Stack.Build.build Nothing)
-              (\(_ :: ExitCode) -> pure ())
-    hooglePackageName = mkPackageName "hoogle"
-    hoogleMinVersion = mkVersion [5, 0]
-    hoogleMinIdent =
-        PackageIdentifier hooglePackageName hoogleMinVersion
-    installHoogle :: RIO EnvConfig (Path Abs File)
-    installHoogle = requiringHoogle Muted $ do
-        Stack.Build.build Nothing
-        mhooglePath' <- findExecutable "hoogle"
-        case mhooglePath' of
-            Right hooglePath -> parseAbsFile hooglePath
-            Left _ -> do
-                logWarn "Couldn't find hoogle in path after installing.  This shouldn't happen, may be a bug."
-                bail
-    requiringHoogle :: Muted -> RIO EnvConfig x -> RIO EnvConfig x
-    requiringHoogle muted f = do
-        hoogleTarget <- do
-          sourceMap <- view $ sourceMapL . to smDeps
-          case Map.lookup hooglePackageName sourceMap of
-            Just hoogleDep ->
-              case dpLocation hoogleDep of
-                PLImmutable pli ->
-                  T.pack . packageIdentifierString <$>
-                      restrictMinHoogleVersion muted (packageLocationIdent pli)
-                plm@(PLMutable _) -> do
-                  T.pack . packageIdentifierString . package . packageDescription
-                      <$> loadCabalFile plm
-            Nothing -> do
-              -- not muted because this should happen only once
-              logWarn "No hoogle version was found, trying to install the latest version"
-              mpir <- getLatestHackageVersion YesRequireHackageIndex hooglePackageName UsePreferredVersions
-              let hoogleIdent = case mpir of
-                      Nothing -> hoogleMinIdent
-                      Just (PackageIdentifierRevision _ ver _) ->
-                          PackageIdentifier hooglePackageName ver
+    withConfig YesReexec $
+      withDefaultEnvConfig $ do
+        hooglePath <- ensureHoogleInPath
+        generateDbIfNeeded hooglePath
+        runHoogle hooglePath args'
+ where
+  modifyGO :: GlobalOpts -> GlobalOpts
+  modifyGO = globalOptsBuildOptsMonoidL . buildOptsMonoidHaddockL ?~ True
+
+  args' :: [String]
+  args' = if startServer
+    then ["server", "--local", "--port", "8080"] ++ args
+    else args
+
+  generateDbIfNeeded :: Path Abs File -> RIO EnvConfig ()
+  generateDbIfNeeded hooglePath = do
+    databaseExists <- checkDatabaseExists
+    unless (databaseExists && not rebuild) $
+      if setup || rebuild
+        then do
+          prettyWarnL $
+            if rebuild
+              then
+                [ flow "Rebuilding database ..." ]
+              else
+                [ flow "No Hoogle database yet. Automatically building \
+                       \Haddock documentation and Hoogle database (use"
+                , style Shell "--no-setup"
+                , flow "to disable) ..."
+                ]
+          buildHaddocks
+          prettyInfoS "Built Haddock documentation."
+          generateDb hooglePath
+          prettyInfoS "Generated Hoogle database."
+        else prettyThrowIO HoogleDatabaseNotFound
+
+  generateDb :: Path Abs File -> RIO EnvConfig ()
+  generateDb hooglePath = do
+    dir <- hoogleRoot
+    createDirIfMissing True dir
+    runHoogle hooglePath ["generate", "--local"]
+
+  buildHaddocks :: RIO EnvConfig ()
+  buildHaddocks = do
+    config <- view configL
+    runRIO config $ -- a bit weird that we have to drop down like this
+      catch (withDefaultEnvConfig $ Stack.Build.build Nothing)
+            (\(_ :: ExitCode) -> pure ())
+
+  hooglePackageName = mkPackageName "hoogle"
+  hoogleMinVersion = mkVersion [5, 0]
+  hoogleMinIdent =
+    PackageIdentifier hooglePackageName hoogleMinVersion
+
+  installHoogle :: RIO EnvConfig (Path Abs File)
+  installHoogle = requiringHoogle Muted $ do
+    Stack.Build.build Nothing
+    mhooglePath' <- findExecutable "hoogle"
+    case mhooglePath' of
+      Right hooglePath -> parseAbsFile hooglePath
+      Left _ -> throwIO HoogleOnPathNotFoundBug
+
+  requiringHoogle :: Muted -> RIO EnvConfig x -> RIO EnvConfig x
+  requiringHoogle muted f = do
+    hoogleTarget <- do
+      sourceMap <- view $ sourceMapL . to (.deps)
+      case Map.lookup hooglePackageName sourceMap of
+        Just hoogleDep ->
+          case hoogleDep.location of
+            PLImmutable pli ->
               T.pack . packageIdentifierString <$>
-                  restrictMinHoogleVersion muted hoogleIdent
-        config <- view configL
-        let boptsCLI = defaultBuildOptsCLI
-                { boptsCLITargets =  [hoogleTarget]
-                }
-        runRIO config $ withEnvConfig NeedTargets boptsCLI f
-    restrictMinHoogleVersion
-      :: HasLogFunc env
-      => Muted -> PackageIdentifier -> RIO env PackageIdentifier
-    restrictMinHoogleVersion muted ident = do
-      if ident < hoogleMinIdent
+                  restrictMinHoogleVersion muted (packageLocationIdent pli)
+            plm@(PLMutable _) ->
+              T.pack . packageIdentifierString . package . packageDescription
+                  <$> loadCabalFile (Just stackProgName') plm
+        Nothing -> do
+          -- not muted because this should happen only once
+          prettyWarnS
+            "No hoogle version was found, trying to install the latest version"
+          mpir <- getLatestHackageVersion YesRequireHackageIndex hooglePackageName UsePreferredVersions
+          let hoogleIdent = case mpir of
+                  Nothing -> hoogleMinIdent
+                  Just (PackageIdentifierRevision _ ver _) ->
+                      PackageIdentifier hooglePackageName ver
+          T.pack . packageIdentifierString <$>
+              restrictMinHoogleVersion muted hoogleIdent
+    config <- view configL
+    let boptsCLI = defaultBuildOptsCLI
+          { targetsCLI =  [hoogleTarget] }
+    runRIO config $ withEnvConfig NeedTargets boptsCLI f
+
+  restrictMinHoogleVersion ::
+       HasLogFunc env
+    => Muted
+    -> PackageIdentifier
+    -> RIO env PackageIdentifier
+  restrictMinHoogleVersion muted ident =
+    if ident < hoogleMinIdent
       then do
-          muteableLog LevelWarn muted $
-               "Minimum " <>
-               fromString (packageIdentifierString hoogleMinIdent) <>
-               " is not in your index. Installing the minimum version."
-          pure hoogleMinIdent
+        muteableLog LevelWarn muted $
+          "Minimum " <>
+          fromString (packageIdentifierString hoogleMinIdent) <>
+          " is not in your index. Installing the minimum version."
+        pure hoogleMinIdent
       else do
-          muteableLog LevelInfo muted $
-              "Minimum version is " <>
-              fromString (packageIdentifierString hoogleMinIdent) <>
-              ". Found acceptable " <>
-              fromString (packageIdentifierString ident) <>
-              " in your index, requiring its installation."
-          pure ident
-    muteableLog :: HasLogFunc env => LogLevel -> Muted -> Utf8Builder -> RIO env ()
-    muteableLog logLevel muted msg =
-        case muted of
-            Muted -> pure ()
-            NotMuted -> logGeneric "" logLevel msg
-    runHoogle :: Path Abs File -> [String] -> RIO EnvConfig ()
-    runHoogle hooglePath hoogleArgs = do
-        config <- view configL
-        menv <- liftIO $ configProcessContextSettings config envSettings
-        dbpath <- hoogleDatabasePath
-        let databaseArg = ["--database=" ++ toFilePath dbpath]
-        withProcessContext menv $ proc
-          (toFilePath hooglePath)
-          (hoogleArgs ++ databaseArg)
-          runProcess_
-    bail :: RIO EnvConfig a
-    bail = exitWith (ExitFailure (-1))
-    checkDatabaseExists = do
-        path <- hoogleDatabasePath
-        liftIO (doesFileExist path)
-    ensureHoogleInPath :: RIO EnvConfig (Path Abs File)
-    ensureHoogleInPath = do
-        config <- view configL
-        menv <- liftIO $ configProcessContextSettings config envSettings
-        mhooglePath <- runRIO menv (findExecutable "hoogle") <>
-          requiringHoogle NotMuted (findExecutable "hoogle")
-        eres <- case mhooglePath of
-            Left _ -> pure $ Left "Hoogle isn't installed."
-            Right hooglePath -> do
-                result <- withProcessContext menv
-                        $ proc hooglePath ["--numeric-version"]
-                        $ tryAny . fmap fst . readProcess_
-                let unexpectedResult got = Left $ T.concat
-                        [ "'"
-                        , T.pack hooglePath
-                        , " --numeric-version' did not respond with expected value. Got: "
-                        , got
-                        ]
-                pure $ case result of
-                    Left err -> unexpectedResult $ T.pack (show err)
-                    Right bs -> case parseVersion (takeWhile (not . isSpace) (BL8.unpack bs)) of
-                        Nothing -> unexpectedResult $ T.pack (BL8.unpack bs)
-                        Just ver
-                            | ver >= hoogleMinVersion -> Right hooglePath
-                            | otherwise -> Left $ T.concat
-                                [ "Installed Hoogle is too old, "
-                                , T.pack hooglePath
-                                , " is version "
-                                , T.pack $ versionString ver
-                                , " but >= 5.0 is required."
-                                ]
-        case eres of
-            Right hooglePath -> parseAbsFile hooglePath
-            Left err
-                | setup -> do
-                    logWarn $ display err <> " Automatically installing (use --no-setup to disable) ..."
-                    installHoogle
-                | otherwise -> do
-                    logWarn $ display err <> " Not installing it due to --no-setup."
-                    bail
-    envSettings =
-        EnvSettings
-        { esIncludeLocals = True
-        , esIncludeGhcPackagePath = True
-        , esStackExe = True
-        , esLocaleUtf8 = False
-        , esKeepGhcRts = False
-        }
+        muteableLog LevelInfo muted $
+          "Minimum version is " <>
+          fromString (packageIdentifierString hoogleMinIdent) <>
+          ". Found acceptable " <>
+          fromString (packageIdentifierString ident) <>
+          " in your index, requiring its installation."
+        pure ident
+  muteableLog ::
+       HasLogFunc env
+    => LogLevel
+    -> Muted
+    -> Utf8Builder
+    -> RIO env ()
+  muteableLog logLevel muted msg =
+    case muted of
+      Muted -> pure ()
+      NotMuted -> logGeneric "" logLevel msg
+
+  runHoogle :: Path Abs File -> [String] -> RIO EnvConfig ()
+  runHoogle hooglePath hoogleArgs = do
+    config <- view configL
+    menv <- liftIO $ config.processContextSettings envSettings
+    dbpath <- hoogleDatabasePath
+    let databaseArg = ["--database=" ++ toFilePath dbpath]
+    withProcessContext menv $ proc
+      (toFilePath hooglePath)
+      (hoogleArgs ++ databaseArg)
+      runProcess_
+
+  checkDatabaseExists = do
+    path <- hoogleDatabasePath
+    liftIO (doesFileExist path)
+
+  ensureHoogleInPath :: RIO EnvConfig (Path Abs File)
+  ensureHoogleInPath = do
+    config <- view configL
+    menv <- liftIO $ config.processContextSettings envSettings
+    mHooglePath <- eitherToMaybe <$> runRIO menv (findExecutable "hoogle")
+    let mHooglePath' =
+          eitherToMaybe <$> requiringHoogle NotMuted (findExecutable "hoogle")
+    eres <- maybe mHooglePath' (pure . Just) mHooglePath >>= \case
+      Nothing -> pure $ Left (flow "Hoogle isn't installed.")
+      Just hooglePath -> do
+        result <- withProcessContext menv
+          $ proc hooglePath ["--numeric-version"]
+          $ tryAny . fmap fst . readProcess_
+        let unexpectedResult got = Left $
+                 fillSep
+                   [ style Shell (fromString hooglePath)
+                   , style Shell "--numeric-version"
+                   , flow "did not respond with expected value. Got:"
+                   ]
+              <> blankLine
+              <> got
+        pure $ case result of
+          Left err -> unexpectedResult $ string (displayException err)
+          Right bs ->
+            case parseVersion (takeWhile (not . isSpace) (BL8.unpack bs)) of
+              Nothing -> unexpectedResult $ fromString (BL8.unpack bs)
+              Just ver
+                | ver >= hoogleMinVersion -> Right hooglePath
+                | otherwise -> Left $
+                    fillSep
+                      [ flow "Installed Hoogle is too old, "
+                      , style Shell (fromString hooglePath)
+                      , flow "is version"
+                      , fromString (versionString ver)
+                      , flow "but >= 5.0 is required."
+                      ]
+    case eres of
+      Right hooglePath -> parseAbsFile hooglePath
+      Left err
+        | setup -> do
+            prettyWarnL
+              [ err
+              , flow "Automatically installing (use"
+              , style Shell "--no-setup"
+              , flow "to disable) ..."
+              ]
+            installHoogle
+        | otherwise -> prettyThrowIO $ HoogleNotFound err
+
+  envSettings = EnvSettings
+    { includeLocals = True
+    , includeGhcPackagePath = True
+    , stackExe = True
+    , localeUtf8 = False
+    , keepGhcRts = False
+    }
diff --git a/src/Stack/IDE.hs b/src/Stack/IDE.hs
index cf31f5f2a1..9de8fea9f6 100644
--- a/src/Stack/IDE.hs
+++ b/src/Stack/IDE.hs
@@ -1,59 +1,95 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections       #-}
 
--- | Functions for IDEs.
+{-|
+Module      : Stack.IDE
+Description : Types and functions related to Stack's @ide@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @ide@ command.
+-}
+
 module Stack.IDE
-    ( OutputStream(..)
-    , ListPackagesCmd(..)
-    , listPackages
-    , listTargets
-    ) where
+  ( OutputStream (..)
+  , ListPackagesCmd (..)
+  , idePackagesCmd
+  , ideTargetsCmd
+  , listPackages
+  , listTargets
+  ) where
 
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 import qualified Data.Text as T
+import           Data.Tuple ( swap )
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Runners
+                   ( ShouldReexec (..), withBuildConfig, withConfig )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.IdeOpts ( ListPackagesCmd (..), OutputStream (..) )
 import           Stack.Types.NamedComponent
+                   ( NamedComponent, isCBench, isCExe, isCTest
+                   , renderPkgComponent
+                   )
+import           Stack.Types.Runner ( Runner )
 import           Stack.Types.SourceMap
-import           System.IO (putStrLn)
+                   ( ProjectPackage (..), SMWanted (..), ppComponentsMaybe )
+import           System.IO ( putStrLn )
+
+-- | Function underlying the @stack ide packages@ command. List packages in the
+-- project.
+idePackagesCmd :: (OutputStream, ListPackagesCmd) -> RIO Runner ()
+idePackagesCmd =
+  withConfig NoReexec . withBuildConfig . uncurry listPackages
 
-data OutputStream = OutputLogInfo
-                  | OutputStdout
+compTypes :: (Bool, Bool, Bool) -> NamedComponent -> Bool
+compTypes (False, False, False) = const True
+compTypes (exe, test, bench) =
+  \x -> (exe && isCExe x) || (test && isCTest x) || (bench && isCBench x)
 
-data ListPackagesCmd = ListPackageNames
-                     | ListPackageCabalFiles
+-- | Function underlying the @stack ide targets@ command. List targets in the
+-- project.
+ideTargetsCmd :: ((Bool, Bool, Bool), OutputStream)  -> RIO Runner ()
+ideTargetsCmd = withConfig NoReexec .
+  withBuildConfig . uncurry listTargets . fmap compTypes . swap
 
-outputFunc :: HasLogFunc env => OutputStream -> String -> RIO env ()
-outputFunc OutputLogInfo = logInfo . fromString
+outputFunc :: HasTerm env => OutputStream -> String -> RIO env ()
+outputFunc OutputLogInfo = prettyInfo . fromString
 outputFunc OutputStdout  = liftIO . putStrLn
 
 -- | List the packages inside the current project.
-listPackages :: HasBuildConfig env => OutputStream -> ListPackagesCmd -> RIO env ()
+listPackages ::
+     HasBuildConfig env
+  => OutputStream
+  -> ListPackagesCmd
+  -> RIO env ()
 listPackages stream flag = do
-  packages <- view $ buildConfigL.to (smwProject . bcSMWanted)
+  packages <- view $ buildConfigL . to (.smWanted.project)
   let strs = case flag of
         ListPackageNames ->
           map packageNameString (Map.keys packages)
         ListPackageCabalFiles ->
-          map (toFilePath . ppCabalFP) (Map.elems packages)
+          map (toFilePath . (.cabalFP)) (Map.elems packages)
   mapM_ (outputFunc stream) strs
 
 -- | List the targets in the current project.
-listTargets :: forall env. HasBuildConfig env => OutputStream -> RIO env ()
-listTargets stream = do
-  packages <- view $ buildConfigL.to (smwProject . bcSMWanted)
+listTargets ::
+     forall env. HasBuildConfig env
+  => OutputStream
+  -> (NamedComponent -> Bool)
+  -> RIO env ()
+listTargets stream isCompType = do
+  packages <- view $ buildConfigL . to (.smWanted.project)
   pairs <- concat <$> Map.traverseWithKey toNameAndComponent packages
   outputFunc stream $ T.unpack $ T.intercalate "\n" $
     map renderPkgComponent pairs
-  where
-    toNameAndComponent
-      :: PackageName
-      -> ProjectPackage
-      -> RIO env [(PackageName, NamedComponent)]
-    toNameAndComponent pkgName' =
-        fmap (map (pkgName', ) . Set.toList) . ppComponents
+ where
+  toNameAndComponent ::
+       PackageName
+    -> ProjectPackage
+    -> RIO env [(PackageName, NamedComponent)]
+  toNameAndComponent pkgName' =
+    fmap (map (pkgName',) . Set.toList) . ppComponentsMaybe (\x ->
+      if isCompType x then Just x else Nothing)
diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs
index 6a940a8052..2dfb5eea2c 100644
--- a/src/Stack/Init.hs
+++ b/src/Stack/Init.hs
@@ -1,590 +1,753 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 {-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE TypeFamilies          #-}
-{-# LANGUAGE TypeOperators         #-}
 
-module Stack.Init
-    ( initProject
-    , InitOpts (..)
-    ) where
+{-|
+Module      : Stack.Init
+Description : Types and functions related to Stack's @init@ command.
+License     : BSD-3-Clause
 
-import           Stack.Prelude
-import qualified Data.Aeson.KeyMap               as KeyMap
-import qualified Data.ByteString.Builder         as B
-import qualified Data.ByteString.Char8           as BC
-import qualified Data.Foldable                   as F
-import qualified Data.IntMap                     as IntMap
-import           Data.List.Extra                 (groupSortOn)
-import qualified Data.List.NonEmpty              as NonEmpty
-import qualified Data.Map.Strict                 as Map
-import qualified Data.Set                        as Set
-import qualified Data.Text                       as T
-import qualified Data.Text.Normalize             as T (normalize , NormalizationMode(NFC))
-import qualified Data.Yaml                       as Yaml
+Types and functions related to Stack's @init@ command.
+-}
+
+module Stack.Init
+  ( InitOpts (..)
+  , initCmd
+  , initProject
+  ) where
+
+import qualified Data.Aeson.KeyMap as KeyMap
+import qualified Data.ByteString.Builder as B
+import qualified Data.ByteString.Char8 as BC
+import qualified Data.Foldable as F
+import qualified Data.IntMap as IntMap
+import           Data.List.Extra ( groupSortOn )
+import           Data.List.NonEmpty.Extra ( minimumBy1 )
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import qualified Data.Text as T
+import qualified Data.Yaml as Yaml
 import qualified Distribution.PackageDescription as C
-import qualified Distribution.Text               as C
-import qualified Distribution.Version            as C
+import qualified Distribution.Text as C
+import qualified Distribution.Version as C
 import           Path
-import           Path.Extra                      (toFilePathNoTrailingSep)
-import           Path.Find                       (findFiles)
-import           Path.IO                         hiding (findFiles)
-import qualified Paths_stack                     as Meta
-import qualified RIO.FilePath                    as FP
-import           RIO.List                        ((\\), intercalate, intersperse,
-                                                  isSuffixOf, isPrefixOf)
-import           RIO.List.Partial                (minimumBy)
+                   ( PathException, (</>), dirname, filename, parent
+                   , stripProperPrefix
+                   )
+import           Path.Extra ( toFilePathNoTrailingSep )
+import           Path.Find ( findFiles )
+import           Path.IO
+                   ( AnyPath, RelPath, doesFileExist, getCurrentDir
+                   ,  makeRelativeToCurrentDir, resolveDir'
+                   )
+import qualified RIO.FilePath as FP
+import           RIO.List ( (\\), intercalate, isSuffixOf, isPrefixOf )
+import           RIO.NonEmpty ( nonEmpty )
+import qualified RIO.NonEmpty as NE
 import           Stack.BuildPlan
-import           Stack.Config                    (getSnapshots,
-                                                  makeConcreteResolver)
-import           Stack.Constants
+                   ( BuildPlanCheck (..), DepError (..), checkSnapBuildPlan
+                   , removeSrcPkgDefaultFlags, selectBestSnapshot
+                   )
+import           Stack.Config ( getSnapshots, makeConcreteSnapshot )
+import           Stack.Constants ( stackDotYaml, stackProgName' )
+import           Stack.Prelude
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withGlobalProject )
 import           Stack.SourceMap
-import           Stack.Types.Config
-import           Stack.Types.Resolver
-import           Stack.Types.Version
-
--- | Generate stack.yaml
-initProject
-    :: (HasConfig env, HasGHCVariant env)
-    => Path Abs Dir
-    -> InitOpts
-    -> Maybe AbstractResolver
-    -> RIO env ()
-initProject currDir initOpts mresolver = do
-    let dest = currDir </> stackDotYaml
-
-    reldest <- toFilePath `liftM` makeRelativeToCurrentDir dest
-
-    exists <- doesFileExist dest
-    when (not (forceOverwrite initOpts) && exists) $
-        throwString
-            ("Error: Stack configuration file " <> reldest <>
-             " exists, use '--force' to overwrite it.")
-
-    dirs <- mapM (resolveDir' . T.unpack) (searchDirs initOpts)
-    let find  = findCabalDirs (includeSubDirs initOpts)
-        dirs' = if null dirs then [currDir] else dirs
-    logInfo "Looking for .cabal or package.yaml files to use to init the project."
-    cabaldirs <- Set.toList . Set.unions <$> mapM find dirs'
-    (bundle, dupPkgs)  <- cabalPackagesCheck cabaldirs Nothing
-    let makeRelDir dir =
-            case stripProperPrefix currDir dir of
-                Nothing
-                    | currDir == dir -> "."
-                    | otherwise -> assert False $ toFilePathNoTrailingSep dir
-                Just rel -> toFilePathNoTrailingSep rel
-        fpToPkgDir fp =
-            let absDir = parent fp
-            in ResolvedPath (RelFilePath $ T.pack $ makeRelDir absDir) absDir
-        pkgDirs = Map.map (fpToPkgDir . fst) bundle
-    (snapshotLoc, flags, extraDeps, rbundle) <- getDefaultResolver initOpts mresolver pkgDirs
-
-    let ignored = Map.difference bundle rbundle
-        dupPkgMsg
-            | dupPkgs /= [] =
-                "Warning (added by new or init): Some packages were found to " <>
-                "have names conflicting with others and have been commented " <>
-                "out in the packages section.\n"
-            | otherwise = ""
-
-        missingPkgMsg
-            | Map.size ignored > 0 =
-                "Warning (added by new or init): Some packages were found to " <>
-                "be incompatible with the resolver and have been left commented " <>
-                "out in the packages section.\n"
-            | otherwise = ""
-
-        extraDepMsg
-            | Map.size extraDeps > 0 =
-                "Warning (added by new or init): Specified resolver could not " <>
-                "satisfy all dependencies. Some external packages have been " <>
-                "added as dependencies.\n"
-            | otherwise = ""
-        makeUserMsg msgs =
-            let msg = concat msgs
-            in if msg /= "" then
-                  msg <> "You can omit this message by removing it from " <>
-                         "stack.yaml\n"
-                 else ""
-
-        userMsg = makeUserMsg [dupPkgMsg, missingPkgMsg, extraDepMsg]
-
-        gpdByDir = Map.fromList [ (parent fp, gpd) | (fp, gpd) <- Map.elems bundle]
-        gpds = Map.elems $
-          Map.mapMaybe (flip Map.lookup gpdByDir . resolvedAbsolute) rbundle
-
-    deps <- for (Map.toList extraDeps) $ \(n, v) ->
-      PLImmutable . cplComplete <$>
-      completePackageLocation (RPLIHackage (PackageIdentifierRevision n v CFILatest) Nothing)
-
-    let p = Project
-            { projectUserMsg = if userMsg == "" then Nothing else Just userMsg
-            , projectPackages = resolvedRelative <$> Map.elems rbundle
-            , projectDependencies = map toRawPL deps
-            , projectFlags = removeSrcPkgDefaultFlags gpds flags
-            , projectResolver = snapshotLoc
-            , projectCompiler = Nothing
-            , projectExtraPackageDBs = []
-            , projectCurator = Nothing
-            , projectDropPackages = mempty
-            }
-
-        makeRel = fmap toFilePath . makeRelativeToCurrentDir
-
-        indent t = T.unlines $ fmap ("    " <>) (T.lines t)
-
-    logInfo $ "Initialising configuration using resolver: " <> display snapshotLoc
-    logInfo $ "Total number of user packages considered: "
-               <> display (Map.size bundle + length dupPkgs)
-
-    when (dupPkgs /= []) $ do
-        logWarn $ "Warning! Ignoring "
-                   <> displayShow (length dupPkgs)
-                   <> " duplicate packages:"
-        rels <- mapM makeRel dupPkgs
-        logWarn $ display $ indent $ showItems rels
-
-    when (Map.size ignored > 0) $ do
-        logWarn $ "Warning! Ignoring "
-                   <> displayShow (Map.size ignored)
-                   <> " packages due to dependency conflicts:"
-        rels <- mapM makeRel (Map.elems (fmap fst ignored))
-        logWarn $ display $ indent $ showItems rels
-
-    when (Map.size extraDeps > 0) $ do
-        logWarn $ "Warning! " <> displayShow (Map.size extraDeps)
-                   <> " external dependencies were added."
-    logInfo $
-        (if exists then "Overwriting existing configuration file: "
-         else "Writing configuration to file: ")
-        <> fromString reldest
-    writeBinaryFileAtomic dest
-           $ renderStackYaml p
-               (Map.elems $ fmap (makeRelDir . parent . fst) ignored)
-               (map (makeRelDir . parent) dupPkgs)
-    logInfo "All done."
+                   ( SnapshotCandidate, loadProjectSnapshotCandidate )
+import           Stack.Types.Config ( HasConfig, Config (..), configL )
+import           Stack.Types.GHCVariant ( HasGHCVariant )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Project ( Project (..) )
+import           Stack.Types.Runner (Runner, globalOptsL )
+import           Stack.Types.Snapshot ( AbstractSnapshot, Snapshots (..) )
+import           Stack.Types.Version ( stackMajorVersion )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Init" module.
+data InitException
+  = NoPackagesToIgnoreBug
+  deriving Show
+
+instance Exception InitException where
+  displayException NoPackagesToIgnoreBug = bugReport "[S-2747]"
+    "No packages to ignore."
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Init" module.
+data InitPrettyException
+  = SnapshotDownloadFailure SomeException
+  | ConfigFileAlreadyExists FilePath
+  | PackageNameInvalid [(Path Abs File, PackageName)]
+  | NoMatchingSnapshot !(NonEmpty SnapName)
+  | SnapshotMismatch !RawSnapshotLocation String
+  | SnapshotPartial !RawSnapshotLocation !String
+  deriving Show
+
+instance Pretty InitPrettyException where
+  pretty (ConfigFileAlreadyExists reldest) =
+    "[S-8009]"
+    <> line
+    <> flow "Stack declined to create a project-level configuration file."
+    <> blankLine
+    <> fillSep
+         [ flow "The file"
+         , style File (fromString reldest)
+         , "already exists. To overwrite it, pass the flag"
+         , style Shell "--force" <> "."
+         ]
+  pretty (PackageNameInvalid rels) =
+    "[S-5267]"
+    <> line
+    <> flow "Stack did not create project-level configuration, as (like \
+            \Hackage) it requires a Cabal file name to match the package it \
+            \defines."
+    <> blankLine
+    <> flow "Please rename the following Cabal files:"
+    <> line
+    <> bulletedList
+         ( map
+             ( \(fp, name) -> fillSep
+                 [ pretty fp
+                 , "as"
+                 , style
+                     File
+                     (fromPackageName name <> ".cabal")
+                 ]
+             )
+             rels
+         )
+  pretty (SnapshotDownloadFailure e) =
+    "[S-8332]"
+    <> line
+    <> flow "Stack failed to create project-level configuration file, as it \
+            \was unable to download the index of available snapshots."
+    <> blankLine
+    <> fillSep
+         [ flow "This sometimes happens because Certificate Authorities are \
+                \missing on your system. You can try the Stack command again \
+                \or manually create the configuration file. For help about the \
+                \content of Stack's configuration files, see (for the most \
+                \recent release of Stack)"
+         , style
+             Url
+             "http://docs.haskellstack.org/en/stable/configure/yaml/"
+           <> "."
+         ]
+    <> blankLine
+    <> flow "While downloading the snapshot index, Stack encountered the \
+            \following error:"
+    <> blankLine
+    <> string (displayException e)
+  pretty (NoMatchingSnapshot names) =
+    "[S-1833]"
+    <> line
+    <> flow "None of the following snapshots provides a compiler matching \
+            \your package(s):"
+    <> line
+    <> bulletedList (map (fromString . show) (NE.toList names))
+    <> blankLine
+    <> resolveOptions
+  pretty (SnapshotMismatch snapshot errDesc) =
+    "[S-6395]"
+    <> line
+    <> fillSep
+         [ "Snapshot"
+         , style Url (pretty $ PrettyRawSnapshotLocation snapshot)
+         , flow "does not have a matching compiler to build some or all of \
+                \your package(s)."
+         ]
+    <> blankLine
+    <> indent 4 (string errDesc)
+    <> line
+    <> resolveOptions
+  pretty (SnapshotPartial snapshot errDesc) =
+    "[S-2422]"
+    <> line
+    <> fillSep
+         [ "Snapshot"
+         , style Url (pretty $ PrettyRawSnapshotLocation snapshot)
+         , flow "does not have all the packages to match your requirements."
+         ]
+    <> blankLine
+    <> indent 4 (string errDesc)
+    <> line
+    <> resolveOptions
+
+resolveOptions :: StyleDoc
+resolveOptions =
+     flow "This may be resolved by:"
+  <> line
+  <> bulletedList
+       [ fillSep
+           [ "Using"
+           , style Shell "--omit-packages"
+           , "to exclude mismatching package(s)."
+           ]
+       , fillSep
+           [ "Using"
+           , style Shell "--snapshot"
+           , "to specify a matching snapshot."
+           ]
+       ]
+
+instance Exception InitPrettyException
+
+-- | Type representing command line options for the @stack init@ command.
+data InitOpts = InitOpts
+  { searchDirs     :: ![T.Text]
+    -- ^ List of sub directories to search for .cabal files
+  , omitPackages   :: Bool
+    -- ^ Exclude conflicting or incompatible user packages
+  , forceOverwrite :: Bool
+    -- ^ Overwrite existing stack.yaml
+  , includeSubDirs :: Bool
+    -- ^ If True, include all .cabal files found in any sub directories
+  }
+
+-- | Function underlying the @stack init@ command. Project initialization.
+initCmd :: InitOpts -> RIO Runner ()
+initCmd initOpts = do
+  pwd <- getCurrentDir
+  go <- view globalOptsL
+  withGlobalProject $
+    withConfig YesReexec (initProject pwd initOpts go.snapshot)
+
+-- | Generate a @stack.yaml@ file.
+initProject ::
+     (HasConfig env, HasGHCVariant env)
+  => Path Abs Dir
+  -> InitOpts
+  -> Maybe AbstractSnapshot
+  -> RIO env ()
+initProject currDir initOpts mASnapshot = do
+  let dest = currDir </> stackDotYaml
+  reldest <- toFilePath <$> makeRelativeToCurrentDir dest
+  exists <- doesFileExist dest
+  when (not initOpts.forceOverwrite && exists) $
+    prettyThrowIO $ ConfigFileAlreadyExists reldest
+  dirs <- mapM (resolveDir' . T.unpack) initOpts.searchDirs
+  let find  = findCabalDirs initOpts.includeSubDirs
+      dirs' = if null dirs then [currDir] else dirs
+  prettyInfo $
+       fillSep
+         [ flow "Looking for Cabal or"
+         , style File "package.yaml"
+         , flow "files to use to initialise Stack's project-level YAML \
+                \configuration file."
+         ]
+    <> line
+  cabaldirs <- Set.toList . Set.unions <$> mapM find dirs'
+  (bundle, dupPkgs)  <- cabalPackagesCheck cabaldirs
+  let makeRelDir dir =
+        case stripProperPrefix currDir dir of
+          Nothing
+              | currDir == dir -> "."
+              | otherwise -> assert False $ toFilePathNoTrailingSep dir
+          Just rel -> toFilePathNoTrailingSep rel
+      fpToPkgDir fp =
+        let absDir = parent fp
+        in  ResolvedPath (RelFilePath $ T.pack $ makeRelDir absDir) absDir
+      pkgDirs = Map.map (fpToPkgDir . fst) bundle
+  defaultInitSnapshot <- view $ configL . to (.defaultInitSnapshot)
+  let mASnapshot' = getFirst $ First mASnapshot <> defaultInitSnapshot
+  (snapshot, flags, extraDeps, rbundle) <-
+    getDefaultSnapshot initOpts mASnapshot' pkgDirs
+  let ignored = Map.difference bundle rbundle
+      dupPkgMsg
+        | dupPkgs /= [] = Just
+            "Warning (added by new or init): Some packages were found to have \
+            \names\n\
+            \conflicting with others and have been commented out in the \
+            \packages section."
+        | otherwise = Nothing
+      missingPkgMsg
+        | Map.size ignored > 0 = Just
+            "Warning (added by new or init): Some packages were found to be \
+            \incompatible\n\
+            \with the snapshot and have been left commented out in the \
+            \packages section."
+        | otherwise = Nothing
+      extraDepMsg
+        | Map.size extraDeps > 0 = Just
+            "Warning (added by new or init): Specified snapshot could not \
+            \satisfy all\n\
+            \dependencies. Some external packages have been added as \
+            \dependencies."
+        | otherwise = Nothing
+      removalMsg =
+        "You can omit this message by removing it from the project-level \
+        \configuration\n\
+        \file."
+      makeUserMsg mMsgs =
+        let msgs = catMaybes mMsgs
+        in  if null msgs
+              then Nothing
+              else Just $ intercalate "\n\n" (msgs <> [removalMsg]) <> "\n"
+      userMsg = makeUserMsg [dupPkgMsg, missingPkgMsg, extraDepMsg]
+      gpdByDir =
+        Map.fromList [ (parent fp, gpd) | (fp, gpd) <- Map.elems bundle]
+      gpds = Map.elems $
+        Map.mapMaybe (flip Map.lookup gpdByDir . resolvedAbsolute) rbundle
+  deps <- for (Map.toList extraDeps) $ \(n, v) ->
+    PLImmutable . cplComplete <$>
+      completePackageLocation
+        (RPLIHackage (PackageIdentifierRevision n v CFILatest) Nothing)
+  let project = Project
+        { userMsg
+        , packages = resolvedRelative <$> Map.elems rbundle
+        , extraDeps = map toRawPL deps
+        , flagsByPkg = removeSrcPkgDefaultFlags gpds flags
+        , snapshot
+        , compiler = Nothing
+        , extraPackageDBs = []
+        , curator = Nothing
+        , dropPackages = mempty
+        }
+      makeRel = fmap toFilePath . makeRelativeToCurrentDir
+  prettyInfoL
+    [ flow "Initialising Stack's project-level configuration file using \
+           \snapshot"
+    , pretty (PrettyRawSnapshotLocation snapshot) <> "."
+    ]
+  prettyInfoL $
+    let n = Map.size bundle + length dupPkgs
+    in  [ "Considered"
+        , fromString $ show n
+        , "user"
+        , if n == 1 then "package." else "packages."
+        ]
+  when (dupPkgs /= []) $ do
+    rels <- mapM makeRel dupPkgs
+    prettyWarn $
+         fillSep
+           [ flow "Ignoring these"
+           , fromString $ show (length dupPkgs)
+           , flow "duplicate packages:"
+           ]
+      <> line
+      <> bulletedList (map (style File . fromString) rels)
+  when (Map.size ignored > 0) $ do
+    rels <- mapM makeRel (Map.elems (fmap fst ignored))
+    prettyWarn $
+         fillSep
+           [ flow "Ignoring these"
+           , fromString $ show (Map.size ignored)
+           , flow "packages due to dependency conflicts:"
+           ]
+      <> line
+      <> bulletedList (map (style File . fromString) rels)
+  when (Map.size extraDeps > 0) $
+    prettyWarnL
+      [ fromString $ show (Map.size extraDeps)
+      , flow "external dependencies were added."
+      ]
+  prettyInfoL
+    [ flow $ if exists
+        then "Overwriting existing configuration file"
+        else "Writing configuration to"
+    , style File (fromString reldest) <> "."
+    ]
+  writeBinaryFileAtomic dest $ renderStackYaml project
+    (Map.elems $ fmap (makeRelDir . parent . fst) ignored)
+    (map (makeRelDir . parent) dupPkgs)
+  prettyInfoS
+    "Stack's project-level configuration file has been initialised."
 
 -- | Render a stack.yaml file with comments, see:
 -- https://github.com/commercialhaskell/stack/issues/226
 renderStackYaml :: Project -> [FilePath] -> [FilePath] -> B.Builder
 renderStackYaml p ignoredPackages dupPackages =
-    case Yaml.toJSON p of
-        Yaml.Object o -> renderObject o
-        _ -> assert False $ B.byteString $ Yaml.encode p
-  where
-    renderObject o =
-           B.byteString headerHelp
-        <> B.byteString "\n\n"
-        <> F.foldMap (goComment o) comments
-        <> goOthers (o `KeyMap.difference` KeyMap.fromList comments)
-        <> B.byteString footerHelp
-        <> "\n"
-
-    goComment o (name, comment) =
-        case (convert <$> KeyMap.lookup name o) <|> nonPresentValue name of
-            Nothing -> assert (name == "user-message") mempty
-            Just v ->
-                B.byteString comment <>
-                B.byteString "\n" <>
-                v <>
-                if name == "packages" then commentedPackages else "" <>
-                B.byteString "\n"
-      where
-        convert v = B.byteString (Yaml.encode $ Yaml.object [(name, v)])
-
-        -- Some fields in stack.yaml are optional and may not be
-        -- generated. For these, we provided commented out dummy
-        -- values to go along with the comments.
-        nonPresentValue "extra-deps" = Just "# extra-deps: []\n"
-        nonPresentValue "flags" = Just "# flags: {}\n"
-        nonPresentValue "extra-package-dbs" = Just "# extra-package-dbs: []\n"
-        nonPresentValue _ = Nothing
-
-    commentLine l | null l = "#"
-                  | otherwise = "# " ++ l
-    commentHelp = BC.pack .  intercalate "\n" . map commentLine
-    commentedPackages =
-        let ignoredComment = commentHelp
-                [ "The following packages have been ignored due to incompatibility with the"
-                , "resolver compiler, dependency conflicts with other packages"
-                , "or unsatisfied dependencies."
-                ]
-            dupComment = commentHelp
-                [ "The following packages have been ignored due to package name conflict "
-                , "with other packages."
-                ]
-        in commentPackages ignoredComment ignoredPackages
-           <> commentPackages dupComment dupPackages
-
-    commentPackages comment pkgs
-        | pkgs /= [] =
-               B.byteString comment
-            <> B.byteString "\n"
-            <> B.byteString (BC.pack $ concat
-                 $ map (\x -> "#- " ++ x ++ "\n") pkgs ++ ["\n"])
-        | otherwise = ""
-
-    goOthers o
-        | KeyMap.null o = mempty
-        | otherwise = assert False $ B.byteString $ Yaml.encode o
-
-    -- Per Section Help
-    comments =
-        [ ("user-message"     , userMsgHelp)
-        , ("resolver"         , resolverHelp)
-        , ("packages"         , packageHelp)
-        , ("extra-deps"       , extraDepsHelp)
-        , ("flags"            , "# Override default flag values for local packages and extra-deps")
-        , ("extra-package-dbs", "# Extra package databases containing global packages")
-        ]
-
-    -- Help strings
-    headerHelp = commentHelp
-        [ "This file was automatically generated by 'stack init'"
-        , ""
-        , "Some commonly used options have been documented as comments in this file."
-        , "For advanced use and comprehensive documentation of the format, please see:"
-        , "https://docs.haskellstack.org/en/stable/yaml_configuration/"
-        ]
-
-    resolverHelp = commentHelp
-        [ "Resolver to choose a 'specific' stackage snapshot or a compiler version."
-        , "A snapshot resolver dictates the compiler version and the set of packages"
-        , "to be used for project dependencies. For example:"
-        , ""
-        , "resolver: lts-3.5"
-        , "resolver: nightly-2015-09-21"
-        , "resolver: ghc-7.10.2"
-        , ""
-        , "The location of a snapshot can be provided as a file or url. Stack assumes"
-        , "a snapshot provided as a file might change, whereas a url resource does not."
-        , ""
-        , "resolver: ./custom-snapshot.yaml"
-        , "resolver: https://example.com/snapshots/2018-01-01.yaml"
-        ]
-
-    userMsgHelp = commentHelp
-        [ "A warning or info to be displayed to the user on config load." ]
-
-    packageHelp = commentHelp
-        [ "User packages to be built."
-        , "Various formats can be used as shown in the example below."
-        , ""
-        , "packages:"
-        , "- some-directory"
-        , "- https://example.com/foo/bar/baz-0.0.2.tar.gz"
-        , "  subdirs:"
-        , "  - auto-update"
-        , "  - wai"
-        ]
-
-    extraDepsHelp = commentHelp
-        [ "Dependency packages to be pulled from upstream that are not in the resolver."
-        , "These entries can reference officially published versions as well as"
-        , "forks / in-progress versions pinned to a git hash. For example:"
-        , ""
-        , "extra-deps:"
-        , "- acme-missiles-0.3"
-        , "- git: https://github.com/commercialhaskell/stack.git"
-        , "  commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a"
-        , ""
-        ]
-
-    footerHelp =
-        let major = toMajorVersion $ C.mkVersion' Meta.version
-        in commentHelp
-        [ "Control whether we use the GHC we find on the path"
-        , "system-ghc: true"
-        , ""
-        , "Require a specific version of Stack, using version ranges"
-        , "require-stack-version: -any # Default"
-        , "require-stack-version: \""
-          ++ C.display (C.orLaterVersion major) ++ "\""
-        , ""
-        , "Override the architecture used by Stack, especially useful on Windows"
-        , "arch: i386"
-        , "arch: x86_64"
-        , ""
-        , "Extra directories used by Stack for building"
-        , "extra-include-dirs: [/path/to/dir]"
-        , "extra-lib-dirs: [/path/to/dir]"
-        , ""
-        , "Allow a newer minor version of GHC than the snapshot specifies"
-        , "compiler-check: newer-minor"
-        ]
+  case Yaml.toJSON p of
+    Yaml.Object o -> renderObject o
+    _ -> assert False $ B.byteString $ Yaml.encode p
+ where
+  renderObject o =
+       B.byteString headerHelp
+    <> B.byteString "\n\n"
+    <> F.foldMap (goComment o) comments
+    <> goOthers (o `KeyMap.difference` KeyMap.fromList comments)
+    <> B.byteString footerHelp
+    <> "\n"
+  goComment o (name, comment) =
+    case (convert <$> KeyMap.lookup name o) <|> nonPresentValue name of
+      Nothing -> assert (name == "user-message") mempty
+      Just v ->
+        B.byteString comment <>
+        B.byteString "\n" <>
+        v <>
+        if name == "packages" then commentedPackages else "" <>
+        B.byteString "\n"
+   where
+    convert v = B.byteString (Yaml.encode $ Yaml.object [(name, v)])
+
+    -- Some keys in stack.yaml are optional and may not be generated. For these,
+    -- we provided commented out dummy values to go along with the comments.
+    nonPresentValue "extra-deps" = Just "# extra-deps: []\n"
+    nonPresentValue "flags" = Just "# flags: {}\n"
+    nonPresentValue "extra-package-dbs" = Just "# extra-package-dbs: []\n"
+    nonPresentValue _ = Nothing
+
+  commentLine l | null l = "#"
+                | otherwise = "# " ++ l
+  commentHelp = BC.pack .  intercalate "\n" . map commentLine
+  commentedPackages =
+    let ignoredComment = commentHelp
+          [ "The following packages have been ignored due to incompatibility with the"
+          , "snapshot compiler, dependency conflicts with other packages"
+          , "or unsatisfied dependencies."
+          ]
+        dupComment = commentHelp
+          [ "The following packages have been ignored due to package name conflict "
+          , "with other packages."
+          ]
+    in  commentPackages ignoredComment ignoredPackages
+        <> commentPackages dupComment dupPackages
+  commentPackages comment pkgs
+    | pkgs /= [] =
+           B.byteString comment
+        <> B.byteString "\n"
+        <> B.byteString (BC.pack $ concat
+             $ map (\x -> "#- " ++ x ++ "\n") pkgs ++ ["\n"])
+    | otherwise = ""
+  goOthers o
+    | KeyMap.null o = mempty
+    | otherwise = assert False $ B.byteString $ Yaml.encode o
+  -- Per Section Help
+  comments =
+    [ ("user-message"     , userMsgHelp)
+    , ("snapshot"         , snapshotHelp)
+    , ("packages"         , packageHelp)
+    , ("extra-deps"       , extraDepsHelp)
+    , ("flags"            , "# Override default flag values for project packages and extra-deps")
+    , ("extra-package-dbs", "# Extra package databases containing global packages")
+    ]
+  -- Help strings
+  headerHelp = commentHelp
+    [ "This file was automatically generated by 'stack init'"
+    , ""
+    , "Some commonly used options have been documented as comments in this file."
+    , "For advanced use and comprehensive documentation of the format, please see:"
+    , "https://docs.haskellstack.org/en/stable/configure/yaml/"
+    ]
+  snapshotHelp = commentHelp
+    [ "A 'specific' Stackage snapshot or a compiler version."
+    , "A snapshot dictates the compiler version and the set of packages"
+    , "to be used for project dependencies. For example:"
+    , ""
+    , "snapshot: lts-24.55"
+    , "snapshot: nightly-2026-08-20"
+    , "snapshot: ghc-9.10.3"
+    , ""
+    , "The location of a snapshot can be provided as a file or url. Stack assumes"
+    , "a snapshot provided as a file might change, whereas a url resource does not."
+    , ""
+    , "snapshot: ./custom-snapshot.yaml"
+    , "snapshot: https://example.com/snapshots/2024-01-01.yaml"
+    ]
+  userMsgHelp = commentHelp
+    [ "A warning or info to be displayed to the user on config load." ]
+  packageHelp = commentHelp
+    [ "User packages to be built."
+    , "Various formats can be used as shown in the example below."
+    , ""
+    , "packages:"
+    , "- some-directory"
+    , "- https://example.com/foo/bar/baz-0.0.2.tar.gz"
+    , "  subdirs:"
+    , "  - auto-update"
+    , "  - wai"
+    ]
+  extraDepsHelp = commentHelp
+    [ "Dependency packages to be pulled from upstream that are not in the snapshot."
+    , "These entries can reference officially published versions as well as"
+    , "forks / in-progress versions pinned to a git hash. For example:"
+    , ""
+    , "extra-deps:"
+    , "- acme-missiles-0.3"
+    , "- git: https://github.com/commercialhaskell/stack.git"
+    , "  commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a"
+    , ""
+    ]
+  footerHelp = commentHelp
+    [ "Control whether we use the GHC we find on the path"
+    , "system-ghc: true"
+    , ""
+    , "Require a specific version of Stack, using version ranges"
+    , "require-stack-version: -any # Default"
+    , "require-stack-version: \""
+      ++ C.display (C.orLaterVersion stackMajorVersion) ++ "\""
+    , ""
+    , "Override the architecture used by Stack, especially useful on Windows"
+    , "arch: i386"
+    , "arch: x86_64"
+    , ""
+    , "Extra directories used by Stack for building"
+    , "extra-include-dirs: [/path/to/dir]"
+    , "extra-lib-dirs: [/path/to/dir]"
+    , ""
+    , "Allow a newer minor version of GHC than the snapshot specifies"
+    , "compiler-check: newer-minor"
+    ]
 
 getSnapshots' :: HasConfig env => RIO env Snapshots
-getSnapshots' = do
-    getSnapshots `catchAny` \e -> do
-        logError $
-            "Unable to download snapshot list, and therefore could " <>
-            "not generate a stack.yaml file automatically"
-        logError $
-            "This sometimes happens due to missing Certificate Authorities " <>
-            "on your system. For more information, see:"
-        logError ""
-        logError "    https://github.com/commercialhaskell/stack/issues/234"
-        logError ""
-        logError "You can try again, or create your stack.yaml file by hand. See:"
-        logError ""
-        logError "    http://docs.haskellstack.org/en/stable/yaml_configuration/"
-        logError ""
-        logError $ "Exception was: " <> displayShow e
-        throwString ""
-
--- | Get the default resolver value
-getDefaultResolver
-    :: (HasConfig env, HasGHCVariant env)
-    => InitOpts
-    -> Maybe AbstractResolver
-    -> Map PackageName (ResolvedPath Dir)
-    -- ^ Src package name: cabal dir
-    -> RIO env
-         ( RawSnapshotLocation
-         , Map PackageName (Map FlagName Bool)
-         , Map PackageName Version
-         , Map PackageName (ResolvedPath Dir))
-       -- ^ ( Resolver
-       --   , Flags for src packages and extra deps
-       --   , Extra dependencies
-       --   , Src packages actually considered)
-getDefaultResolver initOpts mresolver pkgDirs = do
-    (candidate, loc) <- case mresolver of
-      Nothing -> selectSnapResolver
-      Just ar -> do
-        sl <- makeConcreteResolver ar
-        c <- loadProjectSnapshotCandidate sl NoPrintWarnings False
-        pure (c, sl)
-    getWorkingResolverPlan initOpts pkgDirs candidate loc
-    where
-        -- TODO support selecting best across regular and custom snapshots
-        selectSnapResolver = do
-            snaps <- fmap getRecommendedSnapshots getSnapshots'
-            (c, l, r) <- selectBestSnapshot (Map.elems pkgDirs) snaps
-            case r of
-                BuildPlanCheckFail {} | not (omitPackages initOpts)
-                        -> throwM (NoMatchingSnapshot snaps)
-                _ -> pure (c, l)
-
-getWorkingResolverPlan
-    :: (HasConfig env, HasGHCVariant env)
-    => InitOpts
-    -> Map PackageName (ResolvedPath Dir)
-    -- ^ Src packages: cabal dir
-    -> SnapshotCandidate env
-    -> RawSnapshotLocation
-    -> RIO env
-         ( RawSnapshotLocation
-         , Map PackageName (Map FlagName Bool)
-         , Map PackageName Version
-         , Map PackageName (ResolvedPath Dir))
-       -- ^ ( SnapshotDef
-       --   , Flags for src packages and extra deps
-       --   , Extra dependencies
-       --   , Src packages actually considered)
-getWorkingResolverPlan initOpts pkgDirs0 snapCandidate snapLoc = do
-    logInfo $ "Selected resolver: " <> display snapLoc
-    go pkgDirs0
-    where
-        go pkgDirs = do
-            eres <- checkBundleResolver initOpts snapLoc snapCandidate (Map.elems pkgDirs)
-            -- if some packages failed try again using the rest
-            case eres of
-                Right (f, edeps)-> pure (snapLoc, f, edeps, pkgDirs)
-                Left ignored
-                    | Map.null available -> do
-                        logWarn $ "*** Could not find a working plan for any of " <>
-                                "the user packages.\nProceeding to create a " <>
-                                "config anyway."
-                        pure (snapLoc, Map.empty, Map.empty, Map.empty)
-                    | otherwise -> do
-                        when (Map.size available == Map.size pkgDirs) $
-                            error "Bug: No packages to ignore"
-
-                        if length ignored > 1 then do
-                          logWarn "*** Ignoring packages:"
-                          logWarn $ display $ indent $ showItems $ map packageNameString ignored
-                        else
-                          logWarn $ "*** Ignoring package: "
-                                 <> fromString
-                                      (case ignored of
-                                        [] -> error "getWorkingResolverPlan.head"
-                                        x:_ -> packageNameString x)
-
-                        go available
-                    where
-                      indent t   = T.unlines $ fmap ("    " <>) (T.lines t)
-                      isAvailable k _ = k `notElem` ignored
-                      available       = Map.filterWithKey isAvailable pkgDirs
-
-checkBundleResolver
-    :: (HasConfig env, HasGHCVariant env)
-    => InitOpts
-    -> RawSnapshotLocation
-    -> SnapshotCandidate env
-    -> [ResolvedPath Dir]
-    -- ^ Src package dirs
-    -> RIO env
-         (Either [PackageName] ( Map PackageName (Map FlagName Bool)
-                               , Map PackageName Version))
-checkBundleResolver initOpts snapshotLoc snapCandidate pkgDirs = do
-    result <- checkSnapBuildPlan pkgDirs Nothing snapCandidate
-    case result of
-        BuildPlanCheckOk f -> pure $ Right (f, Map.empty)
-        BuildPlanCheckPartial _f e -> do -- FIXME:qrilka unused f
-            if omitPackages initOpts
-                then do
-                    warnPartial result
-                    logWarn "*** Omitting packages with unsatisfied dependencies"
-                    pure $ Left $ failedUserPkgs e
-                else throwM $ ResolverPartial snapshotLoc (show result)
-        BuildPlanCheckFail _ e _
-            | omitPackages initOpts -> do
-                logWarn $ "*** Resolver compiler mismatch: "
-                           <> display snapshotLoc
-                logWarn $ display $ indent $ T.pack $ show result
-                pure $ Left $ failedUserPkgs e
-            | otherwise -> throwM $ ResolverMismatch snapshotLoc (show result)
-    where
-      indent t  = T.unlines $ fmap ("    " <>) (T.lines t)
-      warnPartial res = do
-          logWarn $ "*** Resolver " <> display snapshotLoc
-                      <> " will need external packages: "
-          logWarn $ display $ indent $ T.pack $ show res
-
-      failedUserPkgs e = Map.keys $ Map.unions (Map.elems (fmap deNeededBy e))
+getSnapshots' = catchAny
+  getSnapshots
+  (prettyThrowIO . SnapshotDownloadFailure)
+
+-- | Get the default snapshot value
+getDefaultSnapshot ::
+     (HasConfig env, HasGHCVariant env)
+  => InitOpts
+  -> Maybe AbstractSnapshot
+  -> Map PackageName (ResolvedPath Dir)
+  -- ^ Src package name: cabal dir
+  -> RIO env
+       ( RawSnapshotLocation
+       , Map PackageName (Map FlagName Bool)
+       , Map PackageName Version
+       , Map PackageName (ResolvedPath Dir))
+     -- ^ ( Snapshot
+     --   , Flags for src packages and extra deps
+     --   , Extra dependencies
+     --   , Src packages actually considered)
+getDefaultSnapshot initOpts mASnapshot pkgDirs = do
+  (candidate, loc) <- case mASnapshot of
+    Nothing -> selectSnapshot
+    Just as -> do
+      sl <- makeConcreteSnapshot as
+      c <- loadProjectSnapshotCandidate sl NoPrintWarnings False
+      pure (c, sl)
+  getWorkingSnapshotPlan initOpts pkgDirs candidate loc
+ where
+  -- TODO support selecting best across regular and custom snapshots
+  selectSnapshot = do
+    snaps <- fmap getRecommendedSnapshots getSnapshots'
+    (c, l, r) <- selectBestSnapshot (Map.elems pkgDirs) snaps
+    case r of
+      BuildPlanCheckFail {} | not initOpts.omitPackages
+              -> prettyThrowM $ NoMatchingSnapshot snaps
+      _ -> pure (c, l)
+
+getWorkingSnapshotPlan ::
+     (HasConfig env, HasGHCVariant env)
+  => InitOpts
+  -> Map PackageName (ResolvedPath Dir)
+  -- ^ Src packages: cabal dir
+  -> SnapshotCandidate env
+  -> RawSnapshotLocation
+  -> RIO env
+       ( RawSnapshotLocation
+       , Map PackageName (Map FlagName Bool)
+       , Map PackageName Version
+       , Map PackageName (ResolvedPath Dir))
+     -- ^ ( Raw snapshot location
+     --   , Flags for src packages and extra deps
+     --   , Extra dependencies
+     --   , Src packages actually considered)
+getWorkingSnapshotPlan initOpts pkgDirs0 snapCandidate snapLoc = do
+  prettyInfoL
+    [ flow "Selected the snapshot"
+    , pretty (PrettyRawSnapshotLocation snapLoc) <> "."
+    ]
+  go pkgDirs0
+ where
+  go pkgDirs = do
+    eres <- checkBundleSnapshot initOpts snapLoc snapCandidate (Map.elems pkgDirs)
+    -- if some packages failed try again using the rest
+    case eres of
+      Right (f, edeps)-> pure (snapLoc, f, edeps, pkgDirs)
+      Left ignored
+        | Map.null available -> do
+            prettyWarnS
+              "Could not find a working plan for any of the user packages. \
+              \Proceeding to create a project-level configuration file anyway."
+            pure (snapLoc, Map.empty, Map.empty, Map.empty)
+        | otherwise -> do
+            when (Map.size available == Map.size pkgDirs) $
+              throwM NoPackagesToIgnoreBug
+            if length ignored > 1
+              then
+                prettyWarn
+                  (  flow "Ignoring the following packages:"
+                  <> line
+                  <> bulletedList (map fromPackageName ignored)
+                  )
+              else
+                prettyWarnL
+                  [ flow "Ignoring package:"
+                  , fromString
+                      ( case ignored of
+                          [] -> throwM NoPackagesToIgnoreBug
+                          x:_ -> packageNameString x
+                      )
+                  ]
+            go available
+       where
+        isAvailable k _ = k `notElem` ignored
+        available       = Map.filterWithKey isAvailable pkgDirs
+
+checkBundleSnapshot ::
+     (HasConfig env, HasGHCVariant env)
+  => InitOpts
+  -> RawSnapshotLocation
+  -> SnapshotCandidate env
+  -> [ResolvedPath Dir]
+  -- ^ Src package dirs
+  -> RIO env
+       (Either [PackageName] ( Map PackageName (Map FlagName Bool)
+                             , Map PackageName Version))
+checkBundleSnapshot initOpts snapshotLoc snapCandidate pkgDirs = do
+  result <- checkSnapBuildPlan pkgDirs Nothing snapCandidate
+  case result of
+    BuildPlanCheckOk f -> pure $ Right (f, Map.empty)
+    BuildPlanCheckPartial _f e -> do -- FIXME:qrilka unused f
+      if initOpts.omitPackages
+        then do
+          warnPartial result
+          prettyWarnS "Omitting packages with unsatisfied dependencies"
+          pure $ Left $ failedUserPkgs e
+        else
+          prettyThrowM $ SnapshotPartial snapshotLoc (show result)
+    BuildPlanCheckFail _ e _
+      | initOpts.omitPackages -> do
+          prettyWarn $
+               fillSep
+                 [ "Snapshot compiler mismatch:"
+                 , style Current (fromString . T.unpack $ textDisplay snapshotLoc)
+                 ]
+            <> line
+            <> indent 4 (string $ show result)
+          pure $ Left $ failedUserPkgs e
+      | otherwise -> prettyThrowM $ SnapshotMismatch snapshotLoc (show result)
+ where
+  warnPartial res = do
+    prettyWarn $
+         fillSep
+           [ "Snapshot"
+           , style Current (fromString . T.unpack $ textDisplay snapshotLoc)
+           , flow "will need external packages:"
+           ]
+      <> line
+      <> indent 4 (string $ show res)
+
+  failedUserPkgs e = Map.keys $ Map.unions (Map.elems (fmap (.neededBy) e))
 
 getRecommendedSnapshots :: Snapshots -> NonEmpty SnapName
 getRecommendedSnapshots snapshots =
-    -- in order - Latest LTS, Latest Nightly, all LTS most recent first
-    case NonEmpty.nonEmpty supportedLtss of
-        Just (mostRecent :| older)
-            -> mostRecent :| (nightly : older)
-        Nothing
-            -> nightly :| []
-  where
-    ltss = map (uncurry LTS) (IntMap.toDescList $ snapshotsLts snapshots)
-    supportedLtss = filter (>= minSupportedLts) ltss
-    nightly = Nightly (snapshotsNightly snapshots)
+  -- in order - Latest LTS, Latest Nightly, all LTS most recent first
+  case nonEmpty supportedLtss of
+    Just (mostRecent :| older) -> mostRecent :| (nightly : older)
+    Nothing -> nightly :| []
+ where
+  ltss = map (uncurry LTS) (IntMap.toDescList snapshots.lts )
+  supportedLtss = filter (>= minSupportedLts) ltss
+  nightly = Nightly snapshots.nightly
 
 -- |Yields the minimum LTS supported by Stack.
 minSupportedLts :: SnapName
-minSupportedLts = LTS 3 0 -- See https://github.com/commercialhaskell/stack/blob/master/ChangeLog.md
-                          -- under Stack version 2.1.1.
-
-data InitOpts = InitOpts
-    { searchDirs     :: ![T.Text]
-    -- ^ List of sub directories to search for .cabal files
-    , omitPackages   :: Bool
-    -- ^ Exclude conflicting or incompatible user packages
-    , forceOverwrite :: Bool
-    -- ^ Overwrite existing stack.yaml
-    , includeSubDirs :: Bool
-    -- ^ If True, include all .cabal files found in any sub directories
-    }
+-- See https://github.com/commercialhaskell/stack/blob/master/ChangeLog.md
+-- under Stack version 3.1.1.
+minSupportedLts = LTS 12 0
 
-findCabalDirs
-  :: HasConfig env
+findCabalDirs ::
+     HasConfig env
   => Bool -> Path Abs Dir -> RIO env (Set (Path Abs Dir))
 findCabalDirs recurse dir =
-    Set.fromList . map parent
-    <$> liftIO (findFiles dir isHpackOrCabal subdirFilter)
-  where
-    subdirFilter subdir = recurse && not (isIgnored subdir)
-    isHpack = (== "package.yaml")     . toFilePath . filename
-    isCabal = (".cabal" `isSuffixOf`) . toFilePath
-    isHpackOrCabal x = isHpack x || isCabal x
-
-    isIgnored path = "." `isPrefixOf` dirName || dirName `Set.member` ignoredDirs
-      where
-        dirName = FP.dropTrailingPathSeparator (toFilePath (dirname path))
+  Set.fromList . map parent
+  <$> liftIO (findFiles dir isHpackOrCabal subdirFilter)
+ where
+  subdirFilter subdir = recurse && not (isIgnored subdir)
+  isHpack = (== "package.yaml")     . toFilePath . filename
+  isCabal = (".cabal" `isSuffixOf`) . toFilePath
+  isHpackOrCabal x = isHpack x || isCabal x
+  isIgnored path = "." `isPrefixOf` dirName || dirName `Set.member` ignoredDirs
+   where
+    dirName = FP.dropTrailingPathSeparator (toFilePath (dirname path))
 
 -- | Special directories that we don't want to traverse for .cabal files
 ignoredDirs :: Set FilePath
-ignoredDirs = Set.fromList
-    [ "dist"
-    ]
-
-cabalPackagesCheck
-    :: (HasConfig env, HasGHCVariant env)
-     => [Path Abs Dir]
-     -> Maybe String
-     -> RIO env
-          ( Map PackageName (Path Abs File, C.GenericPackageDescription)
-          , [Path Abs File])
-cabalPackagesCheck cabaldirs dupErrMsg = do
-    when (null cabaldirs) $ do
-      logWarn "We didn't find any local package directories"
-      logWarn "You may want to create a package with \"stack new\" instead"
-      logWarn "Create an empty project for now"
-      logWarn "If this isn't what you want, please delete the generated \"stack.yaml\""
-
-    relpaths <- mapM prettyPath cabaldirs
-    logInfo "Using cabal packages:"
-    logInfo $ formatGroup relpaths
-
-    packages <- for cabaldirs $ \dir -> do
-      (gpdio, _name, cabalfp) <- loadCabalFilePath dir
-      gpd <- liftIO $ gpdio YesPrintWarnings
-      pure (cabalfp, gpd)
-
-    -- package name cannot be empty or missing otherwise
-    -- it will result in Cabal solver failure.
-    -- Stack requires packages name to match the Cabal file name
-    -- Just the latter check is enough to cover both the cases
-
-    let normalizeString = T.unpack . T.normalize T.NFC . T.pack
-        getNameMismatchPkg (fp, gpd)
-            | (normalizeString . packageNameString . gpdPackageName) gpd /= (normalizeString . FP.takeBaseName . toFilePath) fp
-                = Just fp
-            | otherwise = Nothing
-        nameMismatchPkgs = mapMaybe getNameMismatchPkg packages
-
-    when (nameMismatchPkgs /= []) $ do
-        rels <- mapM prettyPath nameMismatchPkgs
-        error $ "Package name as defined in the Cabal file must match the " <>
-                "Cabal file name.\n" <>
-                "Please fix the following packages and try again:\n"
-                <> T.unpack (utf8BuilderToText (formatGroup rels))
-
-    let dupGroups = filter ((> 1) . length)
-                            . groupSortOn (gpdPackageName . snd)
-        dupAll    = concat $ dupGroups packages
-
-        -- Among duplicates prefer to include the ones in upper level dirs
-        pathlen     = length . FP.splitPath . toFilePath . fst
-        getmin      = minimumBy (compare `on` pathlen)
-        dupSelected = map getmin (dupGroups packages)
-        dupIgnored  = dupAll \\ dupSelected
-        unique      = packages \\ dupIgnored
-
-    when (dupIgnored /= []) $ do
-        dups <- mapM (mapM (prettyPath. fst)) (dupGroups packages)
-        logWarn $
-            "Following packages have duplicate package names:\n" <>
-            mconcat (intersperse "\n" (map formatGroup dups))
-        case dupErrMsg of
-          Nothing -> logWarn $
-                 "Packages with duplicate names will be ignored.\n"
-              <> "Packages in upper level directories will be preferred.\n"
-          Just msg -> error msg
-
-    pure (Map.fromList
-            $ map (\(file, gpd) -> (gpdPackageName gpd,(file, gpd))) unique
-           , map fst dupIgnored)
-
-formatGroup :: [String] -> Utf8Builder
-formatGroup = foldMap (\path -> "- " <> fromString path <> "\n")
+ignoredDirs = Set.fromList ["dist"]
+
+cabalPackagesCheck ::
+     (HasConfig env, HasGHCVariant env)
+  => [Path Abs Dir]
+  -> RIO env
+       ( Map PackageName (Path Abs File, C.GenericPackageDescription)
+       , [Path Abs File]
+       )
+cabalPackagesCheck cabaldirs = do
+  when (null cabaldirs) $
+    prettyWarn $
+         fillSep
+           [ flow "Stack did not find any local directories containing a \
+                  \package description. You may want to create a package with"
+           , style Shell (flow "stack new")
+           , flow "instead."
+           ]
+      <> blankLine
+      <> fillSep
+           [ flow "Stack will create an empty project. If this is not what \
+                  \you want, please delete the generated"
+           , style File "stack.yaml"
+           , "file."
+           ]
+  relpaths <- mapM prettyPath cabaldirs
+  unless (null relpaths) $
+    prettyInfo $
+         flow "Using the Cabal packages:"
+      <> line
+      <> bulletedList (map (style File . fromString) relpaths)
+      <> line
+  -- A package name cannot be empty or missing otherwise it will result in
+  -- Cabal solver failure. Stack requires packages name to match the Cabal
+  -- file name. Just the latter check is enough to cover both the cases.
+  ePackages <- for cabaldirs $ \dir -> do
+    -- Pantry's 'loadCabalFilePath' throws 'MismatchedCabalName' (error
+    -- [S-910]) if the Cabal file name does not match the package it
+    -- defines.
+    (gpdio, _name, cabalFP) <- loadCabalFilePath (Just stackProgName') dir
+    eres <- liftIO $ try (gpdio YesPrintWarnings)
+    case eres :: Either PantryException C.GenericPackageDescription of
+      Right gpd -> pure $ Right (cabalFP, gpd)
+      Left (MismatchedCabalName fp name) -> pure $ Left (fp, name)
+      Left e -> throwIO e
+  let (nameMismatchPkgs, packages) = partitionEithers ePackages
+  when (nameMismatchPkgs /= []) $
+    prettyThrowIO $ PackageNameInvalid nameMismatchPkgs
+  let dupGroups = mapMaybe nonEmpty . groupSortOn (gpdPackageName . snd)
+      dupAll    = concatMap NE.toList $ dupGroups packages
+      -- Among duplicates prefer to include the ones in upper level dirs
+      pathlen     = length . FP.splitPath . toFilePath . fst
+      getmin      = minimumBy1 (compare `on` pathlen)
+      dupSelected = map getmin (dupGroups packages)
+      dupIgnored  = dupAll \\ dupSelected
+      unique      = packages \\ dupIgnored
+  when (dupIgnored /= []) $ do
+    dups <- mapM (mapM (prettyPath . fst)) (dupGroups packages)
+    prettyWarn $
+         flow "The following packages have duplicate package names:"
+      <> line
+      <> foldMap
+           ( \dup ->    bulletedList (map fromString (NE.toList dup))
+                     <> line
+           )
+           dups
+      <> line
+      <> flow "Packages with duplicate names will be ignored. Packages \
+              \in upper level directories will be preferred."
+      <> line
+  pure (Map.fromList
+          $ map (\(file, gpd) -> (gpdPackageName gpd,(file, gpd))) unique
+         , map fst dupIgnored)
 
 prettyPath ::
-       (MonadIO m, RelPath (Path r t) ~ Path Rel t, AnyPath (Path r t))
-    => Path r t
-    -> m FilePath
-prettyPath path = do
-    eres <- liftIO $ try $ makeRelativeToCurrentDir path
-    pure $ case eres of
-        Left (_ :: PathException) -> toFilePath path
-        Right res -> toFilePath res
+     (MonadIO m, RelPath (Path r t) ~ Path Rel t, AnyPath (Path r t))
+  => Path r t
+  -> m FilePath
+prettyPath path =
+  liftIO (try $ makeRelativeToCurrentDir path) <&> \case
+    Left (_ :: PathException) -> toFilePath path
+    Right res -> toFilePath res
diff --git a/src/Stack/List.hs b/src/Stack/List.hs
index 080c3989a5..fbd22debb8 100644
--- a/src/Stack/List.hs
+++ b/src/Stack/List.hs
@@ -1,77 +1,132 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.List
+Description : Types and functions related to Stack's @list@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @list@ command.
+-}
 
 module Stack.List
-  ( listPackages
+  ( listCmd
+  , listPackages
   ) where
 
-import Stack.Prelude
+import qualified RIO.ByteString.Lazy as Lazy
 import qualified RIO.Map as Map
-import RIO.List (intercalate)
-import RIO.Process (HasProcessContext)
+import           RIO.Process ( HasProcessContext )
+import           Stack.Config ( getRawSnapshot )
+import           Stack.Prelude
+import           Stack.Runners ( ShouldReexec (..), withConfig )
+import           Stack.SourceMap ( globalsFromHints )
+import           Stack.Types.Runner ( Runner )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.List" module.
+newtype ListPrettyException
+  = CouldNotParsePackageSelectors [StyleDoc]
+  deriving Show
+
+instance Pretty ListPrettyException where
+  pretty (CouldNotParsePackageSelectors errs) =
+    "[S-4926]"
+    <> line
+    <> bulletedList errs
 
-newtype ListException
-  = CouldNotParsePackageSelectors [String]
-    deriving Typeable
-instance Exception ListException
-instance Show ListException where
-    show (CouldNotParsePackageSelectors strs) = unlines $ map ("- " ++) strs
+instance Exception ListPrettyException
+
+-- | Function underlying the @stack list@ command. List packages.
+listCmd :: [String] -> RIO Runner ()
+listCmd names = withConfig NoReexec $ do
+  mSnapshot <- getRawSnapshot
+  let mWc = rsCompiler <$> mSnapshot
+  mGlobals <- mapM globalsFromHints mWc
+  listPackages mSnapshot mGlobals names
 
 -- | Intended to work for the command line command.
-listPackages
-  :: forall env. (HasPantryConfig env, HasLogFunc env, HasProcessContext env)
-  => Maybe RawSnapshot -- ^ when looking up by name, take from this build plan
-  -> [String] -- ^ names or identifiers
+listPackages ::
+     forall env. (HasPantryConfig env, HasProcessContext env, HasTerm env)
+  => Maybe RawSnapshot
+     -- ^ When looking up by name, take from this build plan.
+  -> Maybe (Map PackageName Version)
+     -- ^ Global hints for snapshot wanted compiler.
+  -> [String]
+     -- ^ Names or identifiers.
   -> RIO env ()
-listPackages mSnapshot input = do
-    let (errs1, names) = case mSnapshot of
-                   Just snapshot | null input ->
-                                     ([], Map.keys (rsPackages snapshot))
-                   _ -> partitionEithers $ map parse input
-    (errs2, locs) <- partitionEithers <$> traverse toLoc names
-    case errs1 ++ errs2 of
-      [] -> pure ()
-      errs -> throwM $ CouldNotParsePackageSelectors errs
-    mapM_ (logInfo . fromString . packageIdentifierString) locs
-  where
-    toLoc | Just snapshot <- mSnapshot = toLocSnapshot snapshot
-          | otherwise = toLocNoSnapshot
+listPackages mSnapshot mGlobals input = do
+  let (errs1, names) = case mSnapshot of
+        Just snapshot | null input -> ([], Map.keys (rsPackages snapshot))
+        _ -> partitionEithers $ map parse input
+  (errs2, locs) <- partitionEithers <$> traverse toLoc names
+  case errs1 ++ errs2 of
+    [] -> pure ()
+    errs -> prettyThrowM $ CouldNotParsePackageSelectors errs
+  mapM_ (Lazy.putStrLn . fromPackageId) locs
+ where
+  toLoc | Just snapshot <- mSnapshot = toLocSnapshot snapshot
+        | otherwise = toLocNoSnapshot
 
-    toLocNoSnapshot :: PackageName -> RIO env (Either String PackageIdentifier)
-    toLocNoSnapshot name = do
-      mloc1 <- getLatestHackageLocation YesRequireHackageIndex name UsePreferredVersions
-      mloc <-
-        case mloc1 of
-          Just _ -> pure mloc1
-          Nothing -> do
-            updated <- updateHackageIndex $ Just $ "Could not find package " <> fromString (packageNameString name) <> ", updating"
-            case updated of
-              UpdateOccurred -> getLatestHackageLocation YesRequireHackageIndex name UsePreferredVersions
-              NoUpdateOccurred -> pure Nothing
-      case mloc of
+  toLocNoSnapshot :: PackageName -> RIO env (Either StyleDoc PackageIdentifier)
+  toLocNoSnapshot name = do
+    mloc1 <-
+      getLatestHackageLocation YesRequireHackageIndex name UsePreferredVersions
+    mloc <-
+      case mloc1 of
+        Just _ -> pure mloc1
         Nothing -> do
-          candidates <- getHackageTypoCorrections name
-          pure $ Left $ concat
-            [ "Could not find package "
-            , packageNameString name
-            , " on Hackage"
-            , if null candidates
-                then ""
-                else ". Perhaps you meant: " ++ intercalate ", " (map packageNameString candidates)
-            ]
-        Just loc -> pure $ Right (packageLocationIdent loc)
+          updated <-
+            updateHackageIndex $ Just $
+                 "Could not find package "
+              <> fromPackageName name
+              <> ", updating"
+          case updated of
+            UpdateOccurred ->
+              getLatestHackageLocation
+                YesRequireHackageIndex
+                name
+                UsePreferredVersions
+            NoUpdateOccurred -> pure Nothing
+    case mloc of
+      Nothing -> do
+        candidates <- getHackageTypoCorrections name
+        pure $ Left $ fillSep
+          [ flow "Could not find package"
+          , style Current (fromPackageName name)
+          , flow "on Hackage."
+          , if null candidates
+              then mempty
+              else fillSep $
+                  flow "Perhaps you meant one of:"
+                : mkNarrativeList (Just Good) False
+                    (map fromPackageName candidates :: [StyleDoc])
+          ]
+      Just loc -> pure $ Right (packageLocationIdent loc)
 
-    toLocSnapshot :: RawSnapshot -> PackageName -> RIO env (Either String PackageIdentifier)
-    toLocSnapshot snapshot name =
-        case Map.lookup name (rsPackages snapshot) of
-          Nothing ->
-            pure $ Left $ "Package does not appear in snapshot: " ++ packageNameString name
-          Just sp -> do
-            loc <- cplComplete <$> completePackageLocation (rspLocation sp)
-            pure $ Right (packageLocationIdent loc)
+  toLocSnapshot ::
+       RawSnapshot
+    -> PackageName
+    -> RIO env (Either StyleDoc PackageIdentifier)
+  toLocSnapshot snapshot name =
+    case Map.lookup name (rsPackages snapshot) of
+      Nothing -> case Map.lookup name =<< mGlobals of
+        Nothing ->
+          pure $ Left $ fillSep
+            [ flow "Package does not appear in snapshot (directly or \
+                   \indirectly):"
+            , style Current (fromPackageName name) <> "."
+            ]
+        Just version ->
+          pure $ Right $ PackageIdentifier name version
+      Just sp -> do
+        loc <- cplComplete <$> completePackageLocation (rspLocation sp)
+        pure $ Right (packageLocationIdent loc)
 
-    parse s =
-        case parsePackageName s of
-            Just x -> Right x
-            Nothing -> Left $ "Could not parse as package name or identifier: " ++ s
+  parse s =
+    case parsePackageName s of
+      Just x -> Right x
+      Nothing -> Left $ fillSep
+        [ flow "Could not parse as package name or identifier:"
+        , style Current (fromString s) <> "."
+        ]
diff --git a/src/Stack/Lock.hs b/src/Stack/Lock.hs
index ca0d94937f..7ef17d028f 100644
--- a/src/Stack/Lock.hs
+++ b/src/Stack/Lock.hs
@@ -1,157 +1,200 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Lock
+License     : BSD-3-Clause
+-}
 
 module Stack.Lock
-    ( lockCachedWanted
-    , LockedLocation(..)
-    , Locked(..)
-    ) where
-
-import Pantry.Internal.AesonExtended
-import Data.ByteString.Builder (byteString)
-import qualified Data.List.NonEmpty as NE
+  ( lockCachedWanted
+  , LockedLocation (..)
+  , Locked (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), ToJSON, Value, (.=), object )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings (..), (..:), jsonSubWarnings
+                   , jsonSubWarningsT, logJSONWarnings, withObjectWarnings
+                   )
+import           Data.ByteString.Builder ( byteString )
 import qualified Data.Map as Map
+import qualified Data.Text as T
 import qualified Data.Yaml as Yaml
-import Path (parent)
-import Path.Extended (addExtension)
-import Path.IO (doesFileExist)
-import Stack.Prelude
-import Stack.SourceMap
-import Stack.Types.Config
-import Stack.Types.SourceMap
+import qualified RIO.NonEmpty as NE
+import           Path ( addExtension, parent )
+import           Path.IO ( doesFileExist )
+import           Stack.Prelude
+import           Stack.SourceMap ( snapToDepPackage )
+import           Stack.Types.Config.Exception ( ConfigPrettyException (..) )
+import           Stack.Types.LockFileBehavior ( LockFileBehavior (..) )
+import           Stack.Types.Runner ( HasRunner, lockFileBehaviorL, rslInLogL )
+import           Stack.Types.SourceMap ( DepPackage, SMWanted )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Lock" module.
+data LockPrettyException
+  = WritingLockFileError (Path Abs File) Locked
+  deriving Show
 
+instance Pretty LockPrettyException where
+  pretty (WritingLockFileError lockFile newLocked) =
+    "[S-1353]"
+    <> line
+    <> flow "Stack is configured to report an error on writing a lock file."
+    <> blankLine
+    <> fillSep
+         [ flow "Stack just tried to write the following lock file content to"
+         , pretty lockFile <> ":"
+         ]
+    <> blankLine
+    <> string newLocked'
+   where
+    newLocked' = T.unpack . decodeUtf8With lenientDecode $ Yaml.encode newLocked
+
+instance Exception LockPrettyException
+
+-- | Type representing locked locations.
 data LockedLocation a b = LockedLocation
-    { llOriginal :: a
-    , llCompleted :: b
-    } deriving (Eq, Show)
+  { original :: a
+  , completed :: b
+  }
+  deriving (Eq, Show)
 
 instance (ToJSON a, ToJSON b) => ToJSON (LockedLocation a b) where
-    toJSON ll =
-        object [ "original" .= llOriginal ll, "completed" .= llCompleted ll ]
+  toJSON ll =
+      object [ "original" .= ll.original, "completed" .= ll.completed ]
 
 instance ( FromJSON (WithJSONWarnings (Unresolved a))
          , FromJSON (WithJSONWarnings (Unresolved b))
          ) =>
          FromJSON (WithJSONWarnings (Unresolved (LockedLocation a b))) where
-    parseJSON =
-        withObjectWarnings "LockedLocation" $ \o -> do
-            original <- jsonSubWarnings $ o ..: "original"
-            completed <- jsonSubWarnings $ o ..: "completed"
-            pure $ LockedLocation <$> original <*> completed
+  parseJSON =
+    withObjectWarnings "LockedLocation" $ \o -> do
+      original <- jsonSubWarnings $ o ..: "original"
+      completed <- jsonSubWarnings $ o ..: "completed"
+      pure $ LockedLocation <$> original <*> completed
 
 -- Special wrapper extracting only 1 RawPackageLocationImmutable
 -- serialization should not produce locations with multiple subdirs
 -- so we should be OK using just a head element
-newtype SingleRPLI = SingleRPLI { unSingleRPLI :: RawPackageLocationImmutable}
+newtype SingleRPLI
+  = SingleRPLI { singleRPLI :: RawPackageLocationImmutable}
 
 instance FromJSON (WithJSONWarnings (Unresolved SingleRPLI)) where
-   parseJSON v =
-     do
-       WithJSONWarnings unresolvedRPLIs ws <- parseJSON v
-       let withWarnings x = WithJSONWarnings x ws
-       pure $ withWarnings $ SingleRPLI . NE.head <$> unresolvedRPLIs
+  parseJSON v =
+    do
+      WithJSONWarnings unresolvedRPLIs ws <- parseJSON v
+      let withWarnings x = WithJSONWarnings x ws
+      pure $ withWarnings $ SingleRPLI . NE.head <$> unresolvedRPLIs
 
+-- | Type representing the contents of lock files.
 data Locked = Locked
-    { lckSnapshotLocations :: [LockedLocation RawSnapshotLocation SnapshotLocation]
-    , lckPkgImmutableLocations :: [LockedLocation RawPackageLocationImmutable PackageLocationImmutable]
-    } deriving (Eq, Show)
+  { snapshotLocations :: [LockedLocation RawSnapshotLocation SnapshotLocation]
+  , pkgImmutableLocations :: [LockedLocation RawPackageLocationImmutable PackageLocationImmutable]
+  }
+  deriving (Eq, Show)
 
 instance ToJSON Locked where
-    toJSON Locked {..} =
-        object
-            [ "snapshots" .= lckSnapshotLocations
-            , "packages" .= lckPkgImmutableLocations
-            ]
+  toJSON lck =
+    object
+      [ "snapshots" .= lck.snapshotLocations
+      , "packages" .= lck.pkgImmutableLocations
+      ]
 
 instance FromJSON (WithJSONWarnings (Unresolved Locked)) where
-    parseJSON = withObjectWarnings "Locked" $ \o -> do
-      snapshots <- jsonSubWarningsT $ o ..: "snapshots"
-      packages <- jsonSubWarningsT $ o ..: "packages"
-      let unwrap ll = ll { llOriginal = unSingleRPLI (llOriginal ll) }
-      pure $ Locked <$> sequenceA snapshots <*> (map unwrap <$> sequenceA packages)
-
-loadYamlThrow
-    :: HasLogFunc env
-    => (Value -> Yaml.Parser (WithJSONWarnings a)) -> Path Abs File -> RIO env a
-loadYamlThrow parser path = do
-    eVal <- liftIO $ Yaml.decodeFileEither (toFilePath path)
-    case eVal of
-        Left parseException -> throwIO $
-            ParseConfigFileException path parseException
-        Right val -> case Yaml.parseEither parser val of
-            Left err -> throwIO $ Yaml.AesonException err
-            Right (WithJSONWarnings res warnings) -> do
-                logJSONWarnings (toFilePath path) warnings
-                pure res
+  parseJSON = withObjectWarnings "Locked" $ \o -> do
+    snapshots <- jsonSubWarningsT $ o ..: "snapshots"
+    packages <- jsonSubWarningsT $ o ..: "packages"
+    let unwrap :: LockedLocation SingleRPLI b -> LockedLocation RawPackageLocationImmutable b
+        unwrap ll = ll { original = ll.original.singleRPLI }
+    pure $ Locked <$> sequenceA snapshots <*> (map unwrap <$> sequenceA packages)
+
+loadYamlThrow ::
+     HasLogFunc env
+  => (Value -> Yaml.Parser (WithJSONWarnings a))
+  -> Path Abs File
+  -> RIO env a
+loadYamlThrow parser path =
+  liftIO (Yaml.decodeFileEither (toFilePath path)) >>= \case
+    Left parseException -> throwIO $
+      ParseConfigFileException path parseException
+    Right val -> case Yaml.parseEither parser val of
+      Left err -> throwIO $ Yaml.AesonException err
+      Right (WithJSONWarnings res warnings) -> do
+        logJSONWarnings (toFilePath path) warnings
+        pure res
 
+-- | Yields a t'Stack.Types.SourceMap.SMWanted' taking into account the relevant
+-- lock file, if one is applicable and it exists.
 lockCachedWanted ::
-       (HasPantryConfig env, HasRunner env)
-    => Path Abs File
-    -> RawSnapshotLocation
-    -> (Map RawPackageLocationImmutable PackageLocationImmutable
-        -> WantedCompiler
-        -> Map PackageName (Bool -> RIO env DepPackage)
-        -> RIO env ( SMWanted, [CompletedPLI]))
-    -> RIO env SMWanted
-lockCachedWanted stackFile resolver fillWanted = do
-    lockFile <- liftIO $ addExtension ".lock" stackFile
-    let getLockExists = doesFileExist lockFile
-    lfb <- view lockFileBehaviorL
-    readLockFile <-
-      case lfb of
-        LFBIgnore -> pure False
-        LFBReadWrite -> getLockExists
-        LFBReadOnly -> getLockExists
-        LFBErrorOnWrite -> getLockExists
-    locked <-
-        if readLockFile
-        then do
-            logDebug "Using package location completions from a lock file"
-            unresolvedLocked <- loadYamlThrow parseJSON lockFile
-            resolvePaths (Just $ parent stackFile) unresolvedLocked
-        else do
-            logDebug "Not reading lock file"
-            pure $ Locked [] []
-    let toMap :: Ord a => [LockedLocation a b] -> Map a b
-        toMap =  Map.fromList . map (\ll -> (llOriginal ll, llCompleted ll))
-        slocCache = toMap $ lckSnapshotLocations locked
-        pkgLocCache = toMap $ lckPkgImmutableLocations locked
-    debugRSL <- view rslInLogL
-    (snap, slocCompleted, pliCompleted) <-
-        loadAndCompleteSnapshotRaw' debugRSL resolver slocCache pkgLocCache
-    let compiler = snapshotCompiler snap
-        snPkgs = Map.mapWithKey (\n p h -> snapToDepPackage h n p) (snapshotPackages snap)
-    (wanted, prjCompleted) <- fillWanted pkgLocCache compiler snPkgs
-    let lockLocations = map (\(CompletedPLI r c) -> LockedLocation r c)
-        differentSnapLocs (CompletedSL raw complete)
-          | raw == toRawSL complete = Nothing
-          | otherwise = Just $ LockedLocation raw complete
-        newLocked = Locked { lckSnapshotLocations = mapMaybe differentSnapLocs slocCompleted
-                           , lckPkgImmutableLocations =
-                             lockLocations $ pliCompleted <> prjCompleted
-                           }
-    when (newLocked /= locked) $ do
-      case lfb of
-        LFBReadWrite ->
-          writeBinaryFileAtomic lockFile $
-            header <>
-            byteString (Yaml.encode newLocked)
-        LFBErrorOnWrite -> do
-          logError "You indicated that Stack should error out on writing a lock file"
-          logError $
-            "I just tried to write the following lock file contents to " <>
-            fromString (toFilePath lockFile)
-          logError $ display $ decodeUtf8With lenientDecode $ Yaml.encode newLocked
-          exitFailure
-        LFBIgnore -> pure ()
-        LFBReadOnly -> pure ()
-    pure wanted
-  where
-    header =
-      "# This file was autogenerated by Stack.\n\
-      \# You should not edit this file by hand.\n\
-      \# For more information, please see the documentation at:\n\
-      \#   https://docs.haskellstack.org/en/stable/lock_files\n\n"
+     (HasPantryConfig env, HasRunner env)
+  => Path Abs File
+     -- ^ The relevant Stack project-level configuration file.
+  -> RawSnapshotLocation
+     -- ^ The relevant snapshot.
+  -> (  Map RawPackageLocationImmutable PackageLocationImmutable
+     -> WantedCompiler
+     -> Map PackageName (Bool -> RIO env DepPackage)
+     -> RIO env ( SMWanted, [CompletedPLI])
+     )
+  -> RIO env SMWanted
+lockCachedWanted stackFile snapshot fillWanted = do
+  lockFile <- liftIO $ addExtension ".lock" stackFile
+  let getLockExists = doesFileExist lockFile
+  lfb <- view lockFileBehaviorL
+  readLockFile <-
+    case lfb of
+      LFBIgnore -> pure False
+      LFBReadWrite -> getLockExists
+      LFBReadOnly -> getLockExists
+      LFBErrorOnWrite -> getLockExists
+  locked <-
+    if readLockFile
+    then do
+      logDebug "Using package location completions from a lock file"
+      unresolvedLocked <- loadYamlThrow parseJSON lockFile
+      resolvePaths (Just $ parent stackFile) unresolvedLocked
+    else do
+      logDebug "Not reading lock file"
+      pure $ Locked [] []
+  let toMap :: Ord a => [LockedLocation a b] -> Map a b
+      toMap =  Map.fromList . map ((.original) &&& (.completed))
+      slocCache = toMap locked.snapshotLocations
+      pkgLocCache = toMap locked.pkgImmutableLocations
+  debugRSL <- view rslInLogL
+  (snap, slocCompleted, pliCompleted) <-
+    loadAndCompleteSnapshotRaw' debugRSL snapshot slocCache pkgLocCache
+  let compiler = snapshotCompiler snap
+      snPkgs = Map.mapWithKey
+                 (\n p h -> snapToDepPackage h n p)
+                 (snapshotPackages snap)
+  (wanted, prjCompleted) <- fillWanted pkgLocCache compiler snPkgs
+  let lockLocations = map (\(CompletedPLI r c) -> LockedLocation r c)
+      differentSnapLocs (CompletedSL raw complete)
+        | raw == toRawSL complete = Nothing
+        | otherwise = Just $ LockedLocation raw complete
+      newLocked = Locked
+        { snapshotLocations = mapMaybe differentSnapLocs slocCompleted
+        , pkgImmutableLocations =
+          lockLocations $ pliCompleted <> prjCompleted
+        }
+  when (newLocked /= locked) $
+    case lfb of
+      LFBReadWrite ->
+        writeBinaryFileAtomic lockFile $
+          header <>
+          byteString (Yaml.encode newLocked)
+      LFBErrorOnWrite ->
+        prettyThrowIO $ WritingLockFileError lockFile newLocked
+      LFBIgnore -> pure ()
+      LFBReadOnly -> pure ()
+  pure wanted
+ where
+  header =
+    "# This file was autogenerated by Stack.\n\
+    \# You should not edit this file by hand.\n\
+    \# For more information, please see the documentation at:\n\
+    \#   https://docs.haskellstack.org/en/stable/topics/lock_files\n\n"
diff --git a/src/Stack/Ls.hs b/src/Stack/Ls.hs
index b7738445f5..8909161a77 100644
--- a/src/Stack/Ls.hs
+++ b/src/Stack/Ls.hs
@@ -1,221 +1,164 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE RecordWildCards     #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+
+{-|
+Module      : Stack.Ls
+Description : Types and functions related to Stack's @ls@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @ls@ command.
+-}
 
 module Stack.Ls
   ( lsCmd
-  , lsParser
   ) where
 
-import Control.Exception (throw)
-import Data.Aeson
-import Data.Array.IArray ((//), elems)
-import Distribution.Package (mkPackageName)
-import Stack.Prelude hiding (Snapshot (..), SnapName (..))
+import           Control.Monad.Extra ( whenJust )
+import           Data.Aeson ( FromJSON, Value (..), (.:), encode )
+import           Data.Array.IArray ( (//), elems )
+import qualified Data.ByteString.Lazy.Char8 as LBC8
+import           Distribution.Package ( mkPackageName )
 import qualified Data.Aeson.Types as A
+import qualified Data.Foldable as F
 import qualified Data.List as L
-import Data.Text hiding (filter, intercalate, pack, reverse)
+import qualified Data.Map as Map
+import qualified Data.Sequence as Seq
+import qualified Data.Set as Set
+import           Data.Text ( isPrefixOf )
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
 import qualified Data.Vector as V
-import Network.HTTP.StackClient (httpJSON, addRequestHeader, getResponseBody, parseRequest, hAccept)
-import qualified Options.Applicative as OA
-import Options.Applicative (idm)
-import Options.Applicative.Builder.Extra (boolFlags)
-import Path
-import RIO.List (sort)
-import RIO.PrettyPrint (useColorL)
-import RIO.PrettyPrint.DefaultStyles (defaultStyles)
-import RIO.PrettyPrint.Types (StyleSpec)
-import RIO.PrettyPrint.StylesUpdate (StylesUpdate (..), stylesUpdateL)
-import Stack.Constants (osIsWindows, globalFooter)
-import Stack.Dot
-import Stack.Runners
-import Stack.Options.DotParser (listDepsOptsParser)
-import Stack.Setup.Installed (Tool (..), filterTools, listInstalled, toolString)
-import Stack.Types.Config
-import System.Console.ANSI.Codes (SGR (Reset), setSGRCode, sgrToCode)
-import System.Process.Pager (pageText)
-import System.Directory (listDirectory)
-import System.IO (putStrLn)
-
-data LsView
-    = Local
-    | Remote
-    deriving (Show, Eq, Ord)
-
+import           Network.HTTP.StackClient
+                   ( HttpException (..), addRequestHeader, getResponseBody
+                   , hAccept, httpJSON, parseUrlThrow
+                   )
+import           Path ( parent )
+import           RIO.List ( sort )
+import           Stack.Build.Installed ( getInstalled, toInstallMap )
+import           Stack.Config ( withBuildConfig )
+import           Stack.Constants ( osIsWindows )
+import           Stack.DependencyGraph ( createPrunedDependencyGraph )
+import           Stack.Prelude hiding ( Nightly, Snapshot )
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig )
+import           Stack.Setup.Installed
+                   ( Tool (..), filterTools, listInstalled, toolString )
+import           Stack.SourceMap ( globalsFromHints )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.Config
+                   ( Config (..), HasConfig (..), askRecentSnapshotsUrl )
+import           Stack.Types.DependencyTree
+                   ( DependencyGraph, DependencyTree (..), DotPayload (..)
+                   , licenseText, versionText
+                   )
+import           Stack.Types.DotOpts ( DotOpts (..) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig ( EnvConfig (..), installationRootDeps )
+import           Stack.Types.LsOpts
+                   ( LsCmdOpts (..), LsCmds (..), ListDepsFormat (..)
+                   , ListDepsFormatOpts (..), ListDepsOpts (..)
+                   , ListDepsTextItem (..), ListGlobalsOpts (..)
+                   , ListStylesOpts (..), ListToolsOpts (..), LsView (..)
+                   , SnapshotOpts (..)
+                   )
+import           Stack.Types.Runner ( Runner, terminalL )
+import           Stack.Types.SourceMap ( SMWanted (..) )
+import           System.Console.ANSI.Codes
+                   ( SGR (Reset), setSGRCode, sgrToCode )
+import           System.Process.Pager ( pageText )
+import           System.Directory ( listDirectory )
+import           System.IO ( putStrLn )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Ls" module.
+data LsPrettyException
+  = ParseFailure ![Value]
+  | ParseRecentSnapshotsUrlFailed !HttpException
+
+deriving instance Show LsPrettyException
+
+instance Pretty LsPrettyException where
+  pretty (ParseFailure val) =
+    "[S-3421]"
+    <> line
+    <> fillSep
+         [ flow "Failure to parse values as a snapshot:"
+         , string (show val)
+         ]
+  pretty (ParseRecentSnapshotsUrlFailed err) =
+    "[S-9131]"
+    <> line
+    <> fillSep
+         [ flow "While trying to parse the"
+         , style Shell "recent-snapshots"
+         , flow "URL, Stack encountered the following error:"
+         ]
+    <> blankLine
+    <> fromString (displayException err)
+
+instance Exception LsPrettyException
+
+-- | Type representing Stackage snapshot types.
 data SnapshotType
-    = Lts
-    | Nightly
-    deriving (Show, Eq, Ord)
-
-data LsCmds
-    = LsSnapshot SnapshotOpts
-    | LsDependencies ListDepsOpts
-    | LsStyles ListStylesOpts
-    | LsTools ListToolsOpts
-
-data SnapshotOpts = SnapshotOpts
-    { soptViewType :: LsView
-    , soptLtsSnapView :: Bool
-    , soptNightlySnapView :: Bool
-    } deriving (Eq, Show, Ord)
-
-data ListStylesOpts = ListStylesOpts
-    { coptBasic   :: Bool
-    , coptSGR     :: Bool
-    , coptExample :: Bool
-    } deriving (Eq, Ord, Show)
-
-newtype ListToolsOpts = ListToolsOpts
-    { toptFilter  :: String
-    }
-
-newtype LsCmdOpts = LsCmdOpts
-    { lsView :: LsCmds
-    }
-
-lsParser :: OA.Parser LsCmdOpts
-lsParser = LsCmdOpts
-    <$> OA.hsubparser (lsSnapCmd <> lsDepsCmd <> lsStylesCmd <> lsToolsCmd)
-
-lsCmdOptsParser :: OA.Parser LsCmds
-lsCmdOptsParser = LsSnapshot <$> lsViewSnapCmd
-
-lsDepOptsParser :: OA.Parser LsCmds
-lsDepOptsParser = LsDependencies <$> listDepsOptsParser
-
-lsStylesOptsParser :: OA.Parser LsCmds
-lsStylesOptsParser = LsStyles <$> listStylesOptsParser
-
-lsToolsOptsParser :: OA.Parser LsCmds
-lsToolsOptsParser = LsTools <$> listToolsOptsParser
-
-listStylesOptsParser :: OA.Parser ListStylesOpts
-listStylesOptsParser = ListStylesOpts
-    <$> boolFlags False
-                  "basic"
-                  "a basic report of the styles used. The default is a fuller \
-                  \one"
-                  idm
-    <*> boolFlags True
-                  "sgr"
-                  "the provision of the equivalent SGR instructions (provided \
-                  \by default). Flag ignored for a basic report"
-                  idm
-    <*> boolFlags True
-                  "example"
-                  "the provision of an example of the applied style (provided \
-                  \by default for colored output). Flag ignored for a basic \
-                  \report"
-                  idm
-
-listToolsOptsParser :: OA.Parser ListToolsOpts
-listToolsOptsParser = ListToolsOpts
-    <$> OA.strOption
-            ( OA.long "filter"
-           <> OA.metavar "TOOL_NAME"
-           <> OA.value ""
-           <> OA.help "Filter by a tool name (eg 'ghc', 'ghc-git' or 'msys2') \
-                      \- case sensitive. The default is no filter"
-            )
-
-lsViewSnapCmd :: OA.Parser SnapshotOpts
-lsViewSnapCmd =
-    SnapshotOpts <$>
-    (OA.hsubparser (lsViewRemoteCmd <> lsViewLocalCmd) <|> pure Local) <*>
-    OA.switch
-        (OA.long "lts" <> OA.short 'l' <> OA.help "Only show lts snapshots") <*>
-    OA.switch
-        (OA.long "nightly" <> OA.short 'n' <>
-         OA.help "Only show nightly snapshots")
-
-lsSnapCmd :: OA.Mod OA.CommandFields LsCmds
-lsSnapCmd = OA.command "snapshots" $
-  OA.info lsCmdOptsParser $
-       OA.progDesc "View snapshots (local by default)"
-    <> OA.footer localSnapshotMsg
-
-lsDepsCmd :: OA.Mod OA.CommandFields LsCmds
-lsDepsCmd = OA.command "dependencies" $
-    OA.info lsDepOptsParser $
-         OA.progDesc "View the dependencies"
-      <> OA.footer globalFooter
-
-lsStylesCmd :: OA.Mod OA.CommandFields LsCmds
-lsStylesCmd =
-    OA.command
-        "stack-colors"
-        (OA.info lsStylesOptsParser
-                 (OA.progDesc "View Stack's output styles"))
-    <>
-    OA.command
-        "stack-colours"
-        (OA.info lsStylesOptsParser
-                 (OA.progDesc "View Stack's output styles (alias for \
-                              \'stack-colors')"))
-
-lsToolsCmd :: OA.Mod OA.CommandFields LsCmds
-lsToolsCmd =
-    OA.command
-        "tools"
-        (OA.info lsToolsOptsParser (OA.progDesc "View Stack's installed tools"))
+  = Lts
+    -- ^ Stackage LTS Haskell
+  | Nightly
+    -- ^ Stackage Nightly
+  deriving (Eq, Ord, Show)
 
 data Snapshot = Snapshot
-    { snapId :: Text
-    , snapTitle :: Text
-    , snapTime :: Text
-    } deriving (Show, Eq, Ord)
-
-data SnapshotData = SnapshotData
-    { _snapTotalCounts :: Integer
-    , snaps :: [[Snapshot]]
-    } deriving (Show, Eq, Ord)
+  { snapId :: Text
+  , title :: Text
+  , time :: Text
+  }
+  deriving (Eq, Ord, Show)
 
 instance FromJSON Snapshot where
-    parseJSON o@(Array _) = parseSnapshot o
-    parseJSON _ = mempty
+  parseJSON o@(Array _) = parseSnapshot o
+  parseJSON _ = mempty
+
+data SnapshotData = SnapshotData
+  { _snapTotalCounts :: Integer
+  , snaps :: [[Snapshot]]
+  }
+  deriving (Eq, Ord, Show)
 
 instance FromJSON SnapshotData where
-    parseJSON (Object s) =
-        SnapshotData <$> s .: "totalCount" <*> s .: "snapshots"
-    parseJSON _ = mempty
+  parseJSON (Object s) =
+    SnapshotData <$> s .: "totalCount" <*> s .: "snapshots"
+  parseJSON _ = mempty
 
 toSnapshot :: [Value] -> Snapshot
-toSnapshot [String sid, String stitle, String stime] =
-    Snapshot
-    { snapId = sid
-    , snapTitle = stitle
-    , snapTime = stime
+toSnapshot [String snapId, String title, String time] =
+  Snapshot
+    { snapId
+    , title
+    , time
     }
-toSnapshot val = throw $ ParseFailure val
-
-newtype LsException =
-    ParseFailure [Value]
-    deriving (Show, Typeable)
-
-instance Exception LsException
+toSnapshot val = prettyImpureThrow $ ParseFailure val
 
 parseSnapshot :: Value -> A.Parser Snapshot
 parseSnapshot = A.withArray "array of snapshot" (pure . toSnapshot . V.toList)
 
 displayTime :: Snapshot -> [Text]
-displayTime Snapshot {..} = [snapTime]
+displayTime snap = [snap.time]
 
 displaySnap :: Snapshot -> [Text]
-displaySnap Snapshot {..} =
-    ["Resolver name: " <> snapId, "\n" <> snapTitle <> "\n\n"]
+displaySnap snap =
+  ["Snapshot name: " <> snap.snapId, "\n" <> snap.title <> "\n\n"]
 
 displaySingleSnap :: [Snapshot] -> Text
 displaySingleSnap snapshots =
-    case snapshots of
-        [] -> mempty
-        (x:xs) ->
-            let snaps =
-                    displayTime x <> ["\n\n"] <> displaySnap x <>
-                    L.concatMap displaySnap xs
-            in T.concat snaps
+  case snapshots of
+    [] -> mempty
+    (x:xs) ->
+      let snaps =
+            displayTime x <> ["\n\n"] <> displaySnap x <>
+            L.concatMap displaySnap xs
+      in  T.concat snaps
 
 renderData :: Bool -> Text -> IO ()
 renderData True content = pageText content
@@ -223,24 +166,22 @@ renderData False content = T.putStr content
 
 displaySnapshotData :: Bool -> SnapshotData -> IO ()
 displaySnapshotData term sdata =
-    case L.reverse $ snaps sdata of
-        [] -> pure ()
-        xs ->
-            let snaps = T.concat $ L.map displaySingleSnap xs
-            in renderData term snaps
+  case L.reverse sdata.snaps of
+    [] -> pure ()
+    xs ->
+      let snaps = T.concat $ L.map displaySingleSnap xs
+      in  renderData term snaps
 
 filterSnapshotData :: SnapshotData -> SnapshotType -> SnapshotData
 filterSnapshotData sdata stype =
-    sdata
-    { snaps = filterSnapData
-    }
-  where
-    snapdata = snaps sdata
-    filterSnapData =
-        case stype of
-            Lts -> L.map (L.filter (\x -> "lts" `isPrefixOf` snapId x)) snapdata
-            Nightly ->
-                L.map (L.filter (\x -> "nightly" `isPrefixOf` snapId x)) snapdata
+  sdata { snaps = filterSnapData }
+ where
+  snapdata = sdata.snaps
+  filterSnapData =
+    case stype of
+      Lts -> L.map (L.filter (\x -> "lts" `isPrefixOf` x.snapId)) snapdata
+      Nightly ->
+        L.map (L.filter (\x -> "nightly" `isPrefixOf` x.snapId)) snapdata
 
 displayLocalSnapshot :: Bool -> [String] -> IO ()
 displayLocalSnapshot term xs = renderData term (localSnaptoText xs)
@@ -250,125 +191,241 @@ localSnaptoText xs = T.intercalate "\n" $ L.map T.pack xs
 
 handleLocal :: LsCmdOpts -> RIO Runner ()
 handleLocal lsOpts = do
-    (instRoot :: Path Abs Dir) <- withConfig YesReexec $ withDefaultEnvConfig installationRootDeps
-    isStdoutTerminal <- view terminalL
-    let parentInstRoot = parent instRoot
-        snapRootDir
-          | osIsWindows = parentInstRoot
-          | otherwise   = parent parentInstRoot
-    snapData' <- liftIO $ listDirectory $ toFilePath snapRootDir
-    let snapData = L.sort snapData'
-    case lsView lsOpts of
-        LsSnapshot SnapshotOpts {..} ->
-            case (soptLtsSnapView, soptNightlySnapView) of
-                (True, False) ->
-                    liftIO $
-                    displayLocalSnapshot isStdoutTerminal $
-                    L.filter (L.isPrefixOf "lts") snapData
-                (False, True) ->
-                    liftIO $
-                    displayLocalSnapshot isStdoutTerminal $
-                    L.filter (L.isPrefixOf "night") snapData
-                _ -> liftIO $ displayLocalSnapshot isStdoutTerminal snapData
-        LsDependencies _ -> pure ()
-        LsStyles _ -> pure ()
-        LsTools _ -> pure ()
-
-handleRemote
-    :: HasRunner env
-    => LsCmdOpts -> RIO env ()
+  (instRoot :: Path Abs Dir) <-
+    withConfig YesReexec $ withDefaultEnvConfig installationRootDeps
+  isStdoutTerminal <- view terminalL
+  let parentInstRoot = parent instRoot
+      snapRootDir
+        | osIsWindows = parentInstRoot
+        | otherwise   = parent parentInstRoot
+  snapData' <- liftIO $ listDirectory $ toFilePath snapRootDir
+  let snapData = L.sort snapData'
+  case lsOpts.lsCmds of
+    LsSnapshot sopt ->
+      case (sopt.ltsSnapView, sopt.nightlySnapView) of
+        (True, False) ->
+          liftIO $
+          displayLocalSnapshot isStdoutTerminal $
+          L.filter (L.isPrefixOf "lts") snapData
+        (False, True) ->
+          liftIO $
+          displayLocalSnapshot isStdoutTerminal $
+          L.filter (L.isPrefixOf "night") snapData
+        _ -> liftIO $ displayLocalSnapshot isStdoutTerminal snapData
+    LsGlobals _ -> pure ()
+    LsDependencies _ -> pure ()
+    LsStyles _ -> pure ()
+    LsTools _ -> pure ()
+
+handleRemote :: HasConfig env => LsCmdOpts -> RIO env ()
 handleRemote lsOpts = do
-    req <- liftIO $ parseRequest urlInfo
-    isStdoutTerminal <- view terminalL
-    let req' = addRequestHeader hAccept "application/json" req
-    result <- httpJSON req'
-    let snapData = getResponseBody result
-    case lsView lsOpts of
-        LsSnapshot SnapshotOpts {..} ->
-            case (soptLtsSnapView, soptNightlySnapView) of
-                (True, False) ->
-                    liftIO $
-                    displaySnapshotData isStdoutTerminal $
-                    filterSnapshotData snapData Lts
-                (False, True) ->
-                    liftIO $
-                    displaySnapshotData isStdoutTerminal $
-                    filterSnapshotData snapData Nightly
-                _ -> liftIO $ displaySnapshotData isStdoutTerminal snapData
-        LsDependencies _ -> pure ()
-        LsStyles _ -> pure ()
-        LsTools _ -> pure ()
-  where
-    urlInfo = "https://www.stackage.org/snapshots"
-
+  urlInfoText <- askRecentSnapshotsUrl
+  req <- catch
+    (parseUrlThrow $ T.unpack urlInfoText)
+    (prettyThrowM . ParseRecentSnapshotsUrlFailed)
+  isStdoutTerminal <- view terminalL
+  let req' = addRequestHeader hAccept "application/json" req
+  result <- httpJSON req'
+  let snapData = getResponseBody result
+  case lsOpts.lsCmds of
+    LsSnapshot sopt ->
+      case (sopt.ltsSnapView, sopt.nightlySnapView) of
+        (True, False) ->
+          liftIO $
+          displaySnapshotData isStdoutTerminal $
+          filterSnapshotData snapData Lts
+        (False, True) ->
+          liftIO $
+          displaySnapshotData isStdoutTerminal $
+          filterSnapshotData snapData Nightly
+        _ -> liftIO $ displaySnapshotData isStdoutTerminal snapData
+    LsGlobals _ -> pure ()
+    LsDependencies _ -> pure ()
+    LsStyles _ -> pure ()
+    LsTools _ -> pure ()
+
+-- | Function underlying the @stack ls@ command.
 lsCmd :: LsCmdOpts -> RIO Runner ()
 lsCmd lsOpts =
-    case lsView lsOpts of
-        LsSnapshot SnapshotOpts {..} ->
-            case soptViewType of
-                Local -> handleLocal lsOpts
-                Remote -> handleRemote lsOpts
-        LsDependencies depOpts -> listDependencies depOpts
-        LsStyles stylesOpts -> withConfig NoReexec $ listStylesCmd stylesOpts
-        LsTools toolsOpts -> withConfig NoReexec $ listToolsCmd toolsOpts
-
-lsViewLocalCmd :: OA.Mod OA.CommandFields LsView
-lsViewLocalCmd = OA.command "local" $
-  OA.info (pure Local) $
-       OA.progDesc "View local snapshots"
-    <> OA.footer localSnapshotMsg
-
-lsViewRemoteCmd :: OA.Mod OA.CommandFields LsView
-lsViewRemoteCmd = OA.command "remote" $
-  OA.info (pure Remote) $
-       OA.progDesc "View remote snapshots"
-    <> OA.footer pagerMsg
-
-pagerMsg :: String
-pagerMsg =
-  "On a terminal, uses a pager, if one is available. Respects the PAGER \
-  \environment variable (subject to that, prefers pager 'less' to 'more')."
-
-localSnapshotMsg :: String
-localSnapshotMsg =
-  "A local snapshot is identified by a hash code. " <> pagerMsg
+  case lsOpts.lsCmds of
+    LsSnapshot sopt ->
+      case sopt.viewType of
+        Local -> handleLocal lsOpts
+        Remote -> withConfig NoReexec $ handleRemote lsOpts
+    LsGlobals globalsOpts -> withConfig NoReexec $ listGlobalsCmd globalsOpts
+    LsDependencies depOpts -> listDependencies depOpts
+    LsStyles stylesOpts -> withConfig NoReexec $ listStylesCmd stylesOpts
+    LsTools toolsOpts -> withConfig NoReexec $ listToolsCmd toolsOpts
 
 -- | List Stack's output styles
 listStylesCmd :: ListStylesOpts -> RIO Config ()
 listStylesCmd opts = do
-    lc <- ask
-    -- This is the same test as is used in Stack.Types.Runner.withRunner
-    let useColor = view useColorL lc
-        styles = elems $ defaultStyles // stylesUpdate (view stylesUpdateL lc)
-        isComplex = not (coptBasic opts)
-        showSGR = isComplex && coptSGR opts
-        showExample = isComplex && coptExample opts && useColor
-        styleReports = L.map (styleReport showSGR showExample) styles
-    liftIO $ T.putStrLn $ T.intercalate (if isComplex then "\n" else ":") styleReports
-  where
-    styleReport :: Bool -> Bool -> StyleSpec -> Text
-    styleReport showSGR showExample (k, sgrs) = k <> "=" <> codes
-        <> (if showSGR then sgrsList else mempty)
-        <> (if showExample then example else mempty)
-      where
-        codes = T.intercalate ";" (L.map (fromString . show) $
-                    L.concatMap sgrToCode sgrs)
-        sgrsList = " [" <> T.intercalate ", " (L.map (fromString . show) sgrs)
-                   <> "]"
-        example = " " <> ansi <> "Example" <> reset
-        ansi = fromString $ setSGRCode sgrs
-        reset = fromString $ setSGRCode [Reset]
-
--- | List Stack's installed tools, sorted (see instance of 'Ord' for 'Tool').
+  lc <- ask
+  -- This is the same test as is used in Stack.Types.Runner.withRunner
+  let useColor = view useColorL lc
+      styles = elems $ defaultStyles // stylesUpdate (view stylesUpdateL lc)
+      isComplex = not opts.basic
+      showSGR = isComplex && opts.sgr
+      showExample = isComplex && opts.example && useColor
+      styleReports = L.map (styleReport showSGR showExample) styles
+  liftIO $
+    T.putStrLn $ T.intercalate (if isComplex then "\n" else ":") styleReports
+ where
+  styleReport :: Bool -> Bool -> StyleSpec -> Text
+  styleReport showSGR showExample (k, sgrs) = k <> "=" <> codes
+    <> (if showSGR then sgrsList else mempty)
+    <> (if showExample then example else mempty)
+   where
+    codes = T.intercalate ";" (L.map (fromString . show) $
+              L.concatMap sgrToCode sgrs)
+    sgrsList = " [" <> T.intercalate ", " (L.map (fromString . show) sgrs)
+               <> "]"
+    example = " " <> ansi <> "Example" <> reset
+    ansi = fromString $ setSGRCode sgrs
+    reset = fromString $ setSGRCode [Reset]
+
+-- | List Stack's installed tools, sorted (see instance of 'Ord' for t'Tool').
 listToolsCmd :: ListToolsOpts -> RIO Config ()
 listToolsCmd opts = do
-    localPrograms <- view $ configL.to configLocalPrograms
-    installed <- sort <$> listInstalled localPrograms
-    let wanted = case toptFilter opts of
-            [] -> installed
-            "ghc-git" -> [t | t@(ToolGhcGit _ _) <- installed]
-            pkgName -> filtered pkgName installed
-    liftIO $ mapM_ (putStrLn . toolString) wanted
-  where
-    filtered pkgName installed = Tool <$>
-        filterTools (mkPackageName pkgName) (const True) installed
+  localPrograms <- view $ configL . to (.localPrograms)
+  installed <- sort <$> listInstalled localPrograms
+  let wanted = case opts.filter of
+        [] -> installed
+        "ghc-git" -> [t | t@(ToolGhcGit _ _) <- installed]
+        pkgName -> filtered pkgName installed
+  liftIO $ mapM_ (putStrLn . toolString) wanted
+ where
+  filtered pkgName installed = Tool <$>
+      filterTools (mkPackageName pkgName) (const True) installed
+
+listGlobalsCmd :: ListGlobalsOpts -> RIO Config ()
+listGlobalsCmd opts = do
+  idents <- if opts.globalHints
+    then
+      withBuildConfig $ do
+        buildConfig <- view buildConfigL
+        globals <- globalsFromHints buildConfig.smWanted.compiler
+        pure $ map (uncurry PackageIdentifier) (Map.toList globals)
+    else
+      withDefaultEnvConfig $ do
+        envConfig <- ask
+        installMap <- toInstallMap envConfig.sourceMap
+        (_, globalDump, _, _) <- getInstalled installMap
+        pure $ L.sort $ map (.packageIdent) globalDump
+  forM_ idents $ \ident ->
+    prettyInfo $ fromString $ packageIdentifierString ident
+
+listDependencies :: ListDepsOpts -> RIO Runner ()
+listDependencies opts = do
+  let dotOpts = opts.dotOpts
+  (_, pkgs, resultGraph) <- createPrunedDependencyGraph dotOpts
+  liftIO $ case opts.format of
+    ListDepsTree treeOpts ->
+      T.putStrLn "Packages"
+      >> printTree treeOpts dotOpts 0 [] (treeRoots opts pkgs) resultGraph
+    ListDepsJSON -> printJSON pkgs resultGraph
+    ListDepsText textOpts listDepsTextQueries listDepsTextFilters -> do
+      let resultGraph' = Map.filterWithKey p resultGraph
+          locals = Set.toList pkgs
+          includes = expandLocals locals listDepsTextQueries
+          p k _ =
+               Set.notMember k (expandLocals locals listDepsTextFilters)
+            && (Set.null includes || Set.member k includes)
+      void $ Map.traverseWithKey (go "" textOpts) (snd <$> resultGraph')
+     where
+      expandLocals :: [PackageName] -> [ListDepsTextItem] -> Set PackageName
+      expandLocals locals = Set.fromList . expandLocals' locals
+
+      expandLocals' :: [PackageName] -> [ListDepsTextItem] -> [PackageName]
+      expandLocals' _ [] = []
+      expandLocals' locals (x:xs) = case x of
+        PackageNameOnly pkgName -> pkgName : expandLocals' locals xs
+        AllProjectPackages -> locals <> expandLocals' locals xs
+    ListDepsConstraints -> do
+      let constraintOpts = ListDepsFormatOpts
+            { sep = " =="
+            , license = False
+            }
+      T.putStrLn "constraints:"
+      void $ Map.traverseWithKey (go "  , " constraintOpts)
+                                 (snd <$> resultGraph)
+ where
+  go prefix lineOpts name payload =
+    T.putStrLn $ prefix <> listDepsLine lineOpts name payload
+
+treeRoots :: ListDepsOpts -> Set PackageName -> Set PackageName
+treeRoots opts projectPackages' =
+  let targets = opts.dotOpts.dotTargets
+  in  if null targets
+        then projectPackages'
+        else Set.fromList $ map (mkPackageName . T.unpack) targets
+
+printTree ::
+     ListDepsFormatOpts
+  -> DotOpts
+  -> Int
+  -> [Int]
+  -> Set PackageName
+  -> DependencyGraph
+  -> IO ()
+printTree opts dotOpts depth remainingDepsCounts packages dependencyMap =
+  F.sequence_ $ Seq.mapWithIndex go (toSeq packages)
+ where
+  toSeq = Seq.fromList . Set.toList
+  go index name =
+    let newDepsCounts = remainingDepsCounts ++ [Set.size packages - index - 1]
+        -- TODO: Define the 'Nothing' behaviour, maybe pure an error?
+    in  whenJust (Map.lookup name dependencyMap) $ \(deps, payload) -> do
+          printTreeNode opts dotOpts depth newDepsCounts deps payload name
+          unless (Just depth == dotOpts.dependencyDepth) $
+            printTree
+              opts
+              dotOpts
+              (depth + 1)
+              newDepsCounts
+              deps
+              dependencyMap
+
+printTreeNode ::
+     ListDepsFormatOpts
+  -> DotOpts
+  -> Int
+  -> [Int]
+  -> Set PackageName
+  -> DotPayload
+  -> PackageName
+  -> IO ()
+printTreeNode opts dotOpts depth remainingDepsCounts deps payload name =
+  let remainingDepth = fromMaybe 999 dotOpts.dependencyDepth - depth
+      hasDeps = not $ null deps
+  in  T.putStrLn $
+        treeNodePrefix "" remainingDepsCounts hasDeps remainingDepth <> " " <>
+        listDepsLine opts name payload
+
+treeNodePrefix :: Text -> [Int] -> Bool -> Int -> Text
+treeNodePrefix t [] _ _      = t
+treeNodePrefix t [0] True  0 = t <> "└──"
+treeNodePrefix t [_] True  0 = t <> "├──"
+treeNodePrefix t [0] True  _ = t <> "└─┬"
+treeNodePrefix t [_] True  _ = t <> "├─┬"
+treeNodePrefix t [0] False _ = t <> "└──"
+treeNodePrefix t [_] False _ = t <> "├──"
+treeNodePrefix t (0:ns) d remainingDepth =
+  treeNodePrefix (t <> "  ") ns d remainingDepth
+treeNodePrefix t (_:ns) d remainingDepth =
+  treeNodePrefix (t <> "│ ") ns d remainingDepth
+
+listDepsLine :: ListDepsFormatOpts -> PackageName -> DotPayload -> Text
+listDepsLine opts name payload =
+  T.pack (packageNameString name) <> opts.sep <>
+  payloadText opts payload
+
+payloadText :: ListDepsFormatOpts -> DotPayload -> Text
+payloadText opts payload =
+  if opts.license
+    then licenseText payload
+    else versionText payload
+
+printJSON :: Set PackageName -> DependencyGraph -> IO ()
+printJSON pkgs dependencyMap =
+  LBC8.putStrLn $ encode $ DependencyTree pkgs dependencyMap
diff --git a/src/Stack/New.hs b/src/Stack/New.hs
index f2f66a64f7..01cf2b888e 100644
--- a/src/Stack/New.hs
+++ b/src/Stack/New.hs
@@ -1,194 +1,422 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE DeriveDataTypeable  #-}
-{-# LANGUAGE FlexibleContexts    #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
--- | Create new a new project directory populated with a basic working
--- project.
+{-|
+Module      : Stack.New
+Description : Types and functions related to Stack's @new@ command.
+License     : BSD-3-Clause
 
-module Stack.New
-    ( new
-    , NewOpts(..)
-    , TemplateName
-    , templatesHelp
-    ) where
+Types and functions related to Stack's @new@ command.
+-}
 
-import           Stack.Prelude
-import           Control.Monad.Trans.Writer.Strict
+module Stack.New
+  ( NewOpts (..)
+  , TemplateName
+  , newCmd
+  , new
+  ) where
+
+import           Control.Monad.Extra ( whenJust )
+import           Control.Monad.Trans.Writer.Strict ( execWriterT )
 import           Data.Aeson as A
 import qualified Data.Aeson.KeyMap as KeyMap
 import qualified Data.ByteString.Base64 as B64
-import           Data.ByteString.Builder (lazyByteString)
+import           Data.ByteString.Builder ( lazyByteString )
 import qualified Data.ByteString.Lazy as LB
-import           Data.Conduit
+import           Data.Conduit ( yield )
 import qualified Data.List as L
 import qualified Data.Map.Strict as M
 import qualified Data.Set as S
 import qualified Data.Text as T
-import qualified Data.Text.Lazy as TL
 import qualified Data.Text.Encoding as T
+import qualified Data.Text.Lazy as TL
 import qualified Data.Text.Lazy.Encoding as TLE
-import           Data.Time.Calendar
-import           Data.Time.Clock
-import           Network.HTTP.StackClient (VerifiedDownloadException (..), Request, HttpException,
-                                           getResponseBody, httpLbs, mkDownloadRequest, parseRequest, parseUrlThrow,
-                                           setForceDownload, setGitHubHeaders, setRequestCheckStatus, verifiedDownloadWithProgress)
-import           Path
+import           Data.Time.Calendar ( toGregorian )
+import           Data.Time.Clock ( getCurrentTime, utctDay )
+import           Network.HTTP.Client ( applyBasicAuth )
+import           Network.HTTP.StackClient
+                   ( HttpException (..), HttpExceptionContent (..)
+                   , Response (..), VerifiedDownloadException (..)
+                   , mkDownloadRequest, notFound404, parseRequest
+                   , setForceDownload, setRequestCheckStatus
+                   , verifiedDownloadWithProgress
+                   )
+import           Path ( (</>), dirname, parent, parseRelDir, parseRelFile )
 import           Path.IO
+                   ( doesDirExist, doesFileExist, ensureDir, getCurrentDir )
+import           RIO.Process ( proc, runProcess_, withWorkingDir )
 import           Stack.Constants
-import           Stack.Constants.Config
-import           Stack.Types.Config
+                   ( allWiredInPackages, altGitHubTokenEnvVar, backupUrlRelPath
+                   , gitHubBasicAuthType, gitHubTokenEnvVar, stackDotYaml
+                   )
+import           Stack.Constants.Config ( templatesDir )
+import           Stack.Init ( InitOpts (..), initProject )
+import           Stack.Prelude
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withGlobalProject )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Runner ( Runner, globalOptsL )
+import           Stack.Types.SCM ( SCM (..) )
 import           Stack.Types.TemplateName
-import           RIO.Process
+                   ( RepoService (..), RepoTemplatePath (..), TemplateName
+                   , TemplatePath (..), defaultTemplateName
+                   , parseRepoPathWithService, templateName, templatePath
+                   )
+import           System.Environment ( lookupEnv )
 import qualified Text.Mustache as Mustache
 import qualified Text.Mustache.Render as Mustache
 import           Text.ProjectTemplate
+                   ( ProjectTemplateException, receiveMem, unpackTemplate )
+
+--------------------------------------------------------------------------------
+-- Exceptions
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.New" module.
+data NewPrettyException
+  = ProjectDirAlreadyExists !String !(Path Abs Dir)
+  | DownloadTemplateFailed !Text !String !VerifiedDownloadException
+  | forall b. LoadTemplateFailed !TemplateName !(Path b File)
+  | forall b. ExtractTemplateFailed !TemplateName !(Path b File) !String
+  | TemplateInvalid !TemplateName !StyleDoc
+  | MagicPackageNameInvalid !String
+  | AttemptedOverwrites !Text ![Path Abs File]
+
+deriving instance Show NewPrettyException
+
+instance Pretty NewPrettyException where
+  pretty (ProjectDirAlreadyExists name path) =
+    "[S-2135]"
+    <> line
+    <> fillSep
+         [ flow "Stack failed to create a new directory for project"
+         , style Current (fromString name) <> ","
+         , flow "as the directory"
+         , pretty path
+         , flow "already exists."
+         ]
+  pretty (DownloadTemplateFailed name url err) =
+    "[S-1688]"
+    <> line
+    <> fillSep
+         [ flow "Stack failed to download the template"
+         , style Current (fromString . T.unpack $ name)
+         , "from"
+         , style Url (fromString url) <> "."
+         ]
+    <> blankLine
+    <> ( if isNotFound
+            then    flow "Please check that the template exists at that \
+                         \location."
+                 <> blankLine
+            else mempty
+       )
+    <> fillSep
+         [ flow "While downloading, Stack encountered"
+         , msg
+         ]
+   where
+    (msg, isNotFound) = case err of
+      DownloadHttpError (HttpExceptionRequest req content) ->
+        let msg' =    flow "an HTTP error. Stack made the request:"
+                   <> blankLine
+                   <> string (show req)
+                   <> blankLine
+                   <> flow "and the content of the error was:"
+                   <> blankLine
+                   <> string (show content)
+            isNotFound404 = case content of
+                              StatusCodeException res _ ->
+                                responseStatus res == notFound404
+                              _ -> False
+        in  (msg', isNotFound404)
+      DownloadHttpError (InvalidUrlException url' reason) ->
+        let msg' = fillSep
+                     [ flow "an HTTP error. The URL"
+                     , style Url (fromString url')
+                     , flow "was considered invalid because"
+                     , fromString reason <> "."
+                     ]
+        in  (msg', False)
+      _ -> let msg' =    flow "the following error:"
+                      <> blankLine
+                      <> fromString (displayException err)
+           in  (msg', False)
+  pretty (LoadTemplateFailed name path) =
+    "[S-3650]"
+    <> line
+    <> fillSep
+         [ flow "Stack failed to load the downloaded template"
+         , style Current (fromString $ T.unpack $ templateName name)
+         , "from"
+         , pretty path <> "."
+         ]
+  pretty (ExtractTemplateFailed name path err) =
+    "[S-9582]"
+    <> line
+    <> fillSep
+         [ flow "Stack failed to extract the loaded template"
+         , style Current (fromString $ T.unpack $ templateName name)
+         , "at"
+         , pretty path <> "."
+         ]
+    <> blankLine
+    <> flow "While extracting, Stack encountered the following error:"
+    <> blankLine
+    <> string err
+  pretty (TemplateInvalid name why) =
+    "[S-9490]"
+    <> line
+    <> fillSep
+         [ flow "Stack failed to use the template"
+         , style Current (fromString $ T.unpack $ templateName name) <> ","
+         , "as"
+         , why
+         ]
+  pretty (MagicPackageNameInvalid name) =
+    "[S-5682]"
+    <> line
+    <> fillSep
+         [ flow "Stack declined to create a new directory for project"
+         , style Current (fromString name) <> ","
+         , flow "as package"
+         , fromString name
+         , flow "is 'wired-in' to a version of GHC. That can cause build \
+                \errors."
+         ]
+    <> blankLine
+    <> fillSep
+         ( flow "The names blocked by Stack are:"
+         : mkNarrativeList Nothing False
+             (map fromPackageName sortedWiredInPackages :: [StyleDoc])
+         )
+   where
+    sortedWiredInPackages = L.sort $ S.toList allWiredInPackages
+  pretty (AttemptedOverwrites name fps) =
+    "[S-3113]"
+    <> line
+    <> fillSep
+         [ flow "Stack declined to apply the template"
+         , style Current (fromString . T.unpack $ name) <> ","
+         , flow "as it would create files that already exist."
+         ]
+    <> blankLine
+    <> flow "The template would create the following existing files:"
+    <> line
+    <> bulletedList (map (style File . pretty) fps)
+    <> blankLine
+    <> fillSep
+         [ "Use the"
+         , style Shell "--force"
+         , "flag to ignore this and overwrite those files."
+         ]
+
+instance Exception NewPrettyException
 
 --------------------------------------------------------------------------------
 -- Main project creation
 
--- | Options for creating a new project.
+-- | Type representing command line options for the @stack new@ command (other
+-- than those applicable also to the @stack init@ command).
 data NewOpts = NewOpts
-    { newOptsProjectName  :: PackageName
+  { projectName  :: PackageName
     -- ^ Name of the project to create.
-    , newOptsCreateBare   :: Bool
+  , createBare   :: Bool
     -- ^ Whether to create the project without a directory.
-    , newOptsTemplate     :: Maybe TemplateName
+  , init         :: Bool
+    -- ^ Whether to initialise the project for use with Stack.
+  , template     :: Maybe TemplateName
     -- ^ Name of the template to use.
-    , newOptsNonceParams  :: Map Text Text
+  , nonceParams  :: Map Text Text
     -- ^ Nonce parameters specified just for this invocation.
-    }
+  }
+
+-- | Function underlying the @stack new@ command. Create a project directory
+-- structure and initialize the Stack config.
+newCmd :: (NewOpts, InitOpts) -> RIO Runner ()
+newCmd (newOpts, initOpts) =
+  withGlobalProject $ withConfig YesReexec $ do
+    dir <- new newOpts initOpts.forceOverwrite
+    exists <- doesFileExist $ dir </> stackDotYaml
+    when (newOpts.init && (initOpts.forceOverwrite || not exists)) $ do
+      go <- view globalOptsL
+      initProject dir initOpts go.snapshot
 
 -- | Create a new project with the given options.
 new :: HasConfig env => NewOpts -> Bool -> RIO env (Path Abs Dir)
 new opts forceOverwrite = do
-    when (newOptsProjectName opts `elem` wiredInPackages) $
-      throwM $ Can'tUseWiredInName (newOptsProjectName opts)
-    pwd <- getCurrentDir
-    absDir <- if bare then pure pwd
-                      else do relDir <- parseRelDir (packageNameString project)
-                              liftM (pwd </>) (pure relDir)
-    exists <- doesDirExist absDir
-    configTemplate <- view $ configL.to configDefaultTemplate
-    let template = fromMaybe defaultTemplateName $ asum [ cliOptionTemplate
-                                                        , configTemplate
-                                                        ]
-    if exists && not bare
-        then throwM (AlreadyExists absDir)
-        else do
-            templateText <- loadTemplate template (logUsing absDir template)
-            files <-
-                applyTemplate
-                    project
-                    template
-                    (newOptsNonceParams opts)
-                    absDir
-                    templateText
-            when (not forceOverwrite && bare) $ checkForOverwrite (M.keys files)
-            writeTemplateFiles files
-            runTemplateInits absDir
-            pure absDir
-  where
-    cliOptionTemplate = newOptsTemplate opts
-    project = newOptsProjectName opts
-    bare = newOptsCreateBare opts
-    logUsing absDir template templateFrom =
-        let loading = case templateFrom of
-                          LocalTemp -> "Loading local"
-                          RemoteTemp -> "Downloading"
-         in
-        logInfo
-            (loading <> " template \"" <> display (templateName template) <>
-             "\" to create project \"" <>
-             fromString (packageNameString project) <>
-             "\" in " <>
-             if bare then "the current directory"
-                     else fromString (toFilePath (dirname absDir)) <>
-             " ...")
+  when (project `elem` allWiredInPackages) $
+      prettyThrowM $ MagicPackageNameInvalid projectName
+  pwd <- getCurrentDir
+  absDir <- if bare
+              then pure pwd
+              else do relDir <- parseRelDir (packageNameString project)
+                      pure (pwd </> relDir)
+  exists <- doesDirExist absDir
+  configTemplate <- view $ configL . to (.defaultTemplate)
+  let template = fromMaybe defaultTemplateName $ asum [ cliOptionTemplate
+                                                      , configTemplate
+                                                      ]
+  if exists && not bare
+    then prettyThrowM $ ProjectDirAlreadyExists projectName absDir
+    else do
+      templateText <- loadTemplate template (logUsing absDir template)
+      files <-
+        applyTemplate
+          project
+          template
+          opts.nonceParams
+          absDir
+          templateText
+      when (not forceOverwrite && bare) $
+        checkForOverwrite (templateName template) (M.keys files)
+      writeTemplateFiles files
+      runTemplateInits absDir
+      pure absDir
+ where
+  cliOptionTemplate = opts.template
+  project = opts.projectName
+  projectName = packageNameString project
+  bare = opts.createBare
+  logUsing absDir template templateFrom =
+    let loading = case templateFrom of
+                    LocalTemp -> flow "Loading local"
+                    RemoteTemp -> "Downloading"
+    in  prettyInfo
+          ( fillSep
+              [ loading
+              , "template"
+              , style
+                  Current
+                  (fromString $ T.unpack $ templateName template)
+              , flow "to create project"
+              , style Current (fromString projectName)
+              , "in"
+              ,    ( if bare
+                       then flow "the current directory"
+                       else fillSep
+                              [ "directory"
+                              , pretty $ dirname absDir
+                              ]
+                   )
+                <> "..."
+              ]
+            )
 
 data TemplateFrom = LocalTemp | RemoteTemp
 
 -- | Download and read in a template's text content.
-loadTemplate
-    :: forall env. HasConfig env
-    => TemplateName
-    -> (TemplateFrom -> RIO env ())
-    -> RIO env Text
+loadTemplate ::
+     forall env. HasConfig env
+  => TemplateName
+  -> (TemplateFrom -> RIO env ())
+  -> RIO env Text
 loadTemplate name logIt = do
-    templateDir <- view $ configL.to templatesDir
-    case templatePath name of
-        AbsPath absFile -> logIt LocalTemp >> loadLocalFile absFile eitherByteStringToText
-        UrlPath s -> do
-            let settings = asIsFromUrl s
-            downloadFromUrl settings templateDir
-        RelPath rawParam relFile ->
-            catch
-                (do f <- loadLocalFile relFile eitherByteStringToText
-                    logIt LocalTemp
-                    pure f)
-                (\(e :: NewException) -> do
-                      case relSettings rawParam of
-                        Just settings -> do
-                          req <- parseRequest (tplDownloadUrl settings)
-                          let extract = tplExtract settings
-                          downloadTemplate req extract (templateDir </> relFile)
-                        Nothing -> throwM e
-                )
-        RepoPath rtp -> do
-            let settings = settingsFromRepoTemplatePath rtp
-            downloadFromUrl settings templateDir
-
-  where
-    loadLocalFile :: Path b File -> (ByteString -> Either String Text) -> RIO env Text
-    loadLocalFile path extract = do
-        logDebug ("Opening local template: \"" <> fromString (toFilePath path)
-                                                <> "\"")
-        exists <- doesFileExist path
-        if exists
-            then do
-                bs <- readFileBinary (toFilePath path) --readFileUtf8 (toFilePath path)
-                case extract bs of
-                    Left err -> do
-                        logWarn $ "Template extraction error: " <> display (T.pack err)
-                        throwM (FailedToLoadTemplate name (toFilePath path))
-                    Right template ->
-                        pure template
-            else throwM (FailedToLoadTemplate name (toFilePath path))
-    relSettings :: String -> Maybe TemplateDownloadSettings
-    relSettings req = do
-        rtp <- parseRepoPathWithService defaultRepoService (T.pack req)
-        pure (settingsFromRepoTemplatePath rtp)
-    downloadFromUrl :: TemplateDownloadSettings -> Path Abs Dir -> RIO env Text
-    downloadFromUrl settings templateDir = do
-        let url = tplDownloadUrl settings
-        req <- parseRequest url
-        let rel = fromMaybe backupUrlRelPath (parseRelFile url)
-        downloadTemplate req (tplExtract settings) (templateDir </> rel)
-    downloadTemplate :: Request -> (ByteString -> Either String Text) -> Path Abs File -> RIO env Text
-    downloadTemplate req extract path = do
-        let dReq = setForceDownload True $ mkDownloadRequest (setRequestCheckStatus req)
-        logIt RemoteTemp
-        catch
-          (void $ do
-            verifiedDownloadWithProgress dReq path (T.pack $ toFilePath path) Nothing
+  templateDir <- view $ configL . to templatesDir
+  case templatePath name of
+    AbsPath absFile ->
+      logIt LocalTemp >> loadLocalFile absFile eitherByteStringToText
+    UrlPath s -> do
+      let settings = asIsFromUrl s
+      downloadFromUrl settings templateDir
+    RelPath rawParam relFile ->
+      catch
+        (do f <- loadLocalFile relFile eitherByteStringToText
+            logIt LocalTemp
+            pure f)
+        ( \(e :: PrettyException) -> do
+            settings <- fromMaybe (throwM e) (relSettings rawParam)
+            let url = settings.downloadUrl
+                mBasicAuth = settings.basicAuth
+                extract = settings.extract
+            downloadTemplate url mBasicAuth extract (templateDir </> relFile)
+        )
+    RepoPath rtp -> do
+      settings <- settingsFromRepoTemplatePath rtp
+      downloadFromUrl settings templateDir
+
+ where
+  loadLocalFile ::
+       Path b File
+    -> (ByteString -> Either String Text)
+    -> RIO env Text
+  loadLocalFile path extract = do
+    logDebug $
+         "Opening local template: \""
+      <> fromString (toFilePath path)
+      <> "\""
+    exists <- doesFileExist path
+    if exists
+      then do
+        bs <- readFileBinary (toFilePath path) --readFileUtf8 (toFilePath path)
+        case extract bs of
+          Left err -> prettyThrowM $ ExtractTemplateFailed name path err
+          Right template ->
+              pure template
+      else prettyThrowM $ LoadTemplateFailed name path
+
+  relSettings :: String -> Maybe (RIO env TemplateDownloadSettings)
+  relSettings req = do
+    rtp <- parseRepoPathWithService defaultRepoService (T.pack req)
+    pure (settingsFromRepoTemplatePath rtp)
+
+  downloadFromUrl :: TemplateDownloadSettings -> Path Abs Dir -> RIO env Text
+  downloadFromUrl settings templateDir = do
+    let url =  settings.downloadUrl
+        mBasicAuth = settings.basicAuth
+        rel = fromMaybe backupUrlRelPath (parseRelFile url)
+    downloadTemplate url mBasicAuth settings.extract (templateDir </> rel)
+
+  downloadTemplate ::
+       String
+    -> Maybe (ByteString, ByteString)
+       -- ^ Optional HTTP \'Basic\' authentication (type, credentials)
+    -> (ByteString -> Either String Text)
+    -> Path Abs File
+    -> RIO env Text
+  downloadTemplate url mBasicAuth extract path = do
+    req <- parseRequest url
+    let authReq = maybe id (uncurry applyBasicAuth) mBasicAuth req
+        dReq = setForceDownload True $
+                   mkDownloadRequest (setRequestCheckStatus authReq)
+    logIt RemoteTemp
+    catch
+      ( do let label = T.pack $ toFilePath path
+           res <- verifiedDownloadWithProgress dReq path label Nothing
+           if res
+             then logStickyDone ("Downloaded " <> display label <> ".")
+             else logStickyDone "Already downloaded."
+      )
+      (useCachedVersionOrThrow url path)
+    loadLocalFile path extract
+
+  useCachedVersionOrThrow ::
+       String
+    -> Path Abs File
+    -> VerifiedDownloadException
+    -> RIO env ()
+  useCachedVersionOrThrow url path exception = do
+    exists <- doesFileExist path
+
+    if exists
+      then
+        prettyWarn
+          ( flow "Tried to download the template but an error was \
+                 \found. Using cached local version. It may not be the \
+                 \most recent version though."
           )
-          (useCachedVersionOrThrow path)
-
-        loadLocalFile path extract
-    useCachedVersionOrThrow :: Path Abs File -> VerifiedDownloadException -> RIO env ()
-    useCachedVersionOrThrow path exception = do
-      exists <- doesFileExist path
-
-      if exists
-        then do logWarn "Tried to download the template but an error was found."
-                logWarn "Using cached local version. It may not be the most recent version though."
-        else throwM (FailedToDownloadTemplate name exception)
+      else
+        prettyThrowM $ DownloadTemplateFailed (templateName name) url exception
 
+-- | Type representing settings for the download of Stack project templates.
 data TemplateDownloadSettings = TemplateDownloadSettings
-  { tplDownloadUrl :: String
-  , tplExtract :: ByteString -> Either String Text
+  { downloadUrl :: String
+  , basicAuth :: Maybe (ByteString, ByteString)
+    -- ^ Optional HTTP \'Basic\' authentication (type, credentials)
+  , extract :: ByteString -> Either String Text
   }
 
 eitherByteStringToText :: ByteString -> Either String Text
@@ -196,160 +424,267 @@ eitherByteStringToText = mapLeft show . decodeUtf8'
 
 asIsFromUrl :: String -> TemplateDownloadSettings
 asIsFromUrl url = TemplateDownloadSettings
-  { tplDownloadUrl = url
-  , tplExtract = eitherByteStringToText
+  { downloadUrl = url
+  , basicAuth = Nothing
+  , extract = eitherByteStringToText
   }
 
--- | Construct a URL for downloading from a repo.
-settingsFromRepoTemplatePath :: RepoTemplatePath -> TemplateDownloadSettings
-settingsFromRepoTemplatePath (RepoTemplatePath GitHub user name) =
-    -- T.concat ["https://raw.githubusercontent.com", "/", user, "/stack-templates/master/", name]
-    TemplateDownloadSettings
-    { tplDownloadUrl = concat ["https://api.github.com/repos/", T.unpack user, "/stack-templates/contents/", T.unpack name]
-    , tplExtract = \bs -> do
-        decodedJson <- eitherDecode (LB.fromStrict bs)
-        case decodedJson of
+-- | Construct settings for downloading a Stack project template from a
+-- repository.
+settingsFromRepoTemplatePath ::
+    HasTerm env
+ => RepoTemplatePath
+ -> RIO env TemplateDownloadSettings
+settingsFromRepoTemplatePath (RepoTemplatePath GitHub user name) = do
+  let basicAuthMsg token = prettyInfoL
+        [ flow "Using content of"
+        , fromString token
+        , flow " environment variable to authenticate GitHub REST API."
+        ]
+  mBasicAuth <- do
+    wantGitHubToken <- liftIO $ fromMaybe "" <$> lookupEnv gitHubTokenEnvVar
+    if not (L.null wantGitHubToken)
+      then do
+         basicAuthMsg gitHubTokenEnvVar
+         pure $ Just (gitHubBasicAuthType, fromString wantGitHubToken)
+      else do
+        wantAltGitHubToken <-
+          liftIO $ fromMaybe "" <$> lookupEnv altGitHubTokenEnvVar
+        if not (L.null wantAltGitHubToken)
+        then do
+          basicAuthMsg altGitHubTokenEnvVar
+          pure $ Just (gitHubBasicAuthType, fromString wantAltGitHubToken)
+        else pure Nothing
+  pure TemplateDownloadSettings
+    { downloadUrl = concat
+        [ "https://api.github.com/repos/"
+        , T.unpack user
+        , "/stack-templates/contents/"
+        , T.unpack name
+        ]
+    , basicAuth = mBasicAuth
+    , extract = \bs ->
+        eitherDecode (LB.fromStrict bs) >>= \case
           Object o | Just (String content) <- KeyMap.lookup "content" o -> do
-                       let noNewlines = T.filter (/= '\n')
-                       bsContent <- B64.decode $ T.encodeUtf8 (noNewlines content)
-                       mapLeft show $ decodeUtf8' bsContent
+            let noNewlines = T.filter (/= '\n')
+            bsContent <- B64.decode $ T.encodeUtf8 (noNewlines content)
+            mapLeft show $ decodeUtf8' bsContent
           _ ->
-            Left "Couldn't parse GitHub response as a JSON object with a \"content\" field"
+            Left "Couldn't parse GitHub response as a JSON object with a \
+                 \\"content\" field"
     }
-
-settingsFromRepoTemplatePath (RepoTemplatePath GitLab user name) =
-    asIsFromUrl $ concat ["https://gitlab.com",                "/", T.unpack user, "/stack-templates/raw/master/", T.unpack name]
-settingsFromRepoTemplatePath (RepoTemplatePath Bitbucket user name) =
-    asIsFromUrl $ concat ["https://bitbucket.org",             "/", T.unpack user, "/stack-templates/raw/master/", T.unpack name]
+settingsFromRepoTemplatePath (RepoTemplatePath GitLab user name) = pure $
+  asIsFromUrl $ concat
+    [ "https://gitlab.com"
+    , "/"
+    , T.unpack user
+    , "/stack-templates/raw/master/"
+    , T.unpack name
+    ]
+settingsFromRepoTemplatePath (RepoTemplatePath Bitbucket user name) = pure $
+  asIsFromUrl $ concat
+    [ "https://bitbucket.org"
+    , "/"
+    , T.unpack user
+    , "/stack-templates/raw/master/"
+    , T.unpack name
+    ]
+settingsFromRepoTemplatePath (RepoTemplatePath Codeberg user name) = pure $
+  asIsFromUrl $ concat
+    [ "https://codeberg.org"
+    , "/"
+    , T.unpack user
+    , "/stack-templates/raw/"
+    , T.unpack name
+    ]
 
 -- | Apply and unpack a template into a directory.
-applyTemplate
-    :: HasConfig env
-    => PackageName
-    -> TemplateName
-    -> Map Text Text
-    -> Path Abs Dir
-    -> Text
-    -> RIO env  (Map (Path Abs File) LB.ByteString)
+applyTemplate ::
+     HasConfig env
+  => PackageName
+  -> TemplateName
+  -> Map Text Text
+  -> Path Abs Dir
+  -> Text
+  -> RIO env (Map (Path Abs File) LB.ByteString)
 applyTemplate project template nonceParams dir templateText = do
-    config <- view configL
-    currentYear <- do
-      now <- liftIO getCurrentTime
-      let (year, _, _) = toGregorian (utctDay now)
-      pure $ T.pack . show $ year
-    let context = M.unions [nonceParams, nameParams, configParams, yearParam]
-          where
-            nameAsVarId = T.replace "-" "_" $ T.pack $ packageNameString project
-            nameAsModule = T.filter (/= ' ') $ T.toTitle $ T.replace "-" " " $ T.pack $ packageNameString project
-            nameParams = M.fromList [ ("name", T.pack $ packageNameString project)
-                                    , ("name-as-varid", nameAsVarId)
-                                    , ("name-as-module", nameAsModule) ]
-            configParams = configTemplateParams config
-            yearParam = M.singleton "year" currentYear
-    files :: Map FilePath LB.ByteString <-
-        catch (execWriterT $ runConduit $
-               yield (T.encodeUtf8 templateText) .|
-               unpackTemplate receiveMem id
-              )
-              (\(e :: ProjectTemplateException) ->
-                   throwM (InvalidTemplate template (show e)))
-    when (M.null files) $
-         throwM (InvalidTemplate template "Template does not contain any files")
-
-    let isPkgSpec f = ".cabal" `L.isSuffixOf` f || f == "package.yaml"
-    unless (any isPkgSpec . M.keys $ files) $
-         throwM (InvalidTemplate template
-           "Template does not contain a .cabal or package.yaml file")
+  config <- view configL
+  currentYear <- do
+    now <- liftIO getCurrentTime
+    let (year, _, _) = toGregorian (utctDay now)
+    pure $ T.pack . show $ year
+  let context = M.unions [nonceParams, nameParams, configParams, yearParam]
+       where
+        nameAsVarId = T.replace "-" "_" $ T.pack $ packageNameString project
+        nameAsModule = T.filter (/= ' ') $ T.toTitle $ T.replace "-" " " $
+                           T.pack $ packageNameString project
+        nameParams = M.fromList [ ("name", T.pack $ packageNameString project)
+                                , ("name-as-varid", nameAsVarId)
+                                , ("name-as-module", nameAsModule) ]
+        configParams = config.templateParams
+        yearParam = M.singleton "year" currentYear
+  files :: Map FilePath LB.ByteString <-
+    catch
+      ( execWriterT $ runConduit $
+            yield (T.encodeUtf8 templateText) .|
+            unpackTemplate receiveMem id
+      )
+      ( \(e :: ProjectTemplateException) ->
+          prettyThrowM $ TemplateInvalid template (string $ displayException e)
+      )
+  when (M.null files) $
+    prettyThrowM $ TemplateInvalid
+      template
+      (flow "the template does not contain any files.")
+
+  let isPkgSpec f = ".cabal" `L.isSuffixOf` f || "package.yaml" `L.isSuffixOf` f
+  unless (any isPkgSpec . M.keys $ files) $
+    prettyThrowM $ TemplateInvalid
+      template
+      (flow "the template does not contain a Cabal or package.yaml file.")
 
     -- Apply Mustache templating to a single file within the project template.
-    let applyMustache bytes
-          -- Workaround for performance problems with mustache and
-          -- large files, applies to Yesod templates with large
-          -- bootstrap CSS files. See
-          -- https://github.com/commercialhaskell/stack/issues/4133.
-          | LB.length bytes < 50000
-          , Right text <- TLE.decodeUtf8' bytes = do
-              let etemplateCompiled = Mustache.compileTemplate (T.unpack (templateName template)) $ TL.toStrict text
-              templateCompiled <- case etemplateCompiled of
-                Left e -> throwM $ InvalidTemplate template (show e)
-                Right t -> pure t
-              let (substitutionErrors, applied) = Mustache.checkedSubstitute templateCompiled context
-                  missingKeys = S.fromList $ concatMap onlyMissingKeys substitutionErrors
-              pure (LB.fromStrict $ encodeUtf8 applied, missingKeys)
-
-          -- Too large or too binary
-          | otherwise = pure (bytes, S.empty)
-
-        -- Accumulate any missing keys as the file is processed
-        processFile mks (fpOrig, bytes) = do
-          -- Apply the mustache template to the filenames as well, so that we
-          -- can have file names depend on the project name.
-          (fp, mks1) <- applyMustache $ TLE.encodeUtf8 $ TL.pack fpOrig
-          path <- parseRelFile $ TL.unpack $ TLE.decodeUtf8 fp
-          (bytes', mks2) <- applyMustache bytes
-          pure (mks <> mks1 <> mks2, (dir </> path, bytes'))
-
-    (missingKeys, results) <- mapAccumLM processFile S.empty (M.toList files)
-    unless (S.null missingKeys) $ do
-      let missingParameters = MissingParameters
-                               project
-                               template
-                               missingKeys
-                               (configUserConfigPath config)
-      logInfo ("\n" <> displayShow missingParameters <> "\n")
-    pure $ M.fromList results
-  where
-    onlyMissingKeys (Mustache.VariableNotFound ks) = map T.unpack ks
-    onlyMissingKeys _ = []
-
-    mapAccumLM :: Monad m => (a -> b -> m(a, c)) -> a -> [b] -> m(a, [c])
-    mapAccumLM _ a [] = pure (a, [])
-    mapAccumLM f a (x:xs) = do
-      (a', c) <- f a x
-      (a'', cs) <- mapAccumLM f a' xs
-      pure (a'', c:cs)
+  let applyMustache bytes
+        -- Workaround for performance problems with mustache and
+        -- large files, applies to Yesod templates with large
+        -- bootstrap CSS files. See
+        -- https://github.com/commercialhaskell/stack/issues/4133.
+        | LB.length bytes < 50000
+        , Right text <- TLE.decodeUtf8' bytes = do
+            let etemplateCompiled =
+                  Mustache.compileTemplate (T.unpack (templateName template)) $ TL.toStrict text
+            templateCompiled <- case etemplateCompiled of
+              Left e -> prettyThrowM $ TemplateInvalid
+                template
+                (  flow "Stack encountered the following error:"
+                <> blankLine
+                   -- Text.Parsec.Error.ParseError is not an instance
+                   -- of Control.Exception.
+                <> string (show e)
+                )
+              Right t -> pure t
+            let (substitutionErrors, applied) =
+                  Mustache.checkedSubstitute templateCompiled context
+                missingKeys =
+                  S.fromList $ concatMap onlyMissingKeys substitutionErrors
+            pure (LB.fromStrict $ encodeUtf8 applied, missingKeys)
+
+        -- Too large or too binary
+        | otherwise = pure (bytes, S.empty)
+
+      -- Accumulate any missing keys as the file is processed
+      processFile mks (fpOrig, bytes) = do
+        -- Apply the mustache template to the filenames as well, so that we
+        -- can have file names depend on the project name.
+        (fp, mks1) <- applyMustache $ TLE.encodeUtf8 $ TL.pack fpOrig
+        path <- parseRelFile $ TL.unpack $ TLE.decodeUtf8 fp
+        (bytes', mks2) <- applyMustache bytes
+        pure (mks <> mks1 <> mks2, (dir </> path, bytes'))
+
+  (missingKeys, results) <- mapAccumLM processFile S.empty (M.toList files)
+  unless (S.null missingKeys) $
+    prettyNote $
+      missingParameters
+        missingKeys
+        config.userGlobalConfigFile
+  pure $ M.fromList results
+ where
+  onlyMissingKeys (Mustache.VariableNotFound ks) = map T.unpack ks
+  onlyMissingKeys _ = []
+
+  mapAccumLM :: Monad m => (a -> b -> m(a, c)) -> a -> [b] -> m(a, [c])
+  mapAccumLM _ a [] = pure (a, [])
+  mapAccumLM f a (x:xs) = do
+    (a', c) <- f a x
+    (a'', cs) <- mapAccumLM f a' xs
+    pure (a'', c:cs)
+
+  missingParameters :: Set String -> Path Abs File -> StyleDoc
+  missingParameters missingKeys userConfigPath =
+       fillSep
+         ( flow "The following parameters were needed by the template but \
+                \not provided:"
+         : mkNarrativeList Nothing False
+             (map toStyleDoc (S.toList missingKeys))
+         )
+    <> blankLine
+    <> fillSep
+         [ flow "You can provide them in Stack's global configuration file"
+         , "(" <> pretty userConfigPath <> ")"
+         , "like this:"
+         ]
+    <> blankLine
+    <> "templates:"
+    <> line
+    <> "  params:"
+    <> line
+    <> vsep
+         ( map
+             (\key -> "    " <> fromString key <> ": value")
+             (S.toList missingKeys)
+         )
+    <> blankLine
+    <> flow "Or you can pass each one on the command line as parameters \
+            \like this:"
+    <> blankLine
+    <> style Shell
+         ( fillSep
+             [ flow "stack new"
+             , fromPackageName project
+             , fromString $ T.unpack (templateName template)
+             , hsep $
+                 map
+                   ( \key ->
+                       fillSep [ "-p"
+                               , "\"" <> fromString key <> ":value\""
+                               ]
+                   )
+                   (S.toList missingKeys)
+             ]
+         )
+    <> line
+   where
+    toStyleDoc :: String -> StyleDoc
+    toStyleDoc = fromString
 
 -- | Check if we're going to overwrite any existing files.
-checkForOverwrite :: (MonadIO m, MonadThrow m) => [Path Abs File] -> m ()
-checkForOverwrite files = do
-    overwrites <- filterM doesFileExist files
-    unless (null overwrites) $ throwM (AttemptedOverwrites overwrites)
+checkForOverwrite ::
+     (MonadIO m, MonadThrow m)
+  => Text
+  -> [Path Abs File]
+  -> m ()
+checkForOverwrite name files = do
+  overwrites <- filterM doesFileExist files
+  unless (null overwrites) $
+    prettyThrowM $ AttemptedOverwrites name overwrites
 
 -- | Write files to the new project directory.
-writeTemplateFiles
-    :: MonadIO m
-    => Map (Path Abs File) LB.ByteString -> m ()
+writeTemplateFiles ::
+     MonadIO m
+  => Map (Path Abs File) LB.ByteString
+  -> m ()
 writeTemplateFiles files =
-    liftIO $
-    forM_
-        (M.toList files)
-        (\(fp,bytes) ->
-              do ensureDir (parent fp)
-                 writeBinaryFileAtomic fp $ lazyByteString bytes)
+  liftIO $
+  forM_
+    (M.toList files)
+    (\(fp,bytes) ->
+      do ensureDir (parent fp)
+         writeBinaryFileAtomic fp $ lazyByteString bytes)
 
 -- | Run any initialization functions, such as Git.
-runTemplateInits
-    :: HasConfig env
-    => Path Abs Dir
-    -> RIO env ()
+runTemplateInits :: HasConfig env => Path Abs Dir -> RIO env ()
 runTemplateInits dir = do
-    config <- view configL
-    case configScmInit config of
-        Nothing -> pure ()
-        Just Git ->
-            withWorkingDir (toFilePath dir) $
-            catchAny (proc "git" ["init"] runProcess_)
-                  (\_ -> logInfo "git init failed to run, ignoring ...")
-
--- | Display help for the templates command.
-templatesHelp :: HasLogFunc env => RIO env ()
-templatesHelp = do
-  let url = defaultTemplatesHelpUrl
-  req <- liftM setGitHubHeaders (parseUrlThrow url)
-  resp <- httpLbs req `catch` (throwM . FailedToDownloadTemplatesHelp)
-  case decodeUtf8' $ LB.toStrict $ getResponseBody resp of
-    Left err -> throwM $ BadTemplatesHelpEncoding url err
-    Right txt -> logInfo $ display txt
+  config <- view configL
+  whenJust config.scmInit $ \Git ->
+    withWorkingDir (toFilePath dir) $
+      catchAny
+        (proc "git" ["init"] runProcess_)
+        ( \_ -> prettyWarnL
+            [ flow "Stack failed to run a"
+            , style Shell (flow "git init")
+            , flow "command. Ignoring..."
+            ]
+        )
 
 --------------------------------------------------------------------------------
 -- Defaults
@@ -357,84 +692,3 @@ templatesHelp = do
 -- | The default service to use to download templates.
 defaultRepoService :: RepoService
 defaultRepoService = GitHub
-
--- | Default web URL to get the `stack templates` help output.
-defaultTemplatesHelpUrl :: String
-defaultTemplatesHelpUrl =
-    "https://raw.githubusercontent.com/commercialhaskell/stack-templates/master/STACK_HELP.md"
-
---------------------------------------------------------------------------------
--- Exceptions
-
--- | Exception that might occur when making a new project.
-data NewException
-    = FailedToLoadTemplate !TemplateName
-                           !FilePath
-    | FailedToDownloadTemplate !TemplateName
-                               !VerifiedDownloadException
-    | AlreadyExists !(Path Abs Dir)
-    | MissingParameters !PackageName !TemplateName !(Set String) !(Path Abs File)
-    | InvalidTemplate !TemplateName !String
-    | AttemptedOverwrites [Path Abs File]
-    | FailedToDownloadTemplatesHelp !HttpException
-    | BadTemplatesHelpEncoding
-        !String -- URL it's downloaded from
-        !UnicodeException
-    | Can'tUseWiredInName !PackageName
-    deriving (Typeable)
-
-instance Exception NewException
-
-instance Show NewException where
-    show (FailedToLoadTemplate name path) =
-        "Failed to load download template " <> T.unpack (templateName name) <>
-        " from " <>
-        path
-    show (FailedToDownloadTemplate name (DownloadHttpError httpError)) =
-          "There was an unexpected HTTP error while downloading template " <>
-          T.unpack (templateName name) <> ": " <> show httpError
-    show (FailedToDownloadTemplate name _) =
-        "Failed to download template " <> T.unpack (templateName name) <>
-        ": unknown reason"
-
-    show (AlreadyExists path) =
-        "Directory " <> toFilePath path <> " already exists. Aborting."
-    show (MissingParameters name template missingKeys userConfigPath) =
-        L.intercalate
-            "\n"
-            [ "The following parameters were needed by the template but not provided: " <>
-              L.intercalate ", " (S.toList missingKeys)
-            , "You can provide them in " <>
-              toFilePath userConfigPath <>
-              ", like this:"
-            , "templates:"
-            , "  params:"
-            , L.intercalate
-                  "\n"
-                  (map
-                       (\key ->
-                             "    " <> key <> ": value")
-                       (S.toList missingKeys))
-            , "Or you can pass each one as parameters like this:"
-            , "stack new " <> packageNameString name <> " " <>
-              T.unpack (templateName template) <>
-              " " <>
-              unwords
-                  (map
-                       (\key ->
-                             "-p \"" <> key <> ":value\"")
-                       (S.toList missingKeys))]
-    show (InvalidTemplate name why) =
-        "The template \"" <> T.unpack (templateName name) <>
-        "\" is invalid and could not be used. " <>
-        "The error was: " <> why
-    show (AttemptedOverwrites fps) =
-        "The template would create the following files, but they already exist:\n" <>
-        unlines (map (("  " ++) . toFilePath) fps) <>
-        "Use --force to ignore this, and overwrite these files."
-    show (FailedToDownloadTemplatesHelp ex) =
-        "Failed to download 'stack templates' help. The HTTP error was: " <> show ex
-    show (BadTemplatesHelpEncoding url err) =
-        "UTF-8 decoding error on template info from\n    " <> url <> "\n\n" <> show err
-    show (Can'tUseWiredInName name) =
-        "The name \"" <> packageNameString name <> "\" is used by GHC wired-in packages, and so shouldn't be used as a package name"
diff --git a/src/Stack/Nix.hs b/src/Stack/Nix.hs
index b60e52b610..bf697411f5 100644
--- a/src/Stack/Nix.hs
+++ b/src/Stack/Nix.hs
@@ -1,135 +1,271 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE ConstraintKinds    #-}
-{-# LANGUAGE DataKinds          #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE OverloadedStrings  #-}
-
--- | Run commands in a nix-shell
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Nix
+Description : Run commands in a nix-shell.
+License     : BSD-3-Clause
+
+Run commands in a nix-shell.
+-}
+
 module Stack.Nix
-  (nixCmdName
-  ,nixHelpOptName
-  ,runShellAndExit
+  ( nixCmdName
+  , nixHelpOptName
+  , runShellAndExit
   ) where
 
-import           Stack.Prelude
 import qualified Data.Text as T
-import           Data.Version (showVersion)
-import           Path.IO
-import qualified Paths_stack as Meta
-import           Stack.Config (getInContainer, withBuildConfig)
-import           Stack.Config.Nix (nixCompiler, nixCompilerVersion)
-import           Stack.Constants (platformVariantEnvVar,inNixShellEnvVar,inContainerEnvVar)
+import qualified Data.ByteString.Lazy.Char8 as S8
+import           Path ( parseAbsFile )
+import           Path.IO ( resolveFile )
+import           RIO.Process
+                   ( HasProcessContext (..), exec, proc, processContextL
+                   , readProcess
+                   )
+import           Stack.Config ( getInContainer, withBuildConfig )
+import           Stack.Config.Nix ( nixCompiler, nixCompilerVersion )
+import           Stack.Constants
+                   ( inContainerEnvVar, inNixShellEnvVar
+                   , platformVariantEnvVar
+                   )
+import           Stack.Prelude
+import           Stack.Types.BuildConfig ( wantedCompilerVersionL )
 import           Stack.Types.Config
-import           Stack.Types.Docker
-import           Stack.Types.Nix
-import           System.Environment (getArgs,getExecutablePath,lookupEnv)
-import qualified System.FilePath  as F
-import           RIO.Process (processContextL, exec)
+                   ( Config (..), HasConfig (..), configProjectRoot )
+import           Stack.Types.Docker ( reExecArgName )
+import           Stack.Types.Runner ( viewExecutablePath )
+import           Stack.Types.Nix ( NixOpts (..) )
+import           Stack.Types.Version ( showStackVersion )
+import           System.Environment ( getArgs, lookupEnv )
+import qualified System.FilePath as F
+
+-- | Type representing  \'pretty\' exceptions thrown by functions exported by
+-- the "Stack.Nix" module.
+data NixPrettyException
+  = CannotDetermineProjectRoot
+    -- ^ Can't determine the project root (location of the shell file if any).
+  | NixInstantiateCommandFailure ![String] !S8.ByteString
+  | NixInstantiateCommandNoDerivationPath ![String]
+  | NixInstantiateCommandNoSingleDerivationPath ![String] ![S8.ByteString]
+  | NixInstantiateCommandInvalidDerivationPath ![String] !String
+  deriving Show
+
+instance Pretty NixPrettyException where
+  pretty CannotDetermineProjectRoot =
+    "[S-7384]"
+    <> line
+    <> flow "Cannot determine project root directory."
+  pretty (NixInstantiateCommandFailure args e) =
+    "[S-1264]"
+    <> line
+    <> whileUsingNixInstantiate args
+    <> flow "Stack encountered the following error:"
+    <> blankLine
+    <> string (T.unpack . textDisplay . displayBytesUtf8 $ S8.toStrict e)
+  pretty (NixInstantiateCommandNoDerivationPath args) =
+    "[S-3220]"
+    <> line
+    <> whileUsingNixInstantiate args
+    <> flow "the command succeeded but did not output a path to a store \
+            \derivation."
+  pretty (NixInstantiateCommandNoSingleDerivationPath args drvPaths) =
+    "[S-5924]"
+    <> line
+    <> whileUsingNixInstantiate args
+    <> flow "the command succeeded but expected a single path to a store \
+            \derivation and output was:"
+    <> line
+    <> bulletedList (map (style File . string . S8.unpack) drvPaths)
+    <> line
+  pretty (NixInstantiateCommandInvalidDerivationPath args drvPath) =
+    "[S-1537]"
+    <> line
+    <> whileUsingNixInstantiate args
+    <> flow "the command succeeded but expected a valid path to a store \
+            \derivation and output was:"
+    <> line
+    <> style Error (string drvPath)
+
+whileUsingNixInstantiate :: [String] -> StyleDoc
+whileUsingNixInstantiate args =
+     fillSep
+         [ flow "While using"
+         , style Shell "nix-instantiate" <> ","
+         , flow "with arguments:"
+         ]
+  <> line
+  <> bulletedList (map (style Shell . string) args)
+  <> blankLine
 
+instance Exception NixPrettyException
+
+-- | Execute @nix-shell@, replacing the current process.
 runShellAndExit :: RIO Config void
 runShellAndExit = do
-   inContainer <- getInContainer -- TODO we can probably assert that this is False based on Stack.Runners now
-   origArgs <- liftIO getArgs
-   let args | inContainer = origArgs  -- internal-re-exec version already passed
-              -- first stack when restarting in the container
-            | otherwise =
-                ("--" ++ reExecArgName ++ "=" ++ showVersion Meta.version) : origArgs
-   exePath <- liftIO getExecutablePath
-   config <- view configL
-   envOverride <- view processContextL
-   local (set processContextL envOverride) $ do
-     let cmnd = escape exePath
-         args' = map escape args
-
-     mshellFile <- case configProjectRoot config of
-         Just projectRoot ->
-             traverse (resolveFile projectRoot) $ nixInitFile (configNix config)
-         Nothing -> pure Nothing
-
-     -- This will never result in double loading the build config, since:
-     --
-     -- 1. This function explicitly takes a Config, not a HasConfig
-     --
-     -- 2. This function ends up exiting before running other code
-     -- (thus the void return type)
-     compilerVersion <- withBuildConfig $ view wantedCompilerVersionL
-
-     ghc <- either throwIO pure $ nixCompiler compilerVersion
-     ghcVersion <- either throwIO pure $ nixCompilerVersion compilerVersion
-     let pkgsInConfig = nixPackages (configNix config)
-         pkgs = pkgsInConfig ++ [ghc, "git", "gcc", "gmp"]
-         pkgsStr = "[" <> T.intercalate " " pkgs <> "]"
-         pureShell = nixPureShell (configNix config)
-         addGCRoots = nixAddGCRoots (configNix config)
-         nixopts = case mshellFile of
-           Just fp -> [toFilePath fp
-                      ,"--arg", "ghc", "with (import <nixpkgs> {}); " ++ T.unpack ghc
-                      ,"--argstr", "ghcVersion", T.unpack ghcVersion]
-           Nothing -> ["-E", T.unpack $ T.concat
-                              ["with (import <nixpkgs> {}); "
-                              ,"let inputs = ",pkgsStr,"; "
-                              ,    "libPath = lib.makeLibraryPath inputs; "
-                              ,    "stackExtraArgs = lib.concatMap (pkg: "
-                              ,    "[ ''--extra-lib-dirs=${lib.getLib pkg}/lib'' "
-                              ,    "  ''--extra-include-dirs=${lib.getDev pkg}/include'' ]"
-                              ,    ") inputs; in "
-                              ,"runCommand ''myEnv'' { "
-                              ,"buildInputs = lib.optional stdenv.isLinux glibcLocales ++ inputs; "
-                              ,T.pack platformVariantEnvVar <> "=''nix''; "
-                              ,T.pack inNixShellEnvVar <> "=1; "
-                              ,if inContainer
-                                  -- If shell is pure, this env var would not
-                                  -- be seen by stack inside nix
-                                  then T.pack inContainerEnvVar <> "=1; "
-                                  else ""
-                              ,"LD_LIBRARY_PATH = libPath;"  -- LD_LIBRARY_PATH is set because for now it's
-                               -- needed by builds using Template Haskell
-                              ,"STACK_IN_NIX_EXTRA_ARGS = stackExtraArgs; "
-                               -- overriding default locale so Unicode output using base won't be broken
-                              ,"LANG=\"en_US.UTF-8\";"
-                              ,"} \"\""]]
-                    -- glibcLocales is necessary on Linux to avoid warnings about GHC being incapable to set the locale.
-         fullArgs = concat [if pureShell then ["--pure"] else []
-                           ,if addGCRoots then ["--indirect", "--add-root"
-                                               ,toFilePath (configWorkDir config)
-                                                F.</> "nix-gc-symlinks" F.</> "gc-root"] else []
-                           ,map T.unpack (nixShellOptions (configNix config))
-                           ,nixopts
-                           ,["--run", unwords (cmnd:"$STACK_IN_NIX_EXTRA_ARGS":args')]
-                           ]
-                           -- Using --run instead of --command so we cannot
-                           -- end up in the nix-shell if stack build is Ctrl-C'd
-     pathVar <- liftIO $ lookupEnv "PATH"
-     logDebug $ "PATH is: " <> displayShow pathVar
-     logDebug $
-       "Using a nix-shell environment " <> (case mshellFile of
-            Just path -> "from file: " <> fromString (toFilePath path)
-            Nothing -> "with nix packages: " <> display (T.intercalate ", " pkgs))
-     exec "nix-shell" fullArgs
+  inContainer <- getInContainer -- TODO we can probably assert that this is False based on Stack.Runners now
+  origArgs <- liftIO getArgs
+  let args | inContainer = origArgs  -- internal-re-exec version already passed
+             -- first stack when restarting in the container
+           | otherwise =
+               ("--" ++ reExecArgName ++ "=" ++ showStackVersion) : origArgs
+  exePath <- toFilePath <$> viewExecutablePath
+  config <- view configL
+  envOverride <- view processContextL
+  local (set processContextL envOverride) $ do
+    let cmnd = escape exePath
+        args' = map escape args
+
+    mshellFile <- case configProjectRoot config of
+      Just projectRoot ->
+        traverse (resolveFile projectRoot) config.nix.initFile
+      Nothing -> pure Nothing
+
+    -- This will never result in double loading the build config, since:
+    --
+    -- 1. This function explicitly takes a Config, not a HasConfig
+    --
+    -- 2. This function ends up exiting before running other code
+    -- (thus the void return type)
+    compilerVersion <- withBuildConfig $ view wantedCompilerVersionL
+
+    ghc <- either prettyThrowIO pure $ nixCompiler compilerVersion
+    ghcVersion <- either prettyThrowIO pure $ nixCompilerVersion compilerVersion
+    let pkgsInConfig = config.nix.packages
+        -- It appears that cacert needs to be specified in order for
+        -- crypton-x509-system >= 1.6.8 to work with Stack's Nix integration:
+        pkgs = pkgsInConfig ++ [ghc, "git", "gcc", "gmp", "cacert"]
+        pkgsStr = "[" <> T.intercalate " " pkgs <> "]"
+        pureShell = config.nix.pureShell
+        addGCRoots = config.nix.addGCRoots
+        nixopts = case mshellFile of
+          Just fp ->
+            [ toFilePath fp
+            , "--arg"
+            , "ghc"
+            , "with (import <nixpkgs> {}); " ++ T.unpack ghc
+            , "--argstr", "ghcVersion", T.unpack ghcVersion
+            ]
+          Nothing ->
+            [ "-E"
+            , T.unpack $ T.concat
+                [ "with (import <nixpkgs> {}); "
+                , "let inputs = ",pkgsStr,"; "
+                ,     "libPath = lib.makeLibraryPath inputs; "
+                ,     "stackExtraArgs = lib.concatMap (pkg: "
+                ,     "[ ''--extra-lib-dirs=${lib.getLib pkg}/lib'' "
+                ,     "  ''--extra-include-dirs=${lib.getDev pkg}/include'' ]"
+                ,     ") inputs; in "
+                , "runCommand ''myEnv'' { "
+                , "buildInputs = lib.optional stdenv.isLinux glibcLocales ++ inputs; "
+                  -- glibcLocales is necessary on Linux to avoid warnings about
+                  -- GHC being incapable to set the locale.
+                , T.pack platformVariantEnvVar <> "=''nix''; "
+                , T.pack inNixShellEnvVar <> "=1; "
+                , if inContainer
+                     -- If shell is pure, this env var would not
+                     -- be seen by stack inside nix
+                     then T.pack inContainerEnvVar <> "=1; "
+                     else ""
+                , "LD_LIBRARY_PATH = libPath;"
+                  -- LD_LIBRARY_PATH is set because for now it's needed by
+                  -- builds using Template Haskell
+                , "STACK_IN_NIX_EXTRA_ARGS = stackExtraArgs; "
+                  -- Overriding default locale so Unicode output using base
+                  -- won't be broken (including on systems that do not provide
+                  -- locale en_US.UTF-8):
+                , "LANG=\"C.UTF-8\";"
+                , "} \"\""
+                ]
+            ]
+        instantiateArgs = concat
+          [ if addGCRoots
+              then [ "--indirect"
+                     -- From Nix 2.4, the --indirect flag is a no op and
+                     -- --add-root always generates indirect GC roots.
+                   , "--add-root"
+                   , toFilePath
+                             config.workDir
+                       F.</> "nix-gc-symlinks"
+                       F.</> "gc-root"
+                   ]
+              else []
+          , nixopts
+          ,  map T.unpack config.nix.instantiateOptions
+          , [ "--show-trace" ]
+          ]
+        shellArgs = concat
+          [ [ "--pure" | pureShell ]
+          , map T.unpack config.nix.shellOptions
+          , [ "--run"
+              -- Using --run instead of --command so we cannot end up in the
+              -- nix-shell if stack build is Ctrl-C'd
+            , unwords (cmnd : "$STACK_IN_NIX_EXTRA_ARGS" : args')
+            ]
+                      ]
+    pathVar <- liftIO $ lookupEnv "PATH"
+    logDebug $ "PATH is: " <> displayShow pathVar
+    logDebug $
+         "Using a nix-shell environment "
+      <> ( case mshellFile of
+             Just path ->
+                  "from file: "
+               <> fromString (toFilePath path)
+             Nothing ->
+                  "with nix packages: "
+               <> display (T.intercalate ", " pkgs)
+         )
+    runNixShellExec instantiateArgs shellArgs
+
+runNixShellExec
+  :: (HasProcessContext env, HasLogFunc env)
+  => [String]
+     -- ^ nix-instantiate args
+  -> [String]
+     -- ^ nix-shell args
+  -> RIO env a
+runNixShellExec instantiateArgs shellArgs = do
+  -- The nix-instantiate command instantiates (produces) a store derivation
+  -- from a Nix expression and prints the path of the store derivation on
+  -- standard output:
+  (ec, out, err) <- proc "nix-instantiate" instantiateArgs readProcess
+  case ec of
+    ExitFailure _ ->
+      -- As of Nix 2.34, there appears to be no way to capture coloured output
+      prettyThrowIO (NixInstantiateCommandFailure instantiateArgs err)
+    ExitSuccess -> do
+      drvPath <- case S8.lines out of
+            [] -> prettyThrowIO $
+              NixInstantiateCommandNoDerivationPath instantiateArgs
+            -- nix-instantiate prints the .drv path
+            [drvPath'] ->
+              let drvPath'' = S8.unpack drvPath'
+              in  if isJust $ parseAbsFile drvPath''
+                    then
+                      pure drvPath''
+                    else
+                      prettyThrowIO $
+                        NixInstantiateCommandInvalidDerivationPath
+                          instantiateArgs
+                          drvPath''
+            drvPaths -> prettyThrowIO $
+              NixInstantiateCommandNoSingleDerivationPath
+                instantiateArgs
+                drvPaths
+      exec "nix-shell" (drvPath : shellArgs)
 
 -- | Shell-escape quotes inside the string and enclose it in quotes.
 escape :: String -> String
-escape str = "'" ++ foldr (\c -> if c == '\'' then
-                                   ("'\"'\"'"++)
-                                 else (c:)) "" str
-                 ++ "'"
+escape str =
+     "'"
+  ++ foldr (\c -> if c == '\'' then ("'\"'\"'"++) else (c:)) "" str
+  ++ "'"
 
--- | Command-line argument for "nix"
+-- | Command-line argument for "nix".
 nixCmdName :: String
 nixCmdName = "nix"
 
+-- | Command-line option to show only @--nix-*@ options.
 nixHelpOptName :: String
 nixHelpOptName = nixCmdName ++ "-help"
-
--- | Exceptions thrown by "Stack.Nix".
-data StackNixException
-  = CannotDetermineProjectRoot
-    -- ^ Can't determine the project root (location of the shell file if any).
-  deriving (Typeable)
-
-instance Exception StackNixException
-
-instance Show StackNixException where
-  show CannotDetermineProjectRoot =
-    "Cannot determine project root directory."
diff --git a/src/Stack/Options/BenchParser.hs b/src/Stack/Options/BenchParser.hs
index d5b751c4a2..81629b5193 100644
--- a/src/Stack/Options/BenchParser.hs
+++ b/src/Stack/Options/BenchParser.hs
@@ -1,25 +1,42 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Stack.Options.BenchParser where
+{-|
+Module      : Stack.Options.BenchParser
+Description : Parser for benchmark arguments.
+License     : BSD-3-Clause
+
+Parser for benchmark arguments.
+-}
+
+module Stack.Options.BenchParser
+ ( benchOptsParser
+ ) where
 
 import           Options.Applicative
+                   ( Mod, Parser, help, long, metavar, strOption )
 import           Options.Applicative.Builder.Extra
+                   ( firstBoolFlagsTrue, optionalFirst )
 import           Stack.Prelude
-import           Stack.Options.Utils
-import           Stack.Types.Config
+import           Stack.Options.Utils ( hideMods )
+import           Stack.Types.BuildOptsMonoid ( BenchmarkOptsMonoid (..) )
 
 -- | Parser for bench arguments.
 -- FIXME hiding options
 benchOptsParser :: Bool -> Parser BenchmarkOptsMonoid
 benchOptsParser hide0 = BenchmarkOptsMonoid
-        <$> optionalFirst (strOption (long "benchmark-arguments" <>
-                                      long "ba" <>
-                                 metavar "BENCH_ARGS" <>
-                                 help ("Forward BENCH_ARGS to the benchmark suite. " <>
-                                       "Supports templates from `cabal bench`") <>
-                                 hide))
-        <*> optionalFirst (flag' True (long "no-run-benchmarks" <>
-                          help "Disable running of benchmarks. (Benchmarks will still be built.)" <>
-                             hide))
-   where hide = hideMods hide0
+  <$> optionalFirst (strOption
+        (  long "benchmark-arguments"
+        <> long "ba"
+        <> metavar "BENCH_ARGS"
+        <> help "Arguments passed to the benchmarks. Supports path variables \
+                \provided by the Cabal build system."
+        <> hide
+        ))
+  <*> firstBoolFlagsTrue
+        "run-benchmarks"
+        "running of targeted benchmarks."
+        hide
+ where
+  hide :: Mod f a
+  hide = hideMods hide0
diff --git a/src/Stack/Options/BuildMonoidParser.hs b/src/Stack/Options/BuildMonoidParser.hs
index f10c0b98ea..7de4eeaa78 100644
--- a/src/Stack/Options/BuildMonoidParser.hs
+++ b/src/Stack/Options/BuildMonoidParser.hs
@@ -1,193 +1,255 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.BuildMonoidParser where
+{-|
+Module      : Stack.Options.BuildMonoidParser
+Description : Parse arguments for Stack's build configuration.
+License     : BSD-3-Clause
 
-import qualified Data.Text as T
-import           Distribution.Parsec (eitherParsec)
+Parse arguments for Stack's build configuration.
+-}
+
+module Stack.Options.BuildMonoidParser
+  ( buildOptsMonoidParser
+  ) where
+
+import           Distribution.Parsec ( eitherParsec )
 import           Options.Applicative
+                   ( FlagFields, Mod, Parser, eitherReader, flag, help, long
+                   , metavar, option, strOption
+                   )
 import           Options.Applicative.Builder.Extra
-import           Stack.Build (splitObjsWarning)
+                   ( firstBoolFlagsFalse, firstBoolFlagsNoDefault
+                   , firstBoolFlagsTrue, optionalFirst
+                   )
+import           Stack.Build ( splitObjsWarning )
 import           Stack.Prelude
-import           Stack.Options.BenchParser
-import           Stack.Options.TestParser
-import           Stack.Options.HaddockParser
-import           Stack.Options.Utils
-import           Stack.Types.Config.Build
+import           Stack.Options.BenchParser ( benchOptsParser )
+import           Stack.Options.TestParser ( testOptsParser )
+import           Stack.Options.HaddockParser ( haddockOptsParser )
+import           Stack.Options.Utils ( GlobalOptsContext (..), hideMods )
+import           Stack.Types.BuildOptsMonoid
+                   ( BuildOptsMonoid (..), CabalVerbosity, readProgressBarFormat
+                   , toFirstCabalVerbosity
+                   )
+import           Stack.Types.ComponentUtils ( unqualCompFromString )
 
+-- | Parse command line arguments for build configuration.
 buildOptsMonoidParser :: GlobalOptsContext -> Parser BuildOptsMonoid
-buildOptsMonoidParser hide0 =
-    BuildOptsMonoid <$> trace' <*> profile <*> noStrip <*> libProfiling <*>
-    exeProfiling <*> libStripping <*> exeStripping <*> haddock <*>
-    haddockOptsParser hideBool <*> openHaddocks <*> haddockDeps <*>
-    haddockInternal <*> haddockHyperlinkSource <*> copyBins <*>
-    copyCompilerTool <*> preFetch <*> keepGoing <*> keepTmpFiles <*>
-    forceDirty <*> tests <*> testOptsParser hideBool <*> benches <*>
-    benchOptsParser hideBool <*> reconfigure <*> cabalVerbose <*> splitObjs <*>
-    skipComponents <*> interleavedOutput <*> ddumpDir
-  where
-    hideBool = hide0 /= BuildCmdGlobalOpts
-    hide =
-        hideMods hideBool
-    hideExceptGhci =
-        hideMods (hide0 `notElem` [BuildCmdGlobalOpts, GhciCmdGlobalOpts])
+buildOptsMonoidParser hide0 = BuildOptsMonoid
+  <$> semaphore
+  <*> trace'
+  <*> profile
+  <*> noStrip
+  <*> libProfiling
+  <*> exeProfiling
+  <*> libStripping
+  <*> exeStripping
+  <*> haddock
+  <*> haddockOptsParser hideBool
+  <*> openHaddocks
+  <*> haddockDeps
+  <*> haddockExecutables
+  <*> haddockTests
+  <*> haddockBenchmarks
+  <*> haddockInternal
+  <*> haddockHyperlinkSource
+  <*> haddockForHackage
+  <*> copyBins
+  <*> copyCompilerTool
+  <*> preFetch
+  <*> keepGoing
+  <*> keepTmpFiles
+  <*> forceDirty
+  <*> tests
+  <*> testOptsParser hideBool
+  <*> benches
+  <*> benchOptsParser hideBool
+  <*> reconfigure
+  <*> cabalVerbose
+  <*> splitObjs
+  <*> skipComponents
+  <*> interleavedOutput
+  <*> progressBar
+  <*> ddumpDir
+ where
+  hideBool = hide0 /= BuildCmdGlobalOpts
+  hide :: Mod f a
+  hide = hideMods hideBool
+  hideExceptGhci :: Mod FlagFields a
+  hideExceptGhci =
+    hideMods (hide0 `notElem` [BuildCmdGlobalOpts, GhciCmdGlobalOpts])
 
-    -- These use 'Any' because they are not settable in stack.yaml, so
-    -- there is no need for options like --no-profile.
-    trace' = Any <$>
-        flag
-            False
-            True
-            (  long "trace"
-            <> help
-                   "Enable profiling in libraries, executables, etc. for all \
-                   \expressions and generate a backtrace on exception"
-            <> hideExceptGhci)
-    profile = Any <$>
-        flag
-            False
-            True
-            (  long "profile"
-            <> help
-                   "Enable profiling in libraries, executables, etc. for all \
-                   \expressions and generate a profiling report in tests or \
-                   \benchmarks"
-            <> hideExceptGhci)
-    noStrip = Any <$>
-        flag
-             False
-             True
-             (  long "no-strip"
-             <> help
-                    "Disable DWARF debugging symbol stripping in libraries, \
-                    \executables, etc. for all expressions, producing larger \
-                    \executables but allowing the use of standard \
-                    \debuggers/profiling tools/other utilities that use \
-                    \debugging symbols."
-             <> hideExceptGhci)
-    libProfiling =
-        firstBoolFlagsFalse
-            "library-profiling"
-            "library profiling for TARGETs and all its dependencies"
-            hide
-    exeProfiling =
-        firstBoolFlagsFalse
-            "executable-profiling"
-            "executable profiling for TARGETs and all its dependencies"
-            hide
-    libStripping =
-        firstBoolFlagsTrue
-            "library-stripping"
-            "library stripping for TARGETs and all its dependencies"
-            hide
-    exeStripping =
-        firstBoolFlagsTrue
-            "executable-stripping"
-            "executable stripping for TARGETs and all its dependencies"
-            hide
-    haddock =
-        firstBoolFlagsFalse
-            "haddock"
-            "generating Haddocks the package(s) in this directory/configuration"
-            hide
-    openHaddocks =
-        firstBoolFlagsFalse
-            "open"
-            "opening the local Haddock documentation in the browser"
-            hide
-    haddockDeps =
-        firstBoolFlagsNoDefault
-            "haddock-deps"
-            "building Haddocks for dependencies (default: true if building \
-            \Haddocks, false otherwise)"
-            hide
-    haddockInternal =
-        firstBoolFlagsFalse
-            "haddock-internal"
-            "building Haddocks for internal modules (like cabal haddock \
-            \--internal)"
-            hide
-    haddockHyperlinkSource =
-        firstBoolFlagsTrue
-            "haddock-hyperlink-source"
-            "building hyperlinked source for Haddock (like haddock \
-            \--hyperlinked-source)"
-            hide
-    copyBins =
-        firstBoolFlagsFalse
-            "copy-bins"
-            "copying binaries to local-bin (see 'stack path')"
-            hide
-    copyCompilerTool =
-        firstBoolFlagsFalse
-            "copy-compiler-tool"
-            "copying binaries of targets to compiler-tools-bin (see 'stack \
-            \path')"
-            hide
-    keepGoing =
-        firstBoolFlagsNoDefault
-            "keep-going"
-            "continue running after a step fails (default: false for build, \
-            \true for test/bench)"
-            hide
-    keepTmpFiles =
-        firstBoolFlagsFalse
-            "keep-tmp-files"
-            "keep intermediate files and build directories"
-            hide
-    preFetch =
-        firstBoolFlagsFalse
-            "prefetch"
-             "fetching packages necessary for the build immediately, useful \
-             \with --dry-run"
-             hide
-    forceDirty =
-        firstBoolFlagsFalse
-            "force-dirty"
-            "forcing the treatment of all local packages as having dirty \
-            \files, useful for cases where Stack can't detect a file change"
-            hide
-    tests =
-        firstBoolFlagsFalse
-            "test"
-            "testing the package(s) in this directory/configuration"
-            hideExceptGhci
-    benches =
-        firstBoolFlagsFalse
-            "bench"
-            "benchmarking the package(s) in this directory/configuration"
-            hideExceptGhci
-    reconfigure =
-        firstBoolFlagsFalse
-             "reconfigure"
-             "performing the configure step, even if unnecessary. Useful in \
-             \some corner cases with custom Setup.hs files"
-            hide
-    cabalVerbose = cabalVerbosityOptsParser hideBool
-    splitObjs =
-        firstBoolFlagsFalse
-            "split-objs"
-            (  "split-objs, to reduce output size (at the cost of build time). "
-            ++ splitObjsWarning)
-            hide
-    skipComponents = many
-        (fmap
-            T.pack
-            (strOption
-                (  long "skip"
-                <> help "Skip given component (can be specified multiple times)"
-                <> hide)))
-    interleavedOutput =
-        firstBoolFlagsTrue
-            "interleaved-output"
-            "printing concurrent GHC output to the console with a prefix for \
-            \the package name"
-            hide
-    ddumpDir =
-        optionalFirst
-            (strOption
-                (  long "ddump-dir"
-                <> help "Specify output ddump-files"
-                <> hide))
+  -- These use 'Any' because they are not settable in stack.yaml, so
+  -- there is no need for options like --no-profile.
+  trace' = Any <$>
+    flag
+      False
+      True
+      (  long "trace"
+      <> help
+             "Enable profiling in libraries, executables, etc. for all \
+             \expressions and generate a backtrace on exception."
+      <> hideExceptGhci
+      )
+  profile = Any <$>
+    flag
+      False
+      True
+      (  long "profile"
+      <> help
+             "Enable profiling in libraries, executables, etc. for all \
+             \expressions and generate a profiling report in tests or \
+             \benchmarks."
+      <> hideExceptGhci
+      )
+  noStrip = Any <$>
+    flag
+      False
+      True
+      (  long "no-strip"
+      <> help
+             "Disable DWARF debugging symbol stripping in libraries, \
+             \executables, etc. for all expressions, producing larger \
+             \executables but allowing the use of standard \
+             \debuggers/profiling tools/other utilities that use \
+             \debugging symbols."
+      <> hideExceptGhci
+      )
+  libProfiling = firstBoolFlagsFalse
+    "library-profiling"
+    "library profiling for TARGETs and all its dependencies."
+    hide
+  exeProfiling = firstBoolFlagsFalse
+    "executable-profiling"
+    "executable profiling for TARGETs and all its dependencies."
+    hide
+  libStripping = firstBoolFlagsTrue
+    "library-stripping"
+    "library stripping for TARGETs and all its dependencies."
+    hide
+  exeStripping = firstBoolFlagsTrue
+    "executable-stripping"
+    "executable stripping for TARGETs and all its dependencies."
+    hide
+  haddock = firstBoolFlagsFalse
+    "haddock"
+    "generating Haddock documentation for the package(s) in this \
+    \directory/configuration."
+    hide
+  openHaddocks = firstBoolFlagsFalse
+    "open"
+    "opening the local Haddock documentation in the browser."
+    hide
+  haddockDeps = firstBoolFlagsNoDefault
+    "haddock-deps"
+    "building Haddock documentation for dependencies. (default: if building \
+    \Haddock documentation, true; otherwise, false)"
+    hide
+  haddockExecutables = firstBoolFlagsFalse
+    "haddock-executables"
+    "also building Haddock documentation for all executables (like \
+    \'cabal haddock --executables')."
+    hide
+  haddockTests = firstBoolFlagsFalse
+    "haddock-tests"
+    "also building Haddock documentation for all test suites (like \
+    \'cabal haddock --tests')."
+    hide
+  haddockBenchmarks = firstBoolFlagsFalse
+    "haddock-benchmarks"
+    "also building Haddock documentation for all benchmarks (like \
+    \'cabal haddock --benchmarks')."
+    hide
+  haddockInternal = firstBoolFlagsFalse
+    "haddock-internal"
+    "building Haddock documentation for internal modules (like \
+    \'cabal haddock --internal')."
+    hide
+  haddockHyperlinkSource = firstBoolFlagsTrue
+    "haddock-hyperlink-source"
+    "building hyperlinked source for Haddock documentation (like \
+    \'haddock --hyperlinked-source')."
+    hide
+  haddockForHackage = firstBoolFlagsFalse
+    "haddock-for-hackage"
+    "building with flags to generate Haddock documentation suitable for upload \
+    \to Hackage."
+    hide
+  copyBins = firstBoolFlagsFalse
+    "copy-bins"
+    "copying binaries to local-bin (see 'stack path')."
+    hide
+  copyCompilerTool = firstBoolFlagsFalse
+    "copy-compiler-tool"
+    "copying binaries of targets to compiler-tools-bin (see 'stack path')."
+    hide
+  keepGoing = firstBoolFlagsNoDefault
+    "keep-going"
+    "continue running after a step fails. (default: for 'build', false; for \
+    \'test' or 'bench', true)"
+    hide
+  keepTmpFiles = firstBoolFlagsFalse
+    "keep-tmp-files"
+    "keep intermediate files and build directories."
+    hide
+  preFetch = firstBoolFlagsFalse
+    "prefetch"
+    "fetching packages necessary for the build immediately. Useful with \
+    \--dry-run."
+    hide
+  forceDirty = firstBoolFlagsFalse
+    "force-dirty"
+    "forcing the treatment of all project packages and local extra-deps as \
+    \having dirty files. Useful for cases where Stack can't detect a file \
+    \change."
+    hide
+  tests = firstBoolFlagsFalse
+    "test"
+    "testing the package(s) in this directory/configuration."
+    hideExceptGhci
+  benches = firstBoolFlagsFalse
+    "bench"
+    "benchmarking the package(s) in this directory/configuration."
+    hideExceptGhci
+  reconfigure = firstBoolFlagsFalse
+    "reconfigure"
+    "performing the configure step, even if unnecessary. Useful in some \
+    \corner cases with custom Setup.hs files."
+    hide
+  cabalVerbose = cabalVerbosityOptsParser hideBool
+  splitObjs = firstBoolFlagsFalse
+    "split-objs"
+    (  "split-objs, to reduce output size (at the cost of build time). "
+    ++ splitObjsWarning
+    )
+    hide
+  skipComponents = many (fmap unqualCompFromString (strOption
+    (  long "skip"
+    <> help "Skip given component (can be specified multiple times)."
+    <> hide
+    )))
+  interleavedOutput = firstBoolFlagsTrue
+    "interleaved-output"
+    "printing concurrent GHC output to the console with a prefix for the \
+    \package name."
+    hide
+  progressBar = First <$> optional (option (eitherReader readProgressBarFormat)
+    (  long "progress-bar"
+    <> metavar "FORMAT"
+    <> help "Progress bar format (accepts none, count-only, capped and full). \
+            \(default: capped)"
+    <> hide
+    ))
+  ddumpDir = optionalFirst (strOption
+    (  long "ddump-dir"
+    <> help "Specify output directory for ddump-files."
+    <> hide
+    ))
+  semaphore = firstBoolFlagsFalse
+    "semaphore"
+    "the use of a system semaphore to perform compilation in parallel when \
+    \possible. Supported, by default, by GHC 9.10.1 or later."
+    hide
 
 -- | Parser for Cabal verbosity options
 cabalVerbosityOptsParser :: Bool -> Parser (First CabalVerbosity)
@@ -198,10 +260,11 @@ cabalVerbosityOptsParser hide =
 cabalVerbosityParser :: Bool -> Parser (First CabalVerbosity)
 cabalVerbosityParser hide =
   let pCabalVerbosity = option (eitherReader eitherParsec)
-         (  long "cabal-verbosity"
-         <> metavar "VERBOSITY"
-         <> help "Cabal verbosity (accepts Cabal's numerical and extended syntax)"
-         <> hideMods hide)
+        (  long "cabal-verbosity"
+        <> metavar "VERBOSITY"
+        <> help "Cabal verbosity (accepts Cabal's numerical and extended \
+                \syntax)."
+        <> hideMods hide)
   in  First . Just <$> pCabalVerbosity
 
 -- | Parser for the Cabal verbose flag, retained for backward compatibility
@@ -209,6 +272,6 @@ cabalVerboseParser :: Bool -> Parser (First CabalVerbosity)
 cabalVerboseParser hide =
   let pVerboseFlag = firstBoolFlagsFalse
                        "cabal-verbose"
-                       "asking Cabal to be verbose in its output"
+                       "asking Cabal to be verbose in its output."
                        (hideMods hide)
   in  toFirstCabalVerbosity <$> pVerboseFlag
diff --git a/src/Stack/Options/BuildParser.hs b/src/Stack/Options/BuildParser.hs
index 548552a447..df0f8d961a 100644
--- a/src/Stack/Options/BuildParser.hs
+++ b/src/Stack/Options/BuildParser.hs
@@ -1,111 +1,183 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Stack.Options.BuildParser where
+{-|
+Module      : Stack.Options.BuildParser
+License     : BSD-3-Clause
+-}
 
-import qualified Data.Map as Map
+module Stack.Options.BuildParser
+  ( buildOptsParser
+  ) where
+
+import qualified Data.List as L
+import qualified Data.Text as T
 import           Options.Applicative
-import           Options.Applicative.Args
+                   ( Parser, completer, flag, flag', help, internal, long
+                   , metavar, strOption, switch, value
+                   )
+import           Options.Applicative.Args ( cmdOption )
 import           Options.Applicative.Builder.Extra
-import           Stack.Options.Completion
-import           Stack.Options.PackageParser (readFlag)
+                   ( firstBoolFlagsNoDefault, textArgument, textOption )
+import           Stack.Options.Completion ( ghcOptsCompleter, targetCompleter )
+import           Stack.Options.FlagsParser ( flagsParser )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.BuildOptsCLI
+                   ( BuildCommand, BuildOptsCLI (..), BuildSubset (..)
+                   , FileWatchOpts (..)
+                   )
 
 -- | Parser for CLI-only build arguments
-buildOptsParser :: BuildCommand
-                -> Parser BuildOptsCLI
-buildOptsParser cmd =
-    BuildOptsCLI <$>
-    targetsParser <*>
-    switch
-        (long "dry-run" <>
-         help "Don't build anything, just prepare to") <*>
-    ((\x y z ->
-           concat [x, y, z]) <$>
-     flag
-         []
-         ["-Wall", "-Werror"]
-         (long "pedantic" <>
-          help "Turn on -Wall and -Werror") <*>
-     flag
-         []
-         ["-O0"]
-         (long "fast" <>
-          help "Turn off optimizations (-O0)") <*>
-     many
-         (textOption
-              (long "ghc-options" <>
-               metavar "OPTIONS" <>
-               completer ghcOptsCompleter <>
-               help "Additional options passed to GHC"))) <*>
-    flagsParser <*>
-    (flag'
-         BSOnlyDependencies
-         (long "dependencies-only" <>
-          help "A synonym for --only-dependencies") <|>
-     flag'
-         BSOnlySnapshot
-         (long "only-snapshot" <>
-          help
-              "Only build packages for the snapshot database, not the local database") <|>
-     flag'
-         BSOnlyDependencies
-         (long "only-dependencies" <>
-          help
-              "Only build packages that are dependencies of targets on the command line") <|>
-     flag'
-         BSOnlyLocals
-         (long "only-locals" <>
-          help
-              "Only build packages in the local database, fail if the build plan includes the snapshot database") <|>
-     pure BSAll) <*>
-    (flag'
-         FileWatch
-         (long "file-watch" <>
-          help
-              "Watch for changes in local files and automatically rebuild. Ignores files in VCS boring/ignore file") <|>
-     flag'
-         FileWatchPoll
-         (long "file-watch-poll" <>
-          help
-              "Like --file-watch, but polling the filesystem instead of using events") <|>
-     pure NoFileWatch) <*>
-    switch
-        (long "watch-all" <>
-         help "Watch all local files not taking targets into account") <*>
-    many (cmdOption
-             (long "exec" <>
-              metavar "COMMAND [ARGUMENT(S)]" <>
-              help "Command and argument(s) to run after a successful build")) <*>
-    switch
-        (long "only-configure" <>
-         help
-             "Only perform the configure step, not any builds. Intended for tool usage, may break when used on multiple packages at once!") <*>
-    pure cmd <*>
-    switch
-        (long "initial-build-steps" <>
-         help "For target packages, only run initial build steps needed for GHCi" <>
-         internal)
+buildOptsParser :: BuildCommand -> Parser BuildOptsCLI
+buildOptsParser cmd = BuildOptsCLI
+  <$> targetsParser
+  <*> switch
+        (  long "dry-run"
+        <> help "Don't build anything, just prepare to."
+        )
+  <*> (   (\x y z -> concat [x, y, z])
+      <$> flag
+            []
+            ["-Wall", "-Werror"]
+            (  long "pedantic"
+            <> help "Pass the -Wall and -Werror flags to GHC, turning on all \
+                    \warnings that indicate potentially suspicious code and \
+                    \making all warnings into fatal errors. Can be overridden \
+                    \using Stack's --ghc-options option."
+            )
+      <*> flag
+            []
+            ["-O0"]
+            (  long "fast"
+            <> help "Pass a -O0 flag to GHC, turning off any GHC \
+                    \optimsations that have been set. Can be overridden using \
+                    \Stack's --ghc-options option."
+            )
+      <*> many (textOption
+            (  long "ghc-options"
+            <> metavar "OPTIONS"
+            <> completer ghcOptsCompleter
+            <> help "Additional options to be passed to GHC (can be specified \
+                    \multiple times)."
+            ))
+      )
+  <*> progsOptionsParser
+  <*> flagsParser
+  <*> firstBoolFlagsNoDefault
+        "allow-newer"
+        "ignoring of lower and upper version bounds in Cabal files."
+        (hideMods False)
+  <*> (   flag' BSOnlyDependencies
+            (  long "dependencies-only"
+            <> help "A synonym for --only-dependencies."
+            )
+      <|> flag' BSOnlySnapshot
+            (  long "only-snapshot"
+            <> help "Only build packages for the snapshot database, not the \
+                    \local database."
+            )
+      <|> flag' BSOnlyDependencies
+            (  long "only-dependencies"
+            <> help "Only build packages that are dependencies of targets on \
+                    \the command line."
+            )
+      <|> flag' BSOnlyLocals
+            (  long "only-locals"
+            <> help "Only build packages in the local database. Fail if the \
+                    \build plan includes the snapshot database."
+            )
+      <|> pure BSAll
+      )
+  <*> (   flag' FileWatch
+            (  long "file-watch"
+            <> help "Watch for changes in local files and automatically \
+                    \rebuild."
+            )
+      <|> flag' FileWatchPoll
+            (  long "file-watch-poll"
+            <> help "Like --file-watch, but polling the filesystem instead of \
+                    \using events."
+            )
+      <|> pure NoFileWatch
+      )
+  <*> switch
+        (  long "watch-all"
+        <> help "Watch all local files not taking targets into account."
+        )
+  <*> many (cmdOption
+        (  long "exec"
+        <> metavar "COMMAND [ARGUMENT(S)]"
+        <> help "Command and argument(s) to run after a successful build."
+        ))
+  <*> switch
+        (  long "only-configure"
+        <> help "Only perform the configure step, not any builds. Intended for \
+                \tool usage. May break when used on multiple packages at once!"
+        )
+  <*> pure cmd
+  <*> switch
+        (  long "initial-build-steps"
+        <> help "For target packages, only run initial build steps needed for \
+                \GHCi."
+        <> internal
+        )
 
+-- | Parser for build targets.
 targetsParser :: Parser [Text]
 targetsParser =
-    many
-        (textArgument
-             (metavar "TARGET" <>
-              completer targetCompleter <>
-              help ("If none specified, use all local packages. " <>
-                    "See https://docs.haskellstack.org/en/stable/build_command/#target-syntax for details.")))
+  many (textArgument
+    (  metavar "TARGET"
+    <> completer targetCompleter
+    <> help "Can be specified multiple times. If none specified, use all \
+            \project packages. See \
+            \https://docs.haskellstack.org/en/stable/commands/build_command/#target-syntax \
+            \for details."
+    ))
 
-flagsParser :: Parser (Map.Map ApplyCLIFlag (Map.Map FlagName Bool))
-flagsParser =
-     Map.unionsWith Map.union <$>
-     many
-         (option
-              readFlag
-              (long "flag" <>
-               completer flagCompleter <>
-               metavar "PACKAGE:[-]FLAG" <>
-               help
-                   ("Override flags set in stack.yaml " <>
-                    "(applies to local packages and extra-deps)")))
+progsOptionsParser :: Parser [(Text, [Text])]
+progsOptionsParser =
+     dummyProgOptionsParser
+  *> (filter (not . L.null . snd) <$> progsOptionsParser')
+ where
+  -- The purpose of this parser is only to generate the desired help text. The
+  -- actual --PROG-options parsers are all internal.
+  dummyProgOptionsParser :: Parser String
+  dummyProgOptionsParser = strOption
+    ( long "PROG-option"
+    <> help
+         (  "Pass an argument to PROG (can be specified multiple times). PROG \
+            \must be a program recognised by the Cabal library and one of "
+         <> T.unpack (T.intercalate " " progs) <> "."
+         )
+    <> metavar "ARG"
+    <> value ""
+    )
+  progs :: [Text]
+  progs = L.sort
+    [
+      -- configuration
+      "pkg-config"
+      -- preprocessors
+    , "alex"
+    , "c2hs"
+    , "cpphs"
+    , "doctest"
+    , "greencard"
+    , "happy"
+    , "hsc2hs"
+    , "hscolour"
+      -- platform toolchain (GNU)
+    , "ar"  -- create, modify, and extract from archives
+    , "gcc" -- C/C++ compiler
+    , "ld" -- linker
+    , "strip" -- discards symbols and other data from object files
+    , "tar"
+    ]
+  progsOptionsParser' :: Parser [(Text, [Text])]
+  progsOptionsParser' = traverse mkProgOptionsParser progs
+  mkProgOptionsParser :: Text -> Parser (Text, [Text])
+  mkProgOptionsParser prog = fmap (prog,) $ many $ textOption
+    (  long (T.unpack prog <> "-option")
+    <> internal
+    )
diff --git a/src/Stack/Options/CleanParser.hs b/src/Stack/Options/CleanParser.hs
index c9d3c235a4..82a5e9110a 100644
--- a/src/Stack/Options/CleanParser.hs
+++ b/src/Stack/Options/CleanParser.hs
@@ -1,25 +1,59 @@
 {-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE ApplicativeDo     #-}
 
-module Stack.Options.CleanParser where
+{-|
+Module      : Stack.Options.CleanParser
+License     : BSD-3-Clause
+-}
 
-import           Options.Applicative
-import           Stack.Clean                       (CleanCommand(..), CleanOpts (..))
+module Stack.Options.CleanParser
+  ( cleanOptsParser
+  ) where
+
+import           Options.Applicative ( Parser, flag', help, idm, long, metavar )
+import           Options.Applicative.Builder.Extra ( boolFlags )
+import           Stack.Clean
+                   ( CleanCommand (..), CleanDepth (..), CleanOpts (..) )
 import           Stack.Prelude
-import           Stack.Types.PackageName
+import           Stack.Types.PackageName ( packageNameArgument )
 
 -- | Command-line parser for the clean command.
 cleanOptsParser :: CleanCommand -> Parser CleanOpts
-cleanOptsParser Clean = CleanShallow <$> packages <|> doFullClean
-  where
-    packages =
-        many
-            (packageNameArgument
-                 (metavar "PACKAGE" <>
-                  help "If none specified, clean all project packages"))
-    doFullClean =
-        flag'
-            CleanFull
-            (long "full" <>
-             help "Delete the project’s Stack working directories (.stack-work by default).")
+cleanOptsParser Clean = shallowParser <|> fullParser
+
+cleanOptsParser Purge = pure $ CleanOpts
+  { depth = CleanFull
+  , omitThis = False
+  }
+
+shallowParser :: Parser CleanOpts
+shallowParser = do
+  packages <- parsePackages
+  omitThis <- parseOmitThis
+  pure $ CleanOpts
+    { depth = CleanShallow packages
+    , omitThis
+    }
+ where
+  parsePackages = many (packageNameArgument
+    (  metavar "PACKAGE"
+    <> help "If none specified, clean all project packages."
+    ))
+  parseOmitThis = boolFlags False
+    "omit-this"
+    "the omission of directories currently in use"
+    idm
 
-cleanOptsParser Purge = pure CleanFull
+fullParser :: Parser CleanOpts
+fullParser = do
+  depth <- doFullClean
+  pure $ CleanOpts
+    { depth
+    , omitThis = False
+    }
+ where
+  doFullClean = flag' CleanFull
+    (  long "full"
+    <> help "Delete the project's Stack work directories (.stack-work by \
+            \default)."
+    )
diff --git a/src/Stack/Options/Completion.hs b/src/Stack/Options/Completion.hs
index 4698353194..b78effbba5 100644
--- a/src/Stack/Options/Completion.hs
+++ b/src/Stack/Options/Completion.hs
@@ -1,111 +1,130 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TupleSections     #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Options.Completion
+Description : Completers for command line arguments.
+License     : BSD-3-Clause
+
+Completers for command line arguments or arguments of command line options.
+-}
 
 module Stack.Options.Completion
-    ( ghcOptsCompleter
-    , targetCompleter
-    , flagCompleter
-    , projectExeCompleter
-    ) where
+  ( ghcOptsCompleter
+  , targetCompleter
+  , flagCompleter
+  , projectExeCompleter
+  ) where
 
-import           Data.Char (isSpace)
-import           Data.List (isPrefixOf)
+import           Data.Char ( isSpace )
+import           Data.List ( isPrefixOf )
 import qualified Data.Map as Map
-import           Data.Maybe
 import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Distribution.PackageDescription as C
-import           Options.Applicative
-import           Options.Applicative.Builder.Extra
-import           Stack.Constants (ghcShowOptionsOutput)
-import           Stack.Options.GlobalParser (globalOptsFromMonoid)
+import           Options.Applicative ( Completer, mkCompleter )
+import           Options.Applicative.Builder.Extra ( unescapeBashArg )
+import           Stack.Constants ( ghcShowOptionsOutput )
+import           Stack.Options.GlobalParser ( globalOptsFromMonoid )
 import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig
+                   , withRunnerGlobal
+                   )
 import           Stack.Prelude
-import           Stack.Types.Config
-import           Stack.Types.NamedComponent
-import           Stack.Types.SourceMap
+import           Stack.Types.BuildConfig ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.Config ( Config (..) )
+import           Stack.Types.EnvConfig ( EnvConfig )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Project ( Project (..) )
+import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
+import           Stack.Types.NamedComponent ( renderPkgComponent )
+import           Stack.Types.SourceMap ( SMWanted (..), ppComponents, ppGPD )
 
+-- | A completer for @--ghc-options@ or @--ghci-options@.
 ghcOptsCompleter :: Completer
 ghcOptsCompleter = mkCompleter $ \inputRaw -> pure $
-    let input = unescapeBashArg inputRaw
-        (curArgReversed, otherArgsReversed) = break isSpace (reverse input)
-        curArg = reverse curArgReversed
-        otherArgs = reverse otherArgsReversed
-     in if null curArg then [] else
-         map (otherArgs ++) $
-         filter (curArg `isPrefixOf`) ghcShowOptionsOutput
+  let input = unescapeBashArg inputRaw
+      (curArgReversed, otherArgsReversed) = break isSpace (reverse input)
+      curArg = reverse curArgReversed
+      otherArgs = reverse otherArgsReversed
+  in  if null curArg
+        then []
+        else
+          map (otherArgs ++) $
+          filter (curArg `isPrefixOf`) ghcShowOptionsOutput
 
 -- TODO: Ideally this would pay attention to --stack-yaml, may require
 -- changes to optparse-applicative.
 
-buildConfigCompleter
-    :: (String -> RIO EnvConfig [String])
-    -> Completer
+buildConfigCompleter :: (String -> RIO EnvConfig [String]) -> Completer
 buildConfigCompleter inner = mkCompleter $ \inputRaw -> do
-    let input = unescapeBashArg inputRaw
-    case input of
-        -- If it looks like a flag, skip this more costly completion.
-        ('-': _) -> pure []
-        _ -> do
-            go' <- globalOptsFromMonoid False mempty
-            let go = go' { globalLogLevel = LevelOther "silent" }
-            withRunnerGlobal go $ withConfig NoReexec $ withDefaultEnvConfig $ inner input
+  let input = unescapeBashArg inputRaw
+  case input of
+    -- If it looks like a flag, skip this more costly completion.
+    ('-': _) -> pure []
+    _ -> do
+      -- We do not need to specify the name of the current Stack executable, as
+      -- it was invoked, or the path to the current Stack executable, as
+      -- withDefaultEnvConfig does not need either.
+      go' <- globalOptsFromMonoid "" Nothing False mempty
+      let go = go' { logLevel = LevelOther "silent" }
+      withRunnerGlobal go $ withConfig NoReexec $ withDefaultEnvConfig $ inner input
 
+-- | A completer for components of project packages.
 targetCompleter :: Completer
 targetCompleter = buildConfigCompleter $ \input -> do
-  packages <- view $ buildConfigL.to (smwProject . bcSMWanted)
+  packages <- view $ buildConfigL . to (.smWanted.project)
   comps <- for packages ppComponents
-  pure
-    $ filter (input `isPrefixOf`)
-    $ concatMap allComponentNames
-    $ Map.toList comps
-  where
-    allComponentNames (name, comps) =
-        map (T.unpack . renderPkgComponent . (name,)) (Set.toList comps)
+  pure $
+    concatMap
+      (filter (input `isPrefixOf`) . allComponentNames)
+      (Map.toList comps)
+ where
+  allComponentNames (name, comps) =
+    map (T.unpack . renderPkgComponent . (name,)) (Set.toList comps)
 
+-- | A completer for Cabal flags of project packages.
 flagCompleter :: Completer
 flagCompleter = buildConfigCompleter $ \input -> do
-    bconfig <- view buildConfigL
-    gpds <- for (smwProject $ bcSMWanted bconfig) ppGPD
-    let wildcardFlags
-            = nubOrd
-            $ concatMap (\(name, gpd) ->
-                map (\fl -> "*:" ++ flagString name fl) (C.genPackageFlags gpd))
-            $ Map.toList gpds
-        normalFlags
-            = concatMap (\(name, gpd) ->
-                map (\fl -> packageNameString name ++ ":" ++ flagString name fl)
-                    (C.genPackageFlags gpd))
-            $ Map.toList gpds
-        flagString name fl =
-            let flname = C.unFlagName $ C.flagName fl
-             in (if flagEnabled name fl then "-" else "") ++ flname
-        prjFlags =
-          case configProject (bcConfig bconfig) of
-            PCProject (p, _) -> projectFlags p
-            PCGlobalProject -> mempty
-            PCNoProject _ -> mempty
-        flagEnabled name fl =
-            fromMaybe (C.flagDefault fl) $
-            Map.lookup (C.flagName fl) $
-            Map.findWithDefault Map.empty name prjFlags
-    pure $ filter (input `isPrefixOf`) $
-        case input of
-            ('*' : ':' : _) -> wildcardFlags
-            ('*' : _) -> wildcardFlags
-            _ -> normalFlags
+  bconfig <- view buildConfigL
+  gpds <- for bconfig.smWanted.project ppGPD
+  let wildcardFlags
+        = nubOrd
+        $ concatMap (\(name, gpd) ->
+            map (\fl -> "*:" ++ flagString name fl) (C.genPackageFlags gpd))
+        $ Map.toList gpds
+      normalFlags
+        = concatMap (\(name, gpd) ->
+            map (\fl -> packageNameString name ++ ":" ++ flagString name fl)
+                (C.genPackageFlags gpd))
+        $ Map.toList gpds
+      flagString name fl =
+        let flname = C.unFlagName $ C.flagName fl
+        in  (if flagEnabled name fl then "-" else "") ++ flname
+      prjFlags =
+        case bconfig.config.project of
+          PCProject (p, _) -> p.flagsByPkg
+          PCGlobalProject -> mempty
+          PCNoProject _ -> mempty
+      flagEnabled name fl =
+        fromMaybe (C.flagDefault fl) $
+        Map.lookup (C.flagName fl) $
+        Map.findWithDefault Map.empty name prjFlags
+  pure $ filter (input `isPrefixOf`) $
+    case input of
+      ('*' : ':' : _) -> wildcardFlags
+      ('*' : _) -> wildcardFlags
+      _ -> normalFlags
 
+-- | A completer for executable components of project packages.
 projectExeCompleter :: Completer
 projectExeCompleter = buildConfigCompleter $ \input -> do
-  packages <- view $ buildConfigL.to (smwProject . bcSMWanted)
+  packages <- view $ buildConfigL . to (.smWanted.project)
   gpds <- Map.traverseWithKey (const ppGPD) packages
   pure
     $ filter (input `isPrefixOf`)
     $ nubOrd
     $ concatMap
-        (\gpd -> map
-          (C.unUnqualComponentName . fst)
-          (C.condExecutables gpd)
-        )
+        (map (C.unUnqualComponentName . fst) . C.condExecutables)
         gpds
diff --git a/src/Stack/Options/ConfigEnvParser.hs b/src/Stack/Options/ConfigEnvParser.hs
new file mode 100644
index 0000000000..80d3c1cd31
--- /dev/null
+++ b/src/Stack/Options/ConfigEnvParser.hs
@@ -0,0 +1,48 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Options.ConfigEnvParser
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @config env@ command.
+-}
+
+module Stack.Options.ConfigEnvParser
+  ( configCmdEnvParser
+  ) where
+
+import qualified Options.Applicative as OA
+import           Options.Applicative.Builder.Extra ( boolFlags )
+import           Stack.Prelude
+import           Stack.Types.EnvSettings
+                   ( EnvSettings (..), defaultEnvSettings )
+
+-- | Parse command line arguments for Stack's @config env@ command.
+configCmdEnvParser :: OA.Parser EnvSettings
+configCmdEnvParser = EnvSettings
+  <$> boolFlags
+        defaultEnvSettings.includeLocals
+        "locals"
+        "include information about local packages"
+        mempty
+  <*> boolFlags
+        defaultEnvSettings.includeGhcPackagePath
+        "ghc-package-path"
+        "set GHC_PACKAGE_PATH environment variable"
+        mempty
+  <*> boolFlags
+        defaultEnvSettings.stackExe
+        "stack-exe"
+        "set STACK_EXE environment variable"
+        mempty
+  <*> boolFlags
+        defaultEnvSettings.localeUtf8
+        "locale-utf8"
+        "set the GHC_CHARENC environment variable to UTF-8"
+        mempty
+  <*> boolFlags
+        defaultEnvSettings.keepGhcRts
+        "keep-ghc-rts"
+        "keep any GHCRTS environment variable"
+        mempty
diff --git a/src/Stack/Options/ConfigParser.hs b/src/Stack/Options/ConfigParser.hs
index 52d4ca1291..2787173727 100644
--- a/src/Stack/Options/ConfigParser.hs
+++ b/src/Stack/Options/ConfigParser.hs
@@ -1,192 +1,243 @@
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
 
-module Stack.Options.ConfigParser where
+{-|
+Module      : Stack.Options.ConfigParser
+License     : BSD-3-Clause
+-}
 
-import           Data.Char
+module Stack.Options.ConfigParser
+  ( configOptsParser
+  ) where
+
+import           Data.Char ( toUpper )
 import           Options.Applicative
+                   ( Mod, Parser, auto, completer, completeWith, eitherReader
+                   , help, long, metavar, option, short, strOption
+                   )
 import           Options.Applicative.Builder.Extra
-import           Path
-import           Stack.Constants
-import           Stack.Options.BuildMonoidParser
-import           Stack.Options.DockerParser
-import           Stack.Options.GhcBuildParser
-import           Stack.Options.GhcVariantParser
-import           Stack.Options.NixParser
-import           Stack.Options.Utils
-import           Stack.Prelude
-import           Stack.Types.Config
+                   ( PathCompleterOpts (..), absDirOption, absFileOption
+                   , defaultPathCompleterOpts, dirCompleter, firstBoolFlagsFalse
+                   , firstBoolFlagsNoDefault, firstBoolFlagsTrue, optionalFirst
+                   , pathCompleterWith
+                   )
+import           Path ( PathException (..), parseRelDir )
+import           Stack.Constants ( stackRootOptionName )
+import           Stack.Options.BuildMonoidParser ( buildOptsMonoidParser )
+import           Stack.Options.DockerParser ( dockerOptsParser )
+import           Stack.Options.GhcBuildParser ( ghcBuildParser )
+import           Stack.Options.GhcVariantParser ( ghcVariantParser )
+import           Stack.Options.NixParser ( nixOptsParser )
+import           Stack.Options.Utils ( GlobalOptsContext (..), hideMods )
+import           Stack.Prelude hiding ( snapshotLocation )
+import           Stack.Types.ColorWhen ( readColorWhen )
+import           Stack.Types.ConfigMonoid ( ConfigMonoid (..) )
+import           Stack.Types.DumpLogs ( DumpLogs (..) )
 import qualified System.FilePath as FilePath
 
 -- | Command-line arguments parser for configuration.
 configOptsParser :: FilePath -> GlobalOptsContext -> Parser ConfigMonoid
 configOptsParser currentDir hide0 =
-    (\stackRoot workDir buildOpts dockerOpts nixOpts systemGHC installGHC arch
-        ghcVariant ghcBuild jobs includes libs preprocs overrideGccPath overrideHpack
-        skipGHCCheck skipMsys localBin setupInfoLocations modifyCodePage
-        allowDifferentUser dumpLogs colorWhen snapLoc noRunCompile -> mempty
-            { configMonoidStackRoot = stackRoot
-            , configMonoidWorkDir = workDir
-            , configMonoidBuildOpts = buildOpts
-            , configMonoidDockerOpts = dockerOpts
-            , configMonoidNixOpts = nixOpts
-            , configMonoidSystemGHC = systemGHC
-            , configMonoidInstallGHC = installGHC
-            , configMonoidSkipGHCCheck = skipGHCCheck
-            , configMonoidArch = arch
-            , configMonoidGHCVariant = ghcVariant
-            , configMonoidGHCBuild = ghcBuild
-            , configMonoidJobs = jobs
-            , configMonoidExtraIncludeDirs = includes
-            , configMonoidExtraLibDirs = libs
-            , configMonoidCustomPreprocessorExts = preprocs
-            , configMonoidOverrideGccPath = overrideGccPath
-            , configMonoidOverrideHpack = overrideHpack
-            , configMonoidSkipMsys = skipMsys
-            , configMonoidLocalBinPath = localBin
-            , configMonoidSetupInfoLocations = setupInfoLocations
-            , configMonoidModifyCodePage = modifyCodePage
-            , configMonoidAllowDifferentUser = allowDifferentUser
-            , configMonoidDumpLogs = dumpLogs
-            , configMonoidColorWhen = colorWhen
-            , configMonoidSnapshotLocation = snapLoc
-            , configMonoidNoRunCompile = noRunCompile
-            })
-    <$> optionalFirst (absDirOption
-            ( long stackRootOptionName
-            <> metavar (map toUpper stackRootOptionName)
-            <> help ("Absolute path to the global Stack root directory " ++
-                     "(Overrides any STACK_ROOT environment variable)")
-            <> hide
-            ))
-    <*> optionalFirst (option (eitherReader (mapLeft showWorkDirError . parseRelDir))
-            ( long "work-dir"
-            <> metavar "WORK-DIR"
-            <> completer (pathCompleterWith (defaultPathCompleterOpts { pcoAbsolute = False, pcoFileFilter = const False }))
-            <> help ("Relative path of work directory " ++
-                     "(Overrides any STACK_WORK environment variable, default is '.stack-work')")
-            <> hide
-            ))
-    <*> buildOptsMonoidParser hide0
-    <*> dockerOptsParser True
-    <*> nixOptsParser True
-    <*> firstBoolFlagsNoDefault
-            "system-ghc"
-            "using the system installed GHC (on the PATH) if it is available and its version matches. Disabled by default."
-            hide
-    <*> firstBoolFlagsTrue
-            "install-ghc"
-            "downloading and installing GHC if necessary (can be done manually \
-            \with 'stack setup')"
-            hide
-    <*> optionalFirst (strOption
-            ( long "arch"
-           <> metavar "ARCH"
-           <> help "System architecture, e.g. i386, x86_64"
-           <> hide
-            ))
-    <*> optionalFirst (ghcVariantParser (hide0 /= OuterGlobalOpts))
-    <*> optionalFirst (ghcBuildParser (hide0 /= OuterGlobalOpts))
-    <*> optionalFirst (option auto
-            ( long "jobs"
-           <> short 'j'
-           <> metavar "JOBS"
-           <> help "Number of concurrent jobs to run"
-           <> hide
-            ))
-    <*> many ((currentDir FilePath.</>) <$> strOption
-            ( long "extra-include-dirs"
-           <> metavar "DIR"
-           <> completer dirCompleter
-           <> help "Extra directories to check for C header files"
-           <> hide
-            ))
-    <*> many ((currentDir FilePath.</>) <$> strOption
-            ( long "extra-lib-dirs"
-           <> metavar "DIR"
-           <> completer dirCompleter
-           <> help "Extra directories to check for libraries"
-           <> hide
-            ))
-    <*> many (strOption
-            ( long "custom-preprocessor-extensions"
-           <> metavar "EXT"
-           <> help "Extensions used for custom preprocessors"
-           <> hide
-            ))
-    <*> optionalFirst (absFileOption
-             ( long "with-gcc"
-            <> metavar "PATH-TO-GCC"
-            <> help "Use gcc found at PATH-TO-GCC"
-            <> hide
-             ))
-    <*> optionalFirst (strOption
-             ( long "with-hpack"
-            <> metavar "HPACK"
-            <> help "Use HPACK executable (overrides bundled Hpack)"
-            <> hide
-             ))
-    <*> firstBoolFlagsFalse
-            "skip-ghc-check"
-            "skipping the GHC version and architecture check"
-            hide
-    <*> firstBoolFlagsFalse
-            "skip-msys"
-            "skipping the local MSYS installation (Windows only)"
-            hide
-    <*> optionalFirst ((currentDir FilePath.</>) <$> strOption
-             ( long "local-bin-path"
-            <> metavar "DIR"
-            <> completer dirCompleter
-            <> help "Install binaries to DIR"
-            <> hide
-             ))
-    <*> many (
-        strOption
-            ( long "setup-info-yaml"
-           <> help "Alternate URL or relative / absolute path for Stack dependencies"
-           <> metavar "URL" ))
-    <*> firstBoolFlagsTrue
-            "modify-code-page"
-            "setting the codepage to support UTF-8 (Windows only)"
-            hide
-    <*> firstBoolFlagsNoDefault
-            "allow-different-user"
-            ("permission for users other than the owner of the Stack root " ++
-                "directory to use a Stack installation (POSIX only) " ++
-                "(default: true inside Docker, otherwise false)")
-            hide
-    <*> fmap toDumpLogs
-            (firstBoolFlagsNoDefault
-             "dump-logs"
-             "dump the build output logs for local packages to the console \
-             \(default: dump warning logs)"
-             hide)
-    <*> optionalFirst (option readColorWhen
-             ( long "color"
-            <> long "colour"
-            <> metavar "WHEN"
-            <> completeWith ["always", "never", "auto"]
-            <> help "Specify when to use color in output; WHEN is 'always', \
-                    \'never', or 'auto'. On Windows versions before Windows \
-                    \10, for terminals that do not support color codes, the \
-                    \default is 'never'; color may work on terminals that \
-                    \support color codes"
-            <> hide
-             ))
-    <*> optionalFirst (strOption
-            ( long "snapshot-location-base"
-           <> help "The base location of LTS/Nightly snapshots"
-           <> metavar "URL"
-            ))
-    <*> firstBoolFlagsFalse
-            "script-no-run-compile"
-            "the use of options `--no-run --compile` with `stack script`"
-            hide
-  where
-    hide = hideMods (hide0 /= OuterGlobalOpts)
-    toDumpLogs (First (Just True)) = First (Just DumpAllLogs)
-    toDumpLogs (First (Just False)) = First (Just DumpNoLogs)
-    toDumpLogs (First Nothing) = First Nothing
-    showWorkDirError err = show err ++
-        "\nNote that --work-dir must be a relative child directory, because work-dirs outside of the package are not supported by Cabal." ++
-        "\nSee https://github.com/commercialhaskell/stack/issues/2954"
+  ( \stackRoot workDir buildOpts dockerOpts nixOpts systemGHC installGHC installMsys arch
+     ghcVariant ghcBuild jobs extraIncludeDirs extraLibDirs
+     customPreprocessorExts overrideGccPath overrideHpack hpackForce skipGHCCheck skipMsys
+     localBinPath setupInfoLocations modifyCodePage allowDifferentUser dumpLogs
+     colorWhen snapshotLocation noRunCompile -> mempty
+       { stackRoot
+       , workDir
+       , buildOpts
+       , dockerOpts
+       , nixOpts
+       , systemGHC
+       , installGHC
+       , installMsys
+       , skipGHCCheck
+       , arch
+       , ghcVariant
+       , ghcBuild
+       , jobs
+       , extraIncludeDirs
+       , extraLibDirs
+       , customPreprocessorExts
+       , overrideGccPath
+       , overrideHpack
+       , hpackForce
+       , skipMsys
+       , localBinPath
+       , setupInfoLocations
+       , modifyCodePage
+       , allowDifferentUser
+       , dumpLogs
+       , colorWhen
+       , snapshotLocation
+       , noRunCompile
+       }
+  )
+  <$> optionalFirst (absDirOption
+        ( long stackRootOptionName
+        <> metavar (map toUpper stackRootOptionName)
+        <> help "Absolute path to the global Stack root directory. Overrides \
+                \any STACK_ROOT environment variable."
+        <> hide
+        ))
+  <*> optionalFirst (option (eitherReader (mapLeft showWorkDirError . parseRelDir))
+        ( long "work-dir"
+        <> metavar "WORK-DIR"
+        <> completer
+             ( pathCompleterWith
+               ( defaultPathCompleterOpts
+                   { absolute = False, fileFilter = const False }
+               )
+             )
+        <> help "Relative path to Stack's work directory. Overrides any \
+                \STACK_WORK environment variable. (default: '.stack-work')"
+        <> hide
+        ))
+  <*> buildOptsMonoidParser hide0
+  <*> dockerOptsParser True
+  <*> nixOptsParser True
+  <*> firstBoolFlagsNoDefault
+        "system-ghc"
+        "using the system installed GHC (on the PATH) if it is available and \
+        \its version matches. (default: disabled)"
+        hide
+  <*> firstBoolFlagsTrue
+        "install-ghc"
+        "downloading and installing GHC if necessary. (Can be done manually \
+        \with 'stack setup'.)"
+        hide
+  <*> firstBoolFlagsNoDefault
+        "install-msys"
+        "downloading and installing MSYS2 if necessary (Windows only). (Can be \
+        \done manually with 'stack setup'.) (default: same as 'install-ghc')"
+        hide
+  <*> optionalFirst (strOption
+        (  long "arch"
+        <> metavar "ARCH"
+        <> help "System architecture, e.g. i386, x86_64, aarch64."
+        <> hide
+        ))
+  <*> optionalFirst (ghcVariantParser (hide0 /= OuterGlobalOpts))
+  <*> optionalFirst (ghcBuildParser (hide0 /= OuterGlobalOpts))
+  <*> optionalFirst (option auto
+        (  long "jobs"
+        <> short 'j'
+        <> metavar "JOBS"
+        <> help "Number of concurrent jobs to run."
+        <> hide
+        ))
+  <*> many ((currentDir FilePath.</>) <$> strOption
+        (  long "extra-include-dirs"
+        <> metavar "DIR"
+        <> completer dirCompleter
+        <> help "Extra directories to check for C header files."
+        <> hide
+        ))
+  <*> many ((currentDir FilePath.</>) <$> strOption
+        (  long "extra-lib-dirs"
+        <> metavar "DIR"
+        <> completer dirCompleter
+        <> help "Extra directories to check for libraries."
+        <> hide
+        ))
+  <*> many (strOption
+        (  long "custom-preprocessor-extensions"
+        <> metavar "EXT"
+        <> help "Extensions used for custom preprocessors."
+        <> hide
+        ))
+  <*> optionalFirst (absFileOption
+        (  long "with-gcc"
+        <> metavar "PATH-TO-GCC"
+        <> help "Use gcc found at PATH-TO-GCC."
+        <> hide
+        ))
+  <*> optionalFirst (strOption
+        (  long "with-hpack"
+        <> metavar "HPACK"
+        <> help "Use HPACK executable (overrides bundled Hpack)."
+        <> hide
+        ))
+  <*> firstBoolFlagsFalse
+        "hpack-force"
+        "overwriting of Cabal files that were created by a more recent \
+        \version of Hpack or have been modified manually."
+        hide
+  <*> firstBoolFlagsFalse
+        "skip-ghc-check"
+        "skipping the GHC version and architecture check."
+        hide
+  <*> firstBoolFlagsFalse
+        "skip-msys"
+        "skipping the local MSYS installation (Windows only)."
+        hide
+  <*> optionalFirst ((currentDir FilePath.</>) <$> strOption
+        ( long "local-bin-path"
+        <> metavar "DIR"
+        <> completer dirCompleter
+        <> help "Override the target directory for 'stack build --copy-bins' \
+                \and 'stack install'. DIR can be an absolute path or one \
+                \relative to the current directory."
+        <> hide
+        ))
+  <*> many (strOption
+        (  long "setup-info-yaml"
+        <> help "Alternate URL or path (relative or absolute) for Stack \
+                \dependencies."
+        <> metavar "URL"
+        ))
+  <*> firstBoolFlagsTrue
+        "modify-code-page"
+        "setting the codepage to support UTF-8 (Windows only)."
+        hide
+  <*> firstBoolFlagsNoDefault
+        "allow-different-user"
+        "permission for users other than the owner of the Stack root directory \
+        \to use a Stack installation (POSIX only). (default: inside Docker, \
+        \ true; otherwise, false)"
+        hide
+  <*> fmap toDumpLogs (firstBoolFlagsNoDefault
+        "dump-logs"
+        "dump the build output logs for project packages to the console. \
+        \(default: dump warning logs)"
+        hide)
+  <*> optionalFirst (option readColorWhen
+        (  long "color"
+        <> long "colour"
+        <> metavar "WHEN"
+        <> completeWith ["always", "never", "auto"]
+        <> help "Specify when to use color in output; WHEN is 'always', \
+                \'never', or 'auto'. On Windows versions before Windows \
+                \10, for terminals that do not support color codes, the \
+                \default is 'never'; color may work on terminals that \
+                \support color codes."
+        <> hide
+        ))
+  <*> optionalFirst (strOption
+        (  long "snapshot-location-base"
+        <> help "The base location of LTS/Nightly snapshots."
+        <> metavar "URL"
+        ))
+  <*> firstBoolFlagsFalse
+        "script-no-run-compile"
+        "the use of options `--no-run --compile` with `stack script`."
+        hide
+ where
+  hide :: Mod f a
+  hide = hideMods (hide0 /= OuterGlobalOpts)
+  toDumpLogs (First (Just True)) = First (Just DumpAllLogs)
+  toDumpLogs (First (Just False)) = First (Just DumpNoLogs)
+  toDumpLogs (First Nothing) = First Nothing
+  showWorkDirError err = case fromException err of
+    Just (InvalidRelDir x) ->
+      "Stack failed to interpret the value of the option as a valid\n\
+      \relative path to a directory. Stack will not accept an absolute path. A \
+      \path\n\
+      \containing a .. (parent directory) component is not valid.\n\n\
+      \If set, Stack expects the value to identify the location of Stack's \
+      \work\n\
+      \directory, relative to the root directory of the project or package. \
+      \Stack\n\
+      \encountered the value:\n"
+      ++ x
+    _ -> displayException err
diff --git a/src/Stack/Options/ConfigSetParser.hs b/src/Stack/Options/ConfigSetParser.hs
new file mode 100644
index 0000000000..cef75f06f1
--- /dev/null
+++ b/src/Stack/Options/ConfigSetParser.hs
@@ -0,0 +1,143 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Options.ConfigSetParser
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @config set@ command.
+-}
+
+module Stack.Options.ConfigSetParser
+  ( configCmdSetParser
+  ) where
+
+import qualified Data.Text as T
+import qualified Options.Applicative as OA
+import qualified Options.Applicative.Types as OA
+import           Stack.Prelude
+import           Stack.Types.ConfigMonoid
+                   ( configMonoidInstallGHCName
+                   , configMonoidInstallMsysName
+                   , configMonoidRecommendStackUpgradeName
+                   , configMonoidSystemGHCName
+                   )
+import           Stack.Types.ConfigSetOpts
+                   ( CommandScope (..), ConfigCmdSet (..) )
+import           Stack.Types.Snapshot ( readAbstractSnapshot )
+
+-- | Parse command line arguments for Stack's @config set@ command.
+configCmdSetParser :: OA.Parser ConfigCmdSet
+configCmdSetParser =
+  OA.hsubparser $
+    mconcat
+      [ OA.command "snapshot"
+          ( OA.info
+              (   ConfigCmdSetSnapshot
+              <$> OA.argument
+                    readAbstractSnapshot
+                    (  OA.metavar "SNAPSHOT"
+                    <> OA.help "E.g. \"nightly\" or \"lts-24.55\"" ))
+              ( OA.progDesc
+                  "Change the snapshot of the current project." ))
+      , OA.command "resolver"
+          ( OA.info
+              (   ConfigCmdSetResolver
+              <$> OA.argument
+                    readAbstractSnapshot
+                    (  OA.metavar "SNAPSHOT"
+                    <> OA.help "E.g. \"nightly\" or \"lts-24.55\"" ))
+              ( OA.progDesc
+                  "Change the snapshot of the current project, using the \
+                  \(deprecated) resolver key." ))
+      , OA.command (T.unpack configMonoidSystemGHCName)
+          ( OA.info
+              (   ConfigCmdSetSystemGhc
+              <$> globalScopeFlag
+              <*> boolArgument )
+              ( OA.progDesc
+                  "Configure whether or not Stack should use a system GHC \
+                  \installation." ))
+      , OA.command (T.unpack configMonoidInstallGHCName)
+          ( OA.info
+              (   ConfigCmdSetInstallGhc
+              <$> globalScopeFlag
+              <*> boolArgument )
+              ( OA.progDesc
+                  "Configure whether or not Stack should automatically install \
+                  \GHC when necessary." ))
+      , OA.command (T.unpack configMonoidInstallMsysName)
+          ( OA.info
+              (   ConfigCmdSetInstallMsys
+              <$> globalScopeFlag
+              <*> boolArgument )
+              ( OA.progDesc
+                  "Configure whether or not Stack should automatically install \
+                  \MSYS2 when necessary." ))
+      , OA.command (T.unpack configMonoidRecommendStackUpgradeName)
+          ( OA.info
+              (   ConfigCmdSetRecommendStackUpgrade
+              <$> projectScopeFlag
+              <*> boolArgument )
+              ( OA.progDesc
+                  "Configure whether or not Stack should notify the user if it \
+                  \identifes a new version of Stack is available." ))
+      , OA.command "package-index"
+          ( OA.info
+              ( OA.hsubparser $
+                  OA.command "download-prefix"
+                    ( OA.info
+                        (   ConfigCmdSetDownloadPrefix
+                        <$> globalScopeFlag
+                        <*> urlArgument )
+                        ( OA.progDesc
+                            "Configure download prefix for Stack's package \
+                            \index." )))
+              ( OA.progDesc
+                  "Configure Stack's package index" ))
+      ]
+
+globalScopeFlag :: OA.Parser CommandScope
+globalScopeFlag = OA.flag
+  CommandScopeProject
+  CommandScopeGlobal
+  (  OA.long "global"
+  <> OA.help
+       "Modify the user-specific global configuration file ('config.yaml') \
+       \instead of the project-level configuration file ('stack.yaml')."
+  )
+
+projectScopeFlag :: OA.Parser CommandScope
+projectScopeFlag = OA.flag
+  CommandScopeGlobal
+  CommandScopeProject
+  (  OA.long "project"
+  <> OA.help
+       "Modify the project-level configuration file ('stack.yaml') instead of \
+       \the user-specific global configuration file ('config.yaml')."
+  )
+
+boolArgument :: OA.Parser Bool
+boolArgument = OA.argument
+  readBool
+  (  OA.metavar "true|false"
+  <> OA.completeWith ["true", "false"]
+  )
+
+readBool :: OA.ReadM Bool
+readBool = do
+  s <- OA.readerAsk
+  case s of
+    "true" -> pure True
+    "false" -> pure False
+    _ -> OA.readerError ("Invalid value " ++ show s ++
+           ": Expected \"true\" or \"false\"")
+
+urlArgument :: OA.Parser Text
+urlArgument = OA.strArgument
+  (  OA.metavar "URL"
+  <> OA.value defaultDownloadPrefix
+  <> OA.showDefault
+  <> OA.help
+       "Location of package index. It is highly recommended to use only the \
+       \official Hackage server or a mirror."
+  )
diff --git a/src/Stack/Options/DockerParser.hs b/src/Stack/Options/DockerParser.hs
index 5d22f876dc..c913cca274 100644
--- a/src/Stack/Options/DockerParser.hs
+++ b/src/Stack/Options/DockerParser.hs
@@ -1,108 +1,158 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.DockerParser where
+{-|
+Module      : Stack.Options.DockerParser
+License     : BSD-3-Clause
+-}
 
-import           Data.List                         (intercalate)
-import qualified Data.Text                         as T
-import           Distribution.Version              (anyVersion)
+module Stack.Options.DockerParser
+  ( dockerOptsParser
+  ) where
+
+import           Data.List ( intercalate )
+import qualified Data.Text as T
+import           Distribution.Version ( anyVersion )
 import           Options.Applicative
-import           Options.Applicative.Args
+                   ( Mod, Parser, auto, completer, help, listCompleter, long
+                   , metavar, option, str, value
+                   )
+import           Options.Applicative.Args ( argsOption )
 import           Options.Applicative.Builder.Extra
-import           Stack.Docker
+                   ( dirCompleter, eitherReader', fileCompleter
+                   , firstBoolFlagsFalse, firstBoolFlagsNoDefault
+                   , firstBoolFlagsTrue, optionalFirst
+                   )
+import           Stack.Constants ( stackProgName )
+import           Stack.Docker ( dockerCmdName )
 import           Stack.Prelude
-import           Stack.Options.Utils
-import           Stack.Types.Version
+import           Stack.Options.Utils ( hideMods )
+import           Stack.Types.Version ( IntersectingVersionRange (..) )
 import           Stack.Types.Docker
+                   ( DockerMonoidRepoOrImage (..), DockerOptsMonoid (..)
+                   , dockerAutoPullArgName, dockerImageArgName
+                   , dockerContainerNameArgName, dockerDetachArgName
+                   , dockerEnvArgName, dockerPersistArgName
+                   , dockerRegistryLoginArgName, dockerRegistryPasswordArgName
+                   , dockerRegistryUsernameArgName, dockerRepoArgName
+                   , dockerRunArgsArgName, dockerMountArgName
+                   , dockerMountModeArgName, dockerNetworkArgName
+                   , dockerSetUserArgName, dockerStackExeArgName
+                   , dockerStackExeDownloadVal, dockerStackExeHostVal
+                   , dockerStackExeImageVal, parseDockerStackExe
+                   )
 
 -- | Options parser configuration for Docker.
 dockerOptsParser :: Bool -> Parser DockerOptsMonoid
-dockerOptsParser hide0 =
-    DockerOptsMonoid (Any False)
-    <$> firstBoolFlagsNoDefault
-                       dockerCmdName
-                       "using a Docker container. --docker implies 'system-ghc: true'"
-                       hide
-    <*> fmap First
-           (Just . DockerMonoidRepo <$> option str (long (dockerOptName dockerRepoArgName) <>
-                                                     hide <>
-                                                     metavar "NAME" <>
-                                                     help "Docker repository name") <|>
-             Just . DockerMonoidImage <$> option str (long (dockerOptName dockerImageArgName) <>
-                                                      hide <>
-                                                      metavar "IMAGE" <>
-                                                      help "Exact Docker image ID (overrides docker-repo)") <|>
-         pure Nothing)
-    <*> firstBoolFlagsNoDefault
-                       (dockerOptName dockerRegistryLoginArgName)
-                       "registry requires login"
-                       hide
-    <*> firstStrOption (long (dockerOptName dockerRegistryUsernameArgName) <>
-                        hide <>
-                        metavar "USERNAME" <>
-                        help "Docker registry username")
-    <*> firstStrOption (long (dockerOptName dockerRegistryPasswordArgName) <>
-                        hide <>
-                        metavar "PASSWORD" <>
-                        help "Docker registry password")
-    <*> firstBoolFlagsTrue
-                       (dockerOptName dockerAutoPullArgName)
-                       "automatic pulling latest version of image"
-                       hide
-    <*> firstBoolFlagsFalse
-                       (dockerOptName dockerDetachArgName)
-                       "running a detached Docker container"
-                       hide
-    <*> firstBoolFlagsFalse
-                       (dockerOptName dockerPersistArgName)
-                       "not deleting container after it exits"
-                       hide
-    <*> firstStrOption (long (dockerOptName dockerContainerNameArgName) <>
-                        hide <>
-                        metavar "NAME" <>
-                        help "Docker container name")
-    <*> firstStrOption (long (dockerOptName dockerNetworkArgName) <>
-                        hide <>
-                        metavar "NETWORK" <>
-                        help "Docker network")
-    <*> argsOption (long (dockerOptName dockerRunArgsArgName) <>
-                    hide <>
-                    value [] <>
-                    metavar "'ARG1 [ARG2 ...]'" <>
-                    help "Additional options to pass to 'docker run'")
-    <*> many (option auto (long (dockerOptName dockerMountArgName) <>
-                           hide <>
-                           metavar "(PATH | HOST-PATH:CONTAINER-PATH)" <>
-                           completer dirCompleter <>
-                           help ("Mount volumes from host in container " ++
-                                 "(can be specified multiple times)")))
-    <*> firstStrOption (long (dockerOptName dockerMountModeArgName) <>
-                        hide <>
-                        metavar "SUFFIX" <>
-                        help "Volume mount mode suffix")
-    <*> many (option str (long (dockerOptName dockerEnvArgName) <>
-                                hide <>
-                                metavar "NAME=VALUE" <>
-                                help ("Set environment variable in container " ++
-                                      "(can be specified multiple times)")))
-    <*> optionalFirst (option (eitherReader' parseDockerStackExe)
-            (let specialOpts =
-                     [ dockerStackExeDownloadVal
-                     , dockerStackExeHostVal
-                     , dockerStackExeImageVal
-                     ] in
-             long(dockerOptName dockerStackExeArgName) <>
-             hide <>
-             metavar (intercalate "|" (specialOpts ++ ["PATH"])) <>
-             completer (listCompleter specialOpts <> fileCompleter) <>
-             help (concat [ "Location of "
+dockerOptsParser hide0 = DockerOptsMonoid (Any False)
+  <$> firstBoolFlagsNoDefault
+        dockerCmdName
+        "using a Docker container. --docker implies 'system-ghc: true'."
+        hide
+  <*> fmap First
+        (   Just . DockerMonoidRepo <$> option str
+              (  long (dockerOptName dockerRepoArgName)
+              <> hide
+              <> metavar "NAME"
+              <> help "Docker repository name."
+              )
+        <|> Just . DockerMonoidImage <$> option str
+              (  long (dockerOptName dockerImageArgName)
+              <> hide
+              <> metavar "IMAGE"
+              <> help "Exact Docker image ID (overrides docker-repo)."
+              )
+        <|> pure Nothing
+        )
+  <*> firstBoolFlagsNoDefault
+        (dockerOptName dockerRegistryLoginArgName)
+        "registry requires login."
+        hide
+  <*> firstStrOption
+        (  long (dockerOptName dockerRegistryUsernameArgName)
+        <> hide
+        <> metavar "USERNAME"
+        <> help "Docker registry username."
+        )
+  <*> firstStrOption
+        (  long (dockerOptName dockerRegistryPasswordArgName)
+        <> hide
+        <> metavar "PASSWORD"
+        <> help "Docker registry password."
+        )
+  <*> firstBoolFlagsTrue
+        (dockerOptName dockerAutoPullArgName)
+        "automatic pulling latest version of image."
+        hide
+  <*> firstBoolFlagsFalse
+        (dockerOptName dockerDetachArgName)
+        "running a detached Docker container."
+        hide
+  <*> firstBoolFlagsFalse
+        (dockerOptName dockerPersistArgName)
+        "not deleting container after it exits."
+        hide
+  <*> firstStrOption
+        (  long (dockerOptName dockerContainerNameArgName)
+        <> hide
+        <> metavar "NAME"
+        <> help "Docker container name."
+        )
+  <*> firstStrOption
+        (  long (dockerOptName dockerNetworkArgName)
+        <> hide
+        <> metavar "NETWORK"
+        <> help "Docker network."
+        )
+  <*> argsOption
+        (  long (dockerOptName dockerRunArgsArgName)
+        <> hide
+        <> value []
+        <> metavar "'ARG1 [ARG2 ...]'"
+        <> help "Additional options to pass to 'docker run'.")
+  <*> many (option auto
+        (  long (dockerOptName dockerMountArgName)
+        <> hide
+        <> metavar "(PATH | HOST-PATH:CONTAINER-PATH)"
+        <> completer dirCompleter
+        <> help "Mount volumes from host in container (can be specified \
+                \multiple times)."
+        ))
+  <*> firstStrOption
+        (  long (dockerOptName dockerMountModeArgName)
+        <> hide
+        <> metavar "SUFFIX"
+        <> help "Volume mount mode suffix."
+        )
+  <*> many (option str
+        (  long (dockerOptName dockerEnvArgName)
+        <> hide
+        <> metavar "NAME=VALUE"
+        <> help "Set environment variable in container (can be specified \
+                \multiple times)."
+        ))
+  <*> optionalFirst (option (eitherReader' parseDockerStackExe)
+        ( let specialOpts = [ dockerStackExeDownloadVal
+                            , dockerStackExeHostVal
+                            , dockerStackExeImageVal
+                            ]
+          in     long (dockerOptName dockerStackExeArgName)
+              <> hide
+              <> metavar (intercalate "|" (specialOpts ++ ["PATH"]))
+              <> completer (listCompleter specialOpts <> fileCompleter)
+              <> help ( concat
+                          [ "Location of "
                           , stackProgName
-                          , " executable used in container" ])))
-    <*> firstBoolFlagsNoDefault
-                       (dockerOptName dockerSetUserArgName)
-                       "setting user in container to match host"
-                       hide
-    <*> pure (IntersectingVersionRange anyVersion)
-  where
-    dockerOptName optName = dockerCmdName ++ "-" ++ T.unpack optName
-    firstStrOption = optionalFirst . option str
-    hide = hideMods hide0
+                          , " executable used in container."
+                          ]
+                      )
+        ))
+  <*> firstBoolFlagsNoDefault
+        (dockerOptName dockerSetUserArgName)
+        "setting user in container to match host."
+        hide
+  <*> pure (IntersectingVersionRange anyVersion)
+ where
+  dockerOptName optName = dockerCmdName ++ "-" ++ T.unpack optName
+  firstStrOption = optionalFirst . option str
+  hide :: Mod f a
+  hide = hideMods hide0
diff --git a/src/Stack/Options/DotParser.hs b/src/Stack/Options/DotParser.hs
index 3068e7cb50..3572c50464 100644
--- a/src/Stack/Options/DotParser.hs
+++ b/src/Stack/Options/DotParser.hs
@@ -1,105 +1,102 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Stack.Options.DotParser where
+{-|
+Module      : Stack.Options.DotParser
+License     : BSD-3-Clause
 
-import           Data.Char (isSpace)
-import           Data.List.Split (splitOn)
+Function to parse command line arguments for Stack's @dot@ command and certain
+command line arguments for Stack's @ls dependencies@ command.
+-}
+
+module Stack.Options.DotParser
+  ( dotOptsParser
+  ) where
+
+import           Data.Char ( isSpace )
+import           Data.List.Split ( splitOn )
 import qualified Data.Set as Set
-import qualified Data.Text as T
-import           Distribution.Types.PackageName(mkPackageName)
+import           Distribution.Types.PackageName ( mkPackageName )
 import           Options.Applicative
-import           Options.Applicative.Builder.Extra
-import           Stack.Dot
-import           Stack.Options.BuildParser
+                   ( Parser, auto, completer, help, idm, long, metavar, option
+                   , strOption, switch
+                   )
+import           Options.Applicative.Builder.Extra ( boolFlags, textArgument )
+import           Stack.Options.Completion ( targetCompleter )
+import           Stack.Options.FlagsParser ( flagsParser )
 import           Stack.Prelude
+import           Stack.Types.DotOpts ( DotOpts (..) )
 
 -- | Parser for arguments to `stack dot`
 dotOptsParser :: Bool -> Parser DotOpts
-dotOptsParser externalDefault =
-  DotOpts <$> includeExternal
-          <*> includeBase
-          <*> depthLimit
-          <*> fmap (maybe Set.empty $ Set.fromList . splitNames) prunedPkgs
-          <*> targetsParser
-          <*> flagsParser
-          <*> testTargets
-          <*> benchTargets
-          <*> globalHints
-  where includeExternal = boolFlags externalDefault
-                                    "external"
-                                    "inclusion of external dependencies"
-                                    idm
-        includeBase = boolFlags True
-                                "include-base"
-                                "inclusion of dependencies on base"
-                                idm
-        depthLimit =
-            optional (option auto
-                             (long "depth" <>
-                              metavar "DEPTH" <>
-                              help ("Limit the depth of dependency resolution " <>
-                                    "(Default: No limit)")))
-        prunedPkgs = optional (strOption
-                                   (long "prune" <>
-                                    metavar "PACKAGES" <>
-                                    help ("Prune each package name " <>
-                                          "from the comma separated list " <>
-                                          "of package names PACKAGES")))
-        testTargets = switch (long "test" <>
-                              help "Consider dependencies of test components")
-        benchTargets = switch (long "bench" <>
-                               help "Consider dependencies of benchmark components")
-
-        splitNames :: String -> [PackageName]
-        splitNames = map (mkPackageName . takeWhile (not . isSpace) . dropWhile isSpace) . splitOn ","
-
-        globalHints = switch (long "global-hints" <>
-                              help "Do not require an install GHC; instead, use a hints file for global packages")
-
-separatorParser :: Parser Text
-separatorParser =
-  fmap escapeSep
-  (textOption (long "separator" <>
-                metavar "SEP" <>
-                help ("Separator between package name " <>
-                      "and package version.") <>
-                value " " <>
-                showDefault))
-  where escapeSep sep = T.replace "\\t" "\t" (T.replace "\\n" "\n" sep)
-
-licenseParser :: Parser Bool
-licenseParser = boolFlags False
-                "license"
-                "printing of dependency licenses instead of versions"
-                idm
-
-listDepsFormatOptsParser :: Parser ListDepsFormatOpts
-listDepsFormatOptsParser = ListDepsFormatOpts <$> separatorParser <*> licenseParser
-
-listDepsTreeParser :: Parser ListDepsFormat
-listDepsTreeParser =  ListDepsTree <$> listDepsFormatOptsParser
-
-listDepsTextParser :: Parser ListDepsFormat
-listDepsTextParser = ListDepsText <$> listDepsFormatOptsParser
+dotOptsParser externalDefault = DotOpts
+  <$> includeExternal
+  <*> includeBase
+  <*> depthLimit
+  <*> fmap (maybe Set.empty $ Set.fromList . splitNames) prunedPkgs
+  <*> fmap (maybe Set.empty $ Set.fromList . splitNames) reachPkgs
+  <*> targetsParser
+  <*> flagsParser
+  <*> testTargets
+  <*> benchTargets
+  <*> globalHints
+ where
+  includeExternal = boolFlags externalDefault
+    "external"
+    "inclusion of external dependencies."
+    idm
+  includeBase = boolFlags True
+    "include-base"
+    "inclusion of dependencies on base."
+    idm
+  depthLimit = optional (option auto
+    (  long "depth"
+    <> metavar "DEPTH"
+    <> help "Limit the depth of dependency resolution. (default: no limit)"
+    ))
+  prunedPkgs = optional (strOption
+    (  long "prune"
+    <> metavar "PACKAGES"
+    <> help "Prune specified package(s). PACKAGES is a comma-separated list of \
+            \package names."
+    ))
+  reachPkgs = optional (strOption
+    (  long "reach"
+    <> metavar "PACKAGES"
+    <> help "Prune packages that cannot reach any of the specified package(s) \
+            \in the dependency graph. PACKAGES is a comma-separated list of \
+            \package names."
+    ))
 
-listDepsJsonParser :: Parser ListDepsFormat
-listDepsJsonParser = pure ListDepsJSON
+  targetsParser :: Parser [Text]
+  targetsParser =
+    many (textArgument
+      (  metavar "TARGET"
+      <> completer targetCompleter
+      <> help "Can be specified multiple times. If none specified, use all \
+              \project packages. Ignores project package components and \
+              \non-project packages."
+      ))
 
-toListDepsOptsParser :: Parser ListDepsFormat -> Parser ListDepsOpts
-toListDepsOptsParser formatParser = ListDepsOpts
-      <$> formatParser
-      <*> dotOptsParser True
+  testTargets = switch
+    (  long "test"
+    <> help "Consider dependencies of test components."
+    )
+  benchTargets = switch
+    (  long "bench"
+    <> help "Consider dependencies of benchmark components."
+    )
 
-formatSubCommand :: String -> String -> Parser ListDepsFormat -> Mod CommandFields ListDepsOpts
-formatSubCommand cmd desc formatParser =
-  command cmd (info (toListDepsOptsParser formatParser)
-               (progDesc desc))
+  splitNames :: String -> [PackageName]
+  splitNames = map
+      ( mkPackageName
+      . takeWhile (not . isSpace)
+      . dropWhile isSpace
+      )
+    . splitOn ","
 
--- | Parser for arguments to `stack ls dependencies`.
-listDepsOptsParser :: Parser ListDepsOpts
-listDepsOptsParser = subparser
-                     (  formatSubCommand "text" "Print dependencies as text (default)" listDepsTextParser
-                     <> formatSubCommand "tree" "Print dependencies as tree" listDepsTreeParser
-                     <> formatSubCommand "json" "Print dependencies as JSON" listDepsJsonParser
-                     ) <|> toListDepsOptsParser listDepsTextParser
+  globalHints = switch
+    (  long "global-hints"
+    <> help "Do not require an installed GHC; instead, use a hints file for \
+            \global packages."
+    )
diff --git a/src/Stack/Options/EvalParser.hs b/src/Stack/Options/EvalParser.hs
new file mode 100644
index 0000000000..79e7278953
--- /dev/null
+++ b/src/Stack/Options/EvalParser.hs
@@ -0,0 +1,28 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Options.EvalParser
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @eval@ command.
+-}
+
+module Stack.Options.EvalParser
+  ( evalOptsParser
+  ) where
+
+import           Options.Applicative ( Parser, metavar, strArgument )
+import           Stack.Eval ( EvalOpts (..) )
+import           Stack.Options.ExecParser ( execOptsExtraParser )
+import           Stack.Prelude
+
+-- | Parse command line arguments for Stack's @eval@ command.
+evalOptsParser ::
+     String -- ^ metavar
+  -> Parser EvalOpts
+evalOptsParser meta = EvalOpts
+  <$> eoArgsParser
+  <*> execOptsExtraParser
+ where
+  eoArgsParser :: Parser String
+  eoArgsParser = strArgument (metavar meta)
diff --git a/src/Stack/Options/ExecParser.hs b/src/Stack/Options/ExecParser.hs
index 789dc8bfa5..1ad5d8eb3a 100644
--- a/src/Stack/Options/ExecParser.hs
+++ b/src/Stack/Options/ExecParser.hs
@@ -1,80 +1,97 @@
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 
-module Stack.Options.ExecParser where
+{-|
+Module      : Stack.Options.ExecParser
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @exec@, @ghc@, @run@,
+@runghc@ and @runhaskell@ commands.
+-}
+
+module Stack.Options.ExecParser
+  ( execOptsParser
+  , execOptsExtraParser
+  ) where
 
 import           Options.Applicative
-import           Options.Applicative.Builder.Extra
-import           Options.Applicative.Args
-import           Stack.Options.Completion
+                   ( Parser, completer, help, idm, long, metavar, strArgument
+                   , strOption
+                   )
+import           Options.Applicative.Builder.Extra ( boolFlags, dirCompleter )
+import           Options.Applicative.Args ( argsOption )
+import           Stack.Exec
+                   ( ExecOpts (..), ExecOptsExtra (..), SpecialExecCmd (..) )
+import           Stack.Options.Completion ( projectExeCompleter )
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.EnvSettings
+                   ( EnvSettings (..), defaultEnvSettings )
 
--- | Parser for exec command
+-- | Parse command line arguments for Stack's @exec@, @ghc@, @run@,
+-- @runghc@ and @runhaskell@ commands.
 execOptsParser :: Maybe SpecialExecCmd -> Parser ExecOpts
-execOptsParser mcmd =
-    ExecOpts
-        <$> maybe eoCmdParser pure mcmd
-        <*> eoArgsParser
-        <*> execOptsExtraParser
-  where
-    eoCmdParser = ExecCmd <$> strArgument (metavar "COMMAND" <> completer projectExeCompleter)
-    eoArgsParser = many (strArgument (metavar txt))
-      where
-        txt = case mcmd of
-            Nothing -> normalTxt
-            Just ExecCmd{} -> normalTxt
-            Just ExecRun -> "-- ARGUMENT(S) (e.g. stack run -- file.txt)"
-            Just ExecGhc -> "-- ARGUMENT(S) (e.g. stack runghc -- X.hs -o x)"
-            Just ExecRunGhc -> "-- ARGUMENT(S) (e.g. stack runghc -- X.hs)"
-        normalTxt = "-- ARGUMENT(S) (e.g. stack exec ghc-pkg -- describe base)"
-
-evalOptsParser :: String -- ^ metavar
-               -> Parser EvalOpts
-evalOptsParser meta =
-    EvalOpts
-        <$> eoArgsParser
-        <*> execOptsExtraParser
-  where
-    eoArgsParser :: Parser String
-    eoArgsParser = strArgument (metavar meta)
+execOptsParser mcmd = ExecOpts
+  <$> maybe eoCmdParser pure mcmd
+  <*> eoArgsParser
+  <*> execOptsExtraParser
+ where
+  eoCmdParser = ExecCmd
+    <$> strArgument
+          (  metavar "COMMAND"
+          <> completer projectExeCompleter
+          )
+  eoArgsParser = many (strArgument (metavar txt))
+   where
+    txt = case mcmd of
+      Nothing -> normalTxt
+      Just ExecCmd{} -> normalTxt
+      Just ExecRun -> "-- ARGUMENT(S) (e.g. stack run -- file.txt)"
+      Just ExecGhc -> "-- ARGUMENT(S) (e.g. stack ghc -- X.hs -o x)"
+      Just ExecRunGhc -> "-- ARGUMENT(S) (e.g. stack runghc -- X.hs)"
+    normalTxt = "-- ARGUMENT(S) (e.g. stack exec ghc-pkg -- describe base)"
 
 -- | Parser for extra options to exec command
 execOptsExtraParser :: Parser ExecOptsExtra
 execOptsExtraParser = ExecOptsExtra
-                         <$> eoEnvSettingsParser
-                         <*> eoPackagesParser
-                         <*> eoRtsOptionsParser
-                         <*> eoCwdParser
-  where
-    eoEnvSettingsParser :: Parser EnvSettings
-    eoEnvSettingsParser = EnvSettings True
-        <$> boolFlags True
-                "ghc-package-path"
-                "setting the GHC_PACKAGE_PATH variable for the subprocess"
-                idm
-        <*> boolFlags True
-                "stack-exe"
-                "setting the STACK_EXE environment variable to the path for the stack executable"
-                idm
-        <*> pure False
-        <*> pure True
+  <$> eoEnvSettingsParser
+  <*> eoPackagesParser
+  <*> eoRtsOptionsParser
+  <*> eoCwdParser
+ where
+  eoEnvSettingsParser :: Parser EnvSettings
+  eoEnvSettingsParser = EnvSettings defaultEnvSettings.includeLocals
+    <$> boolFlags defaultEnvSettings.includeGhcPackagePath
+          "ghc-package-path"
+          "setting the GHC_PACKAGE_PATH variable for the subprocess."
+          idm
+    <*> boolFlags defaultEnvSettings.stackExe
+          "stack-exe"
+          "setting the STACK_EXE environment variable to the path for the \
+          \stack executable."
+          idm
+    <*> pure defaultEnvSettings.localeUtf8
+    <*> pure defaultEnvSettings.keepGhcRts
 
-    eoPackagesParser :: Parser [String]
-    eoPackagesParser = many
-                       (strOption (long "package"
-                                  <> metavar "PACKAGE"
-                                  <> help "Add a package (can be specified multiple times)"))
+  eoPackagesParser :: Parser [String]
+  eoPackagesParser = many (strOption
+    (  long "package"
+    <> metavar "PACKAGE(S)"
+    <> help "Add package(s) as a list of names or identifiers separated by \
+            \spaces (can be specified multiple times)."
+    ))
 
-    eoRtsOptionsParser :: Parser [String]
-    eoRtsOptionsParser = concat <$> many (argsOption
-        ( long "rts-options"
-        <> help "Explicit RTS options to pass to application"
-        <> metavar "RTSFLAG"))
+  eoRtsOptionsParser :: Parser [String]
+  eoRtsOptionsParser = concat <$> many (argsOption
+    ( long "rts-options"
+    <> help "Explicit RTS options to pass to application (can be specified \
+            \multiple times)."
+    <> metavar "RTSFLAG"
+    ))
 
-    eoCwdParser :: Parser (Maybe FilePath)
-    eoCwdParser = optional
-                  (strOption (long "cwd"
-                             <> help "Sets the working directory before executing"
-                             <> metavar "DIR"
-                             <> completer dirCompleter)
-                  )
+  eoCwdParser :: Parser (Maybe FilePath)
+  eoCwdParser = optional (strOption
+    (  long "cwd"
+    <> help "Sets the working directory before executing."
+    <> metavar "DIR"
+    <> completer dirCompleter
+    ))
diff --git a/src/Stack/Options/FlagsParser.hs b/src/Stack/Options/FlagsParser.hs
new file mode 100644
index 0000000000..2a85b06045
--- /dev/null
+++ b/src/Stack/Options/FlagsParser.hs
@@ -0,0 +1,37 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Options.FlagsParser
+Description : Parser for one or more Cabal flags.
+License     : BSD-3-Clause
+
+Parser for one or more Cabal flags.
+-}
+
+module Stack.Options.FlagsParser
+  ( flagsParser
+  ) where
+
+import qualified Data.Map as Map
+import           Options.Applicative
+                   ( Parser, completer, help, long, metavar, option )
+import           Stack.Options.Completion ( flagCompleter )
+import           Stack.Options.PackageParser ( readFlag )
+import           Stack.Prelude
+import           Stack.Types.BuildOptsCLI ( ApplyCLIFlag )
+
+-- | Parser for one or more @--flag@ options, each for a Cabal flag.
+flagsParser :: Parser (Map.Map ApplyCLIFlag (Map.Map FlagName Bool))
+flagsParser = Map.unionsWith Map.union
+  <$> many (option readFlag
+       (  long "flag"
+       <> completer flagCompleter
+       <> metavar "PACKAGE:[-]FLAG"
+       <> help "Set (or unset) the Cabal flag for the package (or use '*' for \
+               \all packages) (can be specified multiple times). Applies to \
+               \project packages, packages included directly in the snapshot, \
+               \and extra-deps. Takes precedence over any Cabal flags \
+               \specified for the package in the snapshot or in the \
+               \project-level configuration file (stack.yaml)."
+       ))
diff --git a/src/Stack/Options/GhcBuildParser.hs b/src/Stack/Options/GhcBuildParser.hs
index ebb88f36b7..2ee0094ed8 100644
--- a/src/Stack/Options/GhcBuildParser.hs
+++ b/src/Stack/Options/GhcBuildParser.hs
@@ -1,34 +1,44 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.GhcBuildParser where
+{-|
+Module      : Stack.Options.GhcBuildParser
+License     : BSD-3-Clause
+-}
+
+module Stack.Options.GhcBuildParser
+( ghcBuildParser
+) where
 
 import           Options.Applicative
-import           Options.Applicative.Types
-import           Stack.Options.Utils
+                   ( Parser, completeWith, help, long, metavar, option )
+import           Options.Applicative.Types ( readerAsk, readerError )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
-import           Stack.Types.CompilerBuild
+import           Stack.Types.CompilerBuild ( CompilerBuild, parseCompilerBuild )
 
 -- | GHC build parser
 ghcBuildParser :: Bool -> Parser CompilerBuild
-ghcBuildParser hide =
-    option
-        readGHCBuild
-        (long "ghc-build" <> metavar "BUILD" <>
-         completeWith [ "standard"
-                      , "gmp4"
-                      , "nopie"
-                      , "tinfo6"
-                      , "tinfo6-nopie"
-                      , "ncurses6"
-                      , "int-native"
-                      , "integersimple"] <>
-         help
-             "Specialized GHC build, e.g. 'gmp4' or 'standard' (usually auto-detected)" <>
-         hideMods hide
-        )
-  where
-    readGHCBuild = do
-        s <- readerAsk
-        case parseCompilerBuild s of
-            Left e -> readerError (show e)
-            Right v -> pure v
+ghcBuildParser hide = option readGHCBuild
+  (  long "ghc-build"
+  <> metavar "BUILD"
+  <> completeWith
+       [ "standard"
+       , "gmp4"
+       , "nopie"
+       , "tinfo6"
+       , "tinfo6-libc6-pre232"
+       , "tinfo6-nopie"
+       , "ncurses6"
+       , "int-native"
+       , "integersimple"
+       ]
+  <> help "Specialized GHC build, e.g. 'gmp4' or 'standard' (usually \
+          \auto-detected)."
+  <> hideMods hide
+  )
+ where
+  readGHCBuild = do
+    s <- readerAsk
+    case parseCompilerBuild s of
+      Left e -> readerError (displayException e)
+      Right v -> pure v
diff --git a/src/Stack/Options/GhcVariantParser.hs b/src/Stack/Options/GhcVariantParser.hs
index 8a38c75005..bd6729d5ee 100644
--- a/src/Stack/Options/GhcVariantParser.hs
+++ b/src/Stack/Options/GhcVariantParser.hs
@@ -1,25 +1,33 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.GhcVariantParser where
+{-|
+Module      : Stack.Options.GhcVariantParser
+License     : BSD-3-Clause
+-}
+
+module Stack.Options.GhcVariantParser
+  ( ghcVariantParser
+  ) where
 
 import           Options.Applicative
-import           Options.Applicative.Types         (readerAsk)
+                   ( Parser, help, long, metavar, option, readerError )
+import           Options.Applicative.Types ( readerAsk )
 import           Stack.Prelude
-import           Stack.Options.Utils
-import           Stack.Types.Config
+import           Stack.Options.Utils ( hideMods )
+import           Stack.Types.GHCVariant ( GHCVariant, parseGHCVariant )
 
 -- | GHC variant parser
 ghcVariantParser :: Bool -> Parser GHCVariant
 ghcVariantParser hide = option readGHCVariant
-   ( long "ghc-variant"
+  (  long "ghc-variant"
   <> metavar "VARIANT"
   <> help "Specialized GHC variant, e.g. int-native or integersimple \
-          \(incompatible with --system-ghc)"
+          \(incompatible with --system-ghc)."
   <> hideMods hide
-   )
+  )
  where
   readGHCVariant = do
     s <- readerAsk
     case parseGHCVariant s of
-      Left e -> readerError (show e)
+      Left e -> readerError (displayException e)
       Right v -> pure v
diff --git a/src/Stack/Options/GhciParser.hs b/src/Stack/Options/GhciParser.hs
index 952378c91a..c2e6bf0319 100644
--- a/src/Stack/Options/GhciParser.hs
+++ b/src/Stack/Options/GhciParser.hs
@@ -1,61 +1,103 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Stack.Options.GhciParser where
+{-|
+Module      : Stack.Options.GhciParser
+Description : Parse arguments for Stack's @ghci@ and @repl@ commands.
+License     : BSD-3-Clause
+
+Function to parse arguments for Stack's @ghci@ and @repl@ commands.
+-}
+
+module Stack.Options.GhciParser
+  ( ghciOptsParser
+  ) where
 
 import           Options.Applicative
-import           Options.Applicative.Args
+                   ( Parser, completer, flag, help, idm, internal, long, metavar
+                   , strOption, switch
+                   )
+import           Options.Applicative.Args ( argsOption )
 import           Options.Applicative.Builder.Extra
-import           Stack.Config                      (packagesParser)
-import           Stack.Ghci                        (GhciOpts (..))
-import           Stack.Options.BuildParser         (flagsParser)
-import           Stack.Options.Completion
+                   ( boolFlags, boolFlagsNoDefault, fileExtCompleter
+                   , textArgument, textOption
+                   )
+import           Stack.Options.Completion ( ghcOptsCompleter, targetCompleter )
+import           Stack.Options.FlagsParser ( flagsParser )
+import           Stack.Options.PackagesParser ( packagesParser )
 import           Stack.Prelude
+import           Stack.Types.GhciOpts ( GhciOpts (..) )
 
--- | Parser for GHCI options
+-- | Parse command line arguments for Stack's @ghci@ and @repl@ commands.
 ghciOptsParser :: Parser GhciOpts
 ghciOptsParser = GhciOpts
-             <$> many
-                   (textArgument
-                        (metavar "TARGET/FILE" <>
-                         completer (targetCompleter <> fileExtCompleter [".hs", ".lhs"]) <>
-                         help ("If none specified, use all local packages. " <>
-                               "See https://docs.haskellstack.org/en/stable/build_command/#target-syntax for details. " <>
-                               "If a path to a .hs or .lhs file is specified, it will be loaded.")))
-             <*> ((\x y -> x ++ concat y)
-                 <$> flag
-                     []
-                     ["-Wall", "-Werror"]
-                     (long "pedantic" <> help "Turn on -Wall and -Werror")
-                 <*> many (argsOption (long "ghci-options" <>
-                                    metavar "OPTIONS" <>
-                                    completer ghcOptsCompleter <>
-                                    help "Additional options passed to GHCi"))
-             )
-             <*> (concat <$> many
-                     (argsOption
-                          (long "ghc-options" <>
-                           metavar "OPTIONS" <>
-                           completer ghcOptsCompleter <>
-                           help "Additional options passed to both GHC and GHCi")))
-             <*> flagsParser
-             <*> optional
-                     (strOption (long "with-ghc" <>
-                                 metavar "GHC" <>
-                                 help "Use this GHC to run GHCi"))
-             <*> (not <$> boolFlags True "load" "load modules on start-up" idm)
-             <*> packagesParser
-             <*> optional
-                     (textOption
-                           (long "main-is" <>
-                            metavar "TARGET" <>
-                            completer targetCompleter <>
-                            help "Specify which target should contain the main \
-                                 \module to load, such as for an executable for \
-                                 \test suite or benchmark."))
-             <*> switch (long "load-local-deps" <> help "Load all local dependencies of your targets")
-             -- TODO: deprecate this? probably useless.
-             <*> switch (long "skip-intermediate-deps" <> help "Skip loading intermediate target dependencies" <> internal)
-             <*> optional (boolFlagsNoDefault "package-hiding" "package hiding" idm)
-             <*> switch (long "no-build" <> help "Don't build before launching GHCi" <> internal)
-             <*> switch (long "only-main" <> help "Only load and import the main module.  If no main module, no modules will be loaded.")
+  <$> many (textArgument
+        (  metavar "TARGET/FILE"
+        <> completer (targetCompleter <> fileExtCompleter [".hs", ".lhs"])
+        <> help "If none specified, use all project packages. See \
+                \https://docs.haskellstack.org/en/stable/commands/build_command/#target-syntax \
+                \for details. If a path to a .hs or .lhs file is specified, it \
+                \will be loaded."
+        ))
+  <*> (     (\x y -> x ++ concat y)
+        <$> flag
+              []
+              ["-Wall", "-Werror"]
+              (  long "pedantic"
+              <> help "Turn on -Wall and -Werror."
+              )
+        <*> many (argsOption
+              (  long "ghci-options"
+              <> metavar "OPTIONS"
+              <> completer ghcOptsCompleter
+              <> help "Additional options passed to GHCi (can be specified \
+                      \multiple times)."
+              ))
+      )
+  <*> (     concat
+        <$> many (argsOption
+              (  long "ghc-options"
+              <> metavar "OPTIONS"
+              <> completer ghcOptsCompleter
+              <> help "Additional options passed to both GHC and GHCi (can be \
+                      \specified multiple times)."
+              ))
+      )
+  <*> flagsParser
+  <*> optional (strOption
+        (  long "with-ghc"
+        <> metavar "GHC"
+        <> help "Use this GHC to run GHCi."
+        ))
+  <*> (     not
+        <$> boolFlags True
+              "load"
+              "load modules on start-up."
+              idm
+      )
+  <*> packagesParser
+  <*> optional (textOption
+        (  long "main-is"
+        <> metavar "TARGET"
+        <> completer targetCompleter
+        <> help "Specify which target should contain the main module to load, \
+                \such as for an executable for test suite or benchmark."
+        ))
+  <*> switch
+        (  long "load-local-deps"
+        <> help "Load all local dependencies of your targets."
+        )
+  <*> optional (boolFlagsNoDefault
+        "package-hiding"
+        "package hiding"
+        idm)
+  <*> switch
+        (  long "no-build"
+        <> help "Don't build before launching GHCi."
+        <> internal
+        )
+  <*> switch
+        (  long "only-main"
+        <> help "Only load and import the main module. If no main module, no \
+                \modules will be loaded."
+        )
diff --git a/src/Stack/Options/GlobalParser.hs b/src/Stack/Options/GlobalParser.hs
index fb7817bc1e..9cc6201e8e 100644
--- a/src/Stack/Options/GlobalParser.hs
+++ b/src/Stack/Options/GlobalParser.hs
@@ -1,131 +1,176 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 
-module Stack.Options.GlobalParser where
+{-|
+Module      : Stack.Options.GlobalParser
+Description : Functions to parse Stack's \'global\' command line arguments.
+License     : BSD-3-Clause
+
+Functions to parse Stack's \'global\' command line arguments.
+-}
+
+module Stack.Options.GlobalParser
+  ( globalOptsFromMonoid
+  , globalOptsParser
+  ) where
 
 import           Options.Applicative
+                   ( Mod, Parser, ReadM, auto, completer, help, hidden, internal
+                   , long, metavar, option, short, strOption, value
+                   )
 import           Options.Applicative.Builder.Extra
-import           Path.IO (getCurrentDir, resolveDir', resolveFile')
-import qualified Stack.Docker                      as Docker
-import           Stack.Init
+                   ( fileExtCompleter, firstBoolFlagsFalse
+                   , firstBoolFlagsNoDefault, firstBoolFlagsTrue, optionalFirst
+                   )
+import           Options.Applicative.Types ( readerAsk )
+import           Path.IO ( getCurrentDir, resolveDir', resolveFile' )
+import qualified Stack.Docker as Docker
 import           Stack.Prelude
-import           Stack.Options.ConfigParser
-import           Stack.Options.LogLevelParser
-import           Stack.Options.ResolverParser
-import           Stack.Options.Utils
-import           Stack.Types.Config
-import           Stack.Types.Docker
+import           Stack.Options.ConfigParser ( configOptsParser )
+import           Stack.Options.LogLevelParser ( logLevelOptsParser )
+import           Stack.Options.SnapshotParser
+                   ( abstractSnapshotOptsParser, compilerOptsParser )
+import           Stack.Options.Utils ( GlobalOptsContext (..), hideMods )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.GlobalOptsMonoid ( GlobalOptsMonoid (..) )
+import           Stack.Types.LockFileBehavior
+                   ( LockFileBehavior (..), readLockFileBehavior )
+import           Stack.Types.StackYamlLoc ( StackYamlLoc (..) )
+import           Stack.Types.Docker ( dockerEntrypointArgName )
 
 -- | Parser for global command-line options.
-globalOptsParser :: FilePath -> GlobalOptsContext -> Maybe LogLevel -> Parser GlobalOptsMonoid
-globalOptsParser currentDir kind defLogLevel =
-    GlobalOptsMonoid <$>
-    optionalFirst (strOption (long Docker.reExecArgName <> hidden <> internal)) <*>
-    optionalFirst (option auto (long dockerEntrypointArgName <> hidden <> internal)) <*>
-    (First <$> logLevelOptsParser hide0 defLogLevel) <*>
-    firstBoolFlagsTrue
+globalOptsParser ::
+     FilePath
+  -> GlobalOptsContext
+  -> Parser GlobalOptsMonoid
+globalOptsParser currentDir kind = GlobalOptsMonoid
+  <$> optionalFirst (strOption
+        (  long Docker.reExecArgName
+        <> hidden
+        <> internal
+        ))
+  <*> optionalFirst (option auto
+        (  long dockerEntrypointArgName
+        <> hidden
+        <> internal
+        ))
+  <*> (First <$> logLevelOptsParser hide0)
+  <*> firstBoolFlagsTrue
         "time-in-log"
-        "inclusion of timings in logs, for the purposes of using diff with logs"
-        hide <*>
-    firstBoolFlagsFalse
+        "inclusion of timings in logs, for the purposes of using diff with \
+        \logs."
+        hide
+  <*> firstBoolFlagsFalse
         "rsl-in-log"
-        "inclusion of raw snapshot layer (rsl) in logs"
-        hide <*>
-    configOptsParser currentDir kind <*>
-    optionalFirst (abstractResolverOptsParser hide0) <*>
-    pure (First Nothing) <*> -- resolver root is only set via the script command
-    optionalFirst (compilerOptsParser hide0) <*>
-    firstBoolFlagsNoDefault
+        "inclusion of raw snapshot layer (rsl) in logs."
+        hide
+  <*> firstBoolFlagsFalse
+        "plan-in-log"
+        "inclusion of information about build plan construction in logs."
+        hide
+  <*> configOptsParser currentDir kind
+  <*> optionalFirst (abstractSnapshotOptsParser hide0)
+  <*> pure (First Nothing)
+  <*> optionalFirst (compilerOptsParser hide0)
+      -- snapshot root is only set via the script command
+  <*> firstBoolFlagsNoDefault
         "terminal"
-        "overriding terminal detection in the case of running in a false terminal"
-        hide <*>
-    option readStyles
-         (long "stack-colors" <>
-          long "stack-colours" <>
-          metavar "STYLES" <>
-          value mempty <>
-          help "Specify Stack's output styles; STYLES is a colon-delimited \
-               \sequence of key=value, where 'key' is a style name and 'value' \
-               \is a semicolon-delimited list of 'ANSI' SGR (Select Graphic \
-               \Rendition) control codes (in decimal). Use 'stack ls \
-               \stack-colors --basic' to see the current sequence. In shells \
-               \where a semicolon is a command separator, enclose STYLES in \
-               \quotes." <>
-          hide) <*>
-    optionalFirst (option auto
-        (long "terminal-width" <>
-         metavar "INT" <>
-         help "Specify the width of the terminal, used for pretty-print messages" <>
-         hide)) <*>
-    optionalFirst
-        (strOption
-            (long "stack-yaml" <>
-             metavar "STACK-YAML" <>
-             completer (fileExtCompleter [".yaml"]) <>
-             help ("Override project stack.yaml file " <>
-                   "(overrides any STACK_YAML environment variable)") <>
-             hide)) <*>
-    optionalFirst (option readLockFileBehavior
-        (long "lock-file" <>
-         help "Specify how to interact with lock files. Default: read/write. If resolver is overridden: read-only" <>
-         hide))
-  where
-    hide = hideMods hide0
-    hide0 = kind /= OuterGlobalOpts
+        "overriding terminal detection in the case of running in a false \
+        \terminal."
+        hide
+  <*> option readStyles
+        (  long "stack-colors"
+        <> long "stack-colours"
+        <> metavar "STYLES"
+        <> value mempty
+        <> help "Specify Stack's output styles; STYLES is a colon-delimited \
+                \sequence of key=value, where 'key' is a style name and 'value' \
+                \is a semicolon-delimited list of 'ANSI' SGR (Select Graphic \
+                \Rendition) control codes (in decimal). Use 'stack ls \
+                \stack-colors --basic' to see the current sequence. In shells \
+                \where a semicolon is a command separator, enclose STYLES in \
+                \quotes."
+        <> hide
+        )
+  <*> optionalFirst (option auto
+        (  long "terminal-width"
+        <> metavar "INT"
+        <> help "Specify the width of the terminal, used for pretty-print \
+                \messages."
+        <> hide
+        ))
+  <*> optionalFirst (strOption
+        (  long "stack-yaml"
+        <> short 'w'
+        <> metavar "STACK-YAML"
+        <> completer (fileExtCompleter [".yaml"])
+        <> help "Override project stack.yaml file (overrides any STACK_YAML \
+                \environment variable)."
+        <> hide
+        ))
+  <*> optionalFirst (option readLockFileBehavior
+        (  long "lock-file"
+        <> help "Specify how to interact with lock files. (default: if \
+                \snapshot is overridden: read-only; otherwise: read/write)"
+        <> hide
+        ))
+ where
+  hide :: Mod f a
+  hide = hideMods hide0
+  hide0 = kind /= OuterGlobalOpts
 
 -- | Create GlobalOpts from GlobalOptsMonoid.
-globalOptsFromMonoid :: MonadIO m => Bool -> GlobalOptsMonoid -> m GlobalOpts
-globalOptsFromMonoid defaultTerminal GlobalOptsMonoid{..} = do
-  resolver <- for (getFirst globalMonoidResolver) $ \ur -> do
+globalOptsFromMonoid ::
+     MonadIO m
+  => String
+     -- ^ The name of the current Stack executable, as it was invoked.
+  -> Maybe (Path Abs File)
+     -- ^ The path to the current Stack executable, if the operating system
+     -- provides a reliable way to determine it and where a result was
+     -- available.
+  -> Bool
+  -> GlobalOptsMonoid
+  -> m GlobalOpts
+globalOptsFromMonoid progName mExecutablePath defaultTerminal globalMonoid = do
+  snapshot <- for (getFirst globalMonoid.snapshot) $ \us -> do
     root <-
-      case globalMonoidResolverRoot of
+      case globalMonoid.snapshotRoot of
         First Nothing -> getCurrentDir
         First (Just dir) -> resolveDir' dir
-    resolvePaths (Just root) ur
+    resolvePaths (Just root) us
   stackYaml <-
-    case getFirst globalMonoidStackYaml of
+    case getFirst globalMonoid.stackYaml of
       Nothing -> pure SYLDefault
       Just fp -> SYLOverride <$> resolveFile' fp
-  pure GlobalOpts
-    { globalReExecVersion = getFirst globalMonoidReExecVersion
-    , globalDockerEntrypoint = getFirst globalMonoidDockerEntrypoint
-    , globalLogLevel = fromFirst defaultLogLevel globalMonoidLogLevel
-    , globalTimeInLog = fromFirstTrue globalMonoidTimeInLog
-    , globalRSLInLog = fromFirstFalse globalMonoidRSLInLog
-    , globalConfigMonoid = globalMonoidConfigMonoid
-    , globalResolver = resolver
-    , globalCompiler = getFirst globalMonoidCompiler
-    , globalTerminal = fromFirst defaultTerminal globalMonoidTerminal
-    , globalStylesUpdate = globalMonoidStyles
-    , globalTermWidth = getFirst globalMonoidTermWidth
-    , globalStackYaml = stackYaml
-    , globalLockFileBehavior =
+  let lockFileBehavior =
         let defLFB =
-              case getFirst globalMonoidResolver of
+              case getFirst globalMonoid.snapshot of
                 Nothing -> LFBReadWrite
                 _ -> LFBReadOnly
-         in fromFirst defLFB globalMonoidLockFileBehavior
+        in  fromFirst defLFB globalMonoid.lockFileBehavior
+  pure GlobalOpts
+    { reExecVersion = getFirst globalMonoid.reExecVersion
+    , dockerEntrypoint = getFirst globalMonoid.dockerEntrypoint
+    , logLevel = fromFirst defaultLogLevel globalMonoid.logLevel
+    , timeInLog = fromFirstTrue globalMonoid.timeInLog
+    , rslInLog = fromFirstFalse globalMonoid.rslInLog
+    , planInLog = fromFirstFalse globalMonoid.planInLog
+    , configMonoid = globalMonoid.configMonoid
+    , snapshot
+    , compiler = getFirst globalMonoid.compiler
+    , terminal = fromFirst defaultTerminal globalMonoid.terminal
+    , stylesUpdate = globalMonoid.styles
+    , termWidthOpt = getFirst globalMonoid.termWidthOpt
+    , stackYaml
+    , lockFileBehavior
+    , progName
+    , mExecutablePath
     }
 
-initOptsParser :: Parser InitOpts
-initOptsParser =
-    InitOpts <$> searchDirs
-             <*> omitPackages
-             <*> overwrite <*> fmap not ignoreSubDirs
-  where
-    searchDirs =
-      many (textArgument
-              (metavar "DIR(S)" <>
-               completer dirCompleter <>
-               help "Directory, or directories, to include in the search for \
-                    \.cabal files, when initialising. The default is the \
-                    \current directory."))
-    ignoreSubDirs = switch (long "ignore-subdirs" <>
-                           help "Do not search for .cabal files in \
-                                \subdirectories, when initialising.")
-    overwrite = switch (long "force" <>
-                       help "Force an initialisation that overwrites any \
-                            \existing stack.yaml file.")
-    omitPackages = switch (long "omit-packages" <>
-                           help "Exclude conflicting or incompatible user \
-                                \packages, when initialising.")
+-- | Default logging level should be something useful but not crazy.
+defaultLogLevel :: LogLevel
+defaultLogLevel = LevelInfo
+
+readStyles :: ReadM StylesUpdate
+readStyles = parseStylesUpdateFromString <$> readerAsk
diff --git a/src/Stack/Options/HaddockParser.hs b/src/Stack/Options/HaddockParser.hs
index 603101563a..28a508d13f 100644
--- a/src/Stack/Options/HaddockParser.hs
+++ b/src/Stack/Options/HaddockParser.hs
@@ -1,21 +1,31 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.HaddockParser where
+{-|
+Module      : Stack.Options.HaddockParser
+License     : BSD-3-Clause
+-}
 
-import           Options.Applicative
-import           Options.Applicative.Args
-import           Stack.Options.Utils
+module Stack.Options.HaddockParser
+  ( haddockOptsParser
+  ) where
+
+import           Options.Applicative ( Parser, help, long, metavar )
+import           Options.Applicative.Args ( argsOption )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.BuildOptsMonoid ( HaddockOptsMonoid (..) )
 
 -- | Parser for haddock arguments.
 haddockOptsParser :: Bool -> Parser HaddockOptsMonoid
-haddockOptsParser hide0 =
-  HaddockOptsMonoid <$> fmap (fromMaybe [])
-                             (optional
-                              (argsOption
-                               (long "haddock-arguments" <>
-                                metavar "HADDOCK_ARGS" <>
-                                help "Arguments passed to the haddock program" <>
-                                hide)))
-  where hide = hideMods hide0
+haddockOptsParser hide0 = HaddockOptsMonoid
+  <$> fmap
+        (fromMaybe [])
+        ( optional (argsOption
+            (  long "haddock-arguments"
+            <> metavar "HADDOCK_ARGS"
+            <> help "Arguments passed to the Haddock program."
+            <> hide
+            ))
+        )
+ where
+  hide = hideMods hide0
diff --git a/src/Stack/Options/HpcReportParser.hs b/src/Stack/Options/HpcReportParser.hs
index 224ff71fc2..efae794dc4 100644
--- a/src/Stack/Options/HpcReportParser.hs
+++ b/src/Stack/Options/HpcReportParser.hs
@@ -1,42 +1,44 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.HpcReportParser where
+{-|
+Module      : Stack.Options.HpcReportParser
+Description : Parser for @stack hpc report@.
+License     : BSD-3-Clause
+
+Parser for @stack hpc report@.
+-}
+
+module Stack.Options.HpcReportParser
+  ( hpcReportOptsParser
+  ) where
 
-import qualified Data.Text                         as T
 import           Options.Applicative
+                   ( Parser, completer, help, long, metavar, strOption, switch )
 import           Options.Applicative.Builder.Extra
-import           Options.Applicative.Types         (readerAsk)
-import           Stack.Coverage                    (HpcReportOpts (..))
-import           Stack.Options.Completion          (targetCompleter)
+                   ( dirCompleter, fileExtCompleter, textArgument )
+import           Stack.Options.Completion ( targetCompleter )
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.HpcReportOpts ( HpcReportOpts (..) )
 
 -- | Parser for @stack hpc report@.
 hpcReportOptsParser :: Parser HpcReportOpts
 hpcReportOptsParser = HpcReportOpts
-    <$> many (textArgument $ metavar "TARGET_OR_TIX" <>
-                             completer (targetCompleter <> fileExtCompleter [".tix"]))
-    <*> switch (long "all" <> help "Use results from all packages and components involved in previous --coverage run")
-    <*> optional (strOption (long "destdir" <>
-                             metavar "DIR" <>
-                             completer dirCompleter <>
-                             help "Output directory for HTML report"))
-    <*> switch (long "open" <> help "Open the report in the browser")
-
-pvpBoundsOption :: Parser PvpBounds
-pvpBoundsOption =
-    option
-        readPvpBounds
-        (long "pvp-bounds" <>
-         metavar "PVP-BOUNDS" <>
-         completeWith ["none", "lower", "upper", "both"] <>
-         help
-             "How PVP version bounds should be added to Cabal file: none, lower, upper, both")
-  where
-    readPvpBounds = do
-        s <- readerAsk
-        case parsePvpBounds $ T.pack s of
-            Left e ->
-                readerError e
-            Right v ->
-                pure v
+  <$> many (textArgument
+        (  metavar "TARGET_OR_TIX"
+        <> completer (targetCompleter <> fileExtCompleter [".tix"])
+        ))
+  <*> switch
+        (  long "all"
+        <> help "Use results from all packages and components involved in \
+                \previous --coverage run."
+        )
+  <*> optional (strOption
+        (  long "destdir"
+        <> metavar "DIR"
+        <> completer dirCompleter
+        <> help "Output directory for HTML report."
+        ))
+  <*> switch
+        (  long "open"
+        <> help "Open the report in the browser."
+        )
diff --git a/src/Stack/Options/IdeParser.hs b/src/Stack/Options/IdeParser.hs
new file mode 100644
index 0000000000..6aa00b8d46
--- /dev/null
+++ b/src/Stack/Options/IdeParser.hs
@@ -0,0 +1,64 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Options.IdeParser
+Description : Parse arguments for Stack's @ide@ commands.
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @ide@ commands.
+-}
+
+module Stack.Options.IdeParser
+  ( idePackagesParser
+  , ideTargetsParser
+  ) where
+
+import           Options.Applicative ( Parser, flag, help, long, switch )
+import           Stack.Prelude
+import           Stack.Types.IdeOpts ( ListPackagesCmd (..), OutputStream (..) )
+
+-- | Parse command line arguments for Stack's @ide packages@ command.
+idePackagesParser :: Parser (OutputStream, ListPackagesCmd)
+idePackagesParser = (,) <$> outputFlag <*> cabalFileFlag
+
+-- | Parse command line arguments for Stack's @ide targets@ command.
+ideTargetsParser :: Parser ((Bool, Bool, Bool), OutputStream)
+ideTargetsParser =
+  (,) <$> ((,,) <$> exeFlag <*> testFlag <*> benchFlag) <*> outputFlag
+
+outputFlag :: Parser OutputStream
+outputFlag = flag
+  OutputLogInfo
+  OutputStdout
+  (  long "stdout"
+  <> help "Send output to the standard output stream instead of the \
+          \default, the standard error stream."
+  )
+
+cabalFileFlag :: Parser ListPackagesCmd
+cabalFileFlag = flag
+  ListPackageNames
+  ListPackageCabalFiles
+  (  long "cabal-files"
+  <> help "Print paths to package Cabal files instead of package \
+          \names."
+  )
+
+exeFlag :: Parser Bool
+exeFlag = switch
+  (  long "exes"
+  <> help "Include executables."
+  )
+
+testFlag :: Parser Bool
+testFlag = switch
+  (  long "tests"
+  <> help "Include test suites."
+  )
+
+benchFlag :: Parser Bool
+benchFlag = switch
+  (  long "benchmarks"
+  <> help "Include benchmarks."
+  )
diff --git a/src/Stack/Options/InitParser.hs b/src/Stack/Options/InitParser.hs
new file mode 100644
index 0000000000..976e828189
--- /dev/null
+++ b/src/Stack/Options/InitParser.hs
@@ -0,0 +1,50 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Options.InitParser
+Description : Parse arguments for Stack's @init@ and @new@ commands.
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @init@ and @new@ commands.
+-}
+
+module Stack.Options.InitParser
+  ( initOptsParser
+  ) where
+
+import           Options.Applicative
+                   ( Parser, completer, help, long, metavar, switch )
+import           Options.Applicative.Builder.Extra
+                   ( dirCompleter, textArgument )
+import           Stack.Init ( InitOpts (..) )
+import           Stack.Prelude
+
+-- | Parse command line arguments for Stack's @init@ and @new@ commands.
+initOptsParser :: Parser InitOpts
+initOptsParser = InitOpts
+  <$> searchDirs
+  <*> omitPackages
+  <*> overwrite
+  <*> fmap not ignoreSubDirs
+ where
+  searchDirs = many (textArgument
+    (  metavar "DIR(S)"
+    <> completer dirCompleter
+    <> help "Directory, or directories, to include in the search for Cabal \
+            \files, when initialising. The default is the current directory."
+    ))
+  ignoreSubDirs = switch
+    (  long "ignore-subdirs"
+    <> help "Do not search for Cabal files in subdirectories, when \
+            \initialising."
+    )
+  overwrite = switch
+    (  long "force"
+    <> help "Force an initialisation that overwrites any existing stack.yaml \
+            \file."
+    )
+  omitPackages = switch
+    (  long "omit-packages"
+    <> help "Exclude conflicting or incompatible user packages, when \
+            \initialising."
+    )
diff --git a/src/Stack/Options/LogLevelParser.hs b/src/Stack/Options/LogLevelParser.hs
index 65bcddc654..fabf129431 100644
--- a/src/Stack/Options/LogLevelParser.hs
+++ b/src/Stack/Options/LogLevelParser.hs
@@ -1,44 +1,64 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Stack.Options.LogLevelParser where
+{-|
+Module      : Stack.Options.LogLevelParser
+License     : BSD-3-Clause
+-}
 
-import qualified Data.Text                         as T
+module Stack.Options.LogLevelParser
+  ( logLevelOptsParser
+  ) where
+
+import qualified Data.Text as T
 import           Options.Applicative
-import           Stack.Options.Utils
+                   ( Parser, completeWith, flag', help, long, metavar, short
+                   , strOption
+                   )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
 
 -- | Parser for a logging level.
-logLevelOptsParser :: Bool -> Maybe LogLevel -> Parser (Maybe LogLevel)
-logLevelOptsParser hide defLogLevel =
-  fmap (Just . parse)
-       (strOption (long "verbosity" <>
-                   metavar "VERBOSITY" <>
-                   completeWith ["silent", "error", "warn", "info", "debug"] <>
-                   help "Verbosity: silent, error, warn, info, debug" <>
-                   hideMods hide)) <|>
-  flag' (Just verboseLevel)
-       (short 'v' <> long "verbose" <>
-        help ("Enable verbose mode: verbosity level \"" <> showLevel verboseLevel <> "\"") <>
-        hideMods hide) <|>
-  flag' (Just silentLevel)
-       (long "silent" <>
-        help ("Enable silent mode: verbosity level \"" <> showLevel silentLevel <> "\"") <>
-        hideMods hide) <|>
-  pure defLogLevel
-  where verboseLevel = LevelDebug
-        silentLevel = LevelOther "silent"
-        showLevel l =
-          case l of
-            LevelDebug -> "debug"
-            LevelInfo -> "info"
-            LevelWarn -> "warn"
-            LevelError -> "error"
-            LevelOther x -> T.unpack x
-        parse s =
-          case s of
-            "debug" -> LevelDebug
-            "info" -> LevelInfo
-            "warn" -> LevelWarn
-            "error" -> LevelError
-            _ -> LevelOther (T.pack s)
+logLevelOptsParser :: Bool -> Parser (Maybe LogLevel)
+logLevelOptsParser hide = fmap (Just . parse)
+      (strOption
+        (  long "verbosity"
+        <> metavar "VERBOSITY"
+        <> completeWith ["silent", "error", "warn", "info", "debug"]
+        <> help "Set verbosity level: silent, error, warn, info or debug."
+        <> hideMods hide
+        ))
+  <|> flag' (Just verboseLevel)
+        (  short 'v'
+        <> long "verbose"
+        <> help
+             (  "Enable verbose mode: verbosity level \""
+             <> showLevel verboseLevel
+             <> "\"."
+             )
+        <> hideMods hide
+        )
+  <|> flag' (Just silentLevel)
+        (  long "silent"
+        <> help (  "Enable silent mode: verbosity level \""
+                <> showLevel silentLevel
+                <> "\"."
+                )
+        <> hideMods hide
+        )
+  <|> pure Nothing
+ where
+  verboseLevel = LevelDebug
+  silentLevel = LevelOther "silent"
+  showLevel l = case l of
+    LevelDebug -> "debug"
+    LevelInfo -> "info"
+    LevelWarn -> "warn"
+    LevelError -> "error"
+    LevelOther x -> T.unpack x
+  parse s = case s of
+    "debug" -> LevelDebug
+    "info" -> LevelInfo
+    "warn" -> LevelWarn
+    "error" -> LevelError
+    _ -> LevelOther (T.pack s)
diff --git a/src/Stack/Options/LsParser.hs b/src/Stack/Options/LsParser.hs
new file mode 100644
index 0000000000..968a11b969
--- /dev/null
+++ b/src/Stack/Options/LsParser.hs
@@ -0,0 +1,273 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE ApplicativeDo     #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Options.LsParser
+Description : Parse arguments for Stack's @ls@ command.
+License     : BSD-3-Clause
+
+Function to parse command line arguments for Stack's @ls@ command.
+-}
+
+module Stack.Options.LsParser
+  ( lsOptsParser
+  ) where
+
+import qualified Data.Text as T
+import qualified Options.Applicative as OA
+import           Options.Applicative ( idm )
+import           Options.Applicative.Builder.Extra ( boolFlags, textOption )
+import           Stack.Constants ( globalFooter )
+import           Stack.Options.DotParser ( dotOptsParser )
+import           Stack.Prelude hiding ( sep )
+import           Stack.Types.LsOpts
+                   ( ListDepsFormat (..), ListDepsFormatOpts (..)
+                   , ListDepsOpts (..), ListDepsTextItem (..)
+                   , ListGlobalsOpts (..), ListStylesOpts (..)
+                   , ListToolsOpts (..), LsCmdOpts (..), LsCmds (..)
+                   , LsView (..), SnapshotOpts (..), ListGlobalsOpts
+                   )
+
+-- | Parse command line arguments for Stack's @ls@ command.
+lsOptsParser :: OA.Parser LsCmdOpts
+lsOptsParser = LsCmdOpts
+  <$> OA.hsubparser
+        (  lsSnapCmd
+        <> lsGlobalsCmd
+        <> lsDepsCmd
+        <> lsStylesCmd
+        <> lsToolsCmd
+        )
+
+lsSnapCmd :: OA.Mod OA.CommandFields LsCmds
+lsSnapCmd = OA.command "snapshots" $
+  OA.info lsCmdOptsParser $
+       OA.progDesc "View snapshots. (default: local)"
+    <> OA.footer localSnapshotMsg
+
+lsGlobalsCmd :: OA.Mod OA.CommandFields LsCmds
+lsGlobalsCmd = OA.command "globals" $
+  OA.info lsGlobalsOptsParser $
+       OA.progDesc "View global packages."
+    <> OA.footer globalFooter
+
+lsDepsCmd :: OA.Mod OA.CommandFields LsCmds
+lsDepsCmd = OA.command "dependencies" $
+  OA.info lsDepOptsParser $
+       OA.progDesc
+         "View the packages versions used for a project. Use a command if the \
+         \first target specified has the name of a command. Targets other than \
+         \project packages are ignored."
+    <> OA.footer globalFooter
+
+lsStylesCmd :: OA.Mod OA.CommandFields LsCmds
+lsStylesCmd =
+     OA.command
+       "stack-colors"
+       (OA.info lsStylesOptsParser
+                (OA.progDesc "View Stack's output styles."))
+  <> OA.command
+       "stack-colours"
+       (OA.info lsStylesOptsParser
+                (OA.progDesc "View Stack's output styles (alias for \
+                             \'stack-colors')."))
+
+lsToolsCmd :: OA.Mod OA.CommandFields LsCmds
+lsToolsCmd =
+  OA.command
+    "tools"
+    (OA.info lsToolsOptsParser
+             (OA.progDesc "View Stack's installed tools."))
+
+lsCmdOptsParser :: OA.Parser LsCmds
+lsCmdOptsParser = LsSnapshot <$> lsViewSnapCmd
+
+lsGlobalsOptsParser :: OA.Parser LsCmds
+lsGlobalsOptsParser = LsGlobals <$> listGlobalsOptsParser
+
+lsDepOptsParser :: OA.Parser LsCmds
+lsDepOptsParser = LsDependencies <$> listDepsOptsParser
+
+lsStylesOptsParser :: OA.Parser LsCmds
+lsStylesOptsParser = LsStyles <$> listStylesOptsParser
+
+lsToolsOptsParser :: OA.Parser LsCmds
+lsToolsOptsParser = LsTools <$> listToolsOptsParser
+
+lsViewSnapCmd :: OA.Parser SnapshotOpts
+lsViewSnapCmd = SnapshotOpts
+  <$> ( OA.hsubparser (lsViewRemoteCmd <> lsViewLocalCmd) <|> pure Local)
+  <*> OA.switch
+        (  OA.long "lts"
+        <> OA.short 'l'
+        <> OA.help "Only show LTS Haskell snapshots."
+        )
+  <*> OA.switch
+        (  OA.long "nightly"
+        <> OA.short 'n'
+        <> OA.help "Only show Nightly snapshots."
+        )
+
+lsViewRemoteCmd :: OA.Mod OA.CommandFields LsView
+lsViewRemoteCmd = OA.command "remote" $
+  OA.info (pure Remote) $
+       OA.progDesc "View remote snapshots."
+    <> OA.footer pagerMsg
+
+pagerMsg :: String
+pagerMsg =
+  "On a terminal, uses a pager, if one is available. Respects the PAGER \
+  \environment variable (subject to that, prefers pager 'less' to 'more')."
+
+lsViewLocalCmd :: OA.Mod OA.CommandFields LsView
+lsViewLocalCmd = OA.command "local" $
+  OA.info (pure Local) $
+       OA.progDesc "View local snapshots."
+    <> OA.footer localSnapshotMsg
+
+localSnapshotMsg :: String
+localSnapshotMsg =
+  "A local snapshot is identified by a hash code. " <> pagerMsg
+
+-- | Parser for arguments to `stack ls globals`.
+listGlobalsOptsParser :: OA.Parser ListGlobalsOpts
+listGlobalsOptsParser = ListGlobalsOpts <$> globalHints
+ where
+  globalHints = boolFlags True
+    "global-hints"
+    "use of a hints file for global packages, rather than an installed GHC"
+    idm
+
+-- | Parser for arguments to `stack ls dependencies`.
+listDepsOptsParser :: OA.Parser ListDepsOpts
+listDepsOptsParser = OA.subparser
+      (  formatSubCommand
+           "text"
+           "Print dependencies as text (default)."
+           listDepsTextParser
+      <> formatSubCommand
+           "cabal"
+           "Print dependencies as exact Cabal constraints."
+           listDepsConstraintsParser
+      <> formatSubCommand
+           "tree"
+           "Print dependencies as tree."
+           listDepsTreeParser
+      <> formatSubCommand
+           "json"
+           "Print dependencies as JSON."
+           listDepsJsonParser
+      )
+  <|> toListDepsOptsParser listDepsTextParser
+
+formatSubCommand ::
+     String
+  -> String
+  -> OA.Parser ListDepsFormat
+  -> OA.Mod OA.CommandFields ListDepsOpts
+formatSubCommand cmd desc formatParser =
+  OA.command
+    cmd (OA.info (toListDepsOptsParser formatParser) (OA.progDesc desc))
+
+listDepsTextParser :: OA.Parser ListDepsFormat
+listDepsTextParser = ListDepsText
+  <$> listDepsFormatOptsParser
+  <*> textQueryParser
+  <*> textFilterParser
+
+textQueryParser :: OA.Parser [ListDepsTextItem]
+textQueryParser = many (OA.option parseListDepsTextItem
+  (  OA.long "query"
+  <> OA.metavar "ITEM"
+  <> OA.help "Item to be retained, if present, being either $locals (for all \
+             \project packages) or a package name (can be specified multiple \
+             \times). All non-retained items are filtered out of the results."
+  ))
+
+textFilterParser :: OA.Parser [ListDepsTextItem]
+textFilterParser = many (OA.option parseListDepsTextItem
+  (  OA.long "filter"
+  <> OA.metavar "ITEM"
+  <> OA.help "Item to be filtered out of the results, if present, being either \
+             \$locals (for all project packages) or a package name (can be \
+             \specified multiple times)."
+  ))
+
+parseListDepsTextItem :: OA.ReadM ListDepsTextItem
+parseListDepsTextItem = OA.eitherReader $ \s ->
+  if s == "$locals"
+    then Right AllProjectPackages
+    else case parsePackageName s of
+      Just pkgName -> Right $ PackageNameOnly pkgName
+      Nothing -> Left $ s <> " is not a valid package name."
+
+listDepsConstraintsParser :: OA.Parser ListDepsFormat
+listDepsConstraintsParser = pure ListDepsConstraints
+
+listDepsTreeParser :: OA.Parser ListDepsFormat
+listDepsTreeParser =  ListDepsTree <$> listDepsFormatOptsParser
+
+listDepsJsonParser :: OA.Parser ListDepsFormat
+listDepsJsonParser = pure ListDepsJSON
+
+listDepsFormatOptsParser :: OA.Parser ListDepsFormatOpts
+listDepsFormatOptsParser = do
+  license <- licenseParser
+  sep <- separatorParser
+  pure ListDepsFormatOpts
+    { sep
+    , license
+    }
+
+separatorParser :: OA.Parser Text
+separatorParser = fmap
+  escapeSep
+  ( textOption
+      (  OA.long "separator"
+      <> OA.metavar "SEP"
+      <> OA.help "Separator between package name and what follows."
+      <> OA.value " "
+      <> OA.showDefault
+      )
+  )
+ where
+  escapeSep s = T.replace "\\t" "\t" (T.replace "\\n" "\n" s)
+
+licenseParser :: OA.Parser Bool
+licenseParser = boolFlags False
+  "license"
+  "printing of dependency licenses instead of versions."
+  idm
+
+toListDepsOptsParser :: OA.Parser ListDepsFormat -> OA.Parser ListDepsOpts
+toListDepsOptsParser formatParser = ListDepsOpts
+  <$> formatParser
+  <*> dotOptsParser True
+
+listStylesOptsParser :: OA.Parser ListStylesOpts
+listStylesOptsParser = ListStylesOpts
+  <$> boolFlags False
+        "basic"
+        "a basic report of the styles used. The default is a fuller one."
+        idm
+  <*> boolFlags True
+        "sgr"
+        "the provision of the equivalent SGR instructions (provided by \
+        \default). Flag ignored for a basic report."
+        idm
+  <*> boolFlags True
+        "example"
+        "the provision of an example of the applied style (provided by default \
+        \for colored output). Flag ignored for a basic report."
+        idm
+
+listToolsOptsParser :: OA.Parser ListToolsOpts
+listToolsOptsParser = ListToolsOpts
+  <$> OA.strOption
+        (  OA.long "filter"
+        <> OA.metavar "TOOL_NAME"
+        <> OA.value ""
+        <> OA.help "Filter by a tool name (eg 'ghc', 'ghc-git' or 'msys2') \
+                   \- case sensitive. (default: no filter)"
+        )
diff --git a/src/Stack/Options/NewParser.hs b/src/Stack/Options/NewParser.hs
index d60abf9af5..de4ba3141c 100644
--- a/src/Stack/Options/NewParser.hs
+++ b/src/Stack/Options/NewParser.hs
@@ -1,39 +1,55 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.NewParser where
+{-|
+Module      : Stack.Options.NewParser
+License     : BSD-3-Clause
+-}
 
-import qualified Data.Map.Strict                   as M
+module Stack.Options.NewParser
+  ( newOptsParser
+  ) where
+
+import qualified Data.Map.Strict as M
 import           Options.Applicative
-import           Stack.Init
-import           Stack.New
-import           Stack.Options.GlobalParser
+                   ( Parser, help, idm, long, metavar, short, switch )
+import           Options.Applicative.Builder.Extra ( boolFlags )
+import           Stack.Init ( InitOpts )
+import           Stack.New ( NewOpts (..) )
+import           Stack.Options.InitParser ( initOptsParser )
 import           Stack.Prelude
-import           Stack.Types.PackageName
+import           Stack.Types.PackageName ( packageNameArgument )
 import           Stack.Types.TemplateName
+                   ( templateNameArgument, templateParamArgument )
 
 -- | Parser for @stack new@.
-newOptsParser :: Parser (NewOpts,InitOpts)
+newOptsParser :: Parser (NewOpts, InitOpts)
 newOptsParser = (,) <$> newOpts <*> initOptsParser
-  where
-    newOpts =
-        NewOpts <$>
-        packageNameArgument
-            (metavar "PACKAGE_NAME" <> help "A valid package name.") <*>
-        switch
-            (long "bare" <>
-             help "Do not create a subdirectory for the project") <*>
-        optional (templateNameArgument
-            (metavar "TEMPLATE_NAME" <>
-             help "Name of a template - can take the form\
-                \ [[service:]username/]template with optional service name\
-                \ (github, gitlab, or bitbucket) \
-                \ and username for the service; or, a local filename such as\
-                \ foo.hsfiles or ~/foo; or, a full URL such as\
-                \ https://example.com/foo.hsfiles.")) <*>
-        fmap
-            M.fromList
-            (many
-                 (templateParamArgument
-                      (short 'p' <> long "param" <> metavar "KEY:VALUE" <>
-                       help
-                           "Parameter for the template in the format key:value")))
+ where
+  newOpts = NewOpts
+    <$> packageNameArgument
+          (  metavar "PACKAGE_NAME"
+          <> help "A valid package name."
+          )
+    <*> switch
+          (  long "bare"
+          <> help "Do not create a subdirectory for the project."
+          )
+    <*> boolFlags True
+          "init"
+          "the initialisation of the project for use with Stack."
+          idm
+    <*> optional (templateNameArgument
+          (  metavar "TEMPLATE_NAME"
+          <> help "Name of a template - can take the form\
+                  \ [[service:]username/]template with optional service name\
+                  \ (github, gitlab, bitbucket, or codeberg) and username for\
+                  \ the service; or, a local filename such as foo.hsfiles or\
+                  \ ~/foo; or, a full URL such as\
+                  \ https://example.com/foo.hsfiles."
+          ))
+    <*> fmap M.fromList (many (templateParamArgument
+          (  short 'p'
+          <> long "param"
+          <> metavar "KEY:VALUE"
+          <> help "Parameter for the template in the format key:value."
+          )))
diff --git a/src/Stack/Options/NixParser.hs b/src/Stack/Options/NixParser.hs
index e02d1a6d85..28620e34fa 100644
--- a/src/Stack/Options/NixParser.hs
+++ b/src/Stack/Options/NixParser.hs
@@ -1,62 +1,88 @@
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 
-module Stack.Options.NixParser where
+{-|
+Module      : Stack.Options.NixParser
+Description : Parser for options for Nix integration.
+License     : BSD-3-Clause
 
-import qualified Data.Text                         as T
+Parser for Stack's command line options for Nix integration.
+-}
+
+module Stack.Options.NixParser
+  ( nixOptsParser
+  ) where
+
+import qualified Data.Text as T
 import           Options.Applicative
-import           Options.Applicative.Args
+                   ( Mod, Parser, completer, help, long, metavar, option, str )
+import           Options.Applicative.Args ( argsOption )
 import           Options.Applicative.Builder.Extra
-import           Stack.Nix
-import           Stack.Options.Utils
+                   ( fileExtCompleter, firstBoolFlagsFalse
+                   , firstBoolFlagsNoDefault, optionalFirst
+                   )
+import           Stack.Nix ( nixCmdName )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
-import           Stack.Types.Nix
+import           Stack.Types.Nix ( NixOptsMonoid (..) )
 
+-- | Parser for Stack's command line options for integration with Nix.
 nixOptsParser :: Bool -> Parser NixOptsMonoid
 nixOptsParser hide0 = overrideActivation <$>
-  (NixOptsMonoid
+  (   NixOptsMonoid
   <$> firstBoolFlagsNoDefault
-                     nixCmdName
-                     "use of a Nix-shell. Implies 'system-ghc: true'"
-                     hide
+        nixCmdName
+        "use of a Nix-shell. Implies 'system-ghc: true'."
+        hide
   <*> firstBoolFlagsNoDefault
-                     "nix-pure"
-                     "use of a pure Nix-shell. Implies '--nix' and 'system-ghc: true'"
-                     hide
-  <*> optionalFirst
-          (textArgsOption
-              (long "nix-packages" <>
-               metavar "NAMES" <>
-               help "List of packages that should be available in the nix-shell (space separated)" <>
-               hide))
-  <*> optionalFirst
-          (option
-              str
-              (long "nix-shell-file" <>
-               metavar "FILE" <>
-               completer (fileExtCompleter [".nix"]) <>
-               help "Nix file to be used to launch a nix-shell (for regular Nix users)" <>
-               hide))
-  <*> optionalFirst
-          (textArgsOption
-              (long "nix-shell-options" <>
-               metavar "OPTIONS" <>
-               help "Additional options passed to nix-shell" <>
-               hide))
-  <*> optionalFirst
-          (textArgsOption
-              (long "nix-path" <>
-               metavar "PATH_OPTIONS" <>
-               help "Additional options to override NIX_PATH parts (notably 'nixpkgs')" <>
-               hide))
+        "nix-pure"
+        "use of a pure Nix-shell. Implies '--nix' and 'system-ghc: true'."
+        hide
+  <*> optionalFirst (textArgsOption
+        (  long "nix-packages"
+        <> metavar "NAMES"
+        <> help "List of packages that should be available in the nix-shell \
+                \(space separated)."
+        <> hide
+        ))
+  <*> optionalFirst (option str
+        (  long "nix-shell-file"
+        <> metavar "FILE"
+        <> completer (fileExtCompleter [".nix"])
+        <> help "Nix file to be used to launch a nix-shell (for regular Nix \
+                \users)."
+        <> hide
+        ))
+  <*> optionalFirst (textArgsOption
+        (  long "nix-instantiate-options"
+        <> metavar "OPTIONS"
+        <> help "Additional options passed to nix-instantiate."
+        <> hide
+        ))
+  <*> optionalFirst (textArgsOption
+        (  long "nix-shell-options"
+        <> metavar "OPTIONS"
+        <> help "Additional options passed to nix-shell."
+        <> hide
+        ))
+  <*> optionalFirst (textArgsOption
+        (  long "nix-path"
+        <> metavar "PATH_OPTIONS"
+        <> help "Additional options to override NIX_PATH parts (notably \
+                \'nixpkgs')."
+        <> hide
+        ))
   <*> firstBoolFlagsFalse
-                     "nix-add-gc-roots"
-                     "addition of packages to the nix GC roots so nix-collect-garbage doesn't remove them"
-                     hide
+        "nix-add-gc-roots"
+        "addition of packages to the nix GC roots so nix-collect-garbage does \
+        \not remove them."
+        hide
   )
-  where
-    hide = hideMods hide0
-    overrideActivation m =
-      if fromFirst False (nixMonoidPureShell m)
-        then m { nixMonoidEnable = (First . Just . fromFirst True) (nixMonoidEnable m) }
-        else m
-    textArgsOption = fmap (map T.pack) . argsOption
+ where
+  hide :: Mod f a
+  hide = hideMods hide0
+  overrideActivation m =
+    if fromFirst False m.pureShell
+      then m { enable = (First . Just . fromFirst True) m.enable }
+      else m
+  textArgsOption = fmap (map T.pack) . argsOption
diff --git a/src/Stack/Options/PackageParser.hs b/src/Stack/Options/PackageParser.hs
index 0313a557e6..09d92a5abe 100644
--- a/src/Stack/Options/PackageParser.hs
+++ b/src/Stack/Options/PackageParser.hs
@@ -1,32 +1,36 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.PackageParser where
+{-|
+Module      : Stack.Options.PackageParser
+License     : BSD-3-Clause
+-}
 
-import qualified Data.Map                          as Map
-import           Options.Applicative
-import           Options.Applicative.Types         (readerAsk)
+module Stack.Options.PackageParser
+  ( readFlag
+  ) where
+
+import qualified Data.Map as Map
+import           Options.Applicative ( ReadM, readerError )
+import           Options.Applicative.Types ( readerAsk )
 import           Stack.Prelude
-import           Stack.Types.Config.Build (ApplyCLIFlag (..))
+import           Stack.Types.BuildOptsCLI ( ApplyCLIFlag (..) )
 
 -- | Parser for package:[-]flag
 readFlag :: ReadM (Map ApplyCLIFlag (Map FlagName Bool))
 readFlag = do
-    s <- readerAsk
-    case break (== ':') s of
-        (pn, ':':mflag) -> do
-            pn' <-
-                case parsePackageName pn of
-                    Nothing
-                        | pn == "*" -> pure ACFAllProjectPackages
-                        | otherwise -> readerError $ "Invalid package name: " ++ pn
-                    Just x -> pure $ ACFByName x
-            let (b, flagS) =
-                    case mflag of
-                        '-':x -> (False, x)
-                        _ -> (True, mflag)
-            flagN <-
-                case parseFlagName flagS of
-                    Nothing -> readerError $ "Invalid flag name: " ++ flagS
-                    Just x -> pure x
-            pure $ Map.singleton pn' $ Map.singleton flagN b
-        _ -> readerError "Must have a colon"
+  s <- readerAsk
+  case break (== ':') s of
+    (pn, ':':mflag) -> do
+      pn' <- case parsePackageName pn of
+               Nothing
+                 | pn == "*" -> pure ACFAllProjectPackages
+                 | otherwise -> readerError $ "Invalid package name: " ++ pn
+               Just x -> pure $ ACFByName x
+      let (b, flagS) = case mflag of
+                         '-':x -> (False, x)
+                         _ -> (True, mflag)
+      flagN <- case parseFlagName flagS of
+                 Nothing -> readerError $ "Invalid flag name: " ++ flagS
+                 Just x -> pure x
+      pure $ Map.singleton pn' $ Map.singleton flagN b
+    _ -> readerError "Must have a colon."
diff --git a/src/Stack/Options/PackagesParser.hs b/src/Stack/Options/PackagesParser.hs
new file mode 100644
index 0000000000..001d2c533f
--- /dev/null
+++ b/src/Stack/Options/PackagesParser.hs
@@ -0,0 +1,27 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Options.PackagesParser
+Description : Parser for one or more package names.
+License     : BSD-3-Clause
+
+Parser for one or more package names.
+-}
+
+module Stack.Options.PackagesParser
+  ( packagesParser
+  ) where
+
+import           Options.Applicative ( Parser, help, long, metavar, strOption )
+import           Stack.Prelude
+
+-- | Parser for one or more package names.
+packagesParser :: Parser [String]
+packagesParser = many
+  ( strOption
+      (  long "package"
+      <> metavar "PACKAGE"
+      <> help "Add a package (can be specified multiple times)"
+      )
+  )
diff --git a/src/Stack/Options/PathParser.hs b/src/Stack/Options/PathParser.hs
new file mode 100644
index 0000000000..79ed382bb3
--- /dev/null
+++ b/src/Stack/Options/PathParser.hs
@@ -0,0 +1,35 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Options.PathParser
+Description : Parse arguments for Stack's @path@ command.
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @path@ command.
+-}
+
+module Stack.Options.PathParser
+  ( pathParser
+  ) where
+
+import qualified Data.Text as T
+import           Options.Applicative ( Parser, flag, help, long )
+import           Stack.Path
+                   ( pathsFromConfig, pathsFromEnvConfig, pathsFromRunner )
+import           Stack.Prelude
+
+-- | Parse command line arguments for Stack's @path@ command.
+pathParser :: Parser [Text]
+pathParser = mapMaybeA
+  ( \(desc, name) -> flag Nothing (Just name)
+      (  long (T.unpack name)
+      <> help desc
+      )
+  )
+  paths
+ where
+  toDescName (desc, name, _) = (desc, name)
+  paths =
+       pathsFromRunner
+    :  map toDescName pathsFromConfig
+    <> map toDescName pathsFromEnvConfig
diff --git a/src/Stack/Options/PvpBoundsParser.hs b/src/Stack/Options/PvpBoundsParser.hs
new file mode 100644
index 0000000000..68c56c0690
--- /dev/null
+++ b/src/Stack/Options/PvpBoundsParser.hs
@@ -0,0 +1,46 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Options.PvpBoundsParser
+Description : Parser for PVP bounds.
+License     : BSD-3-Clause
+
+Parser for PVP bounds.
+-}
+
+module Stack.Options.PvpBoundsParser
+  ( pvpBoundsParser
+  ) where
+
+import qualified Data.Text as T
+import           Options.Applicative
+                   ( Parser, completeWith, help, long, metavar, option
+                   , readerError
+                   )
+import           Options.Applicative.Types ( readerAsk )
+import           Stack.Prelude
+import           Stack.Types.PvpBounds ( PvpBounds (..), parsePvpBounds )
+
+-- | Parser for PVP bounds.
+pvpBoundsParser ::
+     Maybe Text
+     -- ^ Optional context for the option's help message.
+  -> Parser PvpBounds
+pvpBoundsParser context = option readPvpBounds
+  (  long "pvp-bounds"
+  <> metavar "PVP-BOUNDS"
+  <> completeWith ["none", "lower", "upper", "both"]
+  <> help (T.unpack helpMsg)
+  )
+ where
+  readPvpBounds = do
+    s <- readerAsk
+    case parsePvpBounds $ T.pack s of
+      Left e -> readerError e
+      Right v -> pure v
+  helpMsg =
+       helpMsgPrefix
+    <> " PVP version bounds should be added to Cabal file: none, lower, upper, \
+       \both."
+  helpMsgPrefix = maybe "How" (<> ", how") context
diff --git a/src/Stack/Options/ResolverParser.hs b/src/Stack/Options/ResolverParser.hs
deleted file mode 100644
index d4ac25092e..0000000000
--- a/src/Stack/Options/ResolverParser.hs
+++ /dev/null
@@ -1,35 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE DataKinds         #-}
-
-module Stack.Options.ResolverParser where
-
-import qualified Data.Text                         as T
-import           Options.Applicative
-import           Options.Applicative.Types         (readerAsk)
-import           Stack.Options.Utils
-import           Stack.Prelude
-import           Stack.Types.Resolver
-
--- | Parser for the resolver
-abstractResolverOptsParser :: Bool -> Parser (Unresolved AbstractResolver)
-abstractResolverOptsParser hide =
-    option readAbstractResolver
-        (long "resolver" <>
-         metavar "RESOLVER" <>
-         help "Override resolver in project file" <>
-         hideMods hide)
-
-compilerOptsParser :: Bool -> Parser WantedCompiler
-compilerOptsParser hide =
-    option readCompilerVersion
-        (long "compiler" <>
-         metavar "COMPILER" <>
-         help "Use the specified compiler" <>
-         hideMods hide)
-
-readCompilerVersion :: ReadM WantedCompiler
-readCompilerVersion = do
-    s <- readerAsk
-    case parseWantedCompiler (T.pack s) of
-        Left{} -> readerError $ "Failed to parse compiler: " ++ s
-        Right x -> pure x
diff --git a/src/Stack/Options/SDistParser.hs b/src/Stack/Options/SDistParser.hs
index e1f712788a..df864ec3d3 100644
--- a/src/Stack/Options/SDistParser.hs
+++ b/src/Stack/Options/SDistParser.hs
@@ -1,24 +1,48 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.SDistParser where
+{-|
+Module      : Stack.Options.SDistParser
+Description : Parse arguments for Stack's @sdist@ command.
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @sdist@ command.
+-}
+
+module Stack.Options.SDistParser
+ ( sdistOptsParser
+ ) where
 
 import           Options.Applicative
-import           Options.Applicative.Builder.Extra
+                   ( Parser, completer, help, idm, long, metavar, strArgument
+                   , strOption, switch
+                   )
+import           Options.Applicative.Builder.Extra ( boolFlags, dirCompleter )
 import           Stack.Prelude
-import           Stack.SDist
-import           Stack.Options.HpcReportParser (pvpBoundsOption)
+import           Stack.Types.SDistOpts ( SDistOpts (..) )
+import           Stack.Options.PvpBoundsParser ( pvpBoundsParser )
 
--- | Parser for arguments to `stack sdist`
+-- | Parse command line arguments for Stack's @sdist@ command.
 sdistOptsParser :: Parser SDistOpts
-sdistOptsParser = SDistOpts <$>
-  many (strArgument $ metavar "DIR" <> completer dirCompleter) <*>
-  optional pvpBoundsOption <*>
-  ignoreCheckSwitch <*>
-  buildPackageOption <*>
-  optional (strOption (long "tar-dir" <> help "If specified, copy all the tar to this dir"))
-  where
-    ignoreCheckSwitch =
-      switch (long "ignore-check"
-               <> help "Do not check package for common mistakes")
-    buildPackageOption =
-      boolFlags False "test-tarball" "building of the resulting tarball" idm
+sdistOptsParser = SDistOpts
+  <$> many (strArgument
+        (  metavar "DIR"
+        <> completer dirCompleter
+        <> help "A relative path to a package directory. Can be specified \
+                \multiple times. If none specified, use all project packages."
+        ))
+  <*> optional (pvpBoundsParser Nothing)
+  <*> ignoreCheckSwitch
+  <*> buildPackageOption
+  <*> optional (strOption
+        (  long "tar-dir"
+        <> help "If specified, copy all the generated files to this directory."
+        ))
+ where
+  ignoreCheckSwitch = switch
+    (  long "ignore-check"
+    <> help "Do not check packages for common mistakes."
+    )
+  buildPackageOption = boolFlags False
+    "test-tarball"
+    "building of the resulting generated files."
+    idm
diff --git a/src/Stack/Options/ScriptParser.hs b/src/Stack/Options/ScriptParser.hs
index 59d89b8429..9c228035cc 100644
--- a/src/Stack/Options/ScriptParser.hs
+++ b/src/Stack/Options/ScriptParser.hs
@@ -1,58 +1,77 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.ScriptParser where
+{-|
+Module      : Stack.Options.ScriptParser
+Description : Parse arguments for Stack's @script@ command.
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @script@ command.
+-}
+
+module Stack.Options.ScriptParser
+  ( scriptOptsParser
+  ) where
 
 import           Options.Applicative
+                   ( Parser, completer, eitherReader, flag', help, long, metavar
+                   , option, strArgument, strOption
+                   )
 import           Options.Applicative.Builder.Extra
-import           Stack.Options.Completion
+                   ( boolFlags, fileExtCompleter )
+import           Stack.Options.Completion ( ghcOptsCompleter )
+import           Stack.Options.PackagesParser ( packagesParser )
 import           Stack.Prelude
+import           Stack.Script
+                   ( ScriptExecute (..), ScriptOpts (..), ShouldRun (..) )
 
-data ScriptOpts = ScriptOpts
-  { soPackages :: ![String]
-  , soFile :: !FilePath
-  , soArgs :: ![String]
-  , soCompile :: !ScriptExecute
-  , soGhcOptions :: ![String]
-  , soScriptExtraDeps :: ![PackageIdentifierRevision]
-  , soShouldRun :: !ShouldRun
-  }
-  deriving Show
-
-data ScriptExecute
-  = SEInterpret
-  | SECompile
-  | SEOptimize
-  deriving Show
-
-data ShouldRun = YesRun | NoRun
-  deriving Show
-
+-- | Parse command line arguments for Stack's @script@ command.
 scriptOptsParser :: Parser ScriptOpts
 scriptOptsParser = ScriptOpts
-    <$> many (strOption
-          (long "package" <>
-            metavar "PACKAGE" <>
-            help "Add a package (can be specified multiple times)"))
-    <*> strArgument (metavar "FILE" <> completer (fileExtCompleter [".hs", ".lhs"]))
-    <*> many (strArgument (metavar "-- ARGUMENT(S) (e.g. stack script X.hs -- argument(s) to program)"))
-    <*> (flag' SECompile
-            ( long "compile"
-           <> help "Compile the script without optimization and run the executable"
-            ) <|>
-         flag' SEOptimize
-            ( long "optimize"
-           <> help "Compile the script with optimization and run the executable"
-            ) <|>
-         pure SEInterpret)
-    <*> many (strOption
-          (long "ghc-options" <>
-            metavar "OPTIONS" <>
-            completer ghcOptsCompleter <>
-            help "Additional options passed to GHC"))
-    <*> many (option extraDepRead
-          (long "extra-dep" <>
-            metavar "PACKAGE-VERSION" <>
-            help "Extra dependencies to be added to the snapshot"))
-    <*> (flag' NoRun (long "no-run" <> help "Don't run, just compile.") <|> pure YesRun)
-  where
-    extraDepRead = eitherReader $ mapLeft show . parsePackageIdentifierRevision . fromString
+  <$> packagesParser
+  <*> strArgument
+        (  metavar "FILE"
+        <> completer (fileExtCompleter [".hs", ".lhs"])
+        )
+  <*> many (strArgument
+        (  metavar "-- ARGUMENT(S) (e.g. stack script X.hs -- argument(s) to \
+                   \program)."
+        ))
+  <*> (   flag' SECompile
+            (  long "compile"
+            <> help "Compile the script without optimization and run the \
+                    \executable."
+            )
+      <|> flag' SEOptimize
+            (  long "optimize"
+            <> help "Compile the script with optimization and run the \
+                    \executable."
+            )
+      <|> pure SEInterpret
+      )
+  <*> boolFlags False
+        "use-root"
+        "writing of all compilation outputs to a script-specific location in \
+        \the scripts directory of the Stack root."
+        mempty
+  <*> many (strOption
+        (  long "ghc-options"
+        <> metavar "OPTIONS"
+        <> completer ghcOptsCompleter
+        <> help "Additional options passed to GHC (can be specified multiple \
+                \times)."
+        ))
+  <*> many (option extraDepRead
+        (  long "extra-dep"
+        <> metavar "EXTRA-DEP"
+        <> help "An immutable extra dependency to be added to the snapshot \
+                \(can be specified multiple times)."
+        ))
+  <*> (   flag' NoRun
+            (  long "no-run"
+            <> help "Do not run, just compile."
+            )
+      <|> pure YesRun
+      )
+ where
+  extraDepRead = eitherReader $
+                   mapLeft show . parseRawPackageLocationImmutables . fromString
diff --git a/src/Stack/Options/SetupParser.hs b/src/Stack/Options/SetupParser.hs
new file mode 100644
index 0000000000..946d9aba5c
--- /dev/null
+++ b/src/Stack/Options/SetupParser.hs
@@ -0,0 +1,58 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Options.SetupParser
+Description : Parse arguments for Stack's @setup@ command.
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @setup@ command.
+-}
+
+module Stack.Options.SetupParser
+  ( setupOptsParser
+  ) where
+
+import qualified Data.Text as T
+import qualified Options.Applicative as OA
+import qualified Options.Applicative.Builder.Extra as OA
+import qualified Options.Applicative.Types as OA
+import           Stack.Prelude
+import           Stack.Types.SetupOpts ( SetupCmdOpts (..) )
+
+-- | Parse command line arguments for Stack's @setup@ command.
+setupOptsParser :: OA.Parser SetupCmdOpts
+setupOptsParser = SetupCmdOpts
+  <$> OA.optional (OA.argument readVersion
+        (  OA.metavar "GHC_VERSION"
+        <> OA.help "Version of GHC to install, e.g. 9.10.3. (default: install \
+                   \the version implied by the snapshot)"
+        ))
+  <*> OA.boolFlags False
+        "reinstall"
+        "reinstalling GHC, even if available (incompatible with --system-ghc)."
+        OA.idm
+  <*> OA.optional (OA.strOption
+        (  OA.long "ghc-bindist"
+        <> OA.metavar "URL"
+        <> OA.help "Alternate GHC binary distribution (requires custom \
+                   \--ghc-variant)."
+        ))
+  <*> OA.many (OA.strOption
+        (  OA.long "ghcjs-boot-options"
+        <> OA.metavar "GHCJS_BOOT"
+        <> OA.help "Additional ghcjs-boot options."
+        ))
+  <*> OA.boolFlags True
+        "ghcjs-boot-clean"
+        "Control if ghcjs-boot should have --clean option present."
+        OA.idm
+ where
+  readVersion = do
+    s <- OA.readerAsk
+    case parseWantedCompiler ("ghc-" <> T.pack s) of
+      Left _ ->
+        case parseWantedCompiler (T.pack s) of
+          Left _ -> OA.readerError $ "Invalid version: " ++ s
+          Right x -> pure x
+      Right x -> pure x
diff --git a/src/Stack/Options/SnapshotParser.hs b/src/Stack/Options/SnapshotParser.hs
new file mode 100644
index 0000000000..caf0e3e372
--- /dev/null
+++ b/src/Stack/Options/SnapshotParser.hs
@@ -0,0 +1,45 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Options.SnapshotParser
+License     : BSD-3-Clause
+-}
+
+module Stack.Options.SnapshotParser
+  ( abstractSnapshotOptsParser
+  , compilerOptsParser
+  , readCompilerVersion
+  ) where
+
+import qualified Data.Text as T
+import           Options.Applicative
+                   ( Parser, ReadM, help, long, metavar, option, readerError )
+import           Options.Applicative.Types ( readerAsk )
+import           Stack.Options.Utils ( hideMods )
+import           Stack.Prelude
+import           Stack.Types.Snapshot ( AbstractSnapshot, readAbstractSnapshot )
+
+-- | Parser for the snapshot
+abstractSnapshotOptsParser :: Bool -> Parser (Unresolved AbstractSnapshot)
+abstractSnapshotOptsParser hide = option readAbstractSnapshot
+  (  long "snapshot"
+  <> long "resolver"
+  <> metavar "SNAPSHOT"
+  <> help "Override snapshot in the project configuration file."
+  <> hideMods hide
+  )
+
+compilerOptsParser :: Bool -> Parser WantedCompiler
+compilerOptsParser hide = option readCompilerVersion
+  (  long "compiler"
+  <> metavar "COMPILER"
+  <> help "Use the specified compiler."
+  <> hideMods hide
+  )
+
+readCompilerVersion :: ReadM WantedCompiler
+readCompilerVersion = do
+  s <- readerAsk
+  case parseWantedCompiler (T.pack s) of
+    Left{} -> readerError $ "Failed to parse compiler: " ++ s
+    Right x -> pure x
diff --git a/src/Stack/Options/TestParser.hs b/src/Stack/Options/TestParser.hs
index 2e0fcf2068..4571d55c6c 100644
--- a/src/Stack/Options/TestParser.hs
+++ b/src/Stack/Options/TestParser.hs
@@ -1,45 +1,64 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.TestParser where
+{-|
+Module      : Stack.Options.TestParser
+License     : BSD-3-Clause
+-}
+
+module Stack.Options.TestParser
+  ( testOptsParser
+  ) where
 
 import           Options.Applicative
-import           Options.Applicative.Args
+                   ( Mod, Parser, auto, flag', help, long, metavar, option )
+import           Options.Applicative.Args ( argsOption )
 import           Options.Applicative.Builder.Extra
-import           Stack.Options.Utils
+                   ( firstBoolFlagsTrue, optionalFirst, optionalFirstFalse )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.BuildOptsMonoid ( TestOptsMonoid (..) )
 
 -- | Parser for test arguments.
 -- FIXME hide args
 testOptsParser :: Bool -> Parser TestOptsMonoid
-testOptsParser hide0 =
-    TestOptsMonoid
-        <$> firstBoolFlagsTrue
-                "rerun-tests"
-                "running already successful tests"
-                hide
-        <*> fmap
-                concat
-                (many
-                    (argsOption
-                        (long "test-arguments" <>
-                         long "ta" <>
-                         metavar "TEST_ARGS" <>
-                         help "Arguments passed in to the test suite program" <>
-                         hide)))
-        <*> optionalFirstFalse
-                (flag' True
-                    (long "coverage" <>
-                     help "Generate a code coverage report" <>
-                     hide))
-        <*> optionalFirstFalse
-                (flag' True
-                    (long "no-run-tests" <>
-                     help "Disable running of tests. (Tests will still be built.)" <>
-                     hide))
-        <*> optionalFirst
-                (option (fmap Just auto)
-                    (long "test-suite-timeout" <>
-                     help "Maximum test suite run time in seconds." <>
-                     hide))
-   where hide = hideMods hide0
+testOptsParser hide0 = TestOptsMonoid
+  <$> firstBoolFlagsTrue
+        "rerun-tests"
+        "running already successful test suites."
+        hide
+  <*> fmap concat (many (argsOption
+        (  long "test-arguments"
+        <> long "ta"
+        <> metavar "TEST_ARGS"
+        <> help "Arguments passed to the test suites."
+        <> hide
+        )))
+  <*> optionalFirstFalse (flag' True
+        (  long "coverage"
+        <> help "Generate a code coverage report."
+        <> hide
+        ))
+  <*> firstBoolFlagsTrue
+        "run-tests"
+        "running of targeted test suites."
+        hide
+  <*> optionalFirst (option (fmap Just auto)
+        (  long "test-suite-timeout"
+        <> metavar "SECONDS"
+        <> help "For each test suite, maximum run time before it fails."
+        <> hide
+        ))
+  <*> optionalFirst (option (fmap Just auto)
+        (  long "test-suite-timeout-grace"
+        <> metavar "SECONDS"
+        <> help "Request termination of timed-out test suite process. Grace \
+                \period after timeout before termination is forced."
+        <> hide
+        ))
+  <*> firstBoolFlagsTrue
+        "tests-allow-stdin"
+        "allow standard input in test suites."
+        hide
+ where
+  hide :: Mod f a
+  hide = hideMods hide0
diff --git a/src/Stack/Options/UnpackParser.hs b/src/Stack/Options/UnpackParser.hs
new file mode 100644
index 0000000000..a73d12e046
--- /dev/null
+++ b/src/Stack/Options/UnpackParser.hs
@@ -0,0 +1,70 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Options.UnpackParser
+Description : Parse arguments for Stack's @unpack@ command.
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @unpack@ command.
+-}
+
+module Stack.Options.UnpackParser
+  ( unpackOptsParser
+  ) where
+
+import qualified Data.Text as T
+import           Options.Applicative
+                   ( Parser, ReadM, argument, eitherReader, help, long, metavar
+                   , option, switch
+                   )
+import           Path ( SomeBase (..), parseSomeDir )
+import           Stack.Prelude
+import           Stack.Unpack ( UnpackOpts (..), UnpackTarget)
+
+-- | Parse command line arguments for Stack's @unpack@ command.
+unpackOptsParser :: Parser UnpackOpts
+unpackOptsParser = UnpackOpts
+  <$> some unpackTargetParser
+  <*> areCandidatesParser
+  <*> optional dirParser
+
+unpackTargetParser :: Parser UnpackTarget
+unpackTargetParser = argument unpackTargetReader
+  (  metavar "TARGET"
+  <> help "A package or package candidate (can be specified multiple times). A \
+          \package can be referred to by name only or by identifier \
+          \(including, optionally, a revision as '@rev:<number>' or \
+          \'@sha256:<sha>'). A package candidate is referred to by its \
+          \identifier."
+  )
+
+unpackTargetReader :: ReadM UnpackTarget
+unpackTargetReader = eitherReader $ \s ->
+  case parsePackageIdentifierRevision $ T.pack s of
+    Right pir -> Right (Right pir)
+    Left _ -> case parsePackageName s of
+      Just pn -> Right (Left pn)
+      Nothing ->
+        Left $ s <> " is an invalid way to refer to a package or package \
+                    \candidate to be unpacked."
+
+areCandidatesParser :: Parser Bool
+areCandidatesParser = switch
+  (  long "candidate"
+  <> help "Each target is a package candidate."
+  )
+
+dirParser :: Parser (SomeBase Dir)
+dirParser = option dirReader
+  (  long "to"
+  <> metavar "DIR"
+  <> help "Optionally, a directory to unpack into. A target will be unpacked \
+          \ into a subdirectory."
+  )
+
+dirReader :: ReadM (SomeBase Dir)
+dirReader = eitherReader $ \s ->
+  case parseSomeDir s of
+    Just dir -> Right dir
+    Nothing ->
+      Left $ s <> " is an invalid way to refer to a directory."
diff --git a/src/Stack/Options/UpgradeParser.hs b/src/Stack/Options/UpgradeParser.hs
new file mode 100644
index 0000000000..71710117f0
--- /dev/null
+++ b/src/Stack/Options/UpgradeParser.hs
@@ -0,0 +1,99 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Options.UpgradeParser
+Description : Parse arguments for Stack's @upgrade@ command.
+License     : BSD-3-Clause
+
+Function to parse command line arguments for Stack's @upgrade@ command.
+-}
+
+module Stack.Options.UpgradeParser
+  ( upgradeOptsParser
+  ) where
+
+import         Options.Applicative
+                 ( Parser, flag', help, idm, long, metavar, showDefault
+                 , strOption, switch, value
+                 )
+import         Options.Applicative.Builder.Extra ( boolFlags )
+import         Stack.Prelude
+import         Stack.Types.UpgradeOpts
+                 ( BinaryOpts (..), SourceOpts (..), UpgradeOpts (..) )
+
+-- | Parse command line arguments for Stack's @upgrade@ command.
+upgradeOptsParser ::
+     Bool
+     -- ^ The default for --[no]-only-local-bin
+  -> Parser UpgradeOpts
+upgradeOptsParser onlyLocalBin = UpgradeOpts
+  <$> (sourceOnly <|> optional binaryOpts)
+  <*> (binaryOnly <|> optional sourceOpts)
+ where
+  binaryOnly = flag' Nothing
+    (  long "binary-only"
+    <> help "Do not use a source upgrade path."
+    )
+  sourceOnly = flag' Nothing
+    (  long "source-only"
+    <> help "Do not use a binary upgrade path."
+    )
+
+  binaryOpts = BinaryOpts
+    <$> optional (strOption
+          (  long "binary-platform"
+          <> help "Platform type for archive to download."
+          <> metavar "PLATFORM"
+          ))
+    <*> switch
+          (  long "force-download"
+          <> help "Download the latest available Stack executable, even if not \
+                  \newer."
+          )
+    <*> boolFlags onlyLocalBin
+          "only-local-bin"
+          "downloading only to Stack's local binary directory"
+          idm
+    <*> optional (strOption
+          (  long "binary-version"
+          <> help "Download a specific Stack version, even if already \
+                  \installed."
+          <> metavar "VERSION"
+          ))
+    <*> optional (strOption
+          (  long "github-org"
+          <> help "GitHub organization name."
+          <> metavar "USER"
+          ))
+    <*> optional (strOption
+          (  long "github-repo"
+          <> help "GitHub repository name."
+          <> metavar "REPO"
+          ))
+
+  sourceOpts = SourceOpts
+    <$> (   ( \fromGit repo branch ->
+                if fromGit
+                  then Just (repo, branch)
+                  else Nothing
+            )
+        <$> switch
+              ( long "git"
+              <> help "Clone from Git instead of downloading from Hackage \
+                      \(more dangerous)."
+              )
+        <*> strOption
+              (  long "git-repo"
+              <> help "Clone from specified Git repository."
+              <> metavar "URL"
+              <> value "https://github.com/commercialhaskell/stack"
+              <> showDefault
+              )
+        <*> strOption
+              (  long "git-branch"
+              <> help "Clone from specified Git branch."
+              <> metavar "BRANCH"
+              <> value "master"
+              <> showDefault
+              )
+        )
diff --git a/src/Stack/Options/UploadParser.hs b/src/Stack/Options/UploadParser.hs
index 41955fb4cb..932438ea76 100644
--- a/src/Stack/Options/UploadParser.hs
+++ b/src/Stack/Options/UploadParser.hs
@@ -1,36 +1,69 @@
 {-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Options.UploadParser
+Description : Parse arguments for Stack's @upload@ command.
+License     : BSD-3-Clause
+
+Functions to parse command line arguments for Stack's @upload@ command.
+-}
 
 module Stack.Options.UploadParser
-  ( UploadOpts(..)
-  , UploadVariant(..)
-  , uploadOptsParser
+  ( uploadOptsParser
   ) where
 
 import           Options.Applicative
-import           Stack.Options.SDistParser (sdistOptsParser)
+                   ( Parser, completer, flag, help, idm, long, metavar, short
+                   , strArgument, strOption, switch
+                   )
+import           Options.Applicative.Builder.Extra
+                   ( boolFlags, dirCompleter, firstBoolFlagsTrue )
+import           Stack.Options.PvpBoundsParser ( pvpBoundsParser )
 import           Stack.Prelude
-import           Stack.SDist (SDistOpts(..))
-
-data UploadOpts = UploadOpts
-  { uoptsSDistOpts :: SDistOpts
-  , uoptsUploadVariant :: UploadVariant
-  -- ^ Says whether to publish the package or upload as a release candidate
-  }
-
-data UploadVariant
-  = Publishing
-  -- ^ Publish the package
-  | Candidate
-  -- ^ Create a package candidate
+import           Stack.Upload ( UploadOpts (..), UploadVariant (..) )
 
--- | Parser for arguments to `stack upload`
+-- | Parse command line arguments for Stack's @upload@ command.
 uploadOptsParser :: Parser UploadOpts
-uploadOptsParser =
-  UploadOpts
-    <$> sdistOptsParser
-    <*> uploadVariant
-  where
-    uploadVariant =
-      flag Publishing Candidate
-        (long "candidate" <>
-         help "Upload as a package candidate")
+uploadOptsParser = UploadOpts
+  <$> itemsToWorkWithParser
+  <*> documentationParser
+  <*> optional (pvpBoundsParser (Just "For package upload"))
+  <*> ignoreCheckSwitch
+  <*> buildPackageOption
+  <*> tarDirParser
+  <*> uploadVariantParser
+  <*> saveHackageCredsOption
+ where
+  itemsToWorkWithParser = many (strArgument
+    (  metavar "ITEM"
+    <> completer dirCompleter
+    <> help "A relative path to a package directory or, for package upload \
+            \only, an sdist tarball. Can be specified multiple times."
+    ))
+  documentationParser = flag False True
+    (  long "documentation"
+    <> short 'd'
+    <> help "Upload documentation for packages (not packages)."
+    )
+  ignoreCheckSwitch = switch
+      (  long "ignore-check"
+      <> help "Do not check packages, for upload, for common mistakes."
+      )
+  buildPackageOption = boolFlags False
+      "test-tarball"
+      "building of the resulting generated files, for package upload."
+      idm
+  tarDirParser = optional (strOption
+    (  long "tar-dir"
+    <> help "If specified, copy all the generated files, for package upload, \
+            \to this directory."
+    ))
+  uploadVariantParser = flag Publishing Candidate
+    (  long "candidate"
+    <> help "Upload as, or for, a package candidate."
+    )
+  saveHackageCredsOption = firstBoolFlagsTrue
+      "save-hackage-creds"
+      "saving user's Hackage username and password in a local file."
+      idm
diff --git a/src/Stack/Options/Utils.hs b/src/Stack/Options/Utils.hs
index abf21dd8de..ba61cb00d1 100644
--- a/src/Stack/Options/Utils.hs
+++ b/src/Stack/Options/Utils.hs
@@ -1,8 +1,16 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
-module Stack.Options.Utils where
+{-|
+Module      : Stack.Options.Utils
+License     : BSD-3-Clause
+-}
 
-import           Options.Applicative
+module Stack.Options.Utils
+  ( GlobalOptsContext (..)
+  , hideMods
+  ) where
+
+import           Options.Applicative ( Mod, hidden, idm, internal )
 import           Stack.Prelude
 
 -- | If argument is True, hides the option from usage and help
@@ -11,12 +19,12 @@ hideMods hide = if hide then internal <> hidden else idm
 
 -- | Allows adjust global options depending on their context
 -- Note: This was being used to remove ambiguity between the local and global
--- implementation of stack init --resolver option. Now that stack init has no
--- local --resolver this is not being used anymore but the code is kept for any
+-- implementation of stack init --snapshot option. Now that stack init has no
+-- local --snapshot this is not being used anymore but the code is kept for any
 -- similar future use cases.
 data GlobalOptsContext
-    = OuterGlobalOpts -- ^ Global options before subcommand name
-    | OtherCmdGlobalOpts -- ^ Global options following any other subcommand
-    | BuildCmdGlobalOpts
-    | GhciCmdGlobalOpts
-    deriving (Show, Eq)
+  = OuterGlobalOpts -- ^ Global options before subcommand name
+  | OtherCmdGlobalOpts -- ^ Global options following any other subcommand
+  | BuildCmdGlobalOpts
+  | GhciCmdGlobalOpts
+  deriving (Eq, Show)
diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
index 74eddff83e..619d47f10c 100644
--- a/src/Stack/Package.hs
+++ b/src/Stack/Package.hs
@@ -1,435 +1,383 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE CPP                 #-}
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE DeriveDataTypeable  #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE FlexibleInstances   #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE RankNTypes          #-}
-{-# LANGUAGE RecordWildCards     #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections       #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
 
--- | Dealing with Cabal.
+{-|
+Module      : Stack.Package
+Description : Dealing with Cabal.
+License     : BSD-3-Clause
+
+Dealing with Cabal.
+-}
 
 module Stack.Package
-  (readDotBuildinfo
-  ,resolvePackage
-  ,packageFromPackageDescription
-  ,Package(..)
-  ,PackageDescriptionPair(..)
-  ,GetPackageFiles(..)
-  ,GetPackageOpts(..)
-  ,PackageConfig(..)
-  ,buildLogPath
-  ,PackageException (..)
-  ,resolvePackageDescription
-  ,packageDependencies
-  ,applyForceCustomBuild
+  ( readDotBuildinfo
+  , resolvePackage
+  , packageFromPackageDescription
+  , Package (..)
+  , PackageConfig (..)
+  , buildLogPath
+  , PackageException (..)
+  , resolvePackageDescription
+  , packageDependencies
+  , applyForceCustomBuild
+  , hasBuildableMainLibrary
+  , packageUnknownTools
+  , buildableForeignLibs
+  , buildableSubLibs
+  , buildableExes
+  , buildableTestSuites
+  , buildableBenchmarks
+  , getPackageOpts
+  , processPackageDepsEither
+  , listOfPackageDeps
+  , setOfPackageDeps
+  , topSortPackageComponent
+  , hasIntraPackageDeps
+  , packageIsIndefinite
+  , packageUsesBackpack
   ) where
 
-import           Data.List (find, isPrefixOf, unzip)
 import qualified Data.Map.Strict as M
 import qualified Data.Set as S
-import qualified Data.Text as T
-import           Distribution.CabalSpecVersion
+import           Distribution.CabalSpecVersion ( cabalSpecToVersionDigits )
 import           Distribution.Compiler
-import           Distribution.ModuleName (ModuleName)
-import qualified Distribution.ModuleName as Cabal
-import           Distribution.Package hiding (Package, packageName, packageVersion, PackageIdentifier)
-import           Distribution.PackageDescription hiding (FlagName)
-#if !MIN_VERSION_Cabal(3,8,1)
-import           Distribution.PackageDescription.Parsec
-#endif
-import           Distribution.Pretty (prettyShow)
-import           Distribution.Simple.Glob (matchDirFileGlob)
-#if MIN_VERSION_Cabal(3,8,1)
-import           Distribution.Simple.PackageDescription (readHookedBuildInfo)
-#endif
-import           Distribution.System (OS (..), Arch, Platform (..))
-import           Distribution.Text (display)
+                   ( CompilerFlavor (..), PerCompilerFlavor (..) )
+import           Distribution.ModuleName ( ModuleName )
+import           Distribution.PackageDescription
+                   ( Benchmark (..), BuildInfo (..), BuildType (..)
+                   , CondTree (..), Condition (..), ConfVar (..)
+                   , Dependency (..), Executable (..), ForeignLib (..)
+                   , GenericPackageDescription (..), HookedBuildInfo
+                   , Library (..), PackageDescription (..), PackageFlag (..)
+                   , SetupBuildInfo (..), TestSuite (..), allLibraries
+                   , buildType, depPkgName, depVerRange
+                   , unqualComponentNameToPackageName
+                   )
+import qualified Distribution.PackageDescription as Executable
+                   ( Executable (..) )
+import           Distribution.Simple.PackageDescription ( readHookedBuildInfo )
+import           Distribution.System ( OS (..), Arch, Platform (..) )
+import           Distribution.Text ( display )
 import qualified Distribution.Types.CondTree as Cabal
-import qualified Distribution.Types.ExeDependency as Cabal
-import qualified Distribution.Types.LegacyExeDependency as Cabal
-import           Distribution.Types.MungedPackageName
-import qualified Distribution.Types.UnqualComponentName as Cabal
-import           Distribution.Utils.Path (getSymbolicPath)
-import           Distribution.Verbosity (silent)
-import           Distribution.Version (mkVersion, orLaterVersion, anyVersion)
-import qualified HiFileParser as Iface
-import           Path as FL hiding (replaceExtension)
-import           Path.Extra
-import           Path.IO hiding (findFiles)
-import           Stack.Build.Installed
-import           Stack.Constants
-import           Stack.Constants.Config
-import           Stack.Prelude hiding (Display (..))
-import           Stack.Types.Compiler
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
+import           Distribution.Utils.Path ( makeSymbolicPath, getSymbolicPath )
+import           Distribution.Verbosity ( silent )
+import           Distribution.Version
+                   ( anyVersion, mkVersion, orLaterVersion )
+import           Path
+                   ( (</>), parent, parseAbsDir, parseRelDir, parseRelFile
+                   , stripProperPrefix
+                   )
+import           Path.Extra ( concatAndCollapseAbsDir, toFilePathNoTrailingSep )
+import           Stack.Component
+                   ( componentDependencyMap, foldOnNameAndBuildInfo
+                   , isComponentBuildable, stackBenchmarkFromCabal
+                   , stackExecutableFromCabal, stackForeignLibraryFromCabal
+                   , stackLibraryFromCabal, stackTestFromCabal
+                   )
+import           Stack.ComponentFile
+                   ( buildDir, componentAutogenDir, componentBuildDir
+                   , componentOutputDir, packageAutogenDir
+                   )
+import           Stack.Constants ( relFileCabalMacrosH, relDirLogs )
+import           Stack.Constants.Config ( distDirFromDir )
+import           Stack.PackageFile ( getPackageFile, stackPackageFileFromCabal )
+import           Stack.Prelude hiding ( Display (..) )
+import           Stack.Types.BuildConfig ( HasBuildConfig (..), getWorkDir )
+import           Stack.Types.CompCollection
+                   ( CompCollection, collectionLookup, foldAndMakeCollection
+                   , foldComponentToAnotherCollection, getBuildableSet
+                   )
+import           Stack.Types.Compiler ( ActualCompiler (..) )
+import           Stack.Types.CompilerPaths ( cabalVersionL )
+import           Stack.Types.Component
+                   ( HasBuildInfo, HasComponentInfo, HasQualiName, HasName
+                   , StackUnqualCompName (..)
+                   )
+import qualified Stack.Types.Component as Component
+import           Stack.Types.ComponentUtils ( emptyCompName, toCabalName )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.Dependency
+                   ( DepLibrary (..), DepType (..), DepValue (..)
+                   , cabalSetupDepsToStackDep, libraryDepFromVersionRange
+                   )
+import           Stack.Types.EnvConfig ( HasEnvConfig )
+import           Stack.Types.Installed
+                   ( InstallMap, Installed (..), InstalledMap
+                   , installedToPackageIdOpt
+                   )
 import           Stack.Types.NamedComponent
+                   ( NamedComponent (..), isPotentialDependency
+                   , subLibComponents
+                   )
 import           Stack.Types.Package
+                   ( BioInput(..), BuildInfoOpts (..), Package (..)
+                   , PackageConfig (..), PackageException (..)
+                   , dotCabalCFilePath, packageIdentifier
+                   )
+import           Stack.Types.PackageFile
+                   ( DotCabalPath, PackageComponentFile (..) )
+import           Stack.Types.SourceMap ( Target(..), PackageType (..) )
 import           Stack.Types.Version
-import qualified System.Directory as D (doesFileExist)
-import           System.FilePath (replaceExtension)
-import qualified System.FilePath as FilePath
-import           System.IO.Error
-import           RIO.Process
-import           RIO.PrettyPrint
-import qualified RIO.PrettyPrint as PP (Style (Module))
-
-data Ctx = Ctx { ctxFile :: !(Path Abs File)
-               , ctxDistDir :: !(Path Abs Dir)
-               , ctxBuildConfig :: !BuildConfig
-               , ctxCabalVer :: !Version
-               }
-
-instance HasPlatform Ctx
-instance HasGHCVariant Ctx
-instance HasLogFunc Ctx where
-    logFuncL = configL.logFuncL
-instance HasRunner Ctx where
-    runnerL = configL.runnerL
-instance HasStylesUpdate Ctx where
-  stylesUpdateL = runnerL.stylesUpdateL
-instance HasTerm Ctx where
-  useColorL = runnerL.useColorL
-  termWidthL = runnerL.termWidthL
-instance HasConfig Ctx
-instance HasPantryConfig Ctx where
-    pantryConfigL = configL.pantryConfigL
-instance HasProcessContext Ctx where
-    processContextL = configL.processContextL
-instance HasBuildConfig Ctx where
-    buildConfigL = lens ctxBuildConfig (\x y -> x { ctxBuildConfig = y })
+                   ( VersionRange, intersectVersionRanges, withinRange )
+import           System.FilePath ( replaceExtension )
+import           RIO.Seq ((|>))
 
 -- | Read @<package>.buildinfo@ ancillary files produced by some Setup.hs hooks.
 -- The file includes Cabal file syntax to be merged into the package description
 -- derived from the package's Cabal file.
 --
 -- NOTE: not to be confused with BuildInfo, an Stack-internal datatype.
-readDotBuildinfo :: MonadIO m
-                 => Path Abs File
-                 -> m HookedBuildInfo
-readDotBuildinfo buildinfofp =
-    liftIO $ readHookedBuildInfo silent (toFilePath buildinfofp)
+readDotBuildinfo :: MonadIO m => Path Abs File -> m HookedBuildInfo
+readDotBuildinfo =
+  liftIO . readHookedBuildInfo silent Nothing . makeSymbolicPath . toFilePath
 
--- | Resolve a parsed Cabal file into a 'Package', which contains all of
--- the info needed for Stack to build the 'Package' given the current
+-- | Resolve a parsed Cabal file into a t'Package', which contains all of the
+-- info needed for Stack to build the t'Package' given the current
 -- configuration.
-resolvePackage :: PackageConfig
-               -> GenericPackageDescription
-               -> Package
+resolvePackage :: PackageConfig -> GenericPackageDescription -> Package
 resolvePackage packageConfig gpkg =
-    packageFromPackageDescription
-        packageConfig
-        (genPackageFlags gpkg)
-        (resolvePackageDescription packageConfig gpkg)
-
-packageFromPackageDescription :: PackageConfig
-                              -> [PackageFlag]
-                              -> PackageDescriptionPair
-                              -> Package
-packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkgNoMod pkg) =
-    Package
-    { packageName = name
-    , packageVersion = pkgVersion pkgId
-    , packageLicense = licenseRaw pkg
-    , packageDeps = deps
-    , packageFiles = pkgFiles
-    , packageUnknownTools = unknownTools
-    , packageGhcOptions = packageConfigGhcOptions packageConfig
-    , packageCabalConfigOpts = packageConfigCabalConfigOpts packageConfig
-    , packageFlags = packageConfigFlags packageConfig
-    , packageDefaultFlags = M.fromList
-      [(flagName flag, flagDefault flag) | flag <- pkgFlags]
-    , packageAllDeps = S.fromList (M.keys deps)
-    , packageLibraries =
-        let mlib = do
-              lib <- library pkg
-              guard $ buildable $ libBuildInfo lib
-              Just lib
-         in
-          case mlib of
-            Nothing -> NoLibraries
-            Just _ -> HasLibraries foreignLibNames
-    , packageInternalLibraries = subLibNames
-    , packageTests = M.fromList
-      [(T.pack (Cabal.unUnqualComponentName $ testName t), testInterface t)
-          | t <- testSuites pkgNoMod
-          , buildable (testBuildInfo t)
-      ]
-    , packageBenchmarks = S.fromList
-      [T.pack (Cabal.unUnqualComponentName $ benchmarkName b)
-          | b <- benchmarks pkgNoMod
-          , buildable (benchmarkBuildInfo b)
-      ]
-        -- Same comment about buildable applies here too.
-    , packageExes = S.fromList
-      [T.pack (Cabal.unUnqualComponentName $ exeName biBuildInfo)
-        | biBuildInfo <- executables pkg
-                                    , buildable (buildInfo biBuildInfo)]
-    -- This is an action used to collect info needed for "stack ghci".
-    -- This info isn't usually needed, so computation of it is deferred.
-    , packageOpts = GetPackageOpts $
-      \installMap installedMap omitPkgs addPkgs cabalfp ->
-           do (componentsModules,componentFiles,_,_) <- getPackageFiles pkgFiles cabalfp
-              let internals = S.toList $ internalLibComponents $ M.keysSet componentsModules
-              excludedInternals <- mapM (parsePackageNameThrowing . T.unpack) internals
-              mungedInternals <- mapM (parsePackageNameThrowing . T.unpack .
-                                       toInternalPackageMungedName) internals
-              componentsOpts <-
-                  generatePkgDescOpts installMap installedMap
-                  (excludedInternals ++ omitPkgs) (mungedInternals ++ addPkgs)
-                  cabalfp pkg componentFiles
-              pure (componentsModules,componentFiles,componentsOpts)
-    , packageHasExposedModules = maybe
-          False
-          (not . null . exposedModules)
-          (library pkg)
-    , packageBuildType = buildType pkg
-    , packageSetupDeps = msetupDeps
-    , packageCabalSpec = specVersion pkg
-    }
-  where
-    extraLibNames = S.union subLibNames foreignLibNames
-
-    subLibNames
-      = S.fromList
-      $ map (T.pack . Cabal.unUnqualComponentName)
-      $ mapMaybe (libraryNameString . libName) -- this is a design bug in the Cabal API: this should statically be known to exist
-      $ filter (buildable . libBuildInfo)
-      $ subLibraries pkg
-
-    foreignLibNames
-      = S.fromList
-      $ map (T.pack . Cabal.unUnqualComponentName . foreignLibName)
-      $ filter (buildable . foreignLibBuildInfo)
-      $ foreignLibs pkg
-
-    toInternalPackageMungedName
-      = T.pack . prettyShow . MungedPackageName (pkgName pkgId)
-      . maybeToLibraryName . Just . Cabal.mkUnqualComponentName . T.unpack
-
-    -- Gets all of the modules, files, build files, and data files that
-    -- constitute the package. This is primarily used for dirtiness
-    -- checking during build, as well as use by "stack ghci"
-    pkgFiles = GetPackageFiles $
-        \cabalfp -> debugBracket ("getPackageFiles" <+> pretty cabalfp) $ do
-             let pkgDir = parent cabalfp
-             distDir <- distDirFromDir pkgDir
-             bc <- view buildConfigL
-             cabalVer <- view cabalVersionL
-             (componentModules,componentFiles,dataFiles',warnings) <-
-                 runRIO
-                     (Ctx cabalfp distDir bc cabalVer)
-                     (packageDescModulesAndFiles pkg)
-             setupFiles <-
-                 if buildType pkg == Custom
-                 then do
-                     let setupHsPath = pkgDir </> relFileSetupHs
-                         setupLhsPath = pkgDir </> relFileSetupLhs
-                     setupHsExists <- doesFileExist setupHsPath
-                     if setupHsExists then pure (S.singleton setupHsPath) else do
-                         setupLhsExists <- doesFileExist setupLhsPath
-                         if setupLhsExists then pure (S.singleton setupLhsPath) else pure S.empty
-                 else pure S.empty
-             buildFiles <- liftM (S.insert cabalfp . S.union setupFiles) $ do
-                 let hpackPath = pkgDir </> relFileHpackPackageConfig
-                 hpackExists <- doesFileExist hpackPath
-                 pure $ if hpackExists then S.singleton hpackPath else S.empty
-             pure (componentModules, componentFiles, buildFiles <> dataFiles', warnings)
-    pkgId = package pkg
-    name = pkgName pkgId
-
-    (unknownTools, knownTools) = packageDescTools pkg
-
-    deps = M.filterWithKey (const . not . isMe) (M.unionsWith (<>)
-        [ asLibrary <$> packageDependencies packageConfig pkg
-        -- We include all custom-setup deps - if present - in the
-        -- package deps themselves. Stack always works with the
-        -- invariant that there will be a single installed package
-        -- relating to a package name, and this applies at the setup
-        -- dependency level as well.
-        , asLibrary <$> fromMaybe M.empty msetupDeps
-        , knownTools
-        ])
-    msetupDeps = fmap
-        (M.fromList . map (depPkgName &&& depVerRange) . setupDepends)
-        (setupBuildInfo pkg)
-
-    asLibrary range = DepValue
-      { dvVersionRange = range
-      , dvType = AsLibrary
+  packageFromPackageDescription
+    packageConfig
+    (genPackageFlags gpkg)
+    (resolvePackageDescription packageConfig gpkg)
+
+packageFromPackageDescription ::
+     PackageConfig
+  -> [PackageFlag]
+  -> PackageDescription
+  -> Package
+packageFromPackageDescription
+    packageConfig
+    pkgFlags
+    pkg
+  = Package
+      { name = name
+      , version = pkgVersion pkgId
+      , license = licenseRaw pkg
+      , ghcOptions =  packageConfig.ghcOptions
+      , cabalConfigOpts =  packageConfig.cabalConfigOpts
+      , flags = packageConfig.flags
+      , defaultFlags = M.fromList
+          [(flagName flag, flagDefault flag) | flag <- pkgFlags]
+      , library = stackLibraryFromCabal <$> library pkg
+      , subLibraries =
+          foldAndMakeCollection stackLibraryFromCabal $ subLibraries pkg
+      , foreignLibraries =
+          foldAndMakeCollection stackForeignLibraryFromCabal $ foreignLibs pkg
+      , testSuites =
+          foldAndMakeCollection stackTestFromCabal $ testSuites pkg
+      , benchmarks =
+          foldAndMakeCollection stackBenchmarkFromCabal $ benchmarks pkg
+      , executables =
+          foldAndMakeCollection stackExecutableFromCabal $ executables pkg
+      , buildType = buildType pkg
+      , setupDeps = fmap cabalSetupDepsToStackDep (setupBuildInfo pkg)
+      , cabalSpec = specVersion pkg
+      , file = stackPackageFileFromCabal pkg
+      , testEnabled =  packageConfig.enableTests
+      , benchmarkEnabled = packageConfig.enableBenchmarks
       }
-
-    -- Is the package dependency mentioned here me: either the package
-    -- name itself, or the name of one of the sub libraries
-    isMe name' = name' == name || fromString (packageNameString name') `S.member` extraLibNames
-
--- | Generate GHC options for the package's components, and a list of
--- options which apply generally to the package, not one specific
--- component.
+ where
+  -- Gets all of the modules, files, build files, and data files that constitute
+  -- the package. This is primarily used for dirtiness checking during build, as
+  -- well as use by "stack ghci"
+  pkgId = package pkg
+  name = pkgName pkgId
+
+-- | This is an action used to collect info needed for "stack ghci". This info
+-- isn't usually needed, so computation of it is deferred.
+getPackageOpts ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m, MonadUnliftIO m )
+  => Package
+  -> InstallMap
+  -> InstalledMap
+  -> [PackageName]
+  -> [PackageName]
+  -> Path Abs File
+  -> m ( Map NamedComponent (Map ModuleName (Path Abs File))
+       , Map NamedComponent [DotCabalPath]
+       , Map NamedComponent BuildInfoOpts
+       )
+getPackageOpts
+    stackPackage
+    installMap
+    installedMap
+    omitPkgs
+    addPkgs
+    cabalFP
+  = do
+      PackageComponentFile !componentsModules componentFiles _ _ <-
+        getPackageFile stackPackage cabalFP
+      let subLibs =
+            S.toList $ subLibComponents $ M.keysSet componentsModules
+          excludedSubLibs =
+            map (unqualComponentNameToPackageName . toCabalName) subLibs
+      componentsOpts <- generatePkgDescOpts
+        installMap
+        installedMap
+        (excludedSubLibs ++ omitPkgs)
+        addPkgs
+        cabalFP
+        stackPackage
+        componentFiles
+      pure (componentsModules, componentFiles, componentsOpts)
+
+-- | Generate GHC options for the package's components, and a list of options
+-- which apply generally to the package, not one specific component.
+generatePkgDescOpts ::
+     (HasEnvConfig env, MonadThrow m, MonadReader env m, MonadIO m)
+  => InstallMap
+  -> InstalledMap
+  -> [PackageName]
+     -- ^ Packages to omit from the "-package" / "-package-id" flags
+  -> [PackageName]
+     -- ^ Packages to add to the "-package" flags
+  -> Path Abs File
+  -> Package
+  -> Map NamedComponent [DotCabalPath]
+  -> m (Map NamedComponent BuildInfoOpts)
 generatePkgDescOpts
-    :: (HasEnvConfig env, MonadThrow m, MonadReader env m, MonadIO m)
-    => InstallMap
-    -> InstalledMap
-    -> [PackageName] -- ^ Packages to omit from the "-package" / "-package-id" flags
-    -> [PackageName] -- ^ Packages to add to the "-package" flags
-    -> Path Abs File
-    -> PackageDescription
-    -> Map NamedComponent [DotCabalPath]
-    -> m (Map NamedComponent BuildInfoOpts)
-generatePkgDescOpts installMap installedMap omitPkgs addPkgs cabalfp pkg componentPaths = do
-    config <- view configL
-    cabalVer <- view cabalVersionL
-    distDir <- distDirFromDir cabalDir
-    let generate namedComponent binfo =
-            ( namedComponent
-            , generateBuildInfoOpts BioInput
-                { biInstallMap = installMap
-                , biInstalledMap = installedMap
-                , biCabalDir = cabalDir
-                , biDistDir = distDir
-                , biOmitPackages = omitPkgs
-                , biAddPackages = addPkgs
-                , biBuildInfo = binfo
-                , biDotCabalPaths = fromMaybe [] (M.lookup namedComponent componentPaths)
-                , biConfigLibDirs = configExtraLibDirs config
-                , biConfigIncludeDirs = configExtraIncludeDirs config
-                , biComponentName = namedComponent
-                , biCabalVersion = cabalVer
-                }
-            )
-    pure
-        ( M.fromList
-              (concat
-                   [ maybe
-                         []
-                         (pure . generate CLib . libBuildInfo)
-                         (library pkg)
-                   , mapMaybe
-                         (\sublib -> do
-                            let maybeLib = CInternalLib . T.pack . Cabal.unUnqualComponentName <$> (libraryNameString . libName) sublib
-                            flip generate  (libBuildInfo sublib) <$> maybeLib
-                          )
-                         (subLibraries pkg)
-                   , fmap
-                         (\exe ->
-                               generate
-                                    (CExe (T.pack (Cabal.unUnqualComponentName (exeName exe))))
-                                    (buildInfo exe))
-                         (executables pkg)
-                   , fmap
-                         (\bench ->
-                               generate
-                                    (CBench (T.pack (Cabal.unUnqualComponentName (benchmarkName bench))))
-                                    (benchmarkBuildInfo bench))
-                         (benchmarks pkg)
-                   , fmap
-                         (\test ->
-                               generate
-                                    (CTest (T.pack (Cabal.unUnqualComponentName (testName test))))
-                                    (testBuildInfo test))
-                         (testSuites pkg)]))
-  where
-    cabalDir = parent cabalfp
-
--- | Input to 'generateBuildInfoOpts'
-data BioInput = BioInput
-    { biInstallMap :: !InstallMap
-    , biInstalledMap :: !InstalledMap
-    , biCabalDir :: !(Path Abs Dir)
-    , biDistDir :: !(Path Abs Dir)
-    , biOmitPackages :: ![PackageName]
-    , biAddPackages :: ![PackageName]
-    , biBuildInfo :: !BuildInfo
-    , biDotCabalPaths :: ![DotCabalPath]
-    , biConfigLibDirs :: ![FilePath]
-    , biConfigIncludeDirs :: ![FilePath]
-    , biComponentName :: !NamedComponent
-    , biCabalVersion :: !Version
-    }
-
--- | Generate GHC options for the target. Since Cabal also figures out
--- these options, currently this is only used for invoking GHCI (via
--- stack ghci).
+    installMap
+    installedMap
+    omitPackages
+    addPackages
+    cabalFP
+    pkg
+    componentPaths
+  = do
+      config <- view configL
+      cabalVersion <- view cabalVersionL
+      distDir <- distDirFromDir cabalDir
+      let generate componentName buildInfo = generateBuildInfoOpts BioInput
+            { installMap
+            , installedMap
+            , cabalDir
+            , distDir
+            , omitPackages
+            , addPackages
+            , buildInfo
+            , dotCabalPaths =
+                fromMaybe [] (M.lookup componentName componentPaths)
+            , configLibDirs = config.extraLibDirs
+            , configIncludeDirs = config.extraIncludeDirs
+            , componentName
+            , cabalVersion
+            }
+          insertInMap name compVal = M.insert name (generate name compVal)
+          translatedInsertInMap constructor name =
+            insertInMap (constructor name)
+          makeBuildInfoOpts ::
+               (Foldable t, HasBuildInfo component, HasName component)
+            => (Package -> t component)
+            -> (StackUnqualCompName -> NamedComponent)
+            -> Map NamedComponent BuildInfoOpts
+            -> Map NamedComponent BuildInfoOpts
+          makeBuildInfoOpts selector constructor =
+              foldOnNameAndBuildInfo
+                (selector pkg)
+                (translatedInsertInMap constructor)
+          aggregateAllBuildInfoOpts =
+              makeBuildInfoOpts (.library) (const CLib)
+            . makeBuildInfoOpts (.subLibraries) CSubLib
+            . makeBuildInfoOpts (.executables) CExe
+            . makeBuildInfoOpts (.benchmarks) CBench
+            . makeBuildInfoOpts (.testSuites) CTest
+      pure $ aggregateAllBuildInfoOpts mempty
+ where
+  cabalDir = parent cabalFP
+
+-- | Generate GHC options for the target. Since Cabal also figures out these
+-- options, currently this is only used for invoking GHCI (via stack ghci).
 generateBuildInfoOpts :: BioInput -> BuildInfoOpts
-generateBuildInfoOpts BioInput {..} =
-    BuildInfoOpts
-        { bioOpts = ghcOpts ++ fmap ("-optP" <>) (cppOptions biBuildInfo)
-        -- NOTE for future changes: Due to this use of nubOrd (and other uses
-        -- downstream), these generated options must not rely on multiple
-        -- argument sequences.  For example, ["--main-is", "Foo.hs", "--main-
-        -- is", "Bar.hs"] would potentially break due to the duplicate
-        -- "--main-is" being removed.
-        --
-        -- See https://github.com/commercialhaskell/stack/issues/1255
-        , bioOneWordOpts = nubOrd $ concat
-            [extOpts, srcOpts, includeOpts, libOpts, fworks, cObjectFiles]
-        , bioPackageFlags = deps
-        , bioCabalMacros = componentAutogen </> relFileCabalMacrosH
-        }
-  where
-    cObjectFiles =
-        mapMaybe (fmap toFilePath .
-                  makeObjectFilePathFromC biCabalDir biComponentName biDistDir)
-                 cfiles
-    cfiles = mapMaybe dotCabalCFilePath biDotCabalPaths
-    installVersion = snd
-    -- Generates: -package=base -package=base16-bytestring-0.1.1.6 ...
-    deps =
-        concat
-            [ case M.lookup name biInstalledMap of
-                Just (_, Stack.Types.Package.Library _ident ipid _) -> ["-package-id=" <> ghcPkgIdString ipid]
-                _ -> ["-package=" <> packageNameString name <>
-                 maybe "" -- This empty case applies to e.g. base.
-                     ((("-" <>) . versionString) . installVersion)
-                     (M.lookup name biInstallMap)]
-            | name <- pkgs]
-    pkgs =
-        biAddPackages ++
-        [ name
-        | Dependency name _ _ <- targetBuildDepends biBuildInfo -- TODO: cabal 3 introduced multiple public libraries in a single dependency
-        , name `notElem` biOmitPackages]
-    PerCompilerFlavor ghcOpts _ = options biBuildInfo
-    extOpts = map (("-X" ++) . display) (usedExtensions biBuildInfo)
-    srcOpts =
-        map (("-i" <>) . toFilePathNoTrailingSep)
-            (concat
-              [ [ componentBuildDir biCabalVersion biComponentName biDistDir ]
-              , [ biCabalDir
-                | null (hsSourceDirs biBuildInfo)
-                ]
-              , mapMaybe (toIncludeDir . getSymbolicPath) (hsSourceDirs biBuildInfo)
-              , [ componentAutogen ]
-              , maybeToList (packageAutogenDir biCabalVersion biDistDir)
-              , [ componentOutputDir biComponentName biDistDir ]
-              ]) ++
-        [ "-stubdir=" ++ toFilePathNoTrailingSep (buildDir biDistDir) ]
-    componentAutogen = componentAutogenDir biCabalVersion biComponentName biDistDir
-    toIncludeDir "." = Just biCabalDir
-    toIncludeDir relDir = concatAndCollapseAbsDir biCabalDir relDir
-    includeOpts =
-        map ("-I" <>) (biConfigIncludeDirs <> pkgIncludeOpts)
-    pkgIncludeOpts =
-        [ toFilePathNoTrailingSep absDir
-        | dir <- includeDirs biBuildInfo
-        , absDir <- handleDir dir
-        ]
-    libOpts =
-        map ("-l" <>) (extraLibs biBuildInfo) <>
-        map ("-L" <>) (biConfigLibDirs <> pkgLibDirs)
-    pkgLibDirs =
-        [ toFilePathNoTrailingSep absDir
-        | dir <- extraLibDirs biBuildInfo
-        , absDir <- handleDir dir
-        ]
-    handleDir dir = case (parseAbsDir dir, parseRelDir dir) of
-       (Just ab, _       ) -> [ab]
-       (_      , Just rel) -> [biCabalDir </> rel]
-       (Nothing, Nothing ) -> []
-    fworks = map (\fwk -> "-framework=" <> fwk) (frameworks biBuildInfo)
+generateBuildInfoOpts bi =
+  BuildInfoOpts
+    { opts =
+           ghcOpts
+        ++ fmap ("-optP" <>) bi.buildInfo.cppOptions
+    -- NOTE for future changes: Due to this use of nubOrd (and other uses
+    -- downstream), these generated options must not rely on multiple
+    -- argument sequences.  For example, ["--main-is", "Foo.hs", "--main-
+    -- is", "Bar.hs"] would potentially break due to the duplicate
+    -- "--main-is" being removed.
+    --
+    -- See https://github.com/commercialhaskell/stack/issues/1255
+    , oneWordOpts = nubOrd $ concat
+        [extOpts, srcOpts, includeOpts, libOpts, fworks, cObjectFiles]
+    , packageFlags = deps
+    , cabalMacros = componentAutogen </> relFileCabalMacrosH
+    }
+ where
+  cObjectFiles = mapMaybe
+    ( fmap toFilePath
+    . makeObjectFilePathFromC bi.cabalDir bi.componentName bi.distDir
+    )
+    cfiles
+  cfiles = mapMaybe dotCabalCFilePath bi.dotCabalPaths
+  installVersion = snd
+  -- Generates: -package=base -package=base16-bytestring-0.1.1.6 ...
+  deps =
+    concat
+      [ case M.lookup name bi.installedMap of
+          Just (_, Stack.Types.Installed.Library _ident installedInfo) ->
+            installedToPackageIdOpt installedInfo
+          _ -> ["-package=" <> packageNameString name <>
+            maybe "" -- This empty case applies to e.g. base.
+              ((("-" <>) . versionString) . installVersion)
+              (M.lookup name bi.installMap)]
+      | name <- pkgs
+      ]
+  pkgs =
+    bi.addPackages ++
+    [ name
+    | Dependency name _ _ <- bi.buildInfo.targetBuildDepends
+      -- TODO: Cabal 3.0 introduced multiple public libraries in a single
+      -- dependency
+    , name `notElem` bi.omitPackages
+    ]
+  PerCompilerFlavor ghcOpts _ = bi.buildInfo.options
+  extOpts =
+       map (("-X" ++) . display) bi.buildInfo.allLanguages
+    <> map (("-X" ++) . display) bi.buildInfo.usedExtensions
+  srcOpts =
+    map (("-i" <>) . toFilePathNoTrailingSep)
+      (concat
+        [ [ componentBuildDir bi.componentName bi.distDir ]
+        , [ bi.cabalDir
+          | null bi.buildInfo.hsSourceDirs
+          ]
+        , mapMaybe
+            (toIncludeDir . getSymbolicPath)
+            bi.buildInfo.hsSourceDirs
+        , [ componentAutogen ]
+        , [ packageAutogenDir bi.distDir ]
+        , [ componentOutputDir bi.componentName bi.distDir ]
+        ]) ++
+    [ "-stubdir=" ++ toFilePathNoTrailingSep (buildDir bi.distDir) ]
+  componentAutogen = componentAutogenDir bi.componentName bi.distDir
+  toIncludeDir "." = Just bi.cabalDir
+  toIncludeDir relDir = concatAndCollapseAbsDir bi.cabalDir relDir
+  includeOpts =
+    map ("-I" <>) (bi.configIncludeDirs <> pkgIncludeOpts)
+  pkgIncludeOpts =
+    [ toFilePathNoTrailingSep absDir
+    | dir <- bi.buildInfo.includeDirs
+    , absDir <- handleDir dir
+    ]
+  libOpts =
+    map ("-l" <>) bi.buildInfo.extraLibs <>
+    map ("-L" <>) (bi.configLibDirs <> pkgLibDirs)
+  pkgLibDirs =
+    [ toFilePathNoTrailingSep absDir
+    | dir <- bi.buildInfo.extraLibDirs
+    , absDir <- handleDir dir
+    ]
+  handleDir dir = case (parseAbsDir dir, parseRelDir dir) of
+    (Just ab, _       ) -> [ab]
+    (_      , Just rel) -> [bi.cabalDir </> rel]
+    (Nothing, Nothing ) -> []
+  fworks = map ("-framework=" <>) bi.buildInfo.frameworks
 
 -- | Make the .o path from the .c file path for a component. Example:
 --
@@ -457,173 +405,31 @@ generateBuildInfoOpts BioInput {..} =
 --     $(mkAbsFile "/Users/chris/Repos/hoogle/cbits/text_search.c")
 -- Just "/Users/chris/Repos/hoogle/.stack-work/Cabal-x.x.x/dist/build/hoogle/hoogle-tmp/cbits/text_search.o"
 -- λ>
-makeObjectFilePathFromC
-    :: MonadThrow m
-    => Path Abs Dir          -- ^ The cabal directory.
-    -> NamedComponent        -- ^ The name of the component.
-    -> Path Abs Dir          -- ^ Dist directory.
-    -> Path Abs File         -- ^ The path to the .c file.
-    -> m (Path Abs File) -- ^ The path to the .o file for the component.
+makeObjectFilePathFromC ::
+     MonadThrow m
+  => Path Abs Dir      -- ^ The cabal directory.
+  -> NamedComponent    -- ^ The name of the component.
+  -> Path Abs Dir      -- ^ Dist directory.
+  -> Path Abs File     -- ^ The path to the .c file.
+  -> m (Path Abs File) -- ^ The path to the .o file for the component.
 makeObjectFilePathFromC cabalDir namedComponent distDir cFilePath = do
-    relCFilePath <- stripProperPrefix cabalDir cFilePath
-    relOFilePath <-
-        parseRelFile (replaceExtension (toFilePath relCFilePath) "o")
-    pure (componentOutputDir namedComponent distDir </> relOFilePath)
-
--- | Make the global autogen dir if Cabal version is new enough.
-packageAutogenDir :: Version -> Path Abs Dir -> Maybe (Path Abs Dir)
-packageAutogenDir cabalVer distDir
-    | cabalVer < mkVersion [2, 0] = Nothing
-    | otherwise = Just $ buildDir distDir </> relDirGlobalAutogen
-
--- | Make the autogen dir.
-componentAutogenDir :: Version -> NamedComponent -> Path Abs Dir -> Path Abs Dir
-componentAutogenDir cabalVer component distDir =
-    componentBuildDir cabalVer component distDir </> relDirAutogen
-
--- | See 'Distribution.Simple.LocalBuildInfo.componentBuildDir'
-componentBuildDir :: Version -> NamedComponent -> Path Abs Dir -> Path Abs Dir
-componentBuildDir cabalVer component distDir
-    | cabalVer < mkVersion [2, 0] = buildDir distDir
-    | otherwise =
-        case component of
-            CLib -> buildDir distDir
-            CInternalLib name -> buildDir distDir </> componentNameToDir name
-            CExe name -> buildDir distDir </> componentNameToDir name
-            CTest name -> buildDir distDir </> componentNameToDir name
-            CBench name -> buildDir distDir </> componentNameToDir name
-
--- | The directory where generated files are put like .o or .hs (from .x files).
-componentOutputDir :: NamedComponent -> Path Abs Dir -> Path Abs Dir
-componentOutputDir namedComponent distDir =
-    case namedComponent of
-        CLib -> buildDir distDir
-        CInternalLib name -> makeTmp name
-        CExe name -> makeTmp name
-        CTest name -> makeTmp name
-        CBench name -> makeTmp name
-  where
-    makeTmp name =
-      buildDir distDir </> componentNameToDir (name <> "/" <> name <> "-tmp")
-
--- | Make the build dir. Note that Cabal >= 2.0 uses the
--- 'componentBuildDir' above for some things.
-buildDir :: Path Abs Dir -> Path Abs Dir
-buildDir distDir = distDir </> relDirBuild
-
--- NOTE: don't export this, only use it for valid paths based on
--- component names.
-componentNameToDir :: Text -> Path Rel Dir
-componentNameToDir name =
-  fromMaybe (error "Invariant violated: component names should always parse as directory names")
-            (parseRelDir (T.unpack name))
+  relCFilePath <- stripProperPrefix cabalDir cFilePath
+  relOFilePath <-
+    parseRelFile (replaceExtension (toFilePath relCFilePath) "o")
+  pure (componentOutputDir namedComponent distDir </> relOFilePath)
 
 -- | Get all dependencies of the package (buildable targets only).
---
--- Note that for Cabal versions 1.22 and earlier, there is a bug where
--- Cabal requires dependencies for non-buildable components to be
--- present. We're going to use GHC version as a proxy for Cabal
--- library version in this case for simplicity, so we'll check for GHC
--- being 7.10 or earlier. This obviously makes our function a lot more
--- fun to write...
-packageDependencies
-  :: PackageConfig
-  -> PackageDescription
+packageDependencies ::
+     PackageDescription
   -> Map PackageName VersionRange
-packageDependencies pkgConfig pkg' =
+packageDependencies pkg =
   M.fromListWith intersectVersionRanges $
-  map (depPkgName &&& depVerRange) $
-  concatMap targetBuildDepends (allBuildInfo' pkg) ++
-  maybe [] setupDepends (setupBuildInfo pkg)
-  where
-    pkg
-      | getGhcVersion (packageConfigCompilerVersion pkgConfig) >= mkVersion [8, 0] = pkg'
-      -- Set all components to buildable. Only need to worry about
-      -- library, exe, test, and bench, since others didn't exist in
-      -- older Cabal versions
-      | otherwise = pkg'
-        { library = (\c -> c { libBuildInfo = go (libBuildInfo c) }) <$> library pkg'
-        , executables = (\c -> c { buildInfo = go (buildInfo c) }) <$> executables pkg'
-        , testSuites =
-            if packageConfigEnableTests pkgConfig
-              then (\c -> c { testBuildInfo = go (testBuildInfo c) }) <$> testSuites pkg'
-              else testSuites pkg'
-        , benchmarks =
-            if packageConfigEnableBenchmarks pkgConfig
-              then (\c -> c { benchmarkBuildInfo = go (benchmarkBuildInfo c) }) <$> benchmarks pkg'
-              else benchmarks pkg'
-        }
-
-    go bi = bi { buildable = True }
-
--- | Get all dependencies of the package (buildable targets only).
---
--- This uses both the new 'buildToolDepends' and old 'buildTools'
--- information.
-packageDescTools
-  :: PackageDescription
-  -> (Set ExeName, Map PackageName DepValue)
-packageDescTools pd =
-    (S.fromList $ concat unknowns, M.fromListWith (<>) $ concat knowns)
-  where
-    (unknowns, knowns) = unzip $ map perBI $ allBuildInfo' pd
-
-    perBI :: BuildInfo -> ([ExeName], [(PackageName, DepValue)])
-    perBI bi =
-        (unknownTools, tools)
-      where
-        (unknownTools, knownTools) = partitionEithers $ map go1 (buildTools bi)
-
-        tools = mapMaybe go2 (knownTools ++ buildToolDepends bi)
-
-        -- This is similar to desugarBuildTool from Cabal, however it
-        -- uses our own hard-coded map which drops tools shipped with
-        -- GHC (like hsc2hs), and includes some tools from Stackage.
-        go1 :: Cabal.LegacyExeDependency -> Either ExeName Cabal.ExeDependency
-        go1 (Cabal.LegacyExeDependency name range) =
-          case M.lookup name hardCodedMap of
-            Just pkgName -> Right $ Cabal.ExeDependency pkgName (Cabal.mkUnqualComponentName name) range
-            Nothing -> Left $ ExeName $ T.pack name
-
-        go2 :: Cabal.ExeDependency -> Maybe (PackageName, DepValue)
-        go2 (Cabal.ExeDependency pkg _name range)
-          | pkg `S.member` preInstalledPackages = Nothing
-          | otherwise = Just
-              ( pkg
-              , DepValue
-                  { dvVersionRange = range
-                  , dvType = AsBuildTool
-                  }
-              )
-
--- | A hard-coded map for tool dependencies
-hardCodedMap :: Map String PackageName
-hardCodedMap = M.fromList
-  [ ("alex", Distribution.Package.mkPackageName "alex")
-  , ("happy", Distribution.Package.mkPackageName "happy")
-  , ("cpphs", Distribution.Package.mkPackageName "cpphs")
-  , ("greencard", Distribution.Package.mkPackageName "greencard")
-  , ("c2hs", Distribution.Package.mkPackageName "c2hs")
-  , ("hscolour", Distribution.Package.mkPackageName "hscolour")
-  , ("hspec-discover", Distribution.Package.mkPackageName "hspec-discover")
-  , ("hsx2hs", Distribution.Package.mkPackageName "hsx2hs")
-  , ("gtk2hsC2hs", Distribution.Package.mkPackageName "gtk2hs-buildtools")
-  , ("gtk2hsHookGenerator", Distribution.Package.mkPackageName "gtk2hs-buildtools")
-  , ("gtk2hsTypeGen", Distribution.Package.mkPackageName "gtk2hs-buildtools")
-  ]
+    map (depPkgName &&& depVerRange) $
+         concatMap targetBuildDepends (allBuildInfo' pkg)
+      <> maybe [] setupDepends (setupBuildInfo pkg)
 
--- | Executable-only packages which come pre-installed with GHC and do
--- not need to be built. Without this exception, we would either end
--- up unnecessarily rebuilding these packages, or failing because the
--- packages do not appear in the Stackage snapshot.
-preInstalledPackages :: Set PackageName
-preInstalledPackages = S.fromList
-  [ mkPackageName "hsc2hs"
-  , mkPackageName "haddock"
-  ]
-
--- | Variant of 'allBuildInfo' from Cabal that, like versions before
--- 2.2, only includes buildable components.
+-- | Variant of 'Distribution.Types.PackageDescription.allBuildInfo' from Cabal
+-- that, like versions before Cabal 2.2 only includes buildable components.
 allBuildInfo' :: PackageDescription -> [BuildInfo]
 allBuildInfo' pkg_descr = [ bi | lib <- allLibraries pkg_descr
                                , let bi = libBuildInfo lib
@@ -641,701 +447,142 @@ allBuildInfo' pkg_descr = [ bi | lib <- allLibraries pkg_descr
                                , let bi = benchmarkBuildInfo tst
                                , buildable bi ]
 
--- | Get all files referenced by the package.
-packageDescModulesAndFiles
-    :: PackageDescription
-    -> RIO Ctx (Map NamedComponent (Map ModuleName (Path Abs File)), Map NamedComponent [DotCabalPath], Set (Path Abs File), [PackageWarning])
-packageDescModulesAndFiles pkg = do
-    (libraryMods,libDotCabalFiles,libWarnings) <-
-        maybe
-            (pure (M.empty, M.empty, []))
-            (asModuleAndFileMap libComponent libraryFiles)
-            (library pkg)
-    (subLibrariesMods,subLibDotCabalFiles,subLibWarnings) <-
-        liftM
-            foldTuples
-            (mapM
-                 (asModuleAndFileMap internalLibComponent libraryFiles)
-                 (subLibraries pkg))
-    (executableMods,exeDotCabalFiles,exeWarnings) <-
-        liftM
-            foldTuples
-            (mapM
-                 (asModuleAndFileMap exeComponent executableFiles)
-                 (executables pkg))
-    (testMods,testDotCabalFiles,testWarnings) <-
-        liftM
-            foldTuples
-            (mapM (asModuleAndFileMap testComponent testFiles) (testSuites pkg))
-    (benchModules,benchDotCabalPaths,benchWarnings) <-
-        liftM
-            foldTuples
-            (mapM
-                 (asModuleAndFileMap benchComponent benchmarkFiles)
-                 (benchmarks pkg))
-    dfiles <- resolveGlobFiles (specVersion pkg)
-                    (extraSrcFiles pkg
-                        ++ map (dataDir pkg FilePath.</>) (dataFiles pkg))
-    let modules = libraryMods <> subLibrariesMods <> executableMods <> testMods <> benchModules
-        files =
-            libDotCabalFiles <> subLibDotCabalFiles <> exeDotCabalFiles <> testDotCabalFiles <>
-            benchDotCabalPaths
-        warnings = libWarnings <> subLibWarnings <> exeWarnings <> testWarnings <> benchWarnings
-    pure (modules, files, dfiles, warnings)
-  where
-    libComponent = const CLib
-    internalLibComponent = CInternalLib . T.pack . maybe "" Cabal.unUnqualComponentName . libraryNameString . libName
-    exeComponent = CExe . T.pack . Cabal.unUnqualComponentName . exeName
-    testComponent = CTest . T.pack . Cabal.unUnqualComponentName . testName
-    benchComponent = CBench . T.pack . Cabal.unUnqualComponentName . benchmarkName
-    asModuleAndFileMap label f lib = do
-        (a,b,c) <- f (label lib) lib
-        pure (M.singleton (label lib) a, M.singleton (label lib) b, c)
-    foldTuples = foldl' (<>) (M.empty, M.empty, [])
-
--- | Resolve globbing of files (e.g. data files) to absolute paths.
-resolveGlobFiles
-  :: CabalSpecVersion -- ^ Cabal file version
-  -> [String]
-  -> RIO Ctx (Set (Path Abs File))
-resolveGlobFiles cabalFileVersion =
-    liftM (S.fromList . catMaybes . concat) .
-    mapM resolve
-  where
-    resolve name =
-        if '*' `elem` name
-            then explode name
-            else liftM pure (resolveFileOrWarn name)
-    explode name = do
-        dir <- asks (parent . ctxFile)
-        names <-
-            matchDirFileGlob'
-                (FL.toFilePath dir)
-                name
-        mapM resolveFileOrWarn names
-    matchDirFileGlob' dir glob =
-        catch
-            (liftIO (matchDirFileGlob minBound cabalFileVersion dir glob))
-            (\(e :: IOException) ->
-                  if isUserError e
-                      then do
-                          prettyWarnL
-                              [ flow "Wildcard does not match any files:"
-                              , style File $ fromString glob
-                              , line <> flow "in directory:"
-                              , style Dir $ fromString dir
-                              ]
-                          pure []
-                      else throwIO e)
-
--- | Get all files referenced by the benchmark.
-benchmarkFiles
-    :: NamedComponent
-    -> Benchmark
-    -> RIO Ctx (Map ModuleName (Path Abs File), [DotCabalPath], [PackageWarning])
-benchmarkFiles component bench = do
-    resolveComponentFiles component build names
-  where
-    names = bnames <> exposed
-    exposed =
-        case benchmarkInterface bench of
-            BenchmarkExeV10 _ fp -> [DotCabalMain fp]
-            BenchmarkUnsupported _ -> []
-    bnames = map DotCabalModule (otherModules build)
-    build = benchmarkBuildInfo bench
-
--- | Get all files referenced by the test.
-testFiles
-    :: NamedComponent
-    -> TestSuite
-    -> RIO Ctx (Map ModuleName (Path Abs File), [DotCabalPath], [PackageWarning])
-testFiles component test = do
-    resolveComponentFiles component build names
-  where
-    names = bnames <> exposed
-    exposed =
-        case testInterface test of
-            TestSuiteExeV10 _ fp -> [DotCabalMain fp]
-            TestSuiteLibV09 _ mn -> [DotCabalModule mn]
-            TestSuiteUnsupported _ -> []
-    bnames = map DotCabalModule (otherModules build)
-    build = testBuildInfo test
-
--- | Get all files referenced by the executable.
-executableFiles
-    :: NamedComponent
-    -> Executable
-    -> RIO Ctx (Map ModuleName (Path Abs File), [DotCabalPath], [PackageWarning])
-executableFiles component exe = do
-    resolveComponentFiles component build names
-  where
-    build = buildInfo exe
-    names =
-        map DotCabalModule (otherModules build) ++
-        [DotCabalMain (modulePath exe)]
-
--- | Get all files referenced by the library.
-libraryFiles
-    :: NamedComponent
-    -> Library
-    -> RIO Ctx (Map ModuleName (Path Abs File), [DotCabalPath], [PackageWarning])
-libraryFiles component lib = do
-    resolveComponentFiles component build names
-  where
-    build = libBuildInfo lib
-    names = bnames ++ exposed
-    exposed = map DotCabalModule (exposedModules lib)
-    bnames = map DotCabalModule (otherModules build)
-
--- | Get all files referenced by the component.
-resolveComponentFiles
-    :: NamedComponent
-    -> BuildInfo
-    -> [DotCabalDescriptor]
-    -> RIO Ctx (Map ModuleName (Path Abs File), [DotCabalPath], [PackageWarning])
-resolveComponentFiles component build names = do
-    dirs <- mapMaybeM (resolveDirOrWarn . getSymbolicPath) (hsSourceDirs build)
-    dir <- asks (parent . ctxFile)
-    agdirs <- autogenDirs
-    (modules,files,warnings) <-
-        resolveFilesAndDeps
-            component
-            ((if null dirs then [dir] else dirs) ++ agdirs)
-            names
-    cfiles <- buildOtherSources build
-    pure (modules, files <> cfiles, warnings)
-  where
-    autogenDirs = do
-      cabalVer <- asks ctxCabalVer
-      distDir <- asks ctxDistDir
-      let compDir = componentAutogenDir cabalVer component distDir
-          pkgDir = maybeToList $ packageAutogenDir cabalVer distDir
-      filterM doesDirExist $ compDir : pkgDir
-
--- | Get all C sources and extra source files in a build.
-buildOtherSources :: BuildInfo -> RIO Ctx [DotCabalPath]
-buildOtherSources build = do
-    cwd <- liftIO getCurrentDir
-    dir <- asks (parent . ctxFile)
-    file <- asks ctxFile
-    let resolveDirFiles files toCabalPath =
-            forMaybeM files $ \fp -> do
-                result <- resolveDirFile dir fp
-                case result of
-                    Nothing -> do
-                        warnMissingFile "File" cwd fp file
-                        pure Nothing
-                    Just p -> pure $ Just (toCabalPath p)
-    csources <- resolveDirFiles (cSources build) DotCabalCFilePath
-    jsources <- resolveDirFiles (targetJsSources build) DotCabalFilePath
-    pure (csources <> jsources)
-
--- | Get the target's JS sources.
-targetJsSources :: BuildInfo -> [FilePath]
-targetJsSources = jsSources
-
--- | A pair of package descriptions: one which modified the buildable
--- values of test suites and benchmarks depending on whether they are
--- enabled, and one which does not.
---
--- Fields are intentionally lazy, we may only need one or the other
--- value.
---
--- MSS 2017-08-29: The very presence of this data type is terribly
--- ugly, it represents the fact that the Cabal 2.0 upgrade did _not_
--- go well. Specifically, we used to have a field to indicate whether
--- a component was enabled in addition to buildable, but that's gone
--- now, and this is an ugly proxy. We should at some point clean up
--- the mess of Package, LocalPackage, etc, and probably pull in the
--- definition of PackageDescription from Cabal with our additionally
--- needed metadata. But this is a good enough hack for the
--- moment. Odds are, you're reading this in the year 2024 and thinking
--- "wtf?"
-data PackageDescriptionPair = PackageDescriptionPair
-  { pdpOrigBuildable :: PackageDescription
-  , pdpModifiedBuildable :: PackageDescription
-  }
-
--- | Evaluates the conditions of a 'GenericPackageDescription', yielding
--- a resolved 'PackageDescription'.
-resolvePackageDescription :: PackageConfig
-                          -> GenericPackageDescription
-                          -> PackageDescriptionPair
-resolvePackageDescription packageConfig (GenericPackageDescription desc _ defaultFlags mlib subLibs foreignLibs' exes tests benches) =
-    PackageDescriptionPair
-      { pdpOrigBuildable = go False
-      , pdpModifiedBuildable = go True
+-- | Evaluates the conditions of a t'GenericPackageDescription', yielding
+-- a resolved t'PackageDescription'.
+resolvePackageDescription ::
+     PackageConfig
+  -> GenericPackageDescription
+  -> PackageDescription
+resolvePackageDescription
+    packageConfig
+    ( GenericPackageDescription
+        desc _ defaultFlags mlib subLibs foreignLibs' exes tests benches
+    )
+  = desc
+      { library = fmap (resolveConditions rc updateLibDeps) mlib
+      , subLibraries = map
+          ( \(n, v) ->
+              (resolveConditions rc updateLibDeps v){libName = LSubLibName n}
+          )
+          subLibs
+      , foreignLibs = map
+          ( \(n, v) ->
+              (resolveConditions rc updateForeignLibDeps v){foreignLibName = n}
+          )
+          foreignLibs'
+      , executables = map
+          ( \(n, v) -> (resolveConditions rc updateExeDeps v){exeName = n} )
+          exes
+      , testSuites = map
+          ( \(n, v) ->
+              (resolveConditions rc updateTestDeps v){testName = n}
+          )
+          tests
+      , benchmarks = map
+          ( \(n, v) ->
+              (resolveConditions rc updateBenchmarkDeps v){benchmarkName = n}
+          )
+          benches
       }
-  where
-        go modBuildable =
-          desc {library =
-                  fmap (resolveConditions rc updateLibDeps) mlib
-               ,subLibraries =
-                  map (\(n, v) -> (resolveConditions rc updateLibDeps v){libName=LSubLibName n})
-                      subLibs
-               ,foreignLibs =
-                  map (\(n, v) -> (resolveConditions rc updateForeignLibDeps v){foreignLibName=n})
-                      foreignLibs'
-               ,executables =
-                  map (\(n, v) -> (resolveConditions rc updateExeDeps v){exeName=n})
-                      exes
-               ,testSuites =
-                  map (\(n,v) -> (resolveConditions rc (updateTestDeps modBuildable) v){testName=n})
-                      tests
-               ,benchmarks =
-                  map (\(n,v) -> (resolveConditions rc (updateBenchmarkDeps modBuildable) v){benchmarkName=n})
-                      benches}
-
-        flags =
-          M.union (packageConfigFlags packageConfig)
-                  (flagMap defaultFlags)
-
-        rc = mkResolveConditions
-                (packageConfigCompilerVersion packageConfig)
-                (packageConfigPlatform packageConfig)
-                flags
-
-        updateLibDeps lib deps =
-          lib {libBuildInfo =
-                 (libBuildInfo lib) {targetBuildDepends = deps}}
-        updateForeignLibDeps lib deps =
-          lib {foreignLibBuildInfo =
-                 (foreignLibBuildInfo lib) {targetBuildDepends = deps}}
-        updateExeDeps exe deps =
-          exe {buildInfo =
-                 (buildInfo exe) {targetBuildDepends = deps}}
-
-        -- Note that, prior to moving to Cabal 2.0, we would set
-        -- testEnabled/benchmarkEnabled here. These fields no longer
-        -- exist, so we modify buildable instead here.  The only
-        -- wrinkle in the Cabal 2.0 story is
-        -- https://github.com/haskell/cabal/issues/1725, where older
-        -- versions of Cabal (which may be used for actually building
-        -- code) don't properly exclude build-depends for
-        -- non-buildable components. Testing indicates that everything
-        -- is working fine, and that this comment can be completely
-        -- ignored. I'm leaving the comment anyway in case something
-        -- breaks and you, poor reader, are investigating.
-        updateTestDeps modBuildable test deps =
-          let bi = testBuildInfo test
-              bi' = bi
-                { targetBuildDepends = deps
-                , buildable = buildable bi && (if modBuildable then packageConfigEnableTests packageConfig else True)
-                }
-           in test { testBuildInfo = bi' }
-        updateBenchmarkDeps modBuildable benchmark deps =
-          let bi = benchmarkBuildInfo benchmark
-              bi' = bi
-                { targetBuildDepends = deps
-                , buildable = buildable bi && (if modBuildable then packageConfigEnableBenchmarks packageConfig else True)
-                }
-           in benchmark { benchmarkBuildInfo = bi' }
+ where
+  flags = M.union packageConfig.flags (flagMap defaultFlags)
+  rc = mkResolveConditions
+         packageConfig.compilerVersion
+         packageConfig.platform
+         flags
+  updateLibDeps lib deps = lib
+    { libBuildInfo = (libBuildInfo lib) {targetBuildDepends = deps} }
+  updateForeignLibDeps lib deps = lib
+    { foreignLibBuildInfo =
+        (foreignLibBuildInfo lib) {targetBuildDepends = deps}
+    }
+  updateExeDeps exe deps = exe
+    { Executable.buildInfo = (buildInfo exe) {targetBuildDepends = deps} }
+  updateTestDeps test deps = test
+    { testBuildInfo = (testBuildInfo test) {targetBuildDepends = deps} }
+  updateBenchmarkDeps bench deps = bench
+    { benchmarkBuildInfo =
+        (benchmarkBuildInfo bench) {targetBuildDepends = deps}
+    }
 
 -- | Make a map from a list of flag specifications.
 --
 -- What is @flagManual@ for?
 flagMap :: [PackageFlag] -> Map FlagName Bool
 flagMap = M.fromList . map pair
-  where pair :: PackageFlag -> (FlagName, Bool)
-        pair = flagName &&& flagDefault
+ where
+  pair :: PackageFlag -> (FlagName, Bool)
+  pair = flagName &&& flagDefault
 
 data ResolveConditions = ResolveConditions
-    { rcFlags :: Map FlagName Bool
-    , rcCompilerVersion :: ActualCompiler
-    , rcOS :: OS
-    , rcArch :: Arch
-    }
+  { flags :: Map FlagName Bool
+  , compilerVersion :: ActualCompiler
+  , os :: OS
+  , arch :: Arch
+  }
 
 -- | Generic a @ResolveConditions@ using sensible defaults.
-mkResolveConditions :: ActualCompiler -- ^ Compiler version
-                    -> Platform -- ^ installation target platform
-                    -> Map FlagName Bool -- ^ enabled flags
-                    -> ResolveConditions
+mkResolveConditions ::
+     ActualCompiler -- ^ Compiler version
+  -> Platform -- ^ installation target platform
+  -> Map FlagName Bool -- ^ enabled flags
+  -> ResolveConditions
 mkResolveConditions compilerVersion (Platform arch os) flags = ResolveConditions
-    { rcFlags = flags
-    , rcCompilerVersion = compilerVersion
-    , rcOS = os
-    , rcArch = arch
-    }
+  { flags
+  , compilerVersion
+  , os
+  , arch
+  }
 
 -- | Resolve the condition tree for the library.
-resolveConditions :: (Semigroup target,Monoid target,Show target)
-                  => ResolveConditions
-                  -> (target -> cs -> target)
-                  -> CondTree ConfVar cs target
-                  -> target
+resolveConditions ::
+     (Semigroup target, Monoid target, Show target)
+  => ResolveConditions
+  -> (target -> cs -> target)
+  -> CondTree ConfVar cs target
+  -> target
 resolveConditions rc addDeps (CondNode lib deps cs) = basic <> children
-  where basic = addDeps lib deps
-        children = mconcat (map apply cs)
-          where apply (Cabal.CondBranch cond node mcs) =
-                  if condSatisfied cond
-                     then resolveConditions rc addDeps node
-                     else maybe mempty (resolveConditions rc addDeps) mcs
-                condSatisfied c =
-                  case c of
-                    Var v -> varSatisfied v
-                    Lit b -> b
-                    CNot c' ->
-                      not (condSatisfied c')
-                    COr cx cy ->
-                      condSatisfied cx || condSatisfied cy
-                    CAnd cx cy ->
-                      condSatisfied cx && condSatisfied cy
-                varSatisfied v =
-                  case v of
-                    OS os -> os == rcOS rc
-                    Arch arch -> arch == rcArch rc
-                    PackageFlag flag ->
-                      fromMaybe False $ M.lookup flag (rcFlags rc)
-                      -- NOTE:  ^^^^^ This should never happen, as all flags
-                      -- which are used must be declared. Defaulting to
-                      -- False.
-                    Impl flavor range ->
-                      case (flavor, rcCompilerVersion rc) of
-                        (GHC, ACGhc vghc) -> vghc `withinRange` range
-                        _ -> False
-
--- | Try to resolve the list of base names in the given directory by
--- looking for unique instances of base names applied with the given
--- extensions, plus find any of their module and TemplateHaskell
--- dependencies.
-resolveFilesAndDeps
-    :: NamedComponent       -- ^ Package component name
-    -> [Path Abs Dir]       -- ^ Directories to look in.
-    -> [DotCabalDescriptor] -- ^ Base names.
-    -> RIO Ctx (Map ModuleName (Path Abs File),[DotCabalPath],[PackageWarning])
-resolveFilesAndDeps component dirs names0 = do
-    (dotCabalPaths, foundModules, missingModules) <- loop names0 S.empty
-    warnings <- liftM2 (++) (warnUnlisted foundModules) (warnMissing missingModules)
-    pure (foundModules, dotCabalPaths, warnings)
-  where
-    loop [] _ = pure ([], M.empty, [])
-    loop names doneModules0 = do
-        resolved <- resolveFiles dirs names
-        let foundFiles = mapMaybe snd resolved
-            foundModules = mapMaybe toResolvedModule resolved
-            missingModules = mapMaybe toMissingModule resolved
-        pairs <- mapM (getDependencies component dirs) foundFiles
-        let doneModules =
-                S.union
-                    doneModules0
-                    (S.fromList (mapMaybe dotCabalModule names))
-            moduleDeps = S.unions (map fst pairs)
-            thDepFiles = concatMap snd pairs
-            modulesRemaining = S.difference moduleDeps doneModules
-        -- Ignore missing modules discovered as dependencies - they may
-        -- have been deleted.
-        (resolvedFiles, resolvedModules, _) <-
-            loop (map DotCabalModule (S.toList modulesRemaining)) doneModules
-        pure
-            ( nubOrd $ foundFiles <> map DotCabalFilePath thDepFiles <> resolvedFiles
-            , M.union
-                  (M.fromList foundModules)
-                  resolvedModules
-            , missingModules)
-    warnUnlisted foundModules = do
-        let unlistedModules =
-                foundModules `M.difference`
-                M.fromList (mapMaybe (fmap (, ()) . dotCabalModule) names0)
-        pure $
-            if M.null unlistedModules
-                then []
-                else [ UnlistedModulesWarning
-                           component
-                           (map fst (M.toList unlistedModules))]
-    warnMissing _missingModules = do
-        pure []
-        -- TODO: bring this back - see
-        -- https://github.com/commercialhaskell/stack/issues/2649
-        {-
-        cabalfp <- asks ctxFile
-        pure $
-            if null missingModules
-               then []
-               else [ MissingModulesWarning
-                           cabalfp
-                           component
-                           missingModules]
-        -}
-    -- TODO: In usages of toResolvedModule / toMissingModule, some sort
-    -- of map + partition would probably be better.
-    toResolvedModule
-        :: (DotCabalDescriptor, Maybe DotCabalPath)
-        -> Maybe (ModuleName, Path Abs File)
-    toResolvedModule (DotCabalModule mn, Just (DotCabalModulePath fp)) =
-        Just (mn, fp)
-    toResolvedModule _ =
-        Nothing
-    toMissingModule
-        :: (DotCabalDescriptor, Maybe DotCabalPath)
-        -> Maybe ModuleName
-    toMissingModule (DotCabalModule mn, Nothing) =
-        Just mn
-    toMissingModule _ =
-        Nothing
-
--- | Get the dependencies of a Haskell module file.
-getDependencies
-    :: NamedComponent -> [Path Abs Dir] -> DotCabalPath -> RIO Ctx (Set ModuleName, [Path Abs File])
-getDependencies component dirs dotCabalPath =
-    case dotCabalPath of
-        DotCabalModulePath resolvedFile -> readResolvedHi resolvedFile
-        DotCabalMainPath resolvedFile -> readResolvedHi resolvedFile
-        DotCabalFilePath{} -> pure (S.empty, [])
-        DotCabalCFilePath{} -> pure (S.empty, [])
-  where
-    readResolvedHi resolvedFile = do
-        dumpHIDir <- componentOutputDir component <$> asks ctxDistDir
-        dir <- asks (parent . ctxFile)
-        let sourceDir = fromMaybe dir $ find (`isProperPrefixOf` resolvedFile) dirs
-            stripSourceDir d = stripProperPrefix d resolvedFile
-        case stripSourceDir sourceDir of
-            Nothing -> pure (S.empty, [])
-            Just fileRel -> do
-                let hiPath =
-                        FilePath.replaceExtension
-                            (toFilePath (dumpHIDir </> fileRel))
-                            ".hi"
-                dumpHIExists <- liftIO $ D.doesFileExist hiPath
-                if dumpHIExists
-                    then parseHI hiPath
-                    else pure (S.empty, [])
-
--- | Parse a .hi file into a set of modules and files.
-parseHI
-    :: FilePath -> RIO Ctx (Set ModuleName, [Path Abs File])
-parseHI hiPath = do
-  dir <- asks (parent . ctxFile)
-  result <- liftIO $ Iface.fromFile hiPath `catchAnyDeep` \e -> pure (Left (show e))
-  case result of
-    Left msg -> do
-      prettyStackDevL
-        [ flow "Failed to decode module interface:"
-        , style File $ fromString hiPath
-        , flow "Decoding failure:"
-        , style Error $ fromString msg
-        ]
-      pure (S.empty, [])
-    Right iface -> do
-      let moduleNames = fmap (fromString . T.unpack . decodeUtf8Lenient . fst) .
-                        Iface.unList . Iface.dmods . Iface.deps
-          resolveFileDependency file = do
-            resolved <- liftIO (forgivingAbsence (resolveFile dir file)) >>= rejectMissingFile
-            when (isNothing resolved) $
-              prettyWarnL
-              [ flow "Dependent file listed in:"
-              , style File $ fromString hiPath
-              , flow "does not exist:"
-              , style File $ fromString file
-              ]
-            pure resolved
-          resolveUsages = traverse (resolveFileDependency . Iface.unUsage) . Iface.unList . Iface.usage
-      resolvedUsages <- catMaybes <$> resolveUsages iface
-      pure (S.fromList $ moduleNames iface, resolvedUsages)
-
--- | Try to resolve the list of base names in the given directory by
--- looking for unique instances of base names applied with the given
--- extensions.
-resolveFiles
-    :: [Path Abs Dir] -- ^ Directories to look in.
-    -> [DotCabalDescriptor] -- ^ Base names.
-    -> RIO Ctx [(DotCabalDescriptor, Maybe DotCabalPath)]
-resolveFiles dirs names =
-    forM names (\name -> liftM (name, ) (findCandidate dirs name))
-
-data CabalFileNameParseFail
-  = CabalFileNameParseFail FilePath
-  | CabalFileNameInvalidPackageName FilePath
-  deriving (Typeable)
-
-instance Exception CabalFileNameParseFail
-instance Show CabalFileNameParseFail where
-    show (CabalFileNameParseFail fp) =
-        "Invalid file path for Cabal file, must have a .cabal extension: " ++ fp
-    show (CabalFileNameInvalidPackageName fp) =
-        "Cabal file names must use valid package names followed by a .cabal extension, the following is invalid: " ++ fp
-
--- | Parse a package name from a file path.
-parsePackageNameFromFilePath :: MonadThrow m => Path a File -> m PackageName
-parsePackageNameFromFilePath fp = do
-    base <- clean $ toFilePath $ filename fp
-    case parsePackageName base of
-        Nothing -> throwM $ CabalFileNameInvalidPackageName $ toFilePath fp
-        Just x -> pure x
-  where clean = liftM reverse . strip . reverse
-        strip ('l':'a':'b':'a':'c':'.':xs) = pure xs
-        strip _ = throwM (CabalFileNameParseFail (toFilePath fp))
-
--- | Find a candidate for the given module-or-filename from the list
--- of directories and given extensions.
-findCandidate
-    :: [Path Abs Dir]
-    -> DotCabalDescriptor
-    -> RIO Ctx (Maybe DotCabalPath)
-findCandidate dirs name = do
-    pkg <- asks ctxFile >>= parsePackageNameFromFilePath
-    customPreprocessorExts <- view $ configL . to configCustomPreprocessorExts
-    let haskellPreprocessorExts = haskellDefaultPreprocessorExts ++ customPreprocessorExts
-    candidates <- liftIO $ makeNameCandidates haskellPreprocessorExts
-    case candidates of
-        [candidate] -> pure (Just (cons candidate))
-        [] -> do
-            case name of
-                DotCabalModule mn
-                  | display mn /= paths_pkg pkg -> logPossibilities dirs mn
-                _ -> pure ()
-            pure Nothing
-        (candidate:rest) -> do
-            warnMultiple name candidate rest
-            pure (Just (cons candidate))
-  where
-    cons =
-        case name of
-            DotCabalModule{} -> DotCabalModulePath
-            DotCabalMain{} -> DotCabalMainPath
-            DotCabalFile{} -> DotCabalFilePath
-            DotCabalCFile{} -> DotCabalCFilePath
-    paths_pkg pkg = "Paths_" ++ packageNameString pkg
-    makeNameCandidates haskellPreprocessorExts =
-        liftM (nubOrd . concat) (mapM (makeDirCandidates haskellPreprocessorExts) dirs)
-    makeDirCandidates :: [Text]
-                      -> Path Abs Dir
-                      -> IO [Path Abs File]
-    makeDirCandidates haskellPreprocessorExts dir =
-        case name of
-            DotCabalMain fp -> resolveCandidate dir fp
-            DotCabalFile fp -> resolveCandidate dir fp
-            DotCabalCFile fp -> resolveCandidate dir fp
-            DotCabalModule mn -> do
-              let perExt ext =
-                     resolveCandidate dir (Cabal.toFilePath mn ++ "." ++ T.unpack ext)
-              withHaskellExts <- mapM perExt haskellFileExts
-              withPPExts <- mapM perExt haskellPreprocessorExts
-              pure $
-                case (concat withHaskellExts, concat withPPExts) of
-                  -- If we have exactly 1 Haskell extension and exactly
-                  -- 1 preprocessor extension, assume the former file is
-                  -- generated from the latter
-                  --
-                  -- See https://github.com/commercialhaskell/stack/issues/4076
-                  ([_], [y]) -> [y]
-
-                  -- Otherwise, return everything
-                  (xs, ys) -> xs ++ ys
-    resolveCandidate dir = fmap maybeToList . resolveDirFile dir
-
--- | Resolve file as a child of a specified directory, symlinks
--- don't get followed.
-resolveDirFile
-    :: (MonadIO m, MonadThrow m)
-    => Path Abs Dir -> FilePath.FilePath -> m (Maybe (Path Abs File))
-resolveDirFile x y = do
-    -- The standard canonicalizePath does not work for this case
-    p <- parseCollapsedAbsFile (toFilePath x FilePath.</> y)
-    exists <- doesFileExist p
-    pure $ if exists then Just p else Nothing
-
--- | Warn the user that multiple candidates are available for an
--- entry, but that we picked one anyway and continued.
-warnMultiple
-    :: DotCabalDescriptor -> Path b t -> [Path b t] -> RIO Ctx ()
-warnMultiple name candidate rest =
-    -- TODO: figure out how to style 'name' and the dispOne stuff
-    prettyWarnL
-        [ flow "There were multiple candidates for the Cabal entry"
-        , fromString . showName $ name
-        , line <> bulletedList (map dispOne (candidate:rest))
-        , line <> flow "picking:"
-        , dispOne candidate
-        ]
-  where showName (DotCabalModule name') = display name'
-        showName (DotCabalMain fp) = fp
-        showName (DotCabalFile fp) = fp
-        showName (DotCabalCFile fp) = fp
-        dispOne = fromString . toFilePath
-          -- TODO: figure out why dispOne can't be just `display`
-          --       (remove the .hlint.yaml exception if it can be)
-
--- | Log that we couldn't find a candidate, but there are
--- possibilities for custom preprocessor extensions.
---
--- For example: .erb for a Ruby file might exist in one of the
--- directories.
-logPossibilities
-    :: HasTerm env
-    => [Path Abs Dir] -> ModuleName -> RIO env ()
-logPossibilities dirs mn = do
-    possibilities <- liftM concat (makePossibilities mn)
-    unless (null possibilities) $ prettyWarnL
-        [ flow "Unable to find a known candidate for the Cabal entry"
-        , (style PP.Module . fromString $ display mn) <> ","
-        , flow "but did find:"
-        , line <> bulletedList (map pretty possibilities)
-        , flow "If you are using a custom preprocessor for this module"
-        , flow "with its own file extension, consider adding the extension"
-        , flow "to the 'custom-preprocessor-extensions' field in stack.yaml."
-        ]
-  where
-    makePossibilities name =
-        mapM
-            (\dir ->
-                  do (_,files) <- listDir dir
-                     pure
-                         (map
-                              filename
-                              (filter
-                                   (isPrefixOf (display name) .
-                                    toFilePath . filename)
-                                   files)))
-            dirs
+ where
+  basic = addDeps lib deps
+  children = mconcat (map apply cs)
+   where
+    apply (Cabal.CondBranch cond node mcs) =
+      if condSatisfied cond
+         then resolveConditions rc addDeps node
+         else maybe mempty (resolveConditions rc addDeps) mcs
+    condSatisfied c =
+      case c of
+        Var v -> varSatisfied v
+        Lit b -> b
+        CNot c' -> not (condSatisfied c')
+        COr cx cy -> condSatisfied cx || condSatisfied cy
+        CAnd cx cy -> condSatisfied cx && condSatisfied cy
+    varSatisfied v =
+      case v of
+        OS os -> os == rc.os
+        Arch arch -> arch == rc.arch
+        PackageFlag flag -> fromMaybe False $ M.lookup flag rc.flags
+        -- NOTE:  ^^^^^ This should never happen, as all flags which are used
+        -- must be declared. Defaulting to False.
+        Impl flavor range ->
+          case (flavor, rc.compilerVersion) of
+            (GHC, ACGhc vghc) -> vghc `withinRange` range
+            _ -> False
 
 -- | Path for the package's build log.
-buildLogPath :: (MonadReader env m, HasBuildConfig env, MonadThrow m)
-             => Package -> Maybe String -> m (Path Abs File)
+buildLogPath ::
+     (MonadReader env m, HasBuildConfig env, MonadThrow m)
+  => Package
+  -> Maybe String
+     -- ^ An optional suffix for the log's file name.
+  -> m (Path Abs File)
 buildLogPath package' msuffix = do
   env <- ask
-  let stack = getProjectWorkDir env
+  let workDir = getWorkDir env
   fp <- parseRelFile $ concat $
     packageIdentifierString (packageIdentifier package') :
     maybe id (\suffix -> ("-" :) . (suffix :)) msuffix [".log"]
-  pure $ stack </> relDirLogs </> fp
-
--- Internal helper to define resolveFileOrWarn and resolveDirOrWarn
-resolveOrWarn :: Text
-              -> (Path Abs Dir -> String -> RIO Ctx (Maybe a))
-              -> FilePath.FilePath
-              -> RIO Ctx (Maybe a)
-resolveOrWarn subject resolver path =
-  do cwd <- liftIO getCurrentDir
-     file <- asks ctxFile
-     dir <- asks (parent . ctxFile)
-     result <- resolver dir path
-     when (isNothing result) $ warnMissingFile subject cwd path file
-     pure result
-
-warnMissingFile :: Text -> Path Abs Dir -> FilePath -> Path Abs File -> RIO Ctx ()
-warnMissingFile subject cwd path fromFile =
-    prettyWarnL
-        [ fromString . T.unpack $ subject -- TODO: needs style?
-        , flow "listed in"
-        , maybe (pretty fromFile) pretty (stripProperPrefix cwd fromFile)
-        , flow "file does not exist:"
-        , style Dir . fromString $ path
-        ]
-
--- | Resolve the file, if it can't be resolved, warn for the user
--- (purely to be helpful).
-resolveFileOrWarn :: FilePath.FilePath
-                  -> RIO Ctx (Maybe (Path Abs File))
-resolveFileOrWarn = resolveOrWarn "File" f
-  where f p x = liftIO (forgivingAbsence (resolveFile p x)) >>= rejectMissingFile
-
--- | Resolve the directory, if it can't be resolved, warn for the user
--- (purely to be helpful).
-resolveDirOrWarn :: FilePath.FilePath
-                 -> RIO Ctx (Maybe (Path Abs Dir))
-resolveDirOrWarn = resolveOrWarn "Directory" f
-  where f p x = liftIO (forgivingAbsence (resolveDir p x)) >>= rejectMissingDir
+  pure $ workDir </> relDirLogs </> fp
 
     {- FIXME
 -- | Create a 'ProjectPackage' from a directory containing a package.
@@ -1378,26 +625,345 @@ mkDepPackage pl = do
 
 -- | Force a package to be treated as a custom build type, see
 -- <https://github.com/commercialhaskell/stack/issues/4488>
-applyForceCustomBuild
-  :: Version -- ^ global Cabal version
+applyForceCustomBuild ::
+     Version
+     -- ^ Global Cabal version.
   -> Package
   -> Package
 applyForceCustomBuild cabalVersion package
-    | forceCustomBuild =
-        package
-          { packageBuildType = Custom
-          , packageDeps = M.insertWith (<>) "Cabal" (DepValue cabalVersionRange AsLibrary)
-                        $ packageDeps package
-          , packageSetupDeps = Just $ M.fromList
-              [ ("Cabal", cabalVersionRange)
-              , ("base", anyVersion)
-              ]
-          }
-    | otherwise = package
-  where
-    cabalVersionRange =
-      orLaterVersion $ mkVersion $ cabalSpecToVersionDigits $
-        packageCabalSpec package
-    forceCustomBuild =
-      packageBuildType package == Simple &&
-      not (cabalVersion `withinRange` cabalVersionRange)
+  | forceCustomBuild =
+      package
+        { buildType = Custom
+        , setupDeps = Just $ M.fromList
+            [ ("Cabal", libraryDepFromVersionRange cabalVersionRange)
+            , ("base", libraryDepFromVersionRange anyVersion)
+            ]
+        }
+  | otherwise = package
+ where
+  cabalVersionRange =
+    orLaterVersion $ mkVersion $ cabalSpecToVersionDigits
+      package.cabalSpec
+  forceCustomBuild = package.buildType == Simple
+    && not (cabalVersion `withinRange` cabalVersionRange)
+
+-- | Check if the package has a main library that is buildable.
+hasBuildableMainLibrary :: Package -> Bool
+hasBuildableMainLibrary package =
+  maybe False isComponentBuildable package.library
+
+-- | Aggregate all unknown tools from all components. Mostly meant for
+-- build tools specified in the legacy manner (build-tools:) that failed the
+-- hard-coded lookup. See 'Stack.Types.Component.unknownTools' for more
+-- information.
+packageUnknownTools :: Package -> Set Text
+packageUnknownTools pkg = lib (bench <> tests <> flib <> sublib <> exe)
+ where
+  lib setT = case pkg.library of
+    Just libV -> addUnknownTools libV setT
+    Nothing -> setT
+  bench = gatherUnknownTools pkg.benchmarks
+  tests = gatherUnknownTools pkg.testSuites
+  flib = gatherUnknownTools pkg.foreignLibraries
+  sublib = gatherUnknownTools pkg.subLibraries
+  exe = gatherUnknownTools pkg.executables
+  addUnknownTools :: HasBuildInfo x => x -> Set Text -> Set Text
+  addUnknownTools = (<>) . (.buildInfo.unknownTools)
+  gatherUnknownTools :: HasBuildInfo x => CompCollection x -> Set Text
+  gatherUnknownTools = foldr' addUnknownTools mempty
+
+buildableForeignLibs :: Package -> Set StackUnqualCompName
+buildableForeignLibs pkg = getBuildableSet pkg.foreignLibraries
+
+buildableSubLibs :: Package -> Set StackUnqualCompName
+buildableSubLibs pkg = getBuildableSet pkg.subLibraries
+
+buildableExes :: Package -> Set StackUnqualCompName
+buildableExes pkg = getBuildableSet pkg.executables
+
+buildableTestSuites :: Package -> Set StackUnqualCompName
+buildableTestSuites pkg = getBuildableSet pkg.testSuites
+
+buildableBenchmarks :: Package -> Set StackUnqualCompName
+buildableBenchmarks pkg = getBuildableSet pkg.benchmarks
+
+-- | Apply a generic processing function in a Monad over all of the Package's
+-- components.
+processPackageComponent ::
+     forall m a. (Monad m)
+  => Package
+  -> (forall component. HasComponentInfo component => component -> m a -> m a)
+     -- ^ Processing function with all the component's info.
+  -> m a
+     -- ^ Initial value.
+  -> m a
+processPackageComponent pkg componentFn =
+    processBenchmarks
+  . processTestSuites
+  . componentKindProcessor (.foreignLibraries)
+  . componentKindProcessor (.executables)
+  . componentKindProcessor (.subLibraries)
+  . processMainLib
+ where
+  processMainLib = maybe id componentFn pkg.library
+
+  componentKindProcessor ::
+       forall component. HasComponentInfo component
+    => (Package -> CompCollection component)
+       -- ^ Accessor.
+    -> m a
+     -- ^ Initial value.
+    -> m a
+  componentKindProcessor target =
+    foldComponentToAnotherCollection (target pkg) componentFn
+
+  processTestSuites = if pkg.testEnabled
+    then componentKindProcessor (.testSuites)
+    else id
+
+  processBenchmarks = if pkg.benchmarkEnabled
+    then componentKindProcessor (.benchmarks)
+    else id
+
+-- | This is a function to iterate in a monad over all of a package's
+-- dependencies (including any custom-setup ones), and yield a collection of
+-- results (used with list and set).
+processPackageMapDeps ::
+     (Monad m)
+  => Package
+  -> (Map PackageName DepValue -> m a -> m a)
+     -- ^ Processing function.
+  -> m a
+     -- ^ Initial value.
+  -> m a
+processPackageMapDeps pkg fn =
+  packageDepsProcessor . packageSetupDepsProcessor
+ where
+  packageSetupDepsProcessor action =
+    maybe action (`fn` action) pkg.setupDeps
+
+  packageDepsProcessor =
+    processPackageComponent pkg (fn . componentDependencyMap)
+
+-- | This is a function to iterate in a monad over all of a package's
+-- dependencies (including any custom-setup ones), and yield a collection of
+-- results.
+processPackageDeps ::
+     forall a b m. Monad m
+  => Package
+  -> (b -> a -> a)
+     -- ^ Combining function.
+  -> (PackageName -> DepValue -> m b)
+     -- ^ Processing function for a dependency.
+  -> m a
+     -- ^ Intial value.
+  -> m a
+processPackageDeps pkg combineResults fn =
+  processPackageMapDeps pkg (flip (M.foldrWithKey' iterator))
+ where
+  iterator :: PackageName -> DepValue -> m a -> m a
+  iterator depPackageName depValue acc
+    -- If the name of the dependency package is the same as the package, we
+    -- ignore the former. It is possible for a dependency package to have the
+    -- same name as a named sublibrary or a named foreign library.
+    | depPackageName == pkg.name = acc
+    | otherwise = combineResults <$> fn depPackageName depValue <*> acc
+
+-- | This is a function to iterate in a monad over all of a package's
+-- dependencies (including any custom-setup ones), and yield a list of
+-- results.
+processPackageDepsToList ::
+     Monad m
+  => Package
+  -> (PackageName -> DepValue -> m b)
+     -- ^ Processing function for a dependency.
+  -> m [b]
+processPackageDepsToList pkg fn = processPackageDeps pkg (:) fn (pure [])
+
+-- | This is a function to iterate in a monad over all of a package's
+-- dependencies (including any custom-setup ones), and yield a collection of
+-- the results.
+processPackageDepsEither ::
+     (Monad m, Monoid a, Monoid b)
+  => Package
+  -> (PackageName -> DepValue -> m (Either a b))
+     -- ^ Processing function for dependency.
+  -> m (Either a b)
+processPackageDepsEither pkg fn =
+  processPackageDeps pkg combineResults fn (pure (Right mempty))
+ where
+  combineResults (Left a) (Left b) = Left (a <> b)
+  combineResults _ (Left b) = Left b
+  combineResults (Left a) _ = Left a
+  combineResults (Right a) (Right b) = Right (a <> b)
+
+-- | List the names of all of a package's dependencies (including any
+-- custom-setup ones) in a "free" context through the 'Data.Functor.Identity'
+-- monad.
+listOfPackageDeps :: Package -> [PackageName]
+listOfPackageDeps pkg = runIdentity $
+  processPackageDepsToList pkg (\pn _ -> pure pn)
+
+-- | Yield a set of the names of all a package's dependencies (including any
+-- custom-setup ones) through the 'Data.Functor.Identity' monad.
+setOfPackageDeps :: Package -> Set PackageName
+setOfPackageDeps pkg = runIdentity $
+  processPackageDeps pkg S.insert (\pn _ -> pure pn) (pure mempty)
+
+-- | This implements a topological sort on all targeted components for the build
+-- and their dependencies. It's only targeting internal dependencies, so it's
+-- doing a topological sort on a subset of a package's components.
+--
+-- Note that in Cabal they use the Data.Graph struct to pursue the same goal.
+-- But dong this here would require a large number intermediate data structure.
+-- This is needed because we need to get the right GhcPkgId of the relevant
+-- internal dependencies of a component before building it as a component.
+topSortPackageComponent ::
+     Package
+  -> Target
+     -- ^ How the package is intended to be built.
+  -> Bool
+     -- ^ Include directTarget or not. False here means we won't include the
+     -- actual targets in the result, only their deps. Using it with False here
+     -- only in GHCi
+  -> Seq NamedComponent
+topSortPackageComponent package target includeDirectTarget =
+  topProcessPackageComponent package target processor mempty
+ where
+  processor ::
+       HasQualiName component
+    => PackageType
+    -> component
+    -> Seq NamedComponent
+    -> Seq NamedComponent
+  processor packageType component
+    | not includeDirectTarget && packageType == PTProject = id
+    | otherwise = \v -> v |> component.qualifiedName
+
+-- | Process a package's internal components in the order of their topological
+-- sort. The first iteration will effect the component depending on no other
+-- component etc, iterating by increasing amount of required dependencies.
+-- 'PackageType' with value 'PTProject' here means the component is a direct
+-- target and 'PTDependency' means it's a dependency of a direct target.
+topProcessPackageComponent ::
+     forall b.
+     Package
+  -> Target
+     -- ^ How the package is intended to be built.
+  -> (    forall component. (HasComponentInfo component)
+       => PackageType
+       -> component
+       -> b
+       -> b
+     )
+  -> b
+  -> b
+topProcessPackageComponent package target fn res = do
+  let
+      initialState :: (Set NamedComponent, b)
+      initialState = (mempty, res)
+      processInitialComponents ::
+           HasComponentInfo component
+        => component
+        -> (Set NamedComponent, b)
+        -> (Set NamedComponent, b)
+      processInitialComponents c = case target of
+        TargetAll{} -> processComponent PTProject c
+        TargetComps targetSet -> if S.member c.qualifiedName targetSet
+          then processComponent PTProject c
+          else id
+  snd $ processPackageComponent package processInitialComponents initialState
+ where
+  processComponent ::
+       HasComponentInfo component
+    => PackageType
+       -- ^ Finally add this component in the seq
+    -> component
+    -> (Set NamedComponent, b)
+    -> (Set NamedComponent, b)
+  processComponent packageType component currentRes@(_a, !_b) = do
+    let depMap = componentDependencyMap component
+        internalDep = M.lookup package.name depMap
+        qualName = component.qualifiedName
+        alreadyProcessed = fst currentRes
+        !appendToResult = fn packageType component
+        -- This is an optimization, the only components we are likely to process
+        -- multiple times are the ones we can find in dependencies, otherwise we
+        -- only fold on a single version of each component by design.
+        processedDeps = processOneDep internalDep currentRes
+    if isPotentialDependency qualName
+      then
+        if S.member qualName alreadyProcessed
+          then currentRes
+          else bimap (S.insert qualName) appendToResult processedDeps
+      else second appendToResult processedDeps
+  lookupLibName isMain name = if isMain
+    then package.library
+    else collectionLookup name package.subLibraries
+  processOneDep ::
+       Maybe DepValue
+    -> (Set NamedComponent, b)
+    -> (Set NamedComponent, b)
+  processOneDep mDependency res' =
+    case (.depType) <$> mDependency of
+      Just (AsLibrary (DepLibrary mainLibDep subLibDeps)) -> do
+        let processMainLibDep =
+              case (mainLibDep, lookupLibName True emptyCompName) of
+                (True, Just mainLib) ->
+                  processComponent PTDependency mainLib
+                _ -> id
+            processSingleSubLib name =
+              case lookupLibName False name of
+                Just lib -> processComponent PTDependency lib
+                Nothing -> id
+            processSubLibDep r = foldr' processSingleSubLib r subLibDeps
+        processSubLibDep (processMainLibDep res')
+      _ -> res'
+
+-- | Does this package have intra-package component dependencies that indicate
+-- Backpack or chained sub-libraries?  Specifically, checks whether the main
+-- library or any sub-library depends on the same package (indicating the
+-- library uses internal sub-libs, or sub-libraries chain among themselves).
+--
+-- Executables, tests, and benchmarks commonly depend on their own package's
+-- library via @build-depends: pkg-name@; this is normal and does NOT count as
+-- an intra-package dep for our purposes, because @cabal build exe:foo@ handles
+-- building the library first automatically.
+--
+-- When 'True', @Setup.hs build@ should be called without explicit component
+-- targets so that Cabal's internal build ordering (which handles Backpack
+-- instantiation) is used.
+hasIntraPackageDeps :: Package -> Bool
+hasIntraPackageDeps package =
+  packageIsIndefinite package || any hasSelfDep libraryBuildInfos
+ where
+  pname = package.name
+  hasSelfDep sbi = M.member pname sbi.dependency
+  libraryBuildInfos :: [Component.StackBuildInfo]
+  libraryBuildInfos =
+       maybe [] (\l -> [l.buildInfo]) package.library
+    ++ map (.buildInfo) (toList package.subLibraries)
+
+-- | Is this package indefinite (has unfilled Backpack signatures)?
+packageIsIndefinite :: Package -> Bool
+packageIsIndefinite pkg = any hasSignatures allLibs
+ where
+  hasSignatures lib = not (null lib.signatures)
+  allLibs =
+       maybeToList pkg.library
+    ++ toList pkg.subLibraries
+
+-- | True iff the package has signatures or any component has mixins.
+packageUsesBackpack :: Package -> Bool
+packageUsesBackpack pkg =
+     packageIsIndefinite pkg
+  || not (all (null . (.mixins)) allBuildInfos)
+ where
+  allBuildInfos :: [Component.StackBuildInfo]
+  allBuildInfos =
+       maybeToList ((.buildInfo) <$> pkg.library)
+    ++ map (.buildInfo) (toList pkg.subLibraries)
+    ++ map (.buildInfo) (toList pkg.foreignLibraries)
+    ++ map (.buildInfo) (toList pkg.executables)
+    ++ map (.buildInfo) (toList pkg.testSuites)
+    ++ map (.buildInfo) (toList pkg.benchmarks)
diff --git a/src/Stack/PackageDump.hs b/src/Stack/PackageDump.hs
index 2d5875bb31..bfbecce336 100644
--- a/src/Stack/PackageDump.hs
+++ b/src/Stack/PackageDump.hs
@@ -1,326 +1,386 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE RankNTypes         #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE TupleSections      #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.PackageDump
+License     : BSD-3-Clause
+-}
 
 module Stack.PackageDump
-    ( Line
-    , eachSection
-    , eachPair
-    , DumpPackage (..)
-    , conduitDumpPackage
-    , ghcPkgDump
-    , ghcPkgDescribe
-    , sinkMatching
-    , pruneDeps
-    ) where
+  ( Line
+  , eachSection
+  , eachPair
+  , DumpPackage (..)
+  , conduitDumpPackage
+  , ghcPkgDump
+  , ghcPkgDescribe
+  , ghcPkgField
+  , sinkMatching
+  , pruneDeps
+  ) where
 
-import           Stack.Prelude
-import           Data.Attoparsec.Args
+import           Control.Monad.Extra ( whenJust )
+import           Data.Attoparsec.Args ( EscapingMode (..), argsParser )
 import           Data.Attoparsec.Text as P
-import           Data.Conduit
+import           Data.Conduit ( await, leftover, toConsumer, yield )
 import qualified Data.Conduit.List as CL
 import qualified Data.Conduit.Text as CT
 import qualified Data.Map as Map
 import qualified Data.Set as Set
-import qualified RIO.Text as T
+import qualified Distribution.Pretty as C
 import qualified Distribution.Text as C
-import           Path.Extra (toFilePathNoTrailingSep)
-import           Stack.GhcPkg
-import           Stack.Types.Config (HasCompiler (..), GhcPkgExe (..), DumpPackage (..))
-import           Stack.Types.GhcPkgId
-import           RIO.Process hiding (readProcess)
+import           Distribution.Types.MungedPackageName
+                   ( decodeCompatPackageName )
+import           Path.Extra ( toFilePathNoTrailingSep )
+import           RIO.Process ( HasProcessContext )
+import qualified RIO.Text as T
+import           Stack.Component ( fromCabalName )
+import           Stack.GhcPkg ( createDatabase )
+import           Stack.Prelude
+import           Stack.Types.CompilerPaths ( GhcPkgExe (..), HasCompiler (..) )
+import           Stack.Types.ComponentUtils ( unqualCompFromText )
+import           Stack.Types.DumpPackage ( DumpPackage (..), SublibDump (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId, parseGhcPkgId )
 
--- | Call ghc-pkg dump with appropriate flags and stream to the given @Sink@, for a single database
-ghcPkgDump
-    :: (HasProcessContext env, HasLogFunc env)
-    => GhcPkgExe
-    -> [Path Abs Dir] -- ^ if empty, use global
-    -> ConduitM Text Void (RIO env) a
-    -> RIO env a
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.PackageDump" module.
+data PackageDumpException
+  = MissingSingleField Text (Map Text [Line])
+  | Couldn'tParseField Text [Line]
+  deriving Show
+
+instance Exception PackageDumpException where
+  displayException (MissingSingleField name values) = unlines $
+    concat
+      [ "Error: [S-4257]\n"
+      , "Expected single value for field name "
+      , show name
+      , " when parsing ghc-pkg dump output:"
+      ]
+    : map (\(k, v) -> "    " ++ show (k, v)) (Map.toList values)
+  displayException (Couldn'tParseField name ls) = concat
+    [ "Error: [S-2016]\n"
+    , "Couldn't parse the field "
+    , show name
+    , " from lines: "
+    , show ls
+    , "."
+    ]
+
+-- | Call @ghc-pkg dump@ with appropriate flags and stream to the given sink,
+-- using either the global package database or the given package databases.
+ghcPkgDump ::
+     (HasProcessContext env, HasTerm env)
+  => GhcPkgExe
+  -> [Path Abs Dir]
+     -- ^ A list of package databases. If empty, use the global package
+     -- database.
+  -> ConduitM Text Void (RIO env) a
+     -- ^ Sink.
+  -> RIO env a
 ghcPkgDump pkgexe = ghcPkgCmdArgs pkgexe ["dump"]
 
--- | Call ghc-pkg describe with appropriate flags and stream to the given @Sink@, for a single database
-ghcPkgDescribe
-    :: (HasProcessContext env, HasLogFunc env, HasCompiler env)
-    => GhcPkgExe
-    -> PackageName
-    -> [Path Abs Dir] -- ^ if empty, use global
-    -> ConduitM Text Void (RIO env) a
-    -> RIO env a
-ghcPkgDescribe pkgexe pkgName' = ghcPkgCmdArgs pkgexe ["describe", "--simple-output", packageNameString pkgName']
+-- | Call @ghc-pkg describe@ with appropriate flags and stream to the given
+-- sink, using either the global package database or the given package
+-- databases.
+ghcPkgDescribe ::
+     (HasCompiler env, HasProcessContext env, HasTerm env)
+  => GhcPkgExe
+  -> PackageName
+  -> [Path Abs Dir]
+     -- ^ A list of package databases. If empty, use the global package
+     -- database.
+  -> ConduitM Text Void (RIO env) a
+     -- ^ Sink.
+  -> RIO env a
+ghcPkgDescribe pkgexe pkgName' = ghcPkgCmdArgs
+  pkgexe
+  ["describe", "--simple-output", packageNameString pkgName']
 
--- | Call ghc-pkg and stream to the given @Sink@, for a single database
-ghcPkgCmdArgs
-    :: (HasProcessContext env, HasLogFunc env)
-    => GhcPkgExe
-    -> [String]
-    -> [Path Abs Dir] -- ^ if empty, use global
-    -> ConduitM Text Void (RIO env) a
-    -> RIO env a
+-- | Call @ghc-pkg field@ with appropriate flags and stream to the given sink,
+-- using the given package database. Throws 'RIO.Process.ExitCodeException' if
+-- the process fails (for example, if the package is not found in the package
+-- database or the field is not found in the package's *.conf file).
+ghcPkgField ::
+     (HasCompiler env, HasProcessContext env, HasTerm env)
+  => GhcPkgExe
+  -> Path Abs Dir
+     -- ^ A package database.
+  -> MungedPackageId
+     -- ^ A munged package identifier.
+  -> String
+     -- ^ A field name.
+  -> ConduitM Text Void (RIO env) a
+     -- ^ Sink.
+  -> RIO env a
+ghcPkgField pkgexe pkgDb mungedPkgId fieldName = ghcPkgCmdArgs
+  pkgexe
+  ["field", C.prettyShow mungedPkgId, fieldName, "--simple-output" ]
+  [pkgDb]
+
+-- | Call @ghc-pkg@ and stream to the given sink, using the either the global
+-- package database or the given package databases.
+ghcPkgCmdArgs ::
+     (HasProcessContext env, HasTerm env)
+  => GhcPkgExe
+  -> [String]
+     -- ^ A list of commands.
+  -> [Path Abs Dir]
+     -- ^ A list of package databases. If empty, use the global package
+     -- database.
+  -> ConduitM Text Void (RIO env) a
+     -- ^ Sink.
+  -> RIO env a
 ghcPkgCmdArgs pkgexe@(GhcPkgExe pkgPath) cmd mpkgDbs sink = do
-    case reverse mpkgDbs of
-        (pkgDb:_) -> createDatabase pkgexe pkgDb -- TODO maybe use some retry logic instead?
-        _ -> pure ()
-    -- https://github.com/haskell/process/issues/251
-    snd <$> sinkProcessStderrStdout (toFilePath pkgPath) args CL.sinkNull sink'
-  where
-    args = concat
-        [ case mpkgDbs of
-              [] -> ["--global", "--no-user-package-db"]
-              _ -> ["--user", "--no-user-package-db"] ++
-                  concatMap (\pkgDb -> ["--package-db", toFilePathNoTrailingSep pkgDb]) mpkgDbs
-        , cmd
-        , ["--expand-pkgroot"]
-        ]
-    sink' = CT.decodeUtf8 .| sink
+  case reverse mpkgDbs of
+      (pkgDb:_) -> createDatabase pkgexe pkgDb -- TODO maybe use some retry logic instead?
+      _ -> pure ()
+  -- https://github.com/haskell/process/issues/251
+  snd <$> sinkProcessStderrStdout (toFilePath pkgPath) args CL.sinkNull sink'
+ where
+  args = concat
+    [ case mpkgDbs of
+          [] -> ["--global", "--no-user-package-db"]
+          _ ->   "--user"
+               : "--no-user-package-db"
+               : concatMap
+                   (\pkgDb -> ["--package-db", toFilePathNoTrailingSep pkgDb])
+                   mpkgDbs
+    , cmd
+    , ["--expand-pkgroot"]
+    ]
+  sink' = CT.decodeUtf8 .| sink
 
 -- | Prune a list of possible packages down to those whose dependencies are met.
 --
 -- * id uniquely identifies an item
 --
 -- * There can be multiple items per name
-pruneDeps
-    :: (Ord name, Ord id)
-    => (id -> name) -- ^ extract the name from an id
-    -> (item -> id) -- ^ the id of an item
-    -> (item -> [id]) -- ^ get the dependencies of an item
-    -> (item -> item -> item) -- ^ choose the desired of two possible items
-    -> [item] -- ^ input items
-    -> Map name item
+pruneDeps ::
+     (Ord name, Ord id)
+  => (id -> name) -- ^ extract the name from an id
+  -> (item -> id) -- ^ the id of an item
+  -> (item -> [id]) -- ^ get the dependencies of an item
+  -> (item -> item -> item) -- ^ choose the desired of two possible items
+  -> [item] -- ^ input items
+  -> Map name item
 pruneDeps getName getId getDepends chooseBest =
-      Map.fromList
-    . fmap (getName . getId &&& id)
-    . loop Set.empty Set.empty []
-  where
-    loop foundIds usedNames foundItems dps =
-        case partitionEithers $ map depsMet dps of
-            ([], _) -> foundItems
-            (s', dps') ->
-                let foundIds' = Map.fromListWith chooseBest s'
-                    foundIds'' = Set.fromList $ map getId $ Map.elems foundIds'
-                    usedNames' = Map.keysSet foundIds'
-                    foundItems' = Map.elems foundIds'
-                 in loop
-                        (Set.union foundIds foundIds'')
-                        (Set.union usedNames usedNames')
-                        (foundItems ++ foundItems')
-                        (catMaybes dps')
-      where
-        depsMet dp
-            | name `Set.member` usedNames = Right Nothing
-            | all (`Set.member` foundIds) (getDepends dp) = Left (name, dp)
-            | otherwise = Right $ Just dp
-          where
-            id' = getId dp
-            name = getName id'
+    Map.fromList
+  . fmap (getName . getId &&& id)
+  . loop Set.empty Set.empty []
+ where
+  loop foundIds usedNames foundItems dps =
+    case partitionEithers $ map depsMet dps of
+      ([], _) -> foundItems
+      (s', dps') ->
+        let foundIds' = Map.fromListWith chooseBest s'
+            foundIds'' = Set.fromList $ map getId $ Map.elems foundIds'
+            usedNames' = Map.keysSet foundIds'
+            foundItems' = Map.elems foundIds'
+        in  loop
+              (Set.union foundIds foundIds'')
+              (Set.union usedNames usedNames')
+              (foundItems ++ foundItems')
+              (catMaybes dps')
+   where
+    depsMet dp
+      | name `Set.member` usedNames = Right Nothing
+      | all (`Set.member` foundIds) (getDepends dp) = Left (name, dp)
+      | otherwise = Right $ Just dp
+     where
+      id' = getId dp
+      name = getName id'
 
 -- | Find the package IDs matching the given constraints with all dependencies installed.
 -- Packages not mentioned in the provided @Map@ are allowed to be present too.
-sinkMatching :: Monad m
-             => Map PackageName Version -- ^ allowed versions
-             -> ConduitM DumpPackage o m (Map PackageName DumpPackage)
+sinkMatching ::
+     Monad m
+  => Map PackageName Version -- ^ allowed versions
+  -> ConduitM DumpPackage o m (Map PackageName DumpPackage)
 sinkMatching allowed =
-      Map.fromList
-    . map (pkgName . dpPackageIdent &&& id)
-    . Map.elems
-    . pruneDeps
-        id
-        dpGhcPkgId
-        dpDepends
-        const -- Could consider a better comparison in the future
-    <$> (CL.filter (isAllowed . dpPackageIdent) .| CL.consume)
-  where
-    isAllowed (PackageIdentifier name version) =
-        case Map.lookup name allowed of
-            Just version' | version /= version' -> False
-            _ -> True
-
-data PackageDumpException
-    = MissingSingleField Text (Map Text [Line])
-    | Couldn'tParseField Text [Line]
-    deriving Typeable
-instance Exception PackageDumpException
-instance Show PackageDumpException where
-    show (MissingSingleField name values) = unlines $
-      pure (concat
-        [ "Expected single value for field name "
-        , show name
-        , " when parsing ghc-pkg dump output:"
-        ]) ++ map (\(k, v) -> "    " ++ show (k, v)) (Map.toList values)
-    show (Couldn'tParseField name ls) =
-        "Couldn't parse the field " ++ show name ++ " from lines: " ++ show ls
+    Map.fromList
+  . map (pkgName . (.packageIdent) &&& id)
+  . Map.elems
+  . pruneDeps
+      id
+      (.ghcPkgId)
+      (.depends)
+      const -- Could consider a better comparison in the future
+  <$> (CL.filter (isAllowed . (.packageIdent)) .| CL.consume)
+ where
+  isAllowed (PackageIdentifier name version) =
+    case Map.lookup name allowed of
+      Just version' | version /= version' -> False
+      _ -> True
 
 -- | Convert a stream of bytes into a stream of @DumpPackage@s
-conduitDumpPackage :: MonadThrow m
-                   => ConduitM Text DumpPackage m ()
+conduitDumpPackage ::
+     MonadThrow m
+  => ConduitM Text DumpPackage m ()
 conduitDumpPackage = (.| CL.catMaybes) $ eachSection $ do
-    pairs <- eachPair (\k -> (k, ) <$> CL.consume) .| CL.consume
-    let m = Map.fromList pairs
-    let parseS k =
-            case Map.lookup k m of
-                Just [v] -> pure v
-                _ -> throwM $ MissingSingleField k m
-        -- Can't fail: if not found, same as an empty list. See:
-        -- https://github.com/commercialhaskell/stack/issues/182
-        parseM k = Map.findWithDefault [] k m
-
-        parseDepend :: MonadThrow m => Text -> m (Maybe GhcPkgId)
-        parseDepend "builtin_rts" = pure Nothing
-        parseDepend bs =
-            liftM Just $ parseGhcPkgId bs'
-          where
-            (bs', _builtinRts) =
-                case stripSuffixText " builtin_rts" bs of
-                    Nothing ->
-                        case stripPrefixText "builtin_rts " bs of
-                            Nothing -> (bs, False)
-                            Just x -> (x, True)
-                    Just x -> (x, True)
-    case Map.lookup "id" m of
-        Just ["builtin_rts"] -> pure Nothing
-        _ -> do
-            name <- parseS "name" >>= parsePackageNameThrowing . T.unpack
-            version <- parseS "version" >>= parseVersionThrowing . T.unpack
-            ghcPkgId <- parseS "id" >>= parseGhcPkgId
-
-            -- if a package has no modules, these won't exist
-            let libDirKey = "library-dirs"
-                libraries = parseM "hs-libraries"
-                exposedModules = parseM "exposed-modules"
-                exposed = parseM "exposed"
-                license =
-                    case parseM "license" of
-                        [licenseText] -> C.simpleParse (T.unpack licenseText)
-                        _ -> Nothing
-            depends <- mapMaybeM parseDepend $ concatMap T.words $ parseM "depends"
+  pairs <- eachPair (\k -> (k, ) <$> CL.consume) .| CL.consume
+  let m = Map.fromList pairs
 
-            -- Handle sublibs by recording the name of the parent library
-            -- If name of parent library is missing, this is not a sublib.
-            let mkParentLib n = PackageIdentifier n version
-                parentLib = mkParentLib <$> (parseS "package-name" >>=
-                                             parsePackageNameThrowing . T.unpack)
+      parseS :: MonadThrow m => Text -> m Line
+      parseS k =
+        case Map.lookup k m of
+          Just [v] -> pure v
+          _ -> throwM $ MissingSingleField k m
+      -- Can't fail: if not found, same as an empty list. See:
+      -- https://github.com/commercialhaskell/stack/issues/182
+      parseM k = Map.findWithDefault [] k m
 
-            let parseQuoted key =
-                    case mapM (P.parseOnly (argsParser NoEscaping)) val of
-                        Left{} -> throwM (Couldn'tParseField key val)
-                        Right dirs -> pure (concat dirs)
-                  where
-                    val = parseM key
-            libDirPaths <- parseQuoted libDirKey
-            haddockInterfaces <- parseQuoted "haddock-interfaces"
-            haddockHtml <- parseQuoted "haddock-html"
+      parseDepend :: MonadThrow m => Text -> m (Maybe GhcPkgId)
+      parseDepend "builtin_rts" = pure Nothing
+      parseDepend bs = Just <$> parseGhcPkgId bs'
+       where
+        (bs', _builtinRts) =
+          case stripSuffixText " builtin_rts" bs of
+            Nothing ->
+              case stripPrefixText "builtin_rts " bs of
+                Nothing -> (bs, False)
+                Just x -> (x, True)
+            Just x -> (x, True)
+  case Map.lookup "id" m of
+    Just ["builtin_rts"] -> pure Nothing
+    _ -> do
+      name <- parseS "name" >>= parsePackageNameThrowing . T.unpack
+      version <- parseS "version" >>= parseVersionThrowing . T.unpack
+      ghcPkgId <- parseS "id" >>= parseGhcPkgId
 
-            pure $ Just DumpPackage
-                { dpGhcPkgId = ghcPkgId
-                , dpPackageIdent = PackageIdentifier name version
-                , dpParentLibIdent = parentLib
-                , dpLicense = license
-                , dpLibDirs = libDirPaths
-                , dpLibraries = T.words $ T.unwords libraries
-                , dpHasExposedModules = not (null libraries || null exposedModules)
+      -- if a package has no modules, these won't exist
+      let libDirKey = "library-dirs"
+          libraries = parseM "hs-libraries"
+          exposedModules = parseM "exposed-modules"
+          exposed = parseM "exposed"
+          license =
+            case parseM "license" of
+              [licenseText] -> C.simpleParse (T.unpack licenseText)
+              _ -> Nothing
+      depends <- mapMaybeM parseDepend $ concatMap T.words $ parseM "depends"
 
-                -- Strip trailing commas from ghc package exposed-modules (looks buggy to me...).
-                -- Then try to parse the module names.
-                , dpExposedModules =
-                      Set.fromList
-                    $ mapMaybe (C.simpleParse . T.unpack . T.dropSuffix ",")
-                    $ T.words
-                    $ T.unwords exposedModules
-
-                , dpDepends = depends
-                , dpHaddockInterfaces = haddockInterfaces
-                , dpHaddockHtml = listToMaybe haddockHtml
-                , dpIsExposed = exposed == ["True"]
-                }
+      -- Handle sub-libraries by recording the name of the parent library
+      -- If name of parent library is missing, this is not a sub-library.
+      let maybePackageName :: Maybe PackageName =
+            parseS "package-name" >>= parsePackageNameThrowing . T.unpack
+          maybeLibName = parseS "lib-name"
+          getLibNameFromLegacyName = case decodeCompatPackageName name of
+            MungedPackageName _parentPackageName (LSubLibName libName') ->
+              fromCabalName libName'
+            MungedPackageName _parentPackageName _ -> ""
+          libName =
+            maybe getLibNameFromLegacyName unqualCompFromText maybeLibName
+          sublib = flip SublibDump libName <$> maybePackageName
+          parseQuoted key =
+            case mapM (P.parseOnly (argsParser NoEscaping)) val of
+              Left{} -> throwM (Couldn'tParseField key val)
+              Right dirs -> pure (concat dirs)
+           where
+            val = parseM key
+      libDirs <- parseQuoted libDirKey
+      haddockInterfaces <- parseQuoted "haddock-interfaces"
+      haddockHtml <- listToMaybe <$> parseQuoted "haddock-html"
+      pure $ Just DumpPackage
+        { ghcPkgId
+        , packageIdent = PackageIdentifier name version
+        , sublib
+        , license
+        , libDirs
+        , libraries = T.words $ T.unwords libraries
+        , hasExposedModules = not (null libraries || null exposedModules)
+        -- Strip trailing commas from ghc package exposed-modules (looks buggy
+        -- to me...). Then try to parse the module names.
+        , exposedModules =
+              Set.fromList
+            $ mapMaybe (C.simpleParse . T.unpack . T.dropSuffix ",")
+            $ T.words
+            $ T.unwords exposedModules
+        , depends
+        , haddockInterfaces
+        , haddockHtml
+        , isExposed = exposed == ["True"]
+        }
 
 stripPrefixText :: Text -> Text -> Maybe Text
 stripPrefixText x y
-    | x `T.isPrefixOf` y = Just $ T.drop (T.length x) y
-    | otherwise = Nothing
+  | x `T.isPrefixOf` y = Just $ T.drop (T.length x) y
+  | otherwise = Nothing
 
 stripSuffixText :: Text -> Text -> Maybe Text
 stripSuffixText x y
-    | x `T.isSuffixOf` y = Just $ T.take (T.length y - T.length x) y
-    | otherwise = Nothing
+  | x `T.isSuffixOf` y = Just $ T.take (T.length y - T.length x) y
+  | otherwise = Nothing
 
 -- | A single line of input, not including line endings
 type Line = Text
 
 -- | Apply the given Sink to each section of output, broken by a single line containing ---
-eachSection :: Monad m
-            => ConduitM Line Void m a
-            -> ConduitM Text a m ()
-eachSection inner =
-    CL.map (T.filter (/= '\r')) .| CT.lines .| start
-  where
-
-    peekText = await >>= maybe (pure Nothing) (\bs ->
-        if T.null bs
-            then peekText
-            else leftover bs >> pure (Just bs))
+eachSection ::
+     Monad m
+  => ConduitM Line Void m a
+  -> ConduitM Text a m ()
+eachSection inner = CL.map (T.filter (/= '\r')) .| CT.lines .| start
+ where
+  peekText = await >>= maybe (pure Nothing) (\bs ->
+    if T.null bs
+      then peekText
+      else leftover bs >> pure (Just bs))
 
-    start = peekText >>= maybe (pure ()) (const go)
+  start = peekText >>= maybe (pure ()) (const go)
 
-    go = do
-        x <- toConsumer $ takeWhileC (/= "---") .| inner
-        yield x
-        CL.drop 1
-        start
+  go = do
+    x <- toConsumer $ takeWhileC (/= "---") .| inner
+    yield x
+    CL.drop 1
+    start
 
 -- | Grab each key/value pair
-eachPair :: Monad m
-         => (Text -> ConduitM Line Void m a)
-         -> ConduitM Line a m ()
-eachPair inner =
-    start
-  where
-    start = await >>= maybe (pure ()) start'
+eachPair ::
+     Monad m
+  => (Text -> ConduitM Line Void m a)
+  -> ConduitM Line a m ()
+eachPair inner = start
+ where
+  start = await >>= maybe (pure ()) start'
 
-    start' bs1 =
-        toConsumer (valSrc .| inner key) >>= yield >> start
-      where
-        (key, bs2) = T.break (== ':') bs1
-        (spaces, bs3) = T.span (== ' ') $ T.drop 1 bs2
-        indent = T.length key + 1 + T.length spaces
+  start' bs1 = toConsumer (valSrc .| inner key) >>= yield >> start
+   where
+    (key, bs2) = T.break (== ':') bs1
+    (spaces, bs3) = T.span (== ' ') $ T.drop 1 bs2
+    ind = T.length key + 1 + T.length spaces
 
-        valSrc
-            | T.null bs3 = noIndent
-            | otherwise = yield bs3 >> loopIndent indent
+    valSrc
+      | T.null bs3 = noIndent
+      | otherwise = yield bs3 >> loopIndent ind
 
-    noIndent = do
-        mx <- await
-        case mx of
-            Nothing -> pure ()
-            Just bs -> do
-                let (spaces, val) = T.span (== ' ') bs
-                if T.length spaces == 0
-                    then leftover val
-                    else do
-                        yield val
-                        loopIndent (T.length spaces)
+  noIndent = do
+    mx <- await
+    whenJust mx $ \bs -> do
+      let (spaces, val) = T.span (== ' ') bs
+      if T.length spaces == 0
+        then leftover val
+        else do
+          yield val
+          loopIndent (T.length spaces)
 
-    loopIndent i =
-        loop
-      where
-        loop = await >>= maybe (pure ()) go
+  loopIndent i = loop
+   where
+    loop = await >>= maybe (pure ()) go
 
-        go bs
-            | T.length spaces == i && T.all (== ' ') spaces =
-                yield val >> loop
-            | otherwise = leftover bs
-          where
-            (spaces, val) = T.splitAt i bs
+    go bs
+      | T.length spaces == i && T.all (== ' ') spaces =
+          yield val >> loop
+      | otherwise = leftover bs
+     where
+      (spaces, val) = T.splitAt i bs
 
 -- | General purpose utility
 takeWhileC :: Monad m => (a -> Bool) -> ConduitM a a m ()
-takeWhileC f =
-    loop
-  where
-    loop = await >>= maybe (pure ()) go
+takeWhileC f = loop
+ where
+  loop = await >>= maybe (pure ()) go
 
-    go x
-        | f x = yield x >> loop
-        | otherwise = leftover x
+  go x
+    | f x = yield x >> loop
+    | otherwise = leftover x
diff --git a/src/Stack/PackageFile.hs b/src/Stack/PackageFile.hs
new file mode 100644
index 0000000000..c35f7f3c8a
--- /dev/null
+++ b/src/Stack/PackageFile.hs
@@ -0,0 +1,203 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.PackageFile
+Description : All package-level file-gathering logic.
+License     : BSD-3-Clause
+
+A module which exports all package-level file-gathering logic.
+-}
+
+module Stack.PackageFile
+  ( getPackageFile
+  , stackPackageFileFromCabal
+  ) where
+
+import qualified Data.Map.Strict as M
+import qualified Data.Set as S
+import           Distribution.CabalSpecVersion ( CabalSpecVersion )
+import qualified Distribution.PackageDescription as Cabal
+import           Distribution.Simple.Glob ( matchDirFileGlob )
+import           Distribution.Utils.Path ( makeSymbolicPath, getSymbolicPath )
+import           Path ( parent, (</>) )
+import           Path.Extra ( forgivingResolveFile, rejectMissingFile )
+import           Path.IO ( doesFileExist )
+import           Stack.ComponentFile
+                   ( ComponentFile (..), resolveOrWarn, stackBenchmarkFiles
+                   , stackExecutableFiles, stackLibraryFiles
+                   , stackTestSuiteFiles
+                   )
+import           Stack.Constants
+                   ( relFileHpackPackageConfig, relFileSetupHs, relFileSetupLhs
+                   )
+import           Stack.Constants.Config ( distDirFromDir )
+import           Stack.Prelude
+import           Stack.Types.BuildConfig ( HasBuildConfig (..) )
+import           Stack.Types.CompilerPaths ( cabalVersionL )
+import           Stack.Types.EnvConfig ( HasEnvConfig (..) )
+import           Stack.Types.NamedComponent ( NamedComponent (..) )
+import           Stack.Types.Package ( Package(..) )
+import           Stack.Types.PackageFile
+                   ( GetPackageFileContext (..), PackageComponentFile (..)
+                   , StackPackageFile (..)
+                   )
+import qualified System.FilePath as FilePath
+import           System.IO.Error ( isUserError )
+
+-- | Resolve the file, if it can't be resolved, warn for the user
+-- (purely to be helpful).
+resolveFileOrWarn ::
+     FilePath.FilePath
+  -> RIO GetPackageFileContext (Maybe (Path Abs File))
+resolveFileOrWarn = resolveOrWarn "File" f
+ where
+  f p x = forgivingResolveFile p x >>= rejectMissingFile
+
+-- | Get all files referenced by the package.
+packageDescModulesAndFiles ::
+     Package
+  -> RIO
+       GetPackageFileContext
+       PackageComponentFile
+packageDescModulesAndFiles pkg = do
+  packageExtraFile <- resolveGlobFilesFromStackPackageFile
+              pkg.cabalSpec pkg.file
+  let initialValue = mempty{packageExtraFile=packageExtraFile}
+      accumulator ::
+           Applicative f
+        => (t -> f (NamedComponent, ComponentFile))
+        -> t
+        -> f PackageComponentFile
+        -> f PackageComponentFile
+      accumulator f comp st = (insertComponentFile <$> st) <*> f comp
+      gatherCompFileCollection ::
+           (Applicative f, Foldable t)
+        => (a -> f (NamedComponent, ComponentFile))
+        -> (Package -> t a)
+        -> f PackageComponentFile
+        -> f PackageComponentFile
+      gatherCompFileCollection createCompFileFn getCompFn res =
+        foldr' (accumulator createCompFileFn) res (getCompFn pkg)
+  gatherCompFileCollection stackLibraryFiles (.library)
+    . gatherCompFileCollection stackLibraryFiles (.subLibraries)
+    . gatherCompFileCollection stackExecutableFiles (.executables)
+    . gatherCompFileCollection stackTestSuiteFiles (.testSuites)
+    . gatherCompFileCollection stackBenchmarkFiles (.benchmarks)
+    $ pure initialValue
+
+resolveGlobFilesFromStackPackageFile ::
+     CabalSpecVersion
+  -> StackPackageFile
+  -> RIO GetPackageFileContext (Set (Path Abs File))
+resolveGlobFilesFromStackPackageFile
+    csvV
+    (StackPackageFile extraSrcFilesV dataDirV dataFilesV)
+  = resolveGlobFiles
+      csvV
+      (extraSrcFilesV ++ map (dataDirV FilePath.</>) dataFilesV)
+
+-- | Resolve globbing of files (e.g. data files) to absolute paths.
+resolveGlobFiles ::
+     CabalSpecVersion -- ^ Cabal file version
+  -> [String]
+  -> RIO GetPackageFileContext (Set (Path Abs File))
+resolveGlobFiles cabalFileVersion =
+  fmap (S.fromList . concatMap catMaybes) . mapM resolve
+ where
+  resolve :: FilePath -> RIO GetPackageFileContext [Maybe (Path Abs File)]
+  resolve name =
+    if '*' `elem` name
+      then explode name
+      else fmap pure (resolveFileOrWarn name)
+
+  explode :: FilePath -> RIO GetPackageFileContext [Maybe (Path Abs File)]
+  explode name = do
+    dir <- asks (parent . (.file))
+    names <- matchDirFileGlob' (toFilePath dir) name
+    mapM resolveFileOrWarn names
+
+  matchDirFileGlob' ::
+       FilePath
+    -> FilePath
+    -> RIO GetPackageFileContext [FilePath]
+  matchDirFileGlob' dir glob = map getSymbolicPath <$> do
+    catch
+      (liftIO $ matchDirFileGlob minBound cabalFileVersion (Just $ makeSymbolicPath dir) (makeSymbolicPath glob))
+      ( \(e :: IOException) ->
+        if isUserError e
+          then do
+            prettyWarnL
+              [ flow "Wildcard does not match any files:"
+              , style File $ fromString glob
+              , line <> flow "in directory:"
+              , style Dir $ fromString dir
+              ]
+            pure []
+          else throwIO e
+      )
+
+-- | Gets all of the modules, files, build files, and data files that constitute
+-- the package. This is primarily used for dirtiness checking during build, as
+-- well as use by "stack ghci"
+getPackageFile ::
+     ( HasEnvConfig s, MonadReader s m, MonadThrow m, MonadUnliftIO m )
+  => Package
+  -> Path Abs File
+  -> m PackageComponentFile
+getPackageFile pkg cabalFP =
+  debugBracket ("getPackageFiles" <+> pretty cabalFP) $ do
+    let pkgDir = parent cabalFP
+    distDir <- distDirFromDir pkgDir
+    bc <- view buildConfigL
+    cabalVer <- view cabalVersionL
+    packageComponentFile <-
+      runRIO
+        (GetPackageFileContext cabalFP distDir bc cabalVer)
+        (packageDescModulesAndFiles pkg)
+    setupFiles <-
+      if pkg.buildType == Cabal.Custom
+        then do
+          let setupHsPath = pkgDir </> relFileSetupHs
+              setupLhsPath = pkgDir </> relFileSetupLhs
+          setupHsExists <- doesFileExist setupHsPath
+          if setupHsExists
+            then pure (S.singleton setupHsPath)
+            else do
+              setupLhsExists <- doesFileExist setupLhsPath
+              if setupLhsExists
+                then pure (S.singleton setupLhsPath)
+                else pure S.empty
+        else pure S.empty
+    moreBuildFiles <- fmap (S.insert cabalFP . S.union setupFiles) $ do
+      let hpackPath = pkgDir </> relFileHpackPackageConfig
+      hpackExists <- doesFileExist hpackPath
+      pure $ if hpackExists then S.singleton hpackPath else S.empty
+    pure packageComponentFile
+      { packageExtraFile =
+          moreBuildFiles <> packageComponentFile.packageExtraFile
+      }
+
+-- | For the given contents of a Cabal file, yields the information from it that
+-- Stack needs to track files.
+stackPackageFileFromCabal :: Cabal.PackageDescription -> StackPackageFile
+stackPackageFileFromCabal cabalPkg =
+  StackPackageFile
+    (map getSymbolicPath $ Cabal.extraSrcFiles cabalPkg)
+    (getSymbolicPath $ Cabal.dataDir cabalPkg)
+    (map getSymbolicPath $ Cabal.dataFiles cabalPkg)
+
+insertComponentFile ::
+     PackageComponentFile
+  -> (NamedComponent, ComponentFile)
+  -> PackageComponentFile
+insertComponentFile packageCompFile (name, compFile) =
+  PackageComponentFile nCompFile nDotCollec packageExtraFile nWarnings
+ where
+  (ComponentFile moduleFileMap dotCabalFileList warningsCollec) = compFile
+  (PackageComponentFile modules files packageExtraFile warnings) =
+    packageCompFile
+  nCompFile = M.insert name moduleFileMap modules
+  nDotCollec = M.insert name dotCabalFileList files
+  nWarnings = warningsCollec ++ warnings
diff --git a/src/Stack/Path.hs b/src/Stack/Path.hs
index 8b0cd760e6..6dcee45fbe 100644
--- a/src/Stack/Path.hs
+++ b/src/Stack/Path.hs
@@ -1,234 +1,383 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Path
+Description : Types and functions related to Stack's @path@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @path@ command.
+-}
 
--- | Handy path information.
 module Stack.Path
-    ( path
-    , pathParser
-    ) where
+  ( EnvConfigPathInfo
+  , UseHaddocks
+  , path
+  , pathsFromRunner
+  , pathsFromConfig
+  , pathsFromEnvConfig
+  ) where
 
-import           Stack.Prelude
-import           Data.List (intercalate)
+import           Control.Exception ( throw )
+import           Data.List ( intercalate )
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
-import qualified Options.Applicative as OA
-import           Path
-import           Path.Extra
+import           Path ( (</>), parent )
+import           Path.Extra ( toFilePathNoTrailingSep )
+import           RIO.Process ( HasProcessContext (..), exeSearchPathL )
+import           Stack.Config ( determineStackRootAndOwnership )
 import           Stack.Constants
-import           Stack.Constants.Config
+                   ( docDirSuffix, stackGlobalConfigOptionName
+                   , stackRootOptionName
+                   )
+import           Stack.Constants.Config ( distRelativeDir )
 import           Stack.GhcPkg as GhcPkg
+import           Stack.Prelude hiding ( pi )
 import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..), configFileL )
+import           Stack.Types.BuildOptsMonoid ( buildOptsMonoidHaddockL )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), HasCompiler (..), getCompilerPath )
 import           Stack.Types.Config
+                   ( Config (..), HasConfig (..), userGlobalConfigFileL )
+import           Stack.Types.Config.Exception ( ConfigPrettyException (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig, HasEnvConfig (..), bindirCompilerTools
+                   , hpcReportDir, installationRootDeps, installationRootLocal
+                   , packageDatabaseDeps, packageDatabaseExtra
+                   , packageDatabaseLocal
+                   )
+import qualified Stack.Types.EnvConfig as EnvConfig
+import           Stack.Types.EnvSettings ( defaultEnvSettings )
+import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
+import           Stack.Types.GlobalOpts
+                   ( GlobalOpts (..), globalOptsBuildOptsMonoidL )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( HasRunner (..), Runner, globalOptsL )
 import qualified System.FilePath as FP
-import           RIO.PrettyPrint
-import           RIO.Process (HasProcessContext (..), exeSearchPathL)
 
--- | Print out useful path information in a human-readable format (and
--- support others later).
+-- | Print out useful path information in a human-readable format (and support
+-- others later).
 path :: [Text] -> RIO Runner ()
-path keys =
-    do let deprecated = filter ((`elem` keys) . fst) deprecatedPathKeys
-       forM_ deprecated $ \(oldOption, newOption) -> logWarn $
-           "\n" <>
-           "'--" <> display oldOption <> "' will be removed in a future release.\n" <>
-           "Please use '--" <> display newOption <> "' instead.\n" <>
-           "\n"
-       let -- filter the chosen paths in flags (keys),
-           -- or show all of them if no specific paths chosen.
-           goodPaths = filter
-                (\(_,key,_) ->
-                      (null keys && key /= T.pack deprecatedStackRootOptionName) || elem key keys)
-                paths
-           singlePath = length goodPaths == 1
-           toEither (_, k, UseHaddocks p) = Left (k, p)
-           toEither (_, k, WithoutHaddocks p) = Right (k, p)
-           (with, without) = partitionEithers $ map toEither goodPaths
-       runHaddock True $ printKeys with singlePath
-       runHaddock False $ printKeys without singlePath
-
-printKeys
-  :: HasEnvConfig env
-  => [(Text, PathInfo -> Text)]
+path keys = do
+  let -- filter the chosen paths in flags (keys), or show all of them if no
+      -- specific paths chosen.
+      filterKeys :: (String, Text, a) -> Bool
+      filterKeys (_, key, _) = null keys || elem key keys
+      goodPathsFromRunner = null keys || elem stackRootOptionName' keys
+      goodPathsFromConfig = filter filterKeys pathsFromConfig
+      goodPathsFromEnvConfig = filter filterKeys pathsFromEnvConfig
+      toKeyPath (_, key, p) = (key, p)
+      goodPathsFromConfig' = map toKeyPath goodPathsFromConfig
+      singlePath = (if goodPathsFromRunner then 1 else 0) +
+        length goodPathsFromConfig + length goodPathsFromEnvConfig == 1
+      toEither (_, k, UseHaddocks a) = Left (k, a)
+      toEither (_, k, WithoutHaddocks a) = Right (k, a)
+      (with, without) = partitionEithers $ map toEither goodPathsFromEnvConfig
+  when goodPathsFromRunner $ printKeysWithRunner singlePath
+  unless (null goodPathsFromConfig') $
+    runHaddockWithConfig $ printKeysWithConfig goodPathsFromConfig' singlePath
+  unless (null without) $
+    runHaddockWithEnvConfig False $ printKeysWithEnvConfig without singlePath
+  unless (null with) $
+    runHaddockWithEnvConfig True $ printKeysWithEnvConfig with singlePath
+
+printKeysWithRunner ::
+     Bool
+  -> RIO Runner ()
+printKeysWithRunner single = do
+  clArgs <- view $ globalOptsL . to (.configMonoid)
+  liftIO $ do
+    (_, stackRoot, _) <- determineStackRootAndOwnership clArgs
+    let prefix = if single then "" else stackRootOptionName' <> ": "
+    T.putStrLn $ prefix <> T.pack (toFilePathNoTrailingSep stackRoot)
+
+printKeysWithConfig ::
+     HasConfig env
+  => [(Text, Config -> Text)]
+  -> Bool
+  -> RIO env ()
+printKeysWithConfig extractors single =
+  view configL >>= printKeys extractors single
+
+printKeysWithEnvConfig ::
+     HasEnvConfig env
+  => [(Text, EnvConfigPathInfo -> Text)]
+  -> Bool
+  -> RIO env ()
+printKeysWithEnvConfig extractors single =
+  fillEnvConfigPathInfo >>= printKeys extractors single
+
+printKeys ::
+     [(Text, info -> Text)]
   -> Bool
+  -> info
   -> RIO env ()
-printKeys extractors single = do
-    pathInfo <- fillPathInfo
-    liftIO $ forM_ extractors $ \(key, extractPath) -> do
-       let prefix = if single then "" else key <> ": "
-       T.putStrLn $ prefix <> extractPath pathInfo
-
-runHaddock :: Bool -> RIO EnvConfig () -> RIO Runner ()
-runHaddock x action = local modifyConfig $
-  withConfig YesReexec $
-    withDefaultEnvConfig action
+printKeys extractors single info = do
+  liftIO $ forM_ extractors $ \(key, extractPath) -> do
+    let prefix = if single then "" else key <> ": "
+    T.putStrLn $ prefix <> extractPath info
+
+runHaddockWithEnvConfig :: Bool -> RIO EnvConfig () -> RIO Runner ()
+runHaddockWithEnvConfig x action = runHaddock x $
+  withDefaultEnvConfig $ do
+    config <- view configL
+    menv <- liftIO $ config.processContextSettings defaultEnvSettings
+    -- Required, as otherwise (due to withDefaultEnvConfig) the environment is
+    -- based on Stack.Type.EnvSettings.minimalEnvSettings.
+    withProcessContext menv action
+
+runHaddockWithConfig :: RIO Config () -> RIO Runner ()
+runHaddockWithConfig = runHaddock False
+
+runHaddock :: Bool -> RIO Config () -> RIO Runner ()
+runHaddock x action = local modifyConfig $ withConfig YesReexec action
  where
   modifyConfig = set
-    (globalOptsL.globalOptsBuildOptsMonoidL.buildOptsMonoidHaddockL) (Just x)
-
-fillPathInfo :: HasEnvConfig env => RIO env PathInfo
-fillPathInfo = do
-     -- We must use a BuildConfig from an EnvConfig to ensure that it contains the
-     -- full environment info including GHC paths etc.
-     piBuildConfig <- view $ envConfigL.buildConfigL
-     -- This is the modified 'bin-path',
-     -- including the local GHC or MSYS if not configured to operate on
-     -- global GHC.
-     -- It was set up in 'withBuildConfigAndLock -> withBuildConfigExt -> setupEnv'.
-     -- So it's not the *minimal* override path.
-     piSnapDb <- packageDatabaseDeps
-     piLocalDb <- packageDatabaseLocal
-     piExtraDbs <- packageDatabaseExtra
-     piGlobalDb <- view $ compilerPathsL.to cpGlobalDB
-     piSnapRoot <- installationRootDeps
-     piLocalRoot <- installationRootLocal
-     piToolsDir <- bindirCompilerTools
-     piHoogleRoot <- hoogleRoot
-     piDistDir <- distRelativeDir
-     piHpcDir <- hpcReportDir
-     piCompiler <- getCompilerPath
-     pure PathInfo {..}
-
-pathParser :: OA.Parser [Text]
-pathParser =
-    mapMaybeA
-        (\(desc,name,_) ->
-             OA.flag Nothing
-                     (Just name)
-                     (OA.long (T.unpack name) <>
-                      OA.help desc))
-        paths
-
--- | Passed to all the path printers as a source of info.
-data PathInfo = PathInfo
-    { piBuildConfig  :: !BuildConfig
-    , piSnapDb       :: !(Path Abs Dir)
-    , piLocalDb      :: !(Path Abs Dir)
-    , piGlobalDb     :: !(Path Abs Dir)
-    , piSnapRoot     :: !(Path Abs Dir)
-    , piLocalRoot    :: !(Path Abs Dir)
-    , piToolsDir     :: !(Path Abs Dir)
-    , piHoogleRoot   :: !(Path Abs Dir)
-    , piDistDir      :: Path Rel Dir
-    , piHpcDir       :: !(Path Abs Dir)
-    , piExtraDbs     :: ![Path Abs Dir]
-    , piCompiler     :: !(Path Abs File)
+    (globalOptsL . globalOptsBuildOptsMonoidL . buildOptsMonoidHaddockL)
+    (Just x)
+
+fillEnvConfigPathInfo :: HasEnvConfig env => RIO env EnvConfigPathInfo
+fillEnvConfigPathInfo = do
+  -- We must use a BuildConfig from an EnvConfig to ensure that it contains the
+  -- full environment info including GHC paths etc.
+  buildConfig <- view $ envConfigL . buildConfigL
+  snapDb <- packageDatabaseDeps
+  localDb <- packageDatabaseLocal
+  extraDbs <- packageDatabaseExtra
+  globalDb <- view $ compilerPathsL . to (.globalDB)
+  snapRoot <- installationRootDeps
+  localRoot <- installationRootLocal
+  toolsDir <- bindirCompilerTools
+  hoogleRoot <- EnvConfig.hoogleRoot
+  distDir <- distRelativeDir
+  hpcDir <- hpcReportDir
+  compiler <- getCompilerPath
+  pure EnvConfigPathInfo
+    { buildConfig
+    , snapDb
+    , localDb
+    , globalDb
+    , snapRoot
+    , localRoot
+    , toolsDir
+    , hoogleRoot
+    , distDir
+    , hpcDir
+    , extraDbs
+    , compiler
     }
 
-instance HasPlatform PathInfo
-instance HasLogFunc PathInfo where
-    logFuncL = configL.logFuncL
-instance HasRunner PathInfo where
-    runnerL = configL.runnerL
-instance HasStylesUpdate PathInfo where
-  stylesUpdateL = runnerL.stylesUpdateL
-instance HasTerm PathInfo where
-  useColorL = runnerL.useColorL
-  termWidthL = runnerL.termWidthL
-instance HasGHCVariant PathInfo
-instance HasConfig PathInfo
-instance HasPantryConfig PathInfo where
-    pantryConfigL = configL.pantryConfigL
-instance HasProcessContext PathInfo where
-    processContextL = configL.processContextL
-instance HasBuildConfig PathInfo where
-    buildConfigL = lens piBuildConfig (\x y -> x { piBuildConfig = y })
-                 . buildConfigL
-
-data UseHaddocks a = UseHaddocks a | WithoutHaddocks a
-
--- | The paths of interest to a user. The first tuple string is used
--- for a description that the optparse flag uses, and the second
--- string as a machine-readable key and also for @--foo@ flags. The user
--- can choose a specific path to list like @--stack-root@. But
--- really it's mainly for the documentation aspect.
+-- | Type representing information needed to generate an appropriate string for
+-- paths of interest to a user which require an 'EnvConfig'.
+data EnvConfigPathInfo = EnvConfigPathInfo
+  { buildConfig  :: !BuildConfig
+  , snapDb       :: !(Path Abs Dir)
+  , localDb      :: !(Path Abs Dir)
+  , globalDb     :: !(Path Abs Dir)
+  , snapRoot     :: !(Path Abs Dir)
+  , localRoot    :: !(Path Abs Dir)
+  , toolsDir     :: !(Path Abs Dir)
+  , hoogleRoot   :: !(Path Abs Dir)
+  , distDir      :: Path Rel Dir
+  , hpcDir       :: !(Path Abs Dir)
+  , extraDbs     :: ![Path Abs Dir]
+  , compiler     :: !(Path Abs File)
+  }
+
+instance HasPlatform EnvConfigPathInfo where
+  platformL = configL . platformL
+  {-# INLINE platformL #-}
+  platformVariantL = configL . platformVariantL
+  {-# INLINE platformVariantL #-}
+
+instance HasLogFunc EnvConfigPathInfo where
+  logFuncL = configL . logFuncL
+
+instance HasRunner EnvConfigPathInfo where
+  runnerL = configL . runnerL
+
+instance HasStylesUpdate EnvConfigPathInfo where
+  stylesUpdateL = runnerL . stylesUpdateL
+
+instance HasTerm EnvConfigPathInfo where
+  useColorL = runnerL . useColorL
+  termWidthL = runnerL . termWidthL
+
+instance HasGHCVariant EnvConfigPathInfo where
+  ghcVariantL = configL . ghcVariantL
+  {-# INLINE ghcVariantL #-}
+
+instance HasConfig EnvConfigPathInfo where
+  configL = buildConfigL . lens (.config) (\x y -> x { config = y })
+  {-# INLINE configL #-}
+
+instance HasPantryConfig EnvConfigPathInfo where
+  pantryConfigL = configL . pantryConfigL
+
+instance HasProcessContext EnvConfigPathInfo where
+  processContextL = configL . processContextL
+
+instance HasBuildConfig EnvConfigPathInfo where
+  buildConfigL =
+    lens (.buildConfig) (\x y -> x { buildConfig = y }) . buildConfigL
+
+-- | Type representing whether or not building Haddocks is required.
+data UseHaddocks a
+  = UseHaddocks a
+    -- ^ Building Haddocks is required.
+  | WithoutHaddocks a
+    -- ^ Building Haddocks is not required.
+
+-- | The paths of interest to a user which do require a t'Config' or
+-- 'EnvConfig'. The first tuple string is used for a description that the
+-- optparse flag uses, and the second string as a machine-readable key and also
+-- for @--foo@ flags. The user can choose a specific path to list like
+-- @--stack-root@. But really it's mainly for the documentation aspect.
+pathsFromRunner :: (String, Text)
+pathsFromRunner = ("Global Stack root directory", stackRootOptionName')
+
+-- | The paths of interest to a user which do require an 'EnvConfig'. The first
+-- tuple string is used for a description that the optparse flag uses, and the
+-- second string as a machine-readable key and also for @--foo@ flags. The user
+-- can choose a specific path to list like @--stack-root@. But really it's
+-- mainly for the documentation aspect.
 --
--- When printing output we generate @PathInfo@ and pass it to the
--- function to generate an appropriate string.  Trailing slashes are
--- removed, see #506
-paths :: [(String, Text, UseHaddocks (PathInfo -> Text))]
-paths =
-    [ ( "Global Stack root directory"
-      , T.pack stackRootOptionName
-      , WithoutHaddocks $ view (stackRootL.to toFilePathNoTrailingSep.to T.pack))
-    , ( "Project root (derived from stack.yaml file)"
-      , "project-root"
-      , WithoutHaddocks $ view (projectRootL.to toFilePathNoTrailingSep.to T.pack))
-    , ( "Configuration location (where the stack.yaml file is)"
-      , "config-location"
-      , WithoutHaddocks $ view (stackYamlL.to toFilePath.to T.pack))
-    , ( "PATH environment variable"
-      , "bin-path"
-      , WithoutHaddocks $ T.pack . intercalate [FP.searchPathSeparator] . view exeSearchPathL)
-    , ( "Install location for GHC and other core tools (see 'stack ls tools' command)"
-      , "programs"
-      , WithoutHaddocks $ view (configL.to configLocalPrograms.to toFilePathNoTrailingSep.to T.pack))
-    , ( "Compiler binary (e.g. ghc)"
-      , "compiler-exe"
-      , WithoutHaddocks $ T.pack . toFilePath . piCompiler )
-    , ( "Directory containing the compiler binary (e.g. ghc)"
-      , "compiler-bin"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . parent . piCompiler )
-    , ( "Directory containing binaries specific to a particular compiler (e.g. intero)"
-      , "compiler-tools-bin"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piToolsDir )
-    , ( "Directory where Stack installs executables (e.g. ~/.local/bin (Unix-like OSs) or %APPDATA%\\local\\bin (Windows))"
-      , "local-bin"
-      , WithoutHaddocks $ view $ configL.to configLocalBin.to toFilePathNoTrailingSep.to T.pack)
-    , ( "Extra include directories"
-      , "extra-include-dirs"
-      , WithoutHaddocks $ T.intercalate ", " . map T.pack . configExtraIncludeDirs . view configL )
-    , ( "Extra library directories"
-      , "extra-library-dirs"
-      , WithoutHaddocks $ T.intercalate ", " . map T.pack . configExtraLibDirs . view configL )
-    , ( "Snapshot package database"
-      , "snapshot-pkg-db"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piSnapDb )
-    , ( "Local project package database"
-      , "local-pkg-db"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piLocalDb )
-    , ( "Global package database"
-      , "global-pkg-db"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piGlobalDb )
-    , ( "GHC_PACKAGE_PATH environment variable"
-      , "ghc-package-path"
-      , WithoutHaddocks $ \pi' -> mkGhcPackagePath True (piLocalDb pi') (piSnapDb pi') (piExtraDbs pi') (piGlobalDb pi'))
-    , ( "Snapshot installation root"
-      , "snapshot-install-root"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piSnapRoot )
-    , ( "Local project installation root"
-      , "local-install-root"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piLocalRoot )
-    , ( "Snapshot documentation root"
-      , "snapshot-doc-root"
-      , UseHaddocks $ \pi' -> T.pack (toFilePathNoTrailingSep (piSnapRoot pi' </> docDirSuffix)))
-    , ( "Local project documentation root"
-      , "local-doc-root"
-      , UseHaddocks $ \pi' -> T.pack (toFilePathNoTrailingSep (piLocalRoot pi' </> docDirSuffix)))
-    , ( "Local project documentation root"
-      , "local-hoogle-root"
-      , UseHaddocks $ T.pack . toFilePathNoTrailingSep . piHoogleRoot)
-    , ( "Dist work directory, relative to package directory"
-      , "dist-dir"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piDistDir )
-    , ( "Where HPC reports and tix files are stored"
-      , "local-hpc-root"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . piHpcDir )
-    , ( "DEPRECATED: Use '--local-bin' instead"
-      , "local-bin-path"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . configLocalBin . view configL )
-    , ( "DEPRECATED: Use '--programs' instead"
-      , "ghc-paths"
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . configLocalPrograms . view configL )
-    , ( "DEPRECATED: Use '--" <> stackRootOptionName <> "' instead"
-      , T.pack deprecatedStackRootOptionName
-      , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . view stackRootL )
-    ]
-
-deprecatedPathKeys :: [(Text, Text)]
-deprecatedPathKeys =
-    [ (T.pack deprecatedStackRootOptionName, T.pack stackRootOptionName)
-    , ("ghc-paths", "programs")
-    , ("local-bin-path", "local-bin")
-    ]
+-- When printing output we generate t'Config' and pass it to the function
+-- to generate an appropriate string. Trailing slashes are removed, see #506.
+pathsFromConfig :: [(String, Text, Config -> Text)]
+pathsFromConfig =
+  [ ( "User-specific global configuration file"
+    , T.pack stackGlobalConfigOptionName
+    , view (userGlobalConfigFileL . to toFilePath . to T.pack)
+    )
+  , ( "Install location for GHC and other core tools (see 'stack ls tools' command)"
+    , "programs"
+    , view (configL . to (.localPrograms) . to toFilePathNoTrailingSep . to T.pack)
+    )
+  , ( "Directory where Stack installs executables (e.g. ~/.local/bin (Unix-like OSs) or %APPDATA%\\local\\bin (Windows))"
+    , "local-bin"
+    , view $ configL . to (.localBin) . to toFilePathNoTrailingSep . to T.pack
+    )
+  ]
+
+-- | The paths of interest to a user which require a 'EnvConfig'. The first
+-- tuple string is used for a description that the optparse flag uses, and the
+-- second string as a machine-readable key and also for @--foo@ flags. The user
+-- can choose a specific path to list like @--project-root@. But really it's
+-- mainly for the documentation aspect.
+--
+-- When printing output we generate t'EnvConfigPathInfo' and pass it to the
+-- function to generate an appropriate string. Trailing slashes are removed, see
+-- #506.
+pathsFromEnvConfig :: [(String, Text, UseHaddocks (EnvConfigPathInfo -> Text))]
+pathsFromEnvConfig =
+  [ ( "Project root (derived from the project-level configuration file; \
+      \stack.yaml, by default)"
+    , "project-root"
+    , WithoutHaddocks $ view (configFileL . to toProjectConfigFileRootPath)
+    )
+  , ( "Project-level configuration file (stack.yaml, by default)"
+    , "config-location"
+    , WithoutHaddocks $ view (configFileL . to toProjectConfigFilePath)
+    )
+  , ( "PATH environment variable"
+    , "bin-path"
+    , WithoutHaddocks $
+        T.pack . intercalate [FP.searchPathSeparator] . view exeSearchPathL
+    )
+  , ( "Compiler binary (e.g. ghc)"
+    , "compiler-exe"
+    , WithoutHaddocks $ T.pack . toFilePath . (.compiler)
+    )
+  , ( "Directory containing the compiler binary (e.g. ghc)"
+    , "compiler-bin"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . parent . (.compiler)
+    )
+  , ( "The compiler tools directory for the specified compiler version."
+    , "compiler-tools-bin"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . (.toolsDir)
+    )
+  , ( "Extra include directories"
+    , "extra-include-dirs"
+    , WithoutHaddocks $
+        T.intercalate ", " . map T.pack . (.extraIncludeDirs) . view configL
+    )
+  , ( "Extra library directories"
+    , "extra-library-dirs"
+    , WithoutHaddocks $
+        T.intercalate ", " . map T.pack . (.extraLibDirs) . view configL
+    )
+  , ( "Snapshot package database"
+    , "snapshot-pkg-db"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . (.snapDb)
+    )
+  , ( "Local project package database"
+    , "local-pkg-db"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . (.localDb)
+    )
+  , ( "Global package database"
+    , "global-pkg-db"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . (.globalDb)
+    )
+  , ( "GHC_PACKAGE_PATH environment variable"
+    , "ghc-package-path"
+    , WithoutHaddocks $
+        \pi -> mkGhcPackagePath
+                 True
+                 pi.localDb
+                 pi.snapDb
+                 pi.extraDbs
+                 pi.globalDb
+    )
+  , ( "Snapshot installation root"
+    , "snapshot-install-root"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . (.snapRoot)
+    )
+  , ( "Local project installation root"
+    , "local-install-root"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . (.localRoot)
+    )
+  , ( "Snapshot documentation root"
+    , "snapshot-doc-root"
+    , UseHaddocks $
+        \pi -> T.pack (toFilePathNoTrailingSep (pi.snapRoot </> docDirSuffix))
+    )
+  , ( "Local project documentation root"
+    , "local-doc-root"
+    , UseHaddocks $
+        \pi -> T.pack (toFilePathNoTrailingSep (pi.localRoot </> docDirSuffix))
+    )
+  , ( "Local project documentation root"
+    , "local-hoogle-root"
+    , UseHaddocks $ T.pack . toFilePathNoTrailingSep . (.hoogleRoot)
+    )
+  , ( "Dist work directory, relative to package directory"
+    , "dist-dir"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . (.distDir)
+    )
+  , ( "Where HPC reports and tix files are stored"
+    , "local-hpc-root"
+    , WithoutHaddocks $ T.pack . toFilePathNoTrailingSep . (.hpcDir)
+    )
+  ]
+ where
+  toProjectConfigFileRootPath :: Either (Path Abs File) (Path Abs File) -> Text
+  toProjectConfigFileRootPath (Left _) =
+    throw $ PrettyException ConfigFileNotProjectLevelBug
+  toProjectConfigFileRootPath (Right projectConfigFile) =
+    T.pack $ toFilePathNoTrailingSep $ parent projectConfigFile
+  toProjectConfigFilePath :: Either (Path Abs File) (Path Abs File) -> Text
+  toProjectConfigFilePath (Left _) =
+    throw $ PrettyException ConfigFileNotProjectLevelBug
+  toProjectConfigFilePath (Right projectConfigFile) =
+    T.pack $ toFilePath projectConfigFile
+
+-- | 'Text' equivalent of 'stackRootOptionName'.
+stackRootOptionName' :: Text
+stackRootOptionName' = T.pack stackRootOptionName
diff --git a/src/Stack/Prelude.hs b/src/Stack/Prelude.hs
index 22e7fa571b..e7c5856b26 100644
--- a/src/Stack/Prelude.hs
+++ b/src/Stack/Prelude.hs
@@ -1,6 +1,15 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+
+{-|
+Module      : Stack.Prelude
+Description : Common types and functions.
+License     : BSD-3-Clause
+
+Common types and functions.
+-}
 
 module Stack.Prelude
   ( withSystemTempDir
@@ -14,7 +23,6 @@ module Stack.Prelude
   , prompt
   , promptPassword
   , promptBool
-  , stackProgName
   , FirstTrue (..)
   , fromFirstTrue
   , defaultFirstTrue
@@ -22,46 +30,148 @@ module Stack.Prelude
   , fromFirstFalse
   , defaultFirstFalse
   , writeBinaryFileAtomic
+  , bugReport
+  , bugPrettyReport
+  , blankLine
+  , putUtf8Builder
+  , putBuilder
+  , ppException
+  , prettyThrowIO
+  , prettyThrowM
+  , prettyImpureThrow
+  , mcons
+  , MungedPackageId (..)
+  , MungedPackageName (..)
+  , LibraryName (..)
   , module X
+  -- * Re-exports from the rio-pretty print package
+  , HasStylesUpdate (..)
+  , HasTerm (..)
+  , Pretty (..)
+  , PrettyException (..)
+  , PrettyRawSnapshotLocation (..)
+  , StyleDoc
+  , Style (..)
+  , StyleSpec
+  , StylesUpdate (..)
+  , (<+>)
+  , align
+  , bulletedList
+  , debugBracket
+  , defaultStyles
+  , displayWithColor
+  , encloseSep
+  , fill
+  , fillSep
+  , foldr'
+  , fromPackageId
+  , fromPackageName
+  , flow
+  , hang
+  , hcat
+  , hsep
+  , indent
+  , line
+  , logLevelToStyle
+  , mkNarrativeList
+  , parens
+  , parseStylesUpdateFromString
+  , prettyDebug
+  , prettyDebugL
+  , prettyError
+  , prettyErrorL
+  , prettyGeneric
+  , prettyInfo
+  , prettyInfoL
+  , prettyInfoS
+  , prettyNote
+  , prettyNoteL
+  , prettyNoteS
+  , prettyWarn
+  , prettyWarnL
+  , prettyWarnNoIndent
+  , prettyWarnS
+  , punctuate
+  , sep
+  , softbreak
+  , softline
+  , spacedBulletedList
+  , string
+  , style
+  , vsep
   ) where
 
-import           RIO                  as X
-import           RIO.File             as X hiding (writeBinaryFileAtomic)
-import           Data.Conduit         as X (ConduitM, runConduit, (.|))
-import           Path                 as X (Abs, Dir, File, Path, Rel,
-                                            toFilePath)
-import           Pantry               as X hiding (Package (..), loadSnapshot)
-
-import           Data.Monoid          as X (First (..), Any (..), Sum (..), Endo (..))
-
-import qualified Path.IO
-
-import           System.IO.Echo (withoutInputEcho)
-
+import           Data.Monoid as X
+                   ( Any (..), Endo (..), First (..), Sum (..) )
+import           Data.Conduit as X ( ConduitM, runConduit, (.|) )
 import qualified Data.Conduit.Binary as CB
 import qualified Data.Conduit.List as CL
-import           Data.Conduit.Process.Typed (withLoggedProcess_, createSource, byteStringInput)
-import           RIO.Process (HasProcessContext (..), ProcessContext, setStdin, closed, getStderr, getStdout, proc, withProcessWait_, setStdout, setStderr, ProcessConfig, readProcess_, workingDirL, waitExitCode)
-
+import           Data.Conduit.Process.Typed
+                   ( byteStringInput, createSource, withLoggedProcess_ )
+import           Data.Foldable ( Foldable(foldr') )
 import qualified Data.Text.IO as T
+import           Distribution.Types.LibraryName ( LibraryName (..) )
+import           Distribution.Types.MungedPackageId ( MungedPackageId (..) )
+import           Distribution.Types.MungedPackageName ( MungedPackageName (..) )
+import           Pantry as X hiding ( Package (..), loadSnapshot )
+import           Path as X
+                   ( Abs, Dir, File, Path, Rel, toFilePath )
+import qualified Path.IO
+import           RIO as X
+import           RIO.File as X hiding ( writeBinaryFileAtomic )
+import           RIO.PrettyPrint
+                   ( HasStylesUpdate (..), HasTerm (..), Pretty (..), Style (..)
+                   , StyleDoc, (<+>), align, blankLine, bulletedList
+                   , debugBracket, displayWithColor, encloseSep, fill, fillSep
+                   , flow, hang, hcat, hsep, indent, line, logLevelToStyle
+                   , mkNarrativeList, parens, prettyDebug, prettyDebugL
+                   , prettyError, prettyErrorL, prettyGeneric, prettyInfo
+                   , prettyInfoL, prettyInfoS, prettyNote, prettyNoteL
+                   , prettyNoteS, prettyWarn, prettyWarnL, prettyWarnNoIndent
+                   , prettyWarnS, punctuate, sep, softbreak, softline
+                   , spacedBulletedList, string, style, stylesUpdateL, useColorL
+                   , vsep
+                   )
+import           RIO.PrettyPrint.DefaultStyles (defaultStyles)
+import           RIO.PrettyPrint.PrettyException
+                   ( PrettyException (..), ppException, prettyImpureThrow
+                   , prettyThrowIO, prettyThrowM
+                   )
+import           RIO.PrettyPrint.StylesUpdate
+                   ( StylesUpdate (..), parseStylesUpdateFromString )
+import           RIO.PrettyPrint.Types ( StyleSpec )
+import           RIO.Process
+                   ( HasProcessContext (..), ProcessConfig, ProcessContext
+                   , closed, getStderr, getStdout, proc, readProcess_, setStderr
+                   , setStdin, setStdout, waitExitCode, withProcessWait_
+                   , workingDirL
+                   )
 import qualified RIO.Text as T
+import           System.IO.Echo ( withoutInputEcho )
 
 -- | Path version
 withSystemTempDir :: MonadUnliftIO m => String -> (Path Abs Dir -> m a) -> m a
-withSystemTempDir str inner = withRunInIO $ \run -> Path.IO.withSystemTempDir str $ run . inner
+withSystemTempDir str inner = withRunInIO $ \run ->
+  Path.IO.withSystemTempDir str $ run . inner
 
 -- | Like `withSystemTempDir`, but the temporary directory is not deleted.
-withKeepSystemTempDir :: MonadUnliftIO m => String -> (Path Abs Dir -> m a) -> m a
+withKeepSystemTempDir ::
+     MonadUnliftIO m
+  => String
+  -> (Path Abs Dir -> m a)
+  -> m a
 withKeepSystemTempDir str inner = withRunInIO $ \run -> do
   path <- Path.IO.getTempDir
   dir <- Path.IO.createTempDir path str
   run $ inner dir
 
--- | Consume the stdout and stderr of a process feeding strict 'ByteString's to the consumers.
+-- | Consume the stdout and stderr of a process feeding strict 'ByteString's to
+-- the consumers.
 --
--- Throws a 'ReadProcessException' if unsuccessful in launching, or 'ExitCodeException' if the process itself fails.
-sinkProcessStderrStdout
-  :: forall e o env. (HasProcessContext env, HasLogFunc env, HasCallStack)
+-- Throws a 'Rio.Process.ReadProcessException' if unsuccessful in launching, or
+-- 'Rio.Process.ExitCodeException' if the process itself fails.
+sinkProcessStderrStdout ::
+     forall e o env. (HasProcessContext env, HasLogFunc env, HasCallStack)
   => String -- ^ Command
   -> [String] -- ^ Command line arguments
   -> ConduitM ByteString Void (RIO env) e -- ^ Sink for stderr
@@ -84,43 +194,48 @@ sinkProcessStderrStdout name args sinkStderr sinkStdout =
 -- level. Should not be used for long-running processes or ones with
 -- lots of output; for that use 'sinkProcessStderrStdout'.
 --
--- Throws a 'ReadProcessException' if unsuccessful.
-sinkProcessStdout
-    :: (HasProcessContext env, HasLogFunc env, HasCallStack)
-    => String -- ^ Command
-    -> [String] -- ^ Command line arguments
-    -> ConduitM ByteString Void (RIO env) a -- ^ Sink for stdout
-    -> RIO env a
+-- Throws a 'Rio.Process.ReadProcessException' if unsuccessful.
+sinkProcessStdout ::
+     (HasProcessContext env, HasLogFunc env, HasCallStack)
+  => String -- ^ Command
+  -> [String] -- ^ Command line arguments
+  -> ConduitM ByteString Void (RIO env) a -- ^ Sink for stdout
+  -> RIO env a
 sinkProcessStdout name args sinkStdout =
   proc name args $ \pc ->
   withLoggedProcess_ (setStdin closed pc) $ \p -> runConcurrently
     $ Concurrently (runConduit $ getStderr p .| CL.sinkNull)
    *> Concurrently (runConduit $ getStdout p .| sinkStdout)
 
-logProcessStderrStdout
-    :: (HasCallStack, HasProcessContext env, HasLogFunc env)
-    => ProcessConfig stdin stdoutIgnored stderrIgnored
-    -> RIO env ()
+logProcessStderrStdout ::
+     (HasCallStack, HasProcessContext env, HasLogFunc env)
+  => ProcessConfig stdin stdoutIgnored stderrIgnored
+  -> RIO env ()
 logProcessStderrStdout pc = withLoggedProcess_ pc $ \p ->
-    let logLines = CB.lines .| CL.mapM_ (logInfo . displayBytesUtf8)
-     in runConcurrently
-            $ Concurrently (runConduit $ getStdout p .| logLines)
-           *> Concurrently (runConduit $ getStderr p .| logLines)
+  let logLines = CB.lines .| CL.mapM_ (logInfo . displayBytesUtf8)
+  in  runConcurrently
+        $  Concurrently (runConduit $ getStdout p .| logLines)
+        *> Concurrently (runConduit $ getStderr p .| logLines)
 
 -- | Read from the process, ignoring any output.
 --
--- Throws a 'ReadProcessException' exception if the process fails.
-readProcessNull :: (HasProcessContext env, HasLogFunc env, HasCallStack)
-                => String -- ^ Command
-                -> [String] -- ^ Command line arguments
-                -> RIO env ()
+-- Throws a 'Rio.Process.ReadProcessException' exception if the process fails.
+readProcessNull ::
+     (HasProcessContext env, HasLogFunc env, HasCallStack)
+  => String -- ^ Command
+  -> [String] -- ^ Command line arguments
+  -> RIO env ()
 readProcessNull name args =
   -- We want the output to appear in any exceptions, so we capture and drop it
   void $ proc name args readProcess_
 
 -- | Use the new 'ProcessContext', but retain the working directory
 -- from the parent environment.
-withProcessContext :: HasProcessContext env => ProcessContext -> RIO env a -> RIO env a
+withProcessContext ::
+     HasProcessContext env
+  => ProcessContext
+  -> RIO env a
+  -> RIO env a
 withProcessContext pcNew inner = do
   pcOld <- view processContextL
   let pcNew' = set workingDirL (view workingDirL pcOld) pcNew
@@ -159,60 +274,116 @@ promptPassword txt = liftIO $ do
 -- print a message indicating that "y" or "n" is expected, and ask
 -- again.
 promptBool :: MonadIO m => Text -> m Bool
-promptBool txt = liftIO $ do
-  input <- prompt txt
-  case input of
+promptBool txt = liftIO $
+  prompt txt >>= \case
     "y" -> pure True
     "n" -> pure False
     _ -> do
       T.putStrLn "Please press either 'y' or 'n', and then enter."
       promptBool txt
 
--- | Name of the 'stack' program.
---
--- NOTE: Should be defined in "Stack.Constants", but not doing so due to the
--- GHC stage restrictions.
-stackProgName :: String
-stackProgName = "stack"
-
 -- | Like @First Bool@, but the default is @True@.
-newtype FirstTrue = FirstTrue { getFirstTrue :: Maybe Bool }
-  deriving (Show, Eq, Ord)
+newtype FirstTrue
+  = FirstTrue { firstTrue :: Maybe Bool }
+  deriving (Eq, Ord, Show)
+
 instance Semigroup FirstTrue where
   FirstTrue (Just x) <> _ = FirstTrue (Just x)
   FirstTrue Nothing <> x = x
+
 instance Monoid FirstTrue where
   mempty = FirstTrue Nothing
   mappend = (<>)
 
 -- | Get the 'Bool', defaulting to 'True'
 fromFirstTrue :: FirstTrue -> Bool
-fromFirstTrue = fromMaybe True . getFirstTrue
+fromFirstTrue = fromMaybe True . (.firstTrue)
 
 -- | Helper for filling in default values
-defaultFirstTrue :: (a -> FirstTrue) -> Bool
+defaultFirstTrue :: FirstTrue -> Bool
 defaultFirstTrue _ = True
 
 -- | Like @First Bool@, but the default is @False@.
-newtype FirstFalse = FirstFalse { getFirstFalse :: Maybe Bool }
-  deriving (Show, Eq, Ord)
+newtype FirstFalse
+  = FirstFalse { firstFalse :: Maybe Bool }
+  deriving (Eq, Ord, Show)
+
 instance Semigroup FirstFalse where
   FirstFalse (Just x) <> _ = FirstFalse (Just x)
   FirstFalse Nothing <> x = x
+
 instance Monoid FirstFalse where
   mempty = FirstFalse Nothing
   mappend = (<>)
 
 -- | Get the 'Bool', defaulting to 'False'
 fromFirstFalse :: FirstFalse -> Bool
-fromFirstFalse = fromMaybe False . getFirstFalse
+fromFirstFalse = fromMaybe False . (.firstFalse)
 
 -- | Helper for filling in default values
-defaultFirstFalse :: (a -> FirstFalse) -> Bool
+defaultFirstFalse :: FirstFalse -> Bool
 defaultFirstFalse _ = False
 
 -- | Write a @Builder@ to a file and atomically rename.
 writeBinaryFileAtomic :: MonadIO m => Path absrel File -> Builder -> m ()
 writeBinaryFileAtomic fp builder =
-    liftIO $
-    withBinaryFileAtomic (toFilePath fp) WriteMode (`hPutBuilder` builder)
+  liftIO $
+  withBinaryFileAtomic (toFilePath fp) WriteMode (`hPutBuilder` builder)
+
+newtype PrettyRawSnapshotLocation
+  = PrettyRawSnapshotLocation RawSnapshotLocation
+
+instance Pretty PrettyRawSnapshotLocation where
+  pretty (PrettyRawSnapshotLocation (RSLCompiler compiler)) =
+    fromString $ T.unpack $ utf8BuilderToText $ display compiler
+  pretty (PrettyRawSnapshotLocation (RSLUrl url Nothing)) =
+    style Url (fromString $ T.unpack url)
+  pretty (PrettyRawSnapshotLocation (RSLUrl url (Just blob))) =
+    fillSep
+    [ style Url (fromString $ T.unpack url)
+    , parens $ fromString $ T.unpack $ utf8BuilderToText $ display blob
+    ]
+  pretty (PrettyRawSnapshotLocation (RSLFilePath resolved)) =
+    style File (fromString $ show $ resolvedRelative resolved)
+  pretty (PrettyRawSnapshotLocation (RSLSynonym syn)) = fromString $ show syn
+
+-- | Report a bug in Stack.
+bugReport :: String -> String -> String
+bugReport code msg =
+  "Error: " ++ code ++ "\n" ++
+  bugDeclaration ++ " " ++ msg ++ " " ++ bugRequest
+
+-- | Report a pretty bug in Stack.
+bugPrettyReport :: String -> StyleDoc -> StyleDoc
+bugPrettyReport code msg =
+     "Error:" <+> fromString code
+  <> line
+  <> flow bugDeclaration <+> msg <+> flow bugRequest
+
+-- | Bug declaration message.
+bugDeclaration :: String
+bugDeclaration = "The impossible happened!"
+
+-- | Bug report message.
+bugRequest :: String
+bugRequest =  "Please report this bug at Stack's repository."
+
+-- | Maybe cons.
+mcons :: Maybe a -> [a] -> [a]
+mcons ma as = maybe as (:as) ma
+
+-- | Write a t'Utf8Builder' to the standard output stream.
+putUtf8Builder :: MonadIO m => Utf8Builder -> m ()
+putUtf8Builder = putBuilder . getUtf8Builder
+
+-- | Write a 'Builder' to the standard output stream.
+putBuilder :: MonadIO m => Builder -> m ()
+putBuilder = hPutBuilder stdout
+
+-- | Convert a package identifier to a value of a string-like type.
+fromPackageId :: IsString a => PackageIdentifier -> a
+fromPackageId = fromString . packageIdentifierString
+
+-- | Convert a package name to a value of a string-like type.
+fromPackageName :: IsString a => PackageName -> a
+fromPackageName = fromString . packageNameString
diff --git a/src/Stack/Query.hs b/src/Stack/Query.hs
new file mode 100644
index 0000000000..a86adbc7d1
--- /dev/null
+++ b/src/Stack/Query.hs
@@ -0,0 +1,136 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Query
+Description : Types and functions related to Stack's @query@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @query@ command.
+-}
+
+module Stack.Query
+  ( queryCmd
+  , queryBuildInfo
+  ) where
+
+import           Data.Aeson ( Value (Object, Array), (.=), object )
+import qualified Data.Aeson.Key as Key
+import qualified Data.Aeson.KeyMap as KeyMap
+import           Data.List ( isPrefixOf )
+import qualified Data.Text as T
+import           Data.Text.Encoding ( decodeUtf8 )
+import qualified Data.Text.IO as TIO
+import           Data.Text.Read ( decimal )
+import qualified Data.Vector as V
+import qualified Data.Yaml as Yaml
+import           Path ( parent )
+import           Stack.Build.Source ( projectLocalPackages )
+import           Stack.Prelude
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig )
+import           Stack.Types.BuildConfig ( wantedCompilerVersionL )
+import           Stack.Types.Compiler ( compilerVersionText )
+import           Stack.Types.EnvConfig ( HasEnvConfig, actualCompilerVersionL )
+import           Stack.Types.Runner ( Runner )
+import           Stack.Types.Package ( LocalPackage (..), Package (..) )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Query"module.
+data QueryException
+  = SelectorNotFound ![Text]
+  | IndexOutOfRange ![Text]
+  | NoNumericSelector ![Text]
+  | CannotApplySelector !Value ![Text]
+  deriving Show
+
+instance Exception QueryException where
+  displayException (SelectorNotFound sels) =
+    err "[S-4419]" "Selector not found" sels
+  displayException (IndexOutOfRange sels) =
+    err "[S-8422]" "Index out of range" sels
+  displayException (NoNumericSelector sels) =
+    err "[S-4360]" "Encountered array and needed numeric selector" sels
+  displayException (CannotApplySelector value sels) =
+    err "[S-1711]" ("Cannot apply selector to " ++ show value) sels
+
+-- | Helper function for 'QueryException' instance of 'Show'
+err :: String -> String -> [Text] -> String
+err msg code sels = "Error: " ++ code ++ "\n" ++ msg ++ ": " ++ show sels
+
+-- | Function underlying the @stack query@ command.
+queryCmd ::
+     [String]
+     -- ^ Selectors.
+  -> RIO Runner ()
+queryCmd selectors = withConfig YesReexec $
+  withDefaultEnvConfig $ queryBuildInfo $ map T.pack selectors
+
+-- | Query information about the build and print the result to stdout in YAML
+-- format.
+queryBuildInfo ::
+     HasEnvConfig env
+  => [Text] -- ^ Selectors.
+  -> RIO env ()
+queryBuildInfo selectors0 =
+      rawBuildInfo
+  >>= select id selectors0
+  >>= liftIO . TIO.putStrLn . addGlobalHintsComment . decodeUtf8 . Yaml.encode
+ where
+  select _ [] value = pure value
+  select front (sel:sels) value =
+    case value of
+      Object o ->
+        case KeyMap.lookup (Key.fromText sel) o of
+          Nothing -> throwIO $ SelectorNotFound sels'
+          Just value' -> cont value'
+      Array v ->
+        case decimal sel of
+          Right (i, "")
+            | i >= 0 && i < V.length v -> cont $ v V.! i
+            | otherwise -> throwIO $ IndexOutOfRange sels'
+          _ -> throwIO $ NoNumericSelector sels'
+      _ -> throwIO $ CannotApplySelector value sels'
+   where
+    cont = select (front . (sel:)) sels
+    sels' = front [sel]
+  -- Include comments to indicate that this portion of the "stack
+  -- query" API is not necessarily stable.
+  addGlobalHintsComment
+    | null selectors0 = T.replace globalHintsLine ("\n" <> globalHintsComment <> globalHintsLine)
+    -- Append comment instead of pre-pending. The reasoning here is
+    -- that something *could* expect that the result of 'stack query
+    -- global-hints ghc-boot' is just a string literal. Seems easier
+    -- for to expect the first line of the output to be the literal.
+    | ["global-hints"] `isPrefixOf` selectors0 = (<> ("\n" <> globalHintsComment))
+    | otherwise = id
+  globalHintsLine = "\nglobal-hints:\n"
+  globalHintsComment = T.concat
+    [ "# Note: global-hints is experimental and may be renamed / removed in the future.\n"
+    , "# See https://github.com/commercialhaskell/stack/issues/3796"
+    ]
+
+-- | Get the raw build information object
+rawBuildInfo :: HasEnvConfig env => RIO env Value
+rawBuildInfo = do
+  locals <- projectLocalPackages
+  wantedCompiler <-
+    view $ wantedCompilerVersionL . to (utf8BuilderToText . display)
+  actualCompiler <- view $ actualCompilerVersionL . to compilerVersionText
+  pure $ object
+    [ "locals" .= Object (KeyMap.fromList $ map localToPair locals)
+    , "compiler" .= object
+        [ "wanted" .= wantedCompiler
+        , "actual" .= actualCompiler
+        ]
+    ]
+ where
+  localToPair lp =
+    (Key.fromText $ T.pack $ packageNameString p.name, value)
+   where
+    p = lp.package
+    value = object
+      [ "version" .= CabalString p.version
+      , "path" .= toFilePath (parent lp.cabalFP)
+      ]
diff --git a/src/Stack/Runners.hs b/src/Stack/Runners.hs
index a45ed24b28..e038564a1b 100644
--- a/src/Stack/Runners.hs
+++ b/src/Stack/Runners.hs
@@ -1,72 +1,117 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Runners
+Description : Utilities for running stack commands.
+License     : BSD-3-Clause
+
+Utilities for running stack commands.
+
+Instead of using Has-style classes below, the type signatures use concrete
+environments to try and avoid accidentally rerunning configuration parsing. For
+example, we want @withConfig $ withConfig $ ...@ to fail.
+-}
 
--- | Utilities for running stack commands.
---
--- Instead of using Has-style classes below, the type signatures use
--- concrete environments to try and avoid accidentally rerunning
--- configuration parsing. For example, we want @withConfig $
--- withConfig $ ...@ to fail.
 module Stack.Runners
-    ( withBuildConfig
-    , withEnvConfig
-    , withDefaultEnvConfig
-    , withConfig
-    , withGlobalProject
-    , withRunnerGlobal
-    , ShouldReexec (..)
-    ) where
+  ( withBuildConfig
+  , withEnvConfig
+  , withDefaultEnvConfig
+  , withConfig
+  , withGlobalProject
+  , withRunnerGlobal
+  , ShouldReexec (..)
+  ) where
 
-import           Stack.Prelude
-import           RIO.Process (mkDefaultProcessContext)
-import           RIO.Time (addUTCTime, getCurrentTime)
-import           Stack.Build.Target(NeedTargets(..))
+import qualified Data.ByteString.Lazy.Char8 as L8
+import           RIO.Process
+                   ( findExecutable, mkDefaultProcessContext, proc
+                   , readProcess
+                   )
+import           RIO.Time ( addUTCTime, getCurrentTime )
+import           Stack.Build.Target ( NeedTargets (..) )
 import           Stack.Config
+                   ( getInContainer, getInNixShell, loadConfig, withBuildConfig
+                   , withNewLogFunc
+                   )
 import           Stack.Constants
-import           Stack.DefaultColorWhen (defaultColorWhen)
+                   ( defaultTerminalWidth, maxTerminalWidth, minTerminalWidth
+                   , nixProgName
+                   )
+import           Stack.DefaultColorWhen ( defaultColorWhen )
 import qualified Stack.Docker as Docker
 import qualified Stack.Nix as Nix
-import           Stack.Setup
-import           Stack.Storage.User (upgradeChecksSince, logUpgradeCheck)
-import           Stack.Types.Config
-import           Stack.Types.Docker (dockerEnable)
-import           Stack.Types.Nix (nixEnable)
-import           Stack.Types.Version (stackMinorVersion, minorVersion)
-import           System.Console.ANSI (hSupportsANSIWithoutEmulation)
-import           System.Terminal (getTerminalWidth)
+import           Stack.Prelude
+import           Stack.Setup ( setupEnv )
+import           Stack.Storage.User ( logUpgradeCheck, upgradeChecksSince )
+import           Stack.Types.BuildOptsCLI
+                   ( BuildOptsCLI, defaultBuildOptsCLI )
+import           Stack.Types.ColorWhen ( ColorWhen (..) )
+import           Stack.Types.Config ( Config (..) )
+import           Stack.Types.ConfigMonoid ( ConfigMonoid (..) )
+import           Stack.Types.Docker ( DockerOpts (..) )
+import           Stack.Types.EnvConfig ( EnvConfig )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Nix ( NixOpts (..) )
+import           Stack.Types.Runner
+                   ( Runner (..), globalOptsL, reExecL, stackYamlLocL )
+import           Stack.Types.StackYamlLoc ( StackYamlLoc (..) )
+import           Stack.Types.Version
+                   ( minorVersion, stackMinorVersion, stackVersion )
+import           System.Console.ANSI ( hNowSupportsANSI )
+import           System.Terminal ( getTerminalWidth )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Runners" module.
+data RunnersException
+  = CommandInvalid
+  | DockerAndNixInvalid
+  | NixWithinDockerInvalid
+  | DockerWithinNixInvalid
+  deriving Show
+
+instance Exception RunnersException where
+  displayException CommandInvalid =
+    "Error: [S-7144]\n"
+    ++ "Cannot use this command with options which override the stack.yaml \
+       \location."
+  displayException DockerAndNixInvalid =
+    "Error: [S-8314]\n"
+    ++ "Cannot use both Docker and Nix at the same time."
+  displayException NixWithinDockerInvalid =
+    "Error: [S-8641]\n"
+    ++ "Cannot use Nix from within a Docker container."
+  displayException DockerWithinNixInvalid =
+    "Error: [S-5107]\n"
+    ++ "Cannot use Docker from within a Nix shell."
 
 -- | Ensure that no project settings are used when running 'withConfig'.
 withGlobalProject :: RIO Runner a -> RIO Runner a
-withGlobalProject inner = do
-  oldSYL <- view stackYamlLocL
-  case oldSYL of
-    SYLDefault -> local (set stackYamlLocL SYLGlobalProject) inner
-    _ -> throwString "Cannot use this command with options which override the stack.yaml location"
+withGlobalProject inner = view stackYamlLocL >>= \case
+  SYLDefault -> local (set stackYamlLocL SYLGlobalProject) inner
+  _ -> throwIO CommandInvalid
 
 -- | Helper for 'withEnvConfig' which passes in some default arguments:
 --
 -- * No targets are requested
 --
 -- * Default command line build options are assumed
-withDefaultEnvConfig
-    :: RIO EnvConfig a
-    -> RIO Config a
+withDefaultEnvConfig :: RIO EnvConfig a -> RIO Config a
 withDefaultEnvConfig = withEnvConfig AllowNoTargets defaultBuildOptsCLI
 
--- | Upgrade a 'Config' environment to an 'EnvConfig' environment by
--- performing further parsing of project-specific configuration (like
--- 'withBuildConfig') and then setting up a build environment
--- toolchain. This is intended to be run inside a call to
--- 'withConfig'.
-withEnvConfig
-    :: NeedTargets
-    -> BuildOptsCLI
-    -> RIO EnvConfig a
-    -- ^ Action that uses the build config.  If Docker is enabled for builds,
-    -- this will be run in a Docker container.
-    -> RIO Config a
+-- | Upgrade a t'Config' environment to an 'EnvConfig' environment by performing
+-- further parsing of project-specific configuration (like 'withBuildConfig')
+-- and then setting up a build environment toolchain. This is intended to be run
+-- inside a call to 'withConfig'.
+withEnvConfig ::
+     NeedTargets
+  -> BuildOptsCLI
+  -> RIO EnvConfig a
+  -- ^ Action that uses the build config.  If Docker is enabled for builds,
+  -- this will be run in a Docker container.
+  -> RIO Config a
 withEnvConfig needTargets boptsCLI inner =
   withBuildConfig $ do
     envConfig <- setupEnv needTargets boptsCLI Nothing
@@ -74,43 +119,86 @@ withEnvConfig needTargets boptsCLI inner =
     runRIO envConfig inner
 
 -- | If the settings justify it, should we reexec inside Docker or Nix?
-data ShouldReexec = YesReexec | NoReexec
+data ShouldReexec
+  = YesReexec
+  | NoReexec
 
 -- | Load the configuration. Convenience function used
 -- throughout this module.
-withConfig
-  :: ShouldReexec
-  -> RIO Config a
-  -> RIO Runner a
+withConfig :: ShouldReexec -> RIO Config a -> RIO Runner a
 withConfig shouldReexec inner =
-    loadConfig $ \config -> do
-      -- If we have been relaunched in a Docker container, perform in-container initialization
-      -- (switch UID, etc.).  We do this after first loading the configuration since it must
-      -- happen ASAP but needs a configuration.
-      view (globalOptsL.to globalDockerEntrypoint) >>=
-        traverse_ (Docker.entrypoint config)
-      runRIO config $ do
-        -- Catching all exceptions here, since we don't want this
-        -- check to ever cause Stack to stop working
-        shouldUpgradeCheck `catchAny` \e ->
-          logError ("Error when running shouldUpgradeCheck: " <> displayShow e)
-        case shouldReexec of
-          YesReexec -> reexec inner
-          NoReexec -> inner
-
--- | Perform a Docker or Nix reexec, if warranted. Otherwise run the
--- inner action.
+  loadConfig $ \config -> do
+    -- If we have been relaunched in a Docker container, perform in-container
+    -- initialization (switch UID, etc.).  We do this after first loading the
+    -- configuration since it must happen ASAP but needs a configuration.
+    view (globalOptsL . to (.dockerEntrypoint)) >>=
+      traverse_ (Docker.entrypoint config)
+    runRIO config $ do
+      -- Catching all exceptions here, since we don't want this
+      -- check to ever cause Stack to stop working
+      shouldUpgradeCheck `catchAny` \e ->
+        logError $
+          "Error: [S-7353]\n" <>
+          "Error when running shouldUpgradeCheck: " <>
+          displayShow e
+      case shouldReexec of
+        YesReexec -> reexec inner
+        NoReexec -> inner
+
+-- | Perform a Docker or Nix reexec, if warranted. Otherwise run the inner
+-- action.
 reexec :: RIO Config a -> RIO Config a
 reexec inner = do
-  nixEnable' <- asks $ nixEnable . configNix
-  dockerEnable' <- asks $ dockerEnable . configDocker
+  nixEnable' <- asks $ (.nix.enable)
+  notifyIfNixOnPath <- asks (.notifyIfNixOnPath)
+  when (not nixEnable' && notifyIfNixOnPath) $
+    findExecutable nixProgName >>= \case
+      Left _ -> pure ()
+      Right nix -> proc nix ["--version"] $ \pc -> do
+        let nixProgName' = style Shell (fromString nixProgName)
+            muteMsg = fillSep
+              [ flow "To mute this message in future, set"
+              , style Shell (flow "notify-if-nix-on-path: false")
+              , flow "in Stack's configuration."
+              ]
+            reportErr errMsg = prettyWarn $
+                 fillSep
+                   [ nixProgName'
+                   , flow "is on the PATH"
+                   , parens (fillSep ["at", style File (fromString nix)])
+                   , flow "but Stack encountered the following error with"
+                   , nixProgName'
+                   , style Shell "--version" <> ":"
+                   ]
+              <> blankLine
+              <> errMsg
+              <> blankLine
+              <> muteMsg
+              <> line
+        tryAny (readProcess pc) >>= \case
+          Left e -> reportErr (ppException e)
+          Right (ec, out, err) -> case ec of
+            ExitFailure _ -> reportErr $ string (L8.unpack err)
+            ExitSuccess -> do
+              let trimFinalNewline str = case reverse str of
+                    '\n' : rest -> reverse rest
+                    _ -> str
+              prettyWarn $ fillSep
+                   [ fromString (trimFinalNewline $ L8.unpack out)
+                   , flow "is on the PATH"
+                   , parens (fillSep ["at", style File (fromString nix)])
+                   , flow "but Stack's Nix integration is disabled."
+                   , muteMsg
+                   ]
+                <> line
+  dockerEnable' <- asks (.docker.enable)
   case (nixEnable', dockerEnable') of
-    (True, True) -> throwString "Cannot use both Docker and Nix at the same time"
+    (True, True) -> throwIO DockerAndNixInvalid
     (False, False) -> inner
 
     -- Want to use Nix
     (True, False) -> do
-      whenM getInContainer $ throwString "Cannot use Nix from within a Docker container"
+      whenM getInContainer $ throwIO NixWithinDockerInvalid
       isReexec <- view reExecL
       if isReexec
       then inner
@@ -118,7 +206,7 @@ reexec inner = do
 
     -- Want to use Docker
     (False, True) -> do
-      whenM getInNixShell $ throwString "Cannot use Docker from within a Nix shell"
+      whenM getInNixShell $ throwIO DockerWithinNixInvalid
       inContainer <- getInContainer
       if inContainer
         then do
@@ -128,62 +216,73 @@ reexec inner = do
             else throwIO Docker.OnlyOnHostException
         else Docker.runContainerAndExit
 
--- | Use the 'GlobalOpts' to create a 'Runner' and run the provided
+-- | Use the t'GlobalOpts' to create a t'Runner' and run the provided
 -- action.
 withRunnerGlobal :: GlobalOpts -> RIO Runner a -> IO a
 withRunnerGlobal go inner = do
-  colorWhen <-
-    maybe defaultColorWhen pure $
-    getFirst $ configMonoidColorWhen $ globalConfigMonoid go
-  useColor <- case colorWhen of
-    ColorNever -> pure False
-    ColorAlways -> pure True
-    ColorAuto -> fromMaybe True <$>
-                          hSupportsANSIWithoutEmulation stderr
-  termWidth <- clipWidth <$> maybe (fromMaybe defaultTerminalWidth
-                                    <$> getTerminalWidth)
-                                   pure (globalTermWidth go)
+  useColor <-
+    maybe defaultColorWhen pure (getFirst go.configMonoid.colorWhen) >>= \case
+      ColorNever -> pure False
+      ColorAlways -> pure True
+      ColorAuto -> hNowSupportsANSI stderr
+  termWidth <- clipWidth <$> maybe
+    (fromMaybe defaultTerminalWidth <$> getTerminalWidth)
+    pure
+    go.termWidthOpt
   menv <- mkDefaultProcessContext
-  let update = globalStylesUpdate go
-  withNewLogFunc go useColor update $ \logFunc -> runRIO Runner
-    { runnerGlobalOpts = go
-    , runnerUseColor = useColor
-    , runnerLogFunc = logFunc
-    , runnerTermWidth = termWidth
-    , runnerProcessContext = menv
-    } inner
-  where clipWidth w
-          | w < minTerminalWidth = minTerminalWidth
-          | w > maxTerminalWidth = maxTerminalWidth
-          | otherwise = w
+  -- MVar used to ensure the Docker entrypoint is performed exactly once.
+  dockerEntrypointMVar <- newMVar False
+  let update = go.stylesUpdate
+  withNewLogFunc go useColor update $ \logFunc ->
+    runRIO Runner
+      { globalOpts = go
+      , useColor = useColor
+      , logFunc = logFunc
+      , termWidth = termWidth
+      , processContext = menv
+      , dockerEntrypointMVar = dockerEntrypointMVar
+      } inner
+ where
+  clipWidth w
+    | w < minTerminalWidth = minTerminalWidth
+    | w > maxTerminalWidth = maxTerminalWidth
+    | otherwise = w
 
 -- | Check if we should recommend upgrading Stack and, if so, recommend it.
 shouldUpgradeCheck :: RIO Config ()
 shouldUpgradeCheck = do
   config <- ask
-  when (configRecommendUpgrade config) $ do
+  when config.recommendStackUpgrade $ do
     now <- getCurrentTime
-    let yesterday = addUTCTime (-24 * 60 * 60) now
+    let yesterday = addUTCTime (-(24 * 60 * 60)) now
     checks <- upgradeChecksSince yesterday
     when (checks == 0) $ do
-      mversion <- getLatestHackageVersion NoRequireHackageIndex "stack" UsePreferredVersions
+      mversion <-
+        getLatestHackageVersion NoRequireHackageIndex "stack" UsePreferredVersions
       case mversion of
         -- Compare the minor version so we avoid patch-level, Hackage-only releases.
         -- See: https://github.com/commercialhaskell/stack/pull/4729#pullrequestreview-227176315
         Just (PackageIdentifierRevision _ version _) | minorVersion version > stackMinorVersion -> do
-          logWarn "<<<<<<<<<<<<<<<<<<"
-          logWarn $
-            "You are currently using Stack version " <>
-            fromString (versionString stackVersion) <>
-            ", but version " <>
-            fromString (versionString version) <>
-            " is available"
-          logWarn "You can try to upgrade by running 'stack upgrade'"
-          logWarn $
-            "Tired of seeing this? Add 'recommend-stack-upgrade: false' to " <>
-            fromString (toFilePath (configUserConfigPath config))
-          logWarn ">>>>>>>>>>>>>>>>>>"
-          logWarn ""
-          logWarn ""
+          prettyWarn $
+               fillSep
+                 [ flow "You are currently using Stack version"
+                 , fromString (versionString stackVersion)
+                 , flow "but version"
+                 , fromString (versionString version)
+                 , flow "is available."
+                 ]
+            <> blankLine
+            <> fillSep
+                 [ "You can try to upgrade by running"
+                 , style Shell (flow "stack upgrade")
+                 ]
+            <> blankLine
+            <> fillSep
+                 [ flow "Tired of seeing this? Add"
+                 , style Shell (flow "recommend-stack-upgrade: false")
+                 , "to"
+                 , pretty config.userGlobalConfigFile <> "."
+                 ]
+            <> blankLine
         _ -> pure ()
       logUpgradeCheck now
diff --git a/src/Stack/SDist.hs b/src/Stack/SDist.hs
index cf46f8477c..51c0161230 100644
--- a/src/Stack/SDist.hs
+++ b/src/Stack/SDist.hs
@@ -1,32 +1,40 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE ConstraintKinds    #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RankNTypes         #-}
-{-# LANGUAGE TypeFamilies       #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE TypeFamilies          #-}
+
+{-|
+Module      : Stack.SDist
+Description : Types and functions related to Stack's @sdist@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @sdist@ command.
+-}
 
--- Create a source distribution tarball
 module Stack.SDist
-    ( getSDistTarball
-    , checkSDistTarball
-    , checkSDistTarball'
-    , SDistOpts (..)
-    ) where
+  ( SDistOpts (..)
+  , sdistCmd
+  , getSDistTarball
+  , checkSDistTarball
+  , checkSDistTarball'
+  , readLocalPackage
+  ) where
 
 import qualified Codec.Archive.Tar as Tar
 import qualified Codec.Archive.Tar.Entry as Tar
 import qualified Codec.Compression.GZip as GZip
-import           Control.Applicative
-import           Control.Concurrent.Execute (ActionContext(..), Concurrency(..))
-import           Stack.Prelude hiding (Display (..))
+import           Conduit ( runConduitRes, sourceLazy, sinkFileCautious )
+import           Control.Concurrent.Execute
+                   ( ActionContext (..), Concurrency (..) )
+import           Control.Monad.Extra ( whenJust )
 import qualified Data.ByteString as S
-import qualified Data.ByteString.Char8 as S8
 import qualified Data.ByteString.Lazy as L
-import           Data.Char (toLower)
-import           Data.Data (cast)
+import           Data.Char ( toLower )
+import           Data.Data ( cast )
+import qualified Data.Either.Extra as EE
 import qualified Data.List as List
-import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import qualified Data.Text as T
@@ -34,271 +42,399 @@ import qualified Data.Text.Encoding as T
 import qualified Data.Text.Encoding.Error as T
 import qualified Data.Text.Lazy as TL
 import qualified Data.Text.Lazy.Encoding as TLE
-import           Data.Time.Clock.POSIX
-import           Distribution.Package (Dependency (..))
+import           Data.Time.Clock.POSIX ( getPOSIXTime, utcTimeToPOSIXSeconds )
+import           Distribution.Package ( Dependency (..) )
 import qualified Distribution.PackageDescription as Cabal
 import qualified Distribution.PackageDescription.Check as Check
 import qualified Distribution.PackageDescription.Parsec as Cabal
-import           Distribution.PackageDescription.PrettyPrint (showGenericPackageDescription)
-import           Distribution.Version (simplifyVersionRange, orLaterVersion, earlierVersion, hasUpperBound, hasLowerBound)
-import           Path
-import           Path.IO hiding (getModificationTime, getPermissions, withSystemTempDir)
-import           RIO.PrettyPrint
-import           Stack.Build (mkBaseConfigOpts, build, buildLocalTargets)
+import           Distribution.PackageDescription.PrettyPrint
+                   ( showGenericPackageDescription )
+import           Distribution.Simple.Utils ( cabalVersion )
+import           Distribution.Version
+                   ( earlierVersion, hasLowerBound, hasUpperBound, isAnyVersion
+                   , orLaterVersion, simplifyVersionRange
+                   )
+import           Path ( (</>), parent, parseRelDir, parseRelFile )
+import           Path.IO ( ensureDir, resolveDir' )
+import           RIO.NonEmpty ( nonEmpty )
+import qualified RIO.NonEmpty as NE
+import           Stack.Build ( mkBaseConfigOpts, build, buildLocalTargets )
 import           Stack.Build.Execute
-import           Stack.Build.Installed
-import           Stack.Build.Source (projectLocalPackages)
-import           Stack.Types.GhcPkgId
-import           Stack.Package
-import           Stack.SourceMap
-import           Stack.Types.Build
-import           Stack.Types.Config
+                   ( ExcludeTHLoading (..), KeepOutputOpen (..) )
+import           Stack.Build.ExecuteEnv ( withExecuteEnv, withSingleContext )
+import           Stack.Build.Installed ( getInstalled, toInstallMap )
+import           Stack.Build.Source ( projectLocalPackages )
+import           Stack.BuildOpts ( defaultBuildOpts )
+import           Stack.Constants ( stackProgName, stackProgName' )
+import           Stack.Constants.Config ( distDirFromDir )
+import           Stack.Package ( resolvePackage, resolvePackageDescription )
+import           Stack.Prelude
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig )
+import           Stack.SourceMap ( mkProjectPackage )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..), configFileL )
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
+import           Stack.Types.BuildOptsCLI ( defaultBuildOptsCLI )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.Installed
+                   ( InstallMap, InstalledMap, installedVersion
+                   )
 import           Stack.Types.Package
+                   ( LocalPackage (..), Package (..), PackageConfig (..)
+                   , installedPackageToGhcPkgId', packageIdentifier
+                   )
+import           Stack.Types.Plan ( TaskType (..) )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.PvpBounds ( PvpBounds (..), PvpBoundsType (..) )
+import           Stack.Types.Runner ( HasRunner, Runner )
+import           Stack.Types.SDistOpts ( SDistOpts (..) )
 import           Stack.Types.SourceMap
+                   ( CommonPackage (..), ProjectPackage (..), SMWanted (..)
+                   , SourceMap (..), ppRoot
+                   )
+import qualified Stack.Types.SourceMap as SourceMap ( SourceMap (..) )
 import           Stack.Types.Version
-import           System.Directory (getModificationTime, getPermissions)
+                   ( intersectVersionRanges, nextMajorVersion )
+import           System.Directory
+                   ( copyFile, createDirectoryIfMissing, executable
+                   , getModificationTime, getPermissions
+                   )
 import qualified System.FilePath as FP
 
--- | Special exception to throw when you want to fail because of bad results
--- of package check.
-
-data SDistOpts = SDistOpts
-  { sdoptsDirsToWorkWith :: [String]
-  -- ^ Directories to package
-  , sdoptsPvpBounds :: Maybe PvpBounds
-  -- ^ PVP Bounds overrides
-  , sdoptsIgnoreCheck :: Bool
-  -- ^ Whether to ignore check of the package for common errors
-  , sdoptsBuildTarball :: Bool
-  -- ^ Whether to build the tarball
-  , sdoptsTarPath :: Maybe FilePath
-  -- ^ Where to copy the tarball
-  }
-
-newtype CheckException
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.SDist" module.
+data SDistPrettyException
   = CheckException (NonEmpty Check.PackageCheck)
-  deriving (Typeable)
+  | CabalFilePathsInconsistentBug (Path Abs File) (Path Abs File)
+  | ToTarPathException String
+  deriving Show
+
+instance Pretty SDistPrettyException where
+  pretty (CheckException xs) =
+    "[S-6439]"
+    <> line
+    <> flow "Package check reported the following errors:"
+    <> line
+    <> bulletedList (map (string . show) (NE.toList xs) :: [StyleDoc])
+  pretty (CabalFilePathsInconsistentBug cabalFP cabalFP') =
+    "[S-9595]"
+    <> line
+    <> fillSep
+         [ flow "The impossible happened! Two Cabal file paths are \
+                \inconsistent:"
+         , pretty cabalFP
+         , "and"
+         , pretty cabalFP' <> "."
+         ]
+  pretty (ToTarPathException e) =
+    "[S-7875]"
+    <> line
+    <> string e
 
-instance Exception CheckException
+instance Exception SDistPrettyException
 
-instance Show CheckException where
-  show (CheckException xs) =
-    "Package check reported the following errors:\n" ++
-    (List.intercalate "\n" . fmap show . NE.toList $ xs)
+-- | Function underlying the @stack sdist@ command.
+sdistCmd :: SDistOpts -> RIO Runner ()
+sdistCmd sdistOpts =
+  withConfig YesReexec $ withDefaultEnvConfig $ do
+    -- If no directories are specified, build all sdist tarballs.
+    dirs' <- if null sdistOpts.dirsToWorkWith
+      then do
+        dirs <- view $
+          buildConfigL . to (map ppRoot . Map.elems . (.smWanted.project))
+        when (null dirs) $ do
+          configFile <- view configFileL
+          -- We are indifferent as to whether the configuration file is a
+          -- user-specific global or a project-level one.
+          let eitherConfigFile = EE.fromEither configFile
+          prettyErrorL
+            [ style Shell "stack sdist"
+            , flow "expects a list of targets, and otherwise defaults to all \
+                   \of the project's packages. However, the configuration at"
+            , pretty eitherConfigFile
+            , flow "contains no packages, so no sdist tarballs will be \
+                   \generated."
+            ]
+          exitFailure
+        pure dirs
+      else mapM resolveDir' sdistOpts.dirsToWorkWith
+    forM_ dirs' $ \dir -> do
+      (tarName, tarBytes, _mcabalRevision) <-
+        getSDistTarball sdistOpts.pvpBounds dir
+      distDir <- distDirFromDir dir
+      tarPath <- (distDir </>) <$> parseRelFile tarName
+      ensureDir (parent tarPath)
+      runConduitRes $
+        sourceLazy tarBytes .|
+        sinkFileCautious (toFilePath tarPath)
+      prettyInfoL
+        [flow "Wrote sdist-format compressed archive to"
+        , pretty tarPath <> "."
+        ]
+      checkSDistTarball sdistOpts tarPath
+      forM_ sdistOpts.tarPath $ copyTarToTarPath tarPath tarName
+ where
+  copyTarToTarPath tarPath tarName targetDir = liftIO $ do
+    let targetTarPath = targetDir FP.</> tarName
+    createDirectoryIfMissing True $ FP.takeDirectory targetTarPath
+    copyFile (toFilePath tarPath) targetTarPath
 
--- | Given the path to a local package, creates its source
--- distribution tarball.
+-- | Given the path to a package directory, creates a source distribution
+-- tarball for the package.
 --
--- While this yields a 'FilePath', the name of the tarball, this
--- tarball is not written to the disk and instead yielded as a lazy
--- bytestring.
-getSDistTarball
-  :: HasEnvConfig env
-  => Maybe PvpBounds            -- ^ Override Config value
-  -> Path Abs Dir               -- ^ Path to local package
-  -> RIO env (FilePath, L.ByteString, Maybe (PackageIdentifier, L.ByteString))
-  -- ^ Filename, tarball contents, and option Cabal file revision to upload
+-- While this yields a 'FilePath', the name of the tarball, this tarball is not
+-- written to the disk and instead yielded as a lazy bytestring.
+getSDistTarball ::
+     HasEnvConfig env
+  => Maybe PvpBounds
+     -- ^ Override Config value
+  -> Path Abs Dir
+     -- ^ Path to package directory
+  -> RIO
+       env
+       ( FilePath
+       , L.ByteString
+       , Maybe (PackageIdentifier, L.ByteString)
+       )
+     -- ^ Filename, tarball contents, and option Cabal file revision to upload
 getSDistTarball mpvpBounds pkgDir = do
-    config <- view configL
-    let PvpBounds pvpBounds asRevision = fromMaybe (configPvpBounds config) mpvpBounds
-        tweakCabal = pvpBounds /= PvpBoundsNone
-        pkgFp = toFilePath pkgDir
-    lp <- readLocalPackage pkgDir
-    forM_ (packageSetupDeps (lpPackage lp)) $ \customSetupDeps ->
-        case NE.nonEmpty (map (T.pack . packageNameString) (Map.keys customSetupDeps)) of
-          Just nonEmptyDepTargets -> do
-            eres <- buildLocalTargets nonEmptyDepTargets
-            case eres of
-              Left err ->
-                logError $ "Error building custom-setup dependencies: " <> displayShow err
-              Right _ ->
-                pure ()
-          Nothing ->
-            logWarn "unexpected empty custom-setup dependencies"
-    sourceMap <- view $ envConfigL.to envConfigSourceMap
-
-    installMap <- toInstallMap sourceMap
-    (installedMap, _globalDumpPkgs, _snapshotDumpPkgs, _localDumpPkgs) <-
-        getInstalled installMap
-    let deps = Map.fromList [ (pid, ghcPkgId)
-                            | (_, Library pid ghcPkgId _) <- Map.elems installedMap]
-
-    logInfo $ "Getting file list for " <> fromString pkgFp
-    (fileList, cabalfp) <- getSDistFileList lp deps
-    logInfo $ "Building sdist tarball for " <> fromString pkgFp
-    files <- normalizeTarballPaths (map (T.unpack . stripCR . T.pack) (lines fileList))
-
-    -- We're going to loop below and eventually find the cabal
-    -- file. When we do, we'll upload this reference, if the
-    -- mpvpBounds value indicates that we should be uploading a cabal
-    -- file revision.
-    cabalFileRevisionRef <- liftIO (newIORef Nothing)
-
-    -- NOTE: Could make this use lazy I/O to only read files as needed
-    -- for upload (both GZip.compress and Tar.write are lazy).
-    -- However, it seems less error prone and more predictable to read
-    -- everything in at once, so that's what we're doing for now:
-    let tarPath isDir fp = either throwString pure
-            (Tar.toTarPath isDir (forceUtf8Enc (pkgId FP.</> fp)))
-        -- convert a String of proper characters to a String of bytes
-        -- in UTF8 encoding masquerading as characters. This is
-        -- necessary for tricking the tar package into proper
-        -- character encoding.
-        forceUtf8Enc = S8.unpack . T.encodeUtf8 . T.pack
-        packWith f isDir fp = liftIO $ f (pkgFp FP.</> fp) =<< tarPath isDir fp
-        packDir = packWith Tar.packDirectoryEntry True
-        packFile fp
-            -- This is a Cabal file, we're going to tweak it, but only
-            -- tweak it as a revision.
-            | tweakCabal && isCabalFp fp && asRevision = do
-                lbsIdent <- getCabalLbs pvpBounds (Just 1) cabalfp sourceMap
-                liftIO (writeIORef cabalFileRevisionRef (Just lbsIdent))
-                packWith packFileEntry False fp
-            -- Same, except we'll include the Cabal file in the
-            -- original tarball upload.
-            | tweakCabal && isCabalFp fp = do
-                (_ident, lbs) <- getCabalLbs pvpBounds Nothing cabalfp sourceMap
-                currTime <- liftIO getPOSIXTime -- Seconds from UNIX epoch
-                tp <- liftIO $ tarPath False fp
-                pure $ (Tar.fileEntry tp lbs) { Tar.entryTime = floor currTime }
-            | otherwise = packWith packFileEntry False fp
-        isCabalFp fp = toFilePath pkgDir FP.</> fp == toFilePath cabalfp
-        tarName = pkgId FP.<.> "tar.gz"
-        pkgId = packageIdentifierString (packageIdentifier (lpPackage lp))
-    dirEntries <- mapM packDir (dirsFromFiles files)
-    fileEntries <- mapM packFile files
-    mcabalFileRevision <- liftIO (readIORef cabalFileRevisionRef)
-    pure (tarName, GZip.compress (Tar.write (dirEntries ++ fileEntries)), mcabalFileRevision)
+  config <- view configL
+  let PvpBounds pvpBounds asRevision = fromMaybe config.pvpBounds mpvpBounds
+      tweakCabal = pvpBounds /= PvpBoundsNone
+      pkgFp = toFilePath pkgDir
+  lp <- readLocalPackage pkgDir
+  forM_ lp.package.setupDeps $ \customSetupDeps ->
+    case nonEmpty (map (T.pack . packageNameString) (Map.keys customSetupDeps)) of
+      Just nonEmptyDepTargets ->
+        buildLocalTargets nonEmptyDepTargets >>= \case
+          Left err ->
+            logError $
+              "Error: [S-8399]\n" <>
+              "Error building custom-setup dependencies: " <>
+              displayShow err
+          Right _ ->
+            pure ()
+      Nothing ->
+        prettyWarnS "unexpected empty custom-setup dependencies."
+  sourceMap <- view $ envConfigL . to (.sourceMap)
+  installMap <- toInstallMap sourceMap
+  (installedMap, _globalDumpPkgs, _snapshotDumpPkgs, _localDumpPkgs) <-
+    getInstalled installMap
+  let allDeps =
+        Map.unions $ Map.map (installedPackageToGhcPkgId' . snd) installedMap
+  prettyInfoL
+    [ flow "Getting the file list for"
+    , style File (fromString  pkgFp) <> "."
+    ]
+  (fileList, cabalFP) <- getSDistFileList lp allDeps
+  prettyInfoL
+    [ flow "Building a compressed archive file in the sdist format for"
+    , style File (fromString pkgFp) <> "."
+    ]
+  files <-
+    normalizeTarballPaths (map (T.unpack . stripCR . T.pack) (lines fileList))
+  -- We're going to loop below and eventually find the Cabal file. When we do,
+  -- we'll upload this reference, if the mpvpBounds value indicates that we
+  -- should be uploading a Cabal file revision.
+  cabalFileRevisionRef <- liftIO (newIORef Nothing)
+  -- NOTE: Could make this use lazy I/O to only read files as needed for upload
+  -- (both GZip.compress and Tar.write are lazy). However, it seems less error
+  -- prone and more predictable to read everything in at once, so that's what
+  -- we're doing for now:
+  let tarPath isDir fp =
+        case Tar.toTarPath isDir (pkgIdName FP.</> fp) of
+          Left e -> prettyThrowIO $ ToTarPathException e
+          Right tp -> pure tp
+      packWith f isDir fp = liftIO $ f (pkgFp FP.</> fp) =<< tarPath isDir fp
+      packDir = packWith Tar.packDirectoryEntry True
+      packFile fp
+        -- This is a Cabal file, we're going to tweak it, but only tweak it as a
+        -- revision.
+        | tweakCabal && isCabalFp fp && asRevision = do
+            lbsIdent <- getCabalLbs pvpBounds (Just 1) cabalFP sourceMap
+            liftIO (writeIORef cabalFileRevisionRef (Just lbsIdent))
+            packWith packFileEntry False fp
+        -- Same, except we'll include the Cabal file in the original tarball
+        -- upload.
+        | tweakCabal && isCabalFp fp = do
+            (_ident, lbs) <- getCabalLbs pvpBounds Nothing cabalFP sourceMap
+            currTime <- liftIO getPOSIXTime -- Seconds from UNIX epoch
+            tp <- liftIO $ tarPath False fp
+            pure $ (Tar.fileEntry tp lbs) { Tar.entryTime = floor currTime }
+        | otherwise = packWith packFileEntry False fp
+      isCabalFp fp = toFilePath pkgDir FP.</> fp == toFilePath cabalFP
+      tarName = pkgIdName FP.<.> "tar.gz"
+      pkgIdName = packageIdentifierString pkgId
+      pkgId = packageIdentifier lp.package
+  dirEntries <- mapM packDir (dirsFromFiles files)
+  fileEntries <- mapM packFile files
+  mcabalFileRevision <- liftIO (readIORef cabalFileRevisionRef)
+  pure
+    ( tarName
+    , GZip.compress (Tar.write (dirEntries ++ fileEntries))
+    , mcabalFileRevision
+    )
 
 -- | Get the PVP bounds-enabled version of the given Cabal file
-getCabalLbs :: HasEnvConfig env
-            => PvpBoundsType
-            -> Maybe Int -- ^ optional revision
-            -> Path Abs File -- ^ Cabal file
-            -> SourceMap
-            -> RIO env (PackageIdentifier, L.ByteString)
-getCabalLbs pvpBounds mrev cabalfp sourceMap = do
-    (gpdio, _name, cabalfp') <- loadCabalFilePath (parent cabalfp)
-    gpd <- liftIO $ gpdio NoPrintWarnings
-    unless (cabalfp == cabalfp')
-      $ error $ "getCabalLbs: cabalfp /= cabalfp': " ++ show (cabalfp, cabalfp')
-    installMap <- toInstallMap sourceMap
-    (installedMap, _, _, _) <- getInstalled installMap
-    let internalPackages = Set.fromList $
-          gpdPackageName gpd :
-          map (Cabal.unqualComponentNameToPackageName . fst) (Cabal.condSubLibraries gpd)
-        gpd' = gtraverseT (addBounds internalPackages installMap installedMap) gpd
-        gpd'' =
-          case mrev of
-            Nothing -> gpd'
-            Just rev -> gpd'
-              { Cabal.packageDescription
-               = (Cabal.packageDescription gpd')
-                  { Cabal.customFieldsPD
-                  = (("x-revision", show rev):)
-                  $ filter (\(x, _) -> map toLower x /= "x-revision")
-                  $ Cabal.customFieldsPD
-                  $ Cabal.packageDescription gpd'
-                  }
-              }
-        ident = Cabal.package $ Cabal.packageDescription gpd''
-    -- Sanity rendering and reparsing the input, to ensure there are no
-    -- cabal bugs, since there have been bugs here before, and currently
-    -- are at the time of writing:
-    --
-    -- https://github.com/haskell/cabal/issues/1202
-    -- https://github.com/haskell/cabal/issues/2353
-    -- https://github.com/haskell/cabal/issues/4863 (current issue)
-    let roundtripErrs =
-          [ flow "Bug detected in Cabal library. ((parse . render . parse) === \
-                 \id) does not hold for the Cabal file at"
-          <+> pretty cabalfp
-          , ""
-          ]
-        (_warnings, eres) = Cabal.runParseResult
-                          $ Cabal.parseGenericPackageDescription
-                          $ T.encodeUtf8
-                          $ T.pack
-                          $ showGenericPackageDescription gpd
-    case eres of
-      Right roundtripped
-        | roundtripped == gpd -> pure ()
-        | otherwise -> do
-            prettyWarn $ vsep $ roundtripErrs ++
-              [ "This seems to be fixed in development versions of Cabal, but \
-                \at time of writing, the fix is not in any released versions."
-              , ""
-              ,  "Please see this GitHub issue for status:" <+> style Url "https://github.com/commercialhaskell/stack/issues/3549"
-              , ""
-              , fillSep
-                [ flow "If the issue is closed as resolved, then you may be \
-                       \able to fix this by upgrading to a newer version of \
-                       \Stack via"
-                , style Shell "stack upgrade"
-                , flow "for latest stable version or"
-                , style Shell "stack upgrade --git"
-                , flow "for the latest development version."
-                ]
-              , ""
-              , fillSep
-                [ flow "If the issue is fixed, but updating doesn't solve the \
-                       \problem, please check if there are similar open \
-                       \issues, and if not, report a new issue to the Stack \
-                       \issue tracker, at"
-                , style Url "https://github.com/commercialhaskell/stack/issues/new"
-                ]
-              , ""
-              , flow "If the issue is not fixed, feel free to leave a comment \
-                     \on it indicating that you would like it to be fixed."
-              , ""
-              ]
-      Left (_version, errs) -> do
-        prettyWarn $ vsep $ roundtripErrs ++
-          [ flow "In particular, parsing the rendered Cabal file is yielding a \
-                 \parse error. Please check if there are already issues \
-                 \tracking this, and if not, please report new issues to the \
-                 \Stack and Cabal issue trackers, via"
-          , bulletedList
-            [ style Url "https://github.com/commercialhaskell/stack/issues/new"
-            , style Url "https://github.com/haskell/cabal/issues/new"
-            ]
-          , flow $ "The parse error is: " ++ unlines (map show (toList errs))
-          , ""
-          ]
-    pure
-      ( ident
-      , TLE.encodeUtf8 $ TL.pack $ showGenericPackageDescription gpd''
-      )
-  where
-    addBounds :: Set PackageName -> InstallMap -> InstalledMap -> Dependency -> Dependency
-    addBounds internalPackages installMap installedMap dep@(Dependency name range s) =
-      if name `Set.member` internalPackages
-        then dep
-        else case foundVersion of
-          Nothing -> dep
-          Just version -> Dependency name (simplifyVersionRange
-            $ (if toAddUpper && not (hasUpperBound range) then addUpper version else id)
-            $ (if toAddLower && not (hasLowerBound range) then addLower version else id)
-              range) s
-      where
-        foundVersion =
-          case Map.lookup name installMap of
-              Just (_, version) -> Just version
-              Nothing ->
-                  case Map.lookup name installedMap of
-                      Just (_, installed) -> Just (installedVersion installed)
-                      Nothing -> Nothing
+getCabalLbs ::
+     HasEnvConfig env
+  => PvpBoundsType
+  -> Maybe Int -- ^ optional revision
+  -> Path Abs File -- ^ Cabal file
+  -> SourceMap
+  -> RIO env (PackageIdentifier, L.ByteString)
+getCabalLbs pvpBounds mrev cabalFP sourceMap = do
+  (gpdio, _name, cabalFP') <-
+    loadCabalFilePath (Just stackProgName') (parent cabalFP)
+  gpd <- liftIO $ gpdio NoPrintWarnings
+  unless (cabalFP == cabalFP') $
+    prettyThrowIO $ CabalFilePathsInconsistentBug cabalFP cabalFP'
+  installMap <- toInstallMap sourceMap
+  (installedMap, _, _, _) <- getInstalled installMap
+  let subLibPackages = Set.fromList $
+          gpdPackageName gpd
+        : map
+            (Cabal.unqualComponentNameToPackageName . fst)
+            (Cabal.condSubLibraries gpd)
+      gpd' = gtraverseT (addBounds subLibPackages installMap installedMap) gpd
+      gpd'' =
+        case mrev of
+          Nothing -> gpd'
+          Just rev -> gpd'
+            { Cabal.packageDescription
+             = (Cabal.packageDescription gpd')
+                { Cabal.customFieldsPD
+                = (("x-revision", show rev):)
+                $ filter (\(x, _) -> map toLower x /= "x-revision")
+                $ Cabal.customFieldsPD
+                $ Cabal.packageDescription gpd'
+                }
+            }
+      ident = Cabal.package $ Cabal.packageDescription gpd''
+  -- Sanity rendering and reparsing the input, to ensure there are no Cabal
+  -- bugs, since there have been bugs here before, and currently are at the time
+  -- of writing:
+  --
+  -- https://github.com/haskell/cabal/issues/1202
+  -- https://github.com/haskell/cabal/issues/2353
+  -- https://github.com/haskell/cabal/issues/4863 (current issue)
+  let roundtripErrs =
+           fillSep
+             [ flow "Bug detected in Cabal library. ((parse . render . parse) \
+                    \=== id) does not hold for the Cabal file at"
+             , pretty cabalFP
+             ]
+        <> blankLine
+      (_warnings, eres) = Cabal.runParseResult
+                        $ Cabal.parseGenericPackageDescription
+                        $ T.encodeUtf8
+                        $ T.pack
+                        $ showGenericPackageDescription gpd
+  case eres of
+    Right roundtripped
+      | roundtripped == gpd -> pure ()
+      | otherwise -> prettyWarn $
+             roundtripErrs
+          <> flow "This seems to be fixed in development versions of Cabal, \
+                  \but at time of writing, the fix is not in any released \
+                  \versions."
+          <> blankLine
+          <> fillSep
+               [ flow "Please see this GitHub issue for status:"
+               , style Url "https://github.com/commercialhaskell/stack/issues/3549"
+               ]
+          <> blankLine
+          <> fillSep
+               [ flow "If the issue is closed as resolved, then you may be \
+                      \able to fix this by upgrading to a newer version of \
+                      \Stack via"
+               , style Shell "stack upgrade"
+               , flow "for latest stable version or"
+               , style Shell "stack upgrade --git"
+               , flow "for the latest development version."
+               ]
+          <> blankLine
+          <> fillSep
+               [ flow "If the issue is fixed, but updating doesn't solve the \
+                      \problem, please check if there are similar open \
+                      \issues, and if not, report a new issue to the Stack \
+                      \issue tracker, at"
+               , style Url "https://github.com/commercialhaskell/stack/issues/new"
+               ]
+          <> blankLine
+          <> flow "If the issue is not fixed, feel free to leave a comment \
+                  \on it indicating that you would like it to be fixed."
+          <> blankLine
+    Left (_version, errs) -> prettyWarn $
+         roundtripErrs
+      <> flow "In particular, parsing the rendered Cabal file is yielding a \
+              \parse error. Please check if there are already issues \
+              \tracking this, and if not, please report new issues to the \
+              \Stack and Cabal issue trackers, via"
+      <> line
+      <> bulletedList
+           [ style Url "https://github.com/commercialhaskell/stack/issues/new"
+           , style Url "https://github.com/haskell/cabal/issues/new"
+           ]
+      <> line
+      <> flow ("The parse error is: " <> unlines (map show (toList errs)))
+      <> blankLine
+  pure
+    ( ident
+    , TLE.encodeUtf8 $ TL.pack $ showGenericPackageDescription gpd''
+    )
+ where
+  addBounds ::
+       Set PackageName
+    -> InstallMap
+    -> InstalledMap
+    -> Dependency
+    -> Dependency
+  addBounds subLibPackages installMap installedMap dep =
+    if name `Set.member` subLibPackages
+      then dep
+      else case foundVersion of
+        Nothing -> dep
+        Just version -> Dependency
+          name
+          ( simplifyVersionRange
+          $ ( if toAddUpper && not (hasUpperBound range)
+                then addUpper version
+                else id
+            )
+            -- From Cabal-3.4.0.0, 'hasLowerBound isAnyVersion' is 'True'.
+          $ ( if    toAddLower
+                 && (isAnyVersion range || not (hasLowerBound range))
+                then addLower version
+                else id
+            )
+            range
+          )
+          s
+   where
+    Dependency name range s = dep
+    foundVersion =
+      case Map.lookup name installMap of
+        Just (_, version) -> Just version
+        Nothing ->
+          case Map.lookup name installedMap of
+            Just (_, installed) -> Just (installedVersion installed)
+            Nothing -> Nothing
 
-    addUpper version = intersectVersionRanges
-        (earlierVersion $ nextMajorVersion version)
-    addLower version = intersectVersionRanges (orLaterVersion version)
+  addUpper version = intersectVersionRanges
+      (earlierVersion $ nextMajorVersion version)
+  addLower version = intersectVersionRanges (orLaterVersion version)
 
-    (toAddLower, toAddUpper) =
-      case pvpBounds of
-        PvpBoundsNone  -> (False, False)
-        PvpBoundsUpper -> (False, True)
-        PvpBoundsLower -> (True,  False)
-        PvpBoundsBoth  -> (True,  True)
+  (toAddLower, toAddUpper) =
+    case pvpBounds of
+      PvpBoundsNone  -> (False, False)
+      PvpBoundsUpper -> (False, True)
+      PvpBoundsLower -> (True,  False)
+      PvpBoundsBoth  -> (True,  True)
 
 -- | Traverse a data type.
 gtraverseT :: (Data a,Typeable b) => (Typeable b => b -> b) -> a -> a
@@ -307,154 +443,150 @@ gtraverseT f =
                  Nothing -> gtraverseT f x
                  Just b  -> fromMaybe x (cast (f b)))
 
--- | Read in a 'LocalPackage' config.  This makes some default decisions
--- about 'LocalPackage' fields that might not be appropriate for other
+-- | Read in a t'LocalPackage' config.  This makes some default decisions
+-- about v'LocalPackage' fields that might not be appropriate for other
 -- use-cases.
 readLocalPackage :: HasEnvConfig env => Path Abs Dir -> RIO env LocalPackage
 readLocalPackage pkgDir = do
-    config  <- getDefaultPackageConfig
-    (gpdio, _, cabalfp) <- loadCabalFilePath pkgDir
-    gpd <- liftIO $ gpdio YesPrintWarnings
-    let package = resolvePackage config gpd
-    pure LocalPackage
-        { lpPackage = package
-        , lpWanted = False -- HACK: makes it so that sdist output goes to a log instead of a file.
-        , lpCabalFile = cabalfp
-        -- NOTE: these aren't the 'correct values, but aren't used in
-        -- the usage of this function in this module.
-        , lpTestDeps = Map.empty
-        , lpBenchDeps = Map.empty
-        , lpTestBench = Nothing
-        , lpBuildHaddocks = False
-        , lpForceDirty = False
-        , lpDirtyFiles = pure Nothing
-        , lpNewBuildCaches = pure Map.empty
-        , lpComponentFiles = pure Map.empty
-        , lpComponents = Set.empty
-        , lpUnbuildable = Set.empty
-        }
+  config  <- getDefaultPackageConfig
+  (gpdio, _, cabalFP) <- loadCabalFilePath (Just stackProgName') pkgDir
+  gpd <- liftIO $ gpdio YesPrintWarnings
+  let package = resolvePackage config gpd
+  pure LocalPackage
+    { package
+    , wanted = False -- HACK: makes it so that sdist output goes to a log
+                       -- instead of a file.
+    , cabalFP
+    -- NOTE: these aren't the 'correct' values, but aren't used in the usage of
+    -- this function in this module.
+    , testBench = Nothing
+    , buildHaddocks = False
+    , forceDirty = False
+    , dirtyFiles = pure Nothing
+    , newBuildCaches = pure Map.empty
+    , componentFiles = pure Map.empty
+    , components = Set.empty
+    , unbuildable = Set.empty
+    }
 
 -- | Returns a newline-separate list of paths, and the absolute path to the
 -- Cabal file.
-getSDistFileList :: HasEnvConfig env => LocalPackage -> Map PackageIdentifier GhcPkgId -> RIO env (String, Path Abs File)
-getSDistFileList lp deps =
-    withSystemTempDir (stackProgName <> "-sdist") $ \tmpdir -> do
-        let bopts = defaultBuildOpts
-        let boptsCli = defaultBuildOptsCLI
-        baseConfigOpts <- mkBaseConfigOpts boptsCli
-        locals <- projectLocalPackages
-        withExecuteEnv bopts boptsCli baseConfigOpts locals
-            [] [] [] Nothing -- provide empty list of globals. This is a hack around custom Setup.hs files
-            $ \ee ->
-            withSingleContext ac ee task deps (Just "sdist") $ \_package cabalfp _pkgDir cabal _announce _outputType -> do
-                let outFile = toFilePath tmpdir FP.</> "source-files-list"
-                cabal CloseOnException KeepTHLoading ["sdist", "--list-sources", outFile]
-                contents <- liftIO (S.readFile outFile)
-                pure (T.unpack $ T.decodeUtf8With T.lenientDecode contents, cabalfp)
-  where
-    package = lpPackage lp
-    ac = ActionContext Set.empty [] ConcurrencyAllowed
-    task = Task
-        { taskProvides = PackageIdentifier (packageName package) (packageVersion package)
-        , taskType = TTLocalMutable lp
-        , taskConfigOpts = TaskConfigOpts
-            { tcoMissing = Set.empty
-            , tcoOpts = \_ -> ConfigureOpts [] []
-            }
-        , taskBuildHaddock = False
-        , taskPresent = Map.empty
-        , taskAllInOne = True
-        , taskCachePkgSrc = CacheSrcLocal (toFilePath (parent $ lpCabalFile lp))
-        , taskAnyMissing = True
-        , taskBuildTypeConfig = False
-        }
+getSDistFileList ::
+     HasEnvConfig env
+  => LocalPackage
+  -> Map MungedPackageId GhcPkgId
+     -- ^ Ids of installed packages that are assumed to be available to build a
+     -- package's custom @Setup.hs@, given its dependencies specified in its
+     -- @custom-setup@ stanza of its Cabal file.
+  -> RIO env (String, Path Abs File)
+getSDistFileList lp allDeps =
+  withSystemTempDir (stackProgName <> "-sdist") $ \tmpdir -> do
+    let bopts = defaultBuildOpts
+    let boptsCli = defaultBuildOptsCLI
+    baseConfigOpts <- mkBaseConfigOpts boptsCli
+    locals <- projectLocalPackages
+    -- We provide three empty lists of dumped installed packages. This is a hack
+    -- around custom Setup.hs files:
+    withExecuteEnv bopts boptsCli baseConfigOpts locals [] [] [] Nothing
+      $ \ee ->
+      withSingleContext ac ee taskType allDeps (Just "sdist") Nothing $
+        \_package cabalFP _pkgDir cabal _announce _outputType -> do
+          let outFile = toFilePath tmpdir FP.</> "source-files-list"
+          cabal
+            CloseOnException
+            KeepTHLoading
+            ["sdist", "--list-sources", outFile]
+          contents <- liftIO (S.readFile outFile)
+          pure (T.unpack $ T.decodeUtf8With T.lenientDecode contents, cabalFP)
+ where
+  ac = ActionContext Set.empty [] ConcurrencyAllowed
+  taskType = TTLocalMutable lp
 
-normalizeTarballPaths :: HasRunner env => [FilePath] -> RIO env [FilePath]
+normalizeTarballPaths ::
+     (HasRunner env, HasTerm env)
+  => [FilePath]
+  -> RIO env [FilePath]
 normalizeTarballPaths fps = do
-    -- TODO: consider whether erroring out is better - otherwise the
-    -- user might upload an incomplete tar?
-    unless (null outsideDir) $
-        logWarn $
-            "Warning: These files are outside of the package directory, and will be omitted from the tarball: " <>
-            displayShow outsideDir
-    pure (nubOrd files)
-  where
-    (outsideDir, files) = partitionEithers (map pathToEither fps)
-    pathToEither fp = maybe (Left fp) Right (normalizePath fp)
+  -- TODO: consider whether erroring out is better - otherwise the user might
+  -- upload an incomplete tar?
+  unless (null outsideDir) $
+    prettyWarn $
+         flow "These files are outside of the package directory, and will be \
+              \omitted from the tarball:"
+      <> line
+      <> bulletedList (map (style File . fromString) outsideDir)
+  pure (nubOrd files)
+ where
+  (outsideDir, files) = partitionEithers (map pathToEither fps)
+  pathToEither fp = maybe (Left fp) Right (normalizePath fp)
 
 normalizePath :: FilePath -> Maybe FilePath
 normalizePath = fmap FP.joinPath . go . FP.splitDirectories . FP.normalise
-  where
-    go [] = Just []
-    go ("..":_) = Nothing
-    go (_:"..":xs) = go xs
-    go (x:xs) = (x :) <$> go xs
+ where
+  go [] = Just []
+  go ("..":_) = Nothing
+  go (_:"..":xs) = go xs
+  go (x:xs) = (x :) <$> go xs
 
 dirsFromFiles :: [FilePath] -> [FilePath]
 dirsFromFiles dirs = Set.toAscList (Set.delete "." results)
-  where
-    results = foldl' (\s -> go s . FP.takeDirectory) Set.empty dirs
-    go s x
-      | Set.member x s = s
-      | otherwise = go (Set.insert x s) (FP.takeDirectory x)
+ where
+  results = foldl' (\s -> go s . FP.takeDirectory) Set.empty dirs
+  go s x
+    | Set.member x s = s
+    | otherwise = go (Set.insert x s) (FP.takeDirectory x)
 
--- | Check package in given tarball. This will log all warnings
--- and will throw an exception in case of critical errors.
+-- | Check package in given tarball. This will log all warnings and will throw
+-- an exception in case of critical errors.
 --
 -- Note that we temporarily decompress the archive to analyze it.
-checkSDistTarball
-  :: HasEnvConfig env
+checkSDistTarball ::
+     HasEnvConfig env
   => SDistOpts -- ^ The configuration of what to check
   -> Path Abs File -- ^ Absolute path to tarball
   -> RIO env ()
 checkSDistTarball opts tarball = withTempTarGzContents tarball $ \pkgDir' -> do
-    pkgDir  <- (pkgDir' </>) `liftM`
-        (parseRelDir . FP.takeBaseName . FP.takeBaseName . toFilePath $ tarball)
-    --               ^ drop ".tar"     ^ drop ".gz"
-    when (sdoptsBuildTarball opts) (buildExtractedTarball ResolvedPath
-                                      { resolvedRelative = RelFilePath "this-is-not-used" -- ugly hack
-                                      , resolvedAbsolute = pkgDir
-                                      })
-    unless (sdoptsIgnoreCheck opts) (checkPackageInExtractedTarball pkgDir)
+  pkgDir <- (pkgDir' </>) <$>
+    (parseRelDir . FP.takeBaseName . FP.takeBaseName . toFilePath $ tarball)
+  --               ^ drop ".tar"     ^ drop ".gz"
+  when opts.buildTarball
+    ( buildExtractedTarball ResolvedPath
+        { resolvedRelative = RelFilePath "this-is-not-used" -- ugly hack
+        , resolvedAbsolute = pkgDir
+        }
+    )
+  unless opts.ignoreCheck (checkPackageInExtractedTarball pkgDir)
 
-checkPackageInExtractedTarball
-  :: HasEnvConfig env
+checkPackageInExtractedTarball ::
+     HasEnvConfig env
   => Path Abs Dir -- ^ Absolute path to tarball
   -> RIO env ()
 checkPackageInExtractedTarball pkgDir = do
-    (gpdio, name, _cabalfp) <- loadCabalFilePath pkgDir
-    gpd <- liftIO $ gpdio YesPrintWarnings
-    config  <- getDefaultPackageConfig
-    let PackageDescriptionPair pkgDesc _ = resolvePackageDescription config gpd
-    logInfo $
-        "Checking package '" <> fromString (packageNameString name) <> "' for common mistakes"
-    let pkgChecks =
-          -- MSS 2017-12-12: Try out a few different variants of
-          -- pkgDesc to try and provoke an error or warning. I don't
-          -- know why, but when using `Just pkgDesc`, it appears that
-          -- Cabal does not detect that `^>=` is used with
-          -- `cabal-version: 1.24` or earlier. It seems like pkgDesc
-          -- (the one we create) does not populate the `buildDepends`
-          -- field, whereas flattenPackageDescription from Cabal
-          -- does. In any event, using `Nothing` seems more logical
-          -- for this check anyway, and the fallback to `Just pkgDesc`
-          -- is just a crazy sanity check.
-          case Check.checkPackage gpd Nothing of
-            [] -> Check.checkPackage gpd (Just pkgDesc)
-            x -> x
-    fileChecks <- liftIO $ Check.checkPackageFiles minBound pkgDesc (toFilePath pkgDir)
-    let checks = pkgChecks ++ fileChecks
-        (errors, warnings) =
-          let criticalIssue (Check.PackageBuildImpossible _) = True
-              criticalIssue (Check.PackageDistInexcusable _) = True
-              criticalIssue _ = False
-          in List.partition criticalIssue checks
-    unless (null warnings) $
-        logWarn $ "Package check reported the following warnings:\n" <>
-                   mconcat (List.intersperse "\n" . fmap displayShow $ warnings)
-    case NE.nonEmpty errors of
-        Nothing -> pure ()
-        Just ne -> throwM $ CheckException ne
+  (gpdio, name, _cabalfp) <- loadCabalFilePath (Just stackProgName') pkgDir
+  gpd <- liftIO $ gpdio YesPrintWarnings
+  config <- getDefaultPackageConfig
+  let pkgDesc = resolvePackageDescription config gpd
+  prettyInfoL
+    [ flow "Checking package"
+    , style Current (fromPackageName name)
+    , flow "for common mistakes using Cabal version"
+    , fromString $ versionString cabalVersion <> "."
+    ]
+  let pkgChecks = Check.checkPackage gpd
+  fileChecks <-
+    liftIO $ Check.checkPackageFiles minBound pkgDesc (toFilePath pkgDir)
+  let checks = pkgChecks ++ fileChecks
+      (errors, warnings) =
+        let criticalIssue (Check.PackageBuildImpossible _) = True
+            criticalIssue (Check.PackageDistInexcusable _) = True
+            criticalIssue _ = False
+        in  List.partition criticalIssue checks
+  unless (null warnings) $
+    prettyWarn $
+         flow "Package check reported the following warnings:"
+      <> line
+      <> bulletedList (map (fromString . show) warnings)
+  whenJust (nonEmpty errors) $ \ne -> prettyThrowM $ CheckException ne
 
 buildExtractedTarball :: HasEnvConfig env => ResolvedPath Dir -> RIO env ()
 buildExtractedTarball pkgDir = do
@@ -463,83 +595,90 @@ buildExtractedTarball pkgDir = do
   -- We remove the path based on the name of the package
   let isPathToRemove path = do
         localPackage <- readLocalPackage path
-        pure $ packageName (lpPackage localPackage) == packageName (lpPackage localPackageToBuild)
-  pathsToKeep
-    <- fmap Map.fromList
-     $ flip filterM (Map.toList (smwProject (bcSMWanted (envConfigBuildConfig envConfig))))
-     $ fmap not . isPathToRemove . resolvedAbsolute . ppResolvedDir . snd
+        pure
+          $  localPackage.package.name
+          == localPackageToBuild.package.name
+  pathsToKeep <- Map.fromList <$> filterM
+    (fmap not . isPathToRemove . resolvedAbsolute . (.resolvedDir) . snd)
+    (Map.toList envConfig.buildConfig.smWanted.project)
   pp <- mkProjectPackage YesPrintWarnings pkgDir False
   let adjustEnvForBuild env =
         let updatedEnvConfig = envConfig
-              { envConfigSourceMap = updatePackagesInSourceMap (envConfigSourceMap envConfig)
-              , envConfigBuildConfig = updateBuildConfig (envConfigBuildConfig envConfig)
+              { sourceMap = updatePackagesInSourceMap envConfig.sourceMap
+              , buildConfig = updateBuildConfig envConfig.buildConfig
               }
             updateBuildConfig bc = bc
-              { bcConfig = (bcConfig bc)
-                 { configBuild = defaultBuildOpts { boptsTests = True } }
+              { config = bc.config { build = defaultBuildOpts { tests = True } }
               }
-        in set envConfigL updatedEnvConfig env
+        in  set envConfigL updatedEnvConfig env
       updatePackagesInSourceMap sm =
-        sm {smProject = Map.insert (cpName $ ppCommon pp) pp pathsToKeep}
+        sm { SourceMap.project = Map.insert pp.projectCommon.name pp pathsToKeep }
   local adjustEnvForBuild $ build Nothing
 
 -- | Version of 'checkSDistTarball' that first saves lazy bytestring to
 -- temporary directory and then calls 'checkSDistTarball' on it.
-checkSDistTarball'
-  :: HasEnvConfig env
+checkSDistTarball' ::
+     HasEnvConfig env
   => SDistOpts
   -> String       -- ^ Tarball name
   -> L.ByteString -- ^ Tarball contents as a byte string
   -> RIO env ()
 checkSDistTarball' opts name bytes = withSystemTempDir "stack" $ \tpath -> do
-    npath   <- (tpath </>) `liftM` parseRelFile name
-    liftIO $ L.writeFile (toFilePath npath) bytes
-    checkSDistTarball opts npath
+  npath <- (tpath </>) <$> parseRelFile name
+  liftIO $ L.writeFile (toFilePath npath) bytes
+  checkSDistTarball opts npath
 
-withTempTarGzContents
-  :: Path Abs File                     -- ^ Location of tarball
-  -> (Path Abs Dir -> RIO env a) -- ^ Perform actions given dir with tarball contents
+withTempTarGzContents ::
+     Path Abs File
+     -- ^ Location of tarball
+  -> (Path Abs Dir -> RIO env a)
+     -- ^ Perform actions given dir with tarball contents
   -> RIO env a
 withTempTarGzContents apath f = withSystemTempDir "stack" $ \tpath -> do
-    archive <- liftIO $ L.readFile (toFilePath apath)
-    liftIO . Tar.unpack (toFilePath tpath) . Tar.read . GZip.decompress $ archive
-    f tpath
+  archive <- liftIO $ L.readFile (toFilePath apath)
+  liftIO . Tar.unpack (toFilePath tpath) . Tar.read . GZip.decompress $ archive
+  f tpath
 
 --------------------------------------------------------------------------------
 
 -- Copy+modified from the tar package to avoid issues with lazy IO ( see
 -- https://github.com/commercialhaskell/stack/issues/1344 )
 
-packFileEntry :: FilePath -- ^ Full path to find the file on the local disk
-              -> Tar.TarPath  -- ^ Path to use for the tar Entry in the archive
-              -> IO Tar.Entry
+packFileEntry ::
+     FilePath -- ^ Full path to find the file on the local disk
+  -> Tar.TarPath -- ^ Path to use for the tar Entry in the archive
+  -> IO Tar.Entry
 packFileEntry filepath tarpath = do
-  mtime   <- getModTime filepath
-  perms   <- getPermissions filepath
+  mtime <- getModTime filepath
+  perms <- getPermissions filepath
   content <- S.readFile filepath
   let size = fromIntegral (S.length content)
-  pure (Tar.simpleEntry tarpath (Tar.NormalFile (L.fromStrict content) size)) {
-    Tar.entryPermissions = if executable perms then Tar.executableFilePermissions
-                                               else Tar.ordinaryFilePermissions,
-    Tar.entryTime = mtime
-  }
+      entryContent = Tar.NormalFile (L.fromStrict content) size
+      entry = Tar.simpleEntry tarpath entryContent
+  pure entry
+    { Tar.entryPermissions = if executable perms
+                               then Tar.executableFilePermissions
+                               else Tar.ordinaryFilePermissions
+    , Tar.entryTime = mtime
+    }
 
 getModTime :: FilePath -> IO Tar.EpochTime
 getModTime path = do
-    t <- getModificationTime path
-    pure . floor . utcTimeToPOSIXSeconds $ t
+  t <- getModificationTime path
+  pure $ floor . utcTimeToPOSIXSeconds $ t
 
-getDefaultPackageConfig :: (MonadIO m, MonadReader env m, HasEnvConfig env)
+getDefaultPackageConfig ::
+     (MonadIO m, MonadReader env m, HasEnvConfig env)
   => m PackageConfig
 getDefaultPackageConfig = do
   platform <- view platformL
   compilerVersion <- view actualCompilerVersionL
   pure PackageConfig
-    { packageConfigEnableTests = False
-    , packageConfigEnableBenchmarks = False
-    , packageConfigFlags = mempty
-    , packageConfigGhcOptions = []
-    , packageConfigCabalConfigOpts = []
-    , packageConfigCompilerVersion = compilerVersion
-    , packageConfigPlatform = platform
+    { enableTests = False
+    , enableBenchmarks = False
+    , flags = mempty
+    , ghcOptions = []
+    , cabalConfigOpts = []
+    , compilerVersion
+    , platform
     }
diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs
index f72ccf2c02..2434ae6857 100644
--- a/src/Stack/Script.hs
+++ b/src/Stack/Script.hs
@@ -1,274 +1,422 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE LambdaCase        #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Script
+Description : Types and functions related to Stack's @script@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @script@ command.
+-}
+
 module Stack.Script
-    ( scriptCmd
-    ) where
+  ( ScriptOpts (..)
+  , ScriptExecute (..)
+  , ShouldRun (..)
+  , scriptCmd
+  ) where
 
-import           Stack.Prelude
-import           Data.ByteString.Builder    (toLazyByteString)
-import qualified Data.ByteString.Char8      as S8
-import qualified Data.Conduit.List          as CL
-import           Data.List.Split            (splitWhen)
-import qualified Data.Map.Strict            as Map
-import qualified Data.Set                   as Set
-import           Distribution.Compiler      (CompilerFlavor (..))
-import           Distribution.ModuleName    (ModuleName)
+import           Data.ByteString.Builder ( toLazyByteString )
+import qualified Data.ByteString.Char8 as S8
+import qualified Data.Conduit.List as CL
+import qualified Data.List.NonEmpty as NE
+import           Data.List.Split ( splitWhen )
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import           Distribution.Compiler ( CompilerFlavor (..) )
+import           Distribution.ModuleName ( ModuleName )
 import qualified Distribution.PackageDescription as PD
 import qualified Distribution.Types.CondTree as C
-import           Distribution.Types.ModuleReexport
-import           Distribution.Types.PackageName (mkPackageName)
-import           Distribution.Types.VersionRange (withinRange)
-import           Distribution.System        (Platform (..))
+import           Distribution.Types.ModuleReexport ( moduleReexportName )
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Types.VersionRange ( withinRange )
+import           Distribution.System ( Platform (..) )
 import qualified Pantry.SHA256 as SHA256
-import           Path hiding (replaceExtension)
-import           Path.IO
-import qualified Stack.Build
-import           Stack.Build.Installed
-import           Stack.Constants            (osIsWindows)
-import           Stack.PackageDump
-import           Stack.Options.ScriptParser
-import           Stack.Runners
-import           Stack.Setup                (withNewLocalBuildTargets)
-import           Stack.SourceMap            (getCompilerInfo, immutableLocSha)
-import           Stack.Types.Compiler
-import           Stack.Types.Config
-import           Stack.Types.SourceMap
-import           System.FilePath            (dropExtension, replaceExtension)
+import           Path
+                   ( (</>), filename, fromAbsDir, fromAbsFile, fromRelFile
+                   , parent, parseRelDir, replaceExtension, splitExtension
+                   )
+import           Path.IO ( getModificationTime, resolveFile' )
 import qualified RIO.Directory as Dir
 import           RIO.Process
+                   ( HasProcessContext, exec, proc, readProcessStdout_
+                   , withWorkingDir
+                   )
 import qualified RIO.Text as T
+import           Stack.Build ( build )
+import           Stack.Build.Installed ( getInstalled, toInstallMap )
+import           Stack.Constants ( osIsWindows, relDirScripts )
+import           Stack.Prelude
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig )
+import           Stack.Setup ( withNewLocalBuildTargets )
+import           Stack.SourceMap ( getCompilerInfo, immutableLocSha )
+import           Stack.Types.Compiler ( ActualCompiler (..) )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), GhcPkgExe (..), HasCompiler (..) )
+import           Stack.Types.Config ( Config (..), HasConfig (..), stackRootL )
+import           Stack.Types.ConfigMonoid ( ConfigMonoid (..) )
+import qualified Stack.Types.ConfigMonoid as ConfigMonoid ( ConfigMonoid (..) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
+                   , appropriateGhcColorFlag
+                   )
+import           Stack.Types.EnvSettings ( defaultEnvSettings )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( Runner, globalOptsL )
+import           Stack.Types.SourceMap
+                   ( CommonPackage (..), DepPackage (..), SourceMap (..) )
+import           Stack.Types.StackYamlLoc ( StackYamlLoc (..) )
+import           System.FilePath ( splitDrive )
 
-data StackScriptException
-    = MutableDependenciesForScript [PackageName]
-    | AmbiguousModuleName ModuleName [PackageName]
-  deriving Typeable
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Script" module.
+data ScriptException
+  = MutableDependenciesForScript [PackageName]
+  | AmbiguousModuleName ModuleName [PackageName]
+  | ArgumentsWithNoRunInvalid
+  | NoRunWithoutCompilationInvalid
+  | FailedToParseScriptFileAsDirBug (Path Rel File)
+  | FailedToParseFileAsDirBug (Path Abs Dir)
+  deriving Show
 
-instance Exception StackScriptException
+instance Exception ScriptException where
+  displayException (MutableDependenciesForScript names) = unlines
+    $ "Error: [S-4994]"
+    : "No mutable packages are allowed in the 'script' command. Mutable \
+      \packages found:"
+    : map (\name -> "- " ++ packageNameString name) names
+  displayException (AmbiguousModuleName mname pkgs) = unlines
+    $ "Error: [S-1691]"
+    : (  "Module "
+      ++ moduleNameString mname
+      ++ " appears in multiple packages: "
+      )
+    : [ unwords $ map packageNameString pkgs ]
+  displayException ArgumentsWithNoRunInvalid =
+    "Error: [S-5067]\n"
+    ++ "'--no-run' incompatible with arguments."
+  displayException NoRunWithoutCompilationInvalid =
+    "Error: [S-9469]\n"
+    ++ "'--no-run' requires either '--compile' or '--optimize'."
+  displayException (FailedToParseScriptFileAsDirBug fp) = bugReport "[S-5055]" $
+       "Failed to parse script file name as directory:\n"
+    <> fromRelFile fp <> "\n"
+  displayException (FailedToParseFileAsDirBug p) = bugReport "[S-9464]" $
+       "Failed to parse path to script file as directory:\n"
+    <> fromAbsDir p <> "\n"
 
-instance Show StackScriptException where
-    show (MutableDependenciesForScript names) = unlines
-        $ "No mutable packages are allowed in the `script` command. Mutable packages found:"
-        : map (\name -> "- " ++ packageNameString name) names
-    show (AmbiguousModuleName mname pkgs) = unlines
-        $ ("Module " ++ moduleNameString mname ++ " appears in multiple packages: ")
-        : [unwords $ map packageNameString pkgs ]
+-- | Type representing choices of interpreting, compiling (without optimisation)
+-- and compiling (with optimisation).
+data ScriptExecute
+  = SEInterpret
+  | SECompile
+    -- ^ Without optimisation.
+  | SEOptimize
+    -- ^ Compile with optimisation.
+  deriving Show
+
+-- | Type representing choices of whether to run or not.
+data ShouldRun
+  = YesRun
+    -- ^ Run.
+  | NoRun
+    -- ^ Do not run.
+  deriving Show
+
+-- | Type representing command line options for the @stack script@ command.
+data ScriptOpts = ScriptOpts
+  { packages :: ![String]
+  , file :: !FilePath
+  , args :: ![String]
+  , compile :: !ScriptExecute
+  , useRoot :: !Bool
+  , ghcOptions :: ![String]
+  , scriptExtraDeps :: ![Unresolved (NonEmpty RawPackageLocationImmutable)]
+  , shouldRun :: !ShouldRun
+  }
 
 -- | Run a Stack Script
 scriptCmd :: ScriptOpts -> RIO Runner ()
 scriptCmd opts = do
-    -- Some warnings in case the user somehow tries to set a
-    -- stack.yaml location. Note that in this functions we use
-    -- logError instead of logWarn because, when using the
-    -- interpreter mode, only error messages are shown. See:
-    -- https://github.com/commercialhaskell/stack/issues/3007
-    view (globalOptsL.to globalStackYaml) >>= \case
-      SYLOverride fp -> logError $
-        "Ignoring override stack.yaml file for script command: " <>
-        fromString (toFilePath fp)
-      SYLGlobalProject -> logError "Ignoring SYLGlobalProject for script command"
-      SYLDefault -> pure ()
-      SYLNoProject _ -> assert False (pure ())
-
-    file <- resolveFile' $ soFile opts
-
-    isNoRunCompile <- fromFirstFalse . configMonoidNoRunCompile <$>
-                             view (globalOptsL.to globalConfigMonoid)
-
-    let scriptDir = parent file
-        modifyGO go = go
-            { globalConfigMonoid = (globalConfigMonoid go)
-                { configMonoidInstallGHC = FirstTrue $ Just True
-                }
-            , globalStackYaml = SYLNoProject $ soScriptExtraDeps opts
+  -- Some warnings in case the user somehow tries to set a stack.yaml location.
+  -- Note that in this functions we use logError instead of logWarn because,
+  -- when using the interpreter mode, only error messages are shown. See:
+  -- https://github.com/commercialhaskell/stack/issues/3007
+  view (globalOptsL . to (.stackYaml)) >>= \case
+    SYLOverride fp -> logError $
+         "Ignoring override stack.yaml file for script command: "
+      <> fromString (toFilePath fp)
+    SYLGlobalProject -> logError "Ignoring SYLGlobalProject for script command"
+    SYLDefault -> pure ()
+    SYLNoProject _ -> assert False (pure ())
+
+  file <- resolveFile' opts.file
+  let scriptFile = filename file
+      scriptRoot = parent file
+
+  isNoRunCompile <- fromFirstFalse . (.noRunCompile) <$>
+                           view (globalOptsL . to (.configMonoid))
+
+  resolvedExtraDeps <-
+    mapM (resolvePaths (Just scriptRoot)) opts.scriptExtraDeps
+  let scriptDir = parent file
+      extraDeps = concatMap NE.toList resolvedExtraDeps
+      modifyGO go = go
+        { configMonoid = go.configMonoid
+            { ConfigMonoid.installGHC = FirstTrue $ Just True
             }
-        (shouldRun, shouldCompile) = if isNoRunCompile
-          then (NoRun, SECompile)
-          else (soShouldRun opts, soCompile opts)
+        , stackYaml = SYLNoProject extraDeps
+        }
+      (shouldRun, shouldCompile) = if isNoRunCompile
+        then (NoRun, SECompile)
+        else (opts.shouldRun, opts.compile)
 
-    case shouldRun of
-      YesRun -> pure ()
-      NoRun -> do
-        unless (null $ soArgs opts) $ throwString "--no-run incompatible with arguments"
-        case shouldCompile of
-          SEInterpret -> throwString "--no-run requires either --compile or --optimize"
-          SECompile -> pure ()
-          SEOptimize -> pure ()
+  outputDir <- if opts.useRoot
+    then do
+      root <- local (over globalOptsL modifyGO) $
+        withConfig NoReexec $ view stackRootL
+      scriptFileAsDir <- maybe
+        (throwIO $ FailedToParseScriptFileAsDirBug scriptFile)
+        pure
+        (parseRelDir $ fromRelFile scriptFile)
+      let fileAsDir = scriptDir </> scriptFileAsDir
+          -- We drop the information about the drive. On Windows, in principle,
+          -- the drive could distinguish between two otherwise identical
+          -- fileAsDir (eg C:\MyScript.hs\ D:\MyScript.hs\). In pactice, we
+          -- tolerate that possibility as being unlikely.
+          (_, escaped) = splitDrive (fromAbsDir fileAsDir)
+      escapedRelDir <- maybe
+        (throwIO $ FailedToParseFileAsDirBug fileAsDir)
+        pure
+        (parseRelDir escaped)
+      pure $ root </> relDirScripts </> escapedRelDir
+    else pure scriptDir
+
+  -- path does not necessarily end with an extension.
+  let dropExtension path = pure $ maybe path fst $ splitExtension path
+
+  exe <- if osIsWindows
+    then replaceExtension ".exe" (outputDir </> scriptFile)
+    else dropExtension (outputDir </> scriptFile)
 
-    -- Optimization: if we're compiling, and the executable is newer
-    -- than the source file, run it immediately.
-    local (over globalOptsL modifyGO) $
+  case shouldRun of
+    YesRun -> pure ()
+    NoRun -> do
+      unless (null opts.args) $ throwIO ArgumentsWithNoRunInvalid
       case shouldCompile of
-        SEInterpret -> longWay shouldRun shouldCompile file scriptDir
-        SECompile -> shortCut shouldRun shouldCompile file scriptDir
-        SEOptimize -> shortCut shouldRun shouldCompile file scriptDir
+        SEInterpret -> throwIO NoRunWithoutCompilationInvalid
+        SECompile -> pure ()
+        SEOptimize -> pure ()
 
-  where
-  runCompiled shouldRun file = do
-    let exeName = toExeName $ toFilePath file
+  -- Optimization: if we're compiling, and the executable is newer than the
+  -- source file, run it immediately.
+  local (over globalOptsL modifyGO) $
+    case shouldCompile of
+      SEInterpret -> longWay shouldRun shouldCompile file exe
+      SECompile -> shortCut shouldRun shouldCompile file exe
+      SEOptimize -> shortCut shouldRun shouldCompile file exe
+
+ where
+  runCompiled ::
+       (HasProcessContext env, HasTerm env)
+    => ShouldRun
+    -> Path Abs File
+    -> RIO env ()
+  runCompiled shouldRun exe = do
     case shouldRun of
-      YesRun -> exec exeName (soArgs opts)
-      NoRun -> logInfo $ "Compilation finished, executable available at " <> fromString exeName
+      YesRun -> exec (fromAbsFile exe) opts.args
+      NoRun -> prettyInfoL
+        [ flow "Compilation finished, executable available at"
+        , style File (fromString (fromAbsFile exe)) <> "."
+        ]
 
-  shortCut shouldRun shouldCompile file scriptDir =
-    handleIO (const $ longWay shouldRun shouldCompile file scriptDir) $ do
+  shortCut shouldRun shouldCompile file exe =
+    handleIO (const $ longWay shouldRun shouldCompile file exe) $ do
       srcMod <- getModificationTime file
-      exeMod <- Dir.getModificationTime $ toExeName $ toFilePath file
+      exeMod <- Dir.getModificationTime (fromAbsFile exe)
       if srcMod < exeMod
-        then runCompiled shouldRun file
-        else longWay shouldRun shouldCompile file scriptDir
+        then runCompiled shouldRun exe
+        else longWay shouldRun shouldCompile file exe
 
-  longWay shouldRun shouldCompile file scriptDir =
+  longWay shouldRun shouldCompile file exe =
     withConfig YesReexec $
     withDefaultEnvConfig $ do
       config <- view configL
-      menv <- liftIO $ configProcessContextSettings config defaultEnvSettings
+      menv <- liftIO $ config.processContextSettings defaultEnvSettings
       withProcessContext menv $ do
         colorFlag <- appropriateGhcColorFlag
 
         targetsSet <-
-            case soPackages opts of
-                [] -> do
-                    -- Using the import parser
-                    getPackagesFromImports (soFile opts)
-                packages -> do
-                    let targets = concatMap wordsComma packages
-                    targets' <- mapM parsePackageNameThrowing targets
-                    pure $ Set.fromList targets'
+          case opts.packages of
+            [] -> getPackagesFromImports opts.file -- Using the import parser
+            packages -> do
+              let targets = concatMap wordsComma packages
+              targets' <- mapM parsePackageNameThrowing targets
+              pure $ Set.fromList targets'
 
+        GhcPkgExe pkg <- view $ compilerPathsL . to (.pkg)
+        let ghcPkgPath = toFilePath pkg
         unless (Set.null targetsSet) $ do
-            -- Optimization: use the relatively cheap ghc-pkg list
-            -- --simple-output to check which packages are installed
-            -- already. If all needed packages are available, we can
-            -- skip the (rather expensive) build call below.
-            GhcPkgExe pkg <- view $ compilerPathsL.to cpPkg
-            -- https://github.com/haskell/process/issues/251
-            bss <- snd <$> sinkProcessStderrStdout (toFilePath pkg)
-                ["list", "--simple-output"] CL.sinkNull CL.consume -- FIXME use the package info from envConfigPackages, or is that crazy?
-            let installed = Set.fromList
-                          $ map toPackageName
-                          $ words
-                          $ S8.unpack
-                          $ S8.concat bss
-            if Set.null $ Set.difference (Set.map packageNameString targetsSet) installed
-                then logDebug "All packages already installed"
-                else do
-                    logDebug "Missing packages, performing installation"
-                    let targets = map (T.pack . packageNameString) $ Set.toList targetsSet
-                    withNewLocalBuildTargets targets $ Stack.Build.build Nothing
-
-        let ghcArgs = concat
-                [ ["-i", "-i" ++ toFilePath scriptDir]
-                , ["-hide-all-packages"]
-                , maybeToList colorFlag
-                , map (\x -> "-package" ++ x)
-                    $ Set.toList
-                    $ Set.insert "base"
-                    $ Set.map packageNameString targetsSet
-                , case shouldCompile of
-                    SEInterpret -> []
-                    SECompile -> []
-                    SEOptimize -> ["-O2"]
-                , soGhcOptions opts
-                ]
+          -- Optimization: use the relatively cheap ghc-pkg list --simple-output
+          -- to check which packages are installed already. If all needed
+          -- packages are available, we can skip the (rather expensive) build
+          -- call below.
+          -- https://github.com/haskell/process/issues/251
+          bss <- snd <$> sinkProcessStderrStdout
+                   ghcPkgPath
+                   ["list", "--simple-output"]
+                   CL.sinkNull
+                   CL.consume
+          -- ^ FIXME use the package info from envConfigPackages, or is that crazy?
+          let installed = Set.fromList
+                        $ map toPackageName
+                        $ words
+                        $ S8.unpack
+                        $ S8.concat bss
+          if Set.null $ Set.difference (Set.map packageNameString targetsSet) installed
+            then logDebug "All packages already installed"
+            else do
+              logDebug "Missing packages, performing installation"
+              let targets =
+                    map (T.pack . packageNameString) $ Set.toList targetsSet
+              withNewLocalBuildTargets targets $ build Nothing
+
+        let packagesSet = Set.insert (mkPackageName "base") targetsSet
+            -- Yields 'raw' strings with trailing whitespace. Assumes that the
+            -- ghc-pkg application will find a package of the given name.
+            getRawPackageId :: PackageName -> RIO EnvConfig [ByteString]
+            getRawPackageId target = snd <$> sinkProcessStderrStdout
+              ghcPkgPath
+              ["field", packageNameString target, "id", "--simple-output"]
+              CL.sinkNull
+              CL.consume
+        rawPackageIds <- mapM getRawPackageId $ Set.toList packagesSet
+        let packageIds = words $ S8.unpack $ S8.concat $ concat rawPackageIds
+            -- ^ The use of words will eliminate whitespace between 'raw' items
+            ghcArgs = concat
+              [ ["-i", "-i" ++ fromAbsDir (parent file)]
+              , ["-hide-all-packages"]
+              , maybeToList colorFlag
+                -- We use GHC's -package-id option rather than -package because
+                -- there is a bug in the latter. For packages with a public
+                -- sublibrary, -package <pkg> can expose an installed package
+                -- that is not listed by ghc-pkg list <pkg>. See:
+                -- https://gitlab.haskell.org/ghc/ghc/-/issues/25025
+              , map ("-package-id=" ++) packageIds
+              , case shouldCompile of
+                  SEInterpret -> []
+                  SECompile -> []
+                  SEOptimize -> ["-O2"]
+              , opts.ghcOptions
+              , if opts.useRoot
+                  then
+                    [ "-outputdir=" ++ fromAbsDir (parent exe)
+                    , "-o", fromAbsFile exe
+                    ]
+                  else []
+              ]
         case shouldCompile of
           SEInterpret -> do
-            interpret <- view $ compilerPathsL.to cpInterpreter
+            interpret <- view $ compilerPathsL . to (.interpreter)
             exec (toFilePath interpret)
-                (ghcArgs ++ toFilePath file : soArgs opts)
+                (ghcArgs ++ toFilePath file : opts.args)
           _ -> do
             -- Use readProcessStdout_ so that (1) if GHC does send any output
             -- to stdout, we capture it and stop it from being sent to our
             -- stdout, which could break scripts, and (2) if there's an
             -- exception, the standard output we did capture will be reported
             -- to the user.
-            compilerExeName <- view $ compilerPathsL.to cpCompiler.to toFilePath
-            withWorkingDir (toFilePath scriptDir) $ proc
+            liftIO $ Dir.createDirectoryIfMissing True (fromAbsDir (parent exe))
+            compilerExeName <-
+              view $ compilerPathsL . to (.compiler) . to toFilePath
+            withWorkingDir (fromAbsDir (parent file)) $ proc
               compilerExeName
               (ghcArgs ++ [toFilePath file])
               (void . readProcessStdout_)
-            runCompiled shouldRun file
+            runCompiled shouldRun exe
 
   toPackageName = reverse . drop 1 . dropWhile (/= '-') . reverse
 
   -- Like words, but splits on both commas and spaces
   wordsComma = splitWhen (\c -> c == ' ' || c == ',')
 
-  toExeName fp =
-    if osIsWindows
-      then replaceExtension fp "exe"
-      else dropExtension fp
-
-getPackagesFromImports
-  :: FilePath -- ^ script filename
+getPackagesFromImports ::
+     FilePath -- ^ script filename
   -> RIO EnvConfig (Set PackageName)
 getPackagesFromImports scriptFP = do
-    (pns, mns) <- liftIO $ parseImports <$> S8.readFile scriptFP
-    if Set.null mns
-        then pure pns
-        else Set.union pns <$> getPackagesFromModuleNames mns
+  (pns, mns) <- liftIO $ parseImports <$> S8.readFile scriptFP
+  if Set.null mns
+    then pure pns
+    else Set.union pns <$> getPackagesFromModuleNames mns
 
-getPackagesFromModuleNames
-  :: Set ModuleName
+getPackagesFromModuleNames ::
+     Set ModuleName
   -> RIO EnvConfig (Set PackageName)
 getPackagesFromModuleNames mns = do
-    hash <- hashSnapshot
-    withSnapshotCache hash mapSnapshotPackageModules $ \getModulePackages -> do
-        pns <- forM (Set.toList mns) $ \mn -> do
-            pkgs <- getModulePackages mn
-            case pkgs of
-                [] -> pure Set.empty
-                [pn] -> pure $ Set.singleton pn
-                _ -> throwM $ AmbiguousModuleName mn pkgs
-        pure $ Set.unions pns `Set.difference` blacklist
+  hash <- hashSnapshot
+  withSnapshotCache hash mapSnapshotPackageModules $ \getModulePackages -> do
+    pns <- forM (Set.toList mns) $ \mn -> do
+      pkgs <- getModulePackages mn
+      case pkgs of
+        [] -> pure Set.empty
+        [pn] -> pure $ Set.singleton pn
+        _ -> throwM $ AmbiguousModuleName mn pkgs
+    pure $ Set.unions pns `Set.difference` blacklist
 
 hashSnapshot :: RIO EnvConfig SnapshotCacheHash
 hashSnapshot = do
-    sourceMap <- view $ envConfigL . to envConfigSourceMap
-    compilerInfo <- getCompilerInfo
-    let eitherPliHash (pn, dep) | PLImmutable pli <- dpLocation dep =
-                                    Right $ immutableLocSha pli
-                                | otherwise =
-                                    Left pn
-        deps = Map.toList (smDeps sourceMap)
-    case partitionEithers (map eitherPliHash deps) of
-        ([], pliHashes) -> do
-            let hashedContent = mconcat $ compilerInfo : pliHashes
-            pure $ SnapshotCacheHash (SHA256.hashLazyBytes $ toLazyByteString hashedContent)
-        (mutables, _) ->
-            throwM $ MutableDependenciesForScript mutables
+  sourceMap <- view $ envConfigL . to (.sourceMap)
+  compilerInfo <- getCompilerInfo
+  let eitherPliHash (pn, dep)
+        | PLImmutable pli <- dep.location = Right $ immutableLocSha pli
+        | otherwise = Left pn
+      deps = Map.toList sourceMap.deps
+  case partitionEithers (map eitherPliHash deps) of
+    ([], pliHashes) -> do
+      let hashedContent = mconcat $ compilerInfo : pliHashes
+      pure
+        $ SnapshotCacheHash (SHA256.hashLazyBytes
+        $ toLazyByteString hashedContent)
+    (mutables, _) -> throwM $ MutableDependenciesForScript mutables
 
 mapSnapshotPackageModules :: RIO EnvConfig (Map PackageName (Set ModuleName))
 mapSnapshotPackageModules = do
-    sourceMap <- view $ envConfigL . to envConfigSourceMap
-    installMap <- toInstallMap sourceMap
-    (_installedMap, globalDumpPkgs, snapshotDumpPkgs, _localDumpPkgs) <-
-        getInstalled installMap
-    let globals = dumpedPackageModules (smGlobal sourceMap) globalDumpPkgs
-        notHidden = Map.filter (not . dpHidden)
-        notHiddenDeps = notHidden $ smDeps sourceMap
-        installedDeps = dumpedPackageModules notHiddenDeps snapshotDumpPkgs
-        dumpPkgs = Set.fromList $ map (pkgName . dpPackageIdent) snapshotDumpPkgs
-        notInstalledDeps = Map.withoutKeys notHiddenDeps dumpPkgs
-    otherDeps <- for notInstalledDeps $ \dep -> do
-        gpd <- liftIO $ cpGPD (dpCommon dep)
-        Set.fromList <$> allExposedModules gpd
-    -- source map construction process should guarantee unique package names
-    -- in these maps
-    pure $ globals <> installedDeps <> otherDeps
-
-dumpedPackageModules :: Map PackageName a
-                     -> [DumpPackage]
-                     -> Map PackageName (Set ModuleName)
+  sourceMap <- view $ envConfigL . to (.sourceMap)
+  installMap <- toInstallMap sourceMap
+  (_installedMap, globalDumpPkgs, snapshotDumpPkgs, _localDumpPkgs) <-
+    getInstalled installMap
+  let globals = dumpedPackageModules sourceMap.globalPkgs globalDumpPkgs
+      notHidden = Map.filter (not . (.hidden))
+      notHiddenDeps = notHidden sourceMap.deps
+      installedDeps = dumpedPackageModules notHiddenDeps snapshotDumpPkgs
+      dumpPkgs =
+        Set.fromList $ map (pkgName . (.packageIdent)) snapshotDumpPkgs
+      notInstalledDeps = Map.withoutKeys notHiddenDeps dumpPkgs
+  otherDeps <- for notInstalledDeps $ \dep -> do
+    gpd <- liftIO dep.depCommon.gpd
+    Set.fromList <$> allExposedModules gpd
+  -- source map construction process should guarantee unique package names in
+  -- these maps
+  pure $ globals <> installedDeps <> otherDeps
+
+dumpedPackageModules ::
+     Map PackageName a
+  -> [DumpPackage]
+  -> Map PackageName (Set ModuleName)
 dumpedPackageModules pkgs dumpPkgs =
-    let pnames = Map.keysSet pkgs `Set.difference` blacklist
-    in Map.fromList
-           [ (pn, dpExposedModules)
-           | DumpPackage {..} <- dumpPkgs
-           , let PackageIdentifier pn _ = dpPackageIdent
-           , pn `Set.member` pnames
-           ]
+  let pnames = Map.keysSet pkgs `Set.difference` blacklist
+  in  Map.fromList
+        [ (pn, dp.exposedModules)
+        | dp <- dumpPkgs
+        , let PackageIdentifier pn _ = dp.packageIdent
+        , pn `Set.member` pnames
+        ]
 
 allExposedModules :: PD.GenericPackageDescription -> RIO EnvConfig [ModuleName]
 allExposedModules gpd = do
@@ -284,91 +432,91 @@ allExposedModules gpd = do
       -- currently we don't do flag checking here
       checkCond other = Left other
       mlibrary = snd . C.simplifyCondTree checkCond <$> PD.condLibrary gpd
-  pure $ case mlibrary  of
+  pure $ case mlibrary of
     Just lib -> PD.exposedModules lib ++
                 map moduleReexportName (PD.reexportedModules lib)
     Nothing  -> mempty
 
--- | The Stackage project introduced the concept of hidden packages,
--- to deal with conflicting module names. However, this is a
--- relatively recent addition (at time of writing). See:
--- http://www.snoyman.com/blog/2017/01/conflicting-module-names. To
--- kick this thing off a bit better, we're included a blacklist of
--- packages that should never be auto-parsed in.
+-- | The Stackage project introduced the concept of hidden packages, to deal
+-- with conflicting module names. However, this is a relatively recent addition
+-- (at time of writing). See:
+-- http://www.snoyman.com/blog/2017/01/conflicting-module-names. To kick this
+-- thing off a bit better, we're included a blacklist of packages that should
+-- never be auto-parsed in.
 blacklist :: Set PackageName
 blacklist = Set.fromList
-    [ mkPackageName "async-dejafu"
-    , mkPackageName "monads-tf"
-    , mkPackageName "crypto-api"
-    , mkPackageName "fay-base"
-    , mkPackageName "hashmap"
-    , mkPackageName "hxt-unicode"
-    , mkPackageName "hledger-web"
-    , mkPackageName "plot-gtk3"
-    , mkPackageName "gtk3"
-    , mkPackageName "regex-pcre-builtin"
-    , mkPackageName "regex-compat-tdfa"
-    , mkPackageName "log"
-    , mkPackageName "zip"
-    , mkPackageName "monad-extras"
-    , mkPackageName "control-monad-free"
-    , mkPackageName "prompt"
-    , mkPackageName "kawhi"
-    , mkPackageName "language-c"
-    , mkPackageName "gl"
-    , mkPackageName "svg-tree"
-    , mkPackageName "Glob"
-    , mkPackageName "nanospec"
-    , mkPackageName "HTF"
-    , mkPackageName "courier"
-    , mkPackageName "newtype-generics"
-    , mkPackageName "objective"
-    , mkPackageName "binary-ieee754"
-    , mkPackageName "rerebase"
-    , mkPackageName "cipher-aes"
-    , mkPackageName "cipher-blowfish"
-    , mkPackageName "cipher-camellia"
-    , mkPackageName "cipher-des"
-    , mkPackageName "cipher-rc4"
-    , mkPackageName "crypto-cipher-types"
-    , mkPackageName "crypto-numbers"
-    , mkPackageName "crypto-pubkey"
-    , mkPackageName "crypto-random"
-    , mkPackageName "cryptohash"
-    , mkPackageName "cryptohash-conduit"
-    , mkPackageName "cryptohash-md5"
-    , mkPackageName "cryptohash-sha1"
-    , mkPackageName "cryptohash-sha256"
-    ]
+  [ mkPackageName "Glob"
+  , mkPackageName "HTF"
+  , mkPackageName "async-dejafu"
+  , mkPackageName "binary-ieee754"
+  , mkPackageName "cipher-aes"
+  , mkPackageName "cipher-blowfish"
+  , mkPackageName "cipher-camellia"
+  , mkPackageName "cipher-des"
+  , mkPackageName "cipher-rc4"
+  , mkPackageName "control-monad-free"
+  , mkPackageName "courier"
+  , mkPackageName "crypto-api"
+  , mkPackageName "crypto-cipher-types"
+  , mkPackageName "crypto-numbers"
+  , mkPackageName "crypto-pubkey"
+  , mkPackageName "crypto-random"
+  , mkPackageName "cryptohash"
+  , mkPackageName "cryptohash-conduit"
+  , mkPackageName "cryptohash-md5"
+  , mkPackageName "cryptohash-sha1"
+  , mkPackageName "cryptohash-sha256"
+  , mkPackageName "fay-base"
+  , mkPackageName "gl"
+  , mkPackageName "gtk3"
+  , mkPackageName "hashmap"
+  , mkPackageName "hledger-web"
+  , mkPackageName "hxt-unicode"
+  , mkPackageName "kawhi"
+  , mkPackageName "language-c"
+  , mkPackageName "log"
+  , mkPackageName "monad-extras"
+  , mkPackageName "monads-tf"
+  , mkPackageName "nanospec"
+  , mkPackageName "newtype-generics"
+  , mkPackageName "objective"
+  , mkPackageName "plot-gtk3"
+  , mkPackageName "prompt"
+  , mkPackageName "regex-compat-tdfa"
+  , mkPackageName "regex-pcre-builtin"
+  , mkPackageName "rerebase"
+  , mkPackageName "svg-tree"
+  , mkPackageName "zip"
+  ]
 
 parseImports :: ByteString -> (Set PackageName, Set ModuleName)
 parseImports =
-    fold . mapMaybe (parseLine . stripCR') . S8.lines
-  where
-    -- Remove any carriage pure character present at the end, to
-    -- support Windows-style line endings (CRLF)
-    stripCR' bs
-      | S8.null bs = bs
-      | S8.last bs == '\r' = S8.init bs
-      | otherwise = bs
-
-    stripPrefix x y
-      | x `S8.isPrefixOf` y = Just $ S8.drop (S8.length x) y
-      | otherwise = Nothing
-
-    parseLine bs0 = do
-        bs1 <- stripPrefix "import " bs0
-        let bs2 = S8.dropWhile (== ' ') bs1
-            bs3 = fromMaybe bs2 $ stripPrefix "qualified " bs2
-        case stripPrefix "\"" bs3 of
-            Just bs4 -> do
-                pn <- parsePackageNameThrowing $ S8.unpack $ S8.takeWhile (/= '"') bs4
-                Just (Set.singleton pn, Set.empty)
-            Nothing -> Just
-                ( Set.empty
-                , Set.singleton
-                    $ fromString
-                    $ T.unpack
-                    $ decodeUtf8With lenientDecode
-                    $ S8.takeWhile (\c -> c /= ' ' && c /= '(') bs3
-                )
+  fold . mapMaybe (parseLine . stripCR') . S8.lines
+ where
+  -- Remove any carriage pure character present at the end, to support
+  -- Windows-style line endings (CRLF)
+  stripCR' bs
+    | S8.null bs = bs
+    | S8.last bs == '\r' = S8.init bs
+    | otherwise = bs
+
+  stripPrefix x y
+    | x `S8.isPrefixOf` y = Just $ S8.drop (S8.length x) y
+    | otherwise = Nothing
+
+  parseLine bs0 = do
+    bs1 <- stripPrefix "import " bs0
+    let bs2 = S8.dropWhile (== ' ') bs1
+        bs3 = fromMaybe bs2 $ stripPrefix "qualified " bs2
+    case stripPrefix "\"" bs3 of
+      Just bs4 -> do
+        pn <- parsePackageNameThrowing $ S8.unpack $ S8.takeWhile (/= '"') bs4
+        Just (Set.singleton pn, Set.empty)
+      Nothing -> Just
+        ( Set.empty
+        , Set.singleton
+            $ fromString
+            $ T.unpack
+            $ decodeUtf8With lenientDecode
+            $ S8.takeWhile (\c -> c /= ' ' && c /= '(') bs3
+        )
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
index f8cb1b9117..54ce267092 100644
--- a/src/Stack/Setup.hs
+++ b/src/Stack/Setup.hs
@@ -1,15 +1,16 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE DeriveFunctor       #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE LambdaCase          #-}
-{-# LANGUAGE MultiWayIf          #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE PackageImports      #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeFamilies        #-}
-{-# LANGUAGE ViewPatterns        #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE MultiWayIf            #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE ViewPatterns          #-}
+
+{-|
+Module      : Stack.Setup
+License     : BSD-3-Clause
+-}
 
 module Stack.Setup
   ( setupEnv
@@ -28,327 +29,813 @@ module Stack.Setup
   , downloadStackExe
   ) where
 
-import qualified    Codec.Archive.Tar as Tar
-import              Conduit
-import              Control.Applicative (empty)
-import "cryptonite" Crypto.Hash (SHA1(..), SHA256(..))
-import              Pantry.Internal.AesonExtended
-import qualified    Data.Aeson.KeyMap as KeyMap
-import qualified    Data.ByteString as S
-import qualified    Data.ByteString.Lazy as LBS
-import qualified    Data.Conduit.Binary as CB
-import              Data.Conduit.Lazy (lazyConsume)
-import qualified    Data.Conduit.List as CL
-import              Data.Conduit.Process.Typed (createSource)
-import              Data.Conduit.Zlib          (ungzip)
-import qualified    Data.Map as Map
-import qualified    Data.Set as Set
-import qualified    Data.Text as T
-import qualified    Data.Text.Lazy as TL
-import qualified    Data.Text.Encoding as T
-import qualified    Data.Text.Lazy.Encoding as TL
-import qualified    Data.Text.Encoding.Error as T
-import qualified    Data.Yaml as Yaml
-import              Distribution.System (OS, Arch (..), Platform (..))
-import qualified    Distribution.System as Cabal
-import              Distribution.Text (simpleParse)
-import              Distribution.Types.PackageName (mkPackageName)
-import              Distribution.Version (mkVersion)
-import              Network.HTTP.Client (redirectCount)
-import              Network.HTTP.StackClient (CheckHexDigest (..), HashCheck (..),
-                                              getResponseBody, getResponseStatusCode, httpLbs, httpJSON,
-                                              mkDownloadRequest, parseRequest, parseUrlThrow, setGitHubHeaders,
-                                              setHashChecks, setLengthCheck, verifiedDownloadWithProgress, withResponse,
-                                              setRequestMethod)
-import              Network.HTTP.Simple (getResponseHeader)
-import              Path hiding (fileExtension)
-import              Path.CheckInstall (warnInstallSearchPathIssues)
-import              Path.Extended (fileExtension)
-import              Path.Extra (toFilePathNoTrailingSep)
-import              Path.IO hiding (findExecutable, withSystemTempDir)
-import qualified    Pantry
-import qualified    RIO
-import              RIO.List
-import              RIO.PrettyPrint
-import              RIO.Process
-import              Stack.Build.Haddock (shouldHaddockDeps)
-import              Stack.Build.Source (loadSourceMap, hashSourceMapData)
-import              Stack.Build.Target (NeedTargets(..), parseTargets)
-import              Stack.Constants
-import              Stack.Constants.Config (distRelativeDir)
-import              Stack.GhcPkg (createDatabase, getGlobalDB, mkGhcPackagePath, ghcPkgPathEnvVar)
-import              Stack.Prelude hiding (Display (..))
-import              Stack.SourceMap
-import              Stack.Setup.Installed (Tool (..), extraDirs, filterTools,
-                                          installDir, getCompilerVersion,
-                                          listInstalled, markInstalled, tempInstallDir,
-                                          toolString, unmarkInstalled)
-import              Stack.Storage.User (loadCompilerPaths, saveCompilerPaths)
-import              Stack.Types.Build
-import              Stack.Types.Compiler
-import              Stack.Types.CompilerBuild
-import              Stack.Types.Config
-import              Stack.Types.Docker
-import              Stack.Types.SourceMap
-import              Stack.Types.Version
-import qualified    System.Directory as D
-import              System.Environment (getExecutablePath, lookupEnv)
-import              System.IO.Error (isPermissionError)
-import              System.FilePath (searchPathSeparator)
-import qualified    System.FilePath as FP
-import              System.Permissions (setFileExecutable)
-import              System.Uname (getRelease)
-import              Data.List.Split (splitOn)
+import qualified Codec.Archive.Tar as Tar
+import           Conduit
+                   ( ConduitT, await, concatMapMC, filterCE, foldMC, yield )
+import           Control.Applicative ( empty )
+import           Crypto.Hash ( SHA1 (..), SHA256 (..) )
+import qualified Data.Aeson.KeyMap as KeyMap
+import           Data.Aeson.Types ( Value (..) )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings (..), logJSONWarnings )
+import qualified Data.Attoparsec.Text as P
+import qualified Data.ByteString as S
+import qualified Data.ByteString.Lazy as LBS
+import           Data.Char ( isDigit )
+import qualified Data.Conduit.Binary as CB
+import           Data.Conduit.Lazy ( lazyConsume )
+import qualified Data.Conduit.List as CL
+import           Data.Conduit.Process.Typed ( createSource )
+import           Data.Conduit.Zlib ( ungzip )
+import qualified Data.Either.Extra as EE
+import           Data.List.Split ( splitOn )
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import qualified Data.Text as T
+import qualified Data.Text.Lazy as TL
+import qualified Data.Text.Encoding as T
+import qualified Data.Text.Lazy.Encoding as TL
+import qualified Data.Text.Encoding.Error as T
+import qualified Data.Yaml as Yaml
+import           Distribution.System ( Arch (..), OS, Platform (..) )
+import qualified Distribution.System as Cabal
+import           Distribution.Text ( simpleParse )
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Version ( mkVersion )
+import           Network.HTTP.Client ( redirectCount )
+import           Network.HTTP.StackClient
+                   ( CheckHexDigest (..), HashCheck (..), getResponseBody
+                   , getResponseStatusCode, httpLbs, httpJSON, mkDownloadRequest
+                   , parseRequest, parseUrlThrow, setGitHubHeaders
+                   , setHashChecks, setLengthCheck, setRequestMethod
+                   , verifiedDownloadWithProgress, withResponse
+                   )
+import           Network.HTTP.Simple ( getResponseHeader )
+import           Path
+                   ( (</>), addExtension, fileExtension, filename, parent
+                   , parseAbsDir, parseAbsFile, parseRelDir, parseRelFile
+                   , takeDrive, toFilePath
+                   )
+import           Path.CheckInstall ( warnInstallSearchPathIssues )
+import           Path.Extra ( toFilePathNoTrailingSep )
+import           Path.IO
+                   ( canonicalizePath, doesFileExist, ensureDir, executable
+                   , getPermissions, getTempDir, ignoringAbsence, listDir
+                   , removeDirRecur, removeFile, renameDir, renameFile
+                   , resolveFile', withTempDir
+                   )
+import           RIO.List
+                   ( headMaybe, intercalate, intersperse, isPrefixOf
+                   , maximumByMaybe, sort, sortOn, stripPrefix )
+import           RIO.Process
+                   ( EnvVars, HasProcessContext (..), ProcessContext
+                   , augmentPath, augmentPathMap, doesExecutableExist, envVarsL
+                   , exeSearchPathL, getStdout, mkProcessContext, modifyEnvVars
+                   , proc, readProcess_, readProcessStdout, runProcess
+                   , runProcess_, setStdout, waitExitCode, withModifyEnvVars
+                   , withProcessWait, withWorkingDir, workingDirL
+                   )
+import           Stack.Build.Haddock ( shouldHaddockDeps )
+import           Stack.Build.Source ( hashSourceMapData, loadSourceMap )
+import           Stack.Build.Target ( NeedTargets (..), parseTargets )
+import           Stack.Config.ConfigureScript ( ensureConfigureScript )
+import           Stack.Constants
+                   ( cabalPackageName, ghcBootScript,ghcConfigureMacOS
+                   , ghcConfigurePosix, ghcConfigureWindows, hadrianScriptsPosix
+                   , hadrianScriptsWindows, libDirs, osIsMacOS, osIsWindows
+                   , relDirBin, relDirUsr, relFile7zdll, relFile7zexe
+                   , relFileConfigure, relFileHadrianStackDotYaml
+                   , relFileLibcMuslx86_64So1, relFileLibgmpSo10
+                   , relFileLibgmpSo3, relFileLibncurseswSo6, relFileLibtinfoSo5
+                   , relFileLibtinfoSo6, relFileMainHs, relFileStack
+                   , relFileStackDotExe, relFileStackDotTmp
+                   , relFileStackDotTmpDotExe, stackProgName, usrLibDirs
+                   )
+import           Stack.Constants.Config ( distRelativeDir )
+import           Stack.GhcPkg
+                   ( createDatabase, getGlobalDB, ghcPkgPathEnvVar
+                   , mkGhcPackagePath )
+import           Stack.Prelude
+import           Stack.Setup.Installed
+                   ( Tool (..), filterTools, getCompilerVersion, installDir
+                   , listInstalled, markInstalled, tempInstallDir,toolExtraDirs
+                   , toolString, unmarkInstalled
+                   )
+import           Stack.SourceMap
+                   ( actualFromGhc, globalsFromDump, pruneGlobals )
+import           Stack.Storage.User ( loadCompilerPaths, saveCompilerPaths )
+import           Stack.Types.Build.Exception ( BuildPrettyException (..) )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..), configFileRootL
+                   , wantedCompilerVersionL
+                   )
+import           Stack.Types.BuildOptsCLI ( BuildOptsCLI (..) )
+import           Stack.Types.Compiler
+                   ( ActualCompiler (..), CompilerBindistPath (..)
+                   , CompilerException (..), CompilerRepository (..)
+                   , CompilerTarget (..), WhichCompiler (..)
+                   , compilerVersionText, getGhcVersion, isWantedCompiler
+                   , wantedToActual, whichCompiler, whichCompilerL
+                   )
+import           Stack.Types.CompilerBuild
+                   ( CompilerBuild (..), compilerBuildName, compilerBuildSuffix
+                   )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), GhcPkgExe (..), HasCompiler (..) )
+import           Stack.Types.Config
+                   ( Config (..), HasConfig (..), envOverrideSettingsL
+                   , ghcInstallHook
+                   )
+import           Stack.Types.DownloadInfo ( DownloadInfo (..) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), extraBinDirs
+                   , packageDatabaseDeps, packageDatabaseExtra
+                   , packageDatabaseLocal
+                   )
+import           Stack.Types.EnvSettings
+                   ( EnvSettings (..), minimalEnvSettings )
+import           Stack.Types.ExtraDirs ( ExtraDirs (..) )
+import           Stack.Types.FileDigestCache ( newFileDigestCache )
+import           Stack.Types.GHCDownloadInfo ( GHCDownloadInfo (..) )
+import           Stack.Types.GHCVariant
+                   ( GHCVariant (..), HasGHCVariant (..), ghcVariantName
+                   , ghcVariantSuffix
+                   )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Platform
+                   ( HasPlatform (..), PlatformVariant (..)
+                   , platformOnlyRelDir )
+import           Stack.Types.Runner
+                   ( HasRunner (..), Runner (..), mExecutablePathL
+                   , viewExecutablePath
+                   )
+import           Stack.Types.SetupInfo ( SetupInfo (..) )
+import           Stack.Types.SourceMap
+                   ( SMActual (..), SMWanted (..), SourceMap (..) )
+import           Stack.Types.Version
+                   ( VersionCheck, stackMinorVersion, stackVersion )
+import           Stack.Types.VersionedDownloadInfo
+                   ( VersionedDownloadInfo (..) )
+import           Stack.Types.WantedCompilerSetter ( WantedCompilerSetter (..) )
+import qualified System.Directory as D
+import           System.Environment ( lookupEnv )
+import           System.IO.Error ( isPermissionError )
+import           System.FilePath ( searchPathSeparator )
+import qualified System.FilePath as FP
+import           System.Permissions ( setFileExecutable )
+import           System.Uname ( getRelease )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Setup" module
+data SetupException
+  = WorkingDirectoryInvalidBug
+  | StackBinaryArchiveZipUnsupportedBug
+  deriving Show
+
+instance Exception SetupException where
+  displayException WorkingDirectoryInvalidBug = bugReport "[S-2076]"
+    "Invalid working directory."
+  displayException StackBinaryArchiveZipUnsupportedBug = bugReport "[S-3967]"
+    "FIXME: Handle zip files."
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Setup" module
+data SetupPrettyException
+  = GHCInstallFailed
+      !SomeException
+      !String
+      !String
+      ![String]
+      !(Path Abs Dir)
+      !(Path Abs Dir)
+      !(Path Abs Dir)
+  | InvalidGhcAt !(Path Abs File) !SomeException
+  | ExecutableNotFound ![Path Abs File]
+  | SandboxedCompilerNotFound ![String] ![Path Abs Dir]
+  | UnsupportedSetupCombo !OS !Arch !StyleDoc !StyleDoc !(Path Abs Dir)
+  | MissingDependencies ![String]
+  | UnknownCompilerVersion
+      !(Set.Set Text)
+      !WantedCompiler
+      !(Set.Set ActualCompiler)
+  | UnknownOSKey !Text
+  | GHCSanityCheckCompileFailed !SomeException !(Path Abs File)
+  | RequireCustomGHCVariant
+  | ProblemWhileDecompressing !(Path Abs File)
+  | SetupInfoMissingSevenz
+  | UnsupportedSetupConfiguration
+  | MSYS2NotFound !Text
+  | UnwantedCompilerVersion
+  | UnwantedArchitecture
+  | GHCInfoNotValidUTF8 !UnicodeException
+  | GHCInfoNotListOfPairs
+  | GHCInfoMissingGlobalPackageDB
+  | GHCInfoMissingTargetPlatform
+  | GHCInfoTargetPlatformInvalid !String
+  | CabalNotFound !(Path Abs File)
+  | GhcBootScriptNotFound
+  | HadrianScriptNotFound
+  | URLInvalid !String
+  | UnknownArchiveExtension !String
+  | Unsupported7z
+  | TarballInvalid !String
+  | TarballFileInvalid !String !(Path Abs File)
+  | UnknownArchiveStructure !(Path Abs File)
+  | StackReleaseInfoNotFound !String
+  | StackBinaryArchiveNotFound ![String]
+  | HadrianBindistNotFound
+  | DownloadAndInstallCompilerError
+  | StackBinaryArchiveUnsupported !Text
+  | StackBinaryNotInArchive !String !Text
+  | FileTypeInArchiveInvalid !Tar.Entry !Text
+  | BinaryUpgradeOnOSUnsupported !Cabal.OS
+  | BinaryUpgradeOnArchUnsupported !Cabal.Arch
+  | ExistingMSYS2NotDeleted !(Path Abs Dir) !IOException
+  deriving Show
+
+instance Pretty SetupPrettyException where
+  pretty (GHCInstallFailed ex step cmd args wd tempDir destDir) =
+    "[S-7441]"
+    <> line
+    <> string (displayException ex)
+    <> line
+    <> hang 2 (  fillSep
+                   [ flow "Error encountered while"
+                   , fromString step
+                   , flow "GHC with"
+                   ]
+              <> line
+              <> style Shell (fromString (unwords (cmd : args)))
+              <> line
+              -- TODO: Figure out how to insert \ in the appropriate spots
+              -- hang 2 (shellColor (fillSep (fromString cmd : map fromString args))) <> line <>
+              <> fillSep
+                   [ flow "run in"
+                   , pretty wd
+                   ]
+              )
+    <> blankLine
+    <> flow "The following directories may now contain files, but won't be \
+            \used by Stack:"
+    <> line
+    <> bulletedList [pretty tempDir, pretty destDir]
+    <> blankLine
+    <> fillSep
+         [ flow "For more information consider rerunning with"
+         , style Shell "--verbose"
+         , "flag."
+         ]
+    <> line
+  pretty (InvalidGhcAt compiler e) =
+    "[S-2476]"
+    <> line
+    <> fillSep
+         [ flow "Stack considers the compiler at"
+         , pretty compiler
+         , flow "to be invalid."
+         ]
+    <> blankLine
+    <> flow "While assessing that compiler, Stack encountered the error:"
+    <> blankLine
+    <> ppException e
+  pretty (ExecutableNotFound toTry) =
+    "[S-4764]"
+    <> line
+    <> flow "Stack could not find any of the following executables:"
+    <> line
+    <> bulletedList (map pretty toTry)
+  pretty (SandboxedCompilerNotFound names fps) =
+    "[S-9953]"
+    <> line
+    <> fillSep
+         ( ( flow "Stack could not find the sandboxed compiler. It looked for \
+                   \one named one of:"
+            : mkNarrativeList Nothing False
+                ( map fromString names :: [StyleDoc] )
+            )
+         <> ( flow "However, it could not find any on one of the paths:"
+            : mkNarrativeList Nothing False fps
+            )
+         )
+    <> blankLine
+    <> fillSep
+         [ flow "Perhaps a previously-installed compiler was not completely \
+                \uninstalled. For further information about uninstalling \
+                \tools, see the output of"
+         , style Shell (flow "stack uninstall") <> "."
+         ]
+  pretty (UnsupportedSetupCombo os arch tool toolDirAdvice programsDir) =
+    "[S-1852]"
+    <> line
+    <> fillSep
+         [ flow "Stack does not know how to install"
+         , tool
+         , flow "for the combination of operating system"
+         , style Shell (pretty os)
+         , "and architecture"
+         , style Shell (pretty arch) <> "."
+         , flow "Please install manually."
+         ]
+    <> blankLine
+    <> fillSep
+         [ flow "To install manually the version of"
+         , tool <> ","
+         , flow "its root directory should be named"
+         , toolDirAdvice
+         , flow "and the directory should be accompanied by a file with the \
+                \same name and extension"
+         , style File ".installed"
+         , flow "(which marks the"
+         , tool
+         , flow "version as installed). Both items should be located in the \
+                \subdirectory for the specified platform in Stack's directory \
+                \for local tools"
+         , parens (pretty programsDir) <> "."
+         ]
+  pretty (MissingDependencies tools) =
+    "[S-2126]"
+    <> line
+    <> fillSep
+         ( flow "The following executables are missing and must be installed:"
+         : mkNarrativeList Nothing False (map fromString tools :: [StyleDoc])
+         )
+  pretty (UnknownCompilerVersion oskeys wanted known) =
+    "[S-9443]"
+    <> line
+    <> fillSep
+         (  ( flow "No setup information found for"
+            : style Current wanted'
+            : flow "on your platform. This probably means a GHC binary \
+                   \distribution has not yet been added for OS key"
+            : mkNarrativeList (Just Shell) False
+                (map (fromString . T.unpack) (sort $ Set.toList oskeys) :: [StyleDoc])
+            )
+         <> ( flow "Supported versions:"
+            : mkNarrativeList Nothing False
+                ( map
+                    (fromString . T.unpack . compilerVersionText)
+                    (sort $ Set.toList known)
+                    :: [StyleDoc]
+                )
+            )
+         )
+   where
+    wanted' = fromString . T.unpack . utf8BuilderToText $ display wanted
+  pretty (UnknownOSKey oskey) =
+    "[S-6810]"
+    <> line
+    <> fillSep
+         [ flow "Unable to find installation URLs for OS key:"
+         , fromString $ T.unpack oskey <> "."
+         ]
+  pretty (GHCSanityCheckCompileFailed e ghc) =
+    "[S-5159]"
+    <> line
+    <> fillSep
+         [ flow "The GHC located at"
+         , pretty ghc
+         , flow "failed to compile a sanity check. Please see:"
+         , style Url "http://docs.haskellstack.org/en/stable/install_and_upgrade/"
+         , flow "for more information. Stack encountered the following \
+                \error:"
+         ]
+    <> blankLine
+    <> string (displayException e)
+  pretty RequireCustomGHCVariant =
+    "[S-8948]"
+    <> line
+    <> fillSep
+         [ flow "A custom"
+         , style Shell "--ghc-variant"
+         , flow "must be specified to use"
+         , style Shell "--ghc-bindist" <> "."
+         ]
+  pretty (ProblemWhileDecompressing archive) =
+    "[S-2905]"
+    <> line
+    <> fillSep
+         [ flow "Problem while decompressing"
+         , pretty archive <> "."
+         ]
+  pretty SetupInfoMissingSevenz =
+    "[S-9561]"
+    <> line
+    <> flow "SetupInfo missing Sevenz EXE/DLL."
+  pretty UnsupportedSetupConfiguration =
+    "[S-7748]"
+    <> line
+    <> flow "Stack does not know how to install GHC on your system \
+            \configuration. Please install manually."
+  pretty (MSYS2NotFound osKey) =
+    "[S-5308]"
+    <> line
+    <> fillSep
+         [ flow "MSYS2 not found for"
+         , fromString $ T.unpack osKey <> "."
+         ]
+  pretty UnwantedCompilerVersion =
+    "[S-5127]"
+    <> line
+    <> flow "Not the compiler version we want."
+  pretty UnwantedArchitecture =
+    "[S-1540]"
+    <> line
+    <> flow "Not the architecture we want."
+  pretty (GHCInfoNotValidUTF8 e) =
+    "[S-8668]"
+    <> line
+    <> flow "GHC info is not valid UTF-8. Stack encountered the following \
+            \error:"
+    <> blankLine
+    <> string (displayException e)
+  pretty GHCInfoNotListOfPairs =
+    "[S-4878]"
+    <> line
+    <> flow "GHC info does not parse as a list of pairs."
+  pretty GHCInfoMissingGlobalPackageDB =
+    "[S-2965]"
+    <> line
+    <> flow "Key 'Global Package DB' not found in GHC info."
+  pretty GHCInfoMissingTargetPlatform =
+    "[S-5219]"
+    <> line
+    <> flow "Key 'Target platform' not found in GHC info."
+  pretty (GHCInfoTargetPlatformInvalid targetPlatform) =
+    "[S-8299]"
+    <> line
+    <> fillSep
+         [ flow "Invalid target platform in GHC info:"
+         , fromString targetPlatform <> "."
+         ]
+  pretty (CabalNotFound compiler) =
+    "[S-2574]"
+    <> line
+    <> fillSep
+         [ flow "Cabal library not found in global package database for"
+         , pretty compiler <> "."
+         ]
+  pretty GhcBootScriptNotFound =
+    "[S-8488]"
+    <> line
+    <> flow "No GHC boot script found."
+  pretty HadrianScriptNotFound =
+    "[S-1128]"
+    <> line
+    <> flow "No Hadrian build script found."
+  pretty (URLInvalid url) =
+    "[S-1906]"
+    <> line
+    <> fillSep
+         [ flow "`url` must be either an HTTP URL or a file path:"
+         , fromString url <> "."
+         ]
+  pretty (UnknownArchiveExtension url) =
+    "[S-1648]"
+    <> line
+    <> fillSep
+         [ flow "Unknown extension for url:"
+         , style Url (fromString url) <> "."
+         ]
+  pretty Unsupported7z =
+    "[S-4509]"
+    <> line
+    <> fillSep
+         [ flow "Stack does not know how to deal with"
+         , style File ".7z"
+         , flow "files on non-Windows operating systems."
+         ]
+  pretty (TarballInvalid name) =
+    "[S-3158]"
+    <> line
+    <> fillSep
+         [ style File (fromString name)
+         , flow "must be a tarball file."
+         ]
+  pretty (TarballFileInvalid name archiveFile) =
+    "[S-5252]"
+    <> line
+    <> fillSep
+         [ "Invalid"
+         , style File (fromString name)
+         , "filename:"
+         , pretty archiveFile <> "."
+         ]
+  pretty (UnknownArchiveStructure archiveFile) =
+    "[S-1827]"
+    <> line
+    <> fillSep
+         [ flow "Expected a single directory within unpacked"
+         , pretty archiveFile <> "."
+         ]
+  pretty (StackReleaseInfoNotFound url) =
+    "[S-9476]"
+    <> line
+    <> fillSep
+         [ flow "Could not get release information for Stack from:"
+         , style Url (fromString url) <> "."
+         ]
+  pretty (StackBinaryArchiveNotFound platforms) =
+    "[S-4461]"
+    <> line
+    <> fillSep
+         ( flow "Unable to find binary Stack archive for platforms:"
+         : mkNarrativeList Nothing False
+             (map fromString platforms :: [StyleDoc])
+         )
+  pretty HadrianBindistNotFound =
+    "[S-6617]"
+    <> line
+    <> flow "Can't find Hadrian-generated binary distribution."
+  pretty DownloadAndInstallCompilerError =
+    "[S-7227]"
+    <> line
+    <> flow "'downloadAndInstallCompiler' should not be reached with ghc-git."
+  pretty (StackBinaryArchiveUnsupported archiveURL) =
+    "[S-6636]"
+    <> line
+    <> fillSep
+         [ flow "Unknown archive format for Stack archive:"
+         , style Url (fromString $ T.unpack archiveURL) <> "."
+         ]
+  pretty (StackBinaryNotInArchive exeName url) =
+    "[S-7871]"
+    <> line
+    <> fillSep
+         [ flow "Stack executable"
+         , style File (fromString exeName)
+         , flow "not found in archive from"
+         , style Url (fromString $ T.unpack url) <> "."
+         ]
+  pretty (FileTypeInArchiveInvalid e url) =
+    "[S-5046]"
+    <> line
+    <> fillSep
+         [ flow "Invalid file type for tar entry named"
+         , fromString (Tar.entryPath e)
+         , flow "downloaded from"
+         , style Url (fromString $ T.unpack url) <> "."
+         ]
+  pretty (BinaryUpgradeOnOSUnsupported os) =
+    "[S-4132]"
+    <> line
+    <> fillSep
+         [ flow "Binary upgrade not yet supported on OS:"
+         , pretty os <> "."
+         ]
+  pretty (BinaryUpgradeOnArchUnsupported arch) =
+    "[S-3249]"
+    <> line
+    <> fillSep
+         [ flow "Binary upgrade not yet supported on architecture:"
+         , pretty arch <> "."
+         ]
+  pretty (ExistingMSYS2NotDeleted destDir e) =
+    "[S-4230]"
+    <> line
+    <> fillSep
+         [ flow "Could not delete existing MSYS2 directory:"
+         , pretty destDir <> "."
+         , flow "Stack encountered the following error:"
+         ]
+    <> blankLine
+    <> string (displayException e)
+
+instance Exception SetupPrettyException
+
+-- | Type representing exceptions thrown by 'performPathChecking'
+data PerformPathCheckingException
+  = ProcessExited ExitCode String [String]
+  deriving Show
+
+instance Exception PerformPathCheckingException where
+  displayException (ProcessExited ec cmd args) = concat
+    [ "Error: [S-1991]\n"
+    , "Process exited with "
+    , displayException ec
+    , ": "
+    , unwords (cmd:args)
+    ]
 
 -- | Default location of the stack-setup.yaml file
 defaultSetupInfoYaml :: String
 defaultSetupInfoYaml =
-    "https://raw.githubusercontent.com/commercialhaskell/stackage-content/master/stack/stack-setup-2.yaml"
+  "https://raw.githubusercontent.com/commercialhaskell/stackage-content/master/stack/stack-setup-2.yaml"
 
+-- | Type representing setup configurations.
 data SetupOpts = SetupOpts
-    { soptsInstallIfMissing :: !Bool
-    , soptsUseSystem :: !Bool
+  { installGhcIfMissing :: !Bool
+  , installMsysIfMissing :: !Bool
+  , useSystem :: !Bool
     -- ^ Should we use a system compiler installation, if available?
-    , soptsWantedCompiler :: !WantedCompiler
-    , soptsCompilerCheck :: !VersionCheck
-    , soptsStackYaml :: !(Maybe (Path Abs File))
-    -- ^ If we got the desired GHC version from that file
-    , soptsForceReinstall :: !Bool
-    , soptsSanityCheck :: !Bool
+  , wantedCompiler :: !WantedCompiler
+  , compilerCheck :: !VersionCheck
+  , configFile :: !(Maybe (Path Abs File))
+    -- ^ If we got the desired GHC version from that configuration file, which
+    -- may be either a user-specific global or a project-level one.
+  , forceReinstall :: !Bool
+  , sanityCheck :: !Bool
     -- ^ Run a sanity check on the selected GHC
-    , soptsSkipGhcCheck :: !Bool
+  , skipGhcCheck :: !Bool
     -- ^ Don't check for a compatible GHC version/architecture
-    , soptsSkipMsys :: !Bool
+  , skipMsys :: !Bool
     -- ^ Do not use a custom msys installation on Windows
-    , soptsResolveMissingGHC :: !(Maybe Text)
+  , resolveMissingGHC :: !(Maybe StyleDoc)
     -- ^ Message shown to user for how to resolve the missing GHC
-    , soptsGHCBindistURL :: !(Maybe String)
+  , ghcBindistURL :: !(Maybe String)
     -- ^ Alternate GHC binary distribution (requires custom GHCVariant)
-    }
-    deriving Show
-data SetupException = UnsupportedSetupCombo OS Arch
-                    | MissingDependencies [String]
-                    | UnknownCompilerVersion (Set.Set Text) WantedCompiler (Set.Set ActualCompiler)
-                    | UnknownOSKey Text
-                    | GHCSanityCheckCompileFailed SomeException (Path Abs File)
-                    | WantedMustBeGHC
-                    | RequireCustomGHCVariant
-                    | ProblemWhileDecompressing (Path Abs File)
-                    | SetupInfoMissingSevenz
-                    | DockerStackExeNotFound Version Text
-                    | UnsupportedSetupConfiguration
-                    | InvalidGhcAt (Path Abs File) SomeException
-    deriving Typeable
-instance Exception SetupException
-instance Show SetupException where
-    show (UnsupportedSetupCombo os arch) = concat
-        [ "I don't know how to install GHC for "
-        , show (os, arch)
-        , ", please install manually"
-        ]
-    show (MissingDependencies tools) =
-        "The following executables are missing and must be installed: " ++
-        intercalate ", " tools
-    show (UnknownCompilerVersion oskeys wanted known) = concat
-        [ "No setup information found for "
-        , T.unpack $ utf8BuilderToText $ RIO.display wanted
-        , " on your platform.\nThis probably means a GHC bindist has not yet been added for OS key '"
-        , T.unpack (T.intercalate "', '" (sort $ Set.toList oskeys))
-        , "'.\nSupported versions: "
-        , T.unpack (T.intercalate ", " (map compilerVersionText (sort $ Set.toList known)))
-        ]
-    show (UnknownOSKey oskey) =
-        "Unable to find installation URLs for OS key: " ++
-        T.unpack oskey
-    show (GHCSanityCheckCompileFailed e ghc) = concat
-        [ "The GHC located at "
-        , toFilePath ghc
-        , " failed to compile a sanity check. Please see:\n\n"
-        , "    http://docs.haskellstack.org/en/stable/install_and_upgrade/\n\n"
-        , "for more information. Exception was:\n"
-        , show e
-        ]
-    show WantedMustBeGHC =
-        "The wanted compiler must be GHC"
-    show RequireCustomGHCVariant =
-        "A custom --ghc-variant must be specified to use --ghc-bindist"
-    show (ProblemWhileDecompressing archive) =
-        "Problem while decompressing " ++ toFilePath archive
-    show SetupInfoMissingSevenz =
-        "SetupInfo missing Sevenz EXE/DLL"
-    show (DockerStackExeNotFound stackVersion' osKey) = concat
-        [ stackProgName
-        , "-"
-        , versionString stackVersion'
-        , " executable not found for "
-        , T.unpack osKey
-        , "\nUse the '"
-        , T.unpack dockerStackExeArgName
-        , "' option to specify a location"]
-    show UnsupportedSetupConfiguration =
-        "I don't know how to install GHC on your system configuration, please install manually"
-    show (InvalidGhcAt compiler e) =
-        "Found an invalid compiler at " ++ show (toFilePath compiler) ++ ": " ++ displayException e
-
--- | Modify the environment variables (like PATH) appropriately, possibly doing installation too
-setupEnv :: NeedTargets
-         -> BuildOptsCLI
-         -> Maybe Text -- ^ Message to give user when necessary GHC is not available
-         -> RIO BuildConfig EnvConfig
-setupEnv needTargets boptsCLI mResolveMissingGHC = do
-    config <- view configL
-    bc <- view buildConfigL
-    let stackYaml = bcStackYaml bc
-    platform <- view platformL
-    wcVersion <- view wantedCompilerVersionL
-    wanted <- view wantedCompilerVersionL
-    actual <- either throwIO pure $ wantedToActual wanted
-    let wc = actual^.whichCompilerL
-    let sopts = SetupOpts
-            { soptsInstallIfMissing = configInstallGHC config
-            , soptsUseSystem = configSystemGHC config
-            , soptsWantedCompiler = wcVersion
-            , soptsCompilerCheck = configCompilerCheck config
-            , soptsStackYaml = Just stackYaml
-            , soptsForceReinstall = False
-            , soptsSanityCheck = False
-            , soptsSkipGhcCheck = configSkipGHCCheck config
-            , soptsSkipMsys = configSkipMsys config
-            , soptsResolveMissingGHC = mResolveMissingGHC
-            , soptsGHCBindistURL = Nothing
-            }
+  }
+  deriving Show
 
-    (compilerPaths, ghcBin) <- ensureCompilerAndMsys sopts
-    let compilerVer = cpCompilerVersion compilerPaths
+-- | Modify the environment variables (like PATH) appropriately, possibly doing
+-- installation too
+setupEnv ::
+     NeedTargets
+  -> BuildOptsCLI
+  -> Maybe StyleDoc
+     -- ^ Message to give user when necessary GHC is not available.
+  -> RIO BuildConfig EnvConfig
+setupEnv needTargets buildOptsCLI mResolveMissingGHC = do
+  config <- view configL
+  bc <- view buildConfigL
+  -- We are indifferent as to whether the configuration file is a
+  -- user-specific global or a project-level one.
+  let eitherConfigFile = EE.fromEither bc.configFile
+  platform <- view platformL
+  wcVersion <- view wantedCompilerVersionL
+  actual <- either throwIO pure $ wantedToActual wcVersion
+  let wc = actual^.whichCompilerL
+      sopts = SetupOpts
+        { installGhcIfMissing = config.installGHC
+        , installMsysIfMissing = config.installMsys
+        , useSystem = config.systemGHC
+        , wantedCompiler = wcVersion
+        , compilerCheck = config.compilerCheck
+        , configFile = Just eitherConfigFile
+        , forceReinstall = False
+        , sanityCheck = False
+        , skipGhcCheck = config.skipGHCCheck
+        , skipMsys = config.skipMsys
+        , resolveMissingGHC = mResolveMissingGHC
+        , ghcBindistURL = Nothing
+        }
 
-    -- Modify the initial environment to include the GHC path, if a local GHC
-    -- is being used
-    menv0 <- view processContextL
-    env <- either throwM (pure . removeHaskellEnvVars)
-               $ augmentPathMap
-                    (map toFilePath $ edBins ghcBin)
-                    (view envVarsL menv0)
-    menv <- mkProcessContext env
-
-    logDebug "Resolving package entries"
-
-    (sourceMap, sourceMapHash) <- runWithGHC menv compilerPaths $ do
-      smActual <- actualFromGhc (bcSMWanted bc) compilerVer
-      let actualPkgs = Map.keysSet (smaDeps smActual) <>
-                       Map.keysSet (smaProject smActual)
-          prunedActual = smActual { smaGlobal = pruneGlobals (smaGlobal smActual) actualPkgs }
-          haddockDeps = shouldHaddockDeps (configBuild config)
-      targets <- parseTargets needTargets haddockDeps boptsCLI prunedActual
-      sourceMap <- loadSourceMap targets boptsCLI smActual
-      sourceMapHash <- hashSourceMapData boptsCLI sourceMap
-      pure (sourceMap, sourceMapHash)
-
-    let envConfig0 = EnvConfig
-            { envConfigBuildConfig = bc
-            , envConfigBuildOptsCLI = boptsCLI
-            , envConfigSourceMap = sourceMap
-            , envConfigSourceMapHash = sourceMapHash
-            , envConfigCompilerPaths = compilerPaths
-            }
+  (compilerPaths, ghcBin) <- ensureCompilerAndMsys sopts
+  let compilerVer = compilerPaths.compilerVersion
+
+  -- Modify the initial environment to include the GHC path, if a local GHC
+  -- is being used
+  menv0 <- view processContextL
+  env <- either throwM (pure . removeHaskellEnvVars)
+           $ augmentPathMap
+               (map toFilePath ghcBin.bins)
+               (view envVarsL menv0)
+  menv <- mkProcessContext env
+
+  logDebug "Resolving package entries"
+
+  (sourceMap, sourceMapHash) <- runWithGHC menv compilerPaths $ do
+    smActual <- actualFromGhc bc.smWanted compilerVer
+    let actualPkgs = Map.keysSet smActual.deps <>
+                     Map.keysSet smActual.project
+        prunedActual = smActual
+          { globals = pruneGlobals smActual.globals actualPkgs }
+        haddockDeps = shouldHaddockDeps config.build
+    targets <- parseTargets needTargets haddockDeps buildOptsCLI prunedActual
+    sourceMap <- loadSourceMap targets buildOptsCLI smActual
+    sourceMapHash <- hashSourceMapData buildOptsCLI sourceMap
+    pure (sourceMap, sourceMapHash)
+
+  fileDigestCache <- newFileDigestCache
+
+  let envConfig0 = EnvConfig
+        { buildConfig = bc
+        , buildOptsCLI
+        , fileDigestCache
+        , sourceMap
+        , sourceMapHash
+        , compilerPaths
+        }
 
-    -- extra installation bin directories
-    mkDirs <- runRIO envConfig0 extraBinDirs
-    let mpath = Map.lookup "PATH" env
-    depsPath <- either throwM pure $ augmentPath (toFilePath <$> mkDirs False) mpath
-    localsPath <- either throwM pure $ augmentPath (toFilePath <$> mkDirs True) mpath
-
-    deps <- runRIO envConfig0 packageDatabaseDeps
-    runWithGHC menv compilerPaths $ createDatabase (cpPkg compilerPaths) deps
-    localdb <- runRIO envConfig0 packageDatabaseLocal
-    runWithGHC menv compilerPaths $ createDatabase (cpPkg compilerPaths) localdb
-    extras <- runReaderT packageDatabaseExtra envConfig0
-    let mkGPP locals = mkGhcPackagePath locals localdb deps extras $ cpGlobalDB compilerPaths
-
-    distDir <- runReaderT distRelativeDir envConfig0 >>= canonicalizePath
-
-    executablePath <- liftIO getExecutablePath
-
-    utf8EnvVars <- withProcessContext menv $ getUtf8EnvVars compilerVer
-
-    mGhcRtsEnvVar <- liftIO $ lookupEnv "GHCRTS"
-
-    envRef <- liftIO $ newIORef Map.empty
-    let getProcessContext' es = do
-            m <- readIORef envRef
-            case Map.lookup es m of
-                Just eo -> pure eo
-                Nothing -> do
-                    eo <- mkProcessContext
-                        $ Map.insert "PATH" (if esIncludeLocals es then localsPath else depsPath)
-                        $ (if esIncludeGhcPackagePath es
-                                then Map.insert (ghcPkgPathEnvVar wc) (mkGPP (esIncludeLocals es))
-                                else id)
-
-                        $ (if esStackExe es
-                                then Map.insert "STACK_EXE" (T.pack executablePath)
-                                else id)
-
-                        $ (if esLocaleUtf8 es
-                                then Map.union utf8EnvVars
-                                else id)
-
-                        $ case (soptsSkipMsys sopts, platform) of
-                            (False, Platform Cabal.I386   Cabal.Windows)
-                                -> Map.insert "MSYSTEM" "MINGW32"
-                            (False, Platform Cabal.X86_64 Cabal.Windows)
-                                -> Map.insert "MSYSTEM" "MINGW64"
-                            _   -> id
-
-                        -- See https://github.com/commercialhaskell/stack/issues/3444
-                        $ case (esKeepGhcRts es, mGhcRtsEnvVar) of
-                            (True, Just ghcRts) -> Map.insert "GHCRTS" (T.pack ghcRts)
-                            _ -> id
-
-                        -- For reasoning and duplication, see:
-                        -- https://github.com/commercialhaskell/stack/issues/70
-                        $ Map.insert "HASKELL_PACKAGE_SANDBOX" (T.pack $ toFilePathNoTrailingSep deps)
-                        $ Map.insert "HASKELL_PACKAGE_SANDBOXES"
-                            (T.pack $ if esIncludeLocals es
-                                then intercalate [searchPathSeparator]
-                                        [ toFilePathNoTrailingSep localdb
-                                        , toFilePathNoTrailingSep deps
-                                        , ""
-                                        ]
-                                else intercalate [searchPathSeparator]
-                                        [ toFilePathNoTrailingSep deps
-                                        , ""
-                                        ])
-                        $ Map.insert "HASKELL_DIST_DIR" (T.pack $ toFilePathNoTrailingSep distDir)
-
-                          -- Make sure that any .ghc.environment files
-                          -- are ignored, since we're setting up our
-                          -- own package databases. See
-                          -- https://github.com/commercialhaskell/stack/issues/4706
-                        $ (case cpCompilerVersion compilerPaths of
-                             ACGhc version | version >= mkVersion [8, 4, 4] ->
-                               Map.insert "GHC_ENVIRONMENT" "-"
-                             _ -> id)
-
-                          env
-
-                    () <- atomicModifyIORef envRef $ \m' ->
-                        (Map.insert es eo m', ())
-                    pure eo
-
-    envOverride <- liftIO $ getProcessContext' minimalEnvSettings
-    pure EnvConfig
-        { envConfigBuildConfig = bc
-            { bcConfig = addIncludeLib ghcBin
-                       $ set processContextL envOverride
-                         (view configL bc)
-                { configProcessContextSettings = getProcessContext'
-                }
+  -- extra installation bin directories
+  mkDirs <- runRIO envConfig0 extraBinDirs
+  let mpath = Map.lookup "PATH" env
+  depsPath <-
+    either throwM pure $ augmentPath (toFilePath <$> mkDirs False) mpath
+  localsPath <-
+    either throwM pure $ augmentPath (toFilePath <$> mkDirs True) mpath
+
+  deps <- runRIO envConfig0 packageDatabaseDeps
+  runWithGHC menv compilerPaths $ createDatabase compilerPaths.pkg deps
+  localdb <- runRIO envConfig0 packageDatabaseLocal
+  runWithGHC menv compilerPaths $ createDatabase compilerPaths.pkg localdb
+  extras <- runReaderT packageDatabaseExtra envConfig0
+  let mkGPP locals =
+        mkGhcPackagePath locals localdb deps extras compilerPaths.globalDB
+
+  distDir <- runReaderT distRelativeDir envConfig0 >>= canonicalizePath
+
+  mExecutablePath <- view mExecutablePathL
+
+  mGhcRtsEnvVar <- liftIO $ lookupEnv "GHCRTS"
+
+  envRef <- liftIO $ newIORef Map.empty
+  let msysEnv = maybe "" (T.pack . show) config.msysEnvironment
+      getProcessContext' es = do
+        m <- readIORef envRef
+        case Map.lookup es m of
+          Just eo -> pure eo
+          Nothing -> do
+            eo <- mkProcessContext
+              $ Map.insert
+                  "PATH"
+                  (if es.includeLocals then localsPath else depsPath)
+              $ (if es.includeGhcPackagePath
+                   then
+                     Map.insert
+                       (ghcPkgPathEnvVar wc)
+                       (mkGPP es.includeLocals)
+                   else id)
+
+              $ (if es.stackExe
+                   then maybe
+                     -- We don't throw an exception if there is no Stack
+                     -- executable path, so that buildConfigCompleter does not
+                     -- need to specify a path.
+                     id
+                     ( \executablePath -> Map.insert
+                         "STACK_EXE"
+                         (T.pack $ toFilePath executablePath)
+                     )
+                     mExecutablePath
+                   else id)
+
+              $ (if es.localeUtf8
+                   then Map.union utf8EnvVars
+                   else id)
+
+              $ case (sopts.skipMsys, platform) of
+                  (False, Platform Cabal.I386   Cabal.Windows) ->
+                    Map.insert "MSYSTEM" msysEnv
+                  (False, Platform Cabal.X86_64 Cabal.Windows) ->
+                    Map.insert "MSYSTEM" msysEnv
+                  _ -> id
+
+              -- See https://github.com/commercialhaskell/stack/issues/3444
+              $ case (es.keepGhcRts, mGhcRtsEnvVar) of
+                  (True, Just ghcRts) -> Map.insert "GHCRTS" (T.pack ghcRts)
+                  _ -> id
+
+              -- For reasoning and duplication, see:
+              -- https://github.com/commercialhaskell/stack/issues/70
+              $ Map.insert
+                  "HASKELL_PACKAGE_SANDBOX"
+                  (T.pack $ toFilePathNoTrailingSep deps)
+              $ Map.insert "HASKELL_PACKAGE_SANDBOXES"
+                  (T.pack $ if es.includeLocals
+                    then intercalate [searchPathSeparator]
+                           [ toFilePathNoTrailingSep localdb
+                           , toFilePathNoTrailingSep deps
+                           , ""
+                           ]
+                    else intercalate [searchPathSeparator]
+                           [ toFilePathNoTrailingSep deps
+                           , ""
+                           ])
+              $ Map.insert
+                  "HASKELL_DIST_DIR"
+                  (T.pack $ toFilePathNoTrailingSep distDir)
+
+                -- Make sure that any .ghc.environment files
+                -- are ignored, since we're setting up our
+                -- own package databases. See
+                -- https://github.com/commercialhaskell/stack/issues/4706
+              $ (case compilerPaths.compilerVersion of
+                  ACGhc version | version >= mkVersion [8, 4, 4] ->
+                    Map.insert "GHC_ENVIRONMENT" "-"
+                  _ -> id)
+
+                env
+
+            () <- atomicModifyIORef envRef $ \m' ->
+                (Map.insert es eo m', ())
+            pure eo
+
+  envOverride <- liftIO $ getProcessContext' minimalEnvSettings
+  pure EnvConfig
+    { buildConfig = bc
+        { config = addIncludeLib ghcBin
+                 $ set processContextL envOverride
+                    (view configL bc)
+            { processContextSettings = getProcessContext'
             }
-        , envConfigBuildOptsCLI = boptsCLI
-        , envConfigSourceMap = sourceMap
-        , envConfigSourceMapHash = sourceMapHash
-        , envConfigCompilerPaths = compilerPaths
         }
+    , buildOptsCLI
+    , fileDigestCache
+    , sourceMap
+    , sourceMapHash
+    , compilerPaths
+    }
 
 -- | A modified env which we know has an installed compiler on the PATH.
 data WithGHC env = WithGHC !CompilerPaths !env
@@ -357,31 +844,52 @@ insideL :: Lens' (WithGHC env) env
 insideL = lens (\(WithGHC _ x) -> x) (\(WithGHC cp _) -> WithGHC cp)
 
 instance HasLogFunc env => HasLogFunc (WithGHC env) where
-  logFuncL = insideL.logFuncL
+  logFuncL = insideL . logFuncL
+
 instance HasRunner env => HasRunner (WithGHC env) where
-  runnerL = insideL.runnerL
+  runnerL = insideL . runnerL
+
 instance HasProcessContext env => HasProcessContext (WithGHC env) where
-  processContextL = insideL.processContextL
+  processContextL = insideL . processContextL
+
 instance HasStylesUpdate env => HasStylesUpdate (WithGHC env) where
-  stylesUpdateL = insideL.stylesUpdateL
+  stylesUpdateL = insideL . stylesUpdateL
+
 instance HasTerm env => HasTerm (WithGHC env) where
-  useColorL = insideL.useColorL
-  termWidthL = insideL.termWidthL
+  useColorL = insideL . useColorL
+  termWidthL = insideL . termWidthL
+
 instance HasPantryConfig env => HasPantryConfig (WithGHC env) where
-  pantryConfigL = insideL.pantryConfigL
-instance HasConfig env => HasPlatform (WithGHC env)
-instance HasConfig env => HasGHCVariant (WithGHC env)
+  pantryConfigL = insideL . pantryConfigL
+
+instance HasConfig env => HasPlatform (WithGHC env) where
+  platformL = configL . platformL
+  {-# INLINE platformL #-}
+  platformVariantL = configL . platformVariantL
+  {-# INLINE platformVariantL #-}
+
+instance HasConfig env => HasGHCVariant (WithGHC env) where
+  ghcVariantL = configL . ghcVariantL
+  {-# INLINE ghcVariantL #-}
+
 instance HasConfig env => HasConfig (WithGHC env) where
-  configL = insideL.configL
+  configL = insideL . configL
+
 instance HasBuildConfig env => HasBuildConfig (WithGHC env) where
-  buildConfigL = insideL.buildConfigL
+  buildConfigL = insideL . buildConfigL
+
 instance HasCompiler (WithGHC env) where
   compilerPathsL = to (\(WithGHC cp _) -> cp)
 
--- | Set up a modified environment which includes the modified PATH
--- that GHC can be found on. This is needed for looking up global
--- package information and ghc fingerprint (result from 'ghc --info').
-runWithGHC :: HasConfig env => ProcessContext -> CompilerPaths -> RIO (WithGHC env) a -> RIO env a
+-- | Set up a modified environment which includes the modified PATH that GHC can
+-- be found on. This is needed for looking up global package information and ghc
+-- fingerprint (result from 'ghc --info').
+runWithGHC ::
+     HasConfig env
+  => ProcessContext
+  -> CompilerPaths
+  -> RIO (WithGHC env) a
+  -> RIO env a
 runWithGHC pc cp inner = do
   env <- ask
   let envg
@@ -390,391 +898,544 @@ runWithGHC pc cp inner = do
           set processContextL pc env
   runRIO envg inner
 
+-- | A modified environment which we know has MSYS2 on the PATH.
+newtype WithMSYS env = WithMSYS env
+
+insideMSYSL :: Lens' (WithMSYS env) env
+insideMSYSL = lens (\(WithMSYS x) -> x) (\(WithMSYS _) -> WithMSYS)
+
+instance HasLogFunc env => HasLogFunc (WithMSYS env) where
+  logFuncL = insideMSYSL . logFuncL
+
+instance HasRunner env => HasRunner (WithMSYS env) where
+  runnerL = insideMSYSL . runnerL
+
+instance HasProcessContext env => HasProcessContext (WithMSYS env) where
+  processContextL = insideMSYSL . processContextL
+
+instance HasStylesUpdate env => HasStylesUpdate (WithMSYS env) where
+  stylesUpdateL = insideMSYSL . stylesUpdateL
+
+instance HasTerm env => HasTerm (WithMSYS env) where
+  useColorL = insideMSYSL . useColorL
+  termWidthL = insideMSYSL . termWidthL
+
+instance HasPantryConfig env => HasPantryConfig (WithMSYS env) where
+  pantryConfigL = insideMSYSL . pantryConfigL
+
+instance HasConfig env => HasPlatform (WithMSYS env) where
+  platformL = configL . platformL
+  {-# INLINE platformL #-}
+  platformVariantL = configL . platformVariantL
+  {-# INLINE platformVariantL #-}
+
+instance HasConfig env => HasGHCVariant (WithMSYS env) where
+  ghcVariantL = configL . ghcVariantL
+  {-# INLINE ghcVariantL #-}
+
+instance HasConfig env => HasConfig (WithMSYS env) where
+  configL = insideMSYSL . configL
+
+instance HasBuildConfig env => HasBuildConfig (WithMSYS env) where
+  buildConfigL = insideMSYSL . buildConfigL
+
+-- | Set up a modified environment which includes the modified PATH that MSYS2
+-- can be found on.
+runWithMSYS ::
+     HasConfig env
+  => Maybe ExtraDirs
+  -> RIO (WithMSYS env) a
+  -> RIO env a
+runWithMSYS mmsysPaths inner = do
+  env <- ask
+  pc0 <- view processContextL
+  pc <- case mmsysPaths of
+    Nothing -> pure pc0
+    Just msysPaths -> do
+      envars <- either throwM pure $
+        augmentPathMap
+          (map toFilePath msysPaths.bins)
+          (view envVarsL pc0)
+      mkProcessContext envars
+  let envMsys
+        = WithMSYS $
+          set envOverrideSettingsL (\_ -> pure pc) $
+          set processContextL pc env
+  runRIO envMsys inner
+
 -- | special helper for GHCJS which needs an updated source map
 -- only project dependencies should get included otherwise source map hash will
 -- get changed and EnvConfig will become inconsistent
-rebuildEnv :: EnvConfig
-    -> NeedTargets
-    -> Bool
-    -> BuildOptsCLI
-    -> RIO env EnvConfig
+rebuildEnv ::
+     EnvConfig
+  -> NeedTargets
+  -> Bool
+  -> BuildOptsCLI
+  -> RIO env EnvConfig
 rebuildEnv envConfig needTargets haddockDeps boptsCLI = do
-    let bc = envConfigBuildConfig envConfig
-        cp = envConfigCompilerPaths envConfig
-        compilerVer = smCompiler $ envConfigSourceMap envConfig
-    runRIO (WithGHC cp bc) $ do
-        smActual <- actualFromGhc (bcSMWanted bc) compilerVer
-        let actualPkgs = Map.keysSet (smaDeps smActual) <> Map.keysSet (smaProject smActual)
-            prunedActual = smActual {
-              smaGlobal = pruneGlobals (smaGlobal smActual) actualPkgs
-              }
-        targets <- parseTargets needTargets haddockDeps boptsCLI prunedActual
-        sourceMap <- loadSourceMap targets boptsCLI smActual
-        pure $
-            envConfig
-            {envConfigSourceMap = sourceMap, envConfigBuildOptsCLI = boptsCLI}
+  let bc = envConfig.buildConfig
+      cp = envConfig.compilerPaths
+      compilerVer = envConfig.sourceMap.compiler
+  runRIO (WithGHC cp bc) $ do
+    smActual <- actualFromGhc bc.smWanted compilerVer
+    let actualPkgs =
+          Map.keysSet smActual.deps <> Map.keysSet smActual.project
+        prunedActual = smActual
+          { globals = pruneGlobals smActual.globals actualPkgs }
+    targets <- parseTargets needTargets haddockDeps boptsCLI prunedActual
+    sourceMap <- loadSourceMap targets boptsCLI smActual
+    pure $ envConfig
+      { sourceMap = sourceMap
+      , buildOptsCLI = boptsCLI
+      }
 
 -- | Some commands (script, ghci and exec) set targets dynamically
 -- see also the note about only local targets for rebuildEnv
-withNewLocalBuildTargets :: HasEnvConfig  env => [Text] -> RIO env a -> RIO env a
+withNewLocalBuildTargets ::
+     HasEnvConfig  env
+  => [Text]
+  -> RIO env a
+  -> RIO env a
 withNewLocalBuildTargets targets f = do
-    envConfig <- view $ envConfigL
-    haddockDeps <- view $ configL.to configBuild.to shouldHaddockDeps
-    let boptsCLI = envConfigBuildOptsCLI envConfig
-    envConfig' <- rebuildEnv envConfig NeedTargets haddockDeps $
-                  boptsCLI {boptsCLITargets = targets}
-    local (set envConfigL envConfig') f
+  envConfig <- view envConfigL
+  haddockDeps <- view $ configL . to (.build) . to shouldHaddockDeps
+  let boptsCLI = envConfig.buildOptsCLI
+  envConfig' <-
+    rebuildEnv envConfig NeedTargets haddockDeps $ boptsCLI
+      { targetsCLI = targets}
+  local (set envConfigL envConfig') f
 
 -- | Add the include and lib paths to the given Config
 addIncludeLib :: ExtraDirs -> Config -> Config
-addIncludeLib (ExtraDirs _bins includes libs) config = config
-    { configExtraIncludeDirs =
-        configExtraIncludeDirs config ++
-        map toFilePathNoTrailingSep includes
-    , configExtraLibDirs =
-        configExtraLibDirs config ++
-        map toFilePathNoTrailingSep libs
-    }
+addIncludeLib extraDirs config = config
+  { extraIncludeDirs =
+      config.extraIncludeDirs ++ map toFilePathNoTrailingSep extraDirs.includes
+  , extraLibDirs =
+      config.extraLibDirs ++ map toFilePathNoTrailingSep extraDirs.libs
+  }
 
 -- | Ensure both the compiler and the msys toolchain are installed and
 -- provide the PATHs to add if necessary
-ensureCompilerAndMsys
-  :: (HasBuildConfig env, HasGHCVariant env)
+ensureCompilerAndMsys ::
+     (HasBuildConfig env, HasGHCVariant env)
   => SetupOpts
   -> RIO env (CompilerPaths, ExtraDirs)
 ensureCompilerAndMsys sopts = do
   getSetupInfo' <- memoizeRef getSetupInfo
   mmsys2Tool <- ensureMsys sopts getSetupInfo'
-  msysPaths <- maybe (pure Nothing) (fmap Just . extraDirs) mmsys2Tool
-
-  actual <- either throwIO pure $ wantedToActual $ soptsWantedCompiler sopts
+  mmsysPaths <- maybe (pure Nothing) (fmap Just . toolExtraDirs) mmsys2Tool
+  actual <- either throwIO pure $ wantedToActual sopts.wantedCompiler
   didWarn <- warnUnsupportedCompiler $ getGhcVersion actual
-
-  (cp, ghcPaths) <- ensureCompiler sopts getSetupInfo'
+  -- Modify the initial environment to include the MSYS2 path, if MSYS2 is being
+  -- used
+  (cp, ghcPaths) <- runWithMSYS mmsysPaths $ ensureCompiler sopts getSetupInfo'
 
   warnUnsupportedCompilerCabal cp didWarn
 
-  let paths = maybe ghcPaths (ghcPaths <>) msysPaths
+  let paths = maybe ghcPaths (ghcPaths <>) mmsysPaths
   pure (cp, paths)
 
 -- | See <https://github.com/commercialhaskell/stack/issues/4246>
-warnUnsupportedCompiler :: HasLogFunc env => Version -> RIO env Bool
+warnUnsupportedCompiler ::
+     (HasConfig env, HasTerm env)
+  => Version
+  -> RIO env Bool
 warnUnsupportedCompiler ghcVersion = do
+  notifyIfGhcUntested <- view $ configL . to (.notifyIfGhcUntested)
   if
-    | ghcVersion < mkVersion [7, 8] -> do
-        logWarn $
-          "Stack will almost certainly fail with GHC below version 7.8, requested " <>
-          fromString (versionString ghcVersion)
-        logWarn "Valiantly attempting to run anyway, but I know this is doomed"
-        logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648"
-        logWarn ""
+    | ghcVersion < mkVersion [8, 4] -> do
+        prettyWarnL
+          [ flow "Stack will almost certainly fail with GHC below version 8.4, \
+                 \requested"
+          , fromString (versionString ghcVersion) <> "."
+          , flow "Valiantly attempting to run anyway, but this is doomed."
+          ]
         pure True
-    | ghcVersion >= mkVersion [9, 5] -> do
-        logWarn $
-          "Stack has not been tested with GHC versions above 9.4, and using " <>
-          fromString (versionString ghcVersion) <>
-          ", this may fail"
+    | ghcVersion >= mkVersion [9, 15] && notifyIfGhcUntested -> do
+        prettyWarnL
+          [ flow "Stack has not been tested with GHC versions 9.16 and above, \
+                 \and using"
+          , fromString (versionString ghcVersion) <> ","
+          , flow "this may fail."
+          ]
         pure True
     | otherwise -> do
         logDebug "Asking for a supported GHC version"
         pure False
 
 -- | See <https://github.com/commercialhaskell/stack/issues/4246>
-warnUnsupportedCompilerCabal
-  :: HasLogFunc env
+warnUnsupportedCompilerCabal ::
+     (HasConfig env, HasTerm env)
   => CompilerPaths
   -> Bool -- ^ already warned about GHC?
   -> RIO env ()
 warnUnsupportedCompilerCabal cp didWarn = do
-  unless didWarn $ void $ warnUnsupportedCompiler $ getGhcVersion $ cpCompilerVersion cp
-  let cabalVersion = cpCabalVersion cp
-
+  unless didWarn $
+    void $ warnUnsupportedCompiler $ getGhcVersion cp.compilerVersion
+  let cabalVersion = cp.cabalVersion
+  notifyIfCabalUntested <- view $ configL . to (.notifyIfCabalUntested)
   if
-    | cabalVersion < mkVersion [1, 19, 2] -> do
-        logWarn $ "Stack no longer supports Cabal versions below 1.19.2,"
-        logWarn $ "but version " <> fromString (versionString cabalVersion) <> " was found."
-        logWarn "This invocation will most likely fail."
-        logWarn "To fix this, either use an older version of Stack or a newer resolver"
-        logWarn "Acceptable resolvers: lts-3.0/nightly-2015-05-05 or later"
-    | cabalVersion >= mkVersion [3, 9] ->
-        logWarn $
-          "Stack has not been tested with Cabal versions above 3.8, but version " <>
-          fromString (versionString cabalVersion) <>
-          " was found, this may fail"
+    | cabalVersion < mkVersion [2, 2] -> do
+            -- Due to a bug, Stack 2.15.1 does not support Cabal < 2.
+        let downgradeRecommendation = fillSep $
+                 [ flow "Stack 2.15.5 or earlier" ]
+              <> [ flow "(except Stack 2.15.1)" | cabalVersion < mkVersion [2] ]
+        prettyWarnL
+          [ flow "Stack uses the version of the Cabal package that comes with \
+                 \the specified version of GHC. However, Stack no longer \
+                 \supports such Cabal versions before 2.2. Version"
+          , fromString (versionString cabalVersion)
+          , flow "was found. This invocation of Stack may fail. To fix this, \
+                 \either use"
+          , downgradeRecommendation
+          , flow "or use a snapshot that specifies a version of GHC that is \
+                 \8.4 or later. Stackage LTS Haskell 12.0"
+          , parens (style Shell "lts-12.0")
+          , flow "or later or Nightly 2018-03-13"
+          , parens (style Shell "nightly-2018-03-13")
+          , flow "or later specify such GHC versions."
+          ]
+    | cabalVersion >= mkVersion [3, 17] && notifyIfCabalUntested ->
+        prettyWarnL
+          [ flow "Stack has not been tested with Cabal versions 3.18 and \
+                 \above, but version"
+          , fromString (versionString cabalVersion)
+          , flow "was found, this may fail."
+          ]
     | otherwise -> pure ()
 
--- | Ensure that the msys toolchain is installed if necessary and
--- provide the PATHs to add if necessary
-ensureMsys
-  :: HasBuildConfig env
+-- | Ensure that the msys toolchain is installed if necessary and provide the
+-- PATHs to add if necessary
+ensureMsys ::
+     HasBuildConfig env
   => SetupOpts
   -> Memoized SetupInfo
   -> RIO env (Maybe Tool)
 ensureMsys sopts getSetupInfo' = do
-  platform <- view platformL
-  localPrograms <- view $ configL.to configLocalPrograms
+  localPrograms <- view $ configL . to (.localPrograms)
   installed <- listInstalled localPrograms
+  view platformL >>= \case
+    Platform _ Cabal.Windows | not sopts.skipMsys ->
+      case getInstalledTool installed (mkPackageName "msys2") (const True) of
+        Just tool -> pure (Just tool)
+        Nothing
+          | sopts.installMsysIfMissing -> do
+              si <- runMemoized getSetupInfo'
+              let msysDir = fillSep
+                    [ style Dir "msys2-yyyymmdd"
+                    , flow "(where yyyymmdd is the date-based version)"
+                    ]
+              osKey <- getOSKey "MSYS2" msysDir
+              config <- view configL
+              VersionedDownloadInfo version info <-
+                case Map.lookup osKey si.msys2 of
+                  Just x -> pure x
+                  Nothing -> prettyThrowIO $ MSYS2NotFound osKey
+              let tool = Tool (PackageIdentifier (mkPackageName "msys2") version)
+              Just <$> downloadAndInstallTool
+                         config.localPrograms
+                         info
+                         tool
+                         (installMsys2Windows si)
+          | otherwise -> do
+              prettyWarnS "Stack is not using a Stack-supplied MSYS2."
+              pure Nothing
+    _ -> pure Nothing
 
-  case platform of
-      Platform _ Cabal.Windows | not (soptsSkipMsys sopts) ->
-          case getInstalledTool installed (mkPackageName "msys2") (const True) of
-              Just tool -> pure (Just tool)
-              Nothing
-                  | soptsInstallIfMissing sopts -> do
-                      si <- runMemoized getSetupInfo'
-                      osKey <- getOSKey platform
-                      config <- view configL
-                      VersionedDownloadInfo version info <-
-                          case Map.lookup osKey $ siMsys2 si of
-                              Just x -> pure x
-                              Nothing -> throwString $ "MSYS2 not found for " ++ T.unpack osKey
-                      let tool = Tool (PackageIdentifier (mkPackageName "msys2") version)
-                      Just <$> downloadAndInstallTool (configLocalPrograms config) info tool (installMsys2Windows si)
-                  | otherwise -> do
-                      logWarn "Continuing despite missing tool: msys2"
-                      pure Nothing
-      _ -> pure Nothing
-
-installGhcBindist
-  :: HasBuildConfig env
+installGhcBindist ::
+     HasBuildConfig env
   => SetupOpts
   -> Memoized SetupInfo
   -> [Tool]
   -> RIO env (Tool, CompilerBuild)
 installGhcBindist sopts getSetupInfo' installed = do
-    Platform expectedArch _ <- view platformL
-    let wanted = soptsWantedCompiler sopts
-        isWanted = isWantedCompiler (soptsCompilerCheck sopts) (soptsWantedCompiler sopts)
-    config <- view configL
-    ghcVariant <- view ghcVariantL
-    wc <- either throwIO (pure . whichCompiler) $ wantedToActual wanted
-    possibleCompilers <-
-            case wc of
-                Ghc -> do
-                    ghcBuilds <- getGhcBuilds
-                    forM ghcBuilds $ \ghcBuild -> do
-                        ghcPkgName <- parsePackageNameThrowing ("ghc" ++ ghcVariantSuffix ghcVariant ++ compilerBuildSuffix ghcBuild)
-                        pure (getInstalledTool installed ghcPkgName (isWanted . ACGhc), ghcBuild)
-    let existingCompilers = concatMap
-            (\(installedCompiler, compilerBuild) ->
-                case (installedCompiler, soptsForceReinstall sopts) of
-                    (Just tool, False) -> [(tool, compilerBuild)]
-                    _ -> [])
-            possibleCompilers
-    logDebug $
-      "Found already installed GHC builds: " <>
-      mconcat (intersperse ", " (map (fromString . compilerBuildName . snd) existingCompilers))
-    case existingCompilers of
-        (tool, build_):_ -> pure (tool, build_)
-        []
-            | soptsInstallIfMissing sopts -> do
-                si <- runMemoized getSetupInfo'
-                downloadAndInstallPossibleCompilers
-                    (map snd possibleCompilers)
-                    si
-                    (soptsWantedCompiler sopts)
-                    (soptsCompilerCheck sopts)
-                    (soptsGHCBindistURL sopts)
-            | otherwise -> do
-                let suggestion = fromMaybe
-                        (mconcat
-                             [ "To install the correct GHC into "
-                             , T.pack (toFilePath (configLocalPrograms config))
-                             , ", try running 'stack setup' or use the '--install-ghc' flag."
-                             , " To use your system GHC installation, run \
-                               \'stack config set system-ghc --global true', \
-                               \or use the '--system-ghc' flag."
-                             ])
-                        (soptsResolveMissingGHC sopts)
-                throwM $ CompilerVersionMismatch
-                    Nothing -- FIXME ((\(x, y, _) -> (x, y)) <$> msystem)
-                    (soptsWantedCompiler sopts, expectedArch)
-                    ghcVariant
-                    (case possibleCompilers of
-                        [] -> CompilerBuildStandard
-                        (_, compilerBuild):_ -> compilerBuild)
-                    (soptsCompilerCheck sopts)
-                    (soptsStackYaml sopts)
-                    suggestion
-
--- | Ensure compiler is installed, without worrying about msys
-ensureCompiler
-  :: forall env. (HasConfig env, HasBuildConfig env, HasGHCVariant env)
+  Platform expectedArch _ <- view platformL
+  let wanted = sopts.wantedCompiler
+      isWanted =
+        isWantedCompiler sopts.compilerCheck sopts.wantedCompiler
+  config <- view configL
+  ghcVariant <- view ghcVariantL
+  wc <- either throwIO (pure . whichCompiler) $ wantedToActual wanted
+  possibleCompilers <-
+    case wc of
+      Ghc -> do
+        ghcBuilds <- getGhcBuilds
+        forM ghcBuilds $ \ghcBuild -> do
+          ghcPkgName <- parsePackageNameThrowing
+            (  "ghc"
+            ++ ghcVariantSuffix ghcVariant
+            ++ compilerBuildSuffix ghcBuild
+            )
+          pure (getInstalledTool installed ghcPkgName (isWanted . ACGhc), ghcBuild)
+  let existingCompilers = concatMap
+        (\(installedCompiler, compilerBuild) ->
+          case (installedCompiler, sopts.forceReinstall) of
+            (Just tool, False) -> [(tool, compilerBuild)]
+            _ -> [])
+        possibleCompilers
+      globalOpts = config.runner.globalOpts
+      wantedCompilerSetter
+        | isJust globalOpts.compiler = CompilerAtCommandLine
+        | isJust globalOpts.snapshot = SnapshotAtCommandLine
+        | otherwise = YamlConfiguration sopts.configFile
+  logDebug $
+       "Found already installed GHC builds: "
+    <> mconcat (intersperse ", " (map (fromString . compilerBuildName . snd) existingCompilers))
+  case existingCompilers of
+    (tool, build_):_ -> pure (tool, build_)
+    []
+      | sopts.installGhcIfMissing -> do
+          si <- runMemoized getSetupInfo'
+          downloadAndInstallPossibleCompilers
+            (map snd possibleCompilers)
+            si
+            sopts.wantedCompiler
+            sopts.compilerCheck
+            sopts.ghcBindistURL
+      | otherwise -> do
+          let suggestion =
+                fromMaybe defaultSuggestion sopts.resolveMissingGHC
+              defaultSuggestion = fillSep
+                [ flow "To install the correct version of GHC into the \
+                       \subdirectory for the specified platform in Stack's \
+                       \directory for local tools"
+                , parens (pretty config.localPrograms) <> ","
+                , flow "try running"
+                , style Shell (flow "stack setup")
+                , flow "or use the"
+                , style Shell "--install-ghc"
+                , flow "flag. To use your system GHC installation, run"
+                ,    style
+                       Shell
+                       (flow "stack config set system-ghc --global true")
+                  <> ","
+                , flow "or use the"
+                , style Shell "--system-ghc"
+                , "flag."
+                ]
+
+          prettyThrowM $ CompilerVersionMismatch
+            Nothing -- FIXME ((\(x, y, _) -> (x, y)) <$> msystem)
+            (sopts.wantedCompiler, expectedArch)
+            ghcVariant
+            (case possibleCompilers of
+              [] -> CompilerBuildStandard
+              (_, compilerBuild):_ -> compilerBuild)
+            sopts.compilerCheck
+            wantedCompilerSetter
+            suggestion
+
+-- | Ensure compiler is installed.
+ensureCompiler ::
+     forall env. (HasConfig env, HasBuildConfig env, HasGHCVariant env)
   => SetupOpts
   -> Memoized SetupInfo
-  -> RIO env (CompilerPaths, ExtraDirs)
+  -> RIO (WithMSYS env) (CompilerPaths, ExtraDirs)
 ensureCompiler sopts getSetupInfo' = do
-    let wanted = soptsWantedCompiler sopts
-    wc <- either throwIO (pure . whichCompiler) $ wantedToActual wanted
-
-    hook <- ghcInstallHook
-    hookIsExecutable <- handleIO (\_ -> pure False) $ if osIsWindows
-      then doesFileExist hook  -- can't really detect executable on windows, only file extension
-      else executable <$> getPermissions hook
-
-    Platform expectedArch _ <- view platformL
-
-    let canUseCompiler cp
-            | soptsSkipGhcCheck sopts = pure cp
-            | not $ isWanted $ cpCompilerVersion cp = throwString "Not the compiler version we want"
-            | cpArch cp /= expectedArch = throwString "Not the architecture we want"
-            | otherwise = pure cp
-        isWanted = isWantedCompiler (soptsCompilerCheck sopts) (soptsWantedCompiler sopts)
-
-    let checkCompiler :: Path Abs File -> RIO env (Maybe CompilerPaths)
-        checkCompiler compiler = do
-          eres <- tryAny $ pathsFromCompiler wc CompilerBuildStandard False compiler >>= canUseCompiler
-          case eres of
-            Left e -> do
-              logDebug $ "Not using compiler at " <> displayShow (toFilePath compiler) <> ": " <> displayShow e
-              pure Nothing
-            Right cp -> pure $ Just cp
-
-    mcp <-
-      if | soptsUseSystem sopts -> do
-            logDebug "Getting system compiler version"
-            runConduit $
-              sourceSystemCompilers wanted .|
-              concatMapMC checkCompiler .|
-              await
-         | hookIsExecutable -> do
-          -- if the hook fails, we fall through to stacks sandboxed installation
-            hookGHC <- runGHCInstallHook sopts hook
-            maybe (pure Nothing) checkCompiler hookGHC
-         | otherwise -> pure Nothing
-    case mcp of
-      Nothing -> ensureSandboxedCompiler sopts getSetupInfo'
-      Just cp -> do
-        let paths = ExtraDirs { edBins = [parent $ cpCompiler cp], edInclude = [], edLib = [] }
-        pure (cp, paths)
-
+  let wanted = sopts.wantedCompiler
+  wc <- either throwIO (pure . whichCompiler) $ wantedToActual wanted
+
+  hook <- ghcInstallHook
+  hookIsExecutable <- handleIO (\_ -> pure False) $ if osIsWindows
+    then doesFileExist hook  -- can't really detect executable on windows, only
+                             -- file extension
+    else executable <$> getPermissions hook
+
+  Platform expectedArch _ <- view platformL
+
+  let canUseCompiler cp
+        | sopts.skipGhcCheck = pure cp
+        | not $ isWanted cp.compilerVersion =
+            prettyThrowIO UnwantedCompilerVersion
+        | cp.arch /= expectedArch = prettyThrowIO UnwantedArchitecture
+        | otherwise = pure cp
+      isWanted =
+        isWantedCompiler sopts.compilerCheck sopts.wantedCompiler
+
+  let checkCompiler :: Path Abs File -> RIO (WithMSYS env) (Maybe CompilerPaths)
+      checkCompiler compiler = do
+        eres <- tryAny $
+          pathsFromCompiler wc CompilerBuildStandard False compiler >>= canUseCompiler
+        case eres of
+          Left e -> do
+            logDebug $
+                 "Not using compiler at "
+              <> displayShow (toFilePath compiler)
+              <> ": "
+              <> displayShow e
+            pure Nothing
+          Right cp -> pure $ Just cp
+
+  mcp <-
+    if | sopts.useSystem -> do
+          logDebug "Getting system compiler version"
+          runConduit $
+            sourceSystemCompilers wanted .|
+            concatMapMC checkCompiler .|
+            await
+       | hookIsExecutable -> do
+        -- if the hook fails, we fall through to stacks sandboxed installation
+          hookGHC <- runGHCInstallHook sopts hook
+          maybe (pure Nothing) checkCompiler hookGHC
+       | otherwise -> pure Nothing
+  case mcp of
+    Nothing -> ensureSandboxedCompiler sopts getSetupInfo'
+    Just cp -> do
+      let paths = ExtraDirs
+            { bins = [parent cp.compiler]
+            , includes = []
+            , libs = []
+            }
+      pure (cp, paths)
 
 -- | Runs @STACK_ROOT\/hooks\/ghc-install.sh@.
 --
--- Reads and possibly validates the output of the process as the GHC
--- binary and returns it.
-runGHCInstallHook
-  :: HasBuildConfig env
+-- Reads and possibly validates the output of the process as the GHC binary and
+-- returns it.
+runGHCInstallHook ::
+     HasBuildConfig env
   => SetupOpts
   -> Path Abs File
   -> RIO env (Maybe (Path Abs File))
 runGHCInstallHook sopts hook = do
-    logDebug "Getting hook installed compiler version"
-    let wanted = soptsWantedCompiler sopts
-    menv0 <- view processContextL
-    menv <- mkProcessContext (Map.union (wantedCompilerToEnv wanted) $
-      removeHaskellEnvVars (view envVarsL menv0))
-    (exit, out) <- withProcessContext menv $ proc "sh" [toFilePath hook] readProcessStdout
-    case exit of
-      ExitSuccess -> do
-        let ghcPath = stripNewline . TL.unpack . TL.decodeUtf8With T.lenientDecode $ out
-        case parseAbsFile ghcPath of
-          Just compiler -> do
-            when (soptsSanityCheck sopts) $ sanityCheck compiler
-            logDebug ("Using GHC compiler at: " <> fromString (toFilePath compiler))
-            pure (Just compiler)
-          Nothing -> do
-            logWarn ("Path to GHC binary is not a valid path: " <> fromString ghcPath)
-            pure Nothing
-      ExitFailure i -> do
-        logWarn ("GHC install hook exited with code: " <> fromString (show i))
-        pure Nothing
+  logDebug "Getting hook installed compiler version"
+  let wanted = sopts.wantedCompiler
+  menv0 <- view processContextL
+  menv <- mkProcessContext (Map.union (wantedCompilerToEnv wanted) $
+    removeHaskellEnvVars (view envVarsL menv0))
+  (exit, out) <- withProcessContext menv $ proc "sh" [toFilePath hook] readProcessStdout
+  case exit of
+    ExitSuccess -> do
+      let ghcPath = stripNewline . TL.unpack . TL.decodeUtf8With T.lenientDecode $ out
+      case parseAbsFile ghcPath of
+        Just compiler -> do
+          when sopts.sanityCheck $ sanityCheck compiler
+          logDebug ("Using GHC compiler at: " <> fromString (toFilePath compiler))
+          pure (Just compiler)
+        Nothing -> do
+          prettyWarnL
+            [ flow "Path to GHC binary is not a valid path:"
+            , style Dir (fromString ghcPath) <> "."
+            ]
+          pure Nothing
+    ExitFailure i -> do
+      prettyWarnL
+        [ flow "GHC install hook exited with code:"
+        , style Error (fromString $ show i) <> "."
+        ]
+      pure Nothing
  where
-    wantedCompilerToEnv :: WantedCompiler -> EnvVars
-    wantedCompilerToEnv (WCGhc ver) =
-      Map.fromList [("HOOK_GHC_TYPE", "bindist")
-                   ,("HOOK_GHC_VERSION", T.pack (versionString ver))
-                   ]
-    wantedCompilerToEnv (WCGhcGit commit flavor) =
-      Map.fromList [("HOOK_GHC_TYPE", "git")
-                   ,("HOOK_GHC_COMMIT", commit)
-                   ,("HOOK_GHC_FLAVOR", flavor)
-                   ,("HOOK_GHC_FLAVOUR", flavor)
-                   ]
-    wantedCompilerToEnv (WCGhcjs ghcjs_ver ghc_ver) =
-      Map.fromList [("HOOK_GHC_TYPE", "ghcjs")
-                   ,("HOOK_GHC_VERSION", T.pack (versionString ghc_ver))
-                   ,("HOOK_GHCJS_VERSION", T.pack (versionString ghcjs_ver))
-                   ]
-    newlines :: [Char]
-    newlines = ['\n', '\r']
-
-    stripNewline :: String -> String
-    stripNewline str = filter (flip notElem newlines) str
-
-
-ensureSandboxedCompiler
-  :: HasBuildConfig env
+  wantedCompilerToEnv :: WantedCompiler -> EnvVars
+  wantedCompilerToEnv (WCGhc ver) =
+    Map.fromList [ ("HOOK_GHC_TYPE", "bindist")
+                 , ("HOOK_GHC_VERSION", T.pack (versionString ver))
+                 ]
+  wantedCompilerToEnv (WCGhcGit commit flavor) =
+    Map.fromList [ ("HOOK_GHC_TYPE", "git")
+                 , ("HOOK_GHC_COMMIT", commit)
+                 , ("HOOK_GHC_FLAVOR", flavor)
+                 , ("HOOK_GHC_FLAVOUR", flavor)
+                 ]
+  wantedCompilerToEnv (WCGhcjs ghcjs_ver ghc_ver) =
+    Map.fromList [ ("HOOK_GHC_TYPE", "ghcjs")
+                 , ("HOOK_GHC_VERSION", T.pack (versionString ghc_ver))
+                 , ("HOOK_GHCJS_VERSION", T.pack (versionString ghcjs_ver))
+                 ]
+  newlines :: [Char]
+  newlines = ['\n', '\r']
+
+  stripNewline :: String -> String
+  stripNewline = filter (`notElem` newlines)
+
+ensureSandboxedCompiler ::
+     HasBuildConfig env
   => SetupOpts
   -> Memoized SetupInfo
-  -> RIO env (CompilerPaths, ExtraDirs)
+  -> RIO (WithMSYS env) (CompilerPaths, ExtraDirs)
 ensureSandboxedCompiler sopts getSetupInfo' = do
-    let wanted = soptsWantedCompiler sopts
-    -- List installed tools
-    config <- view configL
-    let localPrograms = configLocalPrograms config
-    installed <- listInstalled localPrograms
-    logDebug $ "Installed tools: \n - " <> mconcat (intersperse "\n - " (map (fromString . toolString) installed))
-    (compilerTool, compilerBuild) <-
-      case soptsWantedCompiler sopts of
-       -- shall we build GHC from source?
-       WCGhcGit commitId flavour -> buildGhcFromSource getSetupInfo' installed  (configCompilerRepository config) commitId flavour
-       _ -> installGhcBindist sopts getSetupInfo' installed
-    paths <- extraDirs compilerTool
-
-    wc <- either throwIO (pure . whichCompiler) $ wantedToActual wanted
-    menv0 <- view processContextL
-    m <- either throwM pure
-       $ augmentPathMap (toFilePath <$> edBins paths) (view envVarsL menv0)
-    menv <- mkProcessContext (removeHaskellEnvVars m)
-
-    names <-
-      case wanted of
-        WCGhc version -> pure ["ghc-" ++ versionString version, "ghc"]
-        WCGhcGit{} -> pure ["ghc"]
-        WCGhcjs{} -> throwIO GhcjsNotSupported
-
-    -- Previously, we used findExecutable to locate these executables. This was
-    -- actually somewhat sloppy, as it could discover executables outside of the
-    -- sandbox. This led to a specific issue on Windows with GHC 9.0.1. See
-    -- https://gitlab.haskell.org/ghc/ghc/-/issues/20074. Instead, now, we look
-    -- on the paths specified only.
-    let loop [] = do
-          logError $ "Looked for sandboxed compiler named one of: " <> displayShow names
-          logError $ "Could not find it on the paths " <> displayShow (edBins paths)
-          throwString "Could not find sandboxed compiler"
-        loop (x:xs) = do
-          res <- liftIO $ D.findExecutablesInDirectories (map toFilePath (edBins paths)) x
-          case res of
-            [] -> loop xs
-            compiler:rest -> do
-              unless (null rest) $ do
-                logWarn "Found multiple candidate compilers:"
-                for_ res $ \y -> logWarn $ "- " <> fromString y
-                logWarn $ "This usually indicates a failed installation. Trying anyway with " <> fromString compiler
-              parseAbsFile compiler
-    compiler <- withProcessContext menv $ do
-      compiler <- loop names
-
-      -- Run this here to ensure that the sanity check uses the modified
-      -- environment, otherwise we may infect GHC_PACKAGE_PATH and break sanity
-      -- checks.
-      when (soptsSanityCheck sopts) $ sanityCheck compiler
-
-      pure compiler
-
-    cp <- pathsFromCompiler wc compilerBuild True compiler
-    pure (cp, paths)
-
-pathsFromCompiler
-  :: forall env. HasConfig env
+  let wanted = sopts.wantedCompiler
+  -- List installed tools
+  config <- view configL
+  let localPrograms = config.localPrograms
+  installed <- listInstalled localPrograms
+  logDebug $
+       "Installed tools: \n - "
+    <> mconcat (intersperse "\n - " (map (fromString . toolString) installed))
+  (compilerTool, compilerBuild) <-
+    case sopts.wantedCompiler of
+     -- shall we build GHC from source?
+     WCGhcGit commitId flavour ->
+       buildGhcFromSource
+         getSetupInfo'
+         installed
+         config.compilerRepository
+         config.compilerTarget
+         config.compilerBindistPath
+         commitId
+         flavour
+     _ -> installGhcBindist sopts getSetupInfo' installed
+  paths <- toolExtraDirs compilerTool
+
+  wc <- either throwIO (pure . whichCompiler) $ wantedToActual wanted
+  menv0 <- view processContextL
+  m <- either throwM pure
+     $ augmentPathMap (toFilePath <$> paths.bins) (view envVarsL menv0)
+  menv <- mkProcessContext (removeHaskellEnvVars m)
+
+  names <-
+    case wanted of
+      WCGhc version -> pure ["ghc-" ++ versionString version, "ghc"]
+      WCGhcGit{} -> pure ["ghc"]
+      WCGhcjs{} -> throwIO GhcjsNotSupported
+
+  -- Previously, we used findExecutable to locate these executables. This was
+  -- actually somewhat sloppy, as it could discover executables outside of the
+  -- sandbox. This led to a specific issue on Windows with GHC 9.0.1. See
+  -- https://gitlab.haskell.org/ghc/ghc/-/issues/20074. Instead, now, we look
+  -- on the paths specified only.
+  let loop [] = prettyThrowIO $ SandboxedCompilerNotFound names paths.bins
+      loop (x:xs) = do
+        res <- liftIO $
+          D.findExecutablesInDirectories (map toFilePath paths.bins) x
+        case res of
+          [] -> loop xs
+          compiler:rest -> do
+            unless (null rest) $ do
+              prettyWarn $
+                   flow "Found multiple candidate compilers:"
+                <> line
+                <> bulletedList (map fromString res)
+                <> blankLine
+                <> fillSep
+                     [ flow "This usually indicates a failed installation. \
+                        \Trying anyway with"
+                     , fromString compiler
+                     ]
+            parseAbsFile compiler
+  compiler <- withProcessContext menv $ do
+    compiler <- loop names
+
+    -- Run this here to ensure that the sanity check uses the modified
+    -- environment, otherwise we may infect GHC_PACKAGE_PATH and break sanity
+    -- checks.
+    when sopts.sanityCheck $ sanityCheck compiler
+
+    pure compiler
+
+  cp <- pathsFromCompiler wc compilerBuild True compiler
+  pure (cp, paths)
+
+pathsFromCompiler ::
+     forall env. HasConfig env
   => WhichCompiler
   -> CompilerBuild
   -> Bool
   -> Path Abs File -- ^ executable filepath
   -> RIO env CompilerPaths
-pathsFromCompiler wc compilerBuild isSandboxed compiler = withCache $ handleAny onErr $ do
+pathsFromCompiler wc build sandboxed compiler =
+  withCache $ handleAny onErr $ do
     let dir = toFilePath $ parent compiler
+
         suffixNoVersion
           | osIsWindows = ".exe"
           | otherwise = ""
@@ -786,15 +1447,21 @@ pathsFromCompiler wc compilerBuild isSandboxed compiler = withCache $ handleAny
         suffixes = maybe id (:) msuffixWithVersion [suffixNoVersion]
         findHelper :: (WhichCompiler -> [String]) -> RIO env (Path Abs File)
         findHelper getNames = do
-          let toTry = [dir ++ name ++ suffix | suffix <- suffixes, name <- getNames wc]
-              loop [] = throwString $ "Could not find any of: " <> show toTry
-              loop (guessedPath':rest) = do
-                guessedPath <- parseAbsFile guessedPath'
+          toTry <- mapM
+                     parseAbsFile
+                     [ dir ++ name ++ suffix
+                     | suffix <- suffixes, name <- getNames wc
+                     ]
+          let loop [] = throwIO $ PrettyException $ ExecutableNotFound toTry
+              loop (guessedPath:rest) = do
                 exists <- doesFileExist guessedPath
                 if exists
                   then pure guessedPath
                   else loop rest
-          logDebug $ "Looking for executable(s): " <> displayShow toTry
+          prettyDebug $
+               flow "Looking for executable(s):"
+            <> line
+            <> bulletedList (map pretty toTry)
           loop toTry
     pkg <- fmap GhcPkgExe $ findHelper $ \case
                                Ghc -> ["ghc-pkg"]
@@ -808,267 +1475,393 @@ pathsFromCompiler wc compilerBuild isSandboxed compiler = withCache $ handleAny
     haddock <- findHelper $
                \case
                   Ghc -> ["haddock", "haddock-ghc"]
-    infobs <- proc (toFilePath compiler) ["--info"]
+    ghcInfo <- proc (toFilePath compiler) ["--info"]
             $ fmap (toStrictBytes . fst) . readProcess_
     infotext <-
-      case decodeUtf8' infobs of
-        Left e -> throwString $ "GHC info is not valid UTF-8: " ++ show e
+      case decodeUtf8' ghcInfo of
+        Left e -> prettyThrowIO $ GHCInfoNotValidUTF8 e
         Right info -> pure info
     infoPairs :: [(String, String)] <-
       case readMaybe $ T.unpack infotext of
-        Nothing -> throwString "GHC info does not parse as a list of pairs"
+        Nothing -> prettyThrowIO GHCInfoNotListOfPairs
         Just infoPairs -> pure infoPairs
     let infoMap = Map.fromList infoPairs
 
     eglobaldb <- tryAny $
       case Map.lookup "Global Package DB" infoMap of
-        Nothing -> throwString "Key 'Global Package DB' not found in GHC info"
+        Nothing -> prettyThrowIO GHCInfoMissingGlobalPackageDB
         Just db -> parseAbsDir db
 
     arch <-
       case Map.lookup "Target platform" infoMap of
-        Nothing -> throwString "Key 'Target platform' not found in GHC info"
+        Nothing -> prettyThrowIO GHCInfoMissingTargetPlatform
         Just targetPlatform ->
           case simpleParse $ takeWhile (/= '-') targetPlatform of
-            Nothing -> throwString $ "Invalid target platform in GHC info: " ++ show targetPlatform
+            Nothing ->
+              prettyThrowIO $ GHCInfoTargetPlatformInvalid targetPlatform
             Just arch -> pure arch
-    compilerVer <-
+    compilerVersion <-
       case wc of
         Ghc ->
           case Map.lookup "Project version" infoMap of
             Nothing -> do
-              logWarn "Key 'Project version' not found in GHC info"
+              prettyWarnS "Key 'Project version' not found in GHC info."
               getCompilerVersion wc compiler
             Just versionString' -> ACGhc <$> parseVersionThrowing versionString'
-    globaldb <-
+    globalDB <-
       case eglobaldb of
         Left e -> do
-          logWarn "Parsing global DB from GHC info failed"
-          logWarn $ displayShow e
-          logWarn "Asking ghc-pkg directly"
+          prettyWarn $
+               flow "Stack failed to parse the global DB from GHC info."
+            <> blankLine
+            <> flow "While parsing, Stack encountered the error:"
+            <> blankLine
+            <> string (show e)
+            <> blankLine
+            <> flow "Asking ghc-pkg directly."
           withProcessContext menv $ getGlobalDB pkg
         Right x -> pure x
 
     globalDump <- withProcessContext menv $ globalsFromDump pkg
-    cabalPkgVer <-
+    cabalVersion <-
       case Map.lookup cabalPackageName globalDump of
-        Nothing -> throwString $ "Cabal library not found in global package database for " ++ toFilePath compiler
-        Just dp -> pure $ pkgVersion $ dpPackageIdent dp
+        Nothing -> prettyThrowIO $ CabalNotFound compiler
+        Just dp -> pure $ pkgVersion dp.packageIdent
 
     pure CompilerPaths
-      { cpBuild = compilerBuild
-      , cpArch = arch
-      , cpSandboxed = isSandboxed
-      , cpCompilerVersion = compilerVer
-      , cpCompiler = compiler
-      , cpPkg = pkg
-      , cpInterpreter = interpreter
-      , cpHaddock = haddock
-      , cpCabalVersion = cabalPkgVer
-      , cpGlobalDB = globaldb
-      , cpGhcInfo = infobs
-      , cpGlobalDump = globalDump
+      { build
+      , arch
+      , sandboxed
+      , compilerVersion
+      , compiler
+      , pkg
+      , interpreter
+      , haddock
+      , cabalVersion
+      , globalDB
+      , ghcInfo
+      , globalDump
       }
-  where
-    onErr = throwIO . InvalidGhcAt compiler
+ where
+  onErr = throwIO . PrettyException . InvalidGhcAt compiler
 
-    withCache inner = do
-      eres <- tryAny $ loadCompilerPaths compiler compilerBuild isSandboxed
-      mres <-
-        case eres of
-          Left e -> do
-            logWarn $ "Trouble loading CompilerPaths cache: " <> displayShow e
-            pure Nothing
-          Right x -> pure x
-      case mres of
-        Just cp -> cp <$ logDebug "Loaded compiler information from cache"
-        Nothing -> do
-          cp <- inner
-          saveCompilerPaths cp `catchAny` \e ->
-            logWarn ("Unable to save CompilerPaths cache: " <> displayShow e)
-          pure cp
-
-buildGhcFromSource :: forall env.
-   ( HasTerm env
-   , HasProcessContext env
-   , HasBuildConfig env
-   ) => Memoized SetupInfo -> [Tool] -> CompilerRepository -> Text -> Text
-   -> RIO env (Tool, CompilerBuild)
-buildGhcFromSource getSetupInfo' installed (CompilerRepository url) commitId flavour = do
-   config <- view configL
-   let compilerTool = ToolGhcGit commitId flavour
-
-   -- detect when the correct GHC is already installed
-   if compilerTool `elem` installed
-     then pure (compilerTool,CompilerBuildStandard)
-     else do
-       -- clone the repository and execute the given commands
-       Pantry.withRepo (Pantry.SimpleRepo url commitId RepoGit) $ do
-         -- withRepo is guaranteed to set workingDirL, so let's get it
-         mcwd <- traverse parseAbsDir =<< view workingDirL
-         let cwd = fromMaybe (error "Invalid working directory") mcwd
-
-         threads <- view $ configL.to configJobs
-         let
-           hadrianArgs = fmap T.unpack
-               [ "-c"                    -- run ./boot and ./configure
-               , "-j" <> tshow threads   -- parallel build
-               , "--flavour=" <> flavour -- selected flavour
-               , "binary-dist"
-               ]
-           hadrianScripts
-             | osIsWindows = hadrianScriptsWindows
-             | otherwise   = hadrianScriptsPosix
-
-         foundHadrianPaths <- filterM doesFileExist $ (cwd </>) <$> hadrianScripts
-         hadrianPath <- maybe (throwString "No Hadrian build script found") pure $ listToMaybe foundHadrianPaths
-
-         logSticky $ "Building GHC from source with `"
-            <> RIO.display flavour
+  withCache inner = do
+    eres <- tryAny $ loadCompilerPaths compiler build sandboxed
+    mres <-
+      case eres of
+        Left e -> do
+          prettyWarn $
+               flow "Trouble loading CompilerPaths cache:"
+            <> blankLine
+            <> string (displayException e)
+          pure Nothing
+        Right x -> pure x
+    case mres of
+      Just cp -> cp <$ logDebug "Loaded compiler information from cache"
+      Nothing -> do
+        cp <- inner
+        saveCompilerPaths cp `catchAny` \e ->
+          prettyWarn $
+               flow "Unable to save CompilerPaths cache:"
+            <> blankLine
+            <> string (displayException e)
+        pure cp
+
+buildGhcFromSource ::
+     forall env. ( HasTerm env, HasProcessContext env, HasBuildConfig env)
+  => Memoized SetupInfo
+  -> [Tool]
+  -> CompilerRepository
+  -> CompilerTarget
+     -- ^ The Hadrian build target.
+  -> CompilerBindistPath
+     -- ^ The Hadrian path to the built binary distribution.
+  -> Text
+     -- ^ Commit ID.
+  -> Text
+     -- ^ Hadrain flavour.
+  -> RIO (WithMSYS env) (Tool, CompilerBuild)
+buildGhcFromSource
+    getSetupInfo'
+    installed
+    (CompilerRepository url)
+    (CompilerTarget hadrianBuildTarget)
+    (CompilerBindistPath hadrianBindistPath)
+    commitId
+    flavour
+  = do
+    config <- view configL
+    let compilerTool = ToolGhcGit commitId flavour
+    -- detect when the correct GHC is already installed
+    if compilerTool `elem` installed
+      then pure (compilerTool, CompilerBuildStandard)
+      else
+        -- clone the repository and execute the given commands
+        withRepo (SimpleRepo url commitId RepoGit) $ do
+          -- withRepo is guaranteed to set workingDirL, so let's get it
+          mcwd <- traverse parseAbsDir =<< view workingDirL
+          cwd <- maybe (throwIO WorkingDirectoryInvalidBug) pure mcwd
+          let threads = config.jobs
+              relFileHadrianStackDotYaml' = toFilePath relFileHadrianStackDotYaml
+              ghcBootScriptPath = cwd </> ghcBootScript
+              boot = if osIsWindows
+                then proc "python3" ["boot"] runProcess_
+                else
+                  proc (toFilePath ghcBootScriptPath) [] runProcess_
+              stack args = proc "stack" args'' runProcess_
+               where
+                args'' = "--stack-yaml=" <> relFileHadrianStackDotYaml' : args'
+                -- If a snapshot is specified on the command line, Stack will
+                -- apply it. This allows the snapshot specified in Hadrian's
+                -- stack.yaml file to be overridden.
+                args' = maybe args addSnapshot config.snapshot
+                addSnapshot snapshot = "--snapshot=" <> show snapshot : args
+              happy = stack ["install", "happy"]
+              alex = stack ["install", "alex"]
+              -- Executed in the Stack environment, because GHC is required.
+              configure = stack ("exec" : "--" : ghcConfigure)
+              ghcConfigure
+                | osIsWindows = ghcConfigureWindows
+                | osIsMacOS = ghcConfigureMacOS
+                | otherwise   = ghcConfigurePosix
+              hadrianScripts
+                | osIsWindows = hadrianScriptsWindows
+                | otherwise   = hadrianScriptsPosix
+              hadrianArgs = fmap T.unpack
+                [ "-j" <> tshow threads   -- parallel build
+                , "--flavour=" <> flavour -- selected flavour
+                , hadrianBuildTarget
+                ]
+          foundHadrianPaths <-
+            filterM doesFileExist $ (cwd </>) <$> hadrianScripts
+          hadrianPath <- maybe (prettyThrowIO HadrianScriptNotFound) pure $
+            listToMaybe foundHadrianPaths
+          exists <- doesFileExist ghcBootScriptPath
+          unless exists $ prettyThrowIO GhcBootScriptNotFound
+          ensureConfigureScript cwd
+          logInfo "Running GHC boot script..."
+          boot
+          doesExecutableExist "happy" >>= \case
+            True -> logInfo "happy executable installed on the PATH."
+            False -> do
+              logInfo "Installing happy executable..."
+              happy
+          doesExecutableExist "alex" >>= \case
+            True -> logInfo "alex executable installed on the PATH."
+            False -> do
+              logInfo "Installing alex executable..."
+              alex
+          logInfo "Running GHC configure script..."
+          configure
+          logSticky $
+               "Building GHC from source with `"
+            <> display flavour
             <> "` flavour. It can take a long time (more than one hour)..."
-
-         -- We need to provide an absolute path to the script since
-         -- the process package only sets working directory _after_
-         -- discovering the executable
-         proc (toFilePath hadrianPath) hadrianArgs runProcess_
-
-         -- find the bindist and install it
-         bindistPath <- parseRelDir "_build/bindist"
-         (_,files) <- listDir (cwd </> bindistPath)
-         let
-           isBindist p = do
-             extension <- fileExtension (filename p)
-
-             pure $ "ghc-" `isPrefixOf` (toFilePath (filename p))
-                         && extension == ".xz"
-
-         mbindist <- filterM isBindist files
-         case mbindist of
-           [bindist] -> do
-               let bindist' = T.pack (toFilePath bindist)
-                   dlinfo = DownloadInfo
-                             { downloadInfoUrl           = bindist'
-                               -- we can specify a filepath instead of a URL
-                             , downloadInfoContentLength = Nothing
-                             , downloadInfoSha1          = Nothing
-                             , downloadInfoSha256        = Nothing
-                             }
-                   ghcdlinfo = GHCDownloadInfo mempty mempty dlinfo
-                   installer
-                      | osIsWindows = installGHCWindows
-                      | otherwise   = installGHCPosix ghcdlinfo
-               si <- runMemoized getSetupInfo'
-               _ <- downloadAndInstallTool
-                 (configLocalPrograms config)
-                 dlinfo
-                 compilerTool
-                 (installer si)
-               pure (compilerTool, CompilerBuildStandard)
-           _ -> do
+          -- We need to provide an absolute path to the script since the process
+          -- package only sets working directory _after_ discovering the
+          -- executable.
+          proc (toFilePath hadrianPath) hadrianArgs runProcess_
+
+          -- find the bindist and install it
+          bindistPath <- parseRelDir (T.unpack hadrianBindistPath)
+          (_,files) <- listDir (cwd </> bindistPath)
+          let isBindist p = do
+                extension <- fileExtension (filename p)
+
+                pure $
+                     "ghc-" `isPrefixOf` toFilePath (filename p)
+                  && extension == ".xz"
+
+          filterM isBindist files >>= \case
+            [bindist] -> do
+              let bindist' = T.pack (toFilePath bindist)
+                  dlinfo = DownloadInfo
+                    { url = bindist'
+                      -- we can specify a filepath instead of a URL
+                    , contentLength = Nothing
+                    , sha1 = Nothing
+                    , sha256 = Nothing
+                    }
+                  ghcdlinfo = GHCDownloadInfo mempty mempty dlinfo
+                  installer
+                     | osIsWindows = installGHCWindows
+                     | otherwise   = installGHCPosix ghcdlinfo
+              si <- runMemoized getSetupInfo'
+              _ <- downloadAndInstallTool
+                config.localPrograms
+                dlinfo
+                compilerTool
+                (installer si)
+              pure (compilerTool, CompilerBuildStandard)
+            _ -> do
               forM_ files (logDebug . fromString . (" - " ++) . toFilePath)
-              error "Can't find hadrian generated bindist"
-
+              prettyThrowIO HadrianBindistNotFound
 
--- | Determine which GHC builds to use depending on which shared libraries are available
--- on the system.
+-- | Determine which GHC builds to use depending on which shared libraries are
+-- available on the system.
 getGhcBuilds :: HasConfig env => RIO env [CompilerBuild]
 getGhcBuilds = do
-
-    config <- view configL
-    case configGHCBuild config of
-        Just ghcBuild -> pure [ghcBuild]
-        Nothing -> determineGhcBuild
-  where
-    determineGhcBuild = do
-        -- TODO: a more reliable, flexible, and data driven approach would be to actually download small
-        -- "test" executables (from setup-info) that link to the same gmp/tinfo versions
-        -- that GHC does (i.e. built in same environment as the GHC bindist). The algorithm would go
-        -- something like this:
-        --
-        -- check for previous 'uname -a'/`ldconfig -p` plus compiler version/variant in cache
-        -- if cached, then use that as suffix
-        -- otherwise:
-        --     download setup-info
-        --     go through all with right prefix for os/version/variant
-        --     first try "standard" (no extra suffix), then the rest
-        --         download "compatibility check" exe if not already downloaded
-        --         try running it
-        --         if successful, then choose that
-        --             cache compiler suffix with the uname -a and ldconfig -p output hash plus compiler version
-        --
-        -- Of course, could also try to make a static GHC bindist instead of all this rigamarole.
-
-        platform <- view platformL
-        case platform of
-            Platform _ Cabal.Linux -> do
-                -- Some systems don't have ldconfig in the PATH, so make sure to look in /sbin and /usr/sbin as well
-                let sbinEnv m = Map.insert
-                      "PATH"
-                      ("/sbin:/usr/sbin" <> maybe "" (":" <>) (Map.lookup "PATH" m))
-                      m
-                eldconfigOut
-                  <- withModifyEnvVars sbinEnv
-                   $ proc "ldconfig" ["-p"]
-                   $ tryAny . fmap fst . readProcess_
-                let firstWords = case eldconfigOut of
-                        Right ldconfigOut -> mapMaybe (listToMaybe . T.words) $
-                            T.lines $ T.decodeUtf8With T.lenientDecode
-                                    $ LBS.toStrict ldconfigOut
-                        Left _ -> []
-                    checkLib lib
-                        | libT `elem` firstWords = do
-                            logDebug ("Found shared library " <> libD <> " in 'ldconfig -p' output")
-                            pure True
-                        | osIsWindows =
-                            -- Cannot parse /usr/lib on Windows
-                            pure False
-                        | otherwise = do
-                        -- This is a workaround for the fact that libtinfo.so.x doesn't appear in
-                        -- the 'ldconfig -p' output on Arch or Slackware even when it exists.
-                        -- There doesn't seem to be an easy way to get the true list of directories
-                        -- to scan for shared libs, but this works for our particular cases.
-                            matches <- filterM (doesFileExist .(</> lib)) usrLibDirs
-                            case matches of
-                                [] -> logDebug ("Did not find shared library " <> libD)
-                                    >> pure False
-                                (path:_) -> logDebug ("Found shared library " <> libD
-                                        <> " in " <> fromString (Path.toFilePath path))
-                                    >> pure True
-                      where
-                        libT = T.pack (toFilePath lib)
-                        libD = fromString (toFilePath lib)
-                hastinfo5 <- checkLib relFileLibtinfoSo5
-                hastinfo6 <- checkLib relFileLibtinfoSo6
-                hasncurses6 <- checkLib relFileLibncurseswSo6
-                hasgmp5 <- checkLib relFileLibgmpSo10
-                hasgmp4 <- checkLib relFileLibgmpSo3
-                let libComponents = concat
-                        [ [["tinfo6"] | hastinfo6 && hasgmp5]
-                        , [[] | hastinfo5 && hasgmp5]
-                        , [["ncurses6"] | hasncurses6 && hasgmp5 ]
-                        , [["gmp4"] | hasgmp4 ]
-                        ]
-                useBuilds $ map
-                    (\c -> case c of
-                        [] -> CompilerBuildStandard
-                        _ -> CompilerBuildSpecialized (intercalate "-" c))
-                    libComponents
-            Platform _ Cabal.FreeBSD -> do
-                let getMajorVer = readMaybe <=< headMaybe . (splitOn ".")
-                majorVer <- getMajorVer <$> sysRelease
-                if majorVer >= Just (12 :: Int) then
-                  useBuilds [CompilerBuildSpecialized "ino64"]
-                else
-                  useBuilds [CompilerBuildStandard]
-            Platform _ Cabal.OpenBSD -> do
-                releaseStr <- mungeRelease <$> sysRelease
-                useBuilds [CompilerBuildSpecialized releaseStr]
-            _ -> useBuilds [CompilerBuildStandard]
-    useBuilds builds = do
-        logDebug $
-          "Potential GHC builds: " <>
-          mconcat (intersperse ", " (map (fromString . compilerBuildName) builds))
-        pure builds
+  config <- view configL
+  case config.ghcBuild of
+    Just ghcBuild -> pure [ghcBuild]
+    Nothing -> determineGhcBuild
+ where
+  -- The GHCup project is also interested in the algorithm below, as it copies
+  -- it at GHCup.Platform.getStackGhcBuilds. If you change this algorithm, it
+  -- would be a courtesy to bring that to the attention of the GHCup project
+  -- maintainers.
+  determineGhcBuild = do
+    -- TODO: a more reliable, flexible, and data driven approach would be to
+    -- actually download small "test" executables (from setup-info) that link to
+    -- the same gmp/tinfo versions that GHC does (i.e. built in same environment
+    -- as the GHC bindist). The algorithm would go something like this:
+    --
+    -- check for previous 'uname -a'/`ldconfig -p` plus compiler version/variant
+    -- in cache.
+    -- if cached, then use that as suffix
+    -- otherwise:
+    --     download setup-info
+    --     go through all with right prefix for os/version/variant
+    --     first try "standard" (no extra suffix), then the rest
+    --         download "compatibility check" exe if not already downloaded
+    --         try running it
+    --         if successful, then choose that
+    --             cache compiler suffix with the uname -a and
+    --               ldconfig -p output hash plus compiler version
+    --
+    -- Of course, could also try to make a static GHC bindist instead of all
+    -- this rigamarole.
+
+    view platformL >>= \case
+      Platform _ Cabal.Linux -> do
+        -- Some systems don't have ldconfig in the PATH, so make sure to look in
+        -- /sbin and /usr/sbin as well
+        let sbinEnv m = Map.insert
+              "PATH"
+              ("/sbin:/usr/sbin" <> maybe "" (":" <>) (Map.lookup "PATH" m))
+              m
+        eldconfigOut <- withModifyEnvVars sbinEnv
+          $ proc "ldconfig" ["-p"]
+          $ tryAny . fmap fst . readProcess_
+        let firstWords = case eldconfigOut of
+              Right ldconfigOut -> mapMaybe (listToMaybe . T.words) $
+                T.lines $ T.decodeUtf8With T.lenientDecode
+                        $ LBS.toStrict ldconfigOut
+              Left _ -> []
+            checkLib lib
+              | libT `elem` firstWords = do
+                  logDebug $
+                       "Found shared library "
+                    <> libD
+                    <> " in 'ldconfig -p' output"
+                  pure True
+              | osIsWindows =
+                  -- Cannot parse /usr/lib on Windows
+                  pure False
+              | otherwise = hasMatches lib usrLibDirs
+              -- This is a workaround for the fact that libtinfo.so.x doesn't
+              -- appear in the 'ldconfig -p' output on Arch or Slackware even
+              -- when it exists. There doesn't seem to be an easy way to get the
+              -- true list of directories to scan for shared libs, but this
+              -- works for our particular cases.
+             where
+              libD = fromString (toFilePath lib)
+              libT = T.pack (toFilePath lib)
+            hasMatches lib dirs = do
+              filterM (doesFileExist . (</> lib)) dirs >>= \case
+                [] ->
+                     logDebug
+                       (  "Did not find shared library "
+                       <> libD
+                       )
+                  >> pure False
+                (path:_) ->
+                     logDebug
+                       (  "Found shared library "
+                       <> libD
+                       <> " in "
+                       <> fromString (Path.toFilePath path)
+                       )
+                  >> pure True
+             where
+              libD = fromString (toFilePath lib)
+            getLibc6Version =
+              -- On Alpine Linux, 'ldd --version' will send output to stderr,
+              -- which we wish to smother.
+              proc "ldd" ["--version"] (tryAny . readProcess_) <&> \case
+                Right (lddOut, _) ->
+                  let lddOut' = decodeUtf8Lenient (LBS.toStrict lddOut)
+                  in  case P.parse lddVersion lddOut' of
+                        P.Done _ result -> Just result
+                        _ -> Nothing
+                Left _ -> Nothing
+            -- Assumes the first line of ldd has the format:
+            --
+            -- ldd (...) nn.nn
+            --
+            -- where nn.nn corresponds to the version of libc6.
+            lddVersion :: P.Parser Version
+            lddVersion = do
+              P.skipWhile (/= ')')
+              P.skip (== ')')
+              P.skipSpace
+              lddMajorVersion <- P.decimal
+              P.skip (== '.')
+              lddMinorVersion <- P.decimal
+              P.skip (not . isDigit)
+              pure $ mkVersion [ lddMajorVersion, lddMinorVersion ]
+        hasMusl <- hasMatches relFileLibcMuslx86_64So1 libDirs
+        mLibc6Version <- getLibc6Version
+        case mLibc6Version of
+          Just libc6Version -> logDebug $
+               "Found shared library libc6 in version: "
+            <> fromString (versionString libc6Version)
+          Nothing -> logDebug
+            "Did not find a version of shared library libc6."
+        let hasLibc6_2_32 =
+              maybe False (>= mkVersion [2 , 32]) mLibc6Version
+        hastinfo5 <- checkLib relFileLibtinfoSo5
+        hastinfo6 <- checkLib relFileLibtinfoSo6
+        hasncurses6 <- checkLib relFileLibncurseswSo6
+        hasgmp5 <- checkLib relFileLibgmpSo10
+        hasgmp4 <- checkLib relFileLibgmpSo3
+        let libComponents = if hasMusl
+              then
+                [ ["musl"] ]
+              else
+                concat
+                  [ if hastinfo6 && hasgmp5
+                      then
+                        if hasLibc6_2_32
+                          then [["tinfo6"]]
+                          else [["tinfo6-libc6-pre232"]]
+                      else [[]]
+                  , [ [] | hastinfo5 && hasgmp5 ]
+                  , [ ["ncurses6"] | hasncurses6 && hasgmp5 ]
+                  , [ ["gmp4"] | hasgmp4 ]
+                  ]
+        useBuilds $ map
+          (\c -> case c of
+            [] -> CompilerBuildStandard
+            _ -> CompilerBuildSpecialized (intercalate "-" c))
+          libComponents
+      Platform _ Cabal.FreeBSD -> do
+        let getMajorVer = readMaybe <=< headMaybe . splitOn "."
+        majorVer <- getMajorVer <$> sysRelease
+        if majorVer >= Just (12 :: Int)
+          then
+            useBuilds [CompilerBuildSpecialized "ino64"]
+          else
+            useBuilds [CompilerBuildStandard]
+      Platform _ Cabal.OpenBSD -> do
+        releaseStr <- mungeRelease <$> sysRelease
+        useBuilds [CompilerBuildSpecialized releaseStr]
+      _ -> useBuilds [CompilerBuildStandard]
+  useBuilds builds = do
+    logDebug $
+         "Potential GHC builds: "
+      <> mconcat (intersperse ", " (map (fromString . compilerBuildName) builds))
+    pure builds
 
 -- | Encode an OpenBSD version (like "6.1") into a valid argument for
 -- CompilerBuildSpecialized, so "maj6-min1". Later version numbers are prefixed
@@ -1077,42 +1870,54 @@ getGhcBuilds = do
 -- as recognized by parsePackageNameFromString.
 mungeRelease :: String -> String
 mungeRelease = intercalate "-" . prefixMaj . splitOn "."
-  where
-    prefixFst pfx k (rev : revs) = (pfx ++ rev) : k revs
-    prefixFst _ _ [] = []
-    prefixMaj = prefixFst "maj" prefixMin
-    prefixMin = prefixFst "min" (map ('r':))
+ where
+  prefixFst pfx k (rev : revs) = (pfx ++ rev) : k revs
+  prefixFst _ _ [] = []
+  prefixMaj = prefixFst "maj" prefixMin
+  prefixMin = prefixFst "min" (map ('r':))
 
-sysRelease :: HasLogFunc env => RIO env String
+sysRelease :: HasTerm env => RIO env String
 sysRelease =
-  handleIO (\e -> do
-               logWarn $ "Could not query OS version: " <> displayShow e
-               pure "")
-  (liftIO getRelease)
-
--- | Ensure Docker container-compatible 'stack' executable is downloaded
+  handleIO
+    ( \e -> do
+        prettyWarn $
+             flow "Could not query OS version:"
+          <> blankLine
+          <> string (displayException e)
+        pure ""
+    )
+    (liftIO getRelease)
+
+-- | Ensure Docker container-compatible \'stack\' executable is downloaded
 ensureDockerStackExe :: HasConfig env => Platform -> RIO env (Path Abs File)
 ensureDockerStackExe containerPlatform = do
-    config <- view configL
-    containerPlatformDir <- runReaderT platformOnlyRelDir (containerPlatform,PlatformVariantNone)
-    let programsPath = configLocalProgramsBase config </> containerPlatformDir
-        tool = Tool (PackageIdentifier (mkPackageName "stack") stackVersion)
-    stackExeDir <- installDir programsPath tool
-    let stackExePath = stackExeDir </> relFileStack
-    stackExeExists <- doesFileExist stackExePath
-    unless stackExeExists $ do
-        logInfo $
-          "Downloading Docker-compatible " <>
-          fromString stackProgName <>
-          " executable"
-        sri <- downloadStackReleaseInfo Nothing Nothing (Just (versionString stackMinorVersion))
-        platforms <- runReaderT preferredPlatforms (containerPlatform, PlatformVariantNone)
-        downloadStackExe platforms sri stackExeDir False (const $ pure ())
-    pure stackExePath
+  config <- view configL
+  containerPlatformDir <-
+    runReaderT platformOnlyRelDir (containerPlatform,PlatformVariantNone)
+  let programsPath = config.localProgramsBase </> containerPlatformDir
+      tool = Tool (PackageIdentifier (mkPackageName "stack") stackVersion)
+  stackExeDir <- installDir programsPath tool
+  let stackExePath = stackExeDir </> relFileStack
+  stackExeExists <- doesFileExist stackExePath
+  unless stackExeExists $ do
+    prettyInfoL
+      [ flow "Downloading Docker-compatible"
+      , fromString stackProgName
+      , "executable."
+      ]
+    sri <-
+      downloadStackReleaseInfo
+        Nothing
+        Nothing
+        (Just (versionString stackMinorVersion))
+    platforms <-
+      runReaderT preferredPlatforms (containerPlatform, PlatformVariantNone)
+    downloadStackExe platforms sri stackExeDir False (const $ pure ())
+  pure stackExePath
 
 -- | Get all executables on the path that might match the wanted compiler
-sourceSystemCompilers
-  :: (HasProcessContext env, HasLogFunc env)
+sourceSystemCompilers ::
+     (HasLogFunc env, HasProcessContext env)
   => WantedCompiler
   -> ConduitT i (Path Abs File) (RIO env) ()
 sourceSystemCompilers wanted = do
@@ -1129,1042 +1934,1090 @@ sourceSystemCompilers wanted = do
     fp <- resolveFile' $ addExe $ dir FP.</> name
     exists <- doesFileExist fp
     when exists $ yield fp
-  where
-    addExe
-      | osIsWindows = (++ ".exe")
-      | otherwise = id
+ where
+  addExe
+    | osIsWindows = (++ ".exe")
+    | otherwise = id
 
 -- | Download the most recent SetupInfo
 getSetupInfo :: HasConfig env => RIO env SetupInfo
 getSetupInfo = do
-    config <- view configL
-    let inlineSetupInfo = configSetupInfoInline config
-        locations' = configSetupInfoLocations config
-        locations = if null locations' then [defaultSetupInfoYaml] else locations'
-
-    resolvedSetupInfos <- mapM loadSetupInfo locations
-    pure (inlineSetupInfo <> mconcat resolvedSetupInfos)
-  where
-    loadSetupInfo urlOrFile = do
-      bs <-
-          case parseUrlThrow urlOrFile of
-              Just req -> liftM (LBS.toStrict . getResponseBody) $ httpLbs req
-              Nothing -> liftIO $ S.readFile urlOrFile
-      WithJSONWarnings si warnings <- either throwM pure (Yaml.decodeEither' bs)
-      when (urlOrFile /= defaultSetupInfoYaml) $
-          logJSONWarnings urlOrFile warnings
-      pure si
-
-getInstalledTool :: [Tool]            -- ^ already installed
-                 -> PackageName       -- ^ package to find
-                 -> (Version -> Bool) -- ^ which versions are acceptable
-                 -> Maybe Tool
+  config <- view configL
+  let inlineSetupInfo = config.setupInfoInline
+      locations' = config.setupInfoLocations
+      locations = if null locations' then [defaultSetupInfoYaml] else locations'
+
+  resolvedSetupInfos <- mapM loadSetupInfo locations
+  pure (inlineSetupInfo <> mconcat resolvedSetupInfos)
+ where
+  loadSetupInfo urlOrFile = do
+    bs <- case parseUrlThrow urlOrFile of
+            Just req -> LBS.toStrict . getResponseBody <$> httpLbs req
+            Nothing -> liftIO $ S.readFile urlOrFile
+    WithJSONWarnings si warnings <- either throwM pure (Yaml.decodeEither' bs)
+    when (urlOrFile /= defaultSetupInfoYaml) $
+      logJSONWarnings urlOrFile warnings
+    pure si
+
+getInstalledTool ::
+     [Tool]            -- ^ already installed
+  -> PackageName       -- ^ package to find
+  -> (Version -> Bool) -- ^ which versions are acceptable
+  -> Maybe Tool
 getInstalledTool installed name goodVersion = Tool <$>
   maximumByMaybe (comparing pkgVersion) (filterTools name goodVersion installed)
 
-downloadAndInstallTool :: (HasTerm env, HasBuildConfig env)
-                       => Path Abs Dir
-                       -> DownloadInfo
-                       -> Tool
-                       -> (Path Abs File -> ArchiveType -> Path Abs Dir -> Path Abs Dir -> RIO env ())
-                       -> RIO env Tool
+-- | Obtain and install the specified tool, using the specified download
+-- information and installer. Also deletes the archive file for the tool after
+-- installation.
+downloadAndInstallTool ::
+     (HasTerm env, HasBuildConfig env)
+  => Path Abs Dir
+     -- ^ Location of the directory for tools.
+  -> DownloadInfo
+     -- ^ Information about the file to obtain.
+  -> Tool
+     -- ^ The tool in question.
+  -> (  Path Abs File
+        -- Location of archive file.
+     -> ArchiveType
+        -- Type of archive file.
+     -> Path Abs Dir
+        -- Tempory directory to use.
+     -> Path Abs Dir
+        -- Destination directory for installed tool.
+     -> RIO env ()
+     )
+     -- ^ Installer.
+  -> RIO env Tool
 downloadAndInstallTool programsDir downloadInfo tool installer = do
-    ensureDir programsDir
-    (file, at) <- downloadFromInfo programsDir downloadInfo tool
-    dir <- installDir programsDir tool
-    tempDir <- tempInstallDir programsDir tool
-    liftIO $ ignoringAbsence (removeDirRecur tempDir)
-    ensureDir tempDir
-    unmarkInstalled programsDir tool
-    installer file at tempDir dir
-    markInstalled programsDir tool
-    liftIO $ ignoringAbsence (removeDirRecur tempDir)
-    pure tool
-
-downloadAndInstallCompiler :: (HasBuildConfig env, HasGHCVariant env)
-                           => CompilerBuild
-                           -> SetupInfo
-                           -> WantedCompiler
-                           -> VersionCheck
-                           -> Maybe String
-                           -> RIO env Tool
+  ensureDir programsDir
+  (file, at) <- downloadFromInfo programsDir downloadInfo tool
+  dir <- installDir programsDir tool
+  tempDir <- tempInstallDir programsDir tool
+  liftIO $ ignoringAbsence (removeDirRecur tempDir)
+  ensureDir tempDir
+  unmarkInstalled programsDir tool
+  installer file at tempDir dir
+  markInstalled programsDir tool
+  liftIO $ ignoringAbsence (removeDirRecur tempDir)
+  liftIO $ ignoringAbsence (removeFile file)
+  pure tool
+
+-- Exceptions thrown by this function are caught by
+-- 'downloadAndInstallPossibleCompilers'.
+downloadAndInstallCompiler ::
+     (HasBuildConfig env, HasGHCVariant env)
+  => CompilerBuild
+  -> SetupInfo
+  -> WantedCompiler
+  -> VersionCheck
+  -> Maybe String
+  -> RIO env Tool
 downloadAndInstallCompiler ghcBuild si wanted@(WCGhc version) versionCheck mbindistURL = do
-    ghcVariant <- view ghcVariantL
-    (selectedVersion, downloadInfo) <- case mbindistURL of
-        Just bindistURL -> do
-            case ghcVariant of
-                GHCCustom _ -> pure ()
-                _ -> throwM RequireCustomGHCVariant
-            pure (version, GHCDownloadInfo mempty mempty DownloadInfo
-                     { downloadInfoUrl = T.pack bindistURL
-                     , downloadInfoContentLength = Nothing
-                     , downloadInfoSha1 = Nothing
-                     , downloadInfoSha256 = Nothing
-                     })
-        _ -> do
-            ghcKey <- getGhcKey ghcBuild
-            case Map.lookup ghcKey $ siGHCs si of
-                Nothing -> throwM $ UnknownOSKey ghcKey
-                Just pairs_ -> getWantedCompilerInfo ghcKey versionCheck wanted ACGhc pairs_
-    config <- view configL
-    let installer =
-            case configPlatform config of
-                Platform _ Cabal.Windows -> installGHCWindows
-                _ -> installGHCPosix downloadInfo
-    logInfo $
-        "Preparing to install GHC" <>
-        (case ghcVariant of
-            GHCStandard -> ""
-            v -> " (" <> fromString (ghcVariantName v) <> ")") <>
-        (case ghcBuild of
-            CompilerBuildStandard -> ""
-            b -> " (" <> fromString (compilerBuildName b) <> ")") <>
-        " to an isolated location."
-    logInfo "This will not interfere with any system-level installation."
-    ghcPkgName <- parsePackageNameThrowing ("ghc" ++ ghcVariantSuffix ghcVariant ++ compilerBuildSuffix ghcBuild)
-    let tool = Tool $ PackageIdentifier ghcPkgName selectedVersion
-    downloadAndInstallTool (configLocalPrograms config) (gdiDownloadInfo downloadInfo) tool (installer si)
+  ghcVariant <- view ghcVariantL
+  (selectedVersion, downloadInfo) <- case mbindistURL of
+    Just bindistURL -> do
+      case ghcVariant of
+        GHCCustom _ -> pure ()
+        _ -> throwM RequireCustomGHCVariant
+      pure
+        ( version
+        , GHCDownloadInfo mempty mempty DownloadInfo
+            { url = T.pack bindistURL
+            , contentLength = Nothing
+            , sha1 = Nothing
+            , sha256 = Nothing
+            }
+        )
+    _ -> do
+      ghcKey <- getGhcKey ghcBuild
+      case Map.lookup ghcKey si.ghcByVersion of
+        Nothing -> throwM $ UnknownOSKey ghcKey
+        Just pairs_ ->
+          getWantedCompilerInfo ghcKey versionCheck wanted ACGhc pairs_
+  config <- view configL
+  let installer =
+        case config.platform of
+          Platform _ Cabal.Windows -> installGHCWindows
+          _ -> installGHCPosix downloadInfo
+  prettyInfo $
+    fillSep $
+         flow "Preparing to install GHC"
+      :  case ghcVariant of
+           GHCStandard -> []
+           v -> ["(" <> fromString (ghcVariantName v) <> ")"]
+      <> case ghcBuild of
+           CompilerBuildStandard -> []
+           b -> ["(" <> fromString (compilerBuildName b) <> ")"]
+      <> [ flow "to an isolated location. This will not interfere with any \
+                \system-level installation."
+         ]
+  ghcPkgName <- parsePackageNameThrowing
+    ("ghc" ++ ghcVariantSuffix ghcVariant ++ compilerBuildSuffix ghcBuild)
+  let tool = Tool $ PackageIdentifier ghcPkgName selectedVersion
+  downloadAndInstallTool
+    config.localPrograms
+    downloadInfo.downloadInfo
+    tool
+    (installer si)
 
 downloadAndInstallCompiler _ _ WCGhcjs{} _ _ = throwIO GhcjsNotSupported
 
 downloadAndInstallCompiler _ _ WCGhcGit{} _ _ =
-    error "downloadAndInstallCompiler: shouldn't be reached with ghc-git"
-
-getWantedCompilerInfo :: (Ord k, MonadThrow m)
-                      => Text
-                      -> VersionCheck
-                      -> WantedCompiler
-                      -> (k -> ActualCompiler)
-                      -> Map k a
-                      -> m (k, a)
+  throwIO DownloadAndInstallCompilerError
+
+-- Exceptions thrown by this function are caught by
+-- 'downloadAndInstallPossibleCompilers'.
+getWantedCompilerInfo ::
+     (Ord k, MonadThrow m)
+  => Text
+  -> VersionCheck
+  -> WantedCompiler
+  -> (k -> ActualCompiler)
+  -> Map k a
+  -> m (k, a)
 getWantedCompilerInfo key versionCheck wanted toCV pairs_ =
-    case mpair of
-        Just pair -> pure pair
-        Nothing -> throwM $ UnknownCompilerVersion (Set.singleton key) wanted (Set.fromList $ map toCV (Map.keys pairs_))
-  where
-    mpair =
-        listToMaybe $
-        sortBy (flip (comparing fst)) $
-        filter (isWantedCompiler versionCheck wanted . toCV . fst) (Map.toList pairs_)
+  case mpair of
+    Just pair -> pure pair
+    Nothing -> throwM $
+      UnknownCompilerVersion
+        (Set.singleton key)
+        wanted
+        (Set.fromList $ map toCV (Map.keys pairs_))
+ where
+  mpair =
+    listToMaybe $
+    sortOn (Down . fst) $
+    filter
+      (isWantedCompiler versionCheck wanted . toCV . fst)
+      (Map.toList pairs_)
 
 -- | Download and install the first available compiler build.
-downloadAndInstallPossibleCompilers
-    :: (HasGHCVariant env, HasBuildConfig env)
-    => [CompilerBuild]
-    -> SetupInfo
-    -> WantedCompiler
-    -> VersionCheck
-    -> Maybe String
-    -> RIO env (Tool, CompilerBuild)
+downloadAndInstallPossibleCompilers ::
+     (HasGHCVariant env, HasBuildConfig env)
+  => [CompilerBuild]
+  -> SetupInfo
+  -> WantedCompiler
+  -> VersionCheck
+  -> Maybe String
+  -> RIO env (Tool, CompilerBuild)
 downloadAndInstallPossibleCompilers possibleCompilers si wanted versionCheck mbindistURL =
-    go possibleCompilers Nothing
-  where
-    -- This will stop as soon as one of the builds doesn't throw an @UnknownOSKey@ or
-    -- @UnknownCompilerVersion@ exception (so it will only try subsequent builds if one is nonexistent,
-    -- not if the download or install fails for some other reason).
-    -- The @Unknown*@ exceptions thrown by each attempt are combined into a single exception
-    -- (if only @UnknownOSKey@ is thrown, then the first of those is rethrown, but if any
-    -- @UnknownCompilerVersion@s are thrown then the attempted OS keys and available versions
-    -- are unioned).
-    go [] Nothing = throwM UnsupportedSetupConfiguration
-    go [] (Just e) = throwM e
-    go (b:bs) e = do
-        logDebug $ "Trying to setup GHC build: " <> fromString (compilerBuildName b)
-        er <- try $ downloadAndInstallCompiler b si wanted versionCheck mbindistURL
-        case er of
-            Left e'@(UnknownCompilerVersion ks' w' vs') ->
-                case e of
-                    Nothing -> go bs (Just e')
-                    Just (UnknownOSKey k) ->
-                        go bs $ Just $ UnknownCompilerVersion (Set.insert k ks') w' vs'
-                    Just (UnknownCompilerVersion ks _ vs) ->
-                        go bs $ Just $ UnknownCompilerVersion (Set.union ks' ks) w' (Set.union vs' vs)
-                    Just x -> throwM x
-            Left e'@(UnknownOSKey k') ->
-                case e of
-                    Nothing -> go bs (Just e')
-                    Just (UnknownOSKey _) -> go bs e
-                    Just (UnknownCompilerVersion ks w vs) ->
-                        go bs $ Just $ UnknownCompilerVersion (Set.insert k' ks) w vs
-                    Just x -> throwM x
-            Left e' -> throwM e'
-            Right r -> pure (r, b)
-
-getGhcKey :: (MonadReader env m, HasPlatform env, HasGHCVariant env, MonadThrow m)
-          => CompilerBuild -> m Text
+  go possibleCompilers Nothing
+ where
+  -- This will stop as soon as one of the builds doesn't throw an @UnknownOSKey@
+  -- or @UnknownCompilerVersion@ exception (so it will only try subsequent
+  -- builds if one is nonexistent, not if the download or install fails for some
+  -- other reason). The @Unknown*@ exceptions thrown by each attempt are
+  -- combined into a single exception (if only @UnknownOSKey@ is thrown, then
+  -- the first of those is rethrown, but if any @UnknownCompilerVersion@s are
+  -- thrown then the attempted OS keys and available versions are unioned).
+  go [] Nothing = prettyThrowM UnsupportedSetupConfiguration
+  go [] (Just e) = prettyThrowM e
+  go (b:bs) e = do
+    logDebug $ "Trying to setup GHC build: " <> fromString (compilerBuildName b)
+    er <- try $ downloadAndInstallCompiler b si wanted versionCheck mbindistURL
+    case er of
+      Left e'@(UnknownCompilerVersion ks' w' vs') ->
+        case e of
+          Nothing -> go bs (Just e')
+          Just (UnknownOSKey k) ->
+            go bs $ Just $ UnknownCompilerVersion (Set.insert k ks') w' vs'
+          Just (UnknownCompilerVersion ks _ vs) ->
+            go bs $ Just $
+              UnknownCompilerVersion (Set.union ks' ks) w' (Set.union vs' vs)
+          Just x -> prettyThrowM x
+      Left e'@(UnknownOSKey k') ->
+        case e of
+          Nothing -> go bs (Just e')
+          Just (UnknownOSKey _) -> go bs e
+          Just (UnknownCompilerVersion ks w vs) ->
+            go bs $ Just $ UnknownCompilerVersion (Set.insert k' ks) w vs
+          Just x -> prettyThrowM x
+      Left e' -> prettyThrowM e'
+      Right r -> pure (r, b)
+
+getGhcKey ::
+     (HasBuildConfig env, HasGHCVariant env)
+  => CompilerBuild
+  -> RIO env Text
 getGhcKey ghcBuild = do
-    ghcVariant <- view ghcVariantL
-    platform <- view platformL
-    osKey <- getOSKey platform
-    pure $ osKey <> T.pack (ghcVariantSuffix ghcVariant) <> T.pack (compilerBuildSuffix ghcBuild)
-
-getOSKey :: (MonadThrow m)
-         => Platform -> m Text
-getOSKey platform =
-    case platform of
-        Platform I386                  Cabal.Linux   -> pure "linux32"
-        Platform X86_64                Cabal.Linux   -> pure "linux64"
-        Platform I386                  Cabal.OSX     -> pure "macosx"
-        Platform X86_64                Cabal.OSX     -> pure "macosx"
-        Platform I386                  Cabal.FreeBSD -> pure "freebsd32"
-        Platform X86_64                Cabal.FreeBSD -> pure "freebsd64"
-        Platform I386                  Cabal.OpenBSD -> pure "openbsd32"
-        Platform X86_64                Cabal.OpenBSD -> pure "openbsd64"
-        Platform I386                  Cabal.Windows -> pure "windows32"
-        Platform X86_64                Cabal.Windows -> pure "windows64"
-        Platform Arm                   Cabal.Linux   -> pure "linux-armv7"
-        Platform AArch64               Cabal.Linux   -> pure "linux-aarch64"
-        Platform Sparc                 Cabal.Linux   -> pure "linux-sparc"
-        Platform AArch64               Cabal.OSX     -> pure "macosx-aarch64"
-        Platform AArch64               Cabal.FreeBSD -> pure "freebsd-aarch64"
-        Platform arch os -> throwM $ UnsupportedSetupCombo os arch
-
-downloadOrUseLocal
-    :: (HasTerm env, HasBuildConfig env)
-    => Text -> DownloadInfo -> Path Abs File -> RIO env (Path Abs File)
+  ghcVariant <- view ghcVariantL
+  ghcVersion <- view (buildConfigL . to (.smWanted.compiler)) >>= \case
+    WCGhc version -> pure version
+    WCGhcjs _ _ ->  throwIO GhcjsNotSupported
+    WCGhcGit _ _ -> throwIO DownloadAndInstallCompilerError
+  let variantSuffix = ghcVariantSuffix ghcVariant
+      buildSuffix = compilerBuildSuffix ghcBuild
+      ghcDir = style Dir $ mconcat
+        [ "ghc"
+        , fromString variantSuffix
+        , fromString buildSuffix
+        , "-"
+        , fromString $ versionString ghcVersion
+        ]
+  osKey <- getOSKey "GHC" ghcDir
+  pure $ osKey <> T.pack variantSuffix <> T.pack buildSuffix
+
+getOSKey ::
+     (HasConfig env, HasPlatform env)
+  => StyleDoc
+     -- ^ Description of the tool that is being set up.
+  -> StyleDoc
+     -- ^ Description of the root directory of the tool.
+  -> RIO env Text
+getOSKey tool toolDir =
+  view platformL >>= \case
+    Platform I386                  Cabal.Linux   -> pure "linux32"
+    Platform X86_64                Cabal.Linux   -> pure "linux64"
+    Platform I386                  Cabal.OSX     -> pure "macosx"
+    Platform X86_64                Cabal.OSX     -> pure "macosx"
+    Platform I386                  Cabal.FreeBSD -> pure "freebsd32"
+    Platform X86_64                Cabal.FreeBSD -> pure "freebsd64"
+    Platform I386                  Cabal.OpenBSD -> pure "openbsd32"
+    Platform X86_64                Cabal.OpenBSD -> pure "openbsd64"
+    Platform I386                  Cabal.Windows -> pure "windows32"
+    Platform X86_64                Cabal.Windows -> pure "windows64"
+    Platform Arm                   Cabal.Linux   -> pure "linux-armv7"
+    Platform AArch64               Cabal.Linux   -> pure "linux-aarch64"
+    Platform Sparc                 Cabal.Linux   -> pure "linux-sparc"
+    Platform AArch64               Cabal.OSX     -> pure "macosx-aarch64"
+    Platform AArch64               Cabal.FreeBSD -> pure "freebsd-aarch64"
+    Platform arch os -> do
+      programsDir <- view $ configL . to (.localPrograms)
+      prettyThrowM $ UnsupportedSetupCombo os arch tool toolDir programsDir
+
+downloadOrUseLocal ::
+     (HasTerm env, HasBuildConfig env)
+  => Text
+  -> DownloadInfo
+  -> Path Abs File
+  -> RIO env (Path Abs File)
 downloadOrUseLocal downloadLabel downloadInfo destination =
   case url of
     (parseUrlThrow -> Just _) -> do
-        ensureDir (parent destination)
-        chattyDownload downloadLabel downloadInfo destination
-        pure destination
+      ensureDir (parent destination)
+      chattyDownload downloadLabel downloadInfo destination
+      pure destination
     (parseAbsFile -> Just path) -> do
-        warnOnIgnoredChecks
-        pure path
+      warnOnIgnoredChecks
+      pure path
     (parseRelFile -> Just path) -> do
-        warnOnIgnoredChecks
-        root <- view projectRootL
-        pure (root </> path)
-    _ ->
-        throwString $ "Error: `url` must be either an HTTP URL or a file path: " ++ url
-  where
-    url = T.unpack $ downloadInfoUrl downloadInfo
-    warnOnIgnoredChecks = do
-      let DownloadInfo{downloadInfoContentLength=contentLength, downloadInfoSha1=sha1,
-                       downloadInfoSha256=sha256} = downloadInfo
-      when (isJust contentLength) $
-        logWarn "`content-length` is not checked and should not be specified when `url` is a file path"
-      when (isJust sha1) $
-        logWarn "`sha1` is not checked and should not be specified when `url` is a file path"
-      when (isJust sha256) $
-        logWarn "`sha256` is not checked and should not be specified when `url` is a file path"
-
-downloadFromInfo
-    :: (HasTerm env, HasBuildConfig env)
-    => Path Abs Dir -> DownloadInfo -> Tool -> RIO env (Path Abs File, ArchiveType)
+      warnOnIgnoredChecks
+      configFileRoot <- view configFileRootL
+      pure (configFileRoot </> path)
+    _ -> prettyThrowIO $ URLInvalid url
+ where
+  url = T.unpack downloadInfo.url
+  warnOnIgnoredChecks = do
+    let DownloadInfo
+          { contentLength
+          , sha1
+          , sha256
+          } = downloadInfo
+    when (isJust contentLength) $
+      prettyWarnS
+        "`content-length` is not checked and should not be specified when \
+        \`url` is a file path."
+    when (isJust sha1) $
+      prettyWarnS
+        "`sha1` is not checked and should not be specified when `url` is a \
+        \file path."
+    when (isJust sha256) $
+      prettyWarn
+        "`sha256` is not checked and should not be specified when `url` is a \
+        \file path"
+
+downloadFromInfo ::
+     (HasTerm env, HasBuildConfig env)
+  => Path Abs Dir
+  -> DownloadInfo
+  -> Tool
+  -> RIO env (Path Abs File, ArchiveType)
 downloadFromInfo programsDir downloadInfo tool = do
-    archiveType <-
-        case extension of
-            ".tar.xz" -> pure TarXz
-            ".tar.bz2" -> pure TarBz2
-            ".tar.gz" -> pure TarGz
-            ".7z.exe" -> pure SevenZ
-            _ -> throwString $ "Error: Unknown extension for url: " ++ url
-
-    relativeFile <- parseRelFile $ toolString tool ++ extension
-    let destinationPath = programsDir </> relativeFile
-    localPath <- downloadOrUseLocal (T.pack (toolString tool)) downloadInfo destinationPath
-    pure (localPath, archiveType)
-
-  where
-    url = T.unpack $ downloadInfoUrl downloadInfo
-    extension = loop url
-      where
-        loop fp
-            | ext `elem` [".tar", ".bz2", ".xz", ".exe", ".7z", ".gz"] = loop fp' ++ ext
-            | otherwise = ""
-          where
-            (fp', ext) = FP.splitExtension fp
+  archiveType <-
+    case extension of
+      ".tar.xz" -> pure TarXz
+      ".tar.bz2" -> pure TarBz2
+      ".tar.gz" -> pure TarGz
+      ".7z.exe" -> pure SevenZ
+      _ -> prettyThrowIO $ UnknownArchiveExtension url
+
+  relativeFile <- parseRelFile $ toolString tool ++ extension
+  let destinationPath = programsDir </> relativeFile
+  localPath <-
+    downloadOrUseLocal (T.pack (toolString tool)) downloadInfo destinationPath
+  pure (localPath, archiveType)
+
+ where
+  url = T.unpack downloadInfo.url
+  extension = loop url
+   where
+    loop fp
+      | ext `elem` [".tar", ".bz2", ".xz", ".exe", ".7z", ".gz"] = loop fp' ++ ext
+      | otherwise = ""
+     where
+      (fp', ext) = FP.splitExtension fp
 
 
 data ArchiveType
-    = TarBz2
-    | TarXz
-    | TarGz
-    | SevenZ
-
-installGHCPosix :: HasConfig env
-                => GHCDownloadInfo
-                -> SetupInfo
-                -> Path Abs File
-                -> ArchiveType
-                -> Path Abs Dir
-                -> Path Abs Dir
-                -> RIO env ()
+  = TarBz2
+  | TarXz
+  | TarGz
+  | SevenZ
+
+installGHCPosix ::
+     HasConfig env
+  => GHCDownloadInfo
+  -> SetupInfo
+  -> Path Abs File
+  -> ArchiveType
+  -> Path Abs Dir
+  -> Path Abs Dir
+  -> RIO env ()
 installGHCPosix downloadInfo _ archiveFile archiveType tempDir destDir = do
-    platform <- view platformL
-    menv0 <- view processContextL
-    menv <- mkProcessContext (removeHaskellEnvVars (view envVarsL menv0))
-    logDebug $ "menv = " <> displayShow (view envVarsL menv)
-    (zipTool', compOpt) <-
-        case archiveType of
-            TarXz -> pure ("xz", 'J')
-            TarBz2 -> pure ("bzip2", 'j')
-            TarGz -> pure ("gzip", 'z')
-            SevenZ -> throwString "Don't know how to deal with .7z files on non-Windows"
-    -- Slight hack: OpenBSD's tar doesn't support xz.
-    -- https://github.com/commercialhaskell/stack/issues/2283#issuecomment-237980986
-    let tarDep =
-          case (platform, archiveType) of
-            (Platform _ Cabal.OpenBSD, TarXz) -> checkDependency "gtar"
-            _ -> checkDependency "tar"
-    (zipTool, makeTool, tarTool) <- checkDependencies $ (,,)
-        <$> checkDependency zipTool'
-        <*> (checkDependency "gmake" <|> checkDependency "make")
-        <*> tarDep
-
-    logDebug $ "ziptool: " <> fromString zipTool
-    logDebug $ "make: " <> fromString makeTool
-    logDebug $ "tar: " <> fromString tarTool
-
-    let runStep step wd env cmd args = do
-          menv' <- modifyEnvVars menv (Map.union env)
-          let logLines lvl = CB.lines .| CL.mapM_ (lvl . displayBytesUtf8)
-              logStdout = logLines logDebug
-              logStderr = logLines logError
-          void $ withWorkingDir (toFilePath wd) $
-                withProcessContext menv' $
-                sinkProcessStderrStdout cmd args logStderr logStdout
-                `catchAny` \ex -> do
-                  logError $ displayShow ex
-                  prettyError $ hang 2 (
-                      "Error encountered while" <+> step <+> "GHC with"
-                      <> line <>
-                      style Shell (fromString (unwords (cmd : args)))
-                      <> line <>
-                      -- TODO: Figure out how to insert \ in the appropriate spots
-                      -- hang 2 (shellColor (fillSep (fromString cmd : map fromString args))) <> line <>
-                      "run in " <> pretty wd
-                      )
-                    <> line <> line <>
-                    "The following directories may now contain files, but \
-                    \won't be used by Stack:"
-                    <> line <>
-                    "  -" <+> pretty tempDir
-                    <> line <>
-                    "  -" <+> pretty destDir
-                    <> line <> line <>
-                    "For more information consider rerunning with --verbose flag"
-                    <> line
-                  exitFailure
-
-    logSticky $
-      "Unpacking GHC into " <>
-      fromString (toFilePath tempDir) <>
-      " ..."
-    logDebug $ "Unpacking " <> fromString (toFilePath archiveFile)
-    runStep "unpacking" tempDir mempty tarTool [compOpt : "xf", toFilePath archiveFile]
-
-    dir <- expectSingleUnpackedDir archiveFile tempDir
-
-    mOverrideGccPath <- view $ configL.to configOverrideGccPath
-
-    -- The make application uses the CC environment variable to configure the
-    -- program for compiling C programs
-    let mGccEnv = let gccEnvFromPath p =
-                        Map.singleton "CC" $ T.pack (toFilePath p)
-                  in  gccEnvFromPath <$> mOverrideGccPath
-
-    -- Data.Map.union provides a left-biased union, so mGccEnv will prevail
-    let ghcConfigureEnv =
-          fromMaybe Map.empty mGccEnv `Map.union` gdiConfigureEnv downloadInfo
-
-    logSticky "Configuring GHC ..."
-    runStep "configuring" dir
-        ghcConfigureEnv
-        (toFilePath $ dir </> relFileConfigure)
-        (("--prefix=" ++ toFilePath destDir) : map T.unpack (gdiConfigureOpts downloadInfo))
-
-    logSticky "Installing GHC ..."
-    runStep "installing" dir mempty makeTool ["install"]
-
-    logStickyDone $ "Installed GHC."
-    logDebug $ "GHC installed to " <> fromString (toFilePath destDir)
+  platform <- view platformL
+  menv0 <- view processContextL
+  menv <- mkProcessContext (removeHaskellEnvVars (view envVarsL menv0))
+  logDebug $ "menv = " <> displayShow (view envVarsL menv)
+  (zipTool', compOpt) <-
+    case archiveType of
+      TarXz -> pure ("xz", 'J')
+      TarBz2 -> pure ("bzip2", 'j')
+      TarGz -> pure ("gzip", 'z')
+      SevenZ -> prettyThrowIO Unsupported7z
+  -- Slight hack: OpenBSD's tar doesn't support xz.
+  -- https://github.com/commercialhaskell/stack/issues/2283#issuecomment-237980986
+  let tarDep =
+        case (platform, archiveType) of
+          (Platform _ Cabal.OpenBSD, TarXz) -> checkDependency "gtar"
+          _ -> checkDependency "tar"
+  (zipTool, makeTool, tarTool) <- checkDependencies $ (,,)
+    <$> checkDependency zipTool'
+    <*> (checkDependency "gmake" <|> checkDependency "make")
+    <*> tarDep
+
+  logDebug $ "ziptool: " <> fromString zipTool
+  logDebug $ "make: " <> fromString makeTool
+  logDebug $ "tar: " <> fromString tarTool
+
+  let runStep step wd env cmd args = do
+        menv' <- modifyEnvVars menv (Map.union env)
+        let logLines lvl = CB.lines .| CL.mapM_ (lvl . displayBytesUtf8)
+            logStdout = logLines logDebug
+            logStderr = logLines logError
+        void $ withWorkingDir (toFilePath wd) $
+          withProcessContext menv' $
+          sinkProcessStderrStdout cmd args logStderr logStdout
+          `catchAny` \ex ->
+            prettyThrowIO (GHCInstallFailed ex step cmd args wd tempDir destDir)
+
+  logSticky $
+       "Unpacking GHC into "
+    <> fromString (toFilePath tempDir)
+    <> " ..."
+  logDebug $ "Unpacking " <> fromString (toFilePath archiveFile)
+  runStep "unpacking" tempDir
+    mempty
+    tarTool
+    [compOpt : "xf", toFilePath archiveFile]
+
+  dir <- expectSingleUnpackedDir archiveFile tempDir
+
+  mOverrideGccPath <- view $ configL . to (.overrideGccPath)
+
+  -- The make application uses the CC environment variable to configure the
+  -- program for compiling C programs
+  let mGccEnv = let gccEnvFromPath p =
+                      Map.singleton "CC" $ T.pack (toFilePath p)
+                in  gccEnvFromPath <$> mOverrideGccPath
+
+  -- Data.Map.union provides a left-biased union, so mGccEnv will prevail
+  let ghcConfigureEnv =
+        fromMaybe Map.empty mGccEnv `Map.union` downloadInfo.configureEnv
+
+  logSticky "Configuring GHC ..."
+  runStep "configuring" dir
+    ghcConfigureEnv
+    (toFilePath $ dir </> relFileConfigure)
+    ( ("--prefix=" ++ toFilePath destDir)
+    : map T.unpack downloadInfo.configureOpts
+    )
+
+  logSticky "Installing GHC ..."
+  runStep "installing" dir mempty makeTool ["install"]
+
+  logStickyDone "Installed GHC."
+  logDebug $ "GHC installed to " <> fromString (toFilePath destDir)
 
 -- | Check if given processes appear to be present, throwing an exception if
 -- missing.
 checkDependencies :: CheckDependency env a -> RIO env a
-checkDependencies (CheckDependency f) = f >>= either (throwIO . MissingDependencies) pure
+checkDependencies (CheckDependency f) =
+  f >>= either (prettyThrowIO . MissingDependencies) pure
 
 checkDependency :: HasProcessContext env => String -> CheckDependency env String
 checkDependency tool = CheckDependency $ do
-    exists <- doesExecutableExist tool
-    pure $ if exists then Right tool else Left [tool]
+  exists <- doesExecutableExist tool
+  pure $ if exists then Right tool else Left [tool]
+
+newtype CheckDependency env a
+  = CheckDependency (RIO env (Either [String] a))
+  deriving Functor
 
-newtype CheckDependency env a = CheckDependency (RIO env (Either [String] a))
-    deriving Functor
 instance Applicative (CheckDependency env) where
-    pure x = CheckDependency $ pure (Right x)
-    CheckDependency f <*> CheckDependency x = CheckDependency $ do
-        f' <- f
-        x' <- x
-        pure $
-            case (f', x') of
-                (Left e1, Left e2) -> Left $ e1 ++ e2
-                (Left e, Right _) -> Left e
-                (Right _, Left e) -> Left e
-                (Right f'', Right x'') -> Right $ f'' x''
+  pure x = CheckDependency $ pure (Right x)
+  CheckDependency f <*> CheckDependency x = CheckDependency $ do
+    f' <- f
+    x' <- x
+    pure $
+      case (f', x') of
+        (Left e1, Left e2) -> Left $ e1 ++ e2
+        (Left e, Right _) -> Left e
+        (Right _, Left e) -> Left e
+        (Right f'', Right x'') -> Right $ f'' x''
+
 instance Alternative (CheckDependency env) where
-    empty = CheckDependency $ pure $ Left []
-    CheckDependency x <|> CheckDependency y = CheckDependency $ do
-        res1 <- x
-        case res1 of
-            Left _ -> y
-            Right x' -> pure $ Right x'
-
-installGHCWindows :: HasBuildConfig env
-                  => SetupInfo
-                  -> Path Abs File
-                  -> ArchiveType
-                  -> Path Abs Dir
-                  -> Path Abs Dir
-                  -> RIO env ()
+  empty = CheckDependency $ pure $ Left []
+  CheckDependency x <|> CheckDependency y = CheckDependency $
+    x >>= \case
+      Left _ -> y
+      Right x' -> pure $ Right x'
+
+installGHCWindows ::
+     HasBuildConfig env
+  => SetupInfo
+  -> Path Abs File
+  -> ArchiveType
+  -> Path Abs Dir
+  -> Path Abs Dir
+  -> RIO env ()
 installGHCWindows si archiveFile archiveType _tempDir destDir = do
-    withUnpackedTarball7z "GHC" si archiveFile archiveType destDir
-    logInfo $ "GHC installed to " <> fromString (toFilePath destDir)
-
-installMsys2Windows :: HasBuildConfig env
-                  => SetupInfo
-                  -> Path Abs File
-                  -> ArchiveType
-                  -> Path Abs Dir
-                  -> Path Abs Dir
-                  -> RIO env ()
+  withUnpackedTarball7z "GHC" si archiveFile archiveType destDir
+  prettyInfoL
+    [ flow "GHC installed to"
+    , pretty destDir <> "."
+    ]
+
+installMsys2Windows ::
+     HasBuildConfig env
+  => SetupInfo
+  -> Path Abs File
+  -> ArchiveType
+  -> Path Abs Dir
+  -> Path Abs Dir
+  -> RIO env ()
 installMsys2Windows si archiveFile archiveType _tempDir destDir = do
-    exists <- liftIO $ D.doesDirectoryExist $ toFilePath destDir
-    when exists $ liftIO (D.removeDirectoryRecursive $ toFilePath destDir) `catchIO` \e -> do
-        logError $
-            "Could not delete existing msys directory: " <>
-            fromString (toFilePath destDir)
-        throwM e
-
-    withUnpackedTarball7z "MSYS2" si archiveFile archiveType destDir
-
-
-    -- I couldn't find this officially documented anywhere, but you need to run
-    -- the MSYS shell once in order to initialize some pacman stuff. Once that
-    -- run happens, you can just run commands as usual.
-    menv0 <- view processContextL
-    newEnv0 <- modifyEnvVars menv0 $ Map.insert "MSYSTEM" "MSYS"
-    newEnv <- either throwM pure $ augmentPathMap
-                  [toFilePath $ destDir </> relDirUsr </> relDirBin]
-                  (view envVarsL newEnv0)
-    menv <- mkProcessContext newEnv
-    withWorkingDir (toFilePath destDir) $ withProcessContext menv
-      $ proc "sh" ["--login", "-c", "true"] runProcess_
-
-    -- No longer installing git, it's unreliable
-    -- (https://github.com/commercialhaskell/stack/issues/1046) and the
-    -- MSYS2-installed version has bad CRLF defaults.
-    --
-    -- Install git. We could install other useful things in the future too.
-    -- runCmd (Cmd (Just destDir) "pacman" menv ["-Sy", "--noconfirm", "git"]) Nothing
-
--- | Unpack a compressed tarball using 7zip.  Expects a single directory in
--- the unpacked results, which is renamed to the destination directory.
-withUnpackedTarball7z :: HasBuildConfig env
-                      => String -- ^ Name of tool, used in error messages
-                      -> SetupInfo
-                      -> Path Abs File -- ^ Path to archive file
-                      -> ArchiveType
-                      -> Path Abs Dir -- ^ Destination directory.
-                      -> RIO env ()
+  exists <- liftIO $ D.doesDirectoryExist $ toFilePath destDir
+  when exists $
+    liftIO (D.removeDirectoryRecursive $ toFilePath destDir) `catchIO` \e ->
+      prettyThrowM $ ExistingMSYS2NotDeleted destDir e
+
+  withUnpackedTarball7z "MSYS2" si archiveFile archiveType destDir
+
+  -- I couldn't find this officially documented anywhere, but you need to run
+  -- the MSYS shell once in order to initialize some pacman stuff. Once that run
+  -- happens, you can just run commands as usual.
+  menv0 <- view processContextL
+  newEnv0 <- modifyEnvVars menv0 $ Map.insert "MSYSTEM" "MSYS"
+  newEnv <- either throwM pure $ augmentPathMap
+              [toFilePath $ destDir </> relDirUsr </> relDirBin]
+              (view envVarsL newEnv0)
+  menv <- mkProcessContext newEnv
+  withWorkingDir (toFilePath destDir) $ withProcessContext menv
+    $ proc "sh" ["--login", "-c", "true"] runProcess_
+
+  -- No longer installing git, it's unreliable
+  -- (https://github.com/commercialhaskell/stack/issues/1046) and the
+  -- MSYS2-installed version has bad CRLF defaults.
+  --
+  -- Install git. We could install other useful things in the future too.
+  -- runCmd (Cmd (Just destDir) "pacman" menv ["-Sy", "--noconfirm", "git"]) Nothing
+
+-- | Unpack a compressed tarball using 7zip. Expects a single directory in the
+-- unpacked results, which is renamed to the destination directory.
+withUnpackedTarball7z ::
+     HasBuildConfig env
+  => String -- ^ Name of tool, used in error messages
+  -> SetupInfo
+  -> Path Abs File -- ^ Path to archive file
+  -> ArchiveType
+  -> Path Abs Dir -- ^ Destination directory.
+  -> RIO env ()
 withUnpackedTarball7z name si archiveFile archiveType destDir = do
-    suffix <-
-        case archiveType of
-            TarXz -> pure ".xz"
-            TarBz2 -> pure ".bz2"
-            TarGz -> pure ".gz"
-            _ -> throwString $ name ++ " must be a tarball file"
-    tarFile <-
-        case T.stripSuffix suffix $ T.pack $ toFilePath (filename archiveFile) of
-            Nothing -> throwString $ "Invalid " ++ name ++ " filename: " ++ show archiveFile
-            Just x -> parseRelFile $ T.unpack x
-    run7z <- setup7z si
-    let tmpName = toFilePathNoTrailingSep (dirname destDir) ++ "-tmp"
-    ensureDir (parent destDir)
-    withRunInIO $ \run -> withTempDir (parent destDir) tmpName $ \tmpDir -> run $ do
+  suffix <-
+    case archiveType of
+      TarXz -> pure ".xz"
+      TarBz2 -> pure ".bz2"
+      TarGz -> pure ".gz"
+      _ -> prettyThrowIO $ TarballInvalid name
+  tarFile <-
+    case T.stripSuffix suffix $ T.pack $ toFilePath (filename archiveFile) of
+      Nothing -> prettyThrowIO $ TarballFileInvalid name archiveFile
+      Just x -> parseRelFile $ T.unpack x
+  run7z <- setup7z si
+  -- We aim to reduce the risk of a filepath length of more than 260 characters,
+  -- which can be problematic for 7-Zip if Windows is not 'long file paths'
+  -- enabled. We use a short name for the temporary directory ...
+  let tmpName = "stack-tmp"
+      destDrive = takeDrive destDir
+  ensureDir (parent destDir)
+  tempDrive <- takeDrive <$> getTempDir
+  -- We use a temporary directory with likely a short absolute path ...
+  let withTempDir' = if tempDrive == destDrive
+        then
+          -- We use the system temporary directory if we can, as a Standard user
+          -- may well not have permission to create a directory in the root of
+          -- the system drive.
+          withSystemTempDir
+        else
+          -- Otherwise we use a temporary directory in the root of the
+          -- destination drive.
+          withTempDir destDrive
+  withRunInIO $ \run ->
+    withTempDir' tmpName $ \tmpDir ->
+      run $ do
         liftIO $ ignoringAbsence (removeDirRecur destDir)
         run7z tmpDir archiveFile
         run7z tmpDir (tmpDir </> tarFile)
         absSrcDir <- expectSingleUnpackedDir archiveFile tmpDir
+        -- On Windows, 'renameDir' does not work across drives. However, we have
+        -- ensured that 'tmpDir' has the same drive as 'destDir'.
         renameDir absSrcDir destDir
 
-expectSingleUnpackedDir :: (MonadIO m, MonadThrow m) => Path Abs File -> Path Abs Dir -> m (Path Abs Dir)
-expectSingleUnpackedDir archiveFile destDir = do
-    contents <- listDir destDir
-    case contents of
-        ([dir], _ ) -> pure dir
-        _ -> throwString $ "Expected a single directory within unpacked " ++ toFilePath archiveFile
+expectSingleUnpackedDir ::
+     (MonadIO m, MonadThrow m)
+  => Path Abs File
+  -> Path Abs Dir
+  -> m (Path Abs Dir)
+expectSingleUnpackedDir archiveFile unpackDir =
+  listDir unpackDir >>= \case
+    ([dir], _ ) -> pure dir
+    _ -> prettyThrowIO $ UnknownArchiveStructure archiveFile
 
 -- | Download 7z as necessary, and get a function for unpacking things.
 --
 -- Returned function takes an unpack directory and archive.
-setup7z :: (HasBuildConfig env, MonadIO m)
-        => SetupInfo
-        -> RIO env (Path Abs Dir -> Path Abs File -> m ())
+setup7z ::
+     (HasBuildConfig env, MonadIO m)
+  => SetupInfo
+  -> RIO env (Path Abs Dir -> Path Abs File -> m ())
 setup7z si = do
-    dir <- view $ configL.to configLocalPrograms
-    ensureDir dir
-    let exeDestination = dir </> relFile7zexe
-        dllDestination = dir </> relFile7zdll
-    case (siSevenzDll si, siSevenzExe si) of
-        (Just sevenzDll, Just sevenzExe) -> do
-            _ <- downloadOrUseLocal "7z.dll" sevenzDll dllDestination
-            exePath <- downloadOrUseLocal "7z.exe" sevenzExe exeDestination
-            withRunInIO $ \run -> pure $ \outdir archive -> liftIO $ run $ do
-                let cmd = toFilePath exePath
-                    args =
-                        [ "x"
-                        , "-o" ++ toFilePath outdir
-                        , "-y"
-                        , toFilePath archive
-                        ]
-                let archiveDisplay = fromString $ FP.takeFileName $ toFilePath archive
-                    isExtract = FP.takeExtension (toFilePath archive) == ".tar"
-                logInfo $
-                  (if isExtract then "Extracting " else "Decompressing ") <>
-                  archiveDisplay <> "..."
-                ec <-
-                  proc cmd args $ \pc ->
-                  if isExtract
-                    then withProcessWait (setStdout createSource pc) $ \p -> do
-                        total <- runConduit
-                            $ getStdout p
-                           .| filterCE (== 10) -- newline characters
-                           .| foldMC
-                                (\count bs -> do
-                                    let count' = count + S.length bs
-                                    logSticky $ "Extracted " <> RIO.display count' <> " files"
-                                    pure count'
-                                )
-                                0
-                        logStickyDone $
-                          "Extracted total of " <>
-                          RIO.display total <>
-                          " files from " <>
-                          archiveDisplay
-                        waitExitCode p
-                    else runProcess pc
-                when (ec /= ExitSuccess)
-                    $ liftIO $ throwM (ProblemWhileDecompressing archive)
-        _ -> throwM SetupInfoMissingSevenz
-
-chattyDownload :: HasTerm env
-               => Text          -- ^ label
-               -> DownloadInfo  -- ^ URL, content-length, sha1, and sha256
-               -> Path Abs File -- ^ destination
-               -> RIO env ()
+  dir <- view $ configL . to (.localPrograms)
+  ensureDir dir
+  let exeDestination = dir </> relFile7zexe
+      dllDestination = dir </> relFile7zdll
+  case (si.sevenzDll, si.sevenzExe) of
+    (Just sevenzDll, Just sevenzExe) -> do
+      _ <- downloadOrUseLocal "7z.dll" sevenzDll dllDestination
+      exePath <- downloadOrUseLocal "7z.exe" sevenzExe exeDestination
+      withRunInIO $ \run -> pure $ \outdir archive -> liftIO $ run $ do
+        let cmd = toFilePath exePath
+            args =
+              [ "x"
+              , "-o" ++ toFilePath outdir
+              , "-y"
+              , archiveFP
+              ]
+            archiveFP = toFilePath archive
+            archiveFileName = filename archive
+            archiveDisplay = fromString $ toFilePath archiveFileName
+            isExtract = FP.takeExtension archiveFP == ".tar"
+        prettyInfoL
+          [ if isExtract then "Extracting" else "Decompressing"
+          , pretty archiveFileName <> "..."
+          ]
+        ec <-
+          proc cmd args $ \pc ->
+          if isExtract
+            then withProcessWait (setStdout createSource pc) $ \p -> do
+              total <- runConduit
+                 $ getStdout p
+                .| filterCE (== 10) -- newline characters
+                .| foldMC
+                     (\count bs -> do
+                         let count' = count + S.length bs
+                         logSticky $ "Extracted " <> display count' <> " files"
+                         pure count'
+                     )
+                     0
+              logStickyDone $
+                   "Extracted total of "
+                <> display total
+                <> " files from "
+                <> archiveDisplay
+              waitExitCode p
+            else runProcess pc
+        when (ec /= ExitSuccess) $
+          liftIO $ prettyThrowM (ProblemWhileDecompressing archive)
+    _ -> prettyThrowM SetupInfoMissingSevenz
+
+chattyDownload ::
+     HasTerm env
+  => Text          -- ^ label
+  -> DownloadInfo  -- ^ URL, content-length, sha1, and sha256
+  -> Path Abs File -- ^ destination
+  -> RIO env ()
 chattyDownload label downloadInfo path = do
-    let url = downloadInfoUrl downloadInfo
-    req <- parseUrlThrow $ T.unpack url
-    logSticky $
-      "Preparing to download " <>
-      RIO.display label <>
-      " ..."
-    logDebug $
-      "Downloading from " <>
-      RIO.display url <>
-      " to " <>
-      fromString (toFilePath path) <>
-      " ..."
-    hashChecks <- fmap catMaybes $ forM
-      [ ("sha1",   HashCheck SHA1,   downloadInfoSha1)
-      , ("sha256", HashCheck SHA256, downloadInfoSha256)
-      ]
-      $ \(name, constr, getter) ->
-        case getter downloadInfo of
-          Just bs -> do
-            logDebug $
-                "Will check against " <>
-                name <>
-                " hash: " <>
-                displayBytesUtf8 bs
-            pure $ Just $ constr $ CheckHexDigestByteString bs
-          Nothing -> pure Nothing
-    when (null hashChecks) $ logWarn $
-        "No sha1 or sha256 found in metadata," <>
-        " download hash won't be checked."
-    let dReq = setHashChecks hashChecks $
-               setLengthCheck mtotalSize $
-               mkDownloadRequest req
-    x <- verifiedDownloadWithProgress dReq path label mtotalSize
-    if x
-        then logStickyDone ("Downloaded " <> RIO.display label <> ".")
-        else logStickyDone "Already downloaded."
-  where
-    mtotalSize = downloadInfoContentLength downloadInfo
+  let url = downloadInfo.url
+  req <- parseUrlThrow $ T.unpack url
+  logSticky $
+       "Preparing to download "
+    <> display label
+    <> " ..."
+  logDebug $
+       "Downloading from "
+    <> display url
+    <> " to "
+    <> fromString (toFilePath path)
+    <> " ..."
+  hashChecks <- fmap catMaybes $ forM
+    [ ("sha1", HashCheck SHA1, (.sha1))
+    , ("sha256", HashCheck SHA256, (.sha256))
+    ]
+    $ \(name, constr, getter) ->
+      case getter downloadInfo of
+        Just bs -> do
+          logDebug $
+               "Will check against "
+            <> name
+            <> " hash: "
+            <> displayBytesUtf8 bs
+          pure $ Just $ constr $ CheckHexDigestByteString bs
+        Nothing -> pure Nothing
+  when (null hashChecks) $
+    prettyWarnS
+      "No sha1 or sha256 found in metadata, download hash won't be checked."
+  let dReq = setHashChecks hashChecks $
+             setLengthCheck mtotalSize $
+             mkDownloadRequest req
+  x <- verifiedDownloadWithProgress dReq path label mtotalSize
+  if x
+    then logStickyDone ("Downloaded " <> display label <> ".")
+    else logStickyDone ("Already downloaded " <> display label <> ".")
+ where
+  mtotalSize = downloadInfo.contentLength
 
 -- | Perform a basic sanity check of GHC
-sanityCheck :: (HasProcessContext env, HasLogFunc env)
-            => Path Abs File -> RIO env ()
+sanityCheck ::
+     (HasLogFunc env, HasProcessContext env)
+  => Path Abs File
+  -> RIO env ()
 sanityCheck ghc = withSystemTempDir "stack-sanity-check" $ \dir -> do
-    let fp = toFilePath $ dir </> relFileMainHs
-    liftIO $ S.writeFile fp $ T.encodeUtf8 $ T.pack $ unlines
-        [ "import Distribution.Simple" -- ensure Cabal library is present
-        , "main = putStrLn \"Hello World\""
-        ]
-    logDebug $ "Performing a sanity check on: " <> fromString (toFilePath ghc)
-    eres <- withWorkingDir (toFilePath dir) $ proc (toFilePath ghc)
-        [ fp
-        , "-no-user-package-db"
-        ] $ try . readProcess_
-    case eres of
-        Left e -> throwIO $ GHCSanityCheckCompileFailed e ghc
-        Right _ -> pure () -- TODO check that the output of running the command is correct
+  let fp = toFilePath $ dir </> relFileMainHs
+  liftIO $ S.writeFile fp $ T.encodeUtf8 $ T.pack $ unlines
+    [ "import Distribution.Simple" -- ensure Cabal library is present
+    , "main = putStrLn \"Hello World\""
+    ]
+  logDebug $ "Performing a sanity check on: " <> fromString (toFilePath ghc)
+  eres <- withWorkingDir (toFilePath dir) $ proc (toFilePath ghc)
+    [ fp
+    , "-no-user-package-db"
+    -- Required to stop GHC looking for a package environment in default
+    -- locations.
+    , "-hide-all-packages"
+    -- Required because GHC flag -hide-all-packages is passed.
+    , "-package base"
+    , "-package Cabal" -- required for "import Distribution.Simple"
+    ] $ try . readProcess_
+  case eres of
+    Left e -> prettyThrowIO $ GHCSanityCheckCompileFailed e ghc
+    Right _ -> pure () -- TODO check that the output of running the command is
+                       -- correct
 
 -- Remove potentially confusing environment variables
 removeHaskellEnvVars :: Map Text Text -> Map Text Text
 removeHaskellEnvVars =
-    Map.delete "GHC_PACKAGE_PATH" .
-    Map.delete "GHC_ENVIRONMENT" .
-    Map.delete "HASKELL_PACKAGE_SANDBOX" .
-    Map.delete "HASKELL_PACKAGE_SANDBOXES" .
-    Map.delete "HASKELL_DIST_DIR" .
-    -- https://github.com/commercialhaskell/stack/issues/1460
-    Map.delete "DESTDIR" .
-    -- https://github.com/commercialhaskell/stack/issues/3444
-    Map.delete "GHCRTS"
-
--- | Get map of environment variables to set to change the GHC's encoding to UTF-8
-getUtf8EnvVars
-    :: (HasProcessContext env, HasPlatform env, HasLogFunc env)
-    => ActualCompiler
-    -> RIO env (Map Text Text)
-getUtf8EnvVars compilerVer =
-    if getGhcVersion compilerVer >= mkVersion [7, 10, 3]
-        -- GHC_CHARENC supported by GHC >=7.10.3
-        then pure $ Map.singleton "GHC_CHARENC" "UTF-8"
-        else legacyLocale
-  where
-    legacyLocale = do
-        menv <- view processContextL
-        Platform _ os <- view platformL
-        if os == Cabal.Windows
-            then
-                 -- On Windows, locale is controlled by the code page, so we don't set any environment
-                 -- variables.
-                 pure
-                     Map.empty
-            else do
-                let checkedVars = map checkVar (Map.toList $ view envVarsL menv)
-                    -- List of environment variables that will need to be updated to set UTF-8 (because
-                    -- they currently do not specify UTF-8).
-                    needChangeVars = concatMap fst checkedVars
-                    -- Set of locale-related environment variables that have already have a value.
-                    existingVarNames = Set.unions (map snd checkedVars)
-                    -- True if a locale is already specified by one of the "global" locale variables.
-                    hasAnyExisting =
-                        any (`Set.member` existingVarNames) ["LANG", "LANGUAGE", "LC_ALL"]
-                if null needChangeVars && hasAnyExisting
-                    then
-                         -- If no variables need changes and at least one "global" variable is set, no
-                         -- changes to environment need to be made.
-                         pure
-                             Map.empty
-                    else do
-                        -- Get a list of known locales by running @locale -a@.
-                        elocales <- tryAny $ fmap fst $ proc "locale" ["-a"] readProcess_
-                        let
-                            -- Filter the list to only include locales with UTF-8 encoding.
-                            utf8Locales =
-                                case elocales of
-                                    Left _ -> []
-                                    Right locales ->
-                                        filter
-                                            isUtf8Locale
-                                            (T.lines $
-                                             T.decodeUtf8With
-                                                 T.lenientDecode $
-                                                 LBS.toStrict locales)
-                            mfallback = getFallbackLocale utf8Locales
-                        when
-                            (isNothing mfallback)
-                            (logWarn
-                                 "Warning: unable to set locale to UTF-8 encoding; GHC may fail with 'invalid character'")
-                        let
-                            -- Get the new values of variables to adjust.
-                            changes =
-                                Map.unions $
-                                map
-                                    (adjustedVarValue menv utf8Locales mfallback)
-                                    needChangeVars
-                            -- Get the values of variables to add.
-                            adds
-                              | hasAnyExisting =
-                                  -- If we already have a "global" variable, then nothing needs
-                                  -- to be added.
-                                  Map.empty
-                              | otherwise =
-                                  -- If we don't already have a "global" variable, then set LANG to the
-                                  -- fallback.
-                                  case mfallback of
-                                      Nothing -> Map.empty
-                                      Just fallback ->
-                                          Map.singleton "LANG" fallback
-                        pure (Map.union changes adds)
-    -- Determines whether an environment variable is locale-related and, if so, whether it needs to
-    -- be adjusted.
-    checkVar
-        :: (Text, Text) -> ([Text], Set Text)
-    checkVar (k,v) =
-        if k `elem` ["LANG", "LANGUAGE"] || "LC_" `T.isPrefixOf` k
-            then if isUtf8Locale v
-                     then ([], Set.singleton k)
-                     else ([k], Set.singleton k)
-            else ([], Set.empty)
-    -- Adjusted value of an existing locale variable.  Looks for valid UTF-8 encodings with
-    -- same language /and/ territory, then with same language, and finally the first UTF-8 locale
-    -- returned by @locale -a@.
-    adjustedVarValue
-        :: ProcessContext -> [Text] -> Maybe Text -> Text -> Map Text Text
-    adjustedVarValue menv utf8Locales mfallback k =
-        case Map.lookup k (view envVarsL menv) of
-            Nothing -> Map.empty
-            Just v ->
-                case concatMap
-                         (matchingLocales utf8Locales)
-                         [ T.takeWhile (/= '.') v <> "."
-                         , T.takeWhile (/= '_') v <> "_"] of
-                    (v':_) -> Map.singleton k v'
-                    [] ->
-                        case mfallback of
-                            Just fallback -> Map.singleton k fallback
-                            Nothing -> Map.empty
-    -- Determine the fallback locale, by looking for any UTF-8 locale prefixed with the list in
-    -- @fallbackPrefixes@, and if not found, picking the first UTF-8 encoding returned by @locale
-    -- -a@.
-    getFallbackLocale
-        :: [Text] -> Maybe Text
-    getFallbackLocale utf8Locales =
-        case concatMap (matchingLocales utf8Locales) fallbackPrefixes of
-            (v:_) -> Just v
-            [] ->
-                case utf8Locales of
-                    [] -> Nothing
-                    (v:_) -> Just v
-    -- Filter the list of locales for any with the given prefixes (case-insensitive).
-    matchingLocales
-        :: [Text] -> Text -> [Text]
-    matchingLocales utf8Locales prefix =
-        filter (\v -> T.toLower prefix `T.isPrefixOf` T.toLower v) utf8Locales
-    -- Does the locale have one of the encodings in @utf8Suffixes@ (case-insensitive)?
-    isUtf8Locale locale =
-      any (\ v -> T.toLower v `T.isSuffixOf` T.toLower locale) utf8Suffixes
-    -- Prefixes of fallback locales (case-insensitive)
-    fallbackPrefixes = ["C.", "en_US.", "en_"]
-    -- Suffixes of UTF-8 locales (case-insensitive)
-    utf8Suffixes = [".UTF-8", ".utf8"]
+  Map.delete "GHC_PACKAGE_PATH" .
+  Map.delete "GHC_ENVIRONMENT" .
+  Map.delete "HASKELL_PACKAGE_SANDBOX" .
+  Map.delete "HASKELL_PACKAGE_SANDBOXES" .
+  Map.delete "HASKELL_DIST_DIR" .
+  -- https://github.com/commercialhaskell/stack/issues/1460
+  Map.delete "DESTDIR" .
+  -- https://github.com/commercialhaskell/stack/issues/3444
+  Map.delete "GHCRTS"
+
+-- | Map of environment variables to set to change the GHC's encoding to UTF-8.
+utf8EnvVars :: Map Text Text
+utf8EnvVars =
+  -- GHC_CHARENC supported by GHC >=7.10.3
+  Map.singleton "GHC_CHARENC" "UTF-8"
 
 -- Binary Stack upgrades
 
--- | Information on a binary release of Stack
+-- | Information on a binary release of Stack.
 data StackReleaseInfo
   = SRIGitHub !Value
-  -- ^ Metadata downloaded from GitHub releases about available binaries.
+    -- ^ Metadata downloaded from GitHub releases about available binaries.
   | SRIHaskellStackOrg !HaskellStackOrg
-  -- ^ Information on the latest available binary for the current platforms.
+    -- ^ Information on the latest available binary for the current platforms.
 
 data HaskellStackOrg = HaskellStackOrg
-  { hsoUrl :: !Text
-  , hsoVersion :: !Version
+  { url :: !Text
+  , version :: !Version
   }
   deriving Show
 
-downloadStackReleaseInfo
-  :: (HasPlatform env, HasLogFunc env)
-  => Maybe String -- GitHub org
-  -> Maybe String -- GitHub repo
-  -> Maybe String -- ^ optional version
+-- | Download information on a binary release of Stack. If there is no given
+-- GitHub user, GitHub repository and version, then first tries
+-- @haskellstack.org@.
+downloadStackReleaseInfo ::
+     (HasLogFunc env, HasPlatform env)
+  => Maybe String -- ^ Optional GitHub user.
+  -> Maybe String -- ^ Optional GitHub repository.
+  -> Maybe String -- ^ Optional version.
   -> RIO env StackReleaseInfo
 downloadStackReleaseInfo Nothing Nothing Nothing = do
-    platform <- view platformL
-    -- Fallback list of URLs to try for upgrading.
-    let urls0 =
-          case platform of
-            Platform X86_64 Cabal.Linux ->
-              [ "https://get.haskellstack.org/upgrade/linux-x86_64-static.tar.gz"
-              , "https://get.haskellstack.org/upgrade/linux-x86_64.tar.gz"
-              ]
-            Platform X86_64 Cabal.OSX ->
-              [ "https://get.haskellstack.org/upgrade/osx-x86_64.tar.gz"
-              ]
-            Platform X86_64 Cabal.Windows ->
-              [ "https://get.haskellstack.org/upgrade/windows-x86_64.tar.gz"
-              ]
-            _ -> []
-        -- Helper function: extract the version from a GitHub releases URL.
-    let extractVersion loc = do
-          version0 <-
-            case reverse $ splitOn "/" $ T.unpack loc of
-              _final:version0:_ -> Right version0
-              _ -> Left $ "Insufficient pieces in location: " ++ show loc
-          version1 <- maybe (Left "no leading v on version") Right $ stripPrefix "v" version0
-          maybe (Left $ "Invalid version: " ++ show version1) Right $ parseVersion version1
-
-        -- Try out different URLs. If we've exhausted all of them, fall back to GitHub.
-        loop [] = do
-          logDebug "Could not get binary from haskellstack.org, trying GitHub"
-          downloadStackReleaseInfoGitHub Nothing Nothing Nothing
-
-        -- Try the next URL
-        loop (url:urls) = do
-          -- Make a HEAD request without any redirects
-          req <- setRequestMethod "HEAD" <$> parseRequest (T.unpack url)
-          res <- httpLbs req { redirectCount = 0 }
-
-          -- Look for a redirect. We're looking for a standard GitHub releases
-          -- URL where we can extract version information from.
-          case getResponseHeader "location" res of
-            [] -> logDebug "No location header found, continuing" *> loop urls
-            -- Exactly one location header.
-            [locBS] ->
-              case decodeUtf8' locBS of
-                Left e -> logDebug ("Invalid UTF8: " <> displayShow (locBS, e)) *> loop urls
-                Right loc ->
-                  case extractVersion loc of
-                    Left s -> logDebug ("No version found: " <> displayShow (url, loc, s)) *> loop (loc:urls)
-                    -- We found a valid URL, let's use it!
-                    Right version -> do
-                      let hso = HaskellStackOrg
-                                  { hsoUrl = loc
-                                  , hsoVersion = version
-                                  }
-                      logDebug $ "Downloading from haskellstack.org: " <> displayShow hso
-                      pure $ SRIHaskellStackOrg hso
-            locs -> logDebug ("Multiple location headers found: " <> displayShow locs) *> loop urls
-    loop urls0
-downloadStackReleaseInfo morg mrepo mver = downloadStackReleaseInfoGitHub morg mrepo mver
+  platform <- view platformL
+  -- Fallback list of URLs to try for upgrading.
+  let urls0 =
+        case platform of
+          Platform X86_64 Cabal.Linux ->
+            [ "https://get.haskellstack.org/upgrade/linux-x86_64-static.tar.gz"
+            , "https://get.haskellstack.org/upgrade/linux-x86_64.tar.gz"
+            ]
+          Platform X86_64 Cabal.OSX ->
+            [ "https://get.haskellstack.org/upgrade/osx-x86_64.tar.gz"
+            ]
+          Platform X86_64 Cabal.Windows ->
+            [ "https://get.haskellstack.org/upgrade/windows-x86_64.tar.gz"
+            ]
+          _ -> []
+      -- Helper function: extract the version from a GitHub releases URL.
+  let extractVersion loc = do
+        version0 <-
+          case reverse $ splitOn "/" $ T.unpack loc of
+            _final:version0:_ -> Right version0
+            _ -> Left $ "Insufficient pieces in location: " ++ show loc
+        version1 <-
+          maybe (Left "no leading v on version") Right $ stripPrefix "v" version0
+        maybe (Left $ "Invalid version: " ++ show version1) Right $ parseVersion version1
+
+      -- Try out different URLs. If we've exhausted all of them, fall back to GitHub.
+      loop [] = do
+        logDebug "Could not get binary from haskellstack.org, trying GitHub"
+        downloadStackReleaseInfoGitHub Nothing Nothing Nothing
+
+      -- Try the next URL
+      loop (url:urls) = do
+        -- Make a HEAD request without any redirects
+        req <- setRequestMethod "HEAD" <$> parseRequest (T.unpack url)
+        res <- httpLbs req { redirectCount = 0 }
+
+        -- Look for a redirect. We're looking for a standard GitHub releases
+        -- URL where we can extract version information from.
+        case getResponseHeader "location" res of
+          [] -> logDebug "No location header found, continuing" *> loop urls
+          -- Exactly one location header.
+          [locBS] ->
+            case decodeUtf8' locBS of
+              Left e ->
+                   logDebug
+                     (   "Invalid UTF8: "
+                     <> displayShow (locBS, e)
+                     )
+                *> loop urls
+              Right loc ->
+                case extractVersion loc of
+                  Left s ->
+                       logDebug
+                         (   "No version found: "
+                         <> displayShow (url, loc, s)
+                         )
+                    *> loop (loc:urls)
+                  -- We found a valid URL, let's use it!
+                  Right version -> do
+                    let hso = HaskellStackOrg
+                                { url = loc
+                                , version
+                                }
+                    logDebug $
+                         "Downloading from haskellstack.org: "
+                      <> displayShow hso
+                    pure $ SRIHaskellStackOrg hso
+          locs ->
+               logDebug
+                 (  "Multiple location headers found: "
+                 <> displayShow locs
+                 )
+            *> loop urls
+  loop urls0
+downloadStackReleaseInfo morg mrepo mver =
+  downloadStackReleaseInfoGitHub morg mrepo mver
 
 -- | Same as above, but always uses GitHub
-downloadStackReleaseInfoGitHub
-  :: (MonadIO m, MonadThrow m)
+downloadStackReleaseInfoGitHub ::
+     (MonadIO m, MonadThrow m)
   => Maybe String -- GitHub org
   -> Maybe String -- GitHub repo
   -> Maybe String -- ^ optional version
   -> m StackReleaseInfo
 downloadStackReleaseInfoGitHub morg mrepo mver = liftIO $ do
-    let org = fromMaybe "commercialhaskell" morg
-        repo = fromMaybe "stack" mrepo
-    let url = concat
-            [ "https://api.github.com/repos/"
-            , org
-            , "/"
-            , repo
-            , "/releases/"
-            , case mver of
-                Nothing -> "latest"
-                Just ver -> "tags/v" ++ ver
-            ]
-    req <- parseRequest url
-    res <- httpJSON $ setGitHubHeaders req
-    let code = getResponseStatusCode res
-    if code >= 200 && code < 300
-        then pure $ SRIGitHub $ getResponseBody res
-        else throwString $ "Could not get release information for Stack from: " ++ url
-
-preferredPlatforms :: (MonadReader env m, HasPlatform env, MonadThrow m)
-                   => m [(Bool, String)]
+  let org = fromMaybe "commercialhaskell" morg
+      repo = fromMaybe "stack" mrepo
+  let url = concat
+        [ "https://api.github.com/repos/"
+        , org
+        , "/"
+        , repo
+        , "/releases/"
+        , case mver of
+            Nothing -> "latest"
+            Just ver -> "tags/v" ++ ver
+        ]
+  req <- parseRequest url
+  res <- httpJSON $ setGitHubHeaders req
+  let code = getResponseStatusCode res
+  if code >= 200 && code < 300
+    then pure $ SRIGitHub $ getResponseBody res
+    else prettyThrowIO $ StackReleaseInfoNotFound url
+
+-- | Yield a list of the preferred GHC variants for the platform. The first item
+-- of each pair indicates if the operating system is Windows. The second item
+-- is the name of the GHC variant in Stack's @setup-info@ dictionary.
+preferredPlatforms ::
+     (MonadReader env m, HasPlatform env, MonadThrow m)
+  => m [(Bool, String)]
 preferredPlatforms = do
-    Platform arch' os' <- view platformL
-    (isWindows, os) <-
-      case os' of
-        Cabal.Linux -> pure (False, "linux")
-        Cabal.Windows -> pure (True, "windows")
-        Cabal.OSX -> pure (False, "osx")
-        Cabal.FreeBSD -> pure (False, "freebsd")
-        _ -> throwM $ stringException $ "Binary upgrade not yet supported on OS: " ++ show os'
-    arch <-
-      case arch' of
-        I386 -> pure "i386"
-        X86_64 -> pure "x86_64"
-        Arm -> pure "arm"
-        _ -> throwM $ stringException $ "Binary upgrade not yet supported on arch: " ++ show arch'
-    hasgmp4 <- pure False -- FIXME import relevant code from Stack.Setup? checkLib $(mkRelFile "libgmp.so.3")
-    let suffixes
-          | hasgmp4 = ["-static", "-gmp4", ""]
-          | otherwise = ["-static", ""]
-    pure $ map (\suffix -> (isWindows, concat [os, "-", arch, suffix])) suffixes
-
-downloadStackExe
-    :: HasConfig env
-    => [(Bool, String)] -- ^ acceptable platforms
-    -> StackReleaseInfo
-    -> Path Abs Dir -- ^ destination directory
-    -> Bool -- ^ perform PATH-aware checking, see #3232
-    -> (Path Abs File -> IO ()) -- ^ test the temp exe before renaming
-    -> RIO env ()
+  Platform arch' os' <- view platformL
+  (isWindows, os) <-
+    case os' of
+      Cabal.Linux -> pure (False, "linux")
+      Cabal.Windows -> pure (True, "windows")
+      Cabal.OSX -> pure (False, "osx")
+      Cabal.FreeBSD -> pure (False, "freebsd")
+      _ -> prettyThrowM $ BinaryUpgradeOnOSUnsupported os'
+  arch <-
+    case arch' of
+      I386 -> pure "i386"
+      X86_64 -> pure "x86_64"
+      Arm -> pure "arm"
+      AArch64 -> pure "aarch64"
+      _ -> prettyThrowM $ BinaryUpgradeOnArchUnsupported arch'
+  let hasgmp4 = False -- FIXME import relevant code from Stack.Setup?
+                      -- checkLib $(mkRelFile "libgmp.so.3")
+      suffixes
+          -- 'gmp4' ceased to be relevant after Stack 1.9.3 (December 2018).
+        | hasgmp4 = ["-static", "-gmp4", ""]
+          -- 'static' will cease to be relevant after Stack 2.11.1 (May 2023).
+        | otherwise = ["-static", ""]
+  pure $ map (\suffix -> (isWindows, concat [os, "-", arch, suffix])) suffixes
+
+-- | Download a Stack executable.
+downloadStackExe ::
+     HasConfig env
+  => [(Bool, String)] -- ^ acceptable platforms
+  -> StackReleaseInfo
+  -> Path Abs Dir -- ^ destination directory
+  -> Bool -- ^ perform PATH-aware checking, see #3232
+  -> (Path Abs File -> IO ()) -- ^ test the temp exe before renaming
+  -> RIO env ()
 downloadStackExe platforms0 archiveInfo destDir checkPath testExe = do
-    (isWindows, archiveURL) <-
-      let loop [] = throwString $ "Unable to find binary Stack archive for platforms: "
-                                ++ unwords (map snd platforms0)
-          loop ((isWindows, p'):ps) = do
-            let p = T.pack p'
-            logInfo $ "Querying for archive location for platform: " <> fromString p'
-            case findArchive archiveInfo p of
-              Just x -> pure (isWindows, x)
-              Nothing -> loop ps
-       in loop platforms0
-
-    let (destFile, tmpFile)
-            | isWindows =
-                ( destDir </> relFileStackDotExe
-                , destDir </> relFileStackDotTmpDotExe
-                )
-            | otherwise =
-                ( destDir </> relFileStack
-                , destDir </> relFileStackDotTmp
-                )
+  (isWindows, archiveURL) <-
+    let loop [] =
+          prettyThrowIO $ StackBinaryArchiveNotFound (map snd platforms0)
+        loop ((isWindows, p'):ps) = do
+          let p = T.pack p'
+          prettyInfoL
+            [ flow "Querying for archive location for platform:"
+            , style Current (fromString p') <> "."
+            ]
+          case findArchive archiveInfo p of
+            Just x -> pure (isWindows, x)
+            Nothing -> loop ps
+    in  loop platforms0
+
+  let (destFile, tmpFile)
+        | isWindows =
+            ( destDir </> relFileStackDotExe
+            , destDir </> relFileStackDotTmpDotExe
+            )
+        | otherwise =
+            ( destDir </> relFileStack
+            , destDir </> relFileStackDotTmp
+            )
+
+  prettyInfoL
+    [ flow "Downloading from:"
+    , style Url (fromString $ T.unpack archiveURL) <> "."
+    ]
+
+  liftIO $
+    if | ".tar.gz" `T.isSuffixOf` archiveURL ->
+           handleTarball tmpFile isWindows archiveURL
+       | ".zip" `T.isSuffixOf` archiveURL ->
+            throwIO StackBinaryArchiveZipUnsupportedBug
+       | otherwise -> prettyThrowIO $ StackBinaryArchiveUnsupported archiveURL
+
+  prettyInfoS "Download complete, testing executable."
+
+  -- We need to preserve the name of the executable file before we overwrite the
+  -- currently running binary: after that, Linux will append (deleted) to the
+  -- filename.
+  currExe <- viewExecutablePath
+
+  liftIO $ do
+    setFileExecutable (toFilePath tmpFile)
+    testExe tmpFile
+
+  relocateStackExeFile currExe tmpFile destFile
+
+  prettyInfoL
+    [ flow "New Stack executable available at:"
+    , pretty destFile <> "."
+    ]
+
+  destDir' <- liftIO . D.canonicalizePath . toFilePath $ destDir
+  warnInstallSearchPathIssues destDir' ["stack"]
+
+  when checkPath $ performPathChecking destFile currExe
+    `catchAny` (logError . displayShow)
+ where
 
-    logInfo $ "Downloading from: " <> RIO.display archiveURL
-
-    liftIO $ do
-      case () of
-        ()
-          | ".tar.gz" `T.isSuffixOf` archiveURL -> handleTarball tmpFile isWindows archiveURL
-          | ".zip" `T.isSuffixOf` archiveURL -> error "FIXME: Handle zip files"
-          | otherwise -> error $ "Unknown archive format for Stack archive: " ++ T.unpack archiveURL
-
-    logInfo "Download complete, testing executable"
-
-    platform <- view platformL
-
-    -- We need to call getExecutablePath before we overwrite the
-    -- currently running binary: after that, Linux will append
-    -- (deleted) to the filename.
-    currExe <- liftIO getExecutablePath
-
-    liftIO $ do
-      setFileExecutable (toFilePath tmpFile)
-
-      testExe tmpFile
-
-      case platform of
-          Platform _ Cabal.Windows | FP.equalFilePath (toFilePath destFile) currExe -> do
-              old <- parseAbsFile (toFilePath destFile ++ ".old")
-              renameFile destFile old
-              renameFile tmpFile destFile
-          _ -> renameFile tmpFile destFile
-
-    destDir' <- liftIO . D.canonicalizePath . toFilePath $ destDir
-    warnInstallSearchPathIssues destDir' ["stack"]
-
-    logInfo $ "New Stack executable available at " <> fromString (toFilePath destFile)
-
-    when checkPath $ performPathChecking destFile currExe
-      `catchAny` (logError . displayShow)
-  where
-
-    findArchive (SRIGitHub val) pattern = do
-        Object top <- pure val
-        Array assets <- KeyMap.lookup "assets" top
-        getFirst $ fold $ fmap (First . findMatch pattern') assets
-      where
-        pattern' = mconcat ["-", pattern, "."]
-
-        findMatch pattern'' (Object o) = do
-            String name <- KeyMap.lookup "name" o
-            guard $ not $ ".asc" `T.isSuffixOf` name
-            guard $ pattern'' `T.isInfixOf` name
-            String url <- KeyMap.lookup "browser_download_url" o
-            Just url
-        findMatch _ _ = Nothing
-    findArchive (SRIHaskellStackOrg hso) _ = pure $ hsoUrl hso
-
-    handleTarball :: Path Abs File -> Bool -> T.Text -> IO ()
-    handleTarball tmpFile isWindows url = do
-        req <- fmap setGitHubHeaders $ parseUrlThrow $ T.unpack url
-        withResponse req $ \res -> do
-            entries <- fmap (Tar.read . LBS.fromChunks)
-                     $ lazyConsume
-                     $ getResponseBody res .| ungzip
-            let loop Tar.Done = error $ concat
-                    [ "Stack executable "
-                    , show exeName
-                    , " not found in archive from "
-                    , T.unpack url
-                    ]
-                loop (Tar.Fail e) = throwM e
-                loop (Tar.Next e es) =
-                    case FP.splitPath (Tar.entryPath e) of
-                        -- Ignore the first component, see: https://github.com/commercialhaskell/stack/issues/5288
-                        [_ignored, name] | name == exeName -> do
-                            case Tar.entryContent e of
-                                Tar.NormalFile lbs _ -> do
-                                  ensureDir destDir
-                                  LBS.writeFile (toFilePath tmpFile) lbs
-                                _ -> error $ concat
-                                    [ "Invalid file type for tar entry named "
-                                    , Tar.entryPath e
-                                    , " downloaded from "
-                                    , T.unpack url
-                                    ]
-                        _ -> loop es
-            loop entries
-      where
-        exeName
-          | isWindows = "stack.exe"
-          | otherwise = "stack"
-
--- | Ensure that the Stack executable download is in the same location
--- as the currently running executable. See:
+  findArchive (SRIGitHub val) platformPattern = do
+    Object top <- pure val
+    Array assets <- KeyMap.lookup "assets" top
+    getFirst $ foldMap (First . findMatch pattern') assets
+   where
+    pattern' = mconcat ["-", platformPattern, "."]
+
+    findMatch pattern'' (Object o) = do
+        String name <- KeyMap.lookup "name" o
+        guard $ not $ ".asc" `T.isSuffixOf` name
+        guard $ pattern'' `T.isInfixOf` name
+        String url <- KeyMap.lookup "browser_download_url" o
+        Just url
+    findMatch _ _ = Nothing
+  findArchive (SRIHaskellStackOrg hso) _ = pure hso.url
+
+  handleTarball :: Path Abs File -> Bool -> T.Text -> IO ()
+  handleTarball tmpFile isWindows url = do
+    req <- fmap setGitHubHeaders $ parseUrlThrow $ T.unpack url
+    withResponse req $ \res -> do
+      entries <- fmap (Tar.read . LBS.fromChunks)
+        $ lazyConsume
+        $ getResponseBody res .| ungzip
+      let loop Tar.Done = prettyThrowIO $ StackBinaryNotInArchive exeName url
+          loop (Tar.Fail e) = throwM e
+          loop (Tar.Next e es) =
+            case FP.splitPath (Tar.entryPath e) of
+              -- Ignore the first component, see:
+              -- https://github.com/commercialhaskell/stack/issues/5288
+              [_ignored, name] | name == exeName -> do
+                case Tar.entryContent e of
+                  Tar.NormalFile lbs _ -> do
+                    ensureDir destDir
+                    LBS.writeFile (toFilePath tmpFile) lbs
+                  _ -> prettyThrowIO $ FileTypeInArchiveInvalid e url
+              _ -> loop es
+      loop entries
+   where
+    exeName
+      | isWindows = "stack.exe"
+      | otherwise = "stack"
+
+relocateStackExeFile ::
+     HasTerm env
+  => Path Abs File
+     -- ^ Path to the currently running executable
+  -> Path Abs File
+     -- ^ Path to the executable file to be relocated
+  -> Path Abs File
+     -- ^ Path to the new location for the excutable file
+  -> RIO env ()
+relocateStackExeFile currExeFile newExeFile destExeFile = do
+  when (osIsWindows && destExeFile == currExeFile) $ do
+    -- Windows allows a running executable's file to be renamed, but not to be
+    -- overwritten.
+    old <- addExtension ".old" currExeFile
+    prettyInfoL
+      [ flow "Renaming existing:"
+      , pretty currExeFile
+      , "as:"
+      , pretty old <> "."
+      ]
+    renameFile currExeFile old
+  renameFile newExeFile destExeFile
+
+-- | Ensure that the Stack executable download is in the same location as the
+-- currently running executable. See:
 -- https://github.com/commercialhaskell/stack/issues/3232
-performPathChecking
-    :: HasConfig env
-    => Path Abs File -- ^ location of the newly downloaded file
-    -> String -- ^ currently running executable
-    -> RIO env ()
-performPathChecking newFile executablePath = do
-  executablePath' <- parseAbsFile executablePath
-  unless (toFilePath newFile == executablePath) $ do
-    logInfo $ "Also copying Stack executable to " <> fromString executablePath
-    tmpFile <- parseAbsFile $ executablePath ++ ".tmp"
-    eres <- tryIO $ do
-      liftIO $ copyFile newFile tmpFile
-      setFileExecutable (toFilePath tmpFile)
-      liftIO $ renameFile tmpFile executablePath'
-      logInfo "Stack executable copied successfully!"
-    case eres of
-      Right () -> pure ()
+performPathChecking ::
+     HasConfig env
+  => Path Abs File
+     -- ^ Path to the newly downloaded file
+  -> Path Abs File
+     -- ^ Path to the currently running executable
+  -> RIO env ()
+performPathChecking newExeFile currExeFile = do
+  unless (newExeFile == currExeFile) $ do
+    prettyInfoL
+      [ flow "Also copying Stack executable to:"
+      , pretty currExeFile <> "."
+      ]
+    tmpFile <- toFilePath <$> addExtension ".tmp" currExeFile
+    tryIO (relocateStackExeFile currExeFile newExeFile currExeFile) >>= \case
+      Right () -> prettyInfoS "Stack executable copied successfully!"
       Left e
-        | isPermissionError e -> do
-            logWarn $ "Permission error when trying to copy: " <> displayShow e
-            logWarn "Should I try to perform the file copy using sudo? This may fail"
-            toSudo <- promptBool "Try using sudo? (y/n) "
-            when toSudo $ do
-              let run cmd args = do
-                    ec <- proc cmd args runProcess
-                    when (ec /= ExitSuccess) $ error $ concat
-                          [ "Process exited with "
-                          , show ec
-                          , ": "
-                          , unwords (cmd:args)
-                          ]
-                  commands =
-                    [ ("sudo",
-                        [ "cp"
-                        , toFilePath newFile
-                        , toFilePath tmpFile
-                        ])
-                    , ("sudo",
-                        [ "mv"
-                        , toFilePath tmpFile
-                        , executablePath
-                        ])
-                    ]
-              logInfo "Going to run the following commands:"
-              logInfo ""
-              forM_ commands $ \(cmd, args) ->
-                logInfo $ "-  " <> mconcat (intersperse " " (fromString <$> (cmd:args)))
-              mapM_ (uncurry run) commands
-              logInfo ""
-              logInfo "sudo file copy worked!"
+        | isPermissionError e -> if osIsWindows
+            then do
+              prettyWarn $
+                   flow "Permission error when trying to copy:"
+                <> blankLine
+                <> string (displayException e)
+            else do
+              prettyWarn $
+                   flow "Permission error when trying to copy:"
+                <> blankLine
+                <> string (displayException e)
+                <> blankLine
+                <> fillSep
+                     [ flow "Should I try to perform the file copy using"
+                     , style Shell "sudo" <> "?"
+                     , flow "This may fail."
+                     ]
+              toSudo <- promptBool "Try using sudo? (y/n) "
+              when toSudo $ do
+                let run cmd args = do
+                      ec <- proc cmd args runProcess
+                      when (ec /= ExitSuccess) $
+                        throwIO $ ProcessExited ec cmd args
+                    commands =
+                      [ ("sudo",
+                          [ "cp"
+                          , toFilePath newExeFile
+                          , tmpFile
+                          ])
+                      , ("sudo",
+                          [ "mv"
+                          , tmpFile
+                          , toFilePath currExeFile
+                          ])
+                      ]
+                prettyInfo $
+                     flow "Going to run the following commands:"
+                  <> blankLine
+                  <> bulletedList
+                       ( map
+                         ( \(cmd, args) ->
+                             style Shell $ fillSep
+                               $ fromString cmd
+                               : map fromString args
+                         )
+                         commands
+                       )
+                mapM_ (uncurry run) commands
+                prettyInfo $
+                     line
+                  <> flow "sudo file copy worked!"
         | otherwise -> throwM e
 
+-- | If available, yields the version of the given binary release of Stack.
 getDownloadVersion :: StackReleaseInfo -> Maybe Version
 getDownloadVersion (SRIGitHub val) = do
-    Object o <- Just val
-    String rawName <- KeyMap.lookup "name" o
-    -- drop the "v" at the beginning of the name
-    parseVersion $ T.unpack (T.drop 1 rawName)
-getDownloadVersion (SRIHaskellStackOrg hso) = Just $ hsoVersion hso
+  Object o <- Just val
+  String rawName <- KeyMap.lookup "name" o
+  -- drop the "v" at the beginning of the name
+  parseVersion $ T.unpack (T.drop 1 rawName)
+getDownloadVersion (SRIHaskellStackOrg hso) = Just hso.version
diff --git a/src/Stack/Setup/Installed.hs b/src/Stack/Setup/Installed.hs
index 4da6da5a32..137747d99c 100644
--- a/src/Stack/Setup/Installed.hs
+++ b/src/Stack/Setup/Installed.hs
@@ -1,61 +1,71 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE ConstraintKinds   #-}
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE LambdaCase        #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ViewPatterns      #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ViewPatterns        #-}
+
+{-|
+Module      : Stack.Setup.Installed
+License     : BSD-3-Clause
+-}
 
 module Stack.Setup.Installed
-    ( getCompilerVersion
-    , markInstalled
-    , unmarkInstalled
-    , listInstalled
-    , Tool (..)
-    , toolString
-    , toolNameString
-    , parseToolText
-    , filterTools
-    , extraDirs
-    , installDir
-    , tempInstallDir
-    ) where
+  ( getCompilerVersion
+  , markInstalled
+  , unmarkInstalled
+  , listInstalled
+  , Tool (..)
+  , toolString
+  , toolNameString
+  , parseToolText
+  , filterTools
+  , toolExtraDirs
+  , installDir
+  , tempInstallDir
+  ) where
 
-import           Stack.Prelude
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.ByteString.Lazy as BL
+import           Data.Char ( isDigit )
 import qualified Data.List as L
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
-import           Distribution.System (Platform (..))
+import           Distribution.System ( Platform (..) )
 import qualified Distribution.System as Cabal
-import           Path
-import           Path.IO
+import           Path ( (</>), filename, parseRelDir, parseRelFile )
+import           Path.IO ( doesDirExist, ignoringAbsence, listDir, removeFile )
+import           RIO.Process ( HasProcessContext, proc, readProcess_ )
 import           Stack.Constants
+                   ( relDirBin, relDirInclude, relDirLib, relDirLocal
+                   , relDirMingw, relDirUsr
+                   )
+import           Stack.Prelude
 import           Stack.Types.Compiler
-import           Stack.Types.Config
-import           RIO.Process
+                   ( ActualCompiler (..), WhichCompiler (..) )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.Config.Exception ( ConfigPrettyException (..) )
+import           Stack.Types.ExtraDirs ( ExtraDirs (..) )
+import           Stack.Types.MsysEnvironment ( relDirMsysEnv )
 
 data Tool
-    = Tool PackageIdentifier -- ^ e.g. ghc-7.8.4, msys2-20150512
-    | ToolGhcGit !Text !Text   -- ^ e.g. ghc-git-COMMIT_ID-FLAVOUR
-    deriving (Eq)
+  = Tool PackageIdentifier -- ^ e.g. ghc-7.8.4, msys2-20150512
+  | ToolGhcGit !Text !Text   -- ^ e.g. ghc-git-COMMIT_ID-FLAVOUR
+  deriving Eq
 
--- | 'Tool' values are ordered by name (being @ghc-git@, for @ToolGhcGit _ _@)
+-- | t'Tool' values are ordered by name (being @ghc-git@, for @ToolGhcGit _ _@)
 -- alphabetically and then by version (later versions are ordered before
 -- earlier versions, where applicable).
 instance Ord Tool where
   compare (Tool pkgId1) (Tool pkgId2) = if pkgName1 == pkgName2
-      then compare pkgVersion2 pkgVersion1 -- Later versions ordered first
-      else compare pkgName1 pkgName2
-    where
-      PackageIdentifier pkgName1 pkgVersion1 = pkgId1
-      PackageIdentifier pkgName2 pkgVersion2 = pkgId2
+    then compare pkgVersion2 pkgVersion1 -- Later versions ordered first
+    else compare pkgName1 pkgName2
+   where
+    PackageIdentifier pkgName1 pkgVersion1 = pkgId1
+    PackageIdentifier pkgName2 pkgVersion2 = pkgId2
   compare (Tool pkgId) (ToolGhcGit _ _) = compare (pkgName pkgId) "ghc-git"
   compare (ToolGhcGit _ _) (Tool pkgId) = compare "ghc-git" (pkgName pkgId)
   compare (ToolGhcGit c1 f1) (ToolGhcGit c2 f2) = if f1 == f2
-      then compare c1 c2
-      else compare f1 f2
+    then compare c1 c2
+    else compare f1 f2
 
 toolString :: Tool -> String
 toolString (Tool ident) = packageIdentifierString ident
@@ -71,125 +81,126 @@ parseToolText (parseWantedCompiler -> Right (WCGhcGit c f)) = Just (ToolGhcGit c
 parseToolText (parsePackageIdentifier . T.unpack -> Just pkgId) = Just (Tool pkgId)
 parseToolText _ = Nothing
 
-markInstalled :: (MonadIO m, MonadThrow m)
-              => Path Abs Dir
-              -> Tool
-              -> m ()
+markInstalled ::
+     (MonadIO m, MonadThrow m)
+  => Path Abs Dir
+  -> Tool
+  -> m ()
 markInstalled programsPath tool = do
-    fpRel <- parseRelFile $ toolString tool ++ ".installed"
-    writeBinaryFileAtomic (programsPath </> fpRel) "installed"
+  fpRel <- parseRelFile $ toolString tool ++ ".installed"
+  writeBinaryFileAtomic (programsPath </> fpRel) "installed"
 
-unmarkInstalled :: MonadIO m
-                => Path Abs Dir
-                -> Tool
-                -> m ()
+unmarkInstalled ::
+     MonadIO m
+  => Path Abs Dir
+  -> Tool
+  -> m ()
 unmarkInstalled programsPath tool = liftIO $ do
-    fpRel <- parseRelFile $ toolString tool ++ ".installed"
-    ignoringAbsence (removeFile $ programsPath </> fpRel)
-
-listInstalled :: (MonadIO m, MonadThrow m)
-              => Path Abs Dir
-              -> m [Tool]
-listInstalled programsPath = do
-    doesDirExist programsPath >>= \case
-        False -> pure []
-        True -> do (_, files) <- listDir programsPath
-                   pure $ mapMaybe toTool files
-  where
-    toTool fp = do
-        x <- T.stripSuffix ".installed" $ T.pack $ toFilePath $ filename fp
-        parseToolText x
-
-filterTools :: PackageName       -- ^ package to find
-            -> (Version -> Bool) -- ^ which versions are acceptable
-            -> [Tool]            -- ^ tools to filter
-            -> [PackageIdentifier]
+  fpRel <- parseRelFile $ toolString tool ++ ".installed"
+  ignoringAbsence (removeFile $ programsPath </> fpRel)
+
+listInstalled ::
+     (MonadIO m, MonadThrow m)
+  => Path Abs Dir
+  -> m [Tool]
+listInstalled programsPath =
+  doesDirExist programsPath >>= \case
+    False -> pure []
+    True -> do (_, files) <- listDir programsPath
+               pure $ mapMaybe toTool files
+ where
+  toTool fp = do
+    x <- T.stripSuffix ".installed" $ T.pack $ toFilePath $ filename fp
+    parseToolText x
+
+filterTools ::
+     PackageName       -- ^ package to find
+  -> (Version -> Bool) -- ^ which versions are acceptable
+  -> [Tool]            -- ^ tools to filter
+  -> [PackageIdentifier]
 filterTools name goodVersion installed =
-    [ pkgId | Tool pkgId <- installed
-            , pkgName pkgId == name
-            , goodVersion (pkgVersion pkgId) ]
+  [ pkgId | Tool pkgId <- installed
+          , pkgName pkgId == name
+          , goodVersion (pkgVersion pkgId) ]
 
-getCompilerVersion
-  :: (HasProcessContext env, HasLogFunc env)
+getCompilerVersion ::
+     (HasProcessContext env, HasLogFunc env)
   => WhichCompiler
   -> Path Abs File -- ^ executable
   -> RIO env ActualCompiler
-getCompilerVersion wc exe = do
-    case wc of
-        Ghc -> do
-            logDebug "Asking GHC for its version"
-            bs <- fst <$> proc (toFilePath exe) ["--numeric-version"] readProcess_
-            let (_, ghcVersion) = versionFromEnd $ BL.toStrict bs
-            x <- ACGhc <$> parseVersionThrowing (T.unpack $ T.decodeUtf8 ghcVersion)
-            logDebug $ "GHC version is: " <> display x
-            pure x
-  where
-    versionFromEnd = S8.spanEnd isValid . fst . S8.breakEnd isValid
-    isValid c = c == '.' || ('0' <= c && c <= '9')
+getCompilerVersion wc exe =
+  case wc of
+    Ghc -> do
+      logDebug "Asking GHC for its version"
+      bs <- fst <$> proc (toFilePath exe) ["--numeric-version"] readProcess_
+      let (_, ghcVersion) = versionFromEnd $ BL.toStrict bs
+      x <- ACGhc <$> parseVersionThrowing (T.unpack $ T.decodeUtf8 ghcVersion)
+      logDebug $ "GHC version is: " <> display x
+      pure x
+ where
+  versionFromEnd = S8.spanEnd isValid . fst . S8.breakEnd isValid
+  isValid c = c == '.' || isDigit c
 
 -- | Binary directories for the given installed package
-extraDirs :: HasConfig env => Tool -> RIO env ExtraDirs
-extraDirs tool = do
-    config <- view configL
-    dir <- installDir (configLocalPrograms config) tool
-    case (configPlatform config, toolNameString tool) of
-        (Platform _ Cabal.Windows, isGHC -> True) -> pure mempty
-            { edBins =
-                [ dir </> relDirBin
-                , dir </> relDirMingw </> relDirBin
-                ]
-            }
-        (Platform Cabal.I386 Cabal.Windows, "msys2") -> pure mempty
-            { edBins =
-                [ dir </> relDirMingw32 </> relDirBin
-                , dir </> relDirUsr </> relDirBin
-                , dir </> relDirUsr </> relDirLocal </> relDirBin
-                ]
-            , edInclude =
-                [ dir </> relDirMingw32 </> relDirInclude
-                ]
-            , edLib =
-                [ dir </> relDirMingw32 </> relDirLib
-                , dir </> relDirMingw32 </> relDirBin
-                ]
-            }
-        (Platform Cabal.X86_64 Cabal.Windows, "msys2") -> pure mempty
-            { edBins =
-                [ dir </> relDirMingw64 </> relDirBin
-                , dir </> relDirUsr </> relDirBin
-                , dir </> relDirUsr </> relDirLocal </> relDirBin
-                ]
-            , edInclude =
-                [ dir </> relDirMingw64 </> relDirInclude
-                ]
-            , edLib =
-                [ dir </> relDirMingw64 </> relDirLib
-                , dir </> relDirMingw64 </> relDirBin
-                ]
-            }
-        (_, isGHC -> True) -> pure mempty
-            { edBins =
-                [ dir </> relDirBin
-                ]
-            }
-        (Platform _ x, toolName) -> do
-            logWarn $ "binDirs: unexpected OS/tool combo: " <> displayShow (x, toolName)
-            pure mempty
-  where
-    isGHC n = "ghc" == n || "ghc-" `L.isPrefixOf` n
-
-installDir :: (MonadReader env m, MonadThrow m)
-           => Path Abs Dir
-           -> Tool
-           -> m (Path Abs Dir)
+toolExtraDirs :: HasConfig env => Tool -> RIO env ExtraDirs
+toolExtraDirs tool = do
+  config <- view configL
+  dir <- installDir config.localPrograms tool
+  case (config.platform, toolNameString tool) of
+    (Platform _ Cabal.Windows, isGHC -> True) -> pure mempty
+      { bins =
+          [ dir </> relDirBin
+          , dir </> relDirMingw </> relDirBin
+          ]
+      }
+    (Platform _ Cabal.Windows, "msys2") -> do
+      relDirMsysEnvPrefix <- case config.msysEnvironment of
+        Just msysEnv -> pure $ relDirMsysEnv msysEnv
+        Nothing -> throwM NoMsysEnvironmentBug
+      pure mempty
+        { bins =
+            [ dir </> relDirMsysEnvPrefix </> relDirBin
+              -- Stack follows the Unix-like convention that usr/local/bin
+              -- should have search priority over usr/bin.
+            , dir </> relDirUsr </> relDirLocal </> relDirBin
+            , dir </> relDirUsr </> relDirBin
+            ]
+        , includes =
+            [ dir </> relDirMsysEnvPrefix </> relDirInclude
+            ]
+        , libs =
+            [ dir </> relDirMsysEnvPrefix </> relDirLib
+            , dir </> relDirMsysEnvPrefix </> relDirBin
+            ]
+        }
+    (_, isGHC -> True) -> pure mempty
+      { bins =
+          [ dir </> relDirBin
+          ]
+      }
+    (Platform _ x, toolName) -> do
+      prettyWarnL
+        [ flow "binDirs: unexpected OS/tool combo:"
+        , flow (show (x, toolName) <> ".")
+        ]
+      pure mempty
+ where
+  isGHC n = "ghc" == n || "ghc-" `L.isPrefixOf` n
+
+installDir ::
+     (MonadReader env m, MonadThrow m)
+  => Path Abs Dir
+  -> Tool
+  -> m (Path Abs Dir)
 installDir programsDir tool = do
-    relativeDir <- parseRelDir $ toolString tool
-    pure $ programsDir </> relativeDir
+  relativeDir <- parseRelDir $ toolString tool
+  pure $ programsDir </> relativeDir
 
-tempInstallDir :: (MonadReader env m, MonadThrow m)
-           => Path Abs Dir
-           -> Tool
-           -> m (Path Abs Dir)
+tempInstallDir ::
+     (MonadReader env m, MonadThrow m)
+  => Path Abs Dir
+  -> Tool
+  -> m (Path Abs Dir)
 tempInstallDir programsDir tool = do
-    relativeDir <- parseRelDir $ toolString tool ++ ".temp"
-    pure $ programsDir </> relativeDir
+  relativeDir <- parseRelDir $ toolString tool ++ ".temp"
+  pure $ programsDir </> relativeDir
diff --git a/src/Stack/SetupCmd.hs b/src/Stack/SetupCmd.hs
index e2aa56ca37..eb339107a3 100644
--- a/src/Stack/SetupCmd.hs
+++ b/src/Stack/SetupCmd.hs
@@ -1,97 +1,136 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE ConstraintKinds   #-}
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.SetupCmd
+Description : Function related to Stack's @setup@ command.
+License     : BSD-3-Clause
+
+Function related to Stack's @setup@ command.
+-}
 
--- | Install GHC/GHCJS and Cabal.
 module Stack.SetupCmd
-    ( setup
-    , setupParser
-    , SetupCmdOpts(..)
-    ) where
+  ( setupCmd
+  ) where
 
-import           Control.Applicative
-import qualified Data.Text as T
-import qualified Options.Applicative as OA
-import qualified Options.Applicative.Builder.Extra as OA
-import qualified Options.Applicative.Types as OA
-import           Path
+import qualified Data.Either.Extra as EE
 import           Stack.Prelude
-import           Stack.Setup
-import           Stack.Types.Config
-import           Stack.Types.Version
+import           Stack.Runners
+                   ( ShouldReexec (..), withBuildConfig, withConfig )
+import           Stack.Setup ( SetupOpts (..), ensureCompilerAndMsys )
+import           Stack.Types.BuildConfig
+                   ( HasBuildConfig, configFileL, wantedCompilerVersionL )
+import           Stack.Types.CompilerPaths ( CompilerPaths (..) )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.GHCVariant ( HasGHCVariant )
+import           Stack.Types.Runner ( Runner )
+import           Stack.Types.SetupOpts ( SetupCmdOpts (..) )
+import           Stack.Types.Version ( VersionCheck (..) )
 
-data SetupCmdOpts = SetupCmdOpts
-    { scoCompilerVersion :: !(Maybe WantedCompiler)
-    , scoForceReinstall  :: !Bool
-    , scoGHCBindistURL   :: !(Maybe String)
-    , scoGHCJSBootOpts   :: ![String]
-    , scoGHCJSBootClean  :: !Bool
-    }
+-- | Function underlying the @stack setup@ command.
+setupCmd :: SetupCmdOpts -> RIO Runner ()
+setupCmd sco = withConfig YesReexec $ do
+  installGHC <- view $ configL . to (.installGHC)
+  installMsys <- view $ configL . to (.installMsys)
+  case (installGHC, installMsys) of
+    (True, True) -> withBuildConfig $ do
+      (wantedCompiler, compilerCheck, mConfigFile) <-
+        case sco.compilerVersion of
+          Just v -> pure (v, MatchMinor, Nothing)
+          Nothing -> do
+           wantedCompilerVersion <- view wantedCompilerVersionL
+           compilerCheck <- view (configL . to (.compilerCheck))
+           configFile <- view configFileL
+           -- We are indifferent as to whether the configuration file is a
+           -- user-specific global or a project-level one.
+           let eitherConfigFile = EE.fromEither configFile
+           pure
+             ( wantedCompilerVersion
+             , compilerCheck
+             , Just eitherConfigFile
+             )
+      setup sco wantedCompiler compilerCheck mConfigFile
+    (False, True) -> warn
+      [ styledNoInstallGHC
+      , singleFlag
+      ]
+    (True, False) -> warn
+      [ styledNoInstallMsys
+      , singleFlag
+      ]
+    (False, False) -> warn
+      [ styledNoInstallGHC
+      , "and"
+      , styledNoInstallMsys
+      , flow "flags are"
+      ]
+ where
+  styledNoInstallGHC = style Shell "--no-install-ghc"
+  styledNoInstallMsys = style Shell "--no-install-msys"
+  singleFlag = flow "flag is"
+  warn docs = prettyWarnL $
+       ["The"]
+    <> docs
+    <> [ flow "inconsistent with"
+       , style Shell (flow "stack setup") <> "."
+       , flow "No action taken."
+       ]
 
-setupParser :: OA.Parser SetupCmdOpts
-setupParser = SetupCmdOpts
-    <$> OA.optional (OA.argument readVersion
-            (OA.metavar "GHC_VERSION" <>
-             OA.help ("Version of GHC to install, e.g. 7.10.2. " ++
-                      "The default is to install the version implied by the resolver.")))
-    <*> OA.boolFlags False
-            "reinstall"
-            "reinstalling GHC, even if available (incompatible with --system-ghc)"
-            OA.idm
-    <*> OA.optional (OA.strOption
-            (OA.long "ghc-bindist"
-           <> OA.metavar "URL"
-           <> OA.help "Alternate GHC binary distribution (requires custom --ghc-variant)"))
-    <*> OA.many (OA.strOption
-            (OA.long "ghcjs-boot-options"
-           <> OA.metavar "GHCJS_BOOT"
-           <> OA.help "Additional ghcjs-boot options"))
-    <*> OA.boolFlags True
-            "ghcjs-boot-clean"
-            "Control if ghcjs-boot should have --clean option present"
-            OA.idm
-  where
-    readVersion = do
-        s <- OA.readerAsk
-        case parseWantedCompiler ("ghc-" <> T.pack s) of
-            Left _ ->
-                case parseWantedCompiler (T.pack s) of
-                    Left _ -> OA.readerError $ "Invalid version: " ++ s
-                    Right x -> pure x
-            Right x -> pure x
-
-setup
-    :: (HasBuildConfig env, HasGHCVariant env)
-    => SetupCmdOpts
-    -> WantedCompiler
-    -> VersionCheck
-    -> Maybe (Path Abs File)
-    -> RIO env ()
-setup SetupCmdOpts{..} wantedCompiler compilerCheck mstack = do
-    Config{..} <- view configL
-    sandboxedGhc <- cpSandboxed . fst <$> ensureCompilerAndMsys SetupOpts
-        { soptsInstallIfMissing = True
-        , soptsUseSystem = configSystemGHC && not scoForceReinstall
-        , soptsWantedCompiler = wantedCompiler
-        , soptsCompilerCheck = compilerCheck
-        , soptsStackYaml = mstack
-        , soptsForceReinstall = scoForceReinstall
-        , soptsSanityCheck = True
-        , soptsSkipGhcCheck = False
-        , soptsSkipMsys = configSkipMsys
-        , soptsResolveMissingGHC = Nothing
-        , soptsGHCBindistURL = scoGHCBindistURL
-        }
-    let compiler = case wantedCompiler of
-            WCGhc _ -> "GHC"
-            WCGhcGit{} -> "GHC (built from source)"
-            WCGhcjs {} -> "GHCJS"
-    if sandboxedGhc
-        then logInfo $ "Stack will use a sandboxed " <> compiler <> " it installed."
-        else logInfo $ "Stack will use the " <> compiler <> " on your PATH."
-    logInfo "For more information on paths, see 'stack path' and 'stack exec env'."
-    logInfo $ "To use this " <> compiler <> " and packages outside of a project, consider using:"
-    logInfo "'stack ghc', 'stack ghci', 'stack runghc', or 'stack exec'."
+setup ::
+     (HasBuildConfig env, HasGHCVariant env)
+  => SetupCmdOpts
+  -> WantedCompiler
+  -> VersionCheck
+  -> Maybe (Path Abs File)
+     -- ^ If we got the desired GHC version from that configuration file, which
+     -- may be either a user-specific global or a project-level one.
+  -> RIO env ()
+setup sco wantedCompiler compilerCheck configFile = do
+  config <- view configL
+  sandboxedGhc <- (.sandboxed) . fst <$> ensureCompilerAndMsys SetupOpts
+    { installGhcIfMissing = True
+    , installMsysIfMissing = True
+    , useSystem = config.systemGHC && not sco.forceReinstall
+    , wantedCompiler
+    , compilerCheck
+    , configFile
+    , forceReinstall = sco.forceReinstall
+    , sanityCheck = True
+    , skipGhcCheck = False
+    , skipMsys = config.skipMsys
+    , resolveMissingGHC = Nothing
+    , ghcBindistURL = sco.ghcBindistUrl
+    }
+  let compiler = case wantedCompiler of
+        WCGhc _ -> "GHC"
+        WCGhcGit{} -> "GHC (built from source)"
+        WCGhcjs {} -> "GHCJS"
+      compilerHelpMsg = fillSep
+        [ flow "To use this"
+        , compiler
+        , flow "and packages outside of a project, consider using:"
+        , style Shell (flow "stack ghc") <> ","
+        , style Shell (flow "stack ghci") <> ","
+        , style Shell (flow "stack runghc") <> ","
+        , "or"
+        , style Shell (flow "stack exec") <> "."
+        ]
+  if sandboxedGhc
+    then prettyInfoL
+      [ flow "Stack will use a sandboxed"
+      , compiler
+      , flow "it installed."
+      , compilerHelpMsg
+      ]
+    else prettyInfoL
+      [ flow "Stack will use the"
+      , compiler
+      , flow "on your PATH. For more information on paths, see"
+      , style Shell (flow "stack path")
+      , "and"
+      , style Shell (flow "stack exec env") <> "."
+      , compilerHelpMsg
+      ]
diff --git a/src/Stack/SourceMap.hs b/src/Stack/SourceMap.hs
index d25a622b0b..823f219b99 100644
--- a/src/Stack/SourceMap.hs
+++ b/src/Stack/SourceMap.hs
@@ -1,187 +1,207 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
-{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.SourceMap
+License     : BSD-3-Clause
+-}
 
 module Stack.SourceMap
-    ( mkProjectPackage
-    , snapToDepPackage
-    , additionalDepPackage
-    , loadVersion
-    , getPLIVersion
-    , loadGlobalHints
-    , DumpedGlobalPackage
-    , actualFromGhc
-    , actualFromHints
-    , checkFlagsUsedThrowing
-    , globalCondCheck
-    , pruneGlobals
-    , globalsFromHints
-    , getCompilerInfo
-    , immutableLocSha
-    , loadProjectSnapshotCandidate
-    , SnapshotCandidate
-    , globalsFromDump
-    ) where
+  ( mkProjectPackage
+  , snapToDepPackage
+  , additionalDepPackage
+  , loadVersion
+  , getPLIVersion
+  , loadGlobalHints
+  , actualFromGhc
+  , globalCondCheck
+  , pruneGlobals
+  , globalsFromHints
+  , getCompilerInfo
+  , immutableLocSha
+  , loadProjectSnapshotCandidate
+  , SnapshotCandidate
+  , globalsFromDump
+  ) where
 
-import Data.ByteString.Builder (byteString)
+import           Data.ByteString.Builder ( byteString )
 import qualified Data.Conduit.List as CL
+import qualified Data.Text as T
 import qualified Distribution.PackageDescription as PD
-import Distribution.System (Platform(..))
+import           Distribution.System ( Platform (..) )
 import qualified Pantry.SHA256 as SHA256
-import qualified RIO
 import qualified RIO.Map as Map
-import qualified RIO.Set as Set
-import RIO.Process
-import Stack.PackageDump
-import Stack.Prelude
-import Stack.Types.Build
-import Stack.Types.Compiler
-import Stack.Types.Config
-import Stack.Types.SourceMap
+import           RIO.Process ( HasProcessContext )
+import           Stack.Constants ( stackProgName' )
+import           Stack.PackageDump ( conduitDumpPackage, ghcPkgDump )
+import           Stack.Prelude
+import           Stack.Types.Compiler
+                   ( ActualCompiler, wantedToActual )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), GhcPkgExe, HasCompiler (..) )
+import           Stack.Types.Config ( HasConfig )
+import           Stack.Types.DumpPackage
+                   ( DumpPackage (..), DumpedGlobalPackage )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( rslInLogL )
+import           Stack.Types.SourceMap
+                   ( CommonPackage (..), DepPackage (..), FromSnapshot (..)
+                   , GlobalPackage (..), GlobalPackageVersion (..)
+                   , ProjectPackage (..), SMActual (..), SMWanted (..)
+                   )
 
--- | Create a 'ProjectPackage' from a directory containing a package.
+-- | Create a t'ProjectPackage' from a directory containing a package.
 mkProjectPackage ::
-       forall env. (HasPantryConfig env, HasLogFunc env, HasProcessContext env)
-    => PrintWarnings
-    -> ResolvedPath Dir
-    -> Bool
-    -> RIO env ProjectPackage
-mkProjectPackage printWarnings dir buildHaddocks = do
-   (gpd, name, cabalfp) <- loadCabalFilePath (resolvedAbsolute dir)
-   pure ProjectPackage
-     { ppCabalFP = cabalfp
-     , ppResolvedDir = dir
-     , ppCommon = CommonPackage
-                  { cpGPD = gpd printWarnings
-                  , cpName = name
-                  , cpFlags = mempty
-                  , cpGhcOptions = mempty
-                  , cpCabalConfigOpts = mempty
-                  , cpHaddocks = buildHaddocks
-                  }
-     }
+     forall env. (HasPantryConfig env, HasLogFunc env, HasProcessContext env)
+  => PrintWarnings
+  -> ResolvedPath Dir
+  -> Bool
+     -- ^ Should Haddock documentation be built for the package?
+  -> RIO env ProjectPackage
+mkProjectPackage printWarnings resolvedDir buildHaddocks = do
+  (gpd, name, cabalFP) <-
+    loadCabalFilePath (Just stackProgName') (resolvedAbsolute resolvedDir)
+  pure ProjectPackage
+    { cabalFP
+    , resolvedDir
+    , projectCommon =
+        CommonPackage
+          { gpd = gpd printWarnings
+          , name
+          , flags = mempty
+          , ghcOptions = mempty
+          , cabalConfigOpts = mempty
+          , buildHaddocks
+          }
+    }
 
--- | Create a 'DepPackage' from a 'PackageLocation', from some additional
--- to a snapshot setting (extra-deps or command line)
-additionalDepPackage
-  :: forall env. (HasPantryConfig env, HasLogFunc env, HasProcessContext env)
+-- | Create a t'DepPackage' from a 'PackageLocation', from some additional to a
+-- snapshot setting (extra-deps or command line).
+additionalDepPackage ::
+     forall env. (HasPantryConfig env, HasLogFunc env, HasProcessContext env)
   => Bool
+     -- ^ Should Haddock documentation be built for the package?
   -> PackageLocation
   -> RIO env DepPackage
-additionalDepPackage buildHaddocks pl = do
-  (name, gpdio) <-
-    case pl of
+additionalDepPackage buildHaddocks location = do
+  (name, gpd) <-
+    case location of
       PLMutable dir -> do
-        (gpdio, name, _cabalfp) <- loadCabalFilePath (resolvedAbsolute dir)
-        pure (name, gpdio NoPrintWarnings)
+        (gpd, name, _cabalfp) <-
+          loadCabalFilePath (Just stackProgName') (resolvedAbsolute dir)
+        pure (name, gpd NoPrintWarnings)
       PLImmutable pli -> do
         let PackageIdentifier name _ = packageLocationIdent pli
         run <- askRunInIO
         pure (name, run $ loadCabalFileImmutable pli)
   pure DepPackage
-    { dpLocation = pl
-    , dpHidden = False
-    , dpFromSnapshot = NotFromSnapshot
-    , dpCommon = CommonPackage
-                  { cpGPD = gpdio
-                  , cpName = name
-                  , cpFlags = mempty
-                  , cpGhcOptions = mempty
-                  , cpCabalConfigOpts = mempty
-                  , cpHaddocks = buildHaddocks
-                  }
+    { location
+    , hidden = False
+    , fromSnapshot = NotFromSnapshot
+    , depCommon =
+        CommonPackage
+          { gpd
+          , name
+          , flags = mempty
+          , ghcOptions = mempty
+          , cabalConfigOpts = mempty
+          , buildHaddocks
+          }
     }
 
+-- | Given a t'PackageName' and its t'SnapshotPackage', yields the corresponding
+-- t'DepPackage'.
 snapToDepPackage ::
-       forall env. (HasPantryConfig env, HasLogFunc env, HasProcessContext env)
-    => Bool
-    -> PackageName
-    -> SnapshotPackage
-    -> RIO env DepPackage
-snapToDepPackage buildHaddocks name SnapshotPackage{..} = do
+     forall env. (HasPantryConfig env, HasLogFunc env, HasProcessContext env)
+  => Bool
+     -- ^ Should Haddock documentation be built for the package?
+  -> PackageName
+  -> SnapshotPackage
+  -> RIO env DepPackage
+snapToDepPackage buildHaddocks name sp = do
   run <- askRunInIO
   pure DepPackage
-    { dpLocation = PLImmutable spLocation
-    , dpHidden = spHidden
-    , dpFromSnapshot = FromSnapshot
-    , dpCommon = CommonPackage
-                  { cpGPD = run $ loadCabalFileImmutable spLocation
-                  , cpName = name
-                  , cpFlags = spFlags
-                  , cpGhcOptions = spGhcOptions
-                  , cpCabalConfigOpts = [] -- No spCabalConfigOpts, not present in snapshots
-                  , cpHaddocks = buildHaddocks
-                  }
+    { location = PLImmutable sp.spLocation
+    , hidden = sp.spHidden
+    , fromSnapshot = FromSnapshot
+    , depCommon =
+        CommonPackage
+          { gpd = run $ loadCabalFileImmutable sp.spLocation
+          , name
+          , flags = sp.spFlags
+          , ghcOptions = sp.spGhcOptions
+          , cabalConfigOpts = [] -- No spCabalConfigOpts, not present in snapshots
+          , buildHaddocks
+          }
     }
 
+-- | For the given t'CommonPackage', load its generic package description and
+-- yield its version.
 loadVersion :: MonadIO m => CommonPackage -> m Version
 loadVersion common = do
-    gpd <- liftIO $ cpGPD common
-    pure (pkgVersion $ PD.package $ PD.packageDescription gpd)
+  gpd <- liftIO common.gpd
+  pure gpd.packageDescription.package.pkgVersion
 
+-- | For the given t'PackageLocationImmutable', yield the version of the
+-- referenced package.
 getPLIVersion :: PackageLocationImmutable -> Version
 getPLIVersion (PLIHackage (PackageIdentifier _ v) _ _) = v
 getPLIVersion (PLIArchive _ pm) = pkgVersion $ pmIdent pm
 getPLIVersion (PLIRepo _ pm) = pkgVersion $ pmIdent pm
 
+-- | For the given @ghc-pkg@ executable, yield the contents of the global
+-- package database.
 globalsFromDump ::
-       (HasLogFunc env, HasProcessContext env)
-    => GhcPkgExe
-    -> RIO env (Map PackageName DumpedGlobalPackage)
+     (HasProcessContext env, HasTerm env)
+  => GhcPkgExe
+  -> RIO env (Map PackageName DumpedGlobalPackage)
 globalsFromDump pkgexe = do
-    let pkgConduit =
-            conduitDumpPackage .|
-            CL.foldMap (\dp -> Map.singleton (dpGhcPkgId dp) dp)
-        toGlobals ds =
-          Map.fromList $ map (pkgName . dpPackageIdent &&& id) $ Map.elems ds
-    toGlobals <$> ghcPkgDump pkgexe [] pkgConduit
+  let pkgConduit =    conduitDumpPackage
+                   .| CL.foldMap (\dp -> Map.singleton dp.ghcPkgId dp)
+      toGlobals ds =
+        Map.fromList $ map (pkgName . (.packageIdent) &&& id) $ Map.elems ds
+  toGlobals <$> ghcPkgDump pkgexe [] pkgConduit
 
+-- | For the given wanted compiler, yield the global hints (if available).
 globalsFromHints ::
-       HasConfig env
-    => WantedCompiler
-    -> RIO env (Map PackageName Version)
-globalsFromHints compiler = do
-    mglobalHints <- loadGlobalHints compiler
-    case mglobalHints of
-        Just hints -> pure hints
-        Nothing -> do
-            logWarn $ "Unable to load global hints for " <> RIO.display compiler
-            pure mempty
-
-type DumpedGlobalPackage = DumpPackage
+     HasConfig env
+  => WantedCompiler
+  -> RIO env (Map PackageName Version)
+globalsFromHints compiler = loadGlobalHints compiler >>= maybe
+  ( do
+      prettyWarnL
+        [ flow "Unable to load global hints for"
+        , fromString $ T.unpack $ textDisplay compiler
+        ]
+      pure mempty
+  )
+  pure
 
+-- | When the environment 'HasCompiler', for the
+-- given t'Stack.Types.SourceMap.SMWanted' and 'ActualCompiler', yield
+-- a t'SMActual' parameterised by t'DumpedGlobalPackage'.
 actualFromGhc ::
-       (HasConfig env, HasCompiler env)
-    => SMWanted
-    -> ActualCompiler
-    -> RIO env (SMActual DumpedGlobalPackage)
-actualFromGhc smw ac = do
-    globals <- view $ compilerPathsL.to cpGlobalDump
-    pure
-        SMActual
-        { smaCompiler = ac
-        , smaProject = smwProject smw
-        , smaDeps = smwDeps smw
-        , smaGlobal = globals
-        }
-
-actualFromHints ::
-       (HasConfig env)
-    => SMWanted
-    -> ActualCompiler
-    -> RIO env (SMActual GlobalPackageVersion)
-actualFromHints smw ac = do
-    globals <- globalsFromHints (actualToWanted ac)
-    pure
-        SMActual
-        { smaCompiler = ac
-        , smaProject = smwProject smw
-        , smaDeps = smwDeps smw
-        , smaGlobal = Map.map GlobalPackageVersion globals
-        }
+     (HasConfig env, HasCompiler env)
+  => SMWanted
+  -> ActualCompiler
+  -> RIO env (SMActual DumpedGlobalPackage)
+actualFromGhc smw compiler = do
+  globals <- view $ compilerPathsL . to (.globalDump)
+  pure
+    SMActual
+      { compiler
+      , project = smw.project
+      , deps = smw.deps
+      , globals
+      }
 
 -- | Simple cond check for boot packages - checks only OS and Arch
-globalCondCheck :: (HasConfig env) => RIO env (PD.ConfVar -> Either PD.ConfVar Bool)
+globalCondCheck ::
+     (HasConfig env)
+  => RIO env (PD.ConfVar
+  -> Either PD.ConfVar Bool)
 globalCondCheck = do
   Platform arch os <- view platformL
   let condCheck (PD.OS os') = pure $ os' == os
@@ -189,93 +209,65 @@ globalCondCheck = do
       condCheck c = Left c
   pure condCheck
 
-checkFlagsUsedThrowing ::
-       (MonadIO m, MonadThrow m)
-    => Map PackageName (Map FlagName Bool)
-    -> FlagSource
-    -> Map PackageName ProjectPackage
-    -> Map PackageName DepPackage
-    -> m ()
-checkFlagsUsedThrowing packageFlags source prjPackages deps = do
-    unusedFlags <-
-        forMaybeM (Map.toList packageFlags) $ \(pname, flags) ->
-            getUnusedPackageFlags (pname, flags) source prjPackages deps
-    unless (null unusedFlags) $
-        throwM $ InvalidFlagSpecification $ Set.fromList unusedFlags
-
-getUnusedPackageFlags ::
-       MonadIO m
-    => (PackageName, Map FlagName Bool)
-    -> FlagSource
-    -> Map PackageName ProjectPackage
-    -> Map PackageName DepPackage
-    -> m (Maybe UnusedFlags)
-getUnusedPackageFlags (name, userFlags) source prj deps =
-    let maybeCommon =
-          fmap ppCommon (Map.lookup name prj) <|>
-          fmap dpCommon (Map.lookup name deps)
-    in case maybeCommon  of
-        -- Package is not available as project or dependency
-        Nothing ->
-            pure $ Just $ UFNoPackage source name
-        -- Package exists, let's check if the flags are defined
-        Just common -> do
-            gpd <- liftIO $ cpGPD common
-            let pname = pkgName $ PD.package $ PD.packageDescription gpd
-                pkgFlags = Set.fromList $ map PD.flagName $ PD.genPackageFlags gpd
-                unused = Map.keysSet $ Map.withoutKeys userFlags pkgFlags
-            if Set.null unused
-                    -- All flags are defined, nothing to do
-                    then pure Nothing
-                    -- Error about the undefined flags
-                    else pure $ Just $ UFFlagsNotDefined source pname pkgFlags unused
-
+-- | Prune the given packages from GHC's global package database.
 pruneGlobals ::
-       Map PackageName DumpedGlobalPackage
-    -> Set PackageName
-    -> Map PackageName GlobalPackage
+     Map PackageName DumpedGlobalPackage
+     -- ^ Packages in GHC's global package database.
+  -> Set PackageName
+     -- ^ Package names to prune.
+  -> Map PackageName GlobalPackage
 pruneGlobals globals deps =
   let (prunedGlobals, keptGlobals) =
-        partitionReplacedDependencies globals (pkgName . dpPackageIdent)
-            dpGhcPkgId dpDepends deps
-  in Map.map (GlobalPackage . pkgVersion . dpPackageIdent) keptGlobals <>
-     Map.map ReplacedGlobalPackage prunedGlobals
+        partitionReplacedDependencies globals (pkgName . (.packageIdent))
+          (.ghcPkgId) (.depends) deps
+  in  Map.map (GlobalPackage . pkgVersion . (.packageIdent)) keptGlobals <>
+      Map.map ReplacedGlobalPackage prunedGlobals
 
+-- | Get the output of @ghc --info@ for the compiler in the environment.
 getCompilerInfo :: (HasConfig env, HasCompiler env) => RIO env Builder
-getCompilerInfo = view $ compilerPathsL.to (byteString . cpGhcInfo)
+getCompilerInfo = view $ compilerPathsL . to (byteString . (.ghcInfo))
 
+-- | For the given 'PackageLocationImmutable', yield its 256-bit cryptographic
+-- hash.
 immutableLocSha :: PackageLocationImmutable -> Builder
 immutableLocSha = byteString . treeKeyToBs . locationTreeKey
-  where
-    locationTreeKey (PLIHackage _ _ tk) = tk
-    locationTreeKey (PLIArchive _ pm) = pmTreeKey pm
-    locationTreeKey (PLIRepo _ pm) = pmTreeKey pm
-    treeKeyToBs (TreeKey (BlobKey sha _)) = SHA256.toHexBytes sha
+ where
+  locationTreeKey (PLIHackage _ _ tk) = tk
+  locationTreeKey (PLIArchive _ pm) = pmTreeKey pm
+  locationTreeKey (PLIRepo _ pm) = pmTreeKey pm
+  treeKeyToBs (TreeKey (BlobKey sha _)) = SHA256.toHexBytes sha
 
+-- | Type synonym for functions that yield a t'SMActual' parameterised by
+-- t'GlobalPackageVersion' for a given list of project package directories.
 type SnapshotCandidate env
-     = [ResolvedPath Dir] -> RIO env (SMActual GlobalPackageVersion)
+  = [ResolvedPath Dir] -> RIO env (SMActual GlobalPackageVersion)
 
+-- | For the given raw snapshot location, yield a function to yield a
+-- t'SMActual' from a list of project package directories.
 loadProjectSnapshotCandidate ::
-       (HasConfig env)
-    => RawSnapshotLocation
-    -> PrintWarnings
-    -> Bool
-    -> RIO env (SnapshotCandidate env)
+     (HasConfig env)
+  => RawSnapshotLocation
+  -> PrintWarnings
+  -> Bool
+     -- ^ Should Haddock documentation be build for the package?
+  -> RIO env (SnapshotCandidate env)
 loadProjectSnapshotCandidate loc printWarnings buildHaddocks = do
-    debugRSL <- view rslInLogL
-    (snapshot, _, _) <- loadAndCompleteSnapshotRaw' debugRSL loc Map.empty Map.empty
-    deps <- Map.traverseWithKey (snapToDepPackage False) (snapshotPackages snapshot)
-    let wc = snapshotCompiler snapshot
-    globals <- Map.map GlobalPackageVersion <$> globalsFromHints wc
-    pure $ \projectPackages -> do
-        prjPkgs <- fmap Map.fromList . for projectPackages $ \resolved -> do
-            pp <- mkProjectPackage printWarnings resolved buildHaddocks
-            pure (cpName $ ppCommon pp, pp)
-        compiler <- either throwIO pure $ wantedToActual
-                  $ snapshotCompiler snapshot
-        pure SMActual
-              { smaCompiler = compiler
-              , smaProject = prjPkgs
-              , smaDeps = Map.difference deps prjPkgs
-              , smaGlobal = globals
-              }
+  debugRSL <- view rslInLogL
+  (snapshot, _, _) <-
+    loadAndCompleteSnapshotRaw' debugRSL loc Map.empty Map.empty
+  deps <-
+    Map.traverseWithKey (snapToDepPackage False) (snapshotPackages snapshot)
+  let wc = snapshotCompiler snapshot
+  globals <- Map.map GlobalPackageVersion <$> globalsFromHints wc
+  pure $ \projectPackages -> do
+    project <- fmap Map.fromList . for projectPackages $ \resolved -> do
+      pp <- mkProjectPackage printWarnings resolved buildHaddocks
+      pure (pp.projectCommon.name, pp)
+    compiler <- either throwIO pure $ wantedToActual $ snapshotCompiler snapshot
+    pure
+      SMActual
+        { compiler
+        , project
+        , deps = Map.difference deps project
+        , globals
+        }
diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs
index add772ae27..7d858f36b5 100644
--- a/src/Stack/Storage/Project.hs
+++ b/src/Stack/Storage/Project.hs
@@ -1,50 +1,81 @@
-{-# LANGUAGE NoImplicitPrelude          #-}
-{-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE DerivingStrategies         #-}
-{-# LANGUAGE FlexibleInstances          #-}
-{-# LANGUAGE GADTs                      #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE QuasiQuotes                #-}
-{-# LANGUAGE RecordWildCards            #-}
-{-# LANGUAGE StandaloneDeriving         #-}
-{-# LANGUAGE TemplateHaskell            #-}
-{-# LANGUAGE TupleSections              #-}
-{-# LANGUAGE TypeFamilies               #-}
-{-# LANGUAGE TypeOperators              #-}
-{-# LANGUAGE UndecidableInstances       #-}
+{-# LANGUAGE NoImplicitPrelude    #-}
+{-# LANGUAGE OverloadedRecordDot  #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# LANGUAGE QuasiQuotes          #-}
+{-# LANGUAGE TemplateHaskell      #-}
+{-# LANGUAGE TypeFamilies         #-}
+{-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-}
 
--- | Work with SQLite database used for caches across a single project.
+{-|
+Module      : Stack.Storage.Project
+Description : Work with the SQLite database for a project's caches.
+License     : BSD-3-Clause
+
+Work with the SQLite database used for a project's caches.
+-}
+
 module Stack.Storage.Project
-    ( initProjectStorage
-    , ConfigCacheKey
-    , configCacheKey
-    , loadConfigCache
-    , saveConfigCache
-    , deactiveConfigCache
-    ) where
+  ( initProjectStorage
+  , ConfigCacheKey
+  , ConfigCacheParent (..)
+  , ConfigCacheParentId
+  , configCacheKey
+  , loadConfigCache
+  , saveConfigCache
+  , deactiveConfigCache
+  ) where
 
 import qualified Data.ByteString as S
 import qualified Data.Set as Set
-import Database.Persist.Sqlite
-import Database.Persist.TH
-import qualified Pantry.Internal as SQLite
-import Path
-import Stack.Prelude hiding (MigrationFailure)
-import Stack.Storage.Util
-import Stack.Types.Build
-import Stack.Types.Cache
-import Stack.Types.Config (HasBuildConfig, buildConfigL, bcProjectStorage, ProjectStorage (..))
-import Stack.Types.GhcPkgId
+import           Database.Persist.Sqlite
+                   ( Entity (..), SelectOpt (..), SqlBackend, Unique, (=.)
+                   , (==.), getBy, insert, selectList, update, updateWhere
+                   )
+import           Database.Persist.TH
+                   ( mkMigrate, mkPersist, persistLowerCase, share
+                   , sqlSettings
+                   )
+import           Pantry.SQLite ( initStorage, withStorage_ )
+import           Stack.ConfigureOpts ( configureOptsFromDb )
+import           Stack.Prelude
+import           Stack.Storage.Util
+                   ( handleMigrationException, listUpdateDiff, setUpdateDiff
+                   , updateCollection
+                   )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.Cache
+                   ( CachePkgSrc, ConfigCache (..), ConfigCacheType )
+import           Stack.Types.ConfigureOpts ( ConfigureOpts (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.Storage ( ProjectStorage (..) )
 
+-- Uses the Persistent entity syntax to generate entities for five tables in a
+-- SQLite database:
+--
+-- config_cache
+-- config_cache_dir_option
+-- config_cache_no_dir_option
+-- config_cache_dep
+-- config_cache_component
+--
+-- The ID column for each table is automatically generated.
+--
+-- The other tables have a foreign key referring to the config_cache table, via:
+--
+--   parent ConfigCacheParentId sql="config_cache_id" OnDeleteCascade
+--
+-- The tables have UNIQUE constraints on multiple columns.
+--
+-- Creates a function migrateAll to perform all migrations for the generated
+-- entities.
 share [ mkPersist sqlSettings
       , mkMigrate "migrateAll"
-    ]
-    [persistLowerCase|
+      ]
+      [persistLowerCase|
 ConfigCacheParent sql="config_cache"
-  directory FilePath "default=(hex(randomblob(16)))"
+  directory FilePath default="(hex(randomblob(16)))"
   type ConfigCacheType
   pkgSrc CachePkgSrc
   active Bool
@@ -80,140 +111,150 @@ ConfigCacheComponent
   deriving Show
 |]
 
--- | Initialize the database.
+-- | Initialize the project database for caches.
 initProjectStorage ::
-       HasLogFunc env
-    => Path Abs File -- ^ storage file
-    -> (ProjectStorage -> RIO env a)
-    -> RIO env a
-initProjectStorage fp f = SQLite.initStorage "Stack" migrateAll fp $ f . ProjectStorage
+     HasLogFunc env
+  => Path Abs File
+     -- ^ The storage file.
+  -> (ProjectStorage -> RIO env a)
+     -- ^ Action, given a SQL database connection to the project database for
+     -- caches.
+  -> RIO env a
+initProjectStorage fp f = handleMigrationException $
+  initStorage "Stack" migrateAll fp $ f . ProjectStorage
 
 -- | Run an action in a database transaction
 withProjectStorage ::
-       (HasBuildConfig env, HasLogFunc env)
-    => ReaderT SqlBackend (RIO env) a
-    -> RIO env a
+     (HasBuildConfig env, HasLogFunc env)
+  => ReaderT SqlBackend (RIO env) a
+  -> RIO env a
 withProjectStorage inner = do
-    storage <- view (buildConfigL . to bcProjectStorage . to unProjectStorage)
-    SQLite.withStorage_ storage inner
+  storage <- view (buildConfigL . to (.projectStorage.projectStorage))
+  withStorage_ storage inner
 
--- | Key used to retrieve configuration or flag cache
+-- | Type synonym representing keys used to retrieve a record from the Cabal
+-- configuration cache or the library or executable Cabal flag cache.
 type ConfigCacheKey = Unique ConfigCacheParent
 
--- | Build key used to retrieve configuration or flag cache
-configCacheKey :: Path Abs Dir -> ConfigCacheType -> ConfigCacheKey
+-- | For the given directory and type of cache, yields the key used to retrieve
+-- a record from the Cabal configuration cache or the library or executable
+-- Cabal flag cache.
+configCacheKey ::
+     Path Abs Dir
+     -- ^ Directory.
+  -> ConfigCacheType
+     -- ^ Type of cache.
+  -> ConfigCacheKey
 configCacheKey dir = UniqueConfigCacheParent (toFilePath dir)
 
--- | Internal helper to read the 'ConfigCache'
+-- | Internal helper to read the t'ConfigCache'
 readConfigCache ::
-       (HasBuildConfig env, HasLogFunc env)
-    => Entity ConfigCacheParent
-    -> ReaderT SqlBackend (RIO env) ConfigCache
-readConfigCache (Entity parentId ConfigCacheParent {..}) = do
-    let configCachePkgSrc = configCacheParentPkgSrc
-    coDirs <-
-        map (configCacheDirOptionValue . entityVal) <$>
-        selectList
-            [ConfigCacheDirOptionParent ==. parentId]
-            [Asc ConfigCacheDirOptionIndex]
-    coNoDirs <-
-        map (configCacheNoDirOptionValue . entityVal) <$>
-        selectList
-            [ConfigCacheNoDirOptionParent ==. parentId]
-            [Asc ConfigCacheNoDirOptionIndex]
-    let configCacheOpts = ConfigureOpts {..}
-    configCacheDeps <-
-        Set.fromList . map (configCacheDepValue . entityVal) <$>
-        selectList [ConfigCacheDepParent ==. parentId] []
-    configCacheComponents <-
-        Set.fromList . map (configCacheComponentValue . entityVal) <$>
-        selectList [ConfigCacheComponentParent ==. parentId] []
-    let configCachePathEnvVar = configCacheParentPathEnvVar
-    let configCacheHaddock = configCacheParentHaddock
-    pure ConfigCache {..}
-
--- | Load 'ConfigCache' from the database.
+     (HasBuildConfig env, HasLogFunc env)
+  => Entity ConfigCacheParent
+  -> ReaderT SqlBackend (RIO env) ConfigCache
+readConfigCache (Entity parentId configCacheParent) = do
+  let pkgSrc = configCacheParent.configCacheParentPkgSrc
+  pathRelatedInfo <-
+    selectList
+      [ConfigCacheDirOptionParent ==. parentId]
+      [Asc ConfigCacheDirOptionIndex]
+  nonPathRelatedInfo <-
+    selectList
+      [ConfigCacheNoDirOptionParent ==. parentId]
+      [Asc ConfigCacheNoDirOptionIndex]
+  let configureOpts = configureOptsFromDb pathRelatedInfo nonPathRelatedInfo
+  deps <-
+    Set.fromList . map ((.configCacheDepValue) . entityVal) <$>
+    selectList [ConfigCacheDepParent ==. parentId] []
+  components <-
+    Set.fromList . map ((.configCacheComponentValue) . entityVal) <$>
+    selectList [ConfigCacheComponentParent ==. parentId] []
+  let pathEnvVar = configCacheParent.configCacheParentPathEnvVar
+  let buildHaddocks = configCacheParent.configCacheParentHaddock
+  pure ConfigCache
+    { configureOpts
+    , deps
+    , components
+    , buildHaddocks
+    , pkgSrc
+    , pathEnvVar
+    }
+
+-- | Load a t'ConfigCache' value from the project database for caches.
 loadConfigCache ::
-       (HasBuildConfig env, HasLogFunc env)
-    => ConfigCacheKey
-    -> RIO env (Maybe ConfigCache)
+     (HasBuildConfig env, HasLogFunc env)
+  => ConfigCacheKey
+  -> RIO env (Maybe ConfigCache)
 loadConfigCache key =
-    withProjectStorage $ do
-        mparent <- getBy key
-        case mparent of
-            Nothing -> pure Nothing
-            Just parentEntity@(Entity _ ConfigCacheParent {..})
-                | configCacheParentActive ->
-                    Just <$> readConfigCache parentEntity
-                | otherwise -> pure Nothing
-
--- | Insert or update 'ConfigCache' to the database.
+  withProjectStorage $
+    getBy key >>= \case
+      Nothing -> pure Nothing
+      Just parentEntity@(Entity _ configCacheParent)
+        |  configCacheParent.configCacheParentActive ->
+            Just <$> readConfigCache parentEntity
+        | otherwise -> pure Nothing
+
+-- | Insert or update a t'ConfigCache' value to the project database for caches.
 saveConfigCache ::
-       (HasBuildConfig env, HasLogFunc env)
-    => ConfigCacheKey
-    -> ConfigCache
-    -> RIO env ()
+     (HasBuildConfig env, HasLogFunc env)
+  => ConfigCacheKey
+  -> ConfigCache
+  -> RIO env ()
 saveConfigCache key@(UniqueConfigCacheParent dir type_) new =
-    withProjectStorage $ do
-        mparent <- getBy key
-        (parentId, mold) <-
-            case mparent of
-                Nothing ->
-                    (, Nothing) <$>
-                    insert
-                        ConfigCacheParent
-                            { configCacheParentDirectory = dir
-                            , configCacheParentType = type_
-                            , configCacheParentPkgSrc = configCachePkgSrc new
-                            , configCacheParentActive = True
-                            , configCacheParentPathEnvVar = configCachePathEnvVar new
-                            , configCacheParentHaddock = configCacheHaddock new
-                            }
-                Just parentEntity@(Entity parentId _) -> do
-                    old <- readConfigCache parentEntity
-                    update
-                        parentId
-                        [ ConfigCacheParentPkgSrc =. configCachePkgSrc new
-                        , ConfigCacheParentActive =. True
-                        , ConfigCacheParentPathEnvVar =. configCachePathEnvVar new
-                        ]
-                    pure (parentId, Just old)
-        updateList
-            ConfigCacheDirOption
-            ConfigCacheDirOptionParent
+  withProjectStorage $ do
+    (parentId, mold) <- getBy key >>= \case
+        Nothing ->
+          (, Nothing) <$>
+          insert
+            ConfigCacheParent
+              { configCacheParentDirectory = dir
+              , configCacheParentType = type_
+              , configCacheParentPkgSrc = new.pkgSrc
+              , configCacheParentActive = True
+              , configCacheParentPathEnvVar = new.pathEnvVar
+              , configCacheParentHaddock = new.buildHaddocks
+              }
+        Just parentEntity@(Entity parentId _) -> do
+          old <- readConfigCache parentEntity
+          update
             parentId
-            ConfigCacheDirOptionIndex
-            (maybe [] (coDirs . configCacheOpts) mold)
-            (coDirs $ configCacheOpts new)
-        updateList
-            ConfigCacheNoDirOption
-            ConfigCacheNoDirOptionParent
-            parentId
-            ConfigCacheNoDirOptionIndex
-            (maybe [] (coNoDirs . configCacheOpts) mold)
-            (coNoDirs $ configCacheOpts new)
-        updateSet
-            ConfigCacheDep
-            ConfigCacheDepParent
-            parentId
-            ConfigCacheDepValue
-            (maybe Set.empty configCacheDeps mold)
-            (configCacheDeps new)
-        updateSet
-            ConfigCacheComponent
-            ConfigCacheComponentParent
-            parentId
-            ConfigCacheComponentValue
-            (maybe Set.empty configCacheComponents mold)
-            (configCacheComponents new)
-
--- | Mark 'ConfigCache' as inactive in the database.
--- We use a flag instead of deleting the records since, in most cases, the same
--- cache will be written again within in a few seconds (after
--- `cabal configure`), so this avoids unnecessary database churn.
+            [ ConfigCacheParentPkgSrc =. new.pkgSrc
+            , ConfigCacheParentActive =. True
+            , ConfigCacheParentPathEnvVar =. new.pathEnvVar
+            ]
+          pure (parentId, Just old)
+    updateCollection
+      (listUpdateDiff ConfigCacheDirOptionIndex)
+      (uncurry $ ConfigCacheDirOption parentId)
+      [ConfigCacheDirOptionParent ==. parentId]
+      (maybe [] (.configureOpts.pathRelated) mold)
+      new.configureOpts.pathRelated
+    updateCollection
+      (listUpdateDiff ConfigCacheNoDirOptionIndex)
+      (uncurry $ ConfigCacheNoDirOption parentId)
+      [ConfigCacheNoDirOptionParent ==. parentId]
+      (maybe [] (.configureOpts.nonPathRelated) mold)
+      new.configureOpts.nonPathRelated
+    updateCollection
+      (setUpdateDiff ConfigCacheDepValue)
+      (ConfigCacheDep parentId)
+      [ConfigCacheDepParent ==. parentId]
+      (maybe Set.empty (.deps) mold)
+      new.deps
+    updateCollection
+      (setUpdateDiff ConfigCacheComponentValue)
+      (ConfigCacheComponent parentId)
+      [ConfigCacheComponentParent ==. parentId]
+      (maybe Set.empty (.components) mold)
+      new.components
+
+-- | Mark t'ConfigCache' as inactive in the database. We use a flag instead of
+-- deleting the records since, in most cases, the same cache will be written
+-- again within in a few seconds (after `cabal configure`), so this avoids
+-- unnecessary database churn.
 deactiveConfigCache :: HasBuildConfig env => ConfigCacheKey -> RIO env ()
 deactiveConfigCache (UniqueConfigCacheParent dir type_) =
-    withProjectStorage $
+  withProjectStorage $
     updateWhere
-        [ConfigCacheParentDirectory ==. dir, ConfigCacheParentType ==. type_]
-        [ConfigCacheParentActive =. False]
+      [ConfigCacheParentDirectory ==. dir, ConfigCacheParentType ==. type_]
+      [ConfigCacheParentActive =. False]
diff --git a/src/Stack/Storage/User.hs b/src/Stack/Storage/User.hs
index 455f50ed72..b5de0ca2a3 100644
--- a/src/Stack/Storage/User.hs
+++ b/src/Stack/Storage/User.hs
@@ -1,63 +1,100 @@
-{-# LANGUAGE NoImplicitPrelude          #-}
-{-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE DerivingStrategies         #-}
-{-# LANGUAGE FlexibleInstances          #-}
-{-# LANGUAGE GADTs                      #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE QuasiQuotes                #-}
-{-# LANGUAGE RecordWildCards            #-}
-{-# LANGUAGE StandaloneDeriving         #-}
-{-# LANGUAGE TemplateHaskell            #-}
-{-# LANGUAGE TupleSections              #-}
-{-# LANGUAGE TypeFamilies               #-}
-{-# LANGUAGE TypeOperators              #-}
-{-# LANGUAGE UndecidableInstances       #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE QuasiQuotes           #-}
+{-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE UndecidableInstances  #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-}
 
--- | Work with SQLite database used for caches across an entire user account.
+{-|
+Module      : Stack.Storage.User
+Description : Work with SQLite DB for caches across a user account.
+License     : BSD-3-Clause
+
+Work with SQLite database used for caches across an entire user account.
+-}
+
 module Stack.Storage.User
-    ( initUserStorage
-    , PrecompiledCacheKey
-    , precompiledCacheKey
-    , loadPrecompiledCache
-    , savePrecompiledCache
-    , loadDockerImageExeCache
-    , saveDockerImageExeCache
-    , loadCompilerPaths
-    , saveCompilerPaths
-    , upgradeChecksSince
-    , logUpgradeCheck
-    ) where
+  ( initUserStorage
+  , PrecompiledCacheKey
+  , PrecompiledCacheParent (..)
+  , precompiledCacheKey
+  , loadPrecompiledCache
+  , savePrecompiledCache
+  , loadDockerImageExeCache
+  , saveDockerImageExeCache
+  , loadCompilerPaths
+  , saveCompilerPaths
+  , upgradeChecksSince
+  , logUpgradeCheck
+  ) where
 
 import qualified Data.Set as Set
 import qualified Data.Text as T
-import Data.Time.Clock (UTCTime)
-import Database.Persist.Sqlite
-import Database.Persist.TH
-import Distribution.Text (simpleParse, display)
-import Foreign.C.Types (CTime (..))
-import qualified Pantry.Internal as SQLite
-import Path
-import Path.IO (resolveFile', resolveDir')
+import           Data.Time.Clock ( UTCTime )
+import           Database.Persist.Sqlite
+                   ( Entity (..), SqlBackend, Unique, (=.), (==.), (>=.), count
+                   , deleteBy, getBy, insert, insert_, selectList, update
+                   , upsert
+                   )
+import           Database.Persist.TH
+                   ( mkMigrate, mkPersist, persistLowerCase, share
+                   , sqlSettings
+                   )
+import           Distribution.Text ( simpleParse, display )
+import           Foreign.C.Types ( CTime (..) )
+import           Pantry.SQLite ( initStorage, withStorage_ )
+import           Path ( (</>), mkRelFile, parseRelFile )
+import           Path.IO ( resolveFile', resolveDir' )
 import qualified RIO.FilePath as FP
-import Stack.Prelude hiding (MigrationFailure)
-import Stack.Storage.Util
-import Stack.Types.Build
-import Stack.Types.Cache
-import Stack.Types.Compiler
-import Stack.Types.CompilerBuild (CompilerBuild)
-import Stack.Types.Config (HasConfig, configL, configUserStorage, CompilerPaths (..), GhcPkgExe (..), UserStorage (..))
-import System.Posix.Types (COff (..))
-import System.PosixCompat.Files (getFileStatus, fileSize, modificationTime)
+import           Stack.Prelude
+import           Stack.Storage.Util
+                   ( handleMigrationException, setUpdateDiff, updateCollection )
+import           Stack.Types.Cache ( Action (..), PrecompiledCache (..) )
+import           Stack.Types.Compiler ( ActualCompiler, compilerVersionText )
+import           Stack.Types.CompilerBuild ( CompilerBuild )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), GhcPkgExe (..) )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.Storage ( UserStorage (..) )
+import           System.Posix.Types ( COff (..) )
+import           System.PosixCompat.Files
+                   ( fileSize, getFileStatus, modificationTime )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Storage.User" module.
+data StorageUserException
+  = CompilerFileMetadataMismatch
+  | GlobalPackageCacheFileMetadataMismatch
+  | GlobalDumpParseFailure
+  | CompilerCacheArchitectureInvalid Text
+  deriving Show
+
+instance Exception StorageUserException where
+  displayException CompilerFileMetadataMismatch =
+    "Error: [S-8196]\n"
+    ++ "Compiler file metadata mismatch, ignoring cache."
+  displayException GlobalPackageCacheFileMetadataMismatch =
+    "Error: [S-5378]\n"
+    ++ "Global package cache file metadata mismatch, ignoring cache."
+  displayException GlobalDumpParseFailure =
+    "Error: [S-2673]\n"
+    ++ "Global dump did not parse correctly."
+  displayException
+    (CompilerCacheArchitectureInvalid compilerCacheArch) = concat
+      [ "Error: [S-8441]\n"
+      , "Invalid arch: "
+      , show compilerCacheArch
+      ]
 
 share [ mkPersist sqlSettings
       , mkMigrate "migrateAll"
-    ]
-    [persistLowerCase|
+      ]
+      [persistLowerCase|
 PrecompiledCacheParent sql="precompiled_cache"
-  platformGhcDir FilePath "default=(hex(randomblob(16)))"
+  platformGhcDir FilePath default="(hex(randomblob(16)))"
   compiler Text
   cabalVersion Text
   packageKey Text
@@ -123,222 +160,254 @@ LastPerformed
 
 -- | Initialize the database.
 initUserStorage ::
-       HasLogFunc env
-    => Path Abs File -- ^ storage file
-    -> (UserStorage -> RIO env a)
-    -> RIO env a
-initUserStorage fp f = SQLite.initStorage "Stack" migrateAll fp $ f . UserStorage
+     HasLogFunc env
+  => Path Abs File -- ^ storage file
+  -> (UserStorage -> RIO env a)
+  -> RIO env a
+initUserStorage fp f = handleMigrationException $
+  initStorage "Stack" migrateAll fp $ f . UserStorage
 
 -- | Run an action in a database transaction
 withUserStorage ::
-       (HasConfig env, HasLogFunc env)
-    => ReaderT SqlBackend (RIO env) a
-    -> RIO env a
+     (HasConfig env, HasLogFunc env)
+  => ReaderT SqlBackend (RIO env) a
+  -> RIO env a
 withUserStorage inner = do
-    storage <- view (configL . to configUserStorage . to unUserStorage)
-    SQLite.withStorage_ storage inner
+  storage <- view (configL . to (.userStorage.userStorage))
+  withStorage_ storage inner
 
 -- | Key used to retrieve the precompiled cache
 type PrecompiledCacheKey = Unique PrecompiledCacheParent
 
 -- | Build key used to retrieve the precompiled cache
 precompiledCacheKey ::
-       Path Rel Dir
-    -> ActualCompiler
-    -> Version
-    -> Text
-    -> ByteString
-    -> Bool
-    -> PrecompiledCacheKey
+     Path Rel Dir
+  -> ActualCompiler
+  -> Version
+  -> Text
+  -> ByteString
+  -> Bool
+  -> PrecompiledCacheKey
 precompiledCacheKey platformGhcDir compiler cabalVersion =
-    UniquePrecompiledCacheParent
-        (toFilePath platformGhcDir)
-        (compilerVersionText compiler)
-        (T.pack $ versionString cabalVersion)
+  UniquePrecompiledCacheParent
+    (toFilePath platformGhcDir)
+    (compilerVersionText compiler)
+    (T.pack $ versionString cabalVersion)
 
--- | Internal helper to read the 'PrecompiledCache' from the database
+-- | Internal helper to read the t'PrecompiledCache' from the database
 readPrecompiledCache ::
-       (HasConfig env, HasLogFunc env)
-    => PrecompiledCacheKey
-    -> ReaderT SqlBackend (RIO env) (Maybe ( PrecompiledCacheParentId
-                                           , PrecompiledCache Rel))
+     (HasConfig env, HasLogFunc env)
+  => PrecompiledCacheKey
+  -> ReaderT SqlBackend (RIO env) (Maybe ( PrecompiledCacheParentId
+                                         , PrecompiledCache Rel))
 readPrecompiledCache key = do
-    mparent <- getBy key
-    forM mparent $ \(Entity parentId PrecompiledCacheParent {..}) -> do
-        pcLibrary <- mapM parseRelFile precompiledCacheParentLibrary
-        pcSubLibs <-
-            mapM (parseRelFile . precompiledCacheSubLibValue . entityVal) =<<
-            selectList [PrecompiledCacheSubLibParent ==. parentId] []
-        pcExes <-
-            mapM (parseRelFile . precompiledCacheExeValue . entityVal) =<<
-            selectList [PrecompiledCacheExeParent ==. parentId] []
-        pure (parentId, PrecompiledCache {..})
-
--- | Load 'PrecompiledCache' from the database.
+  mparent <- getBy key
+  forM mparent $ \(Entity parentId precompiledCacheParent) -> do
+    library <-
+      mapM parseRelFile precompiledCacheParent.precompiledCacheParentLibrary
+    subLibs <-
+      mapM (parseRelFile . (.precompiledCacheSubLibValue) . entityVal) =<<
+      selectList [PrecompiledCacheSubLibParent ==. parentId] []
+    exes <-
+      mapM (parseRelFile . (.precompiledCacheExeValue) . entityVal) =<<
+      selectList [PrecompiledCacheExeParent ==. parentId] []
+    pure
+      ( parentId
+      , PrecompiledCache
+          { library
+          , subLibs
+          , exes
+          }
+      )
+
+-- | Load t'PrecompiledCache' from the database.
 loadPrecompiledCache ::
-       (HasConfig env, HasLogFunc env)
-    => PrecompiledCacheKey
-    -> RIO env (Maybe (PrecompiledCache Rel))
-loadPrecompiledCache key = withUserStorage $ fmap snd <$> readPrecompiledCache key
+     (HasConfig env, HasLogFunc env)
+  => PrecompiledCacheKey
+  -> RIO env (Maybe (PrecompiledCache Rel))
+loadPrecompiledCache key =
+  withUserStorage $ fmap snd <$> readPrecompiledCache key
 
--- | Insert or update 'PrecompiledCache' to the database.
+-- | Insert or update t'PrecompiledCache' to the database.
 savePrecompiledCache ::
-       (HasConfig env, HasLogFunc env)
-    => PrecompiledCacheKey
-    -> PrecompiledCache Rel
-    -> RIO env ()
-savePrecompiledCache key@(UniquePrecompiledCacheParent precompiledCacheParentPlatformGhcDir precompiledCacheParentCompiler precompiledCacheParentCabalVersion precompiledCacheParentPackageKey precompiledCacheParentOptionsHash precompiledCacheParentHaddock) new =
-    withUserStorage $ do
-        let precompiledCacheParentLibrary = fmap toFilePath (pcLibrary new)
-        mIdOld <- readPrecompiledCache key
-        (parentId, mold) <-
-            case mIdOld of
-                Nothing -> (, Nothing) <$> insert PrecompiledCacheParent {..}
-                Just (parentId, old) -> do
-                    update
-                        parentId
-                        [ PrecompiledCacheParentLibrary =.
-                          precompiledCacheParentLibrary
-                        ]
-                    pure (parentId, Just old)
-        updateSet
-            PrecompiledCacheSubLib
-            PrecompiledCacheSubLibParent
-            parentId
-            PrecompiledCacheSubLibValue
-            (maybe Set.empty (toFilePathSet . pcSubLibs) mold)
-            (toFilePathSet $ pcSubLibs new)
-        updateSet
-            PrecompiledCacheExe
-            PrecompiledCacheExeParent
+     (HasConfig env, HasLogFunc env)
+  => PrecompiledCacheKey
+  -> PrecompiledCache Rel
+  -> RIO env ()
+savePrecompiledCache
+  key@( UniquePrecompiledCacheParent
+          precompiledCacheParentPlatformGhcDir
+          precompiledCacheParentCompiler
+          precompiledCacheParentCabalVersion
+          precompiledCacheParentPackageKey
+          precompiledCacheParentOptionsHash
+          precompiledCacheParentHaddock
+      )
+  new
+  = withUserStorage $ do
+      let precompiledCacheParentLibrary = fmap toFilePath new.library
+      (parentId, mold) <- readPrecompiledCache key >>= \case
+        Nothing -> (, Nothing) <$> insert PrecompiledCacheParent
+          { precompiledCacheParentPlatformGhcDir
+          , precompiledCacheParentCompiler
+          , precompiledCacheParentCabalVersion
+          , precompiledCacheParentPackageKey
+          , precompiledCacheParentOptionsHash
+          , precompiledCacheParentHaddock
+          , precompiledCacheParentLibrary
+          }
+        Just (parentId, old) -> do
+          update
             parentId
-            PrecompiledCacheExeValue
-            (maybe Set.empty (toFilePathSet . pcExes) mold)
-            (toFilePathSet $ pcExes new)
-  where
-    toFilePathSet = Set.fromList . map toFilePath
+            [ PrecompiledCacheParentLibrary =.
+              precompiledCacheParentLibrary
+            ]
+          pure (parentId, Just old)
+      updateCollection
+        (setUpdateDiff PrecompiledCacheSubLibValue)
+        (PrecompiledCacheSubLib parentId)
+        [PrecompiledCacheSubLibParent ==. parentId]
+        (maybe Set.empty (toFilePathSet . (.subLibs)) mold)
+        (toFilePathSet new.subLibs)
+      updateCollection
+        (setUpdateDiff PrecompiledCacheExeValue)
+        (PrecompiledCacheExe parentId)
+        [PrecompiledCacheExeParent ==. parentId]
+        (maybe Set.empty (toFilePathSet . (.exes)) mold)
+        (toFilePathSet new.exes)
+ where
+  toFilePathSet = Set.fromList . map toFilePath
 
 -- | Get the record of whether an executable is compatible with a Docker image
 loadDockerImageExeCache ::
-       (HasConfig env, HasLogFunc env)
-    => Text
-    -> Path Abs File
-    -> UTCTime
-    -> RIO env (Maybe Bool)
-loadDockerImageExeCache imageId exePath exeTimestamp =
-    withUserStorage $
-    fmap (dockerImageExeCacheCompatible . entityVal) <$>
-    getBy (DockerImageExeCacheUnique imageId (toFilePath exePath) exeTimestamp)
+     (HasConfig env, HasLogFunc env)
+  => Text
+  -> Path Abs File
+  -> UTCTime
+  -> RIO env (Maybe Bool)
+loadDockerImageExeCache imageId exePath exeTimestamp = withUserStorage $
+  fmap ((.dockerImageExeCacheCompatible) . entityVal) <$>
+  getBy (DockerImageExeCacheUnique imageId (toFilePath exePath) exeTimestamp)
 
 -- | Sets the record of whether an executable is compatible with a Docker image
 saveDockerImageExeCache ::
-       (HasConfig env, HasLogFunc env)
-    => Text
-    -> Path Abs File
-    -> UTCTime
-    -> Bool
-    -> RIO env ()
-saveDockerImageExeCache imageId exePath exeTimestamp compatible =
-    void $
-    withUserStorage $
+     (HasConfig env, HasLogFunc env)
+  => Text
+  -> Path Abs File
+  -> UTCTime
+  -> Bool
+  -> RIO env ()
+saveDockerImageExeCache imageId exePath exeTimestamp compatible = void $
+  withUserStorage $
     upsert
-        (DockerImageExeCache
-             imageId
-             (toFilePath exePath)
-             exeTimestamp
-             compatible)
-        []
-
--- | Type-restricted version of 'fromIntegral' to ensure we're making
--- the value bigger, not smaller.
+      ( DockerImageExeCache
+          imageId
+          (toFilePath exePath)
+          exeTimestamp
+          compatible
+      )
+      []
+
+-- | Type-restricted version of 'fromIntegral' to ensure we're making the value
+-- bigger, not smaller.
 sizeToInt64 :: COff -> Int64
 sizeToInt64 (COff i) = fromIntegral i -- fromIntegral added for 32-bit systems
 
--- | Type-restricted version of 'fromIntegral' to ensure we're making
--- the value bigger, not smaller.
+-- | Type-restricted version of 'fromIntegral' to ensure we're making the value
+-- bigger, not smaller.
 timeToInt64 :: CTime -> Int64
 timeToInt64 (CTime i) = fromIntegral i -- fromIntegral added for 32-bit systems
 
--- | Load compiler information, if available, and confirm that the
--- referenced files are unchanged. May throw exceptions!
-loadCompilerPaths
-  :: HasConfig env
+-- | Load compiler information, if available, and confirm that the referenced
+-- files are unchanged. May throw exceptions!
+loadCompilerPaths ::
+     HasConfig env
   => Path Abs File -- ^ compiler executable
   -> CompilerBuild
   -> Bool -- ^ sandboxed?
   -> RIO env (Maybe CompilerPaths)
 loadCompilerPaths compiler build sandboxed = do
   mres <- withUserStorage $ getBy $ UniqueCompilerInfo $ toFilePath compiler
-  for mres $ \(Entity _ CompilerCache {..}) -> do
+  for mres $ \(Entity _ compilerCache) -> do
     compilerStatus <- liftIO $ getFileStatus $ toFilePath compiler
     when
-      (compilerCacheGhcSize /= sizeToInt64 (fileSize compilerStatus) ||
-       compilerCacheGhcModified /= timeToInt64 (modificationTime compilerStatus))
-      (throwString "Compiler file metadata mismatch, ignoring cache")
-    globalDbStatus <- liftIO $ getFileStatus $ compilerCacheGlobalDb FP.</> "package.cache"
+      (  compilerCache.compilerCacheGhcSize /=
+           sizeToInt64 (fileSize compilerStatus)
+      || compilerCache.compilerCacheGhcModified /=
+           timeToInt64 (modificationTime compilerStatus)
+      )
+      (throwIO CompilerFileMetadataMismatch)
+    globalDbStatus <- liftIO $
+      getFileStatus $ compilerCache.compilerCacheGlobalDb FP.</> "package.cache"
     when
-      (compilerCacheGlobalDbCacheSize /= sizeToInt64 (fileSize globalDbStatus) ||
-       compilerCacheGlobalDbCacheModified /= timeToInt64 (modificationTime globalDbStatus))
-      (throwString "Global package cache file metadata mismatch, ignoring cache")
-
-    -- We could use parseAbsFile instead of resolveFile' below to
-    -- bypass some system calls, at the cost of some really wonky
-    -- error messages in case someone screws up their GHC installation
-    pkgexe <- resolveFile' compilerCacheGhcPkgPath
-    runghc <- resolveFile' compilerCacheRunghcPath
-    haddock <- resolveFile' compilerCacheHaddockPath
-    globaldb <- resolveDir' compilerCacheGlobalDb
-
-    cabalVersion <- parseVersionThrowing $ T.unpack compilerCacheCabalVersion
+      (  compilerCache.compilerCacheGlobalDbCacheSize /=
+           sizeToInt64 (fileSize globalDbStatus)
+      || compilerCache.compilerCacheGlobalDbCacheModified /=
+           timeToInt64 (modificationTime globalDbStatus)
+      )
+      (throwIO GlobalPackageCacheFileMetadataMismatch)
+
+    -- We could use parseAbsFile instead of resolveFile' below to bypass some
+    -- system calls, at the cost of some really wonky error messages in case
+    -- someone screws up their GHC installation
+    pkg <- GhcPkgExe <$> resolveFile' compilerCache.compilerCacheGhcPkgPath
+    interpreter <- resolveFile' compilerCache.compilerCacheRunghcPath
+    haddock <- resolveFile' compilerCache.compilerCacheHaddockPath
+    globalDB <- resolveDir' compilerCache.compilerCacheGlobalDb
+
+    cabalVersion <- parseVersionThrowing $
+      T.unpack compilerCache.compilerCacheCabalVersion
     globalDump <-
-      case readMaybe $ T.unpack compilerCacheGlobalDump of
-        Nothing -> throwString "Global dump did not parse correctly"
+      case readMaybe $ T.unpack compilerCache.compilerCacheGlobalDump of
+        Nothing -> throwIO GlobalDumpParseFailure
         Just globalDump -> pure globalDump
     arch <-
-      case simpleParse $ T.unpack compilerCacheArch of
-        Nothing -> throwString $ "Invalid arch: " ++ show compilerCacheArch
+      case simpleParse $ T.unpack compilerCache.compilerCacheArch of
+        Nothing -> throwIO $
+          CompilerCacheArchitectureInvalid compilerCache.compilerCacheArch
         Just arch -> pure arch
-
     pure CompilerPaths
-      { cpCompiler = compiler
-      , cpCompilerVersion = compilerCacheActualVersion
-      , cpArch = arch
-      , cpBuild = build
-      , cpPkg = GhcPkgExe pkgexe
-      , cpInterpreter = runghc
-      , cpHaddock = haddock
-      , cpSandboxed = sandboxed
-      , cpCabalVersion = cabalVersion
-      , cpGlobalDB = globaldb
-      , cpGhcInfo = compilerCacheInfo
-      , cpGlobalDump = globalDump
+      { compiler
+      , compilerVersion = compilerCache.compilerCacheActualVersion
+      , arch
+      , build
+      , pkg
+      , interpreter
+      , haddock
+      , sandboxed
+      , cabalVersion
+      , globalDB
+      , ghcInfo = compilerCache.compilerCacheInfo
+      , globalDump
       }
 
 -- | Save compiler information. May throw exceptions!
-saveCompilerPaths
-  :: HasConfig env
+saveCompilerPaths ::
+     HasConfig env
   => CompilerPaths
   -> RIO env ()
-saveCompilerPaths CompilerPaths {..} = withUserStorage $ do
-  deleteBy $ UniqueCompilerInfo $ toFilePath cpCompiler
-  compilerStatus <- liftIO $ getFileStatus $ toFilePath cpCompiler
-  globalDbStatus <- liftIO $ getFileStatus $ toFilePath $ cpGlobalDB </> $(mkRelFile "package.cache")
-  let GhcPkgExe pkgexe = cpPkg
+saveCompilerPaths cp = withUserStorage $ do
+  deleteBy $ UniqueCompilerInfo $ toFilePath cp.compiler
+  compilerStatus <- liftIO $ getFileStatus $ toFilePath cp.compiler
+  globalDbStatus <- liftIO $
+    getFileStatus $ toFilePath $ cp.globalDB </> $(mkRelFile "package.cache")
+  let GhcPkgExe pkgexe = cp.pkg
   insert_ CompilerCache
-    { compilerCacheActualVersion = cpCompilerVersion
-    , compilerCacheGhcPath = toFilePath cpCompiler
+    { compilerCacheActualVersion = cp.compilerVersion
+    , compilerCacheGhcPath = toFilePath cp.compiler
     , compilerCacheGhcSize = sizeToInt64 $ fileSize compilerStatus
     , compilerCacheGhcModified = timeToInt64 $ modificationTime compilerStatus
     , compilerCacheGhcPkgPath = toFilePath pkgexe
-    , compilerCacheRunghcPath = toFilePath cpInterpreter
-    , compilerCacheHaddockPath = toFilePath cpHaddock
-    , compilerCacheCabalVersion = T.pack $ versionString cpCabalVersion
-    , compilerCacheGlobalDb = toFilePath cpGlobalDB
+    , compilerCacheRunghcPath = toFilePath cp.interpreter
+    , compilerCacheHaddockPath = toFilePath cp.haddock
+    , compilerCacheCabalVersion = T.pack $ versionString cp.cabalVersion
+    , compilerCacheGlobalDb = toFilePath cp.globalDB
     , compilerCacheGlobalDbCacheSize = sizeToInt64 $ fileSize globalDbStatus
-    , compilerCacheGlobalDbCacheModified = timeToInt64 $ modificationTime globalDbStatus
-    , compilerCacheInfo = cpGhcInfo
-    , compilerCacheGlobalDump = tshow cpGlobalDump
-    , compilerCacheArch = T.pack $ Distribution.Text.display cpArch
+    , compilerCacheGlobalDbCacheModified =
+        timeToInt64 $ modificationTime globalDbStatus
+    , compilerCacheInfo = cp.ghcInfo
+    , compilerCacheGlobalDump = tshow cp.globalDump
+    , compilerCacheArch = T.pack $ Distribution.Text.display cp.arch
     }
 
 -- | How many upgrade checks have occurred since the given timestamp?
diff --git a/src/Stack/Storage/Util.hs b/src/Stack/Storage/Util.hs
index 313022f539..9f42732030 100644
--- a/src/Stack/Storage/Util.hs
+++ b/src/Stack/Storage/Util.hs
@@ -1,71 +1,92 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE GADTs                 #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE TypeFamilies          #-}
-{-# LANGUAGE TypeOperators         #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE TypeFamilies      #-}
+
+{-|
+Module      : Stack.Storage.Util
+Description : Utilities for other @Stack.Storage@ modules.
+License     : BSD-3-Clause
+
+Utilities for the other @Stack.Storage@ modules.
+-}
 
--- | Utils for the other Stack.Storage modules
 module Stack.Storage.Util
-    ( updateList
-    , updateSet
-    ) where
+  ( handleMigrationException
+  , updateCollection
+  , setUpdateDiff
+  , listUpdateDiff
+  ) where
 
 import qualified Data.Set as Set
-import Database.Persist
-import Stack.Prelude hiding (MigrationFailure)
+import           Database.Persist
+                   ( BaseBackend, EntityField, Filter, PersistEntity
+                   , PersistEntityBackend, PersistField, PersistQueryWrite
+                   , SafeToInsert, (<-.), deleteWhere, insertMany_
+                   )
+import           Stack.Prelude
+import           Stack.Types.Storage ( StoragePrettyException (..) )
+
+-- | Efficiently update a collection of values with a given diff function.
+updateCollection ::
+     ( PersistEntityBackend record ~ BaseBackend backend
+     , Eq (collection rawValue)
+     , PersistEntity record
+     , PersistField value
+     , MonadIO m
+     , PersistQueryWrite backend
+     , SafeToInsert record
+     , Foldable collection
+     )
+  => (collection rawValue -> collection rawValue -> ([Filter record], [value]))
+     -- ^ Function to yield items in old not in new, to delete, and values in
+     -- new not in old, to add, from the old and new collections of values.
+  -> (value -> record)
+     -- ^ Function to yield new records from values in new not in old.
+  -> [Filter record]
+     -- ^ Extra items to delete, if there are other items to delete.
+  -> collection rawValue
+     -- ^ The old collection of values.
+  -> collection rawValue
+     -- ^ The new collection of values.
+  -> ReaderT backend m ()
+updateCollection fnDiffer recordCons extra old new =
+  when (old /= new) $ do
+    let (oldMinusNewFilter, newMinusOld) = fnDiffer old new
+    unless (null oldMinusNewFilter) $ deleteWhere
+      (extra ++ oldMinusNewFilter)
+    unless (null newMinusOld) $ insertMany_ $
+      map recordCons $ toList newMinusOld
+
+setUpdateDiff ::
+     (Ord value, PersistField value)
+  => EntityField record value
+  -> Set value
+  -> Set value
+  -> ([Filter record], [value])
+setUpdateDiff indexFieldCons old new =
+  let oldMinusNew = Set.difference old new
+  in  ([indexFieldCons <-. toList oldMinusNew], toList $ Set.difference new old)
 
--- | Efficiently update a set of values stored in a database table
-updateSet ::
-       ( PersistEntityBackend record ~ BaseBackend backend
-       , PersistField parentid
-       , PersistField value
-       , Ord value
-       , PersistEntity record
-       , MonadIO m
-       , PersistQueryWrite backend
-       )
-    => (parentid -> value -> record)
-    -> EntityField record parentid
-    -> parentid
-    -> EntityField record value
-    -> Set value
-    -> Set value
-    -> ReaderT backend m ()
-updateSet recordCons parentFieldCons parentId valueFieldCons old new =
-    when (old /= new) $ do
-        deleteWhere
-            [ parentFieldCons ==. parentId
-            , valueFieldCons <-. Set.toList (Set.difference old new)
-            ]
-        insertMany_ $
-            map (recordCons parentId) $ Set.toList (Set.difference new old)
+listUpdateDiff ::
+     (Ord value)
+  => EntityField record Int
+  -> [value]
+  -> [value]
+  -> ([Filter record], [(Int, value)])
+listUpdateDiff indexFieldCons old new =
+  let oldSet = Set.fromList (zip [0 ..] old)
+      newSet = Set.fromList (zip [0 ..] new)
+      oldMinusNew = Set.difference oldSet newSet
+      indexList = map fst (Set.toList oldMinusNew)
+  in  ([indexFieldCons <-. indexList], toList $ Set.difference newSet oldSet)
 
--- | Efficiently update a list of values stored in a database table.
-updateList ::
-       ( PersistEntityBackend record ~ BaseBackend backend
-       , PersistField parentid
-       , Ord value
-       , PersistEntity record
-       , MonadIO m
-       , PersistQueryWrite backend
-       )
-    => (parentid -> Int -> value -> record)
-    -> EntityField record parentid
-    -> parentid
-    -> EntityField record Int
-    -> [value]
-    -> [value]
-    -> ReaderT backend m ()
-updateList recordCons parentFieldCons parentId indexFieldCons old new =
-    when (old /= new) $ do
-        let oldSet = Set.fromList (zip [0 ..] old)
-            newSet = Set.fromList (zip [0 ..] new)
-        deleteWhere
-            [ parentFieldCons ==. parentId
-            , indexFieldCons <-.
-              map fst (Set.toList $ Set.difference oldSet newSet)
-            ]
-        insertMany_ $
-            map (uncurry $ recordCons parentId) $
-            Set.toList (Set.difference newSet oldSet)
+handleMigrationException :: HasLogFunc env => RIO env a -> RIO env a
+handleMigrationException inner = do
+  eres <- try inner
+  either
+    ( \e -> case e :: PantryException of
+              MigrationFailure desc fp ex ->
+                prettyThrowIO $ StorageMigrationFailure desc fp ex
+              _ -> throwIO e
+    )
+    pure
+    eres
diff --git a/src/Stack/Templates.hs b/src/Stack/Templates.hs
new file mode 100644
index 0000000000..ee3c1dd3f2
--- /dev/null
+++ b/src/Stack/Templates.hs
@@ -0,0 +1,83 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Templates
+Description : Functions related to Stack's @templates@ command.
+License     : BSD-3-Clause
+
+Functions related to Stack's @templates@ command.
+-}
+
+module Stack.Templates
+  ( templatesCmd
+  , templatesHelp
+  ) where
+
+import qualified Data.ByteString.Lazy as LB
+import qualified Data.Text.IO as T
+import           Network.HTTP.StackClient
+                   ( HttpException (..), getResponseBody, httpLbs, parseUrlThrow
+                   , setGitHubHeaders
+                   )
+import           Stack.Prelude
+import           Stack.Runners ( ShouldReexec (..), withConfig )
+import           Stack.Types.Runner ( Runner )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Templates" module.
+data TemplatesPrettyException
+  = DownloadTemplatesHelpFailed !HttpException
+  | TemplatesHelpEncodingInvalid !String !UnicodeException
+
+deriving instance Show TemplatesPrettyException
+
+instance Pretty TemplatesPrettyException where
+  pretty (DownloadTemplatesHelpFailed err) =
+    "[S-8143]"
+    <> line
+    <> fillSep
+         [ flow "Stack failed to download the help for"
+         , style Shell "stack templates" <> "."
+         ]
+    <> blankLine
+    <> flow "While downloading, Stack encountered the following error:"
+    <> blankLine
+    <> string (displayException err)
+  pretty (TemplatesHelpEncodingInvalid url err) =
+    "[S-6670]"
+    <> line
+    <> fillSep
+         [ flow "Stack failed to decode the help for"
+         , style Shell "stack templates"
+         , flow "downloaded from"
+         , style Url (fromString url) <> "."
+         ]
+    <> blankLine
+    <> flow "While decoding, Stack encountered the following error:"
+    <> blankLine
+    <> string (displayException err)
+
+instance Exception TemplatesPrettyException
+
+-- | Function underlying the @stack templates@ command. Display instructions for
+-- how to use templates.
+templatesCmd :: () -> RIO Runner ()
+templatesCmd () = withConfig NoReexec templatesHelp
+
+-- | Display help for the templates command.
+templatesHelp :: HasTerm env => RIO env ()
+templatesHelp = do
+  let url = defaultTemplatesHelpUrl
+  req <- fmap setGitHubHeaders (parseUrlThrow url)
+  resp <- catch
+    (httpLbs req)
+    (prettyThrowM . DownloadTemplatesHelpFailed)
+  case decodeUtf8' $ LB.toStrict $ getResponseBody resp of
+    Left err -> prettyThrowM $ TemplatesHelpEncodingInvalid url err
+    Right txt -> liftIO $ T.putStrLn txt
+
+-- | Default web URL to get the `stack templates` help output.
+defaultTemplatesHelpUrl :: String
+defaultTemplatesHelpUrl =
+  "https://raw.githubusercontent.com/commercialhaskell/stack-templates/master/STACK_HELP.md"
diff --git a/src/Stack/Types/AddCommand.hs b/src/Stack/Types/AddCommand.hs
new file mode 100644
index 0000000000..dbc83e05e3
--- /dev/null
+++ b/src/Stack/Types/AddCommand.hs
@@ -0,0 +1,28 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.AddCommand
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.AddCommand
+  ( AddCommand
+  ) where
+
+import           Control.Monad.Trans.Except ( ExceptT )
+import           Control.Monad.Writer ( Writer )
+import qualified Options.Applicative as OA
+import           Stack.Prelude
+import           Stack.Types.GlobalOptsMonoid ( GlobalOptsMonoid )
+import           Stack.Types.Runner ( Runner )
+
+-- | A type synonym for the monad used to add command line commands to Stack.
+-- The monad is a stack of an 'ExceptT' @(@t'RIO' 'Runner' @())@ monad on top of
+-- a 'Writer' @f@ monad, where @f@ is
+-- 'Options.Applicative.Mod' 'Options.Applicative.CommandFields' @(@t'RIO' 'Runner' @(),@ 'GlobalOptsMonoid'@)@ - that
+-- is, an option modifier for command options that have return type
+-- @(@t'RIO' 'Runner' @(),@ 'GlobalOptsMonoid'@)@.
+type AddCommand =
+  ExceptT (RIO Runner ())
+          (Writer (OA.Mod OA.CommandFields (RIO Runner (), GlobalOptsMonoid)))
+          ()
diff --git a/src/Stack/Types/AllowNewerDeps.hs b/src/Stack/Types/AllowNewerDeps.hs
new file mode 100644
index 0000000000..0651fa2393
--- /dev/null
+++ b/src/Stack/Types/AllowNewerDeps.hs
@@ -0,0 +1,23 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.AllowNewerDeps
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.AllowNewerDeps
+  ( AllowNewerDeps (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..) )
+import           Distribution.PackageDescription ( mkPackageName )
+import           Stack.Prelude
+
+-- | A type representing lists of packages for which Stack should ignore lower
+-- and upper version bounds in its Cabal file.
+newtype AllowNewerDeps
+  = AllowNewerDeps [PackageName]
+  deriving (Eq, Generic, Monoid, Ord, Read, Semigroup, Show)
+
+instance FromJSON AllowNewerDeps where
+  parseJSON = fmap (AllowNewerDeps . fmap mkPackageName) . parseJSON
diff --git a/src/Stack/Types/ApplyGhcOptions.hs b/src/Stack/Types/ApplyGhcOptions.hs
new file mode 100644
index 0000000000..f8525b9028
--- /dev/null
+++ b/src/Stack/Types/ApplyGhcOptions.hs
@@ -0,0 +1,29 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.ApplyGhcOptions
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ApplyGhcOptions
+  ( ApplyGhcOptions (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), withText )
+import           Stack.Prelude
+
+-- | Which packages do ghc-options on the command line apply to?
+data ApplyGhcOptions
+  = AGOTargets -- ^ All project packages that are targets.
+  | AGOLocals -- ^ All project packages, even non-targets.
+  | AGOEverything -- ^ All packages, project packages and dependencies.
+  deriving (Bounded, Enum, Eq, Ord, Read, Show)
+
+instance FromJSON ApplyGhcOptions where
+  parseJSON = withText "ApplyGhcOptions" $ \t ->
+    case t of
+      "targets" -> pure AGOTargets
+      "locals" -> pure AGOLocals
+      "everything" -> pure AGOEverything
+      _ -> fail $ "Invalid ApplyGhcOptions: " ++ show t
diff --git a/src/Stack/Types/ApplyProgOptions.hs b/src/Stack/Types/ApplyProgOptions.hs
new file mode 100644
index 0000000000..2acd98216f
--- /dev/null
+++ b/src/Stack/Types/ApplyProgOptions.hs
@@ -0,0 +1,30 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.ApplyProgOptions
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ApplyProgOptions
+  ( ApplyProgOptions (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), withText )
+import           Stack.Prelude
+
+-- | Which packages do all and any --PROG-option options on the command line
+-- apply to?
+data ApplyProgOptions
+  = APOTargets -- ^ All project packages that are targets.
+  | APOLocals -- ^ All project packages (targets or otherwise).
+  | APOEverything -- ^ All packages (project packages or dependencies).
+  deriving (Bounded, Enum, Eq, Ord, Read, Show)
+
+instance FromJSON ApplyProgOptions where
+  parseJSON = withText "ApplyProgOptions" $ \t ->
+    case t of
+      "targets" -> pure APOTargets
+      "locals" -> pure APOLocals
+      "everything" -> pure APOEverything
+      _ -> fail $ "Invalid ApplyProgOptions: " ++ show t
diff --git a/src/Stack/Types/Build.hs b/src/Stack/Types/Build.hs
index 02fd7bf70f..9bae8b5265 100644
--- a/src/Stack/Types/Build.hs
+++ b/src/Stack/Types/Build.hs
@@ -1,742 +1,42 @@
-{-# LANGUAGE NoImplicitPrelude          #-}
-{-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE DeriveDataTypeable         #-}
-{-# LANGUAGE DeriveGeneric              #-}
-{-# LANGUAGE FlexibleInstances          #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
 
--- | Build-specific types.
+{-|
+Module      : Stack.Types.Build
+Description : Build-specific types.
+License     : BSD-3-Clause
+
+Build-specific types.
+-}
 
 module Stack.Types.Build
-    (StackBuildException(..)
-    ,FlagSource(..)
-    ,UnusedFlags(..)
-    ,InstallLocation(..)
-    ,Installed(..)
-    ,psVersion
-    ,Task(..)
-    ,taskIsTarget
-    ,taskLocation
-    ,taskTargetIsMutable
-    ,LocalPackage(..)
-    ,BaseConfigOpts(..)
-    ,Plan(..)
-    ,TestOpts(..)
-    ,BenchmarkOpts(..)
-    ,FileWatchOpts(..)
-    ,BuildOpts(..)
-    ,BuildSubset(..)
-    ,defaultBuildOpts
-    ,TaskType(..)
-    ,IsMutable(..)
-    ,installLocationIsMutable
-    ,TaskConfigOpts(..)
-    ,BuildCache(..)
-    ,ConfigCache(..)
-    ,configureOpts
-    ,CachePkgSrc (..)
-    ,toCachePkgSrc
-    ,isStackOpt
-    ,wantedLocalPackages
-    ,FileCacheInfo (..)
-    ,ConfigureOpts (..)
-    ,PrecompiledCache (..)
-    )
-    where
+  ( RunCabalWithArgs
+  , ExcludeTHLoading (..)
+  , ConvertPathsToAbsolute (..)
+  , KeepOutputOpen (..)
+  ) where
 
 import           Stack.Prelude
-import           Data.Aeson                      (ToJSON, FromJSON)
-import qualified Data.ByteString                 as S
-import           Data.Char                       (isSpace)
-import           Data.List.Extra
-import qualified Data.Map                        as Map
-import qualified Data.Set                        as Set
-import qualified Data.Text                       as T
-import           Database.Persist.Sql            (PersistField(..)
-                                                 ,PersistFieldSql(..)
-                                                 ,PersistValue(PersistText)
-                                                 ,SqlType(SqlString))
-import           Distribution.PackageDescription (TestSuiteInterface)
-import           Distribution.System             (Arch)
-import qualified Distribution.Text               as C
-import           Distribution.Version            (mkVersion)
-import           Path                            (parseRelDir, (</>), parent)
-import           Path.Extra                      (toFilePathNoTrailingSep)
-import           Stack.Constants
-import           Stack.Types.Compiler
-import           Stack.Types.CompilerBuild
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
-import           Stack.Types.NamedComponent
-import           Stack.Types.Package
-import           Stack.Types.Version
-import           System.FilePath                 (pathSeparator)
-import           RIO.Process                     (showProcessArgDebug)
-
-----------------------------------------------
--- Exceptions
-data StackBuildException
-  = Couldn'tFindPkgId PackageName
-  | CompilerVersionMismatch
-        (Maybe (ActualCompiler, Arch)) -- found
-        (WantedCompiler, Arch) -- expected
-        GHCVariant -- expected
-        CompilerBuild -- expected
-        VersionCheck
-        (Maybe (Path Abs File)) -- Path to the stack.yaml file
-        Text -- recommended resolution
-  | Couldn'tParseTargets [Text]
-  | UnknownTargets
-    (Set PackageName) -- no known version
-    (Map PackageName Version) -- not in snapshot, here's the most recent version in the index
-    (Path Abs File) -- stack.yaml
-  | TestSuiteFailure PackageIdentifier (Map Text (Maybe ExitCode)) (Maybe (Path Abs File)) S.ByteString
-  | TestSuiteTypeUnsupported TestSuiteInterface
-  | ConstructPlanFailed String
-  | CabalExitedUnsuccessfully
-        ExitCode
-        PackageIdentifier
-        (Path Abs File)  -- cabal Executable
-        [String]         -- cabal arguments
-        (Maybe (Path Abs File)) -- logfiles location
-        [Text]     -- log contents
-  | SetupHsBuildFailure
-        ExitCode
-        (Maybe PackageIdentifier) -- which package's custom setup, is simple setup if Nothing
-        (Path Abs File)  -- ghc Executable
-        [String]         -- ghc arguments
-        (Maybe (Path Abs File)) -- logfiles location
-        [Text]     -- log contents
-  | ExecutionFailure [SomeException]
-  | LocalPackageDoesn'tMatchTarget
-        PackageName
-        Version -- local version
-        Version -- version specified on command line
-  | NoSetupHsFound (Path Abs Dir)
-  | InvalidFlagSpecification (Set UnusedFlags)
-  | InvalidGhcOptionsSpecification [PackageName]
-  | TargetParseException [Text]
-  | SomeTargetsNotBuildable [(PackageName, NamedComponent)]
-  | TestSuiteExeMissing Bool String String String
-  | CabalCopyFailed Bool String
-  | LocalPackagesPresent [PackageIdentifier]
-  | CouldNotLockDistDir !(Path Abs File)
-  deriving Typeable
-
-data FlagSource = FSCommandLine | FSStackYaml
-    deriving (Show, Eq, Ord)
-
-data UnusedFlags = UFNoPackage FlagSource PackageName
-                 | UFFlagsNotDefined
-                       FlagSource
-                       PackageName
-                       (Set FlagName) -- defined in package
-                       (Set FlagName) -- not defined
-                 | UFSnapshot PackageName
-    deriving (Show, Eq, Ord)
-
-instance Show StackBuildException where
-    show (Couldn'tFindPkgId name) =
-              "After installing " <> packageNameString name <>
-               ", the package id couldn't be found " <> "(via ghc-pkg describe " <>
-               packageNameString name <> "). This shouldn't happen, " <>
-               "please report as a bug"
-    show (CompilerVersionMismatch mactual (expected, eArch) ghcVariant ghcBuild check mstack resolution) = concat
-                [ case mactual of
-                    Nothing -> "No compiler found, expected "
-                    Just (actual, arch) -> concat
-                        [ "Compiler version mismatched, found "
-                        , compilerVersionString actual
-                        , " ("
-                        , C.display arch
-                        , ")"
-                        , ", but expected "
-                        ]
-                , case check of
-                    MatchMinor -> "minor version match with "
-                    MatchExact -> "exact version "
-                    NewerMinor -> "minor version match or newer with "
-                , T.unpack $ utf8BuilderToText $ display expected
-                , " ("
-                , C.display eArch
-                , ghcVariantSuffix ghcVariant
-                , compilerBuildSuffix ghcBuild
-                , ") (based on "
-                , case mstack of
-                    Nothing -> "command line arguments"
-                    Just stack -> "resolver setting in " ++ toFilePath stack
-                , ").\n"
-                , T.unpack resolution
-                ]
-    show (Couldn'tParseTargets targets) = unlines
-                $ "The following targets could not be parsed as package names or directories:"
-                : map T.unpack targets
-    show (UnknownTargets noKnown notInSnapshot stackYaml) =
-        unlines $ noKnown' ++ notInSnapshot'
-      where
-        noKnown'
-            | Set.null noKnown = []
-            | otherwise = pure $
-                "The following target packages were not found: " ++
-                intercalate ", " (map packageNameString $ Set.toList noKnown) ++
-                "\nSee https://docs.haskellstack.org/en/stable/build_command/#target-syntax for details."
-        notInSnapshot'
-            | Map.null notInSnapshot = []
-            | otherwise =
-                  "The following packages are not in your snapshot, but exist"
-                : "in your package index. Recommended action: add them to your"
-                : ("extra-deps in " ++ toFilePath stackYaml)
-                : "(Note: these are the most recent versions,"
-                : "but there's no guarantee that they'll build together)."
-                : ""
-                : map
-                    (\(name, version') -> "- " ++ packageIdentifierString
-                        (PackageIdentifier name version'))
-                    (Map.toList notInSnapshot)
-    show (TestSuiteFailure ident codes mlogFile bs) = unlines $ concat
-        [ ["Test suite failure for package " ++ packageIdentifierString ident]
-        , flip map (Map.toList codes) $ \(name, mcode) -> concat
-            [ "    "
-            , T.unpack name
-            , ": "
-            , case mcode of
-                Nothing -> " executable not found"
-                Just ec -> " exited with: " ++ show ec
-            ]
-        , pure $ case mlogFile of
-            Nothing -> "Logs printed to console"
-            -- TODO Should we load up the full error output and print it here?
-            Just logFile -> "Full log available at " ++ toFilePath logFile
-        , if S.null bs
-            then []
-            else ["", "", doubleIndent $ T.unpack $ decodeUtf8With lenientDecode bs]
-        ]
-         where
-          indent = dropWhileEnd isSpace . unlines . fmap (\line -> "  " ++ line) . lines
-          doubleIndent = indent . indent
-    show (TestSuiteTypeUnsupported interface) =
-              "Unsupported test suite type: " <> show interface
-     -- Suppressing duplicate output
-    show (CabalExitedUnsuccessfully exitCode taskProvides' execName fullArgs logFiles bss) =
-      showBuildError False exitCode (Just taskProvides') execName fullArgs logFiles bss
-    show (SetupHsBuildFailure exitCode mtaskProvides execName fullArgs logFiles bss) =
-      showBuildError True exitCode mtaskProvides execName fullArgs logFiles bss
-    show (ExecutionFailure es) = intercalate "\n\n" $ map show es
-    show (LocalPackageDoesn'tMatchTarget name localV requestedV) = concat
-        [ "Version for local package "
-        , packageNameString name
-        , " is "
-        , versionString localV
-        , ", but you asked for "
-        , versionString requestedV
-        , " on the command line"
-        ]
-    show (NoSetupHsFound dir) =
-        "No Setup.hs or Setup.lhs file found in " ++ toFilePath dir
-    show (InvalidFlagSpecification unused) = unlines
-        $ "Invalid flag specification:"
-        : map go (Set.toList unused)
-      where
-        showFlagSrc :: FlagSource -> String
-        showFlagSrc FSCommandLine = " (specified on command line)"
-        showFlagSrc FSStackYaml = " (specified in stack.yaml)"
-
-        go :: UnusedFlags -> String
-        go (UFNoPackage src name) = concat
-            [ "- Package '"
-            , packageNameString name
-            , "' not found"
-            , showFlagSrc src
-            ]
-        go (UFFlagsNotDefined src pname pkgFlags flags) = concat
-            [ "- Package '"
-            , name
-            , "' does not define the following flags"
-            , showFlagSrc src
-            , ":\n"
-            , intercalate "\n"
-                          (map (\flag -> "  " ++ flagNameString flag)
-                               (Set.toList flags))
-            , "\n- Flags defined by package '" ++ name ++ "':\n"
-            , intercalate "\n"
-                          (map (\flag -> "  " ++ name ++ ":" ++ flagNameString flag)
-                               (Set.toList pkgFlags))
-            ]
-          where name = packageNameString pname
-        go (UFSnapshot name) = concat
-            [ "- Attempted to set flag on snapshot package "
-            , packageNameString name
-            , ", please add to extra-deps"
-            ]
-    show (InvalidGhcOptionsSpecification unused) = unlines
-        $ "Invalid GHC options specification:"
-        : map showGhcOptionSrc unused
-      where
-        showGhcOptionSrc name = concat
-            [ "- Package '"
-            , packageNameString name
-            , "' not found"
-            ]
-    show (TargetParseException [err]) = "Error parsing targets: " ++ T.unpack err
-    show (TargetParseException errs) = unlines
-        $ "The following errors occurred while parsing the build targets:"
-        : map (("- " ++) . T.unpack) errs
-
-    show (SomeTargetsNotBuildable xs) =
-        "The following components have 'buildable: False' set in the cabal configuration, and so cannot be targets:\n    " ++
-        T.unpack (renderPkgComponents xs) ++
-        "\nTo resolve this, either provide flags such that these components are buildable, or only specify buildable targets."
-    show (TestSuiteExeMissing isSimpleBuildType exeName pkgName' testName) =
-        missingExeError isSimpleBuildType $ concat
-            [ "Test suite executable \""
-            , exeName
-            , " not found for "
-            , pkgName'
-            , ":test:"
-            , testName
-            ]
-    show (CabalCopyFailed isSimpleBuildType innerMsg) =
-        missingExeError isSimpleBuildType $ concat
-            [ "'cabal copy' failed.  Error message:\n"
-            , innerMsg
-            , "\n"
-            ]
-    show (ConstructPlanFailed msg) = msg
-    show (LocalPackagesPresent locals) = unlines
-      $ "Local packages are not allowed when using the script command. Packages found:"
-      : map (\ident -> "- " ++ packageIdentifierString ident) locals
-    show (CouldNotLockDistDir lockFile) = unlines
-      [ "Locking the dist directory failed, try to lock file:"
-      , "  " ++ toFilePath lockFile
-      , "Maybe you're running another copy of Stack?"
-      ]
-
-missingExeError :: Bool -> String -> String
-missingExeError isSimpleBuildType msg =
-    unlines $ msg : "Possible causes of this issue:" :
-              map ("* " <>) possibleCauses
-  where
-    possibleCauses =
-        "No module named \"Main\". The 'main-is' source file should usually \
-        \have a header indicating that it's a 'Main' module." :
-
-        "A Cabal file that refers to nonexistent other files (e.g. a \
-        \license-file that doesn't exist). Running 'cabal check' may point \
-        \out these issues." :
-
-        if isSimpleBuildType
-            then []
-            else ["The Setup.hs file is changing the installation target dir."]
-
-showBuildError
-  :: Bool
-  -> ExitCode
-  -> Maybe PackageIdentifier
-  -> Path Abs File
-  -> [String]
-  -> Maybe (Path Abs File)
-  -> [Text]
-  -> String
-showBuildError isBuildingSetup exitCode mtaskProvides execName fullArgs logFiles bss =
-  let fullCmd = unwords
-              $ dropQuotes (toFilePath execName)
-              : map (T.unpack . showProcessArgDebug) fullArgs
-      logLocations = maybe "" (\fp -> "\n    Logs have been written to: " ++ toFilePath fp) logFiles
-  in "\n--  While building " ++
-     (case (isBuildingSetup, mtaskProvides) of
-       (False, Nothing) -> error "Invariant violated: unexpected case in showBuildError"
-       (False, Just taskProvides') -> "package " ++ dropQuotes (packageIdentifierString taskProvides')
-       (True, Nothing) -> "simple Setup.hs"
-       (True, Just taskProvides') -> "custom Setup.hs for package " ++ dropQuotes (packageIdentifierString taskProvides')
-     ) ++
-     " (scroll up to its section to see the error) using:\n      " ++ fullCmd ++ "\n" ++
-     "    Process exited with code: " ++ show exitCode ++
-     (if exitCode == ExitFailure (-9)
-          then " (THIS MAY INDICATE OUT OF MEMORY)"
-          else "") ++
-     logLocations ++
-     (if null bss
-          then ""
-          else "\n\n" ++ removeTrailingSpaces (map T.unpack bss))
-   where
-    removeTrailingSpaces = dropWhileEnd isSpace . unlines
-    dropQuotes = filter ('\"' /=)
-
-instance Exception StackBuildException
-
-----------------------------------------------
-
--- | Package dependency oracle.
-newtype PkgDepsOracle =
-    PkgDeps PackageName
-    deriving (Show,Typeable,Eq,NFData)
-
--- | Stored on disk to know whether the files have changed.
-newtype BuildCache = BuildCache
-    { buildCacheTimes :: Map FilePath FileCacheInfo
-      -- ^ Modification times of files.
-    }
-    deriving (Generic, Eq, Show, Typeable, ToJSON, FromJSON)
-instance NFData BuildCache
-
--- | Stored on disk to know whether the flags have changed.
-data ConfigCache = ConfigCache
-    { configCacheOpts :: !ConfigureOpts
-      -- ^ All options used for this package.
-    , configCacheDeps :: !(Set GhcPkgId)
-      -- ^ The GhcPkgIds of all of the dependencies. Since Cabal doesn't take
-      -- the complete GhcPkgId (only a PackageIdentifier) in the configure
-      -- options, just using the previous value is insufficient to know if
-      -- dependencies have changed.
-    , configCacheComponents :: !(Set S.ByteString)
-      -- ^ The components to be built. It's a bit of a hack to include this in
-      -- here, as it's not a configure option (just a build option), but this
-      -- is a convenient way to force compilation when the components change.
-    , configCacheHaddock :: !Bool
-      -- ^ Are haddocks to be built?
-    , configCachePkgSrc :: !CachePkgSrc
-    , configCachePathEnvVar :: !Text
-    -- ^ Value of the PATH env var, see <https://github.com/commercialhaskell/stack/issues/3138>
-    }
-    deriving (Generic, Eq, Show, Data, Typeable)
-instance NFData ConfigCache
-
-data CachePkgSrc = CacheSrcUpstream | CacheSrcLocal FilePath
-    deriving (Generic, Eq, Read, Show, Data, Typeable)
-instance NFData CachePkgSrc
-
-instance PersistField CachePkgSrc where
-    toPersistValue CacheSrcUpstream = PersistText "upstream"
-    toPersistValue (CacheSrcLocal fp) = PersistText ("local:" <> T.pack fp)
-    fromPersistValue (PersistText t) = do
-        if t == "upstream"
-            then Right CacheSrcUpstream
-            else case T.stripPrefix "local:" t of
-                Just fp -> Right $ CacheSrcLocal (T.unpack fp)
-                Nothing -> Left $ "Unexpected CachePkgSrc value: " <> t
-    fromPersistValue _ = Left "Unexpected CachePkgSrc type"
-
-instance PersistFieldSql CachePkgSrc where
-    sqlType _ = SqlString
-
-toCachePkgSrc :: PackageSource -> CachePkgSrc
-toCachePkgSrc (PSFilePath lp) = CacheSrcLocal (toFilePath (parent (lpCabalFile lp)))
-toCachePkgSrc PSRemote{} = CacheSrcUpstream
-
--- | A task to perform when building
-data Task = Task
-    { taskProvides        :: !PackageIdentifier -- FIXME turn this into a function on taskType?
-    -- ^ the package/version to be built
-    , taskType            :: !TaskType
-    -- ^ the task type, telling us how to build this
-    , taskConfigOpts      :: !TaskConfigOpts
-    , taskBuildHaddock    :: !Bool
-    , taskPresent         :: !(Map PackageIdentifier GhcPkgId)
-    -- ^ GhcPkgIds of already-installed dependencies
-    , taskAllInOne        :: !Bool
-    -- ^ indicates that the package can be built in one step
-    , taskCachePkgSrc     :: !CachePkgSrc
-    , taskAnyMissing      :: !Bool
-    -- ^ Were any of the dependencies missing? The reason this is
-    -- necessary is... hairy. And as you may expect, a bug in
-    -- Cabal. See:
-    -- <https://github.com/haskell/cabal/issues/4728#issuecomment-337937673>. The
-    -- problem is that Cabal may end up generating the same package ID
-    -- for a dependency, even if the ABI has changed. As a result,
-    -- without this field, Stack would think that a reconfigure is
-    -- unnecessary, when in fact we _do_ need to reconfigure. The
-    -- details here suck. We really need proper hashes for package
-    -- identifiers.
-    , taskBuildTypeConfig :: !Bool
-    -- ^ Is the build type of this package Configure. Check out
-    -- ensureConfigureScript in Stack.Build.Execute for the motivation
-    }
-    deriving Show
-
--- | Given the IDs of any missing packages, produce the configure options
-data TaskConfigOpts = TaskConfigOpts
-    { tcoMissing :: !(Set PackageIdentifier)
-      -- ^ Dependencies for which we don't yet have an GhcPkgId
-    , tcoOpts    :: !(Map PackageIdentifier GhcPkgId -> ConfigureOpts)
-      -- ^ Produce the list of options given the missing @GhcPkgId@s
-    }
-instance Show TaskConfigOpts where
-    show (TaskConfigOpts missing f) = concat
-        [ "Missing: "
-        , show missing
-        , ". Without those: "
-        , show $ f Map.empty
-        ]
-
--- | The type of a task, either building local code or something from the
--- package index (upstream)
-data TaskType
-  = TTLocalMutable LocalPackage
-  | TTRemotePackage IsMutable Package PackageLocationImmutable
-    deriving Show
-
-data IsMutable
-    = Mutable
-    | Immutable
-    deriving (Eq, Show)
-
-instance Semigroup IsMutable where
-    Mutable <> _ = Mutable
-    _ <> Mutable = Mutable
-    Immutable <> Immutable = Immutable
-
-instance Monoid IsMutable where
-    mempty = Immutable
-    mappend = (<>)
-
-taskIsTarget :: Task -> Bool
-taskIsTarget t =
-    case taskType t of
-        TTLocalMutable lp -> lpWanted lp
-        _ -> False
-
-taskLocation :: Task -> InstallLocation
-taskLocation task =
-    case taskType task of
-        TTLocalMutable _ -> Local
-        TTRemotePackage Mutable _ _ -> Local
-        TTRemotePackage Immutable _ _ -> Snap
-
-taskTargetIsMutable :: Task -> IsMutable
-taskTargetIsMutable task =
-    case taskType task of
-        TTLocalMutable _ -> Mutable
-        TTRemotePackage mutable _ _ -> mutable
-
-installLocationIsMutable :: InstallLocation -> IsMutable
-installLocationIsMutable Snap = Immutable
-installLocationIsMutable Local = Mutable
-
--- | A complete plan of what needs to be built and how to do it
-data Plan = Plan
-    { planTasks :: !(Map PackageName Task)
-    , planFinals :: !(Map PackageName Task)
-    -- ^ Final actions to be taken (test, benchmark, etc)
-    , planUnregisterLocal :: !(Map GhcPkgId (PackageIdentifier, Text))
-    -- ^ Text is reason we're unregistering, for display only
-    , planInstallExes :: !(Map Text InstallLocation)
-    -- ^ Executables that should be installed after successful building
-    }
-    deriving Show
-
--- | Basic information used to calculate what the configure options are
-data BaseConfigOpts = BaseConfigOpts
-    { bcoSnapDB :: !(Path Abs Dir)
-    , bcoLocalDB :: !(Path Abs Dir)
-    , bcoSnapInstallRoot :: !(Path Abs Dir)
-    , bcoLocalInstallRoot :: !(Path Abs Dir)
-    , bcoBuildOpts :: !BuildOpts
-    , bcoBuildOptsCLI :: !BuildOptsCLI
-    , bcoExtraDBs :: ![Path Abs Dir]
-    }
-    deriving Show
-
--- | Render a @BaseConfigOpts@ to an actual list of options
-configureOpts :: EnvConfig
-              -> BaseConfigOpts
-              -> Map PackageIdentifier GhcPkgId -- ^ dependencies
-              -> Bool -- ^ local non-extra-dep?
-              -> IsMutable
-              -> Package
-              -> ConfigureOpts
-configureOpts econfig bco deps isLocal isMutable package = ConfigureOpts
-    { coDirs = configureOptsDirs bco isMutable package
-    , coNoDirs = configureOptsNoDir econfig bco deps isLocal package
-    }
-
--- options set by stack
-isStackOpt :: Text -> Bool
-isStackOpt t = any (`T.isPrefixOf` t)
-    [ "--dependency="
-    , "--constraint="
-    , "--package-db="
-    , "--libdir="
-    , "--bindir="
-    , "--datadir="
-    , "--libexecdir="
-    , "--sysconfdir"
-    , "--docdir="
-    , "--htmldir="
-    , "--haddockdir="
-    , "--enable-tests"
-    , "--enable-benchmarks"
-    , "--exact-configuration"
-    -- Treat these as causing dirtiness, to resolve
-    -- https://github.com/commercialhaskell/stack/issues/2984
-    --
-    -- , "--enable-library-profiling"
-    -- , "--enable-executable-profiling"
-    -- , "--enable-profiling"
-    ] || t == "--user"
-
-configureOptsDirs :: BaseConfigOpts
-                  -> IsMutable
-                  -> Package
-                  -> [String]
-configureOptsDirs bco isMutable package = concat
-    [ ["--user", "--package-db=clear", "--package-db=global"]
-    , map (("--package-db=" ++) . toFilePathNoTrailingSep) $ case isMutable of
-        Immutable -> bcoExtraDBs bco ++ [bcoSnapDB bco]
-        Mutable -> bcoExtraDBs bco ++ [bcoSnapDB bco] ++ [bcoLocalDB bco]
-    , [ "--libdir=" ++ toFilePathNoTrailingSep (installRoot </> relDirLib)
-      , "--bindir=" ++ toFilePathNoTrailingSep (installRoot </> bindirSuffix)
-      , "--datadir=" ++ toFilePathNoTrailingSep (installRoot </> relDirShare)
-      , "--libexecdir=" ++ toFilePathNoTrailingSep (installRoot </> relDirLibexec)
-      , "--sysconfdir=" ++ toFilePathNoTrailingSep (installRoot </> relDirEtc)
-      , "--docdir=" ++ toFilePathNoTrailingSep docDir
-      , "--htmldir=" ++ toFilePathNoTrailingSep docDir
-      , "--haddockdir=" ++ toFilePathNoTrailingSep docDir]
-    ]
-  where
-    installRoot =
-        case isMutable of
-            Immutable -> bcoSnapInstallRoot bco
-            Mutable -> bcoLocalInstallRoot bco
-    docDir =
-        case pkgVerDir of
-            Nothing -> installRoot </> docDirSuffix
-            Just dir -> installRoot </> docDirSuffix </> dir
-    pkgVerDir =
-        parseRelDir (packageIdentifierString (PackageIdentifier (packageName package)
-                                                                (packageVersion package)) ++
-                     [pathSeparator])
-
--- | Same as 'configureOpts', but does not include directory path options
-configureOptsNoDir :: EnvConfig
-                   -> BaseConfigOpts
-                   -> Map PackageIdentifier GhcPkgId -- ^ dependencies
-                   -> Bool -- ^ is this a local, non-extra-dep?
-                   -> Package
-                   -> [String]
-configureOptsNoDir econfig bco deps isLocal package = concat
-    [ depOptions
-    , ["--enable-library-profiling" | boptsLibProfile bopts || boptsExeProfile bopts]
-    -- Cabal < 1.21.1 does not support --enable-profiling, use --enable-executable-profiling instead
-    , let profFlag = "--enable-" <> concat ["executable-" | not newerCabal] <> "profiling"
-      in [ profFlag | boptsExeProfile bopts && isLocal]
-    , ["--enable-split-objs" | boptsSplitObjs bopts]
-    , ["--disable-library-stripping" | not $ boptsLibStrip bopts || boptsExeStrip bopts]
-    , ["--disable-executable-stripping" | not (boptsExeStrip bopts) && isLocal]
-    , map (\(name,enabled) ->
-                       "-f" <>
-                       (if enabled
-                           then ""
-                           else "-") <>
-                       flagNameString name)
-                    (Map.toList flags)
-    , map T.unpack $ packageCabalConfigOpts package
-    , processGhcOptions (packageGhcOptions package)
-    , map ("--extra-include-dirs=" ++) (configExtraIncludeDirs config)
-    , map ("--extra-lib-dirs=" ++) (configExtraLibDirs config)
-    , maybe [] (\customGcc -> ["--with-gcc=" ++ toFilePath customGcc]) (configOverrideGccPath config)
-    , ["--exact-configuration"]
-    , ["--ghc-option=-fhide-source-paths" | hideSourcePaths cv]
-    ]
-  where
-    -- This function parses the GHC options that are providing in the
-    -- stack.yaml file. In order to handle RTS arguments correctly, we need
-    -- to provide the RTS arguments as a single argument.
-    processGhcOptions :: [Text] -> [String]
-    processGhcOptions args =
-        let
-            (preRtsArgs, mid) =
-                break ("+RTS" ==) args
-            (rtsArgs, end) =
-                break ("-RTS" ==) mid
-            fullRtsArgs =
-                case rtsArgs of
-                    [] ->
-                        -- This means that we didn't have any RTS args - no
-                        -- `+RTS` - and therefore no need for a `-RTS`.
-                        []
-                    _ ->
-                        -- In this case, we have some RTS args. `break`
-                        -- puts the `"-RTS"` string in the `snd` list, so
-                        -- we want to append it on the end of `rtsArgs`
-                        -- here.
-                        --
-                        -- We're not checking that `-RTS` is the first
-                        -- element of `end`. This is because the GHC RTS
-                        -- allows you to omit a trailing -RTS if that's the
-                        -- last of the arguments. This permits a GHC
-                        -- options in stack.yaml that matches what you
-                        -- might pass directly to GHC.
-                        [T.unwords $ rtsArgs ++ ["-RTS"]]
-            -- We drop the first element from `end`, because it is always
-            -- either `"-RTS"` (and we don't want that as a separate
-            -- argument) or the list is empty (and `drop _ [] = []`).
-            postRtsArgs =
-                drop 1 end
-            newArgs =
-                concat [preRtsArgs, fullRtsArgs, postRtsArgs]
-        in
-            concatMap (\x -> [compilerOptionsCabalFlag wc, T.unpack x]) newArgs
-
-    wc = view (actualCompilerVersionL.to whichCompiler) econfig
-    cv = view (actualCompilerVersionL.to getGhcVersion) econfig
-
-    hideSourcePaths ghcVersion = ghcVersion >= mkVersion [8, 2] && configHideSourcePaths config
-
-    config = view configL econfig
-    bopts = bcoBuildOpts bco
-
-    newerCabal = view cabalVersionL econfig >= mkVersion [1, 22]
-
-    -- Unioning atop defaults is needed so that all flags are specified
-    -- with --exact-configuration.
-    flags = packageFlags package `Map.union` packageDefaultFlags package
-
-    depOptions = map (uncurry toDepOption) $ Map.toList deps
-      where
-        toDepOption = if newerCabal then toDepOption1_22 else toDepOption1_18
-
-    toDepOption1_22 (PackageIdentifier name _) gid = concat
-        [ "--dependency="
-        , packageNameString name
-        , "="
-        , ghcPkgIdString gid
-        ]
-
-    toDepOption1_18 ident _gid = concat
-        [ "--constraint="
-        , packageNameString name
-        , "=="
-        , versionString version'
-        ]
-      where
-        PackageIdentifier name version' = ident
-
--- | Get set of wanted package names from locals.
-wantedLocalPackages :: [LocalPackage] -> Set PackageName
-wantedLocalPackages = Set.fromList . map (packageName . lpPackage) . filter lpWanted
-
--- | Configure options to be sent to Setup.hs configure
-data ConfigureOpts = ConfigureOpts
-    { coDirs :: ![String]
-    -- ^ Options related to various paths. We separate these out since they do
-    -- not have an impact on the contents of the compiled binary for checking
-    -- if we can use an existing precompiled cache.
-    , coNoDirs :: ![String]
-    }
-    deriving (Show, Eq, Generic, Data, Typeable)
-instance NFData ConfigureOpts
 
--- | Information on a compiled package: the library conf file (if relevant),
--- the sublibraries (if present) and all of the executable paths.
-data PrecompiledCache base = PrecompiledCache
-    { pcLibrary :: !(Maybe (Path base File))
-    -- ^ .conf file inside the package database
-    , pcSubLibs :: ![Path base File]
-    -- ^ .conf file inside the package database, for each of the sublibraries
-    , pcExes    :: ![Path base File]
-    -- ^ Full paths to executables
-    }
-    deriving (Show, Eq, Generic, Typeable)
-instance NFData (PrecompiledCache Abs)
-instance NFData (PrecompiledCache Rel)
+-- | Type synonym that represents functions that run Cabal (the library) with
+-- arguments.
+type RunCabalWithArgs env =
+  KeepOutputOpen -> ExcludeTHLoading -> [String] -> RIO env ()
+
+-- | Type representing treatments of GHC's informational messages during
+-- compilation when it evaluates Template Haskell code.
+data ExcludeTHLoading
+  = ExcludeTHLoading
+    -- ^ Suppress the messages.
+  | KeepTHLoading
+    -- ^ Do not suppress the messages.
+
+data ConvertPathsToAbsolute
+  = ConvertPathsToAbsolute
+  | KeepPathsAsIs
+
+-- | Special marker for expected failures in curator builds, using those we need
+-- to keep log handle open as build continues further even after a failure.
+data KeepOutputOpen
+  = KeepOpen
+  | CloseOnException
+  deriving Eq
diff --git a/src/Stack/Types/Build/ConstructPlan.hs b/src/Stack/Types/Build/ConstructPlan.hs
new file mode 100644
index 0000000000..0885052d45
--- /dev/null
+++ b/src/Stack/Types/Build/ConstructPlan.hs
@@ -0,0 +1,299 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Storage.Util
+Description : Utilities for module "Stack.Build.ConstructPlan".
+License     : BSD-3-Clause
+
+A module providing types and related helper functions used in module
+"Stack.Build.ConstructPlan".
+-}
+
+module Stack.Types.Build.ConstructPlan
+  ( PackageInfo (..)
+  , CombinedMap
+  , M
+  , W (..)
+  , LibraryMap
+  , AddDepRes (..)
+  , toTask
+  , adrVersion
+  , adrHasLibrary
+  , processAdr
+  , isAdrToInstall
+  , Ctx (..)
+  , PackageLoader
+  , UnregisterState (..)
+  , ToolWarning (..)
+  , MissingPresentDeps (..)
+  ) where
+
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
+import           RIO.Process ( HasProcessContext (..) )
+import           RIO.State ( StateT )
+import           RIO.Writer ( WriterT (..) )
+import           Stack.Package ( hasBuildableMainLibrary )
+import           Stack.Prelude hiding ( loadPackage )
+import           Stack.Types.Build.Exception ( ConstructPlanException )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig(..) )
+import           Stack.Types.CompilerPaths ( HasCompiler (..) )
+import           Stack.Types.ComponentUtils ( StackUnqualCompName )
+import           Stack.Types.Config ( HasConfig (..) )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts )
+import           Stack.Types.Curator ( Curator )
+import           Stack.Types.DumpPackage ( DumpPackage )
+import           Stack.Types.EnvConfig
+                   ( EnvConfig (..), HasEnvConfig (..), HasSourceMap (..) )
+import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.Installed
+                   ( InstallLocation, Installed (..), installedVersion )
+import           Stack.Types.IsMutable ( IsMutable )
+import           Stack.Types.Package
+                   ( ExeName (..), LocalPackage (..), Package (..)
+                   , PackageSource (..), installedMapGhcPkgId
+                   )
+import           Stack.Types.ParentMap ( ParentMap )
+import           Stack.Types.Plan
+                   ( ComponentKey, Task (..), TaskType (..)
+                   , installLocationIsMutable, taskProvides
+                   , taskTargetIsMutable
+                   )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( HasRunner (..) )
+
+-- | Type representing information about packages, namely information about
+-- whether or not a package is already installed and, unless the package is not
+-- to be built (global packages), where its source code is located.
+data PackageInfo
+  = PIOnlyInstalled InstallLocation Installed
+    -- ^ This indicates that the package is already installed, and that we
+    -- shouldn't build it from source. This is only the case for global
+    -- packages.
+  | PIOnlySource PackageSource
+    -- ^ This indicates that the package isn't installed, and we know where to
+    -- find its source.
+  | PIBoth PackageSource Installed
+    -- ^ This indicates that the package is installed and we know where to find
+    -- its source. We may want to reinstall from source.
+  deriving Show
+
+-- | A type synonym representing dictionaries of package names, and combined
+-- information about the package in respect of whether or not it is already
+-- installed and, unless the package is not to be built (global packages), where
+-- its source code is located.
+type CombinedMap = Map PackageName PackageInfo
+
+-- | Type synonym representing values used during the construction of a build
+-- plan. The type is an instance of 'Monad', hence its name.
+type M = WriterT W (StateT LibraryMap (RIO Ctx))
+
+-- | Type representing values used as the output to be collected during the
+-- construction of a build plan.
+data W = W
+  { wFinals :: !(Map ComponentKey (Either ConstructPlanException Task))
+    -- ^ A dictionary of component keys, and either a final task to perform when
+    -- building the component or an exception.
+  , wInstall :: !(Map StackUnqualCompName InstallLocation)
+    -- ^ A dictionary of executables to be installed, and location where the
+    -- executable's binary is placed.
+  , wDirty :: !(Map PackageName Text)
+    -- ^ A dictionary of local packages, and the reason why the local package is
+    -- considered dirty.
+  , wWarnings :: !([StyleDoc] -> [StyleDoc])
+    -- ^ Warnings.
+  , wParents :: !ParentMap
+    -- ^ A dictionary of package names, and a list of pairs of the identifier
+    -- of a package depending on the package and the version range specified for
+    -- the dependency by that package. Used in the reporting of failure to
+    -- construct a build plan.
+  }
+  deriving Generic
+
+instance Semigroup W where
+  (<>) = mappenddefault
+
+instance Monoid W where
+  mempty = memptydefault
+  mappend = (<>)
+
+-- | A type synonym representing dictionaries of package names, and either an
+-- exception encountered during the construction of the build plan or the
+-- 'Stack.Build.ConstructPlan.addDep' result.
+type LibraryMap = Map PackageName (Either ConstructPlanException AddDepRes)
+
+-- | Type representing results of 'Stack.Build.ConstructPlan.addDep'.
+data AddDepRes
+  = ADRToInstall Task
+    -- ^ A task must be performed to provide the package name.
+  | ADRFound InstallLocation Installed
+    -- ^ An existing installation provides the package name.
+  deriving Show
+
+isAdrToInstall :: AddDepRes -> Bool
+isAdrToInstall ADRToInstall{} = True
+isAdrToInstall _ = False
+
+toTask :: AddDepRes -> Maybe Task
+toTask (ADRToInstall task) = Just task
+toTask (ADRFound _ _) = Nothing
+
+adrVersion :: AddDepRes -> Version
+adrVersion (ADRToInstall task) = pkgVersion $ taskProvides task
+adrVersion (ADRFound _ installed) = installedVersion installed
+
+adrHasLibrary :: AddDepRes -> Bool
+adrHasLibrary (ADRToInstall task) = case task.taskType of
+  TTLocalMutable lp -> packageHasLibrary lp.package
+  TTRemotePackage _ p _ -> packageHasLibrary p
+ where
+  -- make sure we consider sub-libraries as libraries too
+  packageHasLibrary :: Package -> Bool
+  packageHasLibrary p =
+    hasBuildableMainLibrary p || not (null p.subLibraries)
+adrHasLibrary (ADRFound _ Library{}) = True
+adrHasLibrary (ADRFound _ Executable{}) = False
+
+-- | Given a result of 'Stack.Build.ConstructPlan.addDep', yields a triple
+-- indicating: (1) if the dependency is to be installed, its package identifier;
+-- (2) if the dependency is installed and a library, its package identifier and
+-- 'GhcPkgId'; and (3) if the dependency is, or will be when installed, mutable
+-- or immutable.
+processAdr ::
+     AddDepRes
+  -> MissingPresentDeps
+processAdr adr = case adr of
+  ADRToInstall task ->
+    MissingPresentDeps
+      { missingPackages = Set.singleton $ taskProvides task
+      , presentPackages = mempty
+      , isMutable = taskTargetIsMutable task
+      }
+  ADRFound loc installed ->
+    MissingPresentDeps
+      { missingPackages = mempty
+      , presentPackages = presentPackagesV
+      , isMutable = installLocationIsMutable loc
+      }
+   where
+    presentPackagesV = case installed of
+      Library ident installedInfo -> installedMapGhcPkgId ident installedInfo
+      _ -> Map.empty
+
+data MissingPresentDeps = MissingPresentDeps
+  { missingPackages :: !(Set PackageIdentifier)
+  , presentPackages :: !(Map MungedPackageId GhcPkgId)
+  , isMutable :: !IsMutable
+  }
+  deriving Show
+
+instance Semigroup MissingPresentDeps where
+  (<>) a b = MissingPresentDeps
+    { missingPackages = missingPackages a <> missingPackages b
+    , presentPackages = presentPackages a <> presentPackages b
+    , isMutable = isMutable a <> isMutable b
+    }
+
+instance Monoid MissingPresentDeps where
+  mempty = MissingPresentDeps mempty mempty mempty
+
+-- | Type representing values used as the environment to be read from during the
+-- construction of a build plan (the \'context\').
+data Ctx = Ctx
+  { baseConfigOpts :: !BaseConfigOpts
+    -- ^ Basic information used to determine configure options
+  , loadPackage    :: !(PackageLoader M)
+    -- ^ A function to load a `Package` given the location of a package assumed
+    -- to be immutable.
+  , combinedMap    :: !CombinedMap
+    -- ^ A dictionary of package names, and combined information about the
+    -- package in respect of whether or not it is already installed and, unless
+    -- the package is not to be built (global packages), where its source code
+    -- is located.
+  , ctxEnvConfig   :: !EnvConfig
+    -- ^ Configuration after the environment has been setup.
+  , callStack      :: ![PackageName]
+  , wanted         :: !(Set PackageName)
+  , localNames     :: !(Set PackageName)
+  , curator       :: !(Maybe Curator)
+  , pathEnvVar     :: !Text
+  }
+
+-- | A type synonym representing functions that yield a 'Package' given the
+-- location of a package assumed to be immutable, parameterised by the relevant
+-- monad.
+type PackageLoader m =
+     PackageLocationImmutable
+     -- ^ Location of a package that is assumed to be immutable.
+  -> Map FlagName Bool
+     -- ^ Cabal flags.
+  -> [Text]
+     -- ^ GHC options.
+  -> [Text]
+     -- ^ Cabal configure options.
+  -> m Package
+
+instance HasPlatform Ctx where
+  platformL = configL . platformL
+  {-# INLINE platformL #-}
+  platformVariantL = configL . platformVariantL
+  {-# INLINE platformVariantL #-}
+
+instance HasGHCVariant Ctx where
+  ghcVariantL = configL . ghcVariantL
+  {-# INLINE ghcVariantL #-}
+
+instance HasLogFunc Ctx where
+  logFuncL = configL . logFuncL
+
+instance HasRunner Ctx where
+  runnerL = configL . runnerL
+
+instance HasStylesUpdate Ctx where
+  stylesUpdateL = runnerL . stylesUpdateL
+
+instance HasTerm Ctx where
+  useColorL = runnerL . useColorL
+  termWidthL = runnerL . termWidthL
+
+instance HasConfig Ctx where
+  configL = buildConfigL . lens (.config) (\x y -> x { config = y })
+  {-# INLINE configL #-}
+
+instance HasPantryConfig Ctx where
+  pantryConfigL = configL . pantryConfigL
+
+instance HasProcessContext Ctx where
+  processContextL = configL . processContextL
+
+instance HasBuildConfig Ctx where
+  buildConfigL = envConfigL . lens
+    (.buildConfig)
+    (\x y -> x { buildConfig = y })
+
+instance HasSourceMap Ctx where
+  sourceMapL = envConfigL . sourceMapL
+
+instance HasCompiler Ctx where
+  compilerPathsL = envConfigL . compilerPathsL
+
+instance HasEnvConfig Ctx where
+  envConfigL = lens (.ctxEnvConfig) (\x y -> x { ctxEnvConfig = y })
+
+-- | State to be maintained during the calculation of project packages and local
+-- extra-deps to unregister.
+data UnregisterState = UnregisterState
+  { toUnregister :: !(Map GhcPkgId (PackageIdentifier, Text))
+  , toKeep :: ![DumpPackage]
+  , anyAdded :: !Bool
+  }
+
+-- | Warn about tools in the snapshot definition. States the tool name
+-- expected and the package name using it.
+data ToolWarning
+  = ToolWarning ExeName PackageName
+  deriving Show
diff --git a/src/Stack/Types/Build/Exception.hs b/src/Stack/Types/Build/Exception.hs
new file mode 100644
index 0000000000..65bd579fd4
--- /dev/null
+++ b/src/Stack/Types/Build/Exception.hs
@@ -0,0 +1,1003 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Types.Build.Exception
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.Build.Exception
+  ( BuildException (..)
+  , BuildPrettyException (..)
+  , pprintTargetParseErrors
+  , ConstructPlanException (..)
+  , LatestApplicableVersion
+  , BadDependency (..)
+  ) where
+
+import qualified Data.ByteString as S
+import           Data.Char ( isSpace )
+import           Data.List as L
+import qualified Data.Map as Map
+import qualified Data.Map.Strict as M
+import           Data.Monoid.Map ( MonoidMap (..) )
+import qualified Data.Set as Set
+import qualified Data.Text as T
+import           Distribution.System ( Arch )
+import qualified Distribution.Text as C
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Types.TestSuiteInterface ( TestSuiteInterface )
+import qualified Distribution.Version as C
+import           RIO.NonEmpty ( nonEmpty )
+import           RIO.Process ( showProcessArgDebug )
+import           Stack.Constants ( defaultUserConfigPath, wiredInPackages )
+import           Stack.Prelude
+import           Stack.Types.Compiler ( ActualCompiler, compilerVersionString )
+import           Stack.Types.CompilerBuild
+                   ( CompilerBuild, compilerBuildSuffix )
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName, unqualCompToString )
+import           Stack.Types.DumpPackage ( DumpPackage )
+import           Stack.Types.UnusedFlags ( FlagSource (..), UnusedFlags (..) )
+import           Stack.Types.GHCVariant ( GHCVariant, ghcVariantSuffix )
+import           Stack.Types.NamedComponent
+                   ( NamedComponent, renderPkgComponent )
+import           Stack.Types.Package ( Package (..), packageIdentifier )
+import           Stack.Types.ParentMap ( ParentMap )
+import           Stack.Types.Version ( VersionCheck (..), VersionRange )
+import           Stack.Types.WantedCompilerSetter ( WantedCompilerSetter (..) )
+
+-- | Type representing exceptions thrown by functions exported by modules with
+-- names beginning @Stack.Build@.
+data BuildException
+  = Couldn'tFindPkgId PackageName
+  | Couldn'tParseTargets [Text]
+  | UnknownTargets
+      (Set PackageName) -- no known version
+      (Map PackageName Version) -- not in snapshot, here's the most recent
+                                -- version in the index
+      (Path Abs File) -- stack.yaml
+  | TestSuiteFailure
+      PackageIdentifier
+      (Map StackUnqualCompName (Maybe ExitCode))
+      (Maybe (Path Abs File))
+      S.ByteString
+  | TestSuiteTypeUnsupported TestSuiteInterface
+  | LocalPackageDoesn'tMatchTarget
+      PackageName
+      Version -- local version
+      Version -- version specified on command line
+  | NoSetupHsFound (Path Abs Dir)
+  | InvalidGhcOptionsSpecification [PackageName]
+  | LocalPackagesPresent [PackageIdentifier]
+  | CouldNotLockDistDir !(Path Abs File)
+  | TaskCycleBug PackageIdentifier
+  | PackageIdMissingBug PackageIdentifier
+  | MultipleResultsBug PackageName [DumpPackage]
+  | TemplateHaskellNotFoundBug
+  | HaddockIndexNotFound
+  | ShowBuildErrorBug
+  | CallStackEmptyBug
+  deriving Show
+
+instance Exception BuildException where
+  displayException (Couldn'tFindPkgId name) = bugReport "[S-7178]" $ concat
+    [ "After installing "
+    , packageNameString name
+    ,", the package id couldn't be found (via ghc-pkg describe "
+    , packageNameString name
+    , ")."
+    ]
+  displayException (Couldn'tParseTargets targets) = unlines
+    $ "Error: [S-3127]"
+    : "The following targets could not be parsed as package names or \
+      \directories:"
+    : map T.unpack targets
+  displayException (UnknownTargets noKnown notInSnapshot stackYaml) = unlines
+    $ "Error: [S-2154]"
+    : (noKnown' ++ notInSnapshot')
+   where
+    noKnown'
+      | Set.null noKnown = []
+      | otherwise = pure $
+          "The following target packages were not found: " ++
+          intercalate ", " (map packageNameString $ Set.toList noKnown) ++
+          "\nSee https://docs.haskellstack.org/en/stable/commands/build_command/#target-syntax for details."
+    notInSnapshot'
+      | Map.null notInSnapshot = []
+      | otherwise =
+            "The following packages are not in your snapshot, but exist"
+          : "in your package index. Recommended action: add them to your"
+          : ("extra-deps in " ++ toFilePath stackYaml)
+          : "(Note: these are the most recent versions,"
+          : "but there's no guarantee that they'll build together)."
+          : ""
+          : map
+              (\(name, version') -> "- " ++ packageIdentifierString
+                  (PackageIdentifier name version'))
+              (Map.toList notInSnapshot)
+  displayException (TestSuiteFailure ident codes mlogFile bs) = unlines
+    $ "Error: [S-1995]"
+    : concat
+        [ ["Test suite failure for package " ++ packageIdentifierString ident]
+        , flip map (Map.toList codes) $ \(name, mcode) -> concat
+            [ "    "
+            , unqualCompToString name
+            , ": "
+            , case mcode of
+                Nothing -> " executable not found"
+                Just ec -> " exited with: " ++ displayException ec
+            ]
+        , pure $ case mlogFile of
+            Nothing -> "Logs printed to console"
+            -- TODO Should we load up the full error output and print it here?
+            Just logFile -> "Full log available at " ++ toFilePath logFile
+        , if S.null bs
+            then []
+            else
+              [ ""
+              , ""
+              , doubleIndent $ T.unpack $ decodeUtf8With lenientDecode bs
+              ]
+        ]
+   where
+    indent' = dropWhileEnd isSpace . unlines . fmap ("  " ++) . lines
+    doubleIndent = indent' . indent'
+  displayException (TestSuiteTypeUnsupported interface) = concat
+    [ "Error: [S-3819]\n"
+    , "Unsupported test suite type: "
+    , show interface
+    ]
+     -- Suppressing duplicate output
+  displayException (LocalPackageDoesn'tMatchTarget name localV requestedV) = concat
+    [ "Error: [S-5797]\n"
+    , "Version for project package "
+    , packageNameString name
+    , " is "
+    , versionString localV
+    , ", but you asked for "
+    , versionString requestedV
+    , " on the command line"
+    ]
+  displayException (NoSetupHsFound dir) = concat
+    [ "Error: [S-3118]\n"
+    , "No Setup.hs or Setup.lhs file found in "
+    , toFilePath dir
+    ]
+  displayException (InvalidGhcOptionsSpecification unused) = unlines
+    $ "Error: [S-4925]"
+    : "Invalid GHC options specification:"
+    : map showGhcOptionSrc unused
+   where
+    showGhcOptionSrc name = concat
+      [ "- Package '"
+      , packageNameString name
+      , "' not found"
+      ]
+  displayException (LocalPackagesPresent locals) = unlines
+    $ "Error: [S-5510]"
+    : "Local packages are not allowed when using the 'script' command. \
+      \Packages found:"
+    : map (\ident -> "- " ++ packageIdentifierString ident) locals
+  displayException (CouldNotLockDistDir lockFile) = unlines
+    [ "Error: [S-7168]"
+    , "Locking the dist directory failed, try to lock file:"
+    , "  " ++ toFilePath lockFile
+    , "Maybe you're running another copy of Stack?"
+    ]
+  displayException (TaskCycleBug pid) = bugReport "[S-7868]" $
+    "Unexpected task cycle for "
+    ++ packageNameString (pkgName pid)
+  displayException (PackageIdMissingBug ident) = bugReport "[S-8923]" $
+    "singleBuild: missing package ID missing: "
+    ++ show ident
+  displayException (MultipleResultsBug name dps) = bugReport "[S-6739]" $
+    "singleBuild: multiple results when describing installed package "
+    ++ show (name, dps)
+  displayException TemplateHaskellNotFoundBug = bugReport "[S-3121]"
+    "template-haskell is a wired-in GHC boot library but it wasn't found."
+  displayException HaddockIndexNotFound =
+    "Error: [S-6901]\n"
+    ++ "No local or snapshot doc index found to open."
+  displayException ShowBuildErrorBug = bugReport "[S-5452]"
+    "Unexpected case in showBuildError."
+  displayException CallStackEmptyBug = bugReport "[S-2696]"
+    "addDep: call stack is empty."
+
+data BuildPrettyException
+  = ConstructPlanFailed
+      [ConstructPlanException]
+      (Either (Path Abs File) (Path Abs File))
+      (Path Abs Dir)
+      Bool -- Is the project the implicit global project?
+      ParentMap
+      (Set PackageName)
+      (Map PackageName [PackageName])
+  | ExecutionFailure [SomeException]
+  | CabalExitedUnsuccessfully
+      ExitCode
+      PackageIdentifier
+      (Path Abs File)  -- cabal Executable
+      [String]         -- cabal arguments
+      (Maybe (Path Abs File)) -- logfiles location
+      [Text]     -- log contents
+  | SetupHsBuildFailure
+      ExitCode
+      (Maybe PackageIdentifier) -- which package's custom setup, is simple setup
+                                -- if Nothing
+      (Path Abs File)  -- ghc Executable
+      [String]         -- ghc arguments
+      (Maybe (Path Abs File)) -- logfiles location
+      [Text]     -- log contents
+  | TargetParseException [StyleDoc]
+  | SomeTargetsNotBuildable [(PackageName, NamedComponent)]
+  | InvalidFlagSpecification [UnusedFlags]
+  | GHCProfOptionInvalid
+  | NotOnlyLocal [PackageName] [StackUnqualCompName]
+  | CompilerVersionMismatch
+      (Maybe (ActualCompiler, Arch)) -- found
+      (WantedCompiler, Arch) -- expected
+      GHCVariant -- expected
+      CompilerBuild -- expected
+      VersionCheck
+      WantedCompilerSetter -- Way that the wanted compiler is set
+      StyleDoc -- recommended resolution
+  | ActionNotFilteredBug StyleDoc
+  | TestSuiteExeMissing !Bool !String !PackageName !StackUnqualCompName
+  | CabalCopyFailed !Bool !BuildPrettyException
+  deriving Show
+
+instance Pretty BuildPrettyException where
+  pretty ( ConstructPlanFailed errs configFile stackRoot isImplicitGlobal parents wanted prunedGlobalDeps ) =
+    "[S-4804]"
+    <> line
+    <> flow "Stack failed to construct a build plan."
+    <> blankLine
+    <> pprintExceptions
+         errs configFile stackRoot isImplicitGlobal parents wanted prunedGlobalDeps
+  pretty (ExecutionFailure es) =
+    "[S-7282]"
+    <> line
+    <> flow "Stack failed to execute the build plan."
+    <> blankLine
+    <> fillSep
+         [ flow "While executing the build plan, Stack encountered the"
+         , case es of
+             [_] -> "error:"
+             _ -> flow "following errors:"
+         ]
+    <> blankLine
+    <> hcat (L.intersperse blankLine (map ppException es))
+  pretty (CabalExitedUnsuccessfully exitCode taskProvides' execName fullArgs logFiles bss) =
+    showBuildError "[S-7011]"
+      False exitCode (Just taskProvides') execName fullArgs logFiles bss
+  pretty (SetupHsBuildFailure exitCode mtaskProvides execName fullArgs logFiles bss) =
+    showBuildError "[S-6374]"
+      True exitCode mtaskProvides execName fullArgs logFiles bss
+  pretty (TargetParseException errs) =
+    "[S-8506]"
+    <> pprintTargetParseErrors errs
+  pretty (SomeTargetsNotBuildable xs) =
+    "[S-7086]"
+    <> line
+    <> fillSep
+         (  [ flow "The following components have"
+            , style Shell (flow "buildable: False")
+            , flow "set in the Cabal configuration, and so cannot be targets:"
+            ]
+         <> mkNarrativeList (Just Target) False
+              (map (fromString . T.unpack . renderPkgComponent) xs :: [StyleDoc])
+         )
+    <> blankLine
+    <> flow "To resolve this, either provide flags such that these components \
+            \are buildable, or only specify buildable targets."
+  pretty (InvalidFlagSpecification unused) =
+    "[S-8664]"
+    <> line
+    <> flow "Invalid flag specification:"
+    <> line
+    <> bulletedList (map go (L.sort unused))
+   where
+    showFlagSrc :: FlagSource -> StyleDoc
+    showFlagSrc FSCommandLine = flow "(specified on the command line)"
+    showFlagSrc FSStackYaml =
+      flow "(specified in the project-level configuration (e.g. stack.yaml))"
+
+    go :: UnusedFlags -> StyleDoc
+    go (UFNoPackage src name) = fillSep
+      [ "Package"
+      , style Error (fromPackageName name)
+      , flow "not found"
+      , showFlagSrc src
+      ]
+    go (UFFlagsNotDefined src pname pkgFlags flags) =
+         fillSep
+           ( "Package"
+           : style Current (fromString name)
+           : flow "does not define the following flags"
+           : showFlagSrc src <> ":"
+           : mkNarrativeList (Just Error) False
+               (map (fromString . flagNameString) (Set.toList flags) :: [StyleDoc])
+           )
+      <> line
+      <> if Set.null pkgFlags
+           then fillSep
+             [ flow "No flags are defined by package"
+             , style Current (fromString name) <> "."
+             ]
+           else fillSep
+           ( flow "Flags defined by package"
+           : style Current (fromString name)
+           : "are:"
+           : mkNarrativeList (Just Good) False
+               (map (fromString . flagNameString) (Set.toList pkgFlags) :: [StyleDoc])
+           )
+     where
+      name = packageNameString pname
+    go (UFSnapshot name) = fillSep
+      [ flow "Attempted to set flag on snapshot package"
+      , style Current (fromPackageName name) <> ","
+      , flow "please add the package to"
+      , style Shell "extra-deps" <> "."
+      ]
+  pretty GHCProfOptionInvalid =
+    "[S-8100]"
+    <> line
+    <> fillSep
+         [ flow "When building with Stack, you should not use GHC's"
+         , style Shell "-prof"
+         , flow "option. Instead, please use Stack's"
+         , style Shell "--library-profiling"
+         , "and"
+         , style Shell "--executable-profiling"
+         , flow "flags. See:"
+         , style Url "https://github.com/commercialhaskell/stack/issues/1015" <> "."
+         ]
+  pretty (NotOnlyLocal packages exes) =
+    "[S-1727]"
+    <> line
+    <> flow "Specified only-locals, but Stack needs to build snapshot contents:"
+    <> line
+    <> if null packages
+         then mempty
+         else
+              fillSep
+                ( "Packages:"
+                : mkNarrativeList Nothing False
+                    (map fromPackageName packages :: [StyleDoc])
+                )
+           <> line
+    <> if null exes
+         then mempty
+         else
+              fillSep
+                ( "Executables:"
+                : mkNarrativeList Nothing False
+                    (map (fromString . unqualCompToString) exes :: [StyleDoc])
+                )
+           <> line
+  pretty ( CompilerVersionMismatch
+             mactual
+             (expected, eArch)
+             ghcVariant
+             ghcBuild
+             check
+             wantedCompilerSetter
+             resolution
+         ) =
+    "[S-6362]"
+    <> line
+    <> fillSep
+         [ case mactual of
+             Nothing -> flow "No compiler found, expected"
+             Just (actual, arch) -> fillSep
+               [ flow "Compiler version mismatched, found"
+               , fromString $ compilerVersionString actual
+               , parens (pretty arch) <> ","
+               , flow "but expected"
+               ]
+         , case check of
+             MatchMinor -> flow "minor version match with"
+             MatchExact -> flow "exact version"
+             NewerMinor -> flow "minor version match or newer with"
+         , fromString $ T.unpack $ utf8BuilderToText $ display expected
+         , parens $ mconcat
+             [ pretty eArch
+             , fromString $ ghcVariantSuffix ghcVariant
+             , fromString $ compilerBuildSuffix ghcBuild
+             ]
+         ,    parens
+                ( fillSep
+                    [ flow "based on"
+                    , case wantedCompilerSetter of
+                        CompilerAtCommandLine -> fillSep
+                          [ "the"
+                          , style Shell "--compiler"
+                          , "option"
+                          ]
+                        SnapshotAtCommandLine -> fillSep
+                          [ "the"
+                          , style Shell "--snapshot" <> ","
+                          , "or (deprecated)"
+                          , style Shell "--resolver" <> ","
+                          , "option"
+                          ]
+                        YamlConfiguration mConfigFile -> case mConfigFile of
+                          Nothing -> flow "command line arguments"
+                          Just configFile -> fillSep
+                            [ flow "the configuration in"
+                            , pretty configFile
+                            ]
+                    ]
+                )
+          <> "."
+         ]
+    <> blankLine
+    <> resolution
+  pretty (ActionNotFilteredBug source) = bugPrettyReport "S-4660" $
+    fillSep
+      [ source
+      , flow "is seeking to run an action that should have been filtered from \
+             \the list of actions."
+      ]
+  pretty (TestSuiteExeMissing isSimpleBuildType exeName pkgName testName) =
+    missingExeError "[S-7987]" isSimpleBuildType $
+         fillSep
+           [ flow "Test suite executable"
+           , style Shell (fromString exeName)
+           , flow "not found for"
+           , style PkgComponent pkgComponent <> "."
+           ]
+      <> line
+   where
+    pkgComponent =
+         fromString (packageNameString pkgName)
+      <> ":test:"
+      <> fromString (unqualCompToString testName)
+  pretty (CabalCopyFailed isSimpleBuildType err) =
+    missingExeError "[S-8027]" isSimpleBuildType $
+         fillSep
+           [ style Shell "cabal copy"
+           , flow "failed. Error message:"
+           ]
+      <> line
+      <> pretty err
+      <> line
+
+instance Exception BuildPrettyException
+
+-- | Helper function to pretty print an error message for target parse errors.
+pprintTargetParseErrors :: [StyleDoc] -> StyleDoc
+pprintTargetParseErrors errs =
+     line
+  <> flow "Stack failed to parse the target(s)."
+  <> blankLine
+  <> fillSep
+       [ flow "While parsing, Stack encountered the"
+       , case errs of
+           [err] ->
+                  "error:"
+               <> blankLine
+               <> indent 4 err
+           _ ->
+                  flow "following errors:"
+               <> blankLine
+               <> bulletedList errs
+       ]
+  <> blankLine
+  <> fillSep
+       [ flow "Stack expects a target to be a package name (e.g."
+       , style Shell "my-package" <> "),"
+       , flow "a package identifier (e.g."
+       , style Shell "my-package-0.1.2.3" <> "),"
+       , flow "a package component (e.g."
+       , style Shell "my-package:test:my-test-suite" <> "),"
+       , flow "or, failing that, a relative path to a local directory for a \
+              \package or a parent directory of one or more such directories."
+       ]
+
+pprintExceptions ::
+     [ConstructPlanException]
+  -> Either (Path Abs File) (Path Abs File)
+     -- ^ The configuration file, which may be either (Left) a user-specific
+     -- global one or (Right) a project-level one.
+  -> Path Abs Dir
+  -> Bool
+  -> ParentMap
+  -> Set PackageName
+  -> Map PackageName [PackageName]
+  -> StyleDoc
+pprintExceptions exceptions configFile stackRoot isImplicitGlobal parentMap wanted' prunedGlobalDeps =
+     fillSep
+       [ flow
+           (  "While constructing the build plan, Stack encountered the \
+              \following errors"
+           <> if hasConfigurationRefs then "." else ":"
+           )
+       , if hasConfigurationRefs
+           then flow
+             "The 'Stack configuration' refers to the set of package versions \
+             \specified by the snapshot (after any dropped packages, or pruned \
+             \GHC boot packages; if a boot package is replaced, Stack prunes \
+             \all other such packages that depend on it) and any extra-deps:"
+           else mempty
+       ]
+  <> blankLine
+  <> mconcat (L.intersperse blankLine (mapMaybe pprintException exceptions'))
+  <> if L.null recommendations
+       then mempty
+       else
+            blankLine
+         <> flow "Some different approaches to resolving some or all of this:"
+         <> blankLine
+         <> indent 2 (spacedBulletedList recommendations)
+ where
+  exceptions' = {- should we dedupe these somehow? nubOrd -} exceptions
+
+  recommendations =
+       [ allowNewerMsg True False | onlyHasDependencyMismatches ]
+    <> [ fillSep
+           $ allowNewerMsg False onlyHasDependencyMismatches
+           : flow "add these package names under"
+           : style Shell "allow-newer-deps" <> ":"
+           : mkNarrativeList (Just Shell) False
+               (map fromPackageName (Set.elems pkgsWithMismatches) :: [StyleDoc])
+       | not $ Set.null pkgsWithMismatches
+       ]
+    <> addExtraDepsRecommendations
+   where
+    allowNewerMsg isAll isRepetitive = fillSep
+      $ flow "To ignore"
+      : (if isAll then "all" else "certain")
+      : flow "version constraints and build anyway,"
+      : if isRepetitive
+          then ["also"]
+          else
+            [ fillSep
+                $  [ "pass"
+                   , style Shell "--allow-newer" <> ","
+                   , flow "or, in"
+                   , pretty (defaultUserConfigPath stackRoot)
+                   , flow
+                       (  "(global configuration)"
+                       <> if isImplicitGlobal then "," else mempty
+                       )
+                   ]
+                <> ( case configFile of
+                      Left _ -> []
+                      Right projectConfigFile -> if isImplicitGlobal
+                        then []
+                        else
+                          [ "or"
+                          , pretty projectConfigFile
+                          , flow "(project-level configuration),"
+                          ]
+                   )
+                <> [ "set"
+                   ,    style Shell (flow "allow-newer: true")
+                     <> if isAll then "." else mempty
+                   ]
+                <> [ "and" | not isAll ]
+            ]
+
+  addExtraDepsRecommendations
+    | Map.null extras = []
+    | (Just _) <- Map.lookup (mkPackageName "base") extras =
+        [ fillSep
+            [ flow "Build requires unattainable version of the"
+            , style Current "base"
+            , flow "package. Since"
+            , style Current "base"
+            , flow "is a part of GHC, you most likely need to use a \
+                   \different GHC version with the matching"
+            , style Current "base"<> "."
+            ]
+        ]
+    | otherwise =
+        [    fillSep
+               [ style Recommendation (flow "Recommended action:")
+               , flow "try adding the following to your"
+               , case configFile of
+                   Left _ -> fillSep
+                     [ style Shell "--extra-dep"
+                     , flow "options of the"
+                     , style Shell (flow "stack script")
+                     , "command:"
+                     ]
+                   Right projectConfigFile -> fillSep
+                     [ style Shell "extra-deps"
+                     , "in"
+                     , pretty projectConfigFile
+                     , "(project-level configuration):"
+                     ]
+               ]
+          <> blankLine
+          <> vsep (map pprintExtra (Map.toList extras))
+        ]
+
+  pprintExtra (name, (version, BlobKey cabalHash cabalSize)) =
+    let cfInfo = CFIHash cabalHash (Just cabalSize)
+        packageIdRev = PackageIdentifierRevision name version cfInfo
+    in  fromString ("- " ++ T.unpack (utf8BuilderToText (display packageIdRev)))
+
+  allNotInBuildPlan = Set.fromList $ concatMap toNotInBuildPlan exceptions'
+  toNotInBuildPlan (DependencyPlanFailures _ pDeps) =
+    map fst $
+      filter
+        (\(_, (_, _, badDep)) -> badDep == NotInBuildPlan)
+        (Map.toList pDeps)
+  toNotInBuildPlan _ = []
+
+  (onlyHasDependencyMismatches, hasConfigurationRefs, extras, pkgsWithMismatches) =
+    filterExceptions
+
+  filterExceptions ::
+    ( Bool
+      -- ^ All the errors are DependencyMismatch. This checks if
+      -- 'allow-newer: true' could resolve all reported issues.
+    , Bool
+      -- ^ One or more messages refer to 'the Stack configuration'. This
+      -- triggers a message to explain what that phrase means.
+    , Map PackageName (Version, BlobKey)
+      -- ^ Recommended extras. TO DO: Likely a good idea to distinguish these to
+      -- the user. In particular, those recommended for DependencyMismatch.
+    , Set.Set PackageName
+      -- ^ Set of names of packages with one or more DependencyMismatch errors.
+    )
+  filterExceptions = L.foldl' go acc0 exceptions'
+   where
+    acc0 = (True, False, Map.empty, Set.empty)
+    go acc (DependencyPlanFailures pkg m) = Map.foldrWithKey go' acc m
+     where
+      pkgName = pkg.name
+      go' name (_, Just extra, NotInBuildPlan) (_, _, m', s) =
+        (False, True, Map.insert name extra m', s)
+      go' _ (_, _, NotInBuildPlan) (_, _, m', s) = (False, True, m', s)
+      go' name (_, Just extra, DependencyMismatch _) (p1, _, m', s) =
+        (p1, True, Map.insert name extra m', Set.insert pkgName s)
+      go' _ (_, _, DependencyMismatch _) (p1, _, m', s) =
+        (p1, True, m', Set.insert pkgName s)
+      go' _ (_, _, Couldn'tResolveItsDependencies _) acc' = acc'
+      go' _ _ (_, p2, m', s) = (False, p2, m', s)
+    go (_, p2, m, s) _ = (False, p2, m, s)
+
+  pprintException (DependencyCycleDetected pNames) = Just $
+       flow "Dependency cycle detected in packages:"
+    <> line
+    <> indent 4
+         (encloseSep "[" "]" "," (map (style Error . fromPackageName) pNames))
+  pprintException (DependencyPlanFailures pkg pDeps) =
+    case mapMaybe pprintDep (Map.toList pDeps) of
+      [] -> Nothing
+      depErrors -> Just $
+           fillSep
+             [ flow "In the dependencies for"
+             , pkgIdent <> pprintFlags pkg.flags <> ":"
+             ]
+        <> line
+        <> indent 2 (bulletedList depErrors)
+        <> line
+        <> fillSep
+             ( flow "The above is/are needed"
+             : case getShortestDepsPath parentMap wanted' pkg.name of
+                 Nothing ->
+                   [flow "for unknown reason - Stack invariant violated."]
+                 Just [] ->
+                   [ "since"
+                   , pkgName'
+                   , flow "is a build target."
+                   ]
+                 Just (target:path) ->
+                   [ flow "due to"
+                   , encloseSep "" "" " -> " pathElems
+                   ]
+                  where
+                   pathElems =
+                        [style Target . fromPackageId $ target]
+                     <> map fromPackageId path
+                     <> [pkgIdent]
+             )
+       where
+        pkgName' = style Current (fromPackageName pkg.name)
+        pkgIdent = style Current (fromPackageId $ packageIdentifier pkg)
+  -- Skip these when they are redundant with 'NotInBuildPlan' info.
+  pprintException (UnknownPackage compiler name)
+    | name `Set.member` allNotInBuildPlan = Nothing
+    | name `Set.member` wiredInPackages compiler =
+        Just $ fillSep
+          [ flow "Can't build a package with same name as a wired-in-package:"
+          , style Current . fromPackageName $ name
+          ]
+    | Just pruned <- Map.lookup name prunedGlobalDeps =
+        let prunedDeps =
+              map (style Current . fromPackageName) pruned
+        in  Just $ fillSep
+              [ flow "Can't use GHC boot package"
+              , style Current . fromPackageName $ name
+              , flow "when it depends on a replaced boot package. You need to \
+                     \add the following as explicit dependencies to the \
+                     \project:"
+              , line
+              , encloseSep "" "" ", " prunedDeps
+              ]
+    | otherwise = Just $ fillSep
+        [ flow "Unknown package:"
+        , style Current . fromPackageName $ name
+        ]
+
+  pprintFlags flags
+    | Map.null flags = ""
+    | otherwise = parens $ sep $ map pprintFlag $ Map.toList flags
+  pprintFlag (name, True) = "+" <> fromString (flagNameString name)
+  pprintFlag (name, False) = "-" <> fromString (flagNameString name)
+
+  pprintDep (name, (range, mlatestApplicable, badDep)) = case badDep of
+    NotInBuildPlan
+      | name `elem` fold prunedGlobalDeps -> butMsg $ fillSep
+          [ flow "this GHC boot package has been pruned from the Stack \
+                 \configuration. You need to add the package explicitly to"
+          , style Shell "extra-deps" <> "."
+          ]
+      | otherwise -> butMsg $ inconsistentMsg Nothing
+    -- TODO: For local packages, suggest editing constraints
+    DependencyMismatch version -> butMsg $ inconsistentMsg $ Just version
+    -- I think the main useful info is these explain why missing packages are
+    -- needed. Instead lets give the user the shortest path from a target to the
+    -- package.
+    Couldn'tResolveItsDependencies _version -> Nothing
+    HasNoLibrary -> Just $ fillSep
+      [ errorName
+      , flow "is a library dependency, but the package provides no library."
+      ]
+    BDDependencyCycleDetected names -> Just $ fillSep
+      [ errorName
+      , flow $ "dependency cycle detected: "
+             ++ L.intercalate ", " (map packageNameString names)
+      ]
+   where
+    errorName = style Error . fromPackageName $ name
+    goodRange = style Good (fromString (C.display range))
+    rangeMsg = if range == C.anyVersion
+      then "needed,"
+      else fillSep
+        [ flow "must match"
+        , goodRange <> ","
+        ]
+    butMsg msg = Just $ fillSep
+      [ errorName
+      , rangeMsg
+      , "but"
+      , msg
+      , latestApplicable Nothing
+      ]
+    inconsistentMsg mVersion = fillSep
+      [ style Error $ maybe
+          ( flow "no version" )
+          ( fromPackageId . PackageIdentifier name )
+          mVersion
+      , flow "is in the Stack configuration"
+      ]
+    latestApplicable mversion =
+      case mlatestApplicable of
+        Nothing
+          | isNothing mversion -> fillSep
+              [ flow "(no matching package and version found. Perhaps there is \
+                     \an error in the specification of a package's"
+              , style Shell "dependencies"
+              , "or"
+              , style Shell "build-tools"
+              , flow "(Hpack) or"
+              , style Shell "build-depends" <> ","
+              , style Shell "build-tools"
+              , "or"
+              , style Shell "build-tool-depends"
+              , case configFile of
+                  Left _ -> flow "(Cabal file)."
+                  Right projectConfigFile -> fillSep
+                    [ flow "(Cabal file) or an omission from the"
+                    , style Shell "packages"
+                    , flow "list in"
+                    , pretty projectConfigFile
+                    , flow "(project-level configuration).)"
+                    ]
+              ]
+          | otherwise -> ""
+        Just (laVer, _)
+          | Just laVer == mversion ->
+              flow "(latest matching version is specified)."
+          | otherwise ->
+              fillSep
+                [ flow "(latest matching version is"
+                , style Good (fromString $ versionString laVer) <> ")."
+                ]
+
+data ConstructPlanException
+  = DependencyCycleDetected [PackageName]
+  | DependencyPlanFailures
+      Package
+      (Map PackageName (VersionRange, LatestApplicableVersion, BadDependency))
+  | UnknownPackage ActualCompiler PackageName
+    -- TODO perhaps this constructor will be removed, and BadDependency will
+    -- handle it all
+  -- ^ Recommend adding to extra-deps, give a helpful version number?
+  deriving (Eq, Show)
+
+-- | The latest applicable version and it's latest Cabal file revision.
+-- For display purposes only, Nothing if package not found
+type LatestApplicableVersion = Maybe (Version, BlobKey)
+
+-- | Reason why a dependency was not used
+data BadDependency
+  = NotInBuildPlan
+  | Couldn'tResolveItsDependencies Version
+  | DependencyMismatch Version
+  | HasNoLibrary
+  -- ^ See description of 'Stack.Types.Dependency.DepType'
+  | BDDependencyCycleDetected ![PackageName]
+  deriving (Eq, Ord, Show)
+
+missingExeError :: StyleDoc -> Bool -> StyleDoc -> StyleDoc
+missingExeError errorCode isSimpleBuildType msg =
+     errorCode
+  <> line
+  <> msg
+  <> line
+  <> flow "Possible causes of this issue:"
+  <> line
+  <> bulletedList possibleCauses
+ where
+  possibleCauses =
+       [ fillSep
+           [ flow "No module named"
+           , style Shell "Main" <> "."
+           , "The"
+           , style Shell "main-is"
+           , flow "source file should usually have a header indicating that \
+                  \it's a"
+           , style Shell "Main"
+           , "module."
+           ]
+       , fillSep
+           [ flow "A Cabal file that refers to nonexistent other files (e.g. a"
+           , style Shell "license-file"
+           , flow "that doesn't exist). Running"
+           , style Shell "cabal check"
+           , flow "may point out these issues."
+           ]
+       ]
+    <> [ fillSep
+           [ "The"
+           , style File "Setup.hs"
+           , flow "file is changing the installation target directory."
+           ]
+       | not isSimpleBuildType
+       ]
+
+showBuildError ::
+     String
+  -> Bool
+  -> ExitCode
+  -> Maybe PackageIdentifier
+  -> Path Abs File
+  -> [String]
+  -> Maybe (Path Abs File)
+  -> [Text]
+  -> StyleDoc
+showBuildError errorCode isBuildingSetup exitCode mtaskProvides execName fullArgs logFiles bss =
+  let fullCmd = unwords
+        $ dropQuotes (toFilePath execName)
+        : map (T.unpack . showProcessArgDebug) fullArgs
+      logLocations =
+        maybe
+          mempty
+          (\fp -> line <> flow "Logs have been written to:" <+>
+                    pretty fp)
+          logFiles
+  in     fromString errorCode
+      <> line
+      <> flow "While building" <+>
+         ( case (isBuildingSetup, mtaskProvides) of
+             (False, Nothing) -> impureThrow ShowBuildErrorBug
+             (False, Just taskProvides') ->
+                "package" <+>
+                  style
+                    Target
+                    (fromString $ dropQuotes (packageIdentifierString taskProvides'))
+             (True, Nothing) -> "simple" <+> style File "Setup.hs"
+             (True, Just taskProvides') ->
+                "custom" <+>
+                  style File "Setup.hs" <+>
+                  flow "for package" <+>
+                  style
+                    Target
+                    (fromString $ dropQuotes (packageIdentifierString taskProvides'))
+         ) <+>
+         flow "(scroll up to its section to see the error) using:"
+      <> line
+      <> style Shell (fromString fullCmd)
+      <> line
+      <> flow "Process exited with code:" <+> (fromString . show) exitCode <+>
+         ( if exitCode == ExitFailure (-9)
+             then flow "(THIS MAY INDICATE OUT OF MEMORY)"
+             else mempty
+         )
+      <> logLocations
+      <> if null bss
+           then mempty
+           else blankLine <> string (removeTrailingSpaces (map T.unpack bss))
+   where
+    removeTrailingSpaces = dropWhileEnd isSpace . unlines
+    dropQuotes = filter ('\"' /=)
+
+-- | Get the shortest reason for the package to be in the build plan. In other
+-- words, trace the parent dependencies back to a \'wanted\' package.
+getShortestDepsPath ::
+     ParentMap
+  -> Set PackageName
+  -> PackageName
+  -> Maybe [PackageIdentifier]
+getShortestDepsPath (MonoidMap parentsMap) wanted' name =
+  if Set.member name wanted'
+    then Just []
+    else case M.lookup name parentsMap of
+      Nothing -> Nothing
+      Just parents -> Just $ findShortest 256 paths0
+       where
+        paths0 = M.fromList $
+          map (\(ident, _) -> (pkgName ident, startDepsPath ident)) parents
+ where
+  -- The 'paths' map is a map from PackageName to the shortest path
+  -- found to get there. It is the frontier of our breadth-first
+  -- search of dependencies.
+  findShortest :: Int -> Map PackageName DepsPath -> [PackageIdentifier]
+  findShortest fuel _ | fuel <= 0 =
+    [ PackageIdentifier
+        (mkPackageName "stack-ran-out-of-jet-fuel")
+        (C.mkVersion [0])
+    ]
+  findShortest _ paths | M.null paths = []
+  findShortest fuel paths =
+    case nonEmpty targets of
+      Nothing -> findShortest (fuel - 1) $ M.fromListWith chooseBest $
+              concatMap extendPath recurses
+      Just targets' ->
+        let (DepsPath _ _ path) = minimum (snd <$> targets')
+        in  path
+   where
+    (targets, recurses) =
+      L.partition (\(n, _) -> n `Set.member` wanted') (M.toList paths)
+  chooseBest :: DepsPath -> DepsPath -> DepsPath
+  chooseBest = max
+  -- Extend a path to all its parents.
+  extendPath :: (PackageName, DepsPath) -> [(PackageName, DepsPath)]
+  extendPath (n, dp) =
+    case M.lookup n parentsMap of
+      Nothing -> []
+      Just parents ->
+        map (\(pkgId, _) -> (pkgName pkgId, extendDepsPath pkgId dp)) parents
+
+startDepsPath :: PackageIdentifier -> DepsPath
+startDepsPath ident = DepsPath
+  { dpLength = 1
+  , dpNameLength = length (packageNameString (pkgName ident))
+  , dpPath = [ident]
+  }
+
+extendDepsPath :: PackageIdentifier -> DepsPath -> DepsPath
+extendDepsPath ident dp = DepsPath
+  { dpLength = dp.dpLength + 1
+  , dpNameLength = dp.dpNameLength + length (packageNameString (pkgName ident))
+  , dpPath = [ident]
+  }
+
+data DepsPath = DepsPath
+  { dpLength :: Int
+    -- ^ Length of dpPath
+  , dpNameLength :: Int
+    -- ^ Length of package names combined
+  , dpPath :: [PackageIdentifier]
+    -- ^ A path where the packages later in the list depend on those that come
+    -- earlier
+  }
+  deriving (Eq, Ord, Show)
diff --git a/src/Stack/Types/BuildConfig.hs b/src/Stack/Types/BuildConfig.hs
new file mode 100644
index 0000000000..dfed2f1506
--- /dev/null
+++ b/src/Stack/Types/BuildConfig.hs
@@ -0,0 +1,114 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE TypeFamilies        #-}
+
+{-|
+Module      : Stack.Types.BuildConfig
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.BuildConfig
+  ( BuildConfig (..)
+  , HasBuildConfig (..)
+  , configFileL
+  , configFileRootL
+  , getWorkDir
+  , wantedCompilerVersionL
+  ) where
+
+import qualified Data.Either.Extra as EE
+import           Path ( (</>), parent )
+import           RIO.Process ( HasProcessContext (..) )
+import           Stack.Prelude
+import           Stack.Types.Config ( Config, HasConfig (..), workDirL )
+import           Stack.Types.Curator ( Curator )
+import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( HasRunner (..) )
+import           Stack.Types.SourceMap ( SMWanted (..) )
+import           Stack.Types.Storage ( ProjectStorage )
+
+-- | A superset of 'Config' adding information on how to build code. The reason
+-- for this breakdown is because we will need some of the information from
+-- 'Config' in order to determine the values here.
+--
+-- These are the components which know nothing about local configuration.
+data BuildConfig = BuildConfig
+  { config     :: !Config
+  , smWanted :: !SMWanted
+  , extraPackageDBs :: ![Path Abs Dir]
+    -- ^ Extra package databases
+  , configFile :: !(Either (Path Abs File) (Path Abs File))
+    -- ^ Either (Left) the location of the user-specific global configuration
+    -- file or, in most cases, (Right) the location of the project-level
+    -- coniguration file (stack.yaml, by default).
+    --
+    -- Note: if the STACK_YAML environment variable is used, the location of the
+    -- project-level configuration file may be different from
+    -- projectRootL </> "stack.yaml" if a different file name is used.
+  , projectStorage :: !ProjectStorage
+  -- ^ Database connection pool for project Stack database
+  , curator :: !(Maybe Curator)
+  }
+
+instance HasPlatform BuildConfig where
+  platformL = configL . platformL
+  {-# INLINE platformL #-}
+  platformVariantL = configL . platformVariantL
+  {-# INLINE platformVariantL #-}
+
+instance HasGHCVariant BuildConfig where
+  ghcVariantL = configL . ghcVariantL
+  {-# INLINE ghcVariantL #-}
+
+instance HasProcessContext BuildConfig where
+  processContextL = configL . processContextL
+
+instance HasPantryConfig BuildConfig where
+  pantryConfigL = configL . pantryConfigL
+
+instance HasConfig BuildConfig where
+  configL = lens (.config) (\x y -> x { config = y })
+
+instance HasRunner BuildConfig where
+  runnerL = configL . runnerL
+
+instance HasLogFunc BuildConfig where
+  logFuncL = runnerL . logFuncL
+
+instance HasStylesUpdate BuildConfig where
+  stylesUpdateL = runnerL . stylesUpdateL
+
+instance HasTerm BuildConfig where
+  useColorL = runnerL . useColorL
+  termWidthL = runnerL . termWidthL
+
+class HasConfig env => HasBuildConfig env where
+  buildConfigL :: Lens' env BuildConfig
+
+instance HasBuildConfig BuildConfig where
+  buildConfigL = id
+  {-# INLINE buildConfigL #-}
+
+configFileL ::
+     HasBuildConfig env
+  => Lens' env (Either (Path Abs File) (Path Abs File))
+configFileL = buildConfigL . lens (.configFile) (\x y -> x { configFile = y })
+
+-- | Directory containing the configuration file.
+configFileRootL :: HasBuildConfig env => Getting r env (Path Abs Dir)
+configFileRootL = configFileL . to EE.fromEither . to parent
+
+-- | Work directory in the directory of the configuration file (global or
+-- project-level).
+getWorkDir :: (HasBuildConfig env, MonadReader env m) => m (Path Abs Dir)
+getWorkDir = do
+  configFileRoot <- view configFileRootL
+  workDir <- view workDirL
+  pure (configFileRoot </> workDir)
+
+-- | The compiler specified by the @SnapshotDef@. This may be different from the
+-- actual compiler used!
+wantedCompilerVersionL :: HasBuildConfig s => Getting r s WantedCompiler
+wantedCompilerVersionL = buildConfigL . to (.smWanted.compiler)
diff --git a/src/Stack/Types/BuildOpts.hs b/src/Stack/Types/BuildOpts.hs
new file mode 100644
index 0000000000..cf7c335db8
--- /dev/null
+++ b/src/Stack/Types/BuildOpts.hs
@@ -0,0 +1,143 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+
+{-|
+Module      : Stack.Types.BuildOpts
+Description : Configuration options for building.
+License     : BSD-3-Clause
+
+Configuration options for building.
+-}
+
+module Stack.Types.BuildOpts
+  ( BuildOpts (..)
+  , HaddockOpts (..)
+  , TestOpts (..)
+  , BenchmarkOpts (..)
+  , buildOptsHaddockL
+  , buildOptsInstallExesL
+  , buildOptsSemaphoreL
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.BuildOptsMonoid
+                   ( CabalVerbosity (..), ProgressBarFormat (..) )
+import           Stack.Types.Component ( StackUnqualCompName )
+
+-- | Build options that is interpreted by the build command. This is built up
+-- from BuildOptsCLI and BuildOptsMonoid
+data BuildOpts = BuildOpts
+  { libProfile :: !Bool
+  , exeProfile :: !Bool
+  , libStrip :: !Bool
+  , exeStrip :: !Bool
+  , buildHaddocks :: !Bool
+    -- ^ Build Haddock documentation?
+  , haddockOpts :: !HaddockOpts
+    -- ^ Options to pass to haddock
+  , openHaddocks :: !Bool
+    -- ^ Open haddocks in the browser?
+  , haddockDeps :: !(Maybe Bool)
+    -- ^ Build haddocks for dependencies?
+  , haddockExecutables :: !Bool
+    -- ^ Also build Haddock documentation for all executable components, like
+    -- @runghc Setup.hs haddock --executables@.
+  , haddockTests :: !Bool
+    -- ^ Also build Haddock documentation for all test suite components, like
+    -- @runghc Setup.hs haddock --tests@.
+  , haddockBenchmarks :: !Bool
+    -- ^ Also build Haddock documentation for all benchmark components, like
+    -- @runghc Setup.hs haddock --benchmarks@.
+  , haddockInternal :: !Bool
+    -- ^ Build haddocks for all symbols and packages, like
+    -- @cabal haddock --internal@
+  , haddockHyperlinkSource :: !Bool
+    -- ^ Build hyperlinked source. Disable for no sources.
+  , haddockForHackage :: !Bool
+    -- ^ Build with flags to generate Haddock documentation suitable to upload
+    -- to Hackage.
+  , installExes :: !Bool
+    -- ^ Install executables to user path after building?
+  , installCompilerTool :: !Bool
+    -- ^ Install executables to compiler tools path after building?
+  , preFetch :: !Bool
+    -- ^ Fetch all packages immediately
+    -- ^ Watch files for changes and automatically rebuild
+  , keepGoing :: !(Maybe Bool)
+    -- ^ Keep building/running after failure
+  , keepTmpFiles :: !Bool
+    -- ^ Keep intermediate files and build directories
+  , forceDirty :: !Bool
+    -- ^ Force treating all project packages and local extra-deps as having
+    -- dirty files.
+  , tests :: !Bool
+    -- ^ Turn on tests for local targets
+  , testOpts :: !TestOpts
+    -- ^ Additional test arguments
+  , benchmarks :: !Bool
+    -- ^ Turn on benchmarks for local targets
+  , benchmarkOpts :: !BenchmarkOpts
+    -- ^ Additional test arguments
+    -- ^ Commands (with arguments) to run after a successful build
+    -- ^ Only perform the configure step when building
+  , reconfigure :: !Bool
+    -- ^ Perform the configure step even if already configured
+  , cabalVerbose :: !CabalVerbosity
+    -- ^ Ask Cabal to be verbose in its builds
+  , splitObjs :: !Bool
+    -- ^ Whether to enable split-objs.
+  , skipComponents :: ![StackUnqualCompName]
+    -- ^ Which components to skip when building
+  , interleavedOutput :: !Bool
+    -- ^ Should we use the interleaved GHC output when building
+    -- multiple packages?
+  , progressBar :: !ProgressBarFormat
+    -- ^ Format of the progress bar
+  , ddumpDir :: !(Maybe Text)
+  , semaphore :: !Bool
+    -- ^ Use Cabal's --semaphore=SEMAPHORE option to build modules of the same
+    -- package in parallel.
+  }
+  deriving Show
+
+-- | Haddock Options
+newtype HaddockOpts = HaddockOpts
+  { additionalArgs :: [String] -- ^ Arguments passed to haddock program
+  }
+  deriving (Eq, Show)
+
+-- | Options for the 'FinalAction' 'DoTests'
+data TestOpts = TestOpts
+  { rerunTests :: !Bool -- ^ Whether successful tests will be run gain
+  , additionalArgs :: ![String] -- ^ Arguments passed to the test program
+  , coverage :: !Bool -- ^ Generate a code coverage report
+  , runTests :: !Bool -- ^ Enable running of tests
+  , maximumTimeSeconds :: !(Maybe Int) -- ^ test suite timeout in seconds
+  , timeoutGraceSeconds :: !(Maybe Int)
+    -- ^ additional grace period after timeout before force-killing
+  , allowStdin :: !Bool -- ^ Whether to allow standard input
+  }
+  deriving (Eq, Show)
+
+-- | Options for the 'FinalAction' 'DoBenchmarks'
+data BenchmarkOpts = BenchmarkOpts
+  { additionalArgs :: !(Maybe String)
+    -- ^ Arguments passed to the benchmark program
+  , runBenchmarks :: !Bool
+    -- ^ Enable running of benchmarks
+  }
+  deriving (Eq, Show)
+
+buildOptsInstallExesL :: Lens' BuildOpts Bool
+buildOptsInstallExesL =
+  lens (.installExes) (\bopts t -> bopts {installExes = t})
+
+buildOptsHaddockL :: Lens' BuildOpts Bool
+buildOptsHaddockL =
+  lens (.buildHaddocks) (\bopts t -> bopts {buildHaddocks = t})
+
+buildOptsSemaphoreL :: Lens' BuildOpts Bool
+buildOptsSemaphoreL =
+  lens (.semaphore) (\bopts t -> bopts {semaphore = t})
diff --git a/src/Stack/Types/BuildOptsCLI.hs b/src/Stack/Types/BuildOptsCLI.hs
new file mode 100644
index 0000000000..0f7d97a69b
--- /dev/null
+++ b/src/Stack/Types/BuildOptsCLI.hs
@@ -0,0 +1,128 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Types.BuildOptsCLI
+Description : Configuration options for building from the command line only.
+License     : BSD-3-Clause
+
+Configuration options for building from the command line only.
+-}
+
+module Stack.Types.BuildOptsCLI
+  ( BuildOptsCLI (..)
+  , defaultBuildOptsCLI
+  , ApplyCLIFlag (..)
+  , BuildSubset (..)
+  , FileWatchOpts (..)
+  , BuildCommand (..)
+  , boptsCLIAllProgOptions
+  , boptsCLIFlagsByName
+  ) where
+
+import qualified Data.Map.Strict as Map
+import qualified Data.Text as T
+import           Stack.Prelude
+
+-- | Build options that are specified from the CLI and not specified as
+-- non-project specific configuration options under the build key.
+data BuildOptsCLI = BuildOptsCLI
+  { targetsCLI :: ![Text]
+  , dryrun :: !Bool
+  , ghcOptions :: ![Text]
+  , progsOptions :: ![(Text, [Text])]
+  , flags :: !(Map ApplyCLIFlag (Map FlagName Bool))
+  , allowNewer :: !(First Bool)
+  , buildSubset :: !BuildSubset
+  , fileWatch :: !FileWatchOpts
+  , watchAll :: !Bool
+  , exec :: ![(String, [String])]
+  , onlyConfigure :: !Bool
+  , command :: !BuildCommand
+  , initialBuildSteps :: !Bool
+  }
+  deriving Show
+
+defaultBuildOptsCLI ::BuildOptsCLI
+defaultBuildOptsCLI = BuildOptsCLI
+  { targetsCLI = []
+  , dryrun = False
+  , flags = Map.empty
+  , allowNewer = mempty
+  , ghcOptions = []
+  , progsOptions = []
+  , buildSubset = BSAll
+  , fileWatch = NoFileWatch
+  , watchAll = False
+  , exec = []
+  , onlyConfigure = False
+  , command = Build
+  , initialBuildSteps = False
+  }
+
+-- | How to apply a CLI flag
+data ApplyCLIFlag
+  = ACFAllProjectPackages
+    -- ^ Apply to all project packages which have such a flag name available.
+  | ACFByName !PackageName
+    -- ^ Apply to the specified package only.
+  deriving (Eq, Ord, Show)
+
+-- | Which subset of packages to build
+data BuildSubset
+  = BSAll
+  | BSOnlySnapshot
+    -- ^ Only install packages in the snapshot database, skipping
+    -- packages intended for the local database.
+  | BSOnlyDependencies
+  | BSOnlyLocals
+    -- ^ Refuse to build anything in the snapshot database, see
+    -- https://github.com/commercialhaskell/stack/issues/5272
+  deriving (Show, Eq)
+
+data FileWatchOpts
+  = NoFileWatch
+  | FileWatch
+  | FileWatchPoll
+  deriving (Show, Eq)
+
+-- | Command sum type for conditional arguments.
+data BuildCommand
+  = Build
+  | Test
+  | Haddock
+  | Bench
+  | Install
+  deriving (Eq, Show)
+
+-- | Generate a list of @--PROG-option=<argument>@ arguments for all PROGs.
+
+-- At the command line, --PROG-option="<argument>" is received as
+-- --PROG-option=<argument> (without quotes). However, with the process library,
+-- what is received is --PROG-option="<argument>" (with quotes), which is NOT
+-- what is required.
+boptsCLIAllProgOptions :: BuildOptsCLI -> [Text]
+boptsCLIAllProgOptions boptsCLI =
+  concatMap progOptionArgs boptsCLI.progsOptions
+ where
+  -- Generate a list of --PROG-option=<argument> arguments for a PROG.
+  progOptionArgs :: (Text, [Text]) -> [Text]
+  progOptionArgs (prog, opts) = map progOptionArg opts
+   where
+    -- Generate a --PROG-option=<argument> argument for a PROG and option.
+    progOptionArg :: Text -> Text
+    progOptionArg opt = T.concat
+      [ "--"
+      , prog
+      , "-option="
+      , opt
+      ]
+
+-- | Only flags set via 'ACFByName'
+boptsCLIFlagsByName :: BuildOptsCLI -> Map PackageName (Map FlagName Bool)
+boptsCLIFlagsByName = Map.fromList . mapMaybe go . Map.toList . (.flags)
+ where
+  go (ACFAllProjectPackages, _) = Nothing
+  go (ACFByName name, flags) = Just (name, flags)
diff --git a/src/Stack/Types/BuildOptsMonoid.hs b/src/Stack/Types/BuildOptsMonoid.hs
new file mode 100644
index 0000000000..26847527bb
--- /dev/null
+++ b/src/Stack/Types/BuildOptsMonoid.hs
@@ -0,0 +1,445 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Types.BuildOptsMonoid
+Description : Configuration options for building.
+License     : BSD-3-Clause
+
+Configuration options for building from the command line and/or a configuration
+file.
+-}
+
+module Stack.Types.BuildOptsMonoid
+  ( BuildOptsMonoid (..)
+  , HaddockOptsMonoid (..)
+  , TestOptsMonoid (..)
+  , BenchmarkOptsMonoid (..)
+  , CabalVerbosity (..)
+  , ProgressBarFormat (..)
+  , buildOptsMonoidHaddockL
+  , buildOptsMonoidTestsL
+  , buildOptsMonoidBenchmarksL
+  , buildOptsMonoidInstallExesL
+  , buildOptsMonoidSemaphoreL
+  , toFirstCabalVerbosity
+  , readProgressBarFormat
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), withText )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings, (..:?), (..!=), jsonSubWarnings
+                   , withObjectWarnings
+                   )
+import qualified Data.Text as T
+import           Distribution.Parsec ( Parsec (..), simpleParsec )
+import           Distribution.Verbosity ( Verbosity, normal, verbose )
+import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
+import           Stack.Prelude hiding ( trace )
+import           Stack.Types.ComponentUtils ( StackUnqualCompName )
+
+-- | Build options that may be specified as non-project specific configuration
+-- options under the build key (with certain exceptions) or from the CLI.
+data BuildOptsMonoid = BuildOptsMonoid
+  { semaphore :: !FirstFalse
+  , trace :: !Any
+    -- ^ Cannot be specified under the build key
+  , profile :: !Any
+    -- ^ Cannot be specified under the build key
+  , noStrip :: !Any
+    -- ^ Cannot be specified under the build key
+  , libProfile :: !FirstFalse
+  , exeProfile :: !FirstFalse
+  , libStrip :: !FirstTrue
+  , exeStrip :: !FirstTrue
+  , buildHaddocks :: !FirstFalse
+  , haddockOpts :: !HaddockOptsMonoid
+  , openHaddocks :: !FirstFalse
+  , haddockDeps :: !(First Bool)
+  , haddockExecutables :: !FirstFalse
+  , haddockTests :: !FirstFalse
+  , haddockBenchmarks :: !FirstFalse
+  , haddockInternal :: !FirstFalse
+  , haddockHyperlinkSource :: !FirstTrue
+  , haddockForHackage :: !FirstFalse
+  , installExes :: !FirstFalse
+  , installCompilerTool :: !FirstFalse
+  , preFetch :: !FirstFalse
+  , keepGoing :: !(First Bool)
+  , keepTmpFiles :: !FirstFalse
+  , forceDirty :: !FirstFalse
+  , tests :: !FirstFalse
+  , testOpts :: !TestOptsMonoid
+  , benchmarks :: !FirstFalse
+  , benchmarkOpts :: !BenchmarkOptsMonoid
+  , reconfigure :: !FirstFalse
+  , cabalVerbose :: !(First CabalVerbosity)
+  , splitObjs :: !FirstFalse
+  , skipComponents :: ![StackUnqualCompName]
+  , interleavedOutput :: !FirstTrue
+  , progressBar :: !(First ProgressBarFormat)
+  , ddumpDir :: !(First Text)
+  }
+  deriving (Generic, Show)
+
+instance FromJSON (WithJSONWarnings BuildOptsMonoid) where
+  parseJSON = withObjectWarnings "BuildOptsMonoid" $ \o -> do
+    let trace = Any False
+        profile = Any False
+        noStrip = Any False
+    libProfile <- FirstFalse <$> o ..:? libProfileArgName
+    exeProfile <-FirstFalse <$>  o ..:? exeProfileArgName
+    libStrip <- FirstTrue <$> o ..:? libStripArgName
+    exeStrip <-FirstTrue <$>  o ..:? exeStripArgName
+    buildHaddocks <- FirstFalse <$> o ..:? haddockArgName
+    haddockOpts <- jsonSubWarnings (o ..:? haddockOptsArgName ..!= mempty)
+    openHaddocks <- FirstFalse <$> o ..:? openHaddocksArgName
+    haddockDeps <- First <$> o ..:? haddockDepsArgName
+    haddockExecutables <- FirstFalse <$> o ..:? haddockExecutablesArgName
+    haddockTests <- FirstFalse <$> o ..:? haddockTestsArgName
+    haddockBenchmarks <- FirstFalse <$> o ..:? haddockBenchmarksArgName
+    haddockInternal <- FirstFalse <$> o ..:? haddockInternalArgName
+    haddockHyperlinkSource <- FirstTrue <$> o ..:? haddockHyperlinkSourceArgName
+    haddockForHackage <-  FirstFalse <$> o ..:? haddockForHackageArgName
+    installExes <- FirstFalse <$> o ..:? installExesArgName
+    installCompilerTool <- FirstFalse <$> o ..:? installCompilerToolArgName
+    preFetch <- FirstFalse <$> o ..:? preFetchArgName
+    keepGoing <- First <$> o ..:? keepGoingArgName
+    keepTmpFiles <- FirstFalse <$> o ..:? keepTmpFilesArgName
+    forceDirty <- FirstFalse <$> o ..:? forceDirtyArgName
+    tests <- FirstFalse <$> o ..:? testsArgName
+    testOpts <- jsonSubWarnings (o ..:? testOptsArgName ..!= mempty)
+    benchmarks <- FirstFalse <$> o ..:? benchmarksArgName
+    benchmarkOpts <- jsonSubWarnings (o ..:? benchmarkOptsArgName ..!= mempty)
+    reconfigure <- FirstFalse <$> o ..:? reconfigureArgName
+    cabalVerbosity <- First <$> o ..:? cabalVerbosityArgName
+    cabalVerbose' <- FirstFalse <$> o ..:? cabalVerboseArgName
+    let cabalVerbose = cabalVerbosity <> toFirstCabalVerbosity cabalVerbose'
+    splitObjs <- FirstFalse <$> o ..:? splitObjsName
+    skipComponents <- o ..:? skipComponentsName ..!= mempty
+    interleavedOutput <- FirstTrue <$> o ..:? interleavedOutputName
+    progressBar <- First <$> o ..:? progressBarName
+    ddumpDir <- o ..:? ddumpDirName ..!= mempty
+    semaphore <- FirstFalse <$> o ..:? semaphoreArgName
+    pure BuildOptsMonoid
+      { semaphore
+      , trace
+      , profile
+      , noStrip
+      , libProfile
+      , exeProfile
+      , libStrip
+      , exeStrip
+      , buildHaddocks
+      , haddockOpts
+      , openHaddocks
+      , haddockDeps
+      , haddockExecutables
+      , haddockTests
+      , haddockBenchmarks
+      , haddockInternal
+      , haddockHyperlinkSource
+      , haddockForHackage
+      , installExes
+      , installCompilerTool
+      , preFetch
+      , keepGoing
+      , keepTmpFiles
+      , forceDirty
+      , tests
+      , testOpts
+      , benchmarks
+      , benchmarkOpts
+      , reconfigure
+      , cabalVerbose
+      , splitObjs
+      , skipComponents
+      , interleavedOutput
+      , progressBar
+      , ddumpDir
+      }
+
+libProfileArgName :: Text
+libProfileArgName = "library-profiling"
+
+exeProfileArgName :: Text
+exeProfileArgName = "executable-profiling"
+
+libStripArgName :: Text
+libStripArgName = "library-stripping"
+
+exeStripArgName :: Text
+exeStripArgName = "executable-stripping"
+
+haddockArgName :: Text
+haddockArgName = "haddock"
+
+haddockOptsArgName :: Text
+haddockOptsArgName = "haddock-arguments"
+
+openHaddocksArgName :: Text
+openHaddocksArgName = "open-haddocks"
+
+haddockDepsArgName :: Text
+haddockDepsArgName = "haddock-deps"
+
+haddockExecutablesArgName :: Text
+haddockExecutablesArgName = "haddock-executables"
+
+haddockTestsArgName :: Text
+haddockTestsArgName = "haddock-tests"
+
+haddockBenchmarksArgName :: Text
+haddockBenchmarksArgName = "haddock-benchmarks"
+
+haddockInternalArgName :: Text
+haddockInternalArgName = "haddock-internal"
+
+haddockHyperlinkSourceArgName :: Text
+haddockHyperlinkSourceArgName = "haddock-hyperlink-source"
+
+haddockForHackageArgName :: Text
+haddockForHackageArgName = "haddock-for-hackage"
+
+installExesArgName :: Text
+installExesArgName = "copy-bins"
+
+installCompilerToolArgName :: Text
+installCompilerToolArgName = "copy-compiler-tool"
+
+preFetchArgName :: Text
+preFetchArgName = "prefetch"
+
+keepGoingArgName :: Text
+keepGoingArgName = "keep-going"
+
+keepTmpFilesArgName :: Text
+keepTmpFilesArgName = "keep-tmp-files"
+
+forceDirtyArgName :: Text
+forceDirtyArgName = "force-dirty"
+
+testsArgName :: Text
+testsArgName = "test"
+
+testOptsArgName :: Text
+testOptsArgName = "test-arguments"
+
+benchmarksArgName :: Text
+benchmarksArgName = "bench"
+
+benchmarkOptsArgName :: Text
+benchmarkOptsArgName = "benchmark-opts"
+
+reconfigureArgName :: Text
+reconfigureArgName = "reconfigure"
+
+cabalVerbosityArgName :: Text
+cabalVerbosityArgName = "cabal-verbosity"
+
+cabalVerboseArgName :: Text
+cabalVerboseArgName = "cabal-verbose"
+
+splitObjsName :: Text
+splitObjsName = "split-objs"
+
+skipComponentsName :: Text
+skipComponentsName = "skip-components"
+
+interleavedOutputName :: Text
+interleavedOutputName = "interleaved-output"
+
+progressBarName :: Text
+progressBarName = "progress-bar"
+
+ddumpDirName :: Text
+ddumpDirName = "ddump-dir"
+
+semaphoreArgName :: Text
+semaphoreArgName = "semaphore"
+
+instance Semigroup BuildOptsMonoid where
+  (<>) = mappenddefault
+
+instance Monoid BuildOptsMonoid where
+  mempty = memptydefault
+  mappend = (<>)
+
+data TestOptsMonoid = TestOptsMonoid
+  { rerunTests :: !FirstTrue
+  , additionalArgs :: ![String]
+  , coverage :: !FirstFalse
+  , runTests :: !FirstTrue
+  , maximumTimeSeconds :: !(First (Maybe Int))
+  , timeoutGraceSeconds :: !(First (Maybe Int))
+  , allowStdin :: !FirstTrue
+  }
+  deriving (Show, Generic)
+
+instance FromJSON (WithJSONWarnings TestOptsMonoid) where
+  parseJSON = withObjectWarnings "TestOptsMonoid" $ \o -> do
+    rerunTests <- FirstTrue <$> o ..:? rerunTestsArgName
+    additionalArgs <- o ..:? testAdditionalArgsName ..!= []
+    coverage <- FirstFalse <$> o ..:? coverageArgName
+    runTests <- FirstTrue . (not <$>) <$> o ..:? noRunTestsArgName
+    maximumTimeSeconds <- First <$> o ..:? maximumTimeSecondsArgName
+    timeoutGraceSeconds <- First <$> o ..:? timeoutGraceSecondsArgName
+    allowStdin <- FirstTrue <$> o ..:? testsAllowStdinName
+    pure TestOptsMonoid
+      { rerunTests
+      , additionalArgs
+      , coverage
+      , runTests
+      , maximumTimeSeconds
+      , timeoutGraceSeconds
+      , allowStdin
+      }
+
+rerunTestsArgName :: Text
+rerunTestsArgName = "rerun-tests"
+
+testAdditionalArgsName :: Text
+testAdditionalArgsName = "additional-args"
+
+coverageArgName :: Text
+coverageArgName = "coverage"
+
+noRunTestsArgName :: Text
+noRunTestsArgName = "no-run-tests"
+
+maximumTimeSecondsArgName :: Text
+maximumTimeSecondsArgName = "test-suite-timeout"
+
+timeoutGraceSecondsArgName :: Text
+timeoutGraceSecondsArgName = "test-suite-timeout-grace"
+
+testsAllowStdinName :: Text
+testsAllowStdinName = "tests-allow-stdin"
+
+instance Semigroup TestOptsMonoid where
+  (<>) = mappenddefault
+
+instance Monoid TestOptsMonoid where
+  mempty = memptydefault
+  mappend = (<>)
+
+newtype HaddockOptsMonoid = HaddockOptsMonoid
+  { additionalArgs :: [String]
+  }
+  deriving (Generic, Show)
+
+instance FromJSON (WithJSONWarnings HaddockOptsMonoid) where
+  parseJSON = withObjectWarnings "HaddockOptsMonoid" $ \o -> do
+    additionalArgs <- o ..:? haddockAdditionalArgsName ..!= []
+    pure HaddockOptsMonoid { additionalArgs }
+
+instance Semigroup HaddockOptsMonoid where
+  (<>) = mappenddefault
+
+instance Monoid HaddockOptsMonoid where
+  mempty = memptydefault
+  mappend = (<>)
+
+haddockAdditionalArgsName :: Text
+haddockAdditionalArgsName = "haddock-args"
+
+data BenchmarkOptsMonoid = BenchmarkOptsMonoid
+  { additionalArgs :: !(First String)
+  , runBenchmarks :: !FirstTrue
+  }
+  deriving (Generic, Show)
+
+instance FromJSON (WithJSONWarnings BenchmarkOptsMonoid) where
+  parseJSON = withObjectWarnings "BenchmarkOptsMonoid" $ \o -> do
+    additionalArgs <- First <$> o ..:? benchmarkAdditionalArgsName
+    runBenchmarks <- FirstTrue . (not <$>) <$> o ..:? noRunBenchmarksArgName
+    pure BenchmarkOptsMonoid
+      { additionalArgs
+      , runBenchmarks
+      }
+
+benchmarkAdditionalArgsName :: Text
+benchmarkAdditionalArgsName = "benchmark-arguments"
+
+noRunBenchmarksArgName :: Text
+noRunBenchmarksArgName = "no-run-benchmarks"
+
+instance Semigroup BenchmarkOptsMonoid where
+  (<>) = mappenddefault
+
+instance Monoid BenchmarkOptsMonoid where
+  mempty = memptydefault
+  mappend :: BenchmarkOptsMonoid -> BenchmarkOptsMonoid -> BenchmarkOptsMonoid
+  mappend = (<>)
+
+newtype CabalVerbosity
+  = CabalVerbosity Verbosity
+  deriving (Eq, Show)
+
+toFirstCabalVerbosity :: FirstFalse -> First CabalVerbosity
+toFirstCabalVerbosity vf = First $ vf.firstFalse <&> \p ->
+  if p then verboseLevel else normalLevel
+ where
+  verboseLevel = CabalVerbosity verbose
+  normalLevel  = CabalVerbosity normal
+
+instance FromJSON CabalVerbosity where
+
+  parseJSON = withText "CabalVerbosity" $ \t ->
+    let s = T.unpack t
+        errMsg = fail $ "Unrecognised Cabal verbosity: " ++ s
+    in  maybe errMsg pure (simpleParsec s)
+
+instance Parsec CabalVerbosity where
+  parsec = CabalVerbosity <$> parsec
+
+buildOptsMonoidHaddockL :: Lens' BuildOptsMonoid (Maybe Bool)
+buildOptsMonoidHaddockL =
+  lens (.buildHaddocks.firstFalse)
+    (\buildMonoid t -> buildMonoid {buildHaddocks = FirstFalse t})
+
+buildOptsMonoidTestsL :: Lens' BuildOptsMonoid (Maybe Bool)
+buildOptsMonoidTestsL =
+  lens (.tests.firstFalse)
+    (\buildMonoid t -> buildMonoid {tests = FirstFalse t})
+
+buildOptsMonoidBenchmarksL :: Lens' BuildOptsMonoid (Maybe Bool)
+buildOptsMonoidBenchmarksL =
+  lens (.benchmarks.firstFalse)
+    (\buildMonoid t -> buildMonoid {benchmarks = FirstFalse t})
+
+buildOptsMonoidInstallExesL :: Lens' BuildOptsMonoid (Maybe Bool)
+buildOptsMonoidInstallExesL =
+  lens (.installExes.firstFalse)
+    (\buildMonoid t -> buildMonoid {installExes = FirstFalse t})
+
+buildOptsMonoidSemaphoreL :: Lens' BuildOptsMonoid (Maybe Bool)
+buildOptsMonoidSemaphoreL =
+  lens (.semaphore.firstFalse)
+    (\buildMonoid t -> buildMonoid {semaphore = FirstFalse t})
+
+-- Type representing formats of Stack's progress bar when building.
+data ProgressBarFormat
+  = NoBar -- No progress bar at all.
+  | CountOnlyBar -- A bar that only counts packages.
+  | CappedBar -- A bar capped at a length equivalent to the terminal's width.
+  | FullBar -- A full progress bar.
+  deriving (Eq, Show)
+
+instance FromJSON ProgressBarFormat where
+  parseJSON = withText "ProgressBarFormat" $ \t -> either
+    fail
+    pure
+    (readProgressBarFormat $ T.unpack t)
+
+-- | Parse ProgressBarFormat from a String.
+readProgressBarFormat :: String -> Either String ProgressBarFormat
+readProgressBarFormat s
+  | s == "none" = pure NoBar
+  | s == "count-only" = pure CountOnlyBar
+  | s == "capped" = pure CappedBar
+  | s == "full" = pure FullBar
+  | otherwise = Left $ "Invalid progress bar format: " ++ s
diff --git a/src/Stack/Types/CabalConfigKey.hs b/src/Stack/Types/CabalConfigKey.hs
new file mode 100644
index 0000000000..7047c227d4
--- /dev/null
+++ b/src/Stack/Types/CabalConfigKey.hs
@@ -0,0 +1,42 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.CabalConfigKey
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.CabalConfigKey
+  ( CabalConfigKey (..)
+  , parseCabalConfigKey
+  ) where
+
+import           Data.Aeson.Types
+                   ( FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..)
+                   , withText
+                   )
+import qualified Data.Text as T
+import           Stack.Prelude
+
+-- | Which packages do configure opts apply to?
+data CabalConfigKey
+  = CCKTargets -- ^ See AGOTargets
+  | CCKLocals -- ^ See AGOLocals
+  | CCKEverything -- ^ See AGOEverything
+  | CCKPackage !PackageName -- ^ A specific package
+  deriving (Show, Read, Eq, Ord)
+
+instance FromJSON CabalConfigKey where
+  parseJSON = withText "CabalConfigKey" parseCabalConfigKey
+
+instance FromJSONKey CabalConfigKey where
+  fromJSONKey = FromJSONKeyTextParser parseCabalConfigKey
+
+parseCabalConfigKey :: (Monad m, MonadFail m) => Text -> m CabalConfigKey
+parseCabalConfigKey "$targets" = pure CCKTargets
+parseCabalConfigKey "$locals" = pure CCKLocals
+parseCabalConfigKey "$everything" = pure CCKEverything
+parseCabalConfigKey name =
+  case parsePackageName $ T.unpack name of
+    Nothing -> fail $ "Invalid CabalConfigKey: " ++ show name
+    Just x -> pure $ CCKPackage x
diff --git a/src/Stack/Types/Cache.hs b/src/Stack/Types/Cache.hs
index 2961c312ed..79f957371c 100644
--- a/src/Stack/Types/Cache.hs
+++ b/src/Stack/Types/Cache.hs
@@ -1,56 +1,197 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Types.Cache
+License     : BSD-3-Clause
+-}
 
 module Stack.Types.Cache
-    ( ConfigCacheType(..)
-    , Action(..)
-    ) where
+  ( FileCache
+  , BuildFileCache (..)
+  , FileCacheInfo (..)
+  , ConfigCache (..)
+  , CachePkgSrc (..)
+  , PrecompiledCache (..)
+  , ConfigCacheType (..)
+  , Action (..)
+  ) where
 
+import           Data.Aeson
+                   ( ToJSON (..), FromJSON (..), (.=), (.:), object, withObject
+                   )
+import qualified Data.ByteString as S
 import qualified Data.Text as T
-import Database.Persist.Sql
-import Stack.Prelude
-import Stack.Types.GhcPkgId
+import           Database.Persist.Sql
+                   ( PersistField (..), PersistFieldSql (..), PersistValue (..)
+                   , SqlType (..)
+                   )
+import           Stack.Prelude
+import           Stack.Types.ConfigureOpts ( ConfigureOpts )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
 
--- | Type of config cache
+-- | Type representing types of cache in the Stack project SQLite database.
 data ConfigCacheType
-    = ConfigCacheTypeConfig
-    | ConfigCacheTypeFlagLibrary GhcPkgId
-    | ConfigCacheTypeFlagExecutable PackageIdentifier
-    deriving (Eq, Show)
+  = ConfigCacheTypeConfig
+    -- ^ Cabal configuration cache.
+  | ConfigCacheTypeFlagLibrary PackageIdentifier
+    -- ^ Library Cabal flag cache.
+  | ConfigCacheTypeFlagExecutable PackageIdentifier
+    -- ^ Executable Cabal flag cache.
+  | ConfigCacheTypeInstantiation Text
+    -- ^ Backpack CInst instantiation cache, keyed by hash suffix.
+  deriving (Eq, Show)
 
 instance PersistField ConfigCacheType where
-    toPersistValue ConfigCacheTypeConfig = PersistText "config"
-    toPersistValue (ConfigCacheTypeFlagLibrary v) =
-        PersistText $ "lib:" <> unGhcPkgId v
-    toPersistValue (ConfigCacheTypeFlagExecutable v) =
-        PersistText $ "exe:" <> T.pack (packageIdentifierString v)
-    fromPersistValue (PersistText t) =
-        fromMaybe (Left $ "Unexpected ConfigCacheType value: " <> t) $
-        config <|> fmap lib (T.stripPrefix "lib:" t) <|>
-        fmap exe (T.stripPrefix "exe:" t)
-      where
-        config
-            | t == "config" = Just (Right ConfigCacheTypeConfig)
-            | otherwise = Nothing
-        lib v = do
-            ghcPkgId <- mapLeft tshow (parseGhcPkgId v)
-            Right $ ConfigCacheTypeFlagLibrary ghcPkgId
-        exe v = do
-            pkgId <-
-                maybe (Left $ "Unexpected ConfigCacheType value: " <> t) Right $
-                parsePackageIdentifier (T.unpack v)
-            Right $ ConfigCacheTypeFlagExecutable pkgId
-    fromPersistValue _ = Left "Unexpected ConfigCacheType type"
+  toPersistValue ConfigCacheTypeConfig = PersistText "config"
+  toPersistValue (ConfigCacheTypeFlagLibrary v) =
+    PersistText $ "lib:" <> T.pack (packageIdentifierString v)
+  toPersistValue (ConfigCacheTypeFlagExecutable v) =
+    PersistText $ "exe:" <> T.pack (packageIdentifierString v)
+  toPersistValue (ConfigCacheTypeInstantiation v) =
+    PersistText $ "inst:" <> v
+
+  fromPersistValue (PersistText t) =
+    fromMaybe (Left $ "Unexpected ConfigCacheType value: " <> t) $
+          config
+      <|> flagCache ConfigCacheTypeFlagLibrary "lib:"
+      <|> flagCache ConfigCacheTypeFlagExecutable "exe:"
+      <|> fmap inst (T.stripPrefix "inst:" t)
+   where
+    config
+      | t == "config" = Just (Right ConfigCacheTypeConfig)
+      | otherwise = Nothing
+
+    flagCache ::
+         (PackageIdentifier -> ConfigCacheType)
+         -- ^ Constructor
+      -> Text
+         -- ^ Prefex
+      -> Maybe (Either Text ConfigCacheType)
+    flagCache constructor prefix =
+      fmap toConfigCacheType (T.stripPrefix prefix t)
+     where
+      toConfigCacheType :: Text -> Either Text ConfigCacheType
+      toConfigCacheType v = do
+        pkgId <-
+          maybe (Left $ "Unexpected ConfigCacheType value: " <> t) Right $
+          parsePackageIdentifier (T.unpack v)
+        Right $ constructor pkgId
+
+    inst v = Right $ ConfigCacheTypeInstantiation v
+  fromPersistValue _ = Left "Unexpected ConfigCacheType type"
 
 instance PersistFieldSql ConfigCacheType where
-    sqlType _ = SqlString
+  sqlType _ = SqlString
 
+-- | Type representing actions for which the last time the action was performed
+-- should be cached.
 data Action
   = UpgradeCheck
-  deriving (Show, Eq, Ord)
+  deriving (Eq, Ord, Show)
+
 instance PersistField Action where
-    toPersistValue UpgradeCheck = PersistInt64 1
-    fromPersistValue (PersistInt64 1) = Right UpgradeCheck
-    fromPersistValue x = Left $ T.pack $ "Invalid Action: " ++ show x
+  toPersistValue UpgradeCheck = PersistInt64 1
+  fromPersistValue (PersistInt64 1) = Right UpgradeCheck
+  fromPersistValue x = Left $ T.pack $ "Invalid Action: " ++ show x
+
 instance PersistFieldSql Action where
-    sqlType _ = SqlInt64
+  sqlType _ = SqlInt64
+
+-- | Type synonym representing caches of files and information about them
+-- sufficient to identify if they have changed subsequently.
+type FileCache = Map FilePath FileCacheInfo
+
+-- | Type representing caches of information about files sufficient to identify
+-- if they have changed subsequently. Stored on disk.
+newtype BuildFileCache = BuildFileCache
+  { fileCache :: FileCache
+  }
+  deriving (Eq, FromJSON, Generic, Show, ToJSON)
+
+instance NFData BuildFileCache
+
+-- | Type representing information about a file sufficient to identify if
+-- it has changed subsequently.
+newtype FileCacheInfo = FileCacheInfo
+  { hash :: SHA256
+    -- ^ SHA-256 hash of file contents.
+  }
+  deriving (Eq, Generic, Show)
+
+instance NFData FileCacheInfo
+
+-- Provided for storing the t'BuildFileCache' values in a file. But maybe
+-- JSON/YAML isn't the right choice here, worth considering.
+instance ToJSON FileCacheInfo where
+  toJSON fileCacheInfo = object
+    [ "hash" .= fileCacheInfo.hash
+    ]
+
+instance FromJSON FileCacheInfo where
+  parseJSON = withObject "FileCacheInfo" $ \o -> FileCacheInfo
+    <$> o .: "hash"
+
+-- | Stored in the project's SQLite database to know whether the Cabal
+-- configuration has changed or libarary or executable Cabal flags have changed.
+data ConfigCache = ConfigCache
+  { configureOpts :: !ConfigureOpts
+    -- ^ All Cabal configure options used for this package.
+  , deps :: !(Set GhcPkgId)
+    -- ^ The GhcPkgIds of all of the dependencies. Since Cabal doesn't take
+    -- the complete GhcPkgId (only a PackageIdentifier) in the configure
+    -- options, just using the previous value is insufficient to know if
+    -- dependencies have changed.
+  , components :: !(Set S.ByteString)
+    -- ^ The components to be built. It's a bit of a hack to include this in
+    -- here, as it's not a configure option (just a build option), but this
+    -- is a convenient way to force compilation when the components change.
+  , buildHaddocks :: !Bool
+    -- ^ Is Haddock documentation to be built?
+  , pkgSrc :: !CachePkgSrc
+    -- ^ The origin of the package's source code.
+  , pathEnvVar :: !Text
+    -- ^ Value of the PATH environment variable. See
+    -- <https://github.com/commercialhaskell/stack/issues/3138>
+  }
+  deriving (Data, Eq, Generic, Show)
+
+instance NFData ConfigCache
+
+data CachePkgSrc
+  = CacheSrcUpstream
+  | CacheSrcLocal FilePath
+  deriving (Data, Eq, Generic, Read, Show)
+
+instance NFData CachePkgSrc
+
+instance PersistField CachePkgSrc where
+  toPersistValue CacheSrcUpstream = PersistText "upstream"
+  toPersistValue (CacheSrcLocal fp) = PersistText ("local:" <> T.pack fp)
+  fromPersistValue (PersistText t) =
+    if t == "upstream"
+      then Right CacheSrcUpstream
+      else case T.stripPrefix "local:" t of
+        Just fp -> Right $ CacheSrcLocal (T.unpack fp)
+        Nothing -> Left $ "Unexpected CachePkgSrc value: " <> t
+  fromPersistValue _ = Left "Unexpected CachePkgSrc type"
+
+instance PersistFieldSql CachePkgSrc where
+  sqlType _ = SqlString
+
+-- | Information on a compiled package: the library .conf file (if relevant),
+-- the sub-libraries (if present) and all of the executable paths.
+data PrecompiledCache base = PrecompiledCache
+  { library :: !(Maybe (Path base File))
+    -- ^ .conf file inside the package database
+  , subLibs :: ![Path base File]
+    -- ^ .conf file inside the package database, for each of the sub-libraries
+  , exes    :: ![Path base File]
+    -- ^ Full paths to executables
+  }
+  deriving (Eq, Generic, Show)
+
+instance NFData (PrecompiledCache Abs)
+
+instance NFData (PrecompiledCache Rel)
diff --git a/src/Stack/Types/Casa.hs b/src/Stack/Types/Casa.hs
new file mode 100644
index 0000000000..d1d8dd52bd
--- /dev/null
+++ b/src/Stack/Types/Casa.hs
@@ -0,0 +1,64 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.Casa
+Description : Casa configuration types.
+License     : BSD-3-Clause
+
+Casa configuration types.
+-}
+
+module Stack.Types.Casa
+  ( CasaOptsMonoid (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..) )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings, (..:?), withObjectWarnings )
+import           Casa.Client ( CasaRepoPrefix )
+import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
+import           Stack.Prelude
+
+-- | An uninterpreted representation of Casa configuration options.
+-- Configurations may be "cascaded" using mappend (left-biased).
+data CasaOptsMonoid = CasaOptsMonoid
+  { enable :: !FirstTrue
+  , repoPrefix :: !(First CasaRepoPrefix)
+  , maxKeysPerRequest :: !(First Int)
+  }
+  deriving (Generic, Show)
+
+-- | Decode uninterpreted Casa configuration options from JSON/YAML.
+instance FromJSON (WithJSONWarnings CasaOptsMonoid) where
+  parseJSON = withObjectWarnings "CasaOptsMonoid" $ \o -> do
+    enable <- FirstTrue <$> o ..:? casaEnableName
+    repoPrefix <- First <$> o ..:? casaRepoPrefixName
+    maxKeysPerRequest <- First <$> o ..:? casaMaxKeysPerRequestName
+    pure CasaOptsMonoid
+      { enable
+      , repoPrefix
+      , maxKeysPerRequest
+      }
+
+-- | Left-biased combine Casa configuration options
+instance Semigroup CasaOptsMonoid where
+  (<>) = mappenddefault
+
+-- | Left-biased combine Casa configurations options
+instance Monoid CasaOptsMonoid where
+  mempty = memptydefault
+  mappend = (<>)
+
+-- | Casa configuration enable setting name.
+casaEnableName :: Text
+casaEnableName = "enable"
+
+-- | Casa configuration repository prefix setting name.
+casaRepoPrefixName :: Text
+casaRepoPrefixName = "repo-prefix"
+
+-- | Casa configuration maximum keys per request setting name.
+casaMaxKeysPerRequestName :: Text
+casaMaxKeysPerRequestName = "max-keys-per-request"
diff --git a/src/Stack/Types/ColorWhen.hs b/src/Stack/Types/ColorWhen.hs
new file mode 100644
index 0000000000..f583b64ba0
--- /dev/null
+++ b/src/Stack/Types/ColorWhen.hs
@@ -0,0 +1,42 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.ColorWhen
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ColorWhen
+  ( ColorWhen (..)
+  , readColorWhen
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..) )
+import           Options.Applicative ( ReadM )
+import qualified Options.Applicative.Types as OA
+import           Stack.Prelude
+
+data ColorWhen
+  = ColorNever
+  | ColorAlways
+  | ColorAuto
+  deriving (Eq, Generic, Show)
+
+instance FromJSON ColorWhen where
+  parseJSON v = do
+    s <- parseJSON v
+    case s of
+      "never"  -> pure ColorNever
+      "always" -> pure ColorAlways
+      "auto"   -> pure ColorAuto
+      _ -> fail ("Unknown color use: " <> s <> ". Expected values of " <>
+                 "option are 'never', 'always', or 'auto'.")
+
+readColorWhen :: ReadM ColorWhen
+readColorWhen =
+  OA.readerAsk >>= \case
+    "never" -> pure ColorNever
+    "always" -> pure ColorAlways
+    "auto" -> pure ColorAuto
+    _ -> OA.readerError "Expected values of color option are 'never', \
+                        \'always', or 'auto'."
diff --git a/src/Stack/Types/CompCollection.hs b/src/Stack/Types/CompCollection.hs
new file mode 100644
index 0000000000..54c4966aeb
--- /dev/null
+++ b/src/Stack/Types/CompCollection.hs
@@ -0,0 +1,183 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Types.CompCollection
+License     : BSD-3-Clause
+
+A module providing the type t'CompCollection' and associated helper functions.
+
+The corresponding Cabal approach uses lists. See, for example, the
+'Distribution.Types.PackageDescription.sublibraries',
+'Distribution.Types.PackageDescription.foreignLibs',
+'Distribution.Types.PackageDescription.executables',
+'Distribution.Types.PackageDescription.testSuites', and
+'Distribution.Types.PackageDescription.benchmarks' fields.
+
+Cabal removes all the unbuildable components very early (at the cost of slightly
+worse error messages).
+-}
+module Stack.Types.CompCollection
+  ( CompCollection
+  , getBuildableSet
+  , getBuildableSetText
+  , getBuildableListText
+  , getBuildableListAs
+  , foldAndMakeCollection
+  , hasBuildableComponent
+  , collectionLookup
+  , collectionKeyValueList
+  , collectionMember
+  , foldComponentToAnotherCollection
+  ) where
+
+import qualified Data.Map as M
+import qualified Data.Set as Set
+import           Stack.Prelude
+import           Stack.Types.Component
+                   ( HasBuildInfo, HasName, StackBuildInfo (..) )
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName, unqualCompToText )
+
+-- | A type representing collections of components, distinguishing buildable
+-- components and non-buildable components.
+data CompCollection component = CompCollection
+  { buildableOnes :: {-# UNPACK #-} !(InnerCollection component)
+  , unbuildableOnes :: Set StackUnqualCompName
+    -- ^ The field is lazy beacause it should only serve when users explicitely
+    -- require unbuildable components to be built. The field allows for
+    -- intelligible error messages.
+  }
+  deriving Show
+
+instance Semigroup (CompCollection component) where
+  a <> b = CompCollection
+    { buildableOnes = a.buildableOnes <> b.buildableOnes
+    , unbuildableOnes = a.unbuildableOnes <> b.unbuildableOnes
+    }
+
+instance Monoid (CompCollection component) where
+  mempty = CompCollection
+    { buildableOnes = mempty
+    , unbuildableOnes = mempty
+    }
+
+instance Foldable CompCollection where
+  foldMap fn collection = foldMap fn collection.buildableOnes
+  foldr' fn c collection = M.foldr' fn c collection.buildableOnes
+  null = M.null . (.buildableOnes)
+
+-- | The 'Data.HashMap.Strict.HashMap' type is a more suitable choice than 'Map'
+-- for 'Data.Text.Text' based keys in general (it scales better). However,
+-- constant factors are largely dominant for maps with less than 1000 keys.
+-- Packages with more than 100 components are extremely unlikely, so we use a
+-- 'Map'.
+type InnerCollection component = Map StackUnqualCompName component
+
+-- | A function to add a component to a collection of components. Ensures that
+-- both 'asNameMap' and 'asNameSet' are updated consistently.
+addComponent ::
+     HasName component
+  => component
+     -- ^ Component to add.
+  -> InnerCollection component
+     -- ^ Existing collection of components.
+  -> InnerCollection component
+addComponent component = M.insert component.name component
+
+-- | For the given function and foldable data structure of components of type
+-- @compA@, iterates on the elements of that structure and maps each element to
+-- a component of type @compB@ while building a v'CompCollection'.
+foldAndMakeCollection ::
+     (HasBuildInfo compB, HasName compB, Foldable sourceCollection)
+  => (compA -> compB)
+     -- ^ Function to apply to each element in the data struture.
+  -> sourceCollection compA
+     -- ^ Given foldable data structure of components of type @compA@.
+  -> CompCollection compB
+foldAndMakeCollection mapFn = foldl' compIterator mempty
+ where
+  compIterator existingCollection component =
+    compCreator existingCollection (mapFn component)
+  compCreator existingCollection component
+    | component.buildInfo.buildable = existingCollection
+        { buildableOnes =
+            addComponent component existingCollection.buildableOnes
+        }
+    | otherwise = existingCollection
+        { unbuildableOnes =
+            Set.insert component.name existingCollection.unbuildableOnes
+        }
+
+-- | Get the names of the buildable components in the given collection, as a
+-- 'Set' of 'StackUnqualCompName'.
+getBuildableSet :: CompCollection component -> Set StackUnqualCompName
+getBuildableSet = M.keysSet . (.buildableOnes)
+
+-- | Get the names of the buildable components in the given collection, as a
+-- 'Set' of 'Text'.
+getBuildableSetText :: CompCollection component -> Set Text
+getBuildableSetText = Set.mapMonotonic unqualCompToText . getBuildableSet
+
+-- | Get the names of the buildable components in the given collection, as a
+-- list of 'Text.
+getBuildableListText :: CompCollection component -> [Text]
+getBuildableListText = getBuildableListAs unqualCompToText
+
+-- | Apply the given function to the names of the buildable components in the
+-- given collection, yielding a list.
+getBuildableListAs ::
+     (StackUnqualCompName -> something)
+     -- ^ Function to apply to buildable components.
+  -> CompCollection component
+     -- ^ Collection of components.
+  -> [something]
+getBuildableListAs fn = Set.foldr' (\v l -> fn v:l) [] . getBuildableSet
+
+-- | Yields 'True' if, and only if, the given collection includes at least one
+-- buildable component.
+hasBuildableComponent :: CompCollection component -> Bool
+hasBuildableComponent = not . null . getBuildableSet
+
+-- | For the given name of a buildable component and the given collection of
+-- components, yields 'Just' @component@ if the collection includes a buildable
+-- component of that name, and 'Nothing' otherwise.
+collectionLookup ::
+     StackUnqualCompName
+     -- ^ Name of the buildable component.
+  -> CompCollection component
+     -- ^ Collection of components.
+  -> Maybe component
+collectionLookup needle haystack = M.lookup needle haystack.buildableOnes
+
+-- | For a given collection of components, yields a list of pairs for buildable
+-- components of the name of the component and the component.
+collectionKeyValueList ::
+     CompCollection component
+  -> [(StackUnqualCompName, component)]
+collectionKeyValueList haystack = M.toList haystack.buildableOnes
+
+-- | Yields 'True' if, and only if, the given collection of components includes
+-- a buildable component with the given name.
+collectionMember ::
+     StackUnqualCompName
+     -- ^ Name of the buildable component.
+  -> CompCollection component
+     -- ^ Collection of components.
+  -> Bool
+collectionMember needle haystack = isJust $ collectionLookup needle haystack
+
+-- | Reduce the buildable components of the given collection of components by
+-- applying the given binary operator to all buildable components, using the
+-- given starting value (typically the right-identity of the operator).
+foldComponentToAnotherCollection ::
+     (Monad m)
+  => CompCollection component
+     -- ^ Collection of components.
+  -> (component -> m a -> m a)
+     -- ^ Binary operator.
+  -> m a
+     -- ^ Starting value.
+  -> m a
+foldComponentToAnotherCollection collection fn initialValue =
+  M.foldr' fn initialValue collection.buildableOnes
diff --git a/src/Stack/Types/Compiler.hs b/src/Stack/Types/Compiler.hs
index 5551c5a600..a7e2fa7710 100644
--- a/src/Stack/Types/Compiler.hs
+++ b/src/Stack/Types/Compiler.hs
@@ -1,17 +1,22 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DataKinds          #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE FlexibleInstances  #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE TypeFamilies       #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
+
+{-|
+Module      : Stack.Types.Compiler
+License     : BSD-3-Clause
+-}
 
 module Stack.Types.Compiler
   ( ActualCompiler (..)
   , WhichCompiler (..)
   , CompilerRepository (..)
+  , CompilerTarget (..)
+  , CompilerBindistPath (..)
   , CompilerException (..)
   , defaultCompilerRepository
+  , defaultCompilerTarget
+  , defaultCompilerBindistPath
   , getGhcVersion
   , whichCompiler
   , compilerVersionText
@@ -20,58 +25,80 @@ module Stack.Types.Compiler
   , wantedToActual
   , actualToWanted
   , parseActualCompiler
+  , whichCompilerL
   ) where
 
 import           Data.Aeson
-import           Database.Persist
+                   ( FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..)
+                   , ToJSON (..), Value (..), withText
+                   )
 import           Database.Persist.Sql
+                   ( PersistField (..), PersistFieldSql (..), SqlType (..) )
 import qualified Data.Text as T
+import           Distribution.Version ( mkVersion )
 import           Stack.Prelude
-import           Stack.Types.Version
-import           Distribution.Version (mkVersion)
+import           Stack.Types.Version ( VersionCheck, checkVersion )
+import           System.Permissions ( osIsWindows )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Types.Compiler" module.
+data CompilerException
+  = GhcjsNotSupported
+  | PantryException PantryException
+  deriving Show
+
+instance Exception CompilerException where
+  displayException GhcjsNotSupported =
+    "Error: [S-7903]\n"
+    ++ "GHCJS is no longer supported by Stack."
+  displayException (PantryException p) =
+    "Error: [S-7972]\n"
+    ++ displayException p
 
 -- | Variety of compiler to use.
 data WhichCompiler
-    = Ghc
-    deriving (Show, Eq, Ord)
+  = Ghc
+  deriving (Eq, Ord, Show)
 
 -- | Specifies a compiler and its version number(s).
 --
 -- Note that despite having this datatype, Stack isn't in a hurry to
 -- support compilers other than GHC.
 data ActualCompiler
-    = ACGhc !Version
-    | ACGhcGit !Text !Text
-    deriving (Generic, Show, Eq, Ord, Data, Typeable)
+  = ACGhc !Version
+  | ACGhcGit !Text !Text
+  deriving (Data, Eq, Generic, Ord, Show)
+
 instance NFData ActualCompiler
+
 instance Display ActualCompiler where
-    display (ACGhc x) = display (WCGhc x)
-    display (ACGhcGit x y) = display (WCGhcGit x y)
+  display (ACGhc x) = display (WCGhc x)
+  display (ACGhcGit x y) = display (WCGhcGit x y)
+
 instance ToJSON ActualCompiler where
-    toJSON = toJSON . compilerVersionText
+  toJSON = toJSON . compilerVersionText
+
 instance FromJSON ActualCompiler where
-    parseJSON (String t) = either (const $ fail "Failed to parse compiler version") pure (parseActualCompiler t)
-    parseJSON _ = fail "Invalid CompilerVersion, must be String"
+  parseJSON (String t) =
+    either
+      (const $ fail "Failed to parse compiler version")
+      pure
+      (parseActualCompiler t)
+  parseJSON _ = fail "Invalid CompilerVersion, must be String"
+
 instance FromJSONKey ActualCompiler where
-    fromJSONKey = FromJSONKeyTextParser $ \k ->
-        case parseActualCompiler k of
-            Left _ -> fail $ "Failed to parse CompilerVersion " ++ T.unpack k
-            Right parsed -> pure parsed
+  fromJSONKey = FromJSONKeyTextParser $ \k ->
+    case parseActualCompiler k of
+      Left _ -> fail $ "Failed to parse CompilerVersion " ++ T.unpack k
+      Right parsed -> pure parsed
+
 instance PersistField ActualCompiler where
   toPersistValue = toPersistValue . compilerVersionText
   fromPersistValue = (mapLeft tshow . parseActualCompiler) <=< fromPersistValue
+
 instance PersistFieldSql ActualCompiler where
   sqlType _ = SqlString
 
-data CompilerException
-  = GhcjsNotSupported
-  | PantryException PantryException
-
-instance Show CompilerException where
-    show GhcjsNotSupported = "GHCJS is no longer supported by Stack"
-    show (PantryException p) = displayException p
-instance Exception CompilerException
-
 wantedToActual :: WantedCompiler -> Either CompilerException ActualCompiler
 wantedToActual (WCGhc x) = Right $ ACGhc x
 wantedToActual (WCGhcjs _ _) = Left GhcjsNotSupported
@@ -83,8 +110,9 @@ actualToWanted (ACGhcGit x y) = WCGhcGit x y
 
 parseActualCompiler :: T.Text -> Either CompilerException ActualCompiler
 parseActualCompiler =
-  either (Left . PantryException) wantedToActual .
-  parseWantedCompiler
+  either
+    (Left . PantryException)
+    wantedToActual . parseWantedCompiler
 
 compilerVersionText :: ActualCompiler -> T.Text
 compilerVersionText = utf8BuilderToText . display
@@ -98,27 +126,57 @@ whichCompiler ACGhcGit{} = Ghc
 
 isWantedCompiler :: VersionCheck -> WantedCompiler -> ActualCompiler -> Bool
 isWantedCompiler check (WCGhc wanted) (ACGhc actual) =
-    checkVersion check wanted actual
+  checkVersion check wanted actual
 isWantedCompiler _check (WCGhcGit wCommit wFlavour) (ACGhcGit aCommit aFlavour) =
-    wCommit == aCommit && wFlavour == aFlavour
+  wCommit == aCommit && wFlavour == aFlavour
 isWantedCompiler _ _ _ = False
 
 getGhcVersion :: ActualCompiler -> Version
 getGhcVersion (ACGhc v) = v
 getGhcVersion (ACGhcGit _ _) =
-   -- We can't return the actual version without running the installed ghc.
-   -- For now we assume that users of ghc-git use it with a recent commit so we
-   -- return a version far in the future. This disables our hacks for older
-   -- versions and passes version checking when we use newer features.
-   mkVersion [999,0,0]
+  -- We can't return the actual version without running the installed ghc.
+  -- For now we assume that users of ghc-git use it with a recent commit so we
+  -- return a version far in the future. This disables our hacks for older
+  -- versions and passes version checking when we use newer features.
+  mkVersion [999, 0, 0]
 
 -- | Repository containing the compiler sources
 newtype CompilerRepository
   = CompilerRepository Text
-  deriving (Show)
+  deriving Show
 
 instance FromJSON CompilerRepository where
   parseJSON = withText "CompilerRepository" (pure . CompilerRepository)
 
 defaultCompilerRepository :: CompilerRepository
-defaultCompilerRepository = CompilerRepository "https://gitlab.haskell.org/ghc/ghc.git"
+defaultCompilerRepository =
+  CompilerRepository "https://gitlab.haskell.org/ghc/ghc.git"
+
+-- | Target for Hadrian build
+newtype CompilerTarget
+  = CompilerTarget Text
+  deriving Show
+
+instance FromJSON CompilerTarget where
+  parseJSON = withText "CompilerTarget" (pure . CompilerTarget)
+
+defaultCompilerTarget :: CompilerTarget
+defaultCompilerTarget = if osIsWindows
+  then CompilerTarget "reloc-binary-dist"
+  else CompilerTarget "binary-dist"
+
+-- | Hadrian path to built binary distribution
+newtype CompilerBindistPath
+  = CompilerBindistPath Text
+  deriving Show
+
+instance FromJSON CompilerBindistPath where
+  parseJSON = withText "CompilerBindistPath" (pure . CompilerBindistPath)
+
+defaultCompilerBindistPath :: CompilerBindistPath
+defaultCompilerBindistPath = if osIsWindows
+  then CompilerBindistPath "_build/reloc-bindist"
+  else CompilerBindistPath "_build/bindist"
+
+whichCompilerL :: Getting r ActualCompiler WhichCompiler
+whichCompilerL = to whichCompiler
diff --git a/src/Stack/Types/CompilerBuild.hs b/src/Stack/Types/CompilerBuild.hs
index 475fe0ebe0..606c849025 100644
--- a/src/Stack/Types/CompilerBuild.hs
+++ b/src/Stack/Types/CompilerBuild.hs
@@ -1,27 +1,33 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
+{-|
+Module      : Stack.Types.CompilerBuild
+License     : BSD-3-Clause
+-}
+
 module Stack.Types.CompilerBuild
-  (CompilerBuild(..)
-  ,compilerBuildName
-  ,compilerBuildSuffix
-  ,parseCompilerBuild
+  ( CompilerBuild (..)
+  , compilerBuildName
+  , compilerBuildSuffix
+  , parseCompilerBuild
   ) where
 
+import           Data.Aeson.Types ( FromJSON, parseJSON, withText )
+import qualified Data.Text as T
 import           Stack.Prelude
-import           Pantry.Internal.AesonExtended (FromJSON, parseJSON, withText)
-import           Data.Text as T
 
+-- | Build of the compiler distribution (e.g. standard, gmp4, tinfo6)
 data CompilerBuild
-    = CompilerBuildStandard
-    | CompilerBuildSpecialized String
-    deriving (Show)
+  = CompilerBuildStandard
+  | CompilerBuildSpecialized String
+  deriving Show
 
 instance FromJSON CompilerBuild where
-    -- Strange structuring is to give consistent error messages
-    parseJSON =
-        withText
-            "CompilerBuild"
-            (either (fail . show) pure . parseCompilerBuild . T.unpack)
+  -- Strange structuring is to give consistent error messages
+  parseJSON =
+    withText
+      "CompilerBuild"
+      (either (fail . show) pure . parseCompilerBuild . T.unpack)
 
 -- | Descriptive name for compiler build
 compilerBuildName :: CompilerBuild -> String
diff --git a/src/Stack/Types/CompilerPaths.hs b/src/Stack/Types/CompilerPaths.hs
new file mode 100644
index 0000000000..b9a2b331e3
--- /dev/null
+++ b/src/Stack/Types/CompilerPaths.hs
@@ -0,0 +1,87 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Types.CompilerPaths
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.CompilerPaths
+  ( CompilerPaths (..)
+  , GhcPkgExe (..)
+  , HasCompiler (..)
+  , cabalVersionL
+  , compilerVersionL
+  , cpWhich
+  , getCompilerPath
+  , getGhcPkgExe
+  ) where
+
+import           Distribution.System ( Arch )
+import           Stack.Prelude
+import           Stack.Types.Compiler
+                   ( ActualCompiler, WhichCompiler, whichCompiler )
+import           Stack.Types.CompilerBuild ( CompilerBuild )
+import           Stack.Types.DumpPackage ( DumpPackage )
+
+-- | Paths on the filesystem for the compiler we're using
+data CompilerPaths = CompilerPaths
+  { compilerVersion :: !ActualCompiler
+  , arch :: !Arch
+  , build :: !CompilerBuild
+  , compiler :: !(Path Abs File)
+  , pkg :: !GhcPkgExe
+    -- ^ ghc-pkg or equivalent
+  , interpreter :: !(Path Abs File)
+    -- ^ runghc
+  , haddock :: !(Path Abs File)
+    -- ^ haddock, in 'IO' to allow deferring the lookup
+  , sandboxed :: !Bool
+    -- ^ Is this a Stack-sandboxed installation?
+  , cabalVersion :: !Version
+    -- ^ This is the version of Cabal that Stack will use to compile Setup.hs
+    -- files in the build process.
+    --
+    -- Note that this is not necessarily the same version as the one that Stack
+    -- depends on as a library and which is displayed when running
+    -- @stack ls dependencies | grep Cabal@ in the Stack project.
+  , globalDB :: !(Path Abs Dir)
+    -- ^ Global package database
+  , ghcInfo :: !ByteString
+    -- ^ Output of @ghc --info@
+  , globalDump :: !(Map PackageName DumpPackage)
+  }
+  deriving Show
+
+-- | An environment which ensures that the given compiler is available on the
+-- PATH
+class HasCompiler env where
+  compilerPathsL :: SimpleGetter env CompilerPaths
+
+instance HasCompiler CompilerPaths where
+  compilerPathsL = id
+
+-- | Location of the ghc-pkg executable
+newtype GhcPkgExe
+  = GhcPkgExe (Path Abs File)
+  deriving Show
+
+cabalVersionL :: HasCompiler env => SimpleGetter env Version
+cabalVersionL = compilerPathsL . to (.cabalVersion)
+
+compilerVersionL :: HasCompiler env => SimpleGetter env ActualCompiler
+compilerVersionL = compilerPathsL . to (.compilerVersion)
+
+cpWhich :: (MonadReader env m, HasCompiler env) => m WhichCompiler
+cpWhich = view $ compilerPathsL . to (whichCompiler . (.compilerVersion))
+
+-- | Get the path for the given compiler ignoring any local binaries.
+--
+-- https://github.com/commercialhaskell/stack/issues/1052
+getCompilerPath :: HasCompiler env => RIO env (Path Abs File)
+getCompilerPath = view $ compilerPathsL . to (.compiler)
+
+-- | Get the t'GhcPkgExe' from a 'HasCompiler' environment
+getGhcPkgExe :: HasCompiler env => RIO env GhcPkgExe
+getGhcPkgExe = view $ compilerPathsL . to (.pkg)
diff --git a/src/Stack/Types/Component.hs b/src/Stack/Types/Component.hs
new file mode 100644
index 0000000000..90b5efec71
--- /dev/null
+++ b/src/Stack/Types/Component.hs
@@ -0,0 +1,200 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+
+{-|
+Module      : Stack.Types.Component
+License     : BSD-3-Clause
+
+A module providing the types that represent different sorts of components of a
+package (library and sub-library, foreign library, executable, test suite and
+benchmark).
+-}
+
+module Stack.Types.Component
+  ( StackLibrary (..)
+  , StackForeignLibrary (..)
+  , StackExecutable (..)
+  , StackTestSuite (..)
+  , StackBenchmark (..)
+  , StackUnqualCompName (..)
+  , StackBuildInfo (..)
+  , HasName
+  , HasQualiName
+  , HasBuildInfo
+  , HasComponentInfo
+  ) where
+
+import           Distribution.Compiler ( PerCompilerFlavor )
+import           Distribution.ModuleName ( ModuleName )
+import           Distribution.PackageDescription
+                   ( BenchmarkInterface, Dependency, TestSuiteInterface )
+import           Distribution.Types.Mixin ( Mixin )
+import           Distribution.Simple ( Extension, Language )
+import           Distribution.Utils.Path ( Pkg, Source, SymbolicPath )
+import qualified Distribution.Utils.Path as Cabal
+import           GHC.Records ( HasField (..) )
+import           Stack.Prelude
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName (..), emptyCompName )
+import           Stack.Types.Dependency ( DepValue )
+import           Stack.Types.NamedComponent ( NamedComponent (..) )
+
+-- | A type representing (unnamed) main library or sub-library components of a
+-- package.
+--
+-- Cabal-syntax uses data constructors
+-- 'Distribution.Types.LibraryName.LMainLibName' and
+-- 'Distribution.Types.LibraryName.LSubLibName' to distinguish main libraries
+-- and sub-libraries. We do not do so, as the \'missing\' name in the case of a
+-- main library can be represented by the empty string.
+--
+-- The corresponding Cabal-syntax type is 'Distribution.Types.Library.Library'.
+data StackLibrary = StackLibrary
+  { name :: StackUnqualCompName
+  , buildInfo :: !StackBuildInfo
+  , exposedModules :: [ModuleName]
+    -- |^ This is only used for gathering the files related to this component.
+  , signatures :: [ModuleName]
+    -- ^ Backpack signature module names. Non-empty for indefinite packages.
+  }
+  deriving Show
+
+-- | A type representing foreign library components of a package.
+--
+-- The corresponding Cabal-syntax type is
+-- 'Distribution.Types.Foreign.Libraries.ForeignLib'.
+data StackForeignLibrary = StackForeignLibrary
+  { name :: StackUnqualCompName
+  , buildInfo :: !StackBuildInfo
+  }
+  deriving Show
+
+-- | A type representing executable components of a package.
+--
+-- The corresponding Cabal-syntax type is
+-- 'Distribution.Types.Executable.Executable'.
+data StackExecutable = StackExecutable
+  { name :: StackUnqualCompName
+  , buildInfo :: !StackBuildInfo
+  , modulePath :: FilePath
+  }
+  deriving Show
+
+-- | A type representing test suite components of a package.
+--
+-- The corresponding Cabal-syntax type is
+-- 'Distribution.Types.TestSuite.TestSuite'.
+data StackTestSuite = StackTestSuite
+  { name :: StackUnqualCompName
+  , buildInfo :: !StackBuildInfo
+  , interface :: !TestSuiteInterface
+  }
+  deriving Show
+
+-- | A type representing benchmark components of a package.
+--
+-- The corresponding Cabal-syntax type is
+-- 'Distribution.Types.Benchmark.Benchmark'.
+data StackBenchmark = StackBenchmark
+  { name :: StackUnqualCompName
+  , buildInfo :: StackBuildInfo
+  , interface :: BenchmarkInterface
+    -- ^ This is only used for gathering the files related to this component.
+  }
+  deriving Show
+
+-- | Type representing the name of an executable.
+newtype ExeName = ExeName Text
+  deriving (Data, Eq, Hashable, IsString, Generic, NFData, Ord, Show)
+
+-- | Type representing information needed to build. The file gathering-related
+-- fields are lazy because they are not always needed.
+--
+-- The corresponding Cabal-syntax type is
+-- 'Distribution.Types.BuildInfo.BuildInfo'.
+
+-- We don't use the Cabal-syntax type because Cabal provides a list of
+-- dependencies, and Stack needs a Map and only a small subset of all the
+-- information in Cabal-syntax type.
+data StackBuildInfo = StackBuildInfo
+  { buildable :: !Bool
+    -- ^ Corresponding to Cabal-syntax's
+    -- 'Distribution.Types.BuildInfo.buildable'. The component is buildable
+    -- here.
+  , dependency :: !(Map PackageName DepValue)
+    -- ^ Corresponding to Cabal-syntax's
+    -- 'Distribution.Types.BuildInfo.targetBuildDepends'. Dependencies specific
+    -- to a library or executable target.
+  , unknownTools :: Set Text
+    -- ^ From Cabal-syntax's 'Distribution.Types.BuildInfo.buildTools'. We only
+    -- keep the legacy build tool depends that we know (from a hardcoded list).
+    -- We only use the deduplication aspect of the Set here, as this field is
+    -- only used for error reporting in the end. This is lazy because it's an
+    -- error reporting field only.
+  , otherModules :: [ModuleName]
+    -- ^ Only used in file gathering. See usage in "Stack.ComponentFile" module.
+  , jsSources :: [FilePath]
+    -- ^ Only used in file gathering. See usage in "Stack.ComponentFile" module.
+  , hsSourceDirs :: [SymbolicPath Pkg (Cabal.Dir Source)]
+    -- ^ Only used in file & opts gathering. See usage in "Stack.ComponentFile"
+    -- module for fle gathering.
+  , cSources :: [FilePath]
+    -- ^ Only used in file gathering. See usage in "Stack.ComponentFile" module.
+  , cppOptions :: [String]
+    -- ^ Only used in opts gathering. See usage in "Stack.Package" module.
+  , targetBuildDepends :: [Dependency]
+    -- ^ Only used in opts gathering.
+  , options :: PerCompilerFlavor [String]
+    -- ^ Only used in opts gathering.
+  , allLanguages :: [Language]
+    -- ^ Only used in opts gathering.
+  , usedExtensions :: [Extension]
+    -- ^ Only used in opts gathering.
+  , includeDirs :: [FilePath]
+    -- ^ Only used in opts gathering.
+  , extraLibs :: [String]
+    -- ^ Only used in opts gathering.
+  , extraLibDirs :: [String]
+    -- ^ Only used in opts gathering.
+  , frameworks :: [String]
+    -- ^ Only used in opts gathering.
+  , mixins :: [Mixin]
+    -- ^ Backpack mixin declarations. Used for cross-package Backpack support.
+  }
+  deriving Show
+
+-- | Type synonym for a 'HasField' constraint.
+type HasName component = HasField "name" component StackUnqualCompName
+
+-- | Type synonym for a 'HasField' constraint.
+type HasBuildInfo component = HasField "buildInfo" component StackBuildInfo
+
+instance HasField "qualifiedName" StackLibrary NamedComponent where
+  getField v
+    | rawName == emptyCompName = CLib
+    | otherwise = CSubLib rawName
+    where
+      rawName = v.name
+
+instance HasField "qualifiedName" StackForeignLibrary NamedComponent where
+  getField = CFlib . (.name)
+
+instance HasField "qualifiedName" StackExecutable NamedComponent where
+  getField = CExe . (.name)
+
+instance HasField "qualifiedName" StackTestSuite NamedComponent where
+  getField = CTest . (.name)
+
+instance HasField "qualifiedName" StackBenchmark NamedComponent where
+  getField = CBench . (.name)
+
+-- | Type synonym for a 'HasField' constraint which represent a virtual field,
+-- computed from the type, the NamedComponent constructor and the name.
+type HasQualiName component = HasField "qualifiedName" component NamedComponent
+
+-- | Type synonym for a 'HasField' constraint for all the common component
+-- fields i.e. @name@, @buildInfo@ and @qualifiedName@.
+type HasComponentInfo component =
+  (HasName component, HasBuildInfo component, HasQualiName component)
diff --git a/src/Stack/Types/ComponentUtils.hs b/src/Stack/Types/ComponentUtils.hs
new file mode 100644
index 0000000000..1e89388f7a
--- /dev/null
+++ b/src/Stack/Types/ComponentUtils.hs
@@ -0,0 +1,67 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+
+{-|
+Module      : Stack.Types.ComponentUtils
+License     : BSD-3-Clause
+
+A module providing a type representing the name of an \'unqualified\' component
+and related helper functions.
+-}
+
+module Stack.Types.ComponentUtils
+  ( StackUnqualCompName (..)
+  , unqualCompToText
+  , unqualCompFromText
+  , unqualCompToString
+  , unqualCompFromString
+  , emptyCompName
+  , fromCabalName
+  , toCabalName
+  ) where
+
+import           Data.Aeson ( FromJSON (..) )
+import           Data.Hashable ( Hashable (..) )
+import           Distribution.Compat.Binary ( decode, encode )
+import           Distribution.PackageDescription
+                   ( UnqualComponentName, mkUnqualComponentName
+                   , unUnqualComponentName, unUnqualComponentNameST
+                   )
+import           Stack.Prelude
+
+-- | Type representing the name of an \'unqualified\' component (that is, the
+-- component can be any sort - a (unnamed) main library or sub-library,
+-- an executable, etc. ).
+--
+-- The corresponding The Cabal-syntax type is
+-- 'Distribution.Types.UnqualComponentName.UnqualComponentName'.
+
+-- Ideally, we would use the Cabal-syntax type and not 'Text', to avoid
+-- unnecessary work, but there is no 'Hashable' instance for
+-- 'Distribution.Types.UnqualComponentName.UnqualComponentName' yet.
+newtype StackUnqualCompName = StackUnqualCompName UnqualComponentName
+  deriving (Data, Eq, Generic, IsString, NFData, Ord, Read, Show)
+
+instance Hashable StackUnqualCompName where
+  hashWithSalt a v = hashWithSalt a (show v)
+
+fromCabalName :: UnqualComponentName -> StackUnqualCompName
+fromCabalName = StackUnqualCompName
+
+toCabalName :: StackUnqualCompName -> UnqualComponentName
+toCabalName (StackUnqualCompName unqualName) = unqualName
+
+unqualCompToString :: StackUnqualCompName -> String
+unqualCompToString = unUnqualComponentName . toCabalName
+unqualCompFromString :: String -> StackUnqualCompName
+unqualCompFromString = StackUnqualCompName . mkUnqualComponentName
+unqualCompToText :: StackUnqualCompName -> Text
+unqualCompToText = (decode . encode) . unUnqualComponentNameST . toCabalName
+unqualCompFromText :: Text -> StackUnqualCompName
+unqualCompFromText = StackUnqualCompName . decode . encode
+
+emptyCompName :: StackUnqualCompName
+emptyCompName = StackUnqualCompName $ mkUnqualComponentName ""
+
+instance FromJSON StackUnqualCompName where
+  parseJSON = fmap (StackUnqualCompName . decode . encode) <$> parseJSON @Text
diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs
index b46e7f66de..0beb310792 100644
--- a/src/Stack/Types/Config.hs
+++ b/src/Stack/Types/Config.hs
@@ -1,1333 +1,256 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE DataKinds             #-}
-{-# LANGUAGE DefaultSignatures     #-}
-{-# LANGUAGE DeriveDataTypeable    #-}
-{-# LANGUAGE DeriveGeneric         #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE GADTs                 #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE MultiWayIf            #-}
-{-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE QuasiQuotes           #-}
-{-# LANGUAGE RecordWildCards       #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-{-# LANGUAGE TypeFamilies          #-}
-{-# LANGUAGE ViewPatterns          #-}
-
--- | The Config type.
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE DefaultSignatures   #-}
+{-# LANGUAGE MultiWayIf          #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE QuasiQuotes         #-}
+{-# LANGUAGE TypeFamilies        #-}
+{-# LANGUAGE ViewPatterns        #-}
+
+{-|
+Module      : Stack.Types.Config
+License     : BSD-3-Clause
+-}
 
 module Stack.Types.Config
   (
-  -- * Main configuration types and classes
-  -- ** HasPlatform & HasStackRoot
-   HasPlatform(..)
-  ,PlatformVariant(..)
-  -- ** Runner
-  ,HasRunner(..)
-  ,Runner(..)
-  ,ColorWhen(..)
-  ,terminalL
-  ,reExecL
-  -- ** Config & HasConfig
-  ,Config(..)
-  ,HasConfig(..)
-  ,askLatestSnapshotUrl
-  ,configProjectRoot
-  -- ** BuildConfig & HasBuildConfig
-  ,BuildConfig(..)
-  ,ProjectPackage(..)
-  ,DepPackage(..)
-  ,ppRoot
-  ,ppVersion
-  ,ppComponents
-  ,ppGPD
-  ,stackYamlL
-  ,projectRootL
-  ,HasBuildConfig(..)
-  -- ** Storage databases
-  ,UserStorage(..)
-  ,ProjectStorage(..)
-  -- ** GHCVariant & HasGHCVariant
-  ,GHCVariant(..)
-  ,ghcVariantName
-  ,ghcVariantSuffix
-  ,parseGHCVariant
-  ,HasGHCVariant(..)
-  ,snapshotsDir
-  -- ** EnvConfig & HasEnvConfig
-  ,EnvConfig(..)
-  ,HasSourceMap(..)
-  ,HasEnvConfig(..)
-  ,getCompilerPath
-  -- * Details
-  -- ** ApplyGhcOptions
-  ,ApplyGhcOptions(..)
-  -- ** CabalConfigKey
-  ,CabalConfigKey(..)
-  -- ** ConfigException
-  ,HpackExecutable(..)
-  ,ConfigException(..)
-  -- ** ConfigMonoid
-  ,ConfigMonoid(..)
-  ,configMonoidInstallGHCName
-  ,configMonoidSystemGHCName
-  ,parseConfigMonoid
-  -- ** DumpLogs
-  ,DumpLogs(..)
-  -- ** EnvSettings
-  ,EnvSettings(..)
-  ,minimalEnvSettings
-  ,defaultEnvSettings
-  ,plainEnvSettings
-  -- ** GlobalOpts & GlobalOptsMonoid
-  ,GlobalOpts(..)
-  ,GlobalOptsMonoid(..)
-  ,rslInLogL
-  ,StackYamlLoc(..)
-  ,stackYamlLocL
-  ,LockFileBehavior(..)
-  ,readLockFileBehavior
-  ,lockFileBehaviorL
-  ,defaultLogLevel
-  -- ** Project & ProjectAndConfigMonoid
-  ,Project(..)
-  ,ProjectConfig(..)
-  ,Curator(..)
-  ,ProjectAndConfigMonoid(..)
-  ,parseProjectAndConfigMonoid
-  -- ** PvpBounds
-  ,PvpBounds(..)
-  ,PvpBoundsType(..)
-  ,parsePvpBounds
-  -- ** ColorWhen
-  ,readColorWhen
-  -- ** Styles
-  ,readStyles
-  -- ** SCM
-  ,SCM(..)
-  -- * Paths
-  ,bindirSuffix
-  ,GlobalInfoSource(..)
-  ,getProjectWorkDir
-  ,docDirSuffix
-  ,extraBinDirs
-  ,hpcReportDir
-  ,installationRootDeps
-  ,installationRootLocal
-  ,bindirCompilerTools
-  ,hoogleRoot
-  ,hoogleDatabasePath
-  ,packageDatabaseDeps
-  ,packageDatabaseExtra
-  ,packageDatabaseLocal
-  ,platformOnlyRelDir
-  ,platformGhcRelDir
-  ,platformGhcVerOnlyRelDir
-  ,useShaPathOnWindows
-  ,shaPath
-  ,shaPathForBytes
-  ,workDirL
-  ,ghcInstallHook
-  -- * Command-related types
-  ,AddCommand
-  -- ** Eval
-  ,EvalOpts(..)
-  -- ** Exec
-  ,ExecOpts(..)
-  ,SpecialExecCmd(..)
-  ,ExecOptsExtra(..)
-  -- ** Setup
-  ,DownloadInfo(..)
-  ,VersionedDownloadInfo(..)
-  ,GHCDownloadInfo(..)
-  ,SetupInfo(..)
-  -- ** Docker entrypoint
-  ,DockerEntrypoint(..)
-  ,DockerUser(..)
-  ,module X
+    Config (..)
+  , HasConfig (..)
+  , askLatestSnapshotUrl
+  , askRecentSnapshotsUrl
+  , configProjectRoot
+  , ghcInstallHook
   -- * Lens helpers
-  ,wantedCompilerVersionL
-  ,actualCompilerVersionL
-  ,HasCompiler(..)
-  ,DumpPackage(..)
-  ,CompilerPaths(..)
-  ,GhcPkgExe(..)
-  ,getGhcPkgExe
-  ,cpWhich
-  ,ExtraDirs(..)
-  ,buildOptsL
-  ,globalOptsL
-  ,buildOptsInstallExesL
-  ,buildOptsMonoidHaddockL
-  ,buildOptsMonoidTestsL
-  ,buildOptsMonoidBenchmarksL
-  ,buildOptsMonoidInstallExesL
-  ,buildOptsHaddockL
-  ,globalOptsBuildOptsMonoidL
-  ,stackRootL
-  ,cabalVersionL
-  ,whichCompilerL
-  ,envOverrideSettingsL
-  ,shouldForceGhcColorFlag
-  ,appropriateGhcColorFlag
+  , buildOptsL
+  , envOverrideSettingsL
+  , globalOptsL
+  , userGlobalConfigFileL
+  , stackRootL
+  , workDirL
   -- * Helper logging functions
-  ,prettyStackDevL
-  -- * Lens reexport
-  ,view
-  ,to
+  , prettyStackDevL
   ) where
 
-import           Control.Monad.Writer (Writer, tell)
-import           Control.Monad.Trans.Except (ExceptT)
-import           Crypto.Hash (hashWith, SHA1(..))
+import           Casa.Client ( CasaRepoPrefix )
+import           Distribution.System ( Platform )
+import           Path ( (</>), parent, reldir, relfile )
+import           RIO.Process ( HasProcessContext (..), ProcessContext )
 import           Stack.Prelude
-import           Pantry.Internal.AesonExtended
-                 (ToJSON, toJSON, FromJSON, FromJSONKey (..), parseJSON, withText, object,
-                  (.=), (..:), (...:), (..:?), (..!=), Value(Bool),
-                  withObjectWarnings, WarningParser, Object, jsonSubWarnings,
-                  jsonSubWarningsT, jsonSubWarningsTT, WithJSONWarnings(..),
-                  FromJSONKeyFunction (FromJSONKeyTextParser))
-import           Data.Attoparsec.Args (parseArgs, EscapingMode (Escaping))
-import qualified Data.ByteArray.Encoding as Mem (convertToBase, Base(Base16))
-import qualified Data.ByteString.Char8 as S8
-import           Data.Coerce (coerce)
-import           Data.List (stripPrefix)
-import qualified Data.List.NonEmpty as NonEmpty
-import qualified Data.Map as Map
-import qualified Data.Map.Strict as M
-import qualified Data.Monoid as Monoid
-import           Data.Monoid.Map (MonoidMap(..))
-import qualified Data.Set as Set
-import qualified Data.Text as T
-import           Data.Yaml (ParseException)
-import qualified Data.Yaml as Yaml
-import qualified Distribution.License as C
-import           Distribution.ModuleName (ModuleName)
-import           Distribution.PackageDescription (GenericPackageDescription)
-import qualified Distribution.PackageDescription as C
-import           Distribution.System (Platform, Arch)
-import qualified Distribution.Text
-import           Distribution.Version (anyVersion, mkVersion', mkVersion)
-import           Generics.Deriving.Monoid (memptydefault, mappenddefault)
-import           Lens.Micro
-import           Options.Applicative (ReadM)
-import qualified Options.Applicative as OA
-import qualified Options.Applicative.Types as OA
-import           Pantry.Internal (Storage)
-import           Path
-import qualified Paths_stack as Meta
-import qualified RIO.List as List
-import           RIO.PrettyPrint (HasTerm (..), StyleDoc, prettyWarnL, prettyDebugL)
-import           RIO.PrettyPrint.StylesUpdate (StylesUpdate,
-                     parseStylesUpdateFromString, HasStylesUpdate (..))
-import           Stack.Constants
+import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
+import           Stack.Types.ApplyProgOptions ( ApplyProgOptions (..) )
+import           Stack.Types.BuildOpts ( BuildOpts )
+import           Stack.Types.CabalConfigKey ( CabalConfigKey )
 import           Stack.Types.Compiler
-import           Stack.Types.CompilerBuild
-import           Stack.Types.Docker
-import           Stack.Types.GhcPkgId
-import           Stack.Types.NamedComponent
-import           Stack.Types.Nix
-import           Stack.Types.Resolver
-import           Stack.Types.SourceMap
-import           Stack.Types.TemplateName
-import           Stack.Types.Version
-import qualified System.FilePath as FilePath
-import           System.PosixCompat.Types (UserID, GroupID, FileMode)
-import           RIO.Process (ProcessContext, HasProcessContext (..))
-import           Casa.Client (CasaRepoPrefix)
-
--- Re-exports
-import           Stack.Types.Config.Build as X
-
--- | The base environment that almost everything in Stack runs in,
--- based off of parsing command line options in 'GlobalOpts'. Provides
--- logging and process execution.
-data Runner = Runner
-  { runnerGlobalOpts :: !GlobalOpts
-  , runnerUseColor   :: !Bool
-  , runnerLogFunc    :: !LogFunc
-  , runnerTermWidth  :: !Int
-  , runnerProcessContext :: !ProcessContext
-  }
-
-data ColorWhen = ColorNever | ColorAlways | ColorAuto
-    deriving (Eq, Show, Generic)
-
-instance FromJSON ColorWhen where
-    parseJSON v = do
-        s <- parseJSON v
-        case s of
-            "never"  -> pure ColorNever
-            "always" -> pure ColorAlways
-            "auto"   -> pure ColorAuto
-            _ -> fail ("Unknown color use: " <> s <> ". Expected values of " <>
-                       "option are 'never', 'always', or 'auto'.")
+                   ( CompilerBindistPath, CompilerRepository, CompilerTarget )
+import           Stack.Types.CompilerBuild ( CompilerBuild )
+import           Stack.Types.Docker ( DockerOpts )
+import           Stack.Types.DumpLogs ( DumpLogs )
+import           Stack.Types.EnvSettings ( EnvSettings )
+import           Stack.Types.GHCVariant ( GHCVariant (..), HasGHCVariant (..) )
+import           Stack.Types.MsysEnvironment ( MsysEnvironment )
+import           Stack.Types.Nix ( NixOpts )
+import           Stack.Types.Platform ( HasPlatform (..), PlatformVariant )
+import           Stack.Types.Project ( Project (..) )
+import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
+import           Stack.Types.PvpBounds ( PvpBounds )
+import           Stack.Types.Runner ( HasRunner (..), Runner, globalOptsL )
+import           Stack.Types.SCM ( SCM )
+import           Stack.Types.SetupInfo ( SetupInfo )
+import           Stack.Types.Snapshot ( AbstractSnapshot )
+import           Stack.Types.Storage ( UserStorage )
+import           Stack.Types.TemplateName ( TemplateName )
+import           Stack.Types.Version ( VersionCheck (..), VersionRange )
 
 -- | The top-level Stackage configuration.
-data Config =
-  Config {configWorkDir             :: !(Path Rel Dir)
-         -- ^ this allows to override .stack-work directory
-         ,configUserConfigPath      :: !(Path Abs File)
-         -- ^ Path to user configuration file (usually ~/.stack/config.yaml)
-         ,configBuild               :: !BuildOpts
-         -- ^ Build configuration
-         ,configDocker              :: !DockerOpts
-         -- ^ Docker configuration
-         ,configNix                 :: !NixOpts
-         -- ^ Execution environment (e.g nix-shell) configuration
-         ,configProcessContextSettings :: !(EnvSettings -> IO ProcessContext)
-         -- ^ Environment variables to be passed to external tools
-         ,configLocalProgramsBase   :: !(Path Abs Dir)
-         -- ^ Non-platform-specific path containing local installations
-         ,configLocalPrograms       :: !(Path Abs Dir)
-         -- ^ Path containing local installations (mainly GHC)
-         ,configHideTHLoading       :: !Bool
-         -- ^ Hide the Template Haskell "Loading package ..." messages from the
-         -- console
-         ,configPrefixTimestamps    :: !Bool
-         -- ^ Prefix build output with timestamps for each line.
-         ,configPlatform            :: !Platform
-         -- ^ The platform we're building for, used in many directory names
-         ,configPlatformVariant     :: !PlatformVariant
-         -- ^ Variant of the platform, also used in directory names
-         ,configGHCVariant          :: !(Maybe GHCVariant)
-         -- ^ The variant of GHC requested by the user.
-         ,configGHCBuild            :: !(Maybe CompilerBuild)
-         -- ^ Override build of the compiler distribution (e.g. standard, gmp4, tinfo6)
-         ,configLatestSnapshot      :: !Text
-         -- ^ URL of a JSON file providing the latest LTS and Nightly snapshots.
-         ,configSystemGHC           :: !Bool
-         -- ^ Should we use the system-installed GHC (on the PATH) if
-         -- available? Can be overridden by command line options.
-         ,configInstallGHC          :: !Bool
-         -- ^ Should we automatically install GHC if missing or the wrong
-         -- version is available? Can be overridden by command line options.
-         ,configSkipGHCCheck        :: !Bool
-         -- ^ Don't bother checking the GHC version or architecture.
-         ,configSkipMsys            :: !Bool
-         -- ^ On Windows: don't use a sandboxed MSYS
-         ,configCompilerCheck       :: !VersionCheck
-         -- ^ Specifies which versions of the compiler are acceptable.
-         ,configCompilerRepository  :: !CompilerRepository
-         -- ^ Specifies the repository containing the compiler sources
-         ,configLocalBin            :: !(Path Abs Dir)
-         -- ^ Directory we should install executables into
-         ,configRequireStackVersion :: !VersionRange
-         -- ^ Require a version of Stack within this range.
-         ,configJobs                :: !Int
-         -- ^ How many concurrent jobs to run, defaults to number of capabilities
-         ,configOverrideGccPath     :: !(Maybe (Path Abs File))
-         -- ^ Optional gcc override path
-         ,configExtraIncludeDirs    :: ![FilePath]
-         -- ^ --extra-include-dirs arguments
-         ,configExtraLibDirs        :: ![FilePath]
-         -- ^ --extra-lib-dirs arguments
-         ,configCustomPreprocessorExts :: ![Text]
-         -- ^ List of custom preprocessors to complete the hard coded ones
-         ,configConcurrentTests     :: !Bool
-         -- ^ Run test suites concurrently
-         ,configTemplateParams      :: !(Map Text Text)
-         -- ^ Parameters for templates.
-         ,configScmInit             :: !(Maybe SCM)
-         -- ^ Initialize SCM (e.g. git) when creating new projects.
-         ,configGhcOptionsByName    :: !(Map PackageName [Text])
-         -- ^ Additional GHC options to apply to specific packages.
-         ,configGhcOptionsByCat     :: !(Map ApplyGhcOptions [Text])
-         -- ^ Additional GHC options to apply to categories of packages
-         ,configCabalConfigOpts     :: !(Map CabalConfigKey [Text])
-         -- ^ Additional options to be passed to ./Setup.hs configure
-         ,configSetupInfoLocations  :: ![String]
-         -- ^ URLs or paths to stack-setup.yaml files, for finding tools.
-         -- If none present, the default setup-info is used.
-         ,configSetupInfoInline     :: !SetupInfo
-         -- ^ Additional SetupInfo to use to find tools.
-         ,configPvpBounds           :: !PvpBounds
-         -- ^ How PVP upper bounds should be added to packages
-         ,configModifyCodePage      :: !Bool
-         -- ^ Force the code page to UTF-8 on Windows
-         ,configRebuildGhcOptions   :: !Bool
-         -- ^ Rebuild on GHC options changes
-         ,configApplyGhcOptions     :: !ApplyGhcOptions
-         -- ^ Which packages to ghc-options on the command line apply to?
-         ,configAllowNewer          :: !Bool
-         -- ^ Ignore version ranges in .cabal files. Funny naming chosen to
-         -- match cabal.
-         ,configDefaultTemplate     :: !(Maybe TemplateName)
-         -- ^ The default template to use when none is specified.
-         -- (If Nothing, the 'default' default template is used.)
-         ,configAllowDifferentUser  :: !Bool
-         -- ^ Allow users other than the Stack root owner to use the Stack
-         -- installation.
-         ,configDumpLogs            :: !DumpLogs
-         -- ^ Dump logs of local non-dependencies when doing a build.
-         ,configProject             :: !(ProjectConfig (Project, Path Abs File))
-         -- ^ Project information and stack.yaml file location
-         ,configAllowLocals         :: !Bool
-         -- ^ Are we allowed to build local packages? The script
-         -- command disallows this.
-         ,configSaveHackageCreds    :: !Bool
-         -- ^ Should we save Hackage credentials to a file?
-         ,configHackageBaseUrl      :: !Text
-         -- ^ Hackage base URL used when uploading packages
-         ,configRunner              :: !Runner
-         ,configPantryConfig        :: !PantryConfig
-         ,configStackRoot           :: !(Path Abs Dir)
-         ,configResolver            :: !(Maybe AbstractResolver)
-         -- ^ Any resolver override from the command line
-         ,configUserStorage         :: !UserStorage
-         -- ^ Database connection pool for user Stack database
-         ,configHideSourcePaths     :: !Bool
-         -- ^ Enable GHC hiding source paths?
-         ,configRecommendUpgrade    :: !Bool
-         -- ^ Recommend a Stack upgrade?
-         ,configNoRunCompile   :: !Bool
-         -- ^ Use --no-run and --compile options when using `stack script`
-         ,configStackDeveloperMode  :: !Bool
-         -- ^ Turn on Stack developer mode for additional messages?
-         }
-
--- | A bit of type safety to ensure we're talking to the right database.
-newtype UserStorage = UserStorage
-  { unUserStorage :: Storage
-  }
-
--- | A bit of type safety to ensure we're talking to the right database.
-newtype ProjectStorage = ProjectStorage
-  { unProjectStorage :: Storage
+data Config = Config
+  { workDir                 :: !(Path Rel Dir)
+    -- ^ this allows to override .stack-work directory
+  , userGlobalConfigFile    :: !(Path Abs File)
+    -- ^ The user-specific global configuration file.
+  , build                   :: !BuildOpts
+    -- ^ Build configuration
+  , docker                  :: !DockerOpts
+    -- ^ Docker configuration
+  , nix                     :: !NixOpts
+    -- ^ Execution environment (e.g nix-shell) configuration
+  , processContextSettings  :: !(EnvSettings -> IO ProcessContext)
+    -- ^ Environment variables to be passed to external tools
+  , localProgramsBase       :: !(Path Abs Dir)
+    -- ^ Non-platform-specific path containing local installations
+  , localPrograms           :: !(Path Abs Dir)
+    -- ^ Path containing local installations (mainly GHC)
+  , hideTHLoading           :: !Bool
+    -- ^ Hide the Template Haskell "Loading package ..." messages from the
+    -- console
+  , prefixTimestamps        :: !Bool
+    -- ^ Prefix build output with timestamps for each line.
+  , platform                :: !Platform
+    -- ^ The platform we're building for, used in many directory names
+  , platformVariant         :: !PlatformVariant
+    -- ^ Variant of the platform, also used in directory names
+  , ghcVariant              :: !(Maybe GHCVariant)
+    -- ^ The variant of GHC requested by the user.
+  , ghcBuild                :: !(Maybe CompilerBuild)
+    -- ^ Override build of the compiler distribution (e.g. standard, gmp4,
+    -- tinfo6)
+  , latestSnapshot          :: !Text
+    -- ^ URL of a JSON file providing the latest LTS and Nightly snapshots.
+  , recentSnapshots         :: !Text
+    -- ^ URL of a JSON file providing recently-published snapshots.
+  , systemGHC               :: !Bool
+    -- ^ Should we use the system-installed GHC (on the PATH) if
+    -- available? Can be overridden by command line options.
+  , installGHC              :: !Bool
+    -- ^ Should we automatically install GHC if missing or the wrong
+    -- version is available? Can be overridden by command line options.
+  , installMsys              :: !Bool
+    -- ^ On Windows, should we automatically install MSYS2 if missing? Can be
+    -- overridden by command line options.
+  , skipGHCCheck            :: !Bool
+    -- ^ Don't bother checking the GHC version or architecture.
+  , skipMsys                :: !Bool
+    -- ^ On Windows: don't use a sandboxed MSYS
+  , msysEnvironment         :: !(Maybe MsysEnvironment)
+    -- ^ On Windows: what MSYS2 environment to apply. Nothing on other operating
+    -- systems.
+  , compilerCheck           :: !VersionCheck
+    -- ^ Specifies which versions of the compiler are acceptable.
+  , compilerRepository      :: !CompilerRepository
+    -- ^ Specifies the repository containing the compiler sources
+  , compilerTarget          :: !CompilerTarget
+    -- ^ Specifies the Hadrian build target
+  , compilerBindistPath     :: !CompilerBindistPath
+    -- ^ Specifies the Hadrian path to built binary distribution
+  , localBin                :: !(Path Abs Dir)
+    -- ^ Directory we should install executables into
+  , fileWatchHook           :: !(Maybe (Path Abs File))
+    -- ^ Optional path of executable used to override --file-watch
+    -- post-processing.
+  , requireStackVersion     :: !VersionRange
+    -- ^ Require a version of Stack within this range.
+  , jobs                    :: !Int
+    -- ^ How many concurrent jobs to run, defaults to number of capabilities
+  , overrideGccPath         :: !(Maybe (Path Abs File))
+    -- ^ Optional gcc override path
+  , extraIncludeDirs        :: ![FilePath]
+    -- ^ --extra-include-dirs arguments
+  , extraLibDirs            :: ![FilePath]
+    -- ^ --extra-lib-dirs arguments
+  , customPreprocessorExts  :: ![Text]
+    -- ^ List of custom preprocessors to complete the hard coded ones
+  , concurrentTests         :: !Bool
+    -- ^ Run test suites concurrently
+  , templateParams          :: !(Map Text Text)
+    -- ^ Parameters for templates.
+  , scmInit                 :: !(Maybe SCM)
+    -- ^ Initialize SCM (e.g. git) when creating new projects.
+  , ghcOptionsByName        :: !(Map PackageName [Text])
+    -- ^ Additional GHC options to apply to specific packages.
+  , ghcOptionsByCat         :: !(Map ApplyGhcOptions [Text])
+    -- ^ Additional GHC options to apply to categories of packages
+  , cabalConfigOpts         :: !(Map CabalConfigKey [Text])
+    -- ^ Additional options to be passed to ./Setup.hs configure
+  , setupInfoLocations      :: ![String]
+    -- ^ URLs or paths to stack-setup.yaml files, for finding tools.
+    -- If none present, the default setup-info is used.
+  , setupInfoInline         :: !SetupInfo
+    -- ^ Additional SetupInfo to use to find tools.
+  , pvpBounds               :: !PvpBounds
+    -- ^ How PVP upper bounds should be added to packages
+  , modifyCodePage          :: !Bool
+    -- ^ Force the code page to UTF-8 on Windows
+  , rebuildGhcOptions       :: !Bool
+    -- ^ Rebuild on GHC options changes
+  , applyGhcOptions         :: !ApplyGhcOptions
+    -- ^ Which packages do --ghc-options on the command line apply to?
+  , applyProgOptions        :: !ApplyProgOptions
+    -- ^ Which packages do all and any --PROG-option options on the command line
+    -- apply to?
+  , allowNewer              :: !(First Bool)
+    -- ^ Ignore version ranges in .cabal files. Funny naming chosen to
+    -- match cabal.
+  , allowNewerDeps          :: !(Maybe [PackageName])
+    -- ^ Ignore dependency upper and lower bounds only for specified
+    -- packages. No effect unless allow-newer is enabled.
+  , defaultInitSnapshot     :: !(First AbstractSnapshot)
+    -- ^ An optional default snapshot to use with @stack init@ when none is
+    -- specified at the command line.
+  , defaultTemplate         :: !(Maybe TemplateName)
+    -- ^ The default template to use when none is specified.
+    -- (If Nothing, the 'default' default template is used.)
+  , allowDifferentUser      :: !Bool
+    -- ^ Allow users other than the Stack root owner to use the Stack
+    -- installation.
+  , dumpLogs                :: !DumpLogs
+    -- ^ Dump logs of local non-dependencies when doing a build.
+  , project                 :: !(ProjectConfig (Project, Path Abs File))
+    -- ^ Project information and stack.yaml file location
+  , allowLocals             :: !Bool
+    -- ^ Are we allowed to build local packages? The script
+    -- command disallows this.
+  , saveHackageCreds        :: !FirstTrue
+    -- ^ Should we save Hackage credentials to a file?
+  , hackageBaseUrl          :: !Text
+    -- ^ Hackage base URL used when uploading packages
+  , runner                  :: !Runner
+  , pantryConfig            :: !PantryConfig
+  , stackRoot               :: !(Path Abs Dir)
+  , snapshot                :: !(Maybe AbstractSnapshot)
+    -- ^ Any snapshot override from the command line
+  , userStorage             :: !UserStorage
+    -- ^ Database connection pool for user Stack database
+  , hideSourcePaths         :: !Bool
+    -- ^ Enable GHC hiding source paths?
+  , recommendStackUpgrade   :: !Bool
+    -- ^ Recommend a Stack upgrade?
+  , notifyIfNixOnPath       :: !Bool
+    -- ^ Notify if the Nix package manager (nix) is on the PATH, but
+    -- Stack's Nix integration is not enabled?
+  , notifyIfGhcUntested     :: !Bool
+    -- ^ Notify if Stack has not been tested with the GHC version?
+  , notifyIfCabalUntested   :: !Bool
+    -- ^ Notify if Stack has not been tested with the Cabal version?
+  , notifyIfArchUnknown     :: !Bool
+    -- ^ Notify if the specified machine architecture is unknown to Cabal (the
+    -- library)?
+  , notifyIfNoRunTests      :: !Bool
+    -- ^ Notify if the --no-run-tests flag has prevented the running of a
+    -- targeted test suite?
+  , notifyIfNoRunBenchmarks :: !Bool
+    -- ^ Notify if the --no-run-benchmarks flag has prevented the running of a
+    -- targeted benchmark?
+  , notifyIfBaseNotBoot     :: !Bool
+    -- ^ Notify if the specified base package is other than the GHC boot
+    -- package?
+  , noRunCompile            :: !Bool
+    -- ^ Use --no-run and --compile options when using `stack script`
+  , stackDeveloperMode      :: !Bool
+    -- ^ Turn on Stack developer mode for additional messages?
+  , casa                    :: !(Maybe (CasaRepoPrefix, Int))
+    -- ^ Optional Casa configuration
   }
 
 -- | The project root directory, if in a project.
 configProjectRoot :: Config -> Maybe (Path Abs Dir)
 configProjectRoot c =
-  case configProject c of
+  case c.project of
     PCProject (_, fp) -> Just $ parent fp
     PCGlobalProject -> Nothing
     PCNoProject _deps -> Nothing
 
--- | Which packages do configure opts apply to?
-data CabalConfigKey
-  = CCKTargets -- ^ See AGOTargets
-  | CCKLocals -- ^ See AGOLocals
-  | CCKEverything -- ^ See AGOEverything
-  | CCKPackage !PackageName -- ^ A specific package
-  deriving (Show, Read, Eq, Ord)
-instance FromJSON CabalConfigKey where
-  parseJSON = withText "CabalConfigKey" parseCabalConfigKey
-instance FromJSONKey CabalConfigKey where
-  fromJSONKey = FromJSONKeyTextParser parseCabalConfigKey
-
-parseCabalConfigKey :: (Monad m, MonadFail m) => Text -> m CabalConfigKey
-parseCabalConfigKey "$targets" = pure CCKTargets
-parseCabalConfigKey "$locals" = pure CCKLocals
-parseCabalConfigKey "$everything" = pure CCKEverything
-parseCabalConfigKey name =
-  case parsePackageName $ T.unpack name of
-    Nothing -> fail $ "Invalid CabalConfigKey: " ++ show name
-    Just x -> pure $ CCKPackage x
-
--- | Which packages do ghc-options on the command line apply to?
-data ApplyGhcOptions = AGOTargets -- ^ all local targets
-                     | AGOLocals -- ^ all local packages, even non-targets
-                     | AGOEverything -- ^ every package
-  deriving (Show, Read, Eq, Ord, Enum, Bounded)
-
-instance FromJSON ApplyGhcOptions where
-    parseJSON = withText "ApplyGhcOptions" $ \t ->
-        case t of
-            "targets" -> pure AGOTargets
-            "locals" -> pure AGOLocals
-            "everything" -> pure AGOEverything
-            _ -> fail $ "Invalid ApplyGhcOptions: " ++ show t
-
--- | Which build log files to dump
-data DumpLogs
-  = DumpNoLogs -- ^ don't dump any logfiles
-  | DumpWarningLogs -- ^ dump logfiles containing warnings
-  | DumpAllLogs -- ^ dump all logfiles
-  deriving (Show, Read, Eq, Ord, Enum, Bounded)
-
-instance FromJSON DumpLogs where
-  parseJSON (Bool True) = pure DumpAllLogs
-  parseJSON (Bool False) = pure DumpNoLogs
-  parseJSON v =
-    withText
-      "DumpLogs"
-      (\t ->
-          if | t == "none" -> pure DumpNoLogs
-             | t == "warning" -> pure DumpWarningLogs
-             | t == "all" -> pure DumpAllLogs
-             | otherwise -> fail ("Invalid DumpLogs: " ++ show t))
-      v
-
--- | Controls which version of the environment is used
-data EnvSettings = EnvSettings
-    { esIncludeLocals :: !Bool
-    -- ^ include local project bin directory, GHC_PACKAGE_PATH, etc
-    , esIncludeGhcPackagePath :: !Bool
-    -- ^ include the GHC_PACKAGE_PATH variable
-    , esStackExe :: !Bool
-    -- ^ set the STACK_EXE variable to the current executable name
-    , esLocaleUtf8 :: !Bool
-    -- ^ set the locale to C.UTF-8
-    , esKeepGhcRts :: !Bool
-    -- ^ if True, keep GHCRTS variable in environment
-    }
-    deriving (Show, Eq, Ord)
-
-type AddCommand =
-  ExceptT (RIO Runner ())
-          (Writer (OA.Mod OA.CommandFields (RIO Runner (), GlobalOptsMonoid)))
-          ()
-
-data ExecOpts = ExecOpts
-    { eoCmd :: !SpecialExecCmd
-    , eoArgs :: ![String]
-    , eoExtra :: !ExecOptsExtra
-    } deriving (Show)
-
-data SpecialExecCmd
-    = ExecCmd String
-    | ExecRun
-    | ExecGhc
-    | ExecRunGhc
-    deriving (Show, Eq)
-
-data ExecOptsExtra = ExecOptsExtra
-  { eoEnvSettings :: !EnvSettings
-  , eoPackages :: ![String]
-  , eoRtsOptions :: ![String]
-  , eoCwd :: !(Maybe FilePath)
-  }
-  deriving (Show)
-
-data EvalOpts = EvalOpts
-    { evalArg :: !String
-    , evalExtra :: !ExecOptsExtra
-    } deriving (Show)
-
--- | Parsed global command-line options.
-data GlobalOpts = GlobalOpts
-    { globalReExecVersion :: !(Maybe String) -- ^ Expected re-exec in container version
-    , globalDockerEntrypoint :: !(Maybe DockerEntrypoint)
-      -- ^ Data used when Stack is acting as a Docker entrypoint (internal use only)
-    , globalLogLevel     :: !LogLevel -- ^ Log level
-    , globalTimeInLog    :: !Bool -- ^ Whether to include timings in logs.
-    , globalRSLInLog     :: !Bool -- ^ Whether to include raw snapshot layer (RSL) in logs.
-    , globalConfigMonoid :: !ConfigMonoid -- ^ Config monoid, for passing into 'loadConfig'
-    , globalResolver     :: !(Maybe AbstractResolver) -- ^ Resolver override
-    , globalCompiler     :: !(Maybe WantedCompiler) -- ^ Compiler override
-    , globalTerminal     :: !Bool -- ^ We're in a terminal?
-    , globalStylesUpdate :: !StylesUpdate -- ^ SGR (Ansi) codes for styles
-    , globalTermWidth    :: !(Maybe Int) -- ^ Terminal width override
-    , globalStackYaml    :: !StackYamlLoc -- ^ Override project stack.yaml
-    , globalLockFileBehavior :: !LockFileBehavior
-    } deriving (Show)
-
-rslInLogL :: HasRunner env => SimpleGetter env Bool
-rslInLogL = globalOptsL.to globalRSLInLog
-
--- | Location for the project's stack.yaml file.
-data StackYamlLoc
-    = SYLDefault
-    -- ^ Use the standard parent-directory-checking logic
-    | SYLOverride !(Path Abs File)
-    -- ^ Use a specific stack.yaml file provided
-    | SYLNoProject ![PackageIdentifierRevision]
-    -- ^ Do not load up a project, just user configuration. Include
-    -- the given extra dependencies with the resolver.
-    | SYLGlobalProject
-    -- ^ Do not look for a project configuration, and use the implicit global.
-    deriving Show
-
-stackYamlLocL :: HasRunner env => Lens' env StackYamlLoc
-stackYamlLocL = globalOptsL.lens globalStackYaml (\x y -> x { globalStackYaml = y })
-
--- | How to interact with lock files
-data LockFileBehavior
-  = LFBReadWrite
-  -- ^ Read and write lock files
-  | LFBReadOnly
-  -- ^ Read lock files, but do not write them
-  | LFBIgnore
-  -- ^ Entirely ignore lock files
-  | LFBErrorOnWrite
-  -- ^ Error out on trying to write a lock file. This can be used to
-  -- ensure that lock files in a repository already ensure
-  -- reproducible builds.
-  deriving (Show, Enum, Bounded)
-
-lockFileBehaviorL :: HasRunner env => SimpleGetter env LockFileBehavior
-lockFileBehaviorL = globalOptsL.to globalLockFileBehavior
-
--- | Parser for 'LockFileBehavior'
-readLockFileBehavior :: ReadM LockFileBehavior
-readLockFileBehavior = do
-  s <- OA.readerAsk
-  case Map.lookup s m of
-    Just x -> pure x
-    Nothing -> OA.readerError $ "Invalid lock file behavior, valid options: " ++
-                                List.intercalate ", " (Map.keys m)
-  where
-    m = Map.fromList $ map (\x -> (render x, x)) [minBound..maxBound]
-    render LFBReadWrite = "read-write"
-    render LFBReadOnly = "read-only"
-    render LFBIgnore = "ignore"
-    render LFBErrorOnWrite = "error-on-write"
-
--- | Project configuration information. Not every run of Stack has a
--- true local project; see constructors below.
-data ProjectConfig a
-    = PCProject a
-    -- ^ Normal run: we want a project, and have one. This comes from
-    -- either 'SYLDefault' or 'SYLOverride'.
-    | PCGlobalProject
-    -- ^ No project was found when using 'SYLDefault'. Instead, use
-    -- the implicit global.
-    | PCNoProject ![PackageIdentifierRevision]
-    -- ^ Use a no project run. This comes from 'SYLNoProject'.
-
--- | Parsed global command-line options monoid.
-data GlobalOptsMonoid = GlobalOptsMonoid
-    { globalMonoidReExecVersion :: !(First String) -- ^ Expected re-exec in container version
-    , globalMonoidDockerEntrypoint :: !(First DockerEntrypoint)
-      -- ^ Data used when Stack is acting as a Docker entrypoint (internal use only)
-    , globalMonoidLogLevel     :: !(First LogLevel) -- ^ Log level
-    , globalMonoidTimeInLog    :: !FirstTrue -- ^ Whether to include timings in logs.
-    , globalMonoidRSLInLog     :: !FirstFalse -- ^ Whether to include raw snapshot layer (RSL) in logs.
-    , globalMonoidConfigMonoid :: !ConfigMonoid -- ^ Config monoid, for passing into 'loadConfig'
-    , globalMonoidResolver     :: !(First (Unresolved AbstractResolver)) -- ^ Resolver override
-    , globalMonoidResolverRoot :: !(First FilePath) -- ^ root directory for resolver relative path
-    , globalMonoidCompiler     :: !(First WantedCompiler) -- ^ Compiler override
-    , globalMonoidTerminal     :: !(First Bool) -- ^ We're in a terminal?
-    , globalMonoidStyles       :: !StylesUpdate -- ^ Stack's output styles
-    , globalMonoidTermWidth    :: !(First Int) -- ^ Terminal width override
-    , globalMonoidStackYaml    :: !(First FilePath) -- ^ Override project stack.yaml
-    , globalMonoidLockFileBehavior :: !(First LockFileBehavior) -- ^ See 'globalLockFileBehavior'
-    } deriving Generic
-
-instance Semigroup GlobalOptsMonoid where
-    (<>) = mappenddefault
-
-instance Monoid GlobalOptsMonoid where
-    mempty = memptydefault
-    mappend = (<>)
-
--- | Default logging level should be something useful but not crazy.
-defaultLogLevel :: LogLevel
-defaultLogLevel = LevelInfo
-
-readColorWhen :: ReadM ColorWhen
-readColorWhen = do
-    s <- OA.readerAsk
-    case s of
-        "never" -> pure ColorNever
-        "always" -> pure ColorAlways
-        "auto" -> pure ColorAuto
-        _ -> OA.readerError "Expected values of color option are 'never', 'always', or 'auto'."
-
-readStyles :: ReadM StylesUpdate
-readStyles = parseStylesUpdateFromString <$> OA.readerAsk
-
--- | A superset of 'Config' adding information on how to build code. The reason
--- for this breakdown is because we will need some of the information from
--- 'Config' in order to determine the values here.
---
--- These are the components which know nothing about local configuration.
-data BuildConfig = BuildConfig
-    { bcConfig     :: !Config
-    , bcSMWanted :: !SMWanted
-    , bcExtraPackageDBs :: ![Path Abs Dir]
-      -- ^ Extra package databases
-    , bcStackYaml  :: !(Path Abs File)
-      -- ^ Location of the stack.yaml file.
-      --
-      -- Note: if the STACK_YAML environment variable is used, this may be
-      -- different from projectRootL </> "stack.yaml" if a different file
-      -- name is used.
-    , bcProjectStorage :: !ProjectStorage
-    -- ^ Database connection pool for project Stack database
-    , bcCurator :: !(Maybe Curator)
-    }
-
-stackYamlL :: HasBuildConfig env => Lens' env (Path Abs File)
-stackYamlL = buildConfigL.lens bcStackYaml (\x y -> x { bcStackYaml = y })
-
--- | Directory containing the project's stack.yaml file
-projectRootL :: HasBuildConfig env => Getting r env (Path Abs Dir)
-projectRootL = stackYamlL.to parent
-
--- | Configuration after the environment has been setup.
-data EnvConfig = EnvConfig
-    {envConfigBuildConfig :: !BuildConfig
-    ,envConfigBuildOptsCLI :: !BuildOptsCLI
-    ,envConfigSourceMap :: !SourceMap
-    ,envConfigSourceMapHash :: !SourceMapHash
-    ,envConfigCompilerPaths :: !CompilerPaths
-    }
-
-ppGPD :: MonadIO m => ProjectPackage -> m GenericPackageDescription
-ppGPD = liftIO . cpGPD . ppCommon
-
--- | Root directory for the given 'ProjectPackage'
-ppRoot :: ProjectPackage -> Path Abs Dir
-ppRoot = parent . ppCabalFP
-
--- | All components available in the given 'ProjectPackage'
-ppComponents :: MonadIO m => ProjectPackage -> m (Set NamedComponent)
-ppComponents pp = do
-  gpd <- ppGPD pp
-  pure $ Set.fromList $ concat
-    [ maybe []  (const [CLib]) (C.condLibrary gpd)
-    , go CExe   (fst <$> C.condExecutables gpd)
-    , go CTest  (fst <$> C.condTestSuites gpd)
-    , go CBench (fst <$> C.condBenchmarks gpd)
-    ]
-  where
-    go :: (T.Text -> NamedComponent)
-       -> [C.UnqualComponentName]
-       -> [NamedComponent]
-    go wrapper = map (wrapper . T.pack . C.unUnqualComponentName)
-
--- | Version for the given 'ProjectPackage
-ppVersion :: MonadIO m => ProjectPackage -> m Version
-ppVersion = fmap gpdVersion . ppGPD
-
--- | A project is a collection of packages. We can have multiple stack.yaml
--- files, but only one of them may contain project information.
-data Project = Project
-    { projectUserMsg :: !(Maybe String)
-    -- ^ A warning message to display to the user when the auto generated
-    -- config may have issues.
-    , projectPackages :: ![RelFilePath]
-    -- ^ Packages which are actually part of the project (as opposed
-    -- to dependencies).
-    , projectDependencies :: ![RawPackageLocation]
-    -- ^ Dependencies defined within the stack.yaml file, to be
-    -- applied on top of the snapshot.
-    , projectFlags :: !(Map PackageName (Map FlagName Bool))
-    -- ^ Flags to be applied on top of the snapshot flags.
-    , projectResolver :: !RawSnapshotLocation
-    -- ^ How we resolve which @Snapshot@ to use
-    , projectCompiler :: !(Maybe WantedCompiler)
-    -- ^ Override the compiler in 'projectResolver'
-    , projectExtraPackageDBs :: ![FilePath]
-    , projectCurator :: !(Maybe Curator)
-    -- ^ Extra configuration intended exclusively for usage by the
-    -- curator tool. In other words, this is /not/ part of the
-    -- documented and exposed Stack API. SUBJECT TO CHANGE.
-    , projectDropPackages :: !(Set PackageName)
-    -- ^ Packages to drop from the 'projectResolver'.
-    }
-  deriving Show
-
-instance ToJSON Project where
-    -- Expanding the constructor fully to ensure we don't miss any fields.
-    toJSON (Project userMsg packages extraDeps flags resolver mcompiler extraPackageDBs mcurator drops) = object $ concat
-      [ maybe [] (\cv -> ["compiler" .= cv]) mcompiler
-      , maybe [] (\msg -> ["user-message" .= msg]) userMsg
-      , if null extraPackageDBs then [] else ["extra-package-dbs" .= extraPackageDBs]
-      , if null extraDeps then [] else ["extra-deps" .= extraDeps]
-      , if Map.null flags then [] else ["flags" .= fmap toCabalStringMap (toCabalStringMap flags)]
-      , ["packages" .= packages]
-      , ["resolver" .= resolver]
-      , maybe [] (\c -> ["curator" .= c]) mcurator
-      , if Set.null drops then [] else ["drop-packages" .= Set.map CabalString drops]
-      ]
-
--- | Extra configuration intended exclusively for usage by the
--- curator tool. In other words, this is /not/ part of the
--- documented and exposed Stack API. SUBJECT TO CHANGE.
-data Curator = Curator
-  { curatorSkipTest :: !(Set PackageName)
-  , curatorExpectTestFailure :: !(Set PackageName)
-  , curatorSkipBenchmark :: !(Set PackageName)
-  , curatorExpectBenchmarkFailure :: !(Set PackageName)
-  , curatorSkipHaddock :: !(Set PackageName)
-  , curatorExpectHaddockFailure :: !(Set PackageName)
-  }
-  deriving Show
-instance ToJSON Curator where
-  toJSON c = object
-    [ "skip-test" .= Set.map CabalString (curatorSkipTest c)
-    , "expect-test-failure" .= Set.map CabalString (curatorExpectTestFailure c)
-    , "skip-bench" .= Set.map CabalString (curatorSkipBenchmark c)
-    , "expect-benchmark-failure" .= Set.map CabalString (curatorExpectTestFailure c)
-    , "skip-haddock" .= Set.map CabalString (curatorSkipHaddock c)
-    , "expect-test-failure" .= Set.map CabalString (curatorExpectHaddockFailure c)
-    ]
-instance FromJSON (WithJSONWarnings Curator) where
-  parseJSON = withObjectWarnings "Curator" $ \o -> Curator
-    <$> fmap (Set.map unCabalString) (o ..:? "skip-test" ..!= mempty)
-    <*> fmap (Set.map unCabalString) (o ..:? "expect-test-failure" ..!= mempty)
-    <*> fmap (Set.map unCabalString) (o ..:? "skip-bench" ..!= mempty)
-    <*> fmap (Set.map unCabalString) (o ..:? "expect-benchmark-failure" ..!= mempty)
-    <*> fmap (Set.map unCabalString) (o ..:? "skip-haddock" ..!= mempty)
-    <*> fmap (Set.map unCabalString) (o ..:? "expect-haddock-failure" ..!= mempty)
-
--- An uninterpreted representation of configuration options.
--- Configurations may be "cascaded" using mappend (left-biased).
-data ConfigMonoid =
-  ConfigMonoid
-    { configMonoidStackRoot          :: !(First (Path Abs Dir))
-    -- ^ See: 'clStackRoot'
-    , configMonoidWorkDir            :: !(First (Path Rel Dir))
-    -- ^ See: 'configWorkDir'.
-    , configMonoidBuildOpts          :: !BuildOptsMonoid
-    -- ^ build options.
-    , configMonoidDockerOpts         :: !DockerOptsMonoid
-    -- ^ Docker options.
-    , configMonoidNixOpts            :: !NixOptsMonoid
-    -- ^ Options for the execution environment (nix-shell or container)
-    , configMonoidConnectionCount    :: !(First Int)
-    -- ^ See: 'configConnectionCount'
-    , configMonoidHideTHLoading      :: !FirstTrue
-    -- ^ See: 'configHideTHLoading'
-    , configMonoidPrefixTimestamps   :: !(First Bool)
-    -- ^ See: 'configPrefixTimestamps'
-    , configMonoidLatestSnapshot     :: !(First Text)
-    -- ^ See: 'configLatestSnapshot'
-    , configMonoidPackageIndices     :: !(First [PackageIndexConfig])
-    -- ^ See: @picIndices@
-    , configMonoidSystemGHC          :: !(First Bool)
-    -- ^ See: 'configSystemGHC'
-    ,configMonoidInstallGHC          :: !FirstTrue
-    -- ^ See: 'configInstallGHC'
-    ,configMonoidSkipGHCCheck        :: !FirstFalse
-    -- ^ See: 'configSkipGHCCheck'
-    ,configMonoidSkipMsys            :: !FirstFalse
-    -- ^ See: 'configSkipMsys'
-    ,configMonoidCompilerCheck       :: !(First VersionCheck)
-    -- ^ See: 'configCompilerCheck'
-    ,configMonoidCompilerRepository  :: !(First CompilerRepository)
-    -- ^ See: 'configCompilerRepository'
-    ,configMonoidRequireStackVersion :: !IntersectingVersionRange
-    -- ^ See: 'configRequireStackVersion'
-    ,configMonoidArch                :: !(First String)
-    -- ^ Used for overriding the platform
-    ,configMonoidGHCVariant          :: !(First GHCVariant)
-    -- ^ Used for overriding the platform
-    ,configMonoidGHCBuild            :: !(First CompilerBuild)
-    -- ^ Used for overriding the GHC build
-    ,configMonoidJobs                :: !(First Int)
-    -- ^ See: 'configJobs'
-    ,configMonoidExtraIncludeDirs    :: ![FilePath]
-    -- ^ See: 'configExtraIncludeDirs'
-    ,configMonoidExtraLibDirs        :: ![FilePath]
-    -- ^ See: 'configExtraLibDirs'
-    ,configMonoidCustomPreprocessorExts :: ![Text]
-    -- ^ See: 'configCustomPreprocessorExts'
-    , configMonoidOverrideGccPath    :: !(First (Path Abs File))
-    -- ^ Allow users to override the path to gcc
-    ,configMonoidOverrideHpack       :: !(First FilePath)
-    -- ^ Use Hpack executable (overrides bundled Hpack)
-    ,configMonoidConcurrentTests     :: !(First Bool)
-    -- ^ See: 'configConcurrentTests'
-    ,configMonoidLocalBinPath        :: !(First FilePath)
-    -- ^ Used to override the binary installation dir
-    ,configMonoidTemplateParameters  :: !(Map Text Text)
-    -- ^ Template parameters.
-    ,configMonoidScmInit             :: !(First SCM)
-    -- ^ Initialize SCM (e.g. git init) when making new projects?
-    ,configMonoidGhcOptionsByName    :: !(MonoidMap PackageName (Monoid.Dual [Text]))
-    -- ^ See 'configGhcOptionsByName'. Uses 'Monoid.Dual' so that
-    -- options from the configs on the right come first, so that they
-    -- can be overridden.
-    ,configMonoidGhcOptionsByCat     :: !(MonoidMap ApplyGhcOptions (Monoid.Dual [Text]))
-    -- ^ See 'configGhcOptionsAll'. Uses 'Monoid.Dual' so that options
-    -- from the configs on the right come first, so that they can be
-    -- overridden.
-    ,configMonoidCabalConfigOpts     :: !(MonoidMap CabalConfigKey (Monoid.Dual [Text]))
-    -- ^ See 'configCabalConfigOpts'.
-    ,configMonoidExtraPath           :: ![Path Abs Dir]
-    -- ^ Additional paths to search for executables in
-    ,configMonoidSetupInfoLocations  :: ![String]
-    -- ^ See 'configSetupInfoLocations'
-    ,configMonoidSetupInfoInline     :: !SetupInfo
-    -- ^ See 'configSetupInfoInline'
-    ,configMonoidLocalProgramsBase   :: !(First (Path Abs Dir))
-    -- ^ Override the default local programs dir, where e.g. GHC is installed.
-    ,configMonoidPvpBounds           :: !(First PvpBounds)
-    -- ^ See 'configPvpBounds'
-    ,configMonoidModifyCodePage      :: !FirstTrue
-    -- ^ See 'configModifyCodePage'
-    ,configMonoidRebuildGhcOptions   :: !FirstFalse
-    -- ^ See 'configMonoidRebuildGhcOptions'
-    ,configMonoidApplyGhcOptions     :: !(First ApplyGhcOptions)
-    -- ^ See 'configApplyGhcOptions'
-    ,configMonoidAllowNewer          :: !(First Bool)
-    -- ^ See 'configMonoidAllowNewer'
-    ,configMonoidDefaultTemplate     :: !(First TemplateName)
-    -- ^ The default template to use when none is specified.
-    -- (If Nothing, the 'default' default template is used.)
-    , configMonoidAllowDifferentUser :: !(First Bool)
-    -- ^ Allow users other than the Stack root owner to use the Stack
-    -- installation.
-    , configMonoidDumpLogs           :: !(First DumpLogs)
-    -- ^ See 'configDumpLogs'
-    , configMonoidSaveHackageCreds   :: !(First Bool)
-    -- ^ See 'configSaveHackageCreds'
-    , configMonoidHackageBaseUrl     :: !(First Text)
-    -- ^ See 'configHackageBaseUrl'
-    , configMonoidColorWhen          :: !(First ColorWhen)
-    -- ^ When to use 'ANSI' colors
-    , configMonoidStyles             :: !StylesUpdate
-    , configMonoidHideSourcePaths    :: !FirstTrue
-    -- ^ See 'configHideSourcePaths'
-    , configMonoidRecommendUpgrade   :: !FirstTrue
-    -- ^ See 'configRecommendUpgrade'
-    , configMonoidCasaRepoPrefix     :: !(First CasaRepoPrefix)
-    , configMonoidSnapshotLocation :: !(First Text)
-    -- ^ Custom location of LTS/Nightly snapshots
-    , configMonoidNoRunCompile  :: !FirstFalse
-    -- ^ See: 'configNoRunCompile'
-    , configMonoidStackDeveloperMode :: !(First Bool)
-    -- ^ See 'configStackDeveloperMode'
-    }
-  deriving (Show, Generic)
-
-instance Semigroup ConfigMonoid where
-    (<>) = mappenddefault
-
-instance Monoid ConfigMonoid where
-    mempty = memptydefault
-    mappend = (<>)
-
-parseConfigMonoid :: Path Abs Dir -> Value -> Yaml.Parser (WithJSONWarnings ConfigMonoid)
-parseConfigMonoid = withObjectWarnings "ConfigMonoid" . parseConfigMonoidObject
-
--- | Parse a partial configuration.  Used both to parse both a standalone config
--- file and a project file, so that a sub-parser is not required, which would interfere with
--- warnings for missing fields.
-parseConfigMonoidObject :: Path Abs Dir -> Object -> WarningParser ConfigMonoid
-parseConfigMonoidObject rootDir obj = do
-    -- Parsing 'stackRoot' from 'stackRoot'/config.yaml would be nonsensical
-    let configMonoidStackRoot = First Nothing
-    configMonoidWorkDir <- First <$> obj ..:? configMonoidWorkDirName
-    configMonoidBuildOpts <- jsonSubWarnings (obj ..:? configMonoidBuildOptsName ..!= mempty)
-    configMonoidDockerOpts <- jsonSubWarnings (obj ..:? configMonoidDockerOptsName ..!= mempty)
-    configMonoidNixOpts <- jsonSubWarnings (obj ..:? configMonoidNixOptsName ..!= mempty)
-    configMonoidConnectionCount <- First <$> obj ..:? configMonoidConnectionCountName
-    configMonoidHideTHLoading <- FirstTrue <$> obj ..:? configMonoidHideTHLoadingName
-    configMonoidPrefixTimestamps <- First <$> obj ..:? configMonoidPrefixTimestampsName
-
-    murls :: Maybe Value <- obj ..:? configMonoidUrlsName
-    configMonoidLatestSnapshot <-
-      case murls of
-        Nothing -> pure $ First Nothing
-        Just urls -> jsonSubWarnings $ lift $ withObjectWarnings
-          "urls"
-          (\o -> First <$> o ..:? "latest-snapshot" :: WarningParser (First Text))
-          urls
-
-    configMonoidPackageIndices <- First <$> jsonSubWarningsTT (obj ..:?  configMonoidPackageIndicesName)
-    configMonoidSystemGHC <- First <$> obj ..:? configMonoidSystemGHCName
-    configMonoidInstallGHC <- FirstTrue <$> obj ..:? configMonoidInstallGHCName
-    configMonoidSkipGHCCheck <- FirstFalse <$> obj ..:? configMonoidSkipGHCCheckName
-    configMonoidSkipMsys <- FirstFalse <$> obj ..:? configMonoidSkipMsysName
-    configMonoidRequireStackVersion <- IntersectingVersionRange . unVersionRangeJSON <$> (
-                                       obj ..:? configMonoidRequireStackVersionName
-                                           ..!= VersionRangeJSON anyVersion)
-    configMonoidArch <- First <$> obj ..:? configMonoidArchName
-    configMonoidGHCVariant <- First <$> obj ..:? configMonoidGHCVariantName
-    configMonoidGHCBuild <- First <$> obj ..:? configMonoidGHCBuildName
-    configMonoidJobs <- First <$> obj ..:? configMonoidJobsName
-    configMonoidExtraIncludeDirs <- map (toFilePath rootDir FilePath.</>) <$>
-        obj ..:?  configMonoidExtraIncludeDirsName ..!= []
-    configMonoidExtraLibDirs <- map (toFilePath rootDir FilePath.</>) <$>
-        obj ..:?  configMonoidExtraLibDirsName ..!= []
-    configMonoidCustomPreprocessorExts <- obj ..:?  configMonoidCustomPreprocessorExtsName ..!= []
-    configMonoidOverrideGccPath <- First <$> obj ..:? configMonoidOverrideGccPathName
-    configMonoidOverrideHpack <- First <$> obj ..:? configMonoidOverrideHpackName
-    configMonoidConcurrentTests <- First <$> obj ..:? configMonoidConcurrentTestsName
-    configMonoidLocalBinPath <- First <$> obj ..:? configMonoidLocalBinPathName
-    templates <- obj ..:? "templates"
-    (configMonoidScmInit,configMonoidTemplateParameters) <-
-      case templates of
-        Nothing -> pure (First Nothing,M.empty)
-        Just tobj -> do
-          scmInit <- tobj ..:? configMonoidScmInitName
-          params <- tobj ..:? configMonoidTemplateParametersName
-          pure (First scmInit,fromMaybe M.empty params)
-    configMonoidCompilerCheck <- First <$> obj ..:? configMonoidCompilerCheckName
-    configMonoidCompilerRepository <- First <$> (obj ..:? configMonoidCompilerRepositoryName)
-
-    options <- Map.map unGhcOptions <$> obj ..:? configMonoidGhcOptionsName ..!= mempty
-
-    optionsEverything <-
-      case (Map.lookup GOKOldEverything options, Map.lookup GOKEverything options) of
-        (Just _, Just _) -> fail "Cannot specify both `*` and `$everything` GHC options"
-        (Nothing, Just x) -> pure x
-        (Just x, Nothing) -> do
-          tell "The `*` ghc-options key is not recommended. Consider using $locals, or if really needed, $everything"
-          pure x
-        (Nothing, Nothing) -> pure []
-
-    let configMonoidGhcOptionsByCat = coerce $ Map.fromList
-          [ (AGOEverything, optionsEverything)
-          , (AGOLocals, Map.findWithDefault [] GOKLocals options)
-          , (AGOTargets, Map.findWithDefault [] GOKTargets options)
-          ]
-
-        configMonoidGhcOptionsByName = coerce $ Map.fromList
-            [(name, opts) | (GOKPackage name, opts) <- Map.toList options]
-
-    configMonoidCabalConfigOpts' <- obj ..:? "configure-options" ..!= mempty
-    let configMonoidCabalConfigOpts = coerce (configMonoidCabalConfigOpts' :: Map CabalConfigKey [Text])
-
-    configMonoidExtraPath <- obj ..:? configMonoidExtraPathName ..!= []
-    configMonoidSetupInfoLocations <- obj ..:? configMonoidSetupInfoLocationsName ..!= []
-    configMonoidSetupInfoInline <- jsonSubWarningsT (obj ..:? configMonoidSetupInfoInlineName) ..!= mempty
-    configMonoidLocalProgramsBase <- First <$> obj ..:? configMonoidLocalProgramsBaseName
-    configMonoidPvpBounds <- First <$> obj ..:? configMonoidPvpBoundsName
-    configMonoidModifyCodePage <- FirstTrue <$> obj ..:? configMonoidModifyCodePageName
-    configMonoidRebuildGhcOptions <- FirstFalse <$> obj ..:? configMonoidRebuildGhcOptionsName
-    configMonoidApplyGhcOptions <- First <$> obj ..:? configMonoidApplyGhcOptionsName
-    configMonoidAllowNewer <- First <$> obj ..:? configMonoidAllowNewerName
-    configMonoidDefaultTemplate <- First <$> obj ..:? configMonoidDefaultTemplateName
-    configMonoidAllowDifferentUser <- First <$> obj ..:? configMonoidAllowDifferentUserName
-    configMonoidDumpLogs <- First <$> obj ..:? configMonoidDumpLogsName
-    configMonoidSaveHackageCreds <- First <$> obj ..:? configMonoidSaveHackageCredsName
-    configMonoidHackageBaseUrl <- First <$> obj ..:? configMonoidHackageBaseUrlName
-
-    configMonoidColorWhenUS <- obj ..:? configMonoidColorWhenUSName
-    configMonoidColorWhenGB <- obj ..:? configMonoidColorWhenGBName
-    let configMonoidColorWhen =  First $   configMonoidColorWhenUS
-                                       <|> configMonoidColorWhenGB
-
-    configMonoidStylesUS <- obj ..:? configMonoidStylesUSName
-    configMonoidStylesGB <- obj ..:? configMonoidStylesGBName
-    let configMonoidStyles = fromMaybe mempty $   configMonoidStylesUS
-                                              <|> configMonoidStylesGB
-
-    configMonoidHideSourcePaths <- FirstTrue <$> obj ..:? configMonoidHideSourcePathsName
-    configMonoidRecommendUpgrade <- FirstTrue <$> obj ..:? configMonoidRecommendUpgradeName
-
-    configMonoidCasaRepoPrefix <- First <$> obj ..:? configMonoidCasaRepoPrefixName
-    configMonoidSnapshotLocation <- First <$> obj ..:? configMonoidSnapshotLocationName
-    configMonoidNoRunCompile <- FirstFalse <$> obj ..:? configMonoidNoRunCompileName
-
-    configMonoidStackDeveloperMode <- First <$> obj ..:? configMonoidStackDeveloperModeName
-
-    pure ConfigMonoid {..}
-
-configMonoidWorkDirName :: Text
-configMonoidWorkDirName = "work-dir"
-
-configMonoidBuildOptsName :: Text
-configMonoidBuildOptsName = "build"
-
-configMonoidDockerOptsName :: Text
-configMonoidDockerOptsName = "docker"
-
-configMonoidNixOptsName :: Text
-configMonoidNixOptsName = "nix"
-
-configMonoidConnectionCountName :: Text
-configMonoidConnectionCountName = "connection-count"
-
-configMonoidHideTHLoadingName :: Text
-configMonoidHideTHLoadingName = "hide-th-loading"
-
-configMonoidPrefixTimestampsName :: Text
-configMonoidPrefixTimestampsName = "build-output-timestamps"
-
-configMonoidUrlsName :: Text
-configMonoidUrlsName = "urls"
-
-configMonoidPackageIndicesName :: Text
-configMonoidPackageIndicesName = "package-indices"
-
-configMonoidSystemGHCName :: Text
-configMonoidSystemGHCName = "system-ghc"
-
-configMonoidInstallGHCName :: Text
-configMonoidInstallGHCName = "install-ghc"
-
-configMonoidSkipGHCCheckName :: Text
-configMonoidSkipGHCCheckName = "skip-ghc-check"
-
-configMonoidSkipMsysName :: Text
-configMonoidSkipMsysName = "skip-msys"
-
-configMonoidRequireStackVersionName :: Text
-configMonoidRequireStackVersionName = "require-stack-version"
-
-configMonoidArchName :: Text
-configMonoidArchName = "arch"
-
-configMonoidGHCVariantName :: Text
-configMonoidGHCVariantName = "ghc-variant"
-
-configMonoidGHCBuildName :: Text
-configMonoidGHCBuildName = "ghc-build"
-
-configMonoidJobsName :: Text
-configMonoidJobsName = "jobs"
-
-configMonoidExtraIncludeDirsName :: Text
-configMonoidExtraIncludeDirsName = "extra-include-dirs"
-
-configMonoidExtraLibDirsName :: Text
-configMonoidExtraLibDirsName = "extra-lib-dirs"
-
-configMonoidCustomPreprocessorExtsName  :: Text
-configMonoidCustomPreprocessorExtsName  = "custom-preprocessor-extensions"
-
-configMonoidOverrideGccPathName :: Text
-configMonoidOverrideGccPathName = "with-gcc"
-
-configMonoidOverrideHpackName :: Text
-configMonoidOverrideHpackName = "with-hpack"
-
-configMonoidConcurrentTestsName :: Text
-configMonoidConcurrentTestsName = "concurrent-tests"
-
-configMonoidLocalBinPathName :: Text
-configMonoidLocalBinPathName = "local-bin-path"
-
-configMonoidScmInitName :: Text
-configMonoidScmInitName = "scm-init"
-
-configMonoidTemplateParametersName :: Text
-configMonoidTemplateParametersName = "params"
-
-configMonoidCompilerCheckName :: Text
-configMonoidCompilerCheckName = "compiler-check"
-
-configMonoidCompilerRepositoryName :: Text
-configMonoidCompilerRepositoryName = "compiler-repository"
-
-configMonoidGhcOptionsName :: Text
-configMonoidGhcOptionsName = "ghc-options"
-
-configMonoidExtraPathName :: Text
-configMonoidExtraPathName = "extra-path"
-
-configMonoidSetupInfoLocationsName :: Text
-configMonoidSetupInfoLocationsName = "setup-info-locations"
-
-configMonoidSetupInfoInlineName :: Text
-configMonoidSetupInfoInlineName = "setup-info"
-
-configMonoidLocalProgramsBaseName :: Text
-configMonoidLocalProgramsBaseName = "local-programs-path"
-
-configMonoidPvpBoundsName :: Text
-configMonoidPvpBoundsName = "pvp-bounds"
-
-configMonoidModifyCodePageName :: Text
-configMonoidModifyCodePageName = "modify-code-page"
-
-configMonoidRebuildGhcOptionsName :: Text
-configMonoidRebuildGhcOptionsName = "rebuild-ghc-options"
-
-configMonoidApplyGhcOptionsName :: Text
-configMonoidApplyGhcOptionsName = "apply-ghc-options"
-
-configMonoidAllowNewerName :: Text
-configMonoidAllowNewerName = "allow-newer"
-
-configMonoidDefaultTemplateName :: Text
-configMonoidDefaultTemplateName = "default-template"
-
-configMonoidAllowDifferentUserName :: Text
-configMonoidAllowDifferentUserName = "allow-different-user"
-
-configMonoidDumpLogsName :: Text
-configMonoidDumpLogsName = "dump-logs"
-
-configMonoidSaveHackageCredsName :: Text
-configMonoidSaveHackageCredsName = "save-hackage-creds"
-
-configMonoidHackageBaseUrlName :: Text
-configMonoidHackageBaseUrlName = "hackage-base-url"
-
-configMonoidColorWhenUSName :: Text
-configMonoidColorWhenUSName = "color"
-
-configMonoidColorWhenGBName :: Text
-configMonoidColorWhenGBName = "colour"
-
-configMonoidStylesUSName :: Text
-configMonoidStylesUSName = "stack-colors"
-
-configMonoidStylesGBName :: Text
-configMonoidStylesGBName = "stack-colours"
-
-configMonoidHideSourcePathsName :: Text
-configMonoidHideSourcePathsName = "hide-source-paths"
-
-configMonoidRecommendUpgradeName :: Text
-configMonoidRecommendUpgradeName = "recommend-stack-upgrade"
-
-configMonoidCasaRepoPrefixName :: Text
-configMonoidCasaRepoPrefixName = "casa-repo-prefix"
-
-configMonoidSnapshotLocationName :: Text
-configMonoidSnapshotLocationName = "snapshot-location-base"
-
-configMonoidNoRunCompileName :: Text
-configMonoidNoRunCompileName = "script-no-run-compile"
-
-configMonoidStackDeveloperModeName :: Text
-configMonoidStackDeveloperModeName = "stack-developer-mode"
-
-data ConfigException
-  = ParseConfigFileException (Path Abs File) ParseException
-  | ParseCustomSnapshotException Text ParseException
-  | NoProjectConfigFound (Path Abs Dir) (Maybe Text)
-  | UnexpectedArchiveContents [Path Abs Dir] [Path Abs File]
-  | UnableToExtractArchive Text (Path Abs File)
-  | BadStackVersionException VersionRange
-  | NoMatchingSnapshot (NonEmpty SnapName)
-  | ResolverMismatch !RawSnapshotLocation String
-  | ResolverPartial !RawSnapshotLocation String
-  | NoSuchDirectory FilePath
-  | ParseGHCVariantException String
-  | BadStackRoot (Path Abs Dir)
-  | Won'tCreateStackRootInDirectoryOwnedByDifferentUser (Path Abs Dir) (Path Abs Dir) -- ^ @$STACK_ROOT@, parent dir
-  | UserDoesn'tOwnDirectory (Path Abs Dir)
-  | ManualGHCVariantSettingsAreIncompatibleWithSystemGHC
-  | NixRequiresSystemGhc
-  | NoResolverWhenUsingNoProject
-  | DuplicateLocalPackageNames ![(PackageName, [PackageLocation])]
-  deriving Typeable
-instance Show ConfigException where
-    show (ParseConfigFileException configFile exception) = concat
-        [ "Could not parse '"
-        , toFilePath configFile
-        , "':\n"
-        , Yaml.prettyPrintParseException exception
-        , "\nSee http://docs.haskellstack.org/en/stable/yaml_configuration/"
-        ]
-    show (ParseCustomSnapshotException url exception) = concat
-        [ "Could not parse '"
-        , T.unpack url
-        , "':\n"
-        , Yaml.prettyPrintParseException exception
-        , "\nSee https://docs.haskellstack.org/en/stable/custom_snapshot/"
-        ]
-    show (NoProjectConfigFound dir mcmd) = concat
-        [ "Unable to find a stack.yaml file in the current directory ("
-        , toFilePath dir
-        , ") or its ancestors"
-        , case mcmd of
-            Nothing -> ""
-            Just cmd -> "\nRecommended action: stack " ++ T.unpack cmd
-        ]
-    show (UnexpectedArchiveContents dirs files) = concat
-        [ "When unpacking an archive specified in your stack.yaml file, "
-        , "did not find expected contents. Expected: a single directory. Found: "
-        , show ( map (toFilePath . dirname) dirs
-               , map (toFilePath . filename) files
-               )
-        ]
-    show (UnableToExtractArchive url file) = concat
-        [ "Archive extraction failed. Tarballs and zip archives are supported, couldn't handle the following URL, "
-        , T.unpack url, " downloaded to the file ", toFilePath $ filename file
-        ]
-    show (BadStackVersionException requiredRange) = concat
-        [ "The version of Stack you are using ("
-        , show (mkVersion' Meta.version)
-        , ") is outside the required\n"
-        ,"version range specified in stack.yaml ("
-        , T.unpack (versionRangeText requiredRange)
-        , ").\n"
-        , "You can upgrade Stack by running:\n\n"
-        , "stack upgrade"
-        ]
-    show (NoMatchingSnapshot names) = concat
-        [ "None of the following snapshots provides a compiler matching "
-        , "your package(s):\n"
-        , unlines $ map (\name -> "    - " <> show name)
-                        (NonEmpty.toList names)
-        , resolveOptions
-        ]
-    show (ResolverMismatch resolver errDesc) = concat
-        [ "Resolver '"
-        , T.unpack $ utf8BuilderToText $ display resolver
-        , "' does not have a matching compiler to build some or all of your "
-        , "package(s).\n"
-        , errDesc
-        , resolveOptions
-        ]
-    show (ResolverPartial resolver errDesc) = concat
-        [ "Resolver '"
-        , T.unpack $ utf8BuilderToText $ display resolver
-        , "' does not have all the packages to match your requirements.\n"
-        , unlines $ fmap ("    " <>) (lines errDesc)
-        , resolveOptions
-        ]
-    show (NoSuchDirectory dir) =
-        "No directory could be located matching the supplied path: " ++ dir
-    show (ParseGHCVariantException v) =
-        "Invalid ghc-variant value: " ++ v
-    show (BadStackRoot stackRoot) = concat
-        [ "Invalid Stack root: '"
-        , toFilePath stackRoot
-        , "'. Please provide a valid absolute path."
-        ]
-    show (Won'tCreateStackRootInDirectoryOwnedByDifferentUser envStackRoot parentDir) = concat
-        [ "Preventing creation of Stack root '"
-        , toFilePath envStackRoot
-        , "'. Parent directory '"
-        , toFilePath parentDir
-        , "' is owned by someone else."
-        ]
-    show (UserDoesn'tOwnDirectory dir) = concat
-        [ "You are not the owner of '"
-        , toFilePath dir
-        , "'. Aborting to protect file permissions."
-        , "\nRetry with '--"
-        , T.unpack configMonoidAllowDifferentUserName
-        , "' to disable this precaution."
-        ]
-    show ManualGHCVariantSettingsAreIncompatibleWithSystemGHC = T.unpack $ T.concat
-        [ "Stack can only control the "
-        , configMonoidGHCVariantName
-        , " of its own GHC installations. Please use '--no-"
-        , configMonoidSystemGHCName
-        , "'."
-        ]
-    show NixRequiresSystemGhc = T.unpack $ T.concat
-        [ "Stack's Nix integration is incompatible with '--no-system-ghc'. "
-        , "Please use '--"
-        , configMonoidSystemGHCName
-        , "' or disable the Nix integration."
-        ]
-    show NoResolverWhenUsingNoProject = "When using the script command, you must provide a resolver argument"
-    show (DuplicateLocalPackageNames pairs) = concat
-        $ "The same package name is used in multiple local packages\n"
-        : map go pairs
-      where
-        go (name, dirs) = unlines
-            $ ""
-            : (packageNameString name ++ " used in:")
-            : map goLoc dirs
-        goLoc loc = "- " ++ show loc
-instance Exception ConfigException
-
-resolveOptions :: String
-resolveOptions =
-  unlines [ "\nThis may be resolved by:"
-          , "    - Using '--omit-packages' to exclude mismatching package(s)."
-          , "    - Using '--resolver' to specify a matching snapshot/resolver"
-          ]
-
 -- | Get the URL to request the information on the latest snapshots
 askLatestSnapshotUrl :: (MonadReader env m, HasConfig env) => m Text
-askLatestSnapshotUrl = view $ configL.to configLatestSnapshot
+askLatestSnapshotUrl = view $ configL . to (.latestSnapshot)
 
--- | @".stack-work"@
-workDirL :: HasConfig env => Lens' env (Path Rel Dir)
-workDirL = configL.lens configWorkDir (\x y -> x { configWorkDir = y })
+-- | Get the URL to request the information on the recently-published snapshots
+askRecentSnapshotsUrl :: (MonadReader env m, HasConfig env) => m Text
+askRecentSnapshotsUrl = view $ configL . to (.recentSnapshots)
 
 -- | @STACK_ROOT\/hooks\/@
 hooksDir :: HasConfig env => RIO env (Path Abs Dir)
 hooksDir = do
-  sr <- view $ configL.to configStackRoot
+  sr <- view $ configL . to (.stackRoot)
   pure (sr </> [reldir|hooks|])
 
 -- | @STACK_ROOT\/hooks\/ghc-install.sh@
@@ -1336,839 +259,88 @@ ghcInstallHook = do
   hd <- hooksDir
   pure (hd </> [relfile|ghc-install.sh|])
 
--- | Per-project work dir
-getProjectWorkDir :: (HasBuildConfig env, MonadReader env m) => m (Path Abs Dir)
-getProjectWorkDir = do
-    root    <- view projectRootL
-    workDir <- view workDirL
-    pure (root </> workDir)
-
--- | Relative directory for the platform identifier
-platformOnlyRelDir
-    :: (MonadReader env m, HasPlatform env, MonadThrow m)
-    => m (Path Rel Dir)
-platformOnlyRelDir = do
-    platform <- view platformL
-    platformVariant <- view platformVariantL
-    parseRelDir (Distribution.Text.display platform ++ platformVariantSuffix platformVariant)
-
--- | Directory containing snapshots
-snapshotsDir :: (MonadReader env m, HasEnvConfig env, MonadThrow m) => m (Path Abs Dir)
-snapshotsDir = do
-    root <- view stackRootL
-    platform <- platformGhcRelDir
-    pure $ root </> relDirSnapshots </> platform
-
--- | Installation root for dependencies
-installationRootDeps :: (HasEnvConfig env) => RIO env (Path Abs Dir)
-installationRootDeps = do
-    root <- view stackRootL
-    -- TODO: also useShaPathOnWindows here, once #1173 is resolved.
-    psc <- platformSnapAndCompilerRel
-    pure $ root </> relDirSnapshots </> psc
-
--- | Installation root for locals
-installationRootLocal :: (HasEnvConfig env) => RIO env (Path Abs Dir)
-installationRootLocal = do
-    workDir <- getProjectWorkDir
-    psc <- useShaPathOnWindows =<< platformSnapAndCompilerRel
-    pure $ workDir </> relDirInstall </> psc
-
--- | Installation root for compiler tools
-bindirCompilerTools :: (MonadThrow m, MonadReader env m, HasEnvConfig env) => m (Path Abs Dir)
-bindirCompilerTools = do
-    config <- view configL
-    platform <- platformGhcRelDir
-    compilerVersion <- view actualCompilerVersionL
-    compiler <- parseRelDir $ compilerVersionString compilerVersion
-    pure $
-        view stackRootL config </>
-        relDirCompilerTools </>
-        platform </>
-        compiler </>
-        bindirSuffix
-
--- | Hoogle directory.
-hoogleRoot :: (HasEnvConfig env) => RIO env (Path Abs Dir)
-hoogleRoot = do
-    workDir <- getProjectWorkDir
-    psc <- useShaPathOnWindows =<< platformSnapAndCompilerRel
-    pure $ workDir </> relDirHoogle </> psc
-
--- | Get the hoogle database path.
-hoogleDatabasePath :: (HasEnvConfig env) => RIO env (Path Abs File)
-hoogleDatabasePath = do
-    dir <- hoogleRoot
-    pure (dir </> relFileDatabaseHoo)
-
--- | Path for platform followed by snapshot name followed by compiler
--- name.
-platformSnapAndCompilerRel
-    :: (HasEnvConfig env)
-    => RIO env (Path Rel Dir)
-platformSnapAndCompilerRel = do
-    platform <- platformGhcRelDir
-    smh <- view $ envConfigL.to envConfigSourceMapHash
-    name <- smRelDir smh
-    ghc <- compilerVersionDir
-    useShaPathOnWindows (platform </> name </> ghc)
-
--- | Relative directory for the platform and GHC identifier
-platformGhcRelDir
-    :: (MonadReader env m, HasEnvConfig env, MonadThrow m)
-    => m (Path Rel Dir)
-platformGhcRelDir = do
-    cp <- view compilerPathsL
-    let cbSuffix = compilerBuildSuffix $ cpBuild cp
-    verOnly <- platformGhcVerOnlyRelDirStr
-    parseRelDir (mconcat [ verOnly, cbSuffix ])
-
--- | Relative directory for the platform and GHC identifier without GHC bindist build
-platformGhcVerOnlyRelDir
-    :: (MonadReader env m, HasPlatform env, HasGHCVariant env, MonadThrow m)
-    => m (Path Rel Dir)
-platformGhcVerOnlyRelDir =
-    parseRelDir =<< platformGhcVerOnlyRelDirStr
-
--- | Relative directory for the platform and GHC identifier without GHC bindist build
--- (before parsing into a Path)
-platformGhcVerOnlyRelDirStr
-    :: (MonadReader env m, HasPlatform env, HasGHCVariant env)
-    => m FilePath
-platformGhcVerOnlyRelDirStr = do
-    platform <- view platformL
-    platformVariant <- view platformVariantL
-    ghcVariant <- view ghcVariantL
-    pure $ mconcat [ Distribution.Text.display platform
-                     , platformVariantSuffix platformVariant
-                     , ghcVariantSuffix ghcVariant ]
-
--- | This is an attempt to shorten Stack paths on Windows to decrease our
--- chances of hitting 260 symbol path limit. The idea is to calculate
--- SHA1 hash of the path used on other architectures, encode with base
--- 16 and take first 8 symbols of it.
-useShaPathOnWindows :: MonadThrow m => Path Rel Dir -> m (Path Rel Dir)
-useShaPathOnWindows
-  | osIsWindows = shaPath
-  | otherwise = pure
-
-shaPath :: (IsPath Rel t, MonadThrow m) => Path Rel t -> m (Path Rel t)
-shaPath = shaPathForBytes . encodeUtf8 . T.pack . toFilePath
-
-shaPathForBytes :: (IsPath Rel t, MonadThrow m) => ByteString -> m (Path Rel t)
-shaPathForBytes
-    = parsePath . S8.unpack . S8.take 8
-    . Mem.convertToBase Mem.Base16 . hashWith SHA1
-
--- TODO: Move something like this into the path package. Consider
--- subsuming path-io's 'AnyPath'?
-class IsPath b t where
-  parsePath :: MonadThrow m => FilePath -> m (Path b t)
-
-instance IsPath Abs Dir where parsePath = parseAbsDir
-instance IsPath Rel Dir where parsePath = parseRelDir
-instance IsPath Abs File where parsePath = parseAbsFile
-instance IsPath Rel File where parsePath = parseRelFile
-
-compilerVersionDir :: (MonadThrow m, MonadReader env m, HasEnvConfig env) => m (Path Rel Dir)
-compilerVersionDir = do
-    compilerVersion <- view actualCompilerVersionL
-    parseRelDir $ case compilerVersion of
-        ACGhc version -> versionString version
-        ACGhcGit {} -> compilerVersionString compilerVersion
-
--- | Package database for installing dependencies into
-packageDatabaseDeps :: (HasEnvConfig env) => RIO env (Path Abs Dir)
-packageDatabaseDeps = do
-    root <- installationRootDeps
-    pure $ root </> relDirPkgdb
-
--- | Package database for installing local packages into
-packageDatabaseLocal :: (HasEnvConfig env) => RIO env (Path Abs Dir)
-packageDatabaseLocal = do
-    root <- installationRootLocal
-    pure $ root </> relDirPkgdb
-
--- | Extra package databases
-packageDatabaseExtra :: (MonadReader env m, HasEnvConfig env) => m [Path Abs Dir]
-packageDatabaseExtra = view $ buildConfigL.to bcExtraPackageDBs
-
--- | Where do we get information on global packages for loading up a
--- 'LoadedSnapshot'?
-data GlobalInfoSource
-  = GISSnapshotHints
-  -- ^ Accept the hints in the snapshot definition
-  | GISCompiler ActualCompiler
-  -- ^ Look up the actual information in the installed compiler
-
--- | Where HPC reports and tix files get stored.
-hpcReportDir :: (HasEnvConfig env)
-             => RIO env (Path Abs Dir)
-hpcReportDir = do
-   root <- installationRootLocal
-   pure $ root </> relDirHpc
-
--- | Get the extra bin directories (for the PATH). Puts more local first
---
--- Bool indicates whether or not to include the locals
-extraBinDirs :: (HasEnvConfig env)
-             => RIO env (Bool -> [Path Abs Dir])
-extraBinDirs = do
-    deps <- installationRootDeps
-    local' <- installationRootLocal
-    tools <- bindirCompilerTools
-    pure $ \locals -> if locals
-        then [local' </> bindirSuffix, deps </> bindirSuffix, tools]
-        else [deps </> bindirSuffix, tools]
-
-minimalEnvSettings :: EnvSettings
-minimalEnvSettings =
-    EnvSettings
-    { esIncludeLocals = False
-    , esIncludeGhcPackagePath = False
-    , esStackExe = False
-    , esLocaleUtf8 = False
-    , esKeepGhcRts = False
-    }
-
--- | Default @EnvSettings@ which includes locals and GHC_PACKAGE_PATH.
---
--- Note that this also passes through the GHCRTS environment variable.
--- See https://github.com/commercialhaskell/stack/issues/3444
-defaultEnvSettings :: EnvSettings
-defaultEnvSettings = EnvSettings
-    { esIncludeLocals = True
-    , esIncludeGhcPackagePath = True
-    , esStackExe = True
-    , esLocaleUtf8 = False
-    , esKeepGhcRts = True
-    }
-
--- | Environment settings which do not embellish the environment
---
--- Note that this also passes through the GHCRTS environment variable.
--- See https://github.com/commercialhaskell/stack/issues/3444
-plainEnvSettings :: EnvSettings
-plainEnvSettings = EnvSettings
-    { esIncludeLocals = False
-    , esIncludeGhcPackagePath = False
-    , esStackExe = False
-    , esLocaleUtf8 = False
-    , esKeepGhcRts = True
-    }
-
--- | Get the path for the given compiler ignoring any local binaries.
---
--- https://github.com/commercialhaskell/stack/issues/1052
-getCompilerPath :: HasCompiler env => RIO env (Path Abs File)
-getCompilerPath = view $ compilerPathsL.to cpCompiler
-
-data ProjectAndConfigMonoid
-  = ProjectAndConfigMonoid !Project !ConfigMonoid
-
-parseProjectAndConfigMonoid :: Path Abs Dir -> Value -> Yaml.Parser (WithJSONWarnings (IO ProjectAndConfigMonoid))
-parseProjectAndConfigMonoid rootDir =
-    withObjectWarnings "ProjectAndConfigMonoid" $ \o -> do
-        packages <- o ..:? "packages" ..!= [RelFilePath "."]
-        deps <- jsonSubWarningsTT (o ..:? "extra-deps") ..!= []
-        flags' <- o ..:? "flags" ..!= mempty
-        let flags = unCabalStringMap <$> unCabalStringMap
-                    (flags' :: Map (CabalString PackageName) (Map (CabalString FlagName) Bool))
-
-        resolver <- jsonSubWarnings $ o ...: ["snapshot", "resolver"]
-        mcompiler <- o ..:? "compiler"
-        msg <- o ..:? "user-message"
-        config <- parseConfigMonoidObject rootDir o
-        extraPackageDBs <- o ..:? "extra-package-dbs" ..!= []
-        mcurator <- jsonSubWarningsT (o ..:? "curator")
-        drops <- o ..:? "drop-packages" ..!= mempty
-        pure $ do
-          deps' <- mapM (resolvePaths (Just rootDir)) deps
-          resolver' <- resolvePaths (Just rootDir) resolver
-          let project = Project
-                  { projectUserMsg = msg
-                  , projectResolver = resolver'
-                  , projectCompiler = mcompiler -- FIXME make sure resolver' isn't SLCompiler
-                  , projectExtraPackageDBs = extraPackageDBs
-                  , projectPackages = packages
-                  , projectDependencies = concatMap toList (deps' :: [NonEmpty RawPackageLocation])
-                  , projectFlags = flags
-                  , projectCurator = mcurator
-                  , projectDropPackages = Set.map unCabalString drops
-                  }
-          pure $ ProjectAndConfigMonoid project config
-
--- | A software control system.
-data SCM = Git
-  deriving (Show)
-
-instance FromJSON SCM where
-    parseJSON v = do
-        s <- parseJSON v
-        case s of
-            "git" -> pure Git
-            _ -> fail ("Unknown or unsupported SCM: " <> s)
-
-instance ToJSON SCM where
-    toJSON Git = toJSON ("git" :: Text)
-
--- | A variant of the platform, used to differentiate Docker builds from host
-data PlatformVariant = PlatformVariantNone
-                     | PlatformVariant String
-
--- | Render a platform variant to a String suffix.
-platformVariantSuffix :: PlatformVariant -> String
-platformVariantSuffix PlatformVariantNone = ""
-platformVariantSuffix (PlatformVariant v) = "-" ++ v
-
--- | Specialized variant of GHC (e.g. libgmp4 or integer-simple)
-data GHCVariant
-    = GHCStandard
-    -- ^ Standard bindist
-    | GHCIntegerSimple
-    -- ^ Bindist that uses integer-simple
-    | GHCNativeBignum
-    -- ^ Bindist that uses the Haskell-native big-integer backend
-    | GHCCustom String
-    -- ^ Other bindists
-    deriving (Show)
-
-instance FromJSON GHCVariant where
-    -- Strange structuring is to give consistent error messages
-    parseJSON =
-        withText
-            "GHCVariant"
-            (either (fail . show) pure . parseGHCVariant . T.unpack)
-
--- | Render a GHC variant to a String.
-ghcVariantName :: GHCVariant -> String
-ghcVariantName GHCStandard = "standard"
-ghcVariantName GHCIntegerSimple = "integersimple"
-ghcVariantName GHCNativeBignum = "int-native"
-ghcVariantName (GHCCustom name) = "custom-" ++ name
-
--- | Render a GHC variant to a String suffix.
-ghcVariantSuffix :: GHCVariant -> String
-ghcVariantSuffix GHCStandard = ""
-ghcVariantSuffix v = "-" ++ ghcVariantName v
-
--- | Parse GHC variant from a String.
-parseGHCVariant :: (MonadThrow m) => String -> m GHCVariant
-parseGHCVariant s =
-    case stripPrefix "custom-" s of
-        Just name -> pure (GHCCustom name)
-        Nothing
-          | s == "" -> pure GHCStandard
-          | s == "standard" -> pure GHCStandard
-          | s == "integersimple" -> pure GHCIntegerSimple
-          | s == "int-native" -> pure GHCNativeBignum
-          | otherwise -> pure (GHCCustom s)
-
--- | Build of the compiler distribution (e.g. standard, gmp4, tinfo6)
--- | Information for a file to download.
-data DownloadInfo = DownloadInfo
-    { downloadInfoUrl :: Text
-      -- ^ URL or absolute file path
-    , downloadInfoContentLength :: Maybe Int
-    , downloadInfoSha1 :: Maybe ByteString
-    , downloadInfoSha256 :: Maybe ByteString
-    } deriving (Show)
-
-instance FromJSON (WithJSONWarnings DownloadInfo) where
-    parseJSON = withObjectWarnings "DownloadInfo" parseDownloadInfoFromObject
-
--- | Parse JSON in existing object for 'DownloadInfo'
-parseDownloadInfoFromObject :: Object -> WarningParser DownloadInfo
-parseDownloadInfoFromObject o = do
-    url <- o ..: "url"
-    contentLength <- o ..:? "content-length"
-    sha1TextMay <- o ..:? "sha1"
-    sha256TextMay <- o ..:? "sha256"
-    pure
-        DownloadInfo
-        { downloadInfoUrl = url
-        , downloadInfoContentLength = contentLength
-        , downloadInfoSha1 = fmap encodeUtf8 sha1TextMay
-        , downloadInfoSha256 = fmap encodeUtf8 sha256TextMay
-        }
-
-data VersionedDownloadInfo = VersionedDownloadInfo
-    { vdiVersion :: Version
-    , vdiDownloadInfo :: DownloadInfo
-    }
-    deriving Show
-
-instance FromJSON (WithJSONWarnings VersionedDownloadInfo) where
-    parseJSON = withObjectWarnings "VersionedDownloadInfo" $ \o -> do
-        CabalString version <- o ..: "version"
-        downloadInfo <- parseDownloadInfoFromObject o
-        pure VersionedDownloadInfo
-            { vdiVersion = version
-            , vdiDownloadInfo = downloadInfo
-            }
-
-data GHCDownloadInfo = GHCDownloadInfo
-    { gdiConfigureOpts :: [Text]
-    , gdiConfigureEnv :: Map Text Text
-    , gdiDownloadInfo :: DownloadInfo
-    }
-    deriving Show
-
-instance FromJSON (WithJSONWarnings GHCDownloadInfo) where
-    parseJSON = withObjectWarnings "GHCDownloadInfo" $ \o -> do
-        configureOpts <- o ..:? "configure-opts" ..!= mempty
-        configureEnv <- o ..:? "configure-env" ..!= mempty
-        downloadInfo <- parseDownloadInfoFromObject o
-        pure GHCDownloadInfo
-            { gdiConfigureOpts = configureOpts
-            , gdiConfigureEnv = configureEnv
-            , gdiDownloadInfo = downloadInfo
-            }
-
-data SetupInfo = SetupInfo
-    { siSevenzExe :: Maybe DownloadInfo
-    , siSevenzDll :: Maybe DownloadInfo
-    , siMsys2 :: Map Text VersionedDownloadInfo
-    , siGHCs :: Map Text (Map Version GHCDownloadInfo)
-    , siStack :: Map Text (Map Version DownloadInfo)
-    }
-    deriving Show
-
-instance FromJSON (WithJSONWarnings SetupInfo) where
-    parseJSON = withObjectWarnings "SetupInfo" $ \o -> do
-        siSevenzExe <- jsonSubWarningsT (o ..:? "sevenzexe-info")
-        siSevenzDll <- jsonSubWarningsT (o ..:? "sevenzdll-info")
-        siMsys2 <- jsonSubWarningsT (o ..:? "msys2" ..!= mempty)
-        (fmap unCabalStringMap -> siGHCs) <- jsonSubWarningsTT (o ..:? "ghc" ..!= mempty)
-        (fmap unCabalStringMap -> siStack) <- jsonSubWarningsTT (o ..:? "stack" ..!= mempty)
-        pure SetupInfo {..}
-
--- | For the @siGHCs@ field maps are deeply merged.
--- For all fields the values from the first @SetupInfo@ win.
-instance Semigroup SetupInfo where
-    l <> r =
-        SetupInfo
-        { siSevenzExe = siSevenzExe l <|> siSevenzExe r
-        , siSevenzDll = siSevenzDll l <|> siSevenzDll r
-        , siMsys2 = siMsys2 l <> siMsys2 r
-        , siGHCs = Map.unionWith (<>) (siGHCs l) (siGHCs r)
-        , siStack = Map.unionWith (<>) (siStack l) (siStack r) }
-
-instance Monoid SetupInfo where
-    mempty =
-        SetupInfo
-        { siSevenzExe = Nothing
-        , siSevenzDll = Nothing
-        , siMsys2 = Map.empty
-        , siGHCs = Map.empty
-        , siStack = Map.empty
-        }
-    mappend = (<>)
-
--- | How PVP bounds should be added to .cabal files
-data PvpBoundsType
-  = PvpBoundsNone
-  | PvpBoundsUpper
-  | PvpBoundsLower
-  | PvpBoundsBoth
-  deriving (Show, Read, Eq, Typeable, Ord, Enum, Bounded)
-
-data PvpBounds = PvpBounds
-  { pbType :: !PvpBoundsType
-  , pbAsRevision :: !Bool
-  }
-  deriving (Show, Read, Eq, Typeable, Ord)
-
-pvpBoundsText :: PvpBoundsType -> Text
-pvpBoundsText PvpBoundsNone = "none"
-pvpBoundsText PvpBoundsUpper = "upper"
-pvpBoundsText PvpBoundsLower = "lower"
-pvpBoundsText PvpBoundsBoth = "both"
-
-parsePvpBounds :: Text -> Either String PvpBounds
-parsePvpBounds t = maybe err Right $ do
-    (t', asRevision) <-
-      case T.break (== '-') t of
-        (x, "") -> Just (x, False)
-        (x, "-revision") -> Just (x, True)
-        _ -> Nothing
-    x <- Map.lookup t' m
-    Just PvpBounds
-      { pbType = x
-      , pbAsRevision = asRevision
-      }
-  where
-    m = Map.fromList $ map (pvpBoundsText &&& id) [minBound..maxBound]
-    err = Left $ "Invalid PVP bounds: " ++ T.unpack t
-
-instance ToJSON PvpBounds where
-  toJSON (PvpBounds typ asRevision) =
-    toJSON (pvpBoundsText typ <> (if asRevision then "-revision" else ""))
-instance FromJSON PvpBounds where
-  parseJSON = withText "PvpBounds" (either fail pure . parsePvpBounds)
-
--- | Data passed into Docker container for the Docker entrypoint's use
-newtype DockerEntrypoint = DockerEntrypoint
-    { deUser :: Maybe DockerUser
-      -- ^ UID/GID/etc of host user, if we wish to perform UID/GID switch in container
-    } deriving (Read,Show)
-
--- | Docker host user info
-data DockerUser = DockerUser
-    { duUid :: UserID -- ^ uid
-    , duGid :: GroupID -- ^ gid
-    , duGroups :: [GroupID] -- ^ Supplemental groups
-    , duUmask :: FileMode -- ^ File creation mask }
-    } deriving (Read,Show)
-
-data GhcOptionKey
-  = GOKOldEverything
-  | GOKEverything
-  | GOKLocals
-  | GOKTargets
-  | GOKPackage !PackageName
-  deriving (Eq, Ord)
-
-instance FromJSONKey GhcOptionKey where
-  fromJSONKey = FromJSONKeyTextParser $ \t ->
-    case t of
-      "*" -> pure GOKOldEverything
-      "$everything" -> pure GOKEverything
-      "$locals" -> pure GOKLocals
-      "$targets" -> pure GOKTargets
-      _ ->
-        case parsePackageName $ T.unpack t of
-          Nothing -> fail $ "Invalid package name: " ++ show t
-          Just x -> pure $ GOKPackage x
-  fromJSONKeyList = FromJSONKeyTextParser $ \_ -> fail "GhcOptionKey.fromJSONKeyList"
-
-newtype GhcOptions = GhcOptions { unGhcOptions :: [Text] }
-
-instance FromJSON GhcOptions where
-  parseJSON = withText "GhcOptions" $ \t ->
-    case parseArgs Escaping t of
-      Left e -> fail e
-      Right opts -> pure $ GhcOptions $ map T.pack opts
-
 -----------------------------------
 -- Lens classes
 -----------------------------------
 
--- | Class for environment values which have a Platform
-class HasPlatform env where
-    platformL :: Lens' env Platform
-    default platformL :: HasConfig env => Lens' env Platform
-    platformL = configL.platformL
-    {-# INLINE platformL #-}
-    platformVariantL :: Lens' env PlatformVariant
-    default platformVariantL :: HasConfig env => Lens' env PlatformVariant
-    platformVariantL = configL.platformVariantL
-    {-# INLINE platformVariantL #-}
-
--- | Class for environment values which have a GHCVariant
-class HasGHCVariant env where
-    ghcVariantL :: SimpleGetter env GHCVariant
-    default ghcVariantL :: HasConfig env => SimpleGetter env GHCVariant
-    ghcVariantL = configL.ghcVariantL
-    {-# INLINE ghcVariantL #-}
-
--- | Class for environment values which have a 'Runner'.
-class (HasProcessContext env, HasLogFunc env) => HasRunner env where
-  runnerL :: Lens' env Runner
-instance HasLogFunc Runner where
-  logFuncL = lens runnerLogFunc (\x y -> x { runnerLogFunc = y })
-instance HasProcessContext Runner where
-  processContextL = lens runnerProcessContext (\x y -> x { runnerProcessContext = y })
-instance HasRunner Runner where
-  runnerL = id
-instance HasStylesUpdate Runner where
-  stylesUpdateL = globalOptsL.
-                  lens globalStylesUpdate (\x y -> x { globalStylesUpdate = y })
-instance HasTerm Runner where
-  useColorL = lens runnerUseColor (\x y -> x { runnerUseColor = y })
-  termWidthL = lens runnerTermWidth (\x y -> x { runnerTermWidth = y })
-
-globalOptsL :: HasRunner env => Lens' env GlobalOpts
-globalOptsL = runnerL.lens runnerGlobalOpts (\x y -> x { runnerGlobalOpts = y })
-
--- | Class for environment values that can provide a 'Config'.
-class ( HasPlatform env, HasGHCVariant env, HasProcessContext env, HasPantryConfig env, HasTerm env, HasRunner env) => HasConfig env where
-    configL :: Lens' env Config
-    default configL :: HasBuildConfig env => Lens' env Config
-    configL = buildConfigL.lens bcConfig (\x y -> x { bcConfig = y })
-    {-# INLINE configL #-}
-
-class HasConfig env => HasBuildConfig env where
-    buildConfigL :: Lens' env BuildConfig
-    default buildConfigL :: HasEnvConfig env => Lens' env BuildConfig
-    buildConfigL = envConfigL.lens
-        envConfigBuildConfig
-        (\x y -> x { envConfigBuildConfig = y })
-
-class (HasBuildConfig env, HasSourceMap env, HasCompiler env) => HasEnvConfig env where
-    envConfigL :: Lens' env EnvConfig
+-- | Class for environment values that can provide a t'Config'.
+class ( HasPlatform env
+      , HasGHCVariant env
+      , HasProcessContext env
+      , HasPantryConfig env
+      , HasTerm env
+      , HasRunner env
+      ) => HasConfig env where
+  configL :: Lens' env Config
 
 -----------------------------------
 -- Lens instances
 -----------------------------------
 
-instance HasPlatform (Platform,PlatformVariant) where
-    platformL = _1
-    platformVariantL = _2
 instance HasPlatform Config where
-    platformL = lens configPlatform (\x y -> x { configPlatform = y })
-    platformVariantL = lens configPlatformVariant (\x y -> x { configPlatformVariant = y })
-instance HasPlatform BuildConfig
-instance HasPlatform EnvConfig
+  platformL = lens (.platform) (\x y -> x { platform = y })
+  platformVariantL =
+    lens (.platformVariant) (\x y -> x { platformVariant = y })
 
-instance HasGHCVariant GHCVariant where
-    ghcVariantL = id
-    {-# INLINE ghcVariantL #-}
 instance HasGHCVariant Config where
-    ghcVariantL = to $ fromMaybe GHCStandard . configGHCVariant
-instance HasGHCVariant BuildConfig
-instance HasGHCVariant EnvConfig
+  ghcVariantL = to $ fromMaybe GHCStandard . (.ghcVariant)
 
 instance HasProcessContext Config where
-    processContextL = runnerL.processContextL
-instance HasProcessContext BuildConfig where
-    processContextL = configL.processContextL
-instance HasProcessContext EnvConfig where
-    processContextL = configL.processContextL
+  processContextL = runnerL . processContextL
 
 instance HasPantryConfig Config where
-    pantryConfigL = lens configPantryConfig (\x y -> x { configPantryConfig = y })
-instance HasPantryConfig BuildConfig where
-    pantryConfigL = configL.pantryConfigL
-instance HasPantryConfig EnvConfig where
-    pantryConfigL = configL.pantryConfigL
+  pantryConfigL = lens
+    (.pantryConfig)
+    (\x y -> x { pantryConfig = y })
 
 instance HasConfig Config where
-    configL = id
-    {-# INLINE configL #-}
-instance HasConfig BuildConfig where
-    configL = lens bcConfig (\x y -> x { bcConfig = y })
-instance HasConfig EnvConfig
-
-instance HasBuildConfig BuildConfig where
-    buildConfigL = id
-    {-# INLINE buildConfigL #-}
-instance HasBuildConfig EnvConfig
-
-instance HasCompiler EnvConfig where
-    compilerPathsL = to envConfigCompilerPaths
-instance HasEnvConfig EnvConfig where
-    envConfigL = id
-    {-# INLINE envConfigL #-}
+  configL = id
+  {-# INLINE configL #-}
 
 instance HasRunner Config where
-  runnerL = lens configRunner (\x y -> x { configRunner = y })
-instance HasRunner BuildConfig where
-  runnerL = configL.runnerL
-instance HasRunner EnvConfig where
-  runnerL = configL.runnerL
+  runnerL = lens (.runner) (\x y -> x { runner = y })
 
 instance HasLogFunc Config where
-  logFuncL = runnerL.logFuncL
-instance HasLogFunc BuildConfig where
-  logFuncL = runnerL.logFuncL
-instance HasLogFunc EnvConfig where
-  logFuncL = runnerL.logFuncL
+  logFuncL = runnerL . logFuncL
 
 instance HasStylesUpdate Config where
-  stylesUpdateL = runnerL.stylesUpdateL
-instance HasStylesUpdate BuildConfig where
-  stylesUpdateL = runnerL.stylesUpdateL
-instance HasStylesUpdate EnvConfig where
-  stylesUpdateL = runnerL.stylesUpdateL
+  stylesUpdateL = runnerL . stylesUpdateL
 
 instance HasTerm Config where
-  useColorL = runnerL.useColorL
-  termWidthL = runnerL.termWidthL
-instance HasTerm BuildConfig where
-  useColorL = runnerL.useColorL
-  termWidthL = runnerL.termWidthL
-instance HasTerm EnvConfig where
-  useColorL = runnerL.useColorL
-  termWidthL = runnerL.termWidthL
+  useColorL = runnerL . useColorL
+  termWidthL = runnerL . termWidthL
 
 -----------------------------------
 -- Helper lenses
 -----------------------------------
 
 stackRootL :: HasConfig s => Lens' s (Path Abs Dir)
-stackRootL = configL.lens configStackRoot (\x y -> x { configStackRoot = y })
-
--- | The compiler specified by the @SnapshotDef@. This may be
--- different from the actual compiler used!
-wantedCompilerVersionL :: HasBuildConfig s => Getting r s WantedCompiler
-wantedCompilerVersionL = buildConfigL.to (smwCompiler . bcSMWanted)
-
--- | Location of the ghc-pkg executable
-newtype GhcPkgExe = GhcPkgExe (Path Abs File)
-  deriving Show
-
--- | Get the 'GhcPkgExe' from a 'HasCompiler' environment
-getGhcPkgExe :: HasCompiler env => RIO env GhcPkgExe
-getGhcPkgExe = view $ compilerPathsL.to cpPkg
-
--- | Dump information for a single package
-data DumpPackage = DumpPackage
-    { dpGhcPkgId :: !GhcPkgId
-    , dpPackageIdent :: !PackageIdentifier
-    , dpParentLibIdent :: !(Maybe PackageIdentifier)
-    , dpLicense :: !(Maybe C.License)
-    , dpLibDirs :: ![FilePath]
-    , dpLibraries :: ![Text]
-    , dpHasExposedModules :: !Bool
-    , dpExposedModules :: !(Set ModuleName)
-    , dpDepends :: ![GhcPkgId]
-    , dpHaddockInterfaces :: ![FilePath]
-    , dpHaddockHtml :: !(Maybe FilePath)
-    , dpIsExposed :: !Bool
-    }
-    deriving (Show, Read, Eq)
-
--- | Paths on the filesystem for the compiler we're using
-data CompilerPaths = CompilerPaths
-  { cpCompilerVersion :: !ActualCompiler
-  , cpArch :: !Arch
-  , cpBuild :: !CompilerBuild
-  , cpCompiler :: !(Path Abs File)
-  -- | ghc-pkg or equivalent
-  , cpPkg :: !GhcPkgExe
-  -- | runghc
-  , cpInterpreter :: !(Path Abs File)
-  -- | haddock, in 'IO' to allow deferring the lookup
-  , cpHaddock :: !(Path Abs File)
-  -- | Is this a Stack-sandboxed installation?
-  , cpSandboxed :: !Bool
-  , cpCabalVersion :: !Version
-  -- ^ This is the version of Cabal that Stack will use to compile Setup.hs files
-  -- in the build process.
-  --
-  -- Note that this is not necessarily the same version as the one that Stack
-  -- depends on as a library and which is displayed when running
-  -- @stack ls dependencies | grep Cabal@ in the Stack project.
-  , cpGlobalDB :: !(Path Abs Dir)
-  -- ^ Global package database
-  , cpGhcInfo :: !ByteString
-  -- ^ Output of @ghc --info@
-  , cpGlobalDump :: !(Map PackageName DumpPackage)
-  }
-  deriving Show
-
-cpWhich :: (MonadReader env m, HasCompiler env) => m WhichCompiler
-cpWhich = view $ compilerPathsL.to (whichCompiler.cpCompilerVersion)
-
-data ExtraDirs = ExtraDirs
-    { edBins :: ![Path Abs Dir]
-    , edInclude :: ![Path Abs Dir]
-    , edLib :: ![Path Abs Dir]
-    } deriving (Show, Generic)
-instance Semigroup ExtraDirs where
-    (<>) = mappenddefault
-instance Monoid ExtraDirs where
-    mempty = memptydefault
-    mappend = (<>)
-
--- | An environment which ensures that the given compiler is available
--- on the PATH
-class HasCompiler env where
-  compilerPathsL :: SimpleGetter env CompilerPaths
-instance HasCompiler CompilerPaths where
-  compilerPathsL = id
-
-class HasSourceMap env where
-  sourceMapL :: Lens' env SourceMap
-instance HasSourceMap EnvConfig where
-  sourceMapL = lens envConfigSourceMap (\x y -> x { envConfigSourceMap = y })
+stackRootL =
+  configL . lens (.stackRoot) (\x y -> x { stackRoot = y })
 
--- | The version of the compiler which will actually be used. May be
--- different than that specified in the 'SnapshotDef' and returned
--- by 'wantedCompilerVersionL'.
-actualCompilerVersionL :: HasSourceMap env => SimpleGetter env ActualCompiler
-actualCompilerVersionL = sourceMapL.to smCompiler
+userGlobalConfigFileL :: HasConfig s => Lens' s (Path Abs File)
+userGlobalConfigFileL = configL . lens
+  (.userGlobalConfigFile)
+  (\x y -> x { userGlobalConfigFile = y })
 
 buildOptsL :: HasConfig s => Lens' s BuildOpts
-buildOptsL = configL.lens
-    configBuild
-    (\x y -> x { configBuild = y })
+buildOptsL = configL . lens (.build) (\x y -> x { build = y })
 
-buildOptsMonoidHaddockL :: Lens' BuildOptsMonoid (Maybe Bool)
-buildOptsMonoidHaddockL = lens (getFirstFalse . buildMonoidHaddock)
-                            (\buildMonoid t -> buildMonoid {buildMonoidHaddock = FirstFalse t})
+envOverrideSettingsL ::
+     HasConfig env
+  => Lens' env (EnvSettings -> IO ProcessContext)
+envOverrideSettingsL = configL . lens
+  (.processContextSettings)
+  (\x y -> x { processContextSettings = y })
 
-buildOptsMonoidTestsL :: Lens' BuildOptsMonoid (Maybe Bool)
-buildOptsMonoidTestsL = lens (getFirstFalse . buildMonoidTests)
-                            (\buildMonoid t -> buildMonoid {buildMonoidTests = FirstFalse t})
-
-buildOptsMonoidBenchmarksL :: Lens' BuildOptsMonoid (Maybe Bool)
-buildOptsMonoidBenchmarksL = lens (getFirstFalse . buildMonoidBenchmarks)
-                            (\buildMonoid t -> buildMonoid {buildMonoidBenchmarks = FirstFalse t})
-
-buildOptsMonoidInstallExesL :: Lens' BuildOptsMonoid (Maybe Bool)
-buildOptsMonoidInstallExesL =
-  lens (getFirstFalse . buildMonoidInstallExes)
-       (\buildMonoid t -> buildMonoid {buildMonoidInstallExes = FirstFalse t})
-
-buildOptsInstallExesL :: Lens' BuildOpts Bool
-buildOptsInstallExesL =
-  lens boptsInstallExes
-       (\bopts t -> bopts {boptsInstallExes = t})
-
-buildOptsHaddockL :: Lens' BuildOpts Bool
-buildOptsHaddockL =
-  lens boptsHaddock
-       (\bopts t -> bopts {boptsHaddock = t})
-
-globalOptsBuildOptsMonoidL :: Lens' GlobalOpts BuildOptsMonoid
-globalOptsBuildOptsMonoidL =
-  lens
-    globalConfigMonoid
-    (\x y -> x { globalConfigMonoid = y })
-  .
-  lens
-    configMonoidBuildOpts
-    (\x y -> x { configMonoidBuildOpts = y })
-
-cabalVersionL :: HasCompiler env => SimpleGetter env Version
-cabalVersionL = compilerPathsL.to cpCabalVersion
-
-whichCompilerL :: Getting r ActualCompiler WhichCompiler
-whichCompilerL = to whichCompiler
-
-envOverrideSettingsL :: HasConfig env => Lens' env (EnvSettings -> IO ProcessContext)
-envOverrideSettingsL = configL.lens
-    configProcessContextSettings
-    (\x y -> x { configProcessContextSettings = y })
-
-shouldForceGhcColorFlag :: (HasRunner env, HasEnvConfig env)
-                        => RIO env Bool
-shouldForceGhcColorFlag = do
-    canDoColor <- (>= mkVersion [8, 2, 1]) . getGhcVersion
-              <$> view actualCompilerVersionL
-    shouldDoColor <- view useColorL
-    pure $ canDoColor && shouldDoColor
-
-appropriateGhcColorFlag :: (HasRunner env, HasEnvConfig env)
-                        => RIO env (Maybe String)
-appropriateGhcColorFlag = f <$> shouldForceGhcColorFlag
-  where f True = Just ghcColorForceFlag
-        f False = Nothing
-
--- | See 'globalTerminal'
-terminalL :: HasRunner env => Lens' env Bool
-terminalL = globalOptsL.lens globalTerminal (\x y -> x { globalTerminal = y })
-
--- | See 'globalReExecVersion'
-reExecL :: HasRunner env => SimpleGetter env Bool
-reExecL = globalOptsL.to (isJust . globalReExecVersion)
+-- | @".stack-work"@
+workDirL :: HasConfig env => Lens' env (Path Rel Dir)
+workDirL = configL . lens (.workDir) (\x y -> x { workDir = y })
 
 -- | In dev mode, print as a warning, otherwise as debug
 prettyStackDevL :: HasConfig env => [StyleDoc] -> RIO env ()
 prettyStackDevL docs = do
   config <- view configL
-  if configStackDeveloperMode config
+  if config.stackDeveloperMode
     then prettyWarnL docs
     else prettyDebugL docs
diff --git a/src/Stack/Types/Config/Build.hs b/src/Stack/Types/Config/Build.hs
deleted file mode 100644
index 398a583fb6..0000000000
--- a/src/Stack/Types/Config/Build.hs
+++ /dev/null
@@ -1,509 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
-
--- | Configuration options for building.
-
-module Stack.Types.Config.Build
-    (
-      BuildOpts(..)
-    , BuildCommand(..)
-    , defaultBuildOpts
-    , defaultBuildOptsCLI
-    , BuildOptsCLI(..)
-    , BuildOptsMonoid(..)
-    , TestOpts(..)
-    , defaultTestOpts
-    , TestOptsMonoid(..)
-    , HaddockOpts(..)
-    , defaultHaddockOpts
-    , HaddockOptsMonoid(..)
-    , BenchmarkOpts(..)
-    , defaultBenchmarkOpts
-    , BenchmarkOptsMonoid(..)
-    , FileWatchOpts(..)
-    , BuildSubset(..)
-    , ApplyCLIFlag (..)
-    , boptsCLIFlagsByName
-    , CabalVerbosity (..)
-    , toFirstCabalVerbosity
-    )
-    where
-
-import qualified Data.Map.Strict as Map
-import qualified Data.Text as T
-import           Distribution.Parsec (Parsec (..), simpleParsec)
-import           Distribution.Verbosity (Verbosity, normal, verbose)
-import           Generics.Deriving.Monoid (memptydefault, mappenddefault)
-import           Pantry.Internal.AesonExtended
-import           Stack.Prelude
-
--- | Build options that is interpreted by the build command.
---   This is built up from BuildOptsCLI and BuildOptsMonoid
-data BuildOpts =
-  BuildOpts {boptsLibProfile :: !Bool
-            ,boptsExeProfile :: !Bool
-            ,boptsLibStrip :: !Bool
-            ,boptsExeStrip :: !Bool
-            ,boptsHaddock :: !Bool
-            -- ^ Build haddocks?
-            ,boptsHaddockOpts :: !HaddockOpts
-            -- ^ Options to pass to haddock
-            ,boptsOpenHaddocks :: !Bool
-            -- ^ Open haddocks in the browser?
-            ,boptsHaddockDeps :: !(Maybe Bool)
-            -- ^ Build haddocks for dependencies?
-            ,boptsHaddockInternal :: !Bool
-            -- ^ Build haddocks for all symbols and packages, like @cabal haddock --internal@
-            ,boptsHaddockHyperlinkSource  :: !Bool
-            -- ^ Build hyperlinked source if possible. Fallback to
-            -- @hscolour@. Disable for no sources.
-            ,boptsInstallExes :: !Bool
-            -- ^ Install executables to user path after building?
-            ,boptsInstallCompilerTool :: !Bool
-            -- ^ Install executables to compiler tools path after building?
-            ,boptsPreFetch :: !Bool
-            -- ^ Fetch all packages immediately
-            -- ^ Watch files for changes and automatically rebuild
-            ,boptsKeepGoing :: !(Maybe Bool)
-            -- ^ Keep building/running after failure
-            ,boptsKeepTmpFiles :: !Bool
-            -- ^ Keep intermediate files and build directories
-            ,boptsForceDirty :: !Bool
-            -- ^ Force treating all local packages as having dirty files
-
-            ,boptsTests :: !Bool
-            -- ^ Turn on tests for local targets
-            ,boptsTestOpts :: !TestOpts
-            -- ^ Additional test arguments
-
-            ,boptsBenchmarks :: !Bool
-            -- ^ Turn on benchmarks for local targets
-            ,boptsBenchmarkOpts :: !BenchmarkOpts
-            -- ^ Additional test arguments
-            -- ^ Commands (with arguments) to run after a successful build
-            -- ^ Only perform the configure step when building
-            ,boptsReconfigure :: !Bool
-            -- ^ Perform the configure step even if already configured
-            ,boptsCabalVerbose :: !CabalVerbosity
-            -- ^ Ask Cabal to be verbose in its builds
-            ,boptsSplitObjs :: !Bool
-            -- ^ Whether to enable split-objs.
-            ,boptsSkipComponents :: ![Text]
-            -- ^ Which components to skip when building
-            ,boptsInterleavedOutput :: !Bool
-            -- ^ Should we use the interleaved GHC output when building
-            -- multiple packages?
-            ,boptsDdumpDir :: !(Maybe Text)
-            }
-  deriving (Show)
-
-defaultBuildOpts :: BuildOpts
-defaultBuildOpts = BuildOpts
-    { boptsLibProfile = defaultFirstFalse buildMonoidLibProfile
-    , boptsExeProfile = defaultFirstFalse buildMonoidExeProfile
-    , boptsLibStrip = defaultFirstTrue buildMonoidLibStrip
-    , boptsExeStrip = defaultFirstTrue buildMonoidExeStrip
-    , boptsHaddock = False
-    , boptsHaddockOpts = defaultHaddockOpts
-    , boptsOpenHaddocks = defaultFirstFalse buildMonoidOpenHaddocks
-    , boptsHaddockDeps = Nothing
-    , boptsHaddockInternal = defaultFirstFalse buildMonoidHaddockInternal
-    , boptsHaddockHyperlinkSource = defaultFirstTrue buildMonoidHaddockHyperlinkSource
-    , boptsInstallExes = defaultFirstFalse buildMonoidInstallExes
-    , boptsInstallCompilerTool = defaultFirstFalse buildMonoidInstallCompilerTool
-    , boptsPreFetch = defaultFirstFalse buildMonoidPreFetch
-    , boptsKeepGoing = Nothing
-    , boptsKeepTmpFiles = defaultFirstFalse buildMonoidKeepTmpFiles
-    , boptsForceDirty = defaultFirstFalse buildMonoidForceDirty
-    , boptsTests = defaultFirstFalse buildMonoidTests
-    , boptsTestOpts = defaultTestOpts
-    , boptsBenchmarks = defaultFirstFalse buildMonoidBenchmarks
-    , boptsBenchmarkOpts = defaultBenchmarkOpts
-    , boptsReconfigure = defaultFirstFalse buildMonoidReconfigure
-    , boptsCabalVerbose = CabalVerbosity normal
-    , boptsSplitObjs = defaultFirstFalse buildMonoidSplitObjs
-    , boptsSkipComponents = []
-    , boptsInterleavedOutput = defaultFirstTrue buildMonoidInterleavedOutput
-    , boptsDdumpDir = Nothing
-    }
-
-defaultBuildOptsCLI ::BuildOptsCLI
-defaultBuildOptsCLI = BuildOptsCLI
-    { boptsCLITargets = []
-    , boptsCLIDryrun = False
-    , boptsCLIFlags = Map.empty
-    , boptsCLIGhcOptions = []
-    , boptsCLIBuildSubset = BSAll
-    , boptsCLIFileWatch = NoFileWatch
-    , boptsCLIWatchAll = False
-    , boptsCLIExec = []
-    , boptsCLIOnlyConfigure = False
-    , boptsCLICommand = Build
-    , boptsCLIInitialBuildSteps = False
-    }
-
--- | How to apply a CLI flag
-data ApplyCLIFlag
-  = ACFAllProjectPackages
-  -- ^ Apply to all project packages which have such a flag name available.
-  | ACFByName !PackageName
-  -- ^ Apply to the specified package only.
-  deriving (Show, Eq, Ord)
-
--- | Only flags set via 'ACFByName'
-boptsCLIFlagsByName :: BuildOptsCLI -> Map PackageName (Map FlagName Bool)
-boptsCLIFlagsByName =
-  Map.fromList .
-  mapMaybe go .
-  Map.toList .
-  boptsCLIFlags
-  where
-    go (ACFAllProjectPackages, _) = Nothing
-    go (ACFByName name, flags) = Just (name, flags)
-
--- | Build options that may only be specified from the CLI
-data BuildOptsCLI = BuildOptsCLI
-    { boptsCLITargets :: ![Text]
-    , boptsCLIDryrun :: !Bool
-    , boptsCLIGhcOptions :: ![Text]
-    , boptsCLIFlags :: !(Map ApplyCLIFlag (Map FlagName Bool))
-    , boptsCLIBuildSubset :: !BuildSubset
-    , boptsCLIFileWatch :: !FileWatchOpts
-    , boptsCLIWatchAll :: !Bool
-    , boptsCLIExec :: ![(String, [String])]
-    , boptsCLIOnlyConfigure :: !Bool
-    , boptsCLICommand :: !BuildCommand
-    , boptsCLIInitialBuildSteps :: !Bool
-    } deriving Show
-
--- | Command sum type for conditional arguments.
-data BuildCommand
-    = Build
-    | Test
-    | Haddock
-    | Bench
-    | Install
-    deriving (Eq, Show)
-
--- | Build options that may be specified in the stack.yaml or from the CLI
-data BuildOptsMonoid = BuildOptsMonoid
-    { buildMonoidTrace :: !Any
-    , buildMonoidProfile :: !Any
-    , buildMonoidNoStrip :: !Any
-    , buildMonoidLibProfile :: !FirstFalse
-    , buildMonoidExeProfile :: !FirstFalse
-    , buildMonoidLibStrip :: !FirstTrue
-    , buildMonoidExeStrip :: !FirstTrue
-    , buildMonoidHaddock :: !FirstFalse
-    , buildMonoidHaddockOpts :: !HaddockOptsMonoid
-    , buildMonoidOpenHaddocks :: !FirstFalse
-    , buildMonoidHaddockDeps :: !(First Bool)
-    , buildMonoidHaddockInternal :: !FirstFalse
-    , buildMonoidHaddockHyperlinkSource :: !FirstTrue
-    , buildMonoidInstallExes :: !FirstFalse
-    , buildMonoidInstallCompilerTool :: !FirstFalse
-    , buildMonoidPreFetch :: !FirstFalse
-    , buildMonoidKeepGoing :: !(First Bool)
-    , buildMonoidKeepTmpFiles :: !FirstFalse
-    , buildMonoidForceDirty :: !FirstFalse
-    , buildMonoidTests :: !FirstFalse
-    , buildMonoidTestOpts :: !TestOptsMonoid
-    , buildMonoidBenchmarks :: !FirstFalse
-    , buildMonoidBenchmarkOpts :: !BenchmarkOptsMonoid
-    , buildMonoidReconfigure :: !FirstFalse
-    , buildMonoidCabalVerbose :: !(First CabalVerbosity)
-    , buildMonoidSplitObjs :: !FirstFalse
-    , buildMonoidSkipComponents :: ![Text]
-    , buildMonoidInterleavedOutput :: !FirstTrue
-    , buildMonoidDdumpDir :: !(First Text)
-    } deriving (Show, Generic)
-
-instance FromJSON (WithJSONWarnings BuildOptsMonoid) where
-  parseJSON = withObjectWarnings "BuildOptsMonoid"
-    (\o -> do let buildMonoidTrace = Any False
-                  buildMonoidProfile = Any False
-                  buildMonoidNoStrip = Any False
-              buildMonoidLibProfile <- FirstFalse <$> o ..:? buildMonoidLibProfileArgName
-              buildMonoidExeProfile <-FirstFalse <$>  o ..:? buildMonoidExeProfileArgName
-              buildMonoidLibStrip <- FirstTrue <$> o ..:? buildMonoidLibStripArgName
-              buildMonoidExeStrip <-FirstTrue <$>  o ..:? buildMonoidExeStripArgName
-              buildMonoidHaddock <- FirstFalse <$> o ..:? buildMonoidHaddockArgName
-              buildMonoidHaddockOpts <- jsonSubWarnings (o ..:? buildMonoidHaddockOptsArgName ..!= mempty)
-              buildMonoidOpenHaddocks <- FirstFalse <$> o ..:? buildMonoidOpenHaddocksArgName
-              buildMonoidHaddockDeps <- First <$> o ..:? buildMonoidHaddockDepsArgName
-              buildMonoidHaddockInternal <- FirstFalse <$> o ..:? buildMonoidHaddockInternalArgName
-              buildMonoidHaddockHyperlinkSource <- FirstTrue <$> o ..:? buildMonoidHaddockHyperlinkSourceArgName
-              buildMonoidInstallExes <- FirstFalse <$> o ..:? buildMonoidInstallExesArgName
-              buildMonoidInstallCompilerTool <- FirstFalse <$> o ..:? buildMonoidInstallCompilerToolArgName
-              buildMonoidPreFetch <- FirstFalse <$> o ..:? buildMonoidPreFetchArgName
-              buildMonoidKeepGoing <- First <$> o ..:? buildMonoidKeepGoingArgName
-              buildMonoidKeepTmpFiles <- FirstFalse <$> o ..:? buildMonoidKeepTmpFilesArgName
-              buildMonoidForceDirty <- FirstFalse <$> o ..:? buildMonoidForceDirtyArgName
-              buildMonoidTests <- FirstFalse <$> o ..:? buildMonoidTestsArgName
-              buildMonoidTestOpts <- jsonSubWarnings (o ..:? buildMonoidTestOptsArgName ..!= mempty)
-              buildMonoidBenchmarks <- FirstFalse <$> o ..:? buildMonoidBenchmarksArgName
-              buildMonoidBenchmarkOpts <- jsonSubWarnings (o ..:? buildMonoidBenchmarkOptsArgName ..!= mempty)
-              buildMonoidReconfigure <- FirstFalse <$> o ..:? buildMonoidReconfigureArgName
-              cabalVerbosity <- First <$> o ..:? buildMonoidCabalVerbosityArgName
-              cabalVerbose <- FirstFalse <$> o ..:? buildMonoidCabalVerboseArgName
-              let buildMonoidCabalVerbose = cabalVerbosity <> toFirstCabalVerbosity cabalVerbose
-              buildMonoidSplitObjs <- FirstFalse <$> o ..:? buildMonoidSplitObjsName
-              buildMonoidSkipComponents <- o ..:? buildMonoidSkipComponentsName ..!= mempty
-              buildMonoidInterleavedOutput <- FirstTrue <$> o ..:? buildMonoidInterleavedOutputName
-              buildMonoidDdumpDir <- o ..:? buildMonoidDdumpDirName ..!= mempty
-              pure BuildOptsMonoid{..})
-
-buildMonoidLibProfileArgName :: Text
-buildMonoidLibProfileArgName = "library-profiling"
-
-buildMonoidExeProfileArgName :: Text
-buildMonoidExeProfileArgName = "executable-profiling"
-
-buildMonoidLibStripArgName :: Text
-buildMonoidLibStripArgName = "library-stripping"
-
-buildMonoidExeStripArgName :: Text
-buildMonoidExeStripArgName = "executable-stripping"
-
-buildMonoidHaddockArgName :: Text
-buildMonoidHaddockArgName = "haddock"
-
-buildMonoidHaddockOptsArgName :: Text
-buildMonoidHaddockOptsArgName = "haddock-arguments"
-
-buildMonoidOpenHaddocksArgName :: Text
-buildMonoidOpenHaddocksArgName = "open-haddocks"
-
-buildMonoidHaddockDepsArgName :: Text
-buildMonoidHaddockDepsArgName = "haddock-deps"
-
-buildMonoidHaddockInternalArgName :: Text
-buildMonoidHaddockInternalArgName = "haddock-internal"
-
-buildMonoidHaddockHyperlinkSourceArgName :: Text
-buildMonoidHaddockHyperlinkSourceArgName = "haddock-hyperlink-source"
-
-buildMonoidInstallExesArgName :: Text
-buildMonoidInstallExesArgName = "copy-bins"
-
-buildMonoidInstallCompilerToolArgName :: Text
-buildMonoidInstallCompilerToolArgName = "copy-compiler-tool"
-
-buildMonoidPreFetchArgName :: Text
-buildMonoidPreFetchArgName = "prefetch"
-
-buildMonoidKeepGoingArgName :: Text
-buildMonoidKeepGoingArgName = "keep-going"
-
-buildMonoidKeepTmpFilesArgName :: Text
-buildMonoidKeepTmpFilesArgName = "keep-tmp-files"
-
-buildMonoidForceDirtyArgName :: Text
-buildMonoidForceDirtyArgName = "force-dirty"
-
-buildMonoidTestsArgName :: Text
-buildMonoidTestsArgName = "test"
-
-buildMonoidTestOptsArgName :: Text
-buildMonoidTestOptsArgName = "test-arguments"
-
-buildMonoidBenchmarksArgName :: Text
-buildMonoidBenchmarksArgName = "bench"
-
-buildMonoidBenchmarkOptsArgName :: Text
-buildMonoidBenchmarkOptsArgName = "benchmark-opts"
-
-buildMonoidReconfigureArgName :: Text
-buildMonoidReconfigureArgName = "reconfigure"
-
-buildMonoidCabalVerbosityArgName :: Text
-buildMonoidCabalVerbosityArgName = "cabal-verbosity"
-
-buildMonoidCabalVerboseArgName :: Text
-buildMonoidCabalVerboseArgName = "cabal-verbose"
-
-buildMonoidSplitObjsName :: Text
-buildMonoidSplitObjsName = "split-objs"
-
-buildMonoidSkipComponentsName :: Text
-buildMonoidSkipComponentsName = "skip-components"
-
-buildMonoidInterleavedOutputName :: Text
-buildMonoidInterleavedOutputName = "interleaved-output"
-
-buildMonoidDdumpDirName :: Text
-buildMonoidDdumpDirName = "ddump-dir"
-
-instance Semigroup BuildOptsMonoid where
-    (<>) = mappenddefault
-
-instance Monoid BuildOptsMonoid where
-    mempty = memptydefault
-    mappend = (<>)
-
--- | Which subset of packages to build
-data BuildSubset
-    = BSAll
-    | BSOnlySnapshot
-    -- ^ Only install packages in the snapshot database, skipping
-    -- packages intended for the local database.
-    | BSOnlyDependencies
-    | BSOnlyLocals
-    -- ^ Refuse to build anything in the snapshot database, see
-    -- https://github.com/commercialhaskell/stack/issues/5272
-    deriving (Show, Eq)
-
--- | Options for the 'FinalAction' 'DoTests'
-data TestOpts =
-  TestOpts {toRerunTests :: !Bool -- ^ Whether successful tests will be run gain
-           ,toAdditionalArgs :: ![String] -- ^ Arguments passed to the test program
-           ,toCoverage :: !Bool -- ^ Generate a code coverage report
-           ,toDisableRun :: !Bool -- ^ Disable running of tests
-           ,toMaximumTimeSeconds :: !(Maybe Int) -- ^ test suite timeout in seconds
-           } deriving (Eq,Show)
-
-defaultTestOpts :: TestOpts
-defaultTestOpts = TestOpts
-    { toRerunTests = defaultFirstTrue toMonoidRerunTests
-    , toAdditionalArgs = []
-    , toCoverage = defaultFirstFalse toMonoidCoverage
-    , toDisableRun = defaultFirstFalse toMonoidDisableRun
-    , toMaximumTimeSeconds = Nothing
-    }
-
-data TestOptsMonoid =
-  TestOptsMonoid
-    { toMonoidRerunTests :: !FirstTrue
-    , toMonoidAdditionalArgs :: ![String]
-    , toMonoidCoverage :: !FirstFalse
-    , toMonoidDisableRun :: !FirstFalse
-    , toMonoidMaximumTimeSeconds :: !(First (Maybe Int))
-    } deriving (Show, Generic)
-
-instance FromJSON (WithJSONWarnings TestOptsMonoid) where
-  parseJSON = withObjectWarnings "TestOptsMonoid"
-    (\o -> do toMonoidRerunTests <- FirstTrue <$> o ..:? toMonoidRerunTestsArgName
-              toMonoidAdditionalArgs <- o ..:? toMonoidAdditionalArgsName ..!= []
-              toMonoidCoverage <- FirstFalse <$> o ..:? toMonoidCoverageArgName
-              toMonoidDisableRun <- FirstFalse <$> o ..:? toMonoidDisableRunArgName
-              toMonoidMaximumTimeSeconds <- First <$> o ..:? toMonoidMaximumTimeSecondsArgName
-              pure TestOptsMonoid{..})
-
-toMonoidRerunTestsArgName :: Text
-toMonoidRerunTestsArgName = "rerun-tests"
-
-toMonoidAdditionalArgsName :: Text
-toMonoidAdditionalArgsName = "additional-args"
-
-toMonoidCoverageArgName :: Text
-toMonoidCoverageArgName = "coverage"
-
-toMonoidDisableRunArgName :: Text
-toMonoidDisableRunArgName = "no-run-tests"
-
-toMonoidMaximumTimeSecondsArgName :: Text
-toMonoidMaximumTimeSecondsArgName = "test-suite-timeout"
-
-instance Semigroup TestOptsMonoid where
-  (<>) = mappenddefault
-
-instance Monoid TestOptsMonoid where
-  mempty = memptydefault
-  mappend = (<>)
-
-
-
--- | Haddock Options
-newtype HaddockOpts =
-  HaddockOpts { hoAdditionalArgs :: [String] -- ^ Arguments passed to haddock program
-              } deriving (Eq,Show)
-
-newtype HaddockOptsMonoid =
-  HaddockOptsMonoid {hoMonoidAdditionalArgs :: [String]
-                    } deriving (Show, Generic)
-
-defaultHaddockOpts :: HaddockOpts
-defaultHaddockOpts = HaddockOpts {hoAdditionalArgs = []}
-
-instance FromJSON (WithJSONWarnings HaddockOptsMonoid) where
-  parseJSON = withObjectWarnings "HaddockOptsMonoid"
-    (\o -> do hoMonoidAdditionalArgs <- o ..:? hoMonoidAdditionalArgsName ..!= []
-              pure HaddockOptsMonoid{..})
-
-instance Semigroup HaddockOptsMonoid where
-  (<>) = mappenddefault
-
-instance Monoid HaddockOptsMonoid where
-  mempty = memptydefault
-  mappend = (<>)
-
-hoMonoidAdditionalArgsName :: Text
-hoMonoidAdditionalArgsName = "haddock-args"
-
-
--- | Options for the 'FinalAction' 'DoBenchmarks'
-data BenchmarkOpts =
-  BenchmarkOpts
-    { beoAdditionalArgs :: !(Maybe String) -- ^ Arguments passed to the benchmark program
-    , beoDisableRun :: !Bool -- ^ Disable running of benchmarks
-    } deriving (Eq,Show)
-
-defaultBenchmarkOpts :: BenchmarkOpts
-defaultBenchmarkOpts = BenchmarkOpts
-    { beoAdditionalArgs = Nothing
-    , beoDisableRun = False
-    }
-
-data BenchmarkOptsMonoid =
-  BenchmarkOptsMonoid
-     { beoMonoidAdditionalArgs :: !(First String)
-     , beoMonoidDisableRun :: !(First Bool)
-     } deriving (Show, Generic)
-
-instance FromJSON (WithJSONWarnings BenchmarkOptsMonoid) where
-  parseJSON = withObjectWarnings "BenchmarkOptsMonoid"
-    (\o -> do beoMonoidAdditionalArgs <- First <$> o ..:? beoMonoidAdditionalArgsArgName
-              beoMonoidDisableRun <- First <$> o ..:? beoMonoidDisableRunArgName
-              pure BenchmarkOptsMonoid{..})
-
-beoMonoidAdditionalArgsArgName :: Text
-beoMonoidAdditionalArgsArgName = "benchmark-arguments"
-
-beoMonoidDisableRunArgName :: Text
-beoMonoidDisableRunArgName = "no-run-benchmarks"
-
-instance Semigroup BenchmarkOptsMonoid where
-  (<>) = mappenddefault
-
-instance Monoid BenchmarkOptsMonoid where
-  mempty = memptydefault
-  mappend = (<>)
-
-data FileWatchOpts
-  = NoFileWatch
-  | FileWatch
-  | FileWatchPoll
-  deriving (Show,Eq)
-
-newtype CabalVerbosity = CabalVerbosity Verbosity
-  deriving (Eq, Show)
-
-toFirstCabalVerbosity :: FirstFalse -> First CabalVerbosity
-toFirstCabalVerbosity vf = First $ getFirstFalse vf <&> \p ->
-  if p then verboseLevel else normalLevel
- where
-  verboseLevel = CabalVerbosity verbose
-  normalLevel  = CabalVerbosity normal
-
-instance FromJSON CabalVerbosity where
-
-  parseJSON = withText "CabalVerbosity" $ \t ->
-    let s = T.unpack t
-        errMsg = fail $ "Unrecognised Cabal verbosity: " ++ s
-    in  maybe errMsg pure (simpleParsec s)
-
-instance Parsec CabalVerbosity where
-  parsec = CabalVerbosity <$> parsec
diff --git a/src/Stack/Types/Config/Exception.hs b/src/Stack/Types/Config/Exception.hs
new file mode 100644
index 0000000000..14044da2d8
--- /dev/null
+++ b/src/Stack/Types/Config/Exception.hs
@@ -0,0 +1,269 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
+
+{-|
+Module      : Stack.Types.Config.Exception
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.Config.Exception
+  ( ConfigException (..)
+  , ConfigPrettyException (..)
+  , ParseAbsolutePathException (..)
+  ) where
+
+import qualified Data.Text as T
+import           Data.Yaml ( ParseException )
+import qualified Data.Yaml as Yaml
+import           Distribution.System ( Arch )
+import           Path( dirname, filename )
+import           Stack.Prelude
+import           Stack.Types.ConfigMonoid
+                   ( configMonoidAllowDifferentUserName
+                   , configMonoidGHCVariantName, configMonoidSystemGHCName
+                   )
+import           Stack.Types.MsysEnvironment ( MsysEnvironment )
+import           Stack.Types.Version
+                   ( VersionRange, stackVersion, versionRangeText )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Config" module.
+data ConfigException
+  = ParseCustomSnapshotException Text ParseException
+  | NoProjectConfigFound (Path Abs Dir) (Maybe Text)
+  | UnexpectedArchiveContents [Path Abs Dir] [Path Abs File]
+  | UnableToExtractArchive Text (Path Abs File)
+  | BadStackVersionException VersionRange
+  | NoSuchDirectory FilePath
+  | NoSuchFile FilePath
+  | ParseGHCVariantException String
+  | BadStackRoot (Path Abs Dir)
+  | Won'tCreateStackRootInDirectoryOwnedByDifferentUser
+      (Path Abs Dir)
+      (Path Abs Dir)
+    -- ^ @$STACK_ROOT@, parent dir
+  | UserDoesn'tOwnDirectory (Path Abs Dir)
+  | ManualGHCVariantSettingsAreIncompatibleWithSystemGHC
+  | NixRequiresSystemGhc
+  | NoSnapshotWhenUsingNoProject
+  | NoLTSWithMajorVersion Int
+  | NoLTSFound
+  deriving Show
+
+instance Exception ConfigException where
+  displayException (ParseCustomSnapshotException url exception) = concat
+    [ "Error: [S-8981]\n"
+    , "Could not parse '"
+    , T.unpack url
+    , "':\n"
+    , Yaml.prettyPrintParseException exception
+    , "\nSee https://docs.haskellstack.org/en/stable/topics/custom_snapshot/"
+    ]
+  displayException (NoProjectConfigFound dir mcmd) = concat
+    [ "Error: [S-2206]\n"
+    , "Unable to find a stack.yaml file in the current directory ("
+    , toFilePath dir
+    , ") or its ancestors"
+    , case mcmd of
+        Nothing -> ""
+        Just cmd -> "\nRecommended action: stack " ++ T.unpack cmd
+    ]
+  displayException (UnexpectedArchiveContents dirs files) = concat
+    [ "Error: [S-4964]\n"
+    , "When unpacking an archive specified in your stack.yaml file, "
+    , "did not find expected contents. Expected: a single directory. Found: "
+    , show ( map (toFilePath . dirname) dirs
+           , map (toFilePath . filename) files
+           )
+    ]
+  displayException (UnableToExtractArchive url file) = concat
+    [ "Error: [S-2040]\n"
+    , "Archive extraction failed. Tarballs and zip archives are supported, \
+      \couldn't handle the following URL, "
+    , T.unpack url
+    , " downloaded to the file "
+    , toFilePath $ filename file
+    ]
+  displayException (BadStackVersionException requiredRange) = concat
+    [ "Error: [S-1641]\n"
+    , "The version of Stack you are using ("
+    , show stackVersion
+    , ") is outside the required\n"
+    ,"version range specified in stack.yaml ("
+    , T.unpack (versionRangeText requiredRange)
+    , ").\n"
+    , "You can upgrade Stack by running:\n\n"
+    , "stack upgrade"
+    ]
+  displayException (NoSuchDirectory dir) = concat
+    [ "Error: [S-8773]\n"
+    , "No directory could be located matching the supplied path: "
+    , dir
+    ]
+  displayException (NoSuchFile file) = concat
+    [ "Error: [S-4335]\n"
+    , "No file could be located matching the supplied path: "
+    , file
+    ]
+  displayException (ParseGHCVariantException v) = concat
+    [ "Error: [S-3938]\n"
+    , "Invalid ghc-variant value: "
+    , v
+    ]
+  displayException (BadStackRoot stackRoot) = concat
+    [ "Error: [S-8530]\n"
+    , "Invalid Stack root: '"
+    , toFilePath stackRoot
+    , "'. Please provide a valid absolute path."
+    ]
+  displayException (Won'tCreateStackRootInDirectoryOwnedByDifferentUser envStackRoot parentDir) = concat
+    [ "Error: [S-7613]\n"
+    , "Preventing creation of Stack root '"
+    , toFilePath envStackRoot
+    , "'. Parent directory '"
+    , toFilePath parentDir
+    , "' is owned by someone else."
+    ]
+  displayException (UserDoesn'tOwnDirectory dir) = concat
+    [ "Error: [S-8707]\n"
+    , "You are not the owner of '"
+    , toFilePath dir
+    , "'. Aborting to protect file permissions."
+    , "\nRetry with '--"
+    , T.unpack configMonoidAllowDifferentUserName
+    , "' to disable this precaution."
+    ]
+  displayException ManualGHCVariantSettingsAreIncompatibleWithSystemGHC = T.unpack $ T.concat
+    [ "Error: [S-3605]\n"
+    , "Stack can only control the "
+    , configMonoidGHCVariantName
+    , " of its own GHC installations. Please use '--no-"
+    , configMonoidSystemGHCName
+    , "'."
+    ]
+  displayException NixRequiresSystemGhc = T.unpack $ T.concat
+    [ "Error: [S-6816]\n"
+    , "Stack's Nix integration is incompatible with '--no-system-ghc'. "
+    , "Please use '--"
+    , configMonoidSystemGHCName
+    , "' or disable the Nix integration."
+    ]
+  displayException NoSnapshotWhenUsingNoProject =
+    "Error: [S-5027]\n"
+    ++ "When using the script command, you must provide a snapshot argument"
+  displayException (NoLTSWithMajorVersion n) = concat
+    [ "Error: [S-3803]\n"
+    , "No LTS release found with major version "
+    , show n
+    , "."
+    ]
+  displayException NoLTSFound =
+    "Error: [S-5472]\n"
+    ++ "No LTS releases found."
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Config" module.
+data ConfigPrettyException
+  = ParseConfigFileException !(Path Abs File) !ParseException
+  | StackWorkEnvNotRelativeDir !String
+  | DuplicateLocalPackageNames ![(PackageName, [PackageLocation])]
+  | BadMsysEnvironment !MsysEnvironment !Arch
+  | NoMsysEnvironmentBug
+  | ConfigFileNotProjectLevelBug
+  | NoExecutablePath !String
+  deriving Show
+
+instance Pretty ConfigPrettyException where
+  pretty (ParseConfigFileException configFile exception) =
+    "[S-6602]"
+    <> line
+    <> fillSep
+         [ flow "Stack could not load and parse"
+         , pretty configFile
+         , flow "as a configuraton file."
+         ]
+    <> blankLine
+    <> flow "While loading and parsing, Stack encountered the following \
+            \error:"
+    <> blankLine
+    <> string (Yaml.prettyPrintParseException exception)
+    <> blankLine
+    <> fillSep
+         [ flow "For help about the content of Stack's configuration files, \
+                \see (for the most recent release of Stack)"
+         ,    style
+                Url
+                "http://docs.haskellstack.org/en/stable/configure/yaml/"
+           <> "."
+         ]
+  pretty (StackWorkEnvNotRelativeDir x) =
+    "[S-7462]"
+    <> line
+    <> flow "Stack failed to interpret the value of the STACK_WORK \
+            \environment variable as a valid relative path to a directory. \
+            \Stack will not accept an absolute path. A path containing a \
+            \.. (parent directory) component is not valid."
+    <> blankLine
+    <> fillSep
+         [ flow "If set, Stack expects the value to identify the location \
+                \of Stack's work directory, relative to the root directory \
+                \of the project or package. Stack encountered the value:"
+         , style Error (fromString x) <> "."
+         ]
+  pretty (DuplicateLocalPackageNames pairs) =
+    "[S-5470]"
+    <> line
+    <> fillSep
+         [ flow "The same package name is used in more than one project \
+                \package or"
+         , style Shell "extra-deps" <> "."
+         ]
+    <> mconcat (map go pairs)
+   where
+    go (name, dirs) =
+         blankLine
+      <> fillSep
+           [ style Error (fromPackageName name)
+           , flow "used in:"
+           ]
+      <> line
+      <> bulletedList (map (fromString . T.unpack . textDisplay) dirs)
+  pretty (BadMsysEnvironment msysEnv arch) =
+    "[S-6854]"
+    <> line
+    <> fillSep
+         [ flow "The specified MSYS2 environment"
+         , style Error (fromString $ show msysEnv)
+         , flow "is not consistent with the architecture"
+         , fromString (show arch) <> "."
+         ]
+  pretty NoMsysEnvironmentBug = bugPrettyReport "[S-5006]" $
+    flow "No default MSYS2 environment."
+  pretty ConfigFileNotProjectLevelBug = bugPrettyReport "[S-8398]" $
+    flow "The configuration file is not a project-level one."
+  pretty (NoExecutablePath progName) =
+    "[S-6890]"
+    <> line
+    <> fillSep
+         [ flow "The path for the executable file invoked as"
+         , style Shell (fromString progName)
+         , flow "can not be identified."
+         ]
+
+instance Exception ConfigPrettyException
+
+-- | Type representing an exception thrown by functions exported by the
+-- "Stack.Config" module.
+data ParseAbsolutePathException
+  = ParseAbsolutePathException String String
+  deriving Show
+
+instance Exception ParseAbsolutePathException where
+  displayException (ParseAbsolutePathException envVar dir) = concat
+    [ "Error: [S-9437]\n"
+    , "Failed to parse "
+    , envVar
+    , " environment variable (expected absolute directory): "
+    , dir
+    ]
diff --git a/src/Stack/Types/ConfigExtra.hs b/src/Stack/Types/ConfigExtra.hs
new file mode 100644
index 0000000000..4737cdff40
--- /dev/null
+++ b/src/Stack/Types/ConfigExtra.hs
@@ -0,0 +1,30 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.ConfigExtra
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ConfigExtra
+  ( ConfigExtra (..)
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.Config ( Config )
+import           Stack.Types.Project ( Project (..) )
+
+-- | A type that represents 'Config' values together with some extra information
+--
+data ConfigExtra = ConfigExtra
+  { config :: !Config
+  , mSnapshot :: !(Maybe RawSnapshotLocation)
+  , project :: !Project
+  , configFile :: !(Either (Path Abs File) (Path Abs File))
+    -- ^ Either (Left) the location of the user-specific global configuration
+    -- file or, in most cases, (Right) the location of the project-level
+    -- coniguration file (stack.yaml, by default).
+    --
+    -- Note: if the STACK_YAML environment variable is used, the location of the
+    -- project-level configuration file may be different from
+    -- projectRootL </> "stack.yaml" if a different file name is used.
+  }
diff --git a/src/Stack/Types/ConfigMonoid.hs b/src/Stack/Types/ConfigMonoid.hs
new file mode 100644
index 0000000000..beffb65ba8
--- /dev/null
+++ b/src/Stack/Types/ConfigMonoid.hs
@@ -0,0 +1,702 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Types.ConfigMonoid
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ConfigMonoid
+  ( ConfigMonoid (..)
+  , parseConfigMonoid
+  , parseConfigMonoidObject
+  , configMonoidAllowDifferentUserName
+  , configMonoidGHCVariantName
+  , configMonoidInstallGHCName
+  , configMonoidInstallMsysName
+  , configMonoidRecommendStackUpgradeName
+  , configMonoidSystemGHCName
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), Object, Value )
+import           Data.Aeson.WarningParser
+                   ( WarningParser, WithJSONWarnings, (..:?), (..!=)
+                   , jsonSubWarnings, jsonSubWarningsT, withObjectWarnings
+                   )
+import           Casa.Client ( CasaRepoPrefix )
+import           Control.Monad.Writer ( tell )
+import           Data.Coerce ( coerce )
+import qualified Data.Map as Map
+import qualified Data.Map.Strict as M
+import qualified Data.Monoid as Monoid
+import           Data.Monoid.Map ( MonoidMap (..) )
+import qualified Data.Yaml as Yaml
+import           Distribution.Version ( anyVersion )
+import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
+import           Stack.Prelude hiding ( snapshotLocation )
+import           Stack.Types.AllowNewerDeps ( AllowNewerDeps )
+import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
+import           Stack.Types.ApplyProgOptions ( ApplyProgOptions (..) )
+import           Stack.Types.BuildOptsMonoid ( BuildOptsMonoid )
+import           Stack.Types.Casa ( CasaOptsMonoid )
+import           Stack.Types.CabalConfigKey ( CabalConfigKey )
+import           Stack.Types.ColorWhen ( ColorWhen )
+import           Stack.Types.Compiler
+                   ( CompilerBindistPath, CompilerRepository, CompilerTarget )
+import           Stack.Types.CompilerBuild ( CompilerBuild )
+import           Stack.Types.Docker ( DockerOptsMonoid, VersionRangeJSON (..) )
+import           Stack.Types.DumpLogs ( DumpLogs )
+import           Stack.Types.GhcOptionKey ( GhcOptionKey (..) )
+import           Stack.Types.GhcOptions ( GhcOptions (..) )
+import           Stack.Types.GHCVariant ( GHCVariant )
+import           Stack.Types.MsysEnvironment ( MsysEnvironment )
+import           Stack.Types.Nix ( NixOptsMonoid )
+import           Stack.Types.PvpBounds ( PvpBounds )
+import           Stack.Types.SCM ( SCM )
+import           Stack.Types.SetupInfo ( SetupInfo )
+import           Stack.Types.TemplateName ( TemplateName )
+import           Stack.Types.Version
+                   ( IntersectingVersionRange (..), VersionCheck )
+import qualified System.FilePath as FilePath
+import Stack.Types.Snapshot (AbstractSnapshot)
+
+-- | An uninterpreted representation of configuration options. Configurations
+-- may be "cascaded" using mappend (left-biased).
+data ConfigMonoid = ConfigMonoid
+  { stackRoot               :: !(First (Path Abs Dir))
+    -- ^ See: 'Stack.Types.Config.stackRoot'
+  , workDir                 :: !(First (Path Rel Dir))
+    -- ^ See: 'Stack.Types.Config.workDir'.
+  , buildOpts               :: !BuildOptsMonoid
+    -- ^ build options.
+  , dockerOpts              :: !DockerOptsMonoid
+    -- ^ Docker options.
+  , nixOpts                 :: !NixOptsMonoid
+    -- ^ Options for the execution environment (nix-shell or container)
+  , connectionCount         :: !(First Int)
+    -- ^ See: 'Stack.Types.Config.connectionCount'
+  , hideTHLoading           :: !FirstTrue
+    -- ^ See: 'Stack.Types.Config.hideTHLoading'
+  , prefixTimestamps        :: !(First Bool)
+    -- ^ See: 'Stack.Types.Config.prefixTimestamps'
+  , latestSnapshot          :: !(First Text)
+    -- ^ See: 'Stack.Types.Config.latestSnapshot'
+  , recentSnapshots         :: !(First Text)
+    -- ^ See: 'Stack.Types.Config.recentSnapshots'
+  , packageIndex            :: !(First PackageIndexConfig)
+    -- ^ See: 'withPantryConfig'
+  , systemGHC               :: !(First Bool)
+    -- ^ See: 'Stack.Types.Config.systemGHC'
+  , installGHC              :: !FirstTrue
+    -- ^ See: 'Stack.Types.Config.installGHC'
+  , installMsys             :: !(First Bool)
+    -- ^ See: 'Stack.Types.Config.installMsys'
+  , skipGHCCheck            :: !FirstFalse
+    -- ^ See: 'Stack.Types.Config.skipGHCCheck'
+  , skipMsys                :: !FirstFalse
+    -- ^ See: 'Stack.Types.Config.skipMsys'
+  , msysEnvironment         :: !(First MsysEnvironment)
+    -- ^ See: 'Stack.Types.Config.msysEnvironment'
+  , compilerCheck           :: !(First VersionCheck)
+    -- ^ See: 'Stack.Types.Config.compilerCheck'
+  , compilerRepository      :: !(First CompilerRepository)
+    -- ^ See: 'Stack.Types.Config.compilerRepository'
+  , compilerTarget          :: !(First CompilerTarget)
+    -- ^ See: 'Stack.Types.Config.compilerTarget'
+  , compilerBindistPath     :: !(First CompilerBindistPath)
+    -- ^ See: 'Stack.Types.Config.compilerBindistPath'
+  , requireStackVersion     :: !IntersectingVersionRange
+    -- ^ See: 'Stack.Types.Config.requireStackVersion'
+  , arch                    :: !(First String)
+    -- ^ Used for overriding the platform
+  , ghcVariant              :: !(First GHCVariant)
+    -- ^ Used for overriding the platform
+  , ghcBuild                :: !(First CompilerBuild)
+    -- ^ Used for overriding the GHC build
+  , jobs                    :: !(First Int)
+    -- ^ See: 'Stack.Types.Config.jobs'
+  , extraIncludeDirs        :: ![FilePath]
+    -- ^ See: 'Stack.Types.Config.extraIncludeDirs'
+  , extraLibDirs            :: ![FilePath]
+    -- ^ See: 'Stack.Types.Config.extraLibDirs'
+  , customPreprocessorExts  :: ![Text]
+    -- ^ See: 'Stack.Types.Config.customPreprocessorExts'
+  , overrideGccPath         :: !(First (Path Abs File))
+    -- ^ Allow users to override the path to gcc
+  , overrideHpack           :: !(First FilePath)
+    -- ^ Use Hpack executable (overrides bundled Hpack)
+  , hpackForce              :: !FirstFalse
+    -- ^ Pass --force to Hpack to always overwrite Cabal file
+  , concurrentTests         :: !(First Bool)
+    -- ^ See: 'Stack.Types.Config.concurrentTests'
+  , localBinPath            :: !(First FilePath)
+    -- ^ Used to override the binary installation dir
+  , fileWatchHook           :: !(First FilePath)
+    -- ^ Path to executable used to override --file-watch post-processing.
+  , templateParameters      :: !(Map Text Text)
+    -- ^ Template parameters.
+  , scmInit                 :: !(First SCM)
+    -- ^ Initialize SCM (e.g. git init) when making new projects?
+  , ghcOptionsByName        :: !(MonoidMap PackageName (Monoid.Dual [Text]))
+    -- ^ See 'Stack.Types.Config.ghcOptionsByName'. Uses 'Monoid.Dual' so that
+    -- options from the configs on the right come first, so that they
+    -- can be overridden.
+  , ghcOptionsByCat         :: !(MonoidMap ApplyGhcOptions (Monoid.Dual [Text]))
+    -- ^ See 'Stack.Types.Config.ghcOptionsAll'. Uses 'Monoid.Dual' so that options
+    -- from the configs on the right come first, so that they can be
+    -- overridden.
+  , cabalConfigOpts         :: !(MonoidMap CabalConfigKey (Monoid.Dual [Text]))
+    -- ^ See 'Stack.Types.Config.cabalConfigOpts'.
+  , extraPath               :: ![Path Abs Dir]
+    -- ^ Additional paths to search for executables in
+  , setupInfoLocations      :: ![String]
+    -- ^ See 'Stack.Types.Config.setupInfoLocations'
+  , setupInfoInline         :: !SetupInfo
+    -- ^ See 'Stack.Types.Config.setupInfoInline'
+  , localProgramsBase       :: !(First (Path Abs Dir))
+    -- ^ Override the default local programs dir, where e.g. GHC is installed.
+  , pvpBounds               :: !(First PvpBounds)
+    -- ^ See 'Stack.Types.Config.pvpBounds'
+  , modifyCodePage          :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.modifyCodePage'
+  , rebuildGhcOptions       :: !FirstFalse
+    -- ^ See 'Stack.Types.Config.monoidRebuildGhcOptions'
+  , applyGhcOptions         :: !(First ApplyGhcOptions)
+    -- ^ See 'Stack.Types.Config.applyGhcOptions'
+  , applyProgOptions        :: !(First ApplyProgOptions)
+    -- ^ See 'Stack.Types.Config.applyProgOptions'
+  , allowNewer              :: !(First Bool)
+    -- ^ See 'Stack.Types.Config.monoidAllowNewer'
+  , allowNewerDeps          :: !(Maybe AllowNewerDeps)
+    -- ^ See 'Stack.Types.Config.monoidAllowNewerDeps'
+  , defaultInitSnapshot     :: !(First (Unresolved AbstractSnapshot))
+   -- ^ An optional default snapshot to use with @stack init@ when none is
+   -- specified.
+  , defaultTemplate         :: !(First TemplateName)
+   -- ^ The default template to use when none is specified.
+   -- (If Nothing, the 'default' default template is used.)
+  , allowDifferentUser      :: !(First Bool)
+   -- ^ Allow users other than the Stack root owner to use the Stack
+   -- installation.
+  , dumpLogs                :: !(First DumpLogs)
+    -- ^ See 'Stack.Types.Config.dumpLogs'
+  , saveHackageCreds        :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.saveHackageCreds'
+  , hackageBaseUrl          :: !(First Text)
+    -- ^ See 'Stack.Types.Config.hackageBaseUrl'
+  , colorWhen               :: !(First ColorWhen)
+    -- ^ When to use \'ANSI\' colors
+  , styles                  :: !StylesUpdate
+  , hideSourcePaths         :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.hideSourcePaths'
+  , recommendStackUpgrade   :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.recommendStackUpgrade'
+  , notifyIfNixOnPath       :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.notifyIfNixOnPath'
+  , notifyIfGhcUntested     :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.notifyIfGhcUntested'
+  , notifyIfCabalUntested   :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.notifyIfCabalUntested'
+  , notifyIfArchUnknown     :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.notifyIfArchUnknown'
+  , notifyIfNoRunTests      :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.notifyIfNoRunTests'
+  , notifyIfNoRunBenchmarks :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.notifyIfNoRunBenchmarks'
+  , notifyIfBaseNotBoot     :: !FirstTrue
+    -- ^ See 'Stack.Types.Config.notifyIfBaseNotBoot'
+  , casaOpts                :: !CasaOptsMonoid
+    -- ^ Casa configuration options.
+  , casaRepoPrefix          :: !(First CasaRepoPrefix)
+    -- ^ Casa repository prefix (deprecated).
+  , snapshotLocation        :: !(First Text)
+    -- ^ Custom location of LTS/Nightly snapshots
+  , globalHintsLocation     :: !(First (Unresolved GlobalHintsLocation))
+    -- ^ Custom location of global hints
+  , noRunCompile            :: !FirstFalse
+    -- ^ See: 'Stack.Types.Config.noRunCompile'
+  , stackDeveloperMode      :: !(First Bool)
+    -- ^ See 'Stack.Types.Config.stackDeveloperMode'
+  }
+  deriving Generic
+
+instance Semigroup ConfigMonoid where
+  (<>) = mappenddefault
+
+instance Monoid ConfigMonoid where
+  mempty = memptydefault
+  mappend = (<>)
+
+-- | An uninterpreted representation of URLs options. Configurations may be
+-- "cascaded" using mappend (left-biased).
+data UrlsOptsMonoid = UrlsOptsMonoid
+  { latestSnapshot          :: !(First Text)
+    -- ^ See: 'Stack.Types.Config.latestSnapshot'
+  , recentSnapshots         :: !(First Text)
+    -- ^ See: 'Stack.Types.Config.recentSnapshots'
+  }
+  deriving Generic
+
+-- | Decode uninterpreted URLs options from JSON/YAML.
+instance FromJSON (WithJSONWarnings UrlsOptsMonoid) where
+  parseJSON = withObjectWarnings "UrlsOptsMonoid" $ \o -> do
+    latestSnapshot  <- First <$> o ..:? latestSnapshotArgName
+    recentSnapshots <- First <$> o ..:? recentSnapshotsArgName
+    pure UrlsOptsMonoid
+      { latestSnapshot
+      , recentSnapshots
+      }
+
+-- | Left-biased combine URLs options
+instance Semigroup UrlsOptsMonoid where
+  (<>) = mappenddefault
+
+-- | Left-biased combine URLs options
+instance Monoid UrlsOptsMonoid where
+  mempty = memptydefault
+  mappend = (<>)
+
+-- | URLs latest snapshots argument name.
+latestSnapshotArgName :: Text
+latestSnapshotArgName = "latest-snapshot"
+
+-- | URLs recent snapshots argument name.
+recentSnapshotsArgName :: Text
+recentSnapshotsArgName = "recent-snapshots"
+
+parseConfigMonoid ::
+     Path Abs Dir
+  -> Value
+  -> Yaml.Parser (WithJSONWarnings ConfigMonoid)
+parseConfigMonoid = withObjectWarnings "ConfigMonoid" . parseConfigMonoidObject
+
+-- | Parse a partial configuration.  Used both to parse both a standalone config
+-- file and a project file, so that a sub-parser is not required, which would
+-- interfere with warnings for missing fields.
+parseConfigMonoidObject :: Path Abs Dir -> Object -> WarningParser ConfigMonoid
+parseConfigMonoidObject rootDir obj = do
+  -- Parsing 'stackRoot' from 'stackRoot'/config.yaml would be nonsensical
+  let stackRoot = First Nothing
+  workDir <- First <$> obj ..:? configMonoidWorkDirName
+  buildOpts <- jsonSubWarnings (obj ..:? configMonoidBuildOptsName ..!= mempty)
+  dockerOpts <-
+    jsonSubWarnings (obj ..:? configMonoidDockerOptsName ..!= mempty)
+  nixOpts <- jsonSubWarnings (obj ..:? configMonoidNixOptsName ..!= mempty)
+  connectionCount <- First <$> obj ..:? configMonoidConnectionCountName
+  hideTHLoading <- FirstTrue <$> obj ..:? configMonoidHideTHLoadingName
+  prefixTimestamps <- First <$> obj ..:? configMonoidPrefixTimestampsName
+  urlsOpts :: UrlsOptsMonoid <-
+    jsonSubWarnings (obj ..:? configMonoidUrlsName ..!= mempty)
+  let latestSnapshot = urlsOpts.latestSnapshot
+      recentSnapshots = urlsOpts.recentSnapshots
+  packageIndex <-
+    First <$> jsonSubWarningsT (obj ..:?  configMonoidPackageIndexName)
+  systemGHC <- First <$> obj ..:? configMonoidSystemGHCName
+  installGHC <- FirstTrue <$> obj ..:? configMonoidInstallGHCName
+  installMsys <- First <$> obj ..:? configMonoidInstallMsysName
+  skipGHCCheck <- FirstFalse <$> obj ..:? configMonoidSkipGHCCheckName
+  skipMsys <- FirstFalse <$> obj ..:? configMonoidSkipMsysName
+  msysEnvironment <- First <$> obj ..:? configMonoidMsysEnvironmentName
+  requireStackVersion <-
+    IntersectingVersionRange . (.versionRangeJSON) <$>
+      ( obj ..:? configMonoidRequireStackVersionName
+          ..!= VersionRangeJSON anyVersion
+      )
+  arch <- First <$> obj ..:? configMonoidArchName
+  ghcVariant <- First <$> obj ..:? configMonoidGHCVariantName
+  ghcBuild <- First <$> obj ..:? configMonoidGHCBuildName
+  jobs <- First <$> obj ..:? configMonoidJobsName
+  extraIncludeDirs <- map (toFilePath rootDir FilePath.</>) <$>
+    obj ..:?  configMonoidExtraIncludeDirsName ..!= []
+  extraLibDirs <- map (toFilePath rootDir FilePath.</>) <$>
+    obj ..:?  configMonoidExtraLibDirsName ..!= []
+  customPreprocessorExts <-
+    obj ..:?  configMonoidCustomPreprocessorExtsName ..!= []
+  overrideGccPath <- First <$> obj ..:? configMonoidOverrideGccPathName
+  overrideHpack <- First <$> obj ..:? configMonoidOverrideHpackName
+  hpackForce <- FirstFalse <$> obj ..:? configMonoidHpackForceName
+  concurrentTests <- First <$> obj ..:? configMonoidConcurrentTestsName
+  localBinPath <- First <$> obj ..:? configMonoidLocalBinPathName
+  fileWatchHook <- First <$> obj ..:? configMonoidFileWatchHookName
+  (scmInit, templateParameters) <- obj ..:? "templates" >>= \case
+    Nothing -> pure (First Nothing,M.empty)
+    Just tobj -> do
+      scmInit <- tobj ..:? configMonoidScmInitName
+      params <- tobj ..:? configMonoidTemplateParametersName
+      pure (First scmInit,fromMaybe M.empty params)
+  compilerCheck <- First <$> obj ..:? configMonoidCompilerCheckName
+  compilerRepository <- First <$> (obj ..:? configMonoidCompilerRepositoryName)
+  compilerTarget <- First <$> (obj ..:? configMonoidCompilerTargetName)
+  compilerBindistPath <-
+    First <$> (obj ..:? configMonoidCompilerBindistPathName)
+
+  options <- Map.map (.ghcOptions) <$>
+    obj ..:? configMonoidGhcOptionsName ..!= (mempty :: Map GhcOptionKey GhcOptions)
+
+  optionsEverything <-
+    case (Map.lookup GOKOldEverything options, Map.lookup GOKEverything options) of
+      (Just _, Just _) ->
+        fail "Cannot specify both `*` and `$everything` GHC options"
+      (Nothing, Just x) -> pure x
+      (Just x, Nothing) -> do
+        tell "The `*` ghc-options key is not recommended. Consider using \
+             \$locals, or if really needed, $everything"
+        pure x
+      (Nothing, Nothing) -> pure []
+
+  let ghcOptionsByCat = coerce $ Map.fromList
+        [ (AGOEverything, optionsEverything)
+        , (AGOLocals, Map.findWithDefault [] GOKLocals options)
+        , (AGOTargets, Map.findWithDefault [] GOKTargets options)
+        ]
+
+      ghcOptionsByName = coerce $ Map.fromList
+          [(name, opts) | (GOKPackage name, opts) <- Map.toList options]
+
+  cabalConfigOpts' <- obj ..:? configMonoidConfigureOptionsName ..!= mempty
+  let cabalConfigOpts = coerce (cabalConfigOpts' :: Map CabalConfigKey [Text])
+  extraPath <- obj ..:? configMonoidExtraPathName ..!= []
+  setupInfoLocations <- obj ..:? configMonoidSetupInfoLocationsName ..!= []
+  setupInfoInline <-
+    jsonSubWarningsT (obj ..:? configMonoidSetupInfoInlineName) ..!= mempty
+  localProgramsBase <- First <$> obj ..:? configMonoidLocalProgramsBaseName
+  pvpBounds <- First <$> obj ..:? configMonoidPvpBoundsName
+  modifyCodePage <- FirstTrue <$> obj ..:? configMonoidModifyCodePageName
+  rebuildGhcOptions <- FirstFalse <$> obj ..:? configMonoidRebuildGhcOptionsName
+  applyGhcOptions <- First <$> obj ..:? configMonoidApplyGhcOptionsName
+  applyProgOptions <- First <$> obj ..:? configMonoidApplyProgOptionsName
+  allowNewer <- First <$> obj ..:? configMonoidAllowNewerName
+  allowNewerDeps <- obj ..:? configMonoidAllowNewerDepsName
+  defaultInitSnapshot <- First <$> obj ..:? configMonoidDefaultInitSnapshotName
+  defaultTemplate <- First <$> obj ..:? configMonoidDefaultTemplateName
+  allowDifferentUser <- First <$> obj ..:? configMonoidAllowDifferentUserName
+  dumpLogs <- First <$> obj ..:? configMonoidDumpLogsName
+  saveHackageCreds <- FirstTrue <$> obj ..:? configMonoidSaveHackageCredsName
+  hackageBaseUrl <- First <$> obj ..:? configMonoidHackageBaseUrlName
+  configMonoidColorWhenUS <- obj ..:? configMonoidColorWhenUSName
+  configMonoidColorWhenGB <- obj ..:? configMonoidColorWhenGBName
+  let colorWhen = First $ configMonoidColorWhenUS <|> configMonoidColorWhenGB
+  configMonoidStylesUS <- obj ..:? configMonoidStylesUSName
+  configMonoidStylesGB <- obj ..:? configMonoidStylesGBName
+  let styles = fromMaybe mempty $ configMonoidStylesUS <|> configMonoidStylesGB
+  hideSourcePaths <- FirstTrue <$> obj ..:? configMonoidHideSourcePathsName
+  recommendStackUpgrade <-
+    FirstTrue <$> obj ..:? configMonoidRecommendStackUpgradeName
+  notifyIfNixOnPath <- FirstTrue <$> obj ..:? configMonoidNotifyIfNixOnPathName
+  notifyIfGhcUntested <-
+    FirstTrue <$> obj ..:? configMonoidNotifyIfGhcUntestedName
+  notifyIfCabalUntested <-
+    FirstTrue <$> obj ..:? configMonoidNotifyIfCabalUntestedName
+  notifyIfArchUnknown <-
+    FirstTrue <$> obj ..:? configMonoidNotifyIfArchUnknownName
+  notifyIfNoRunTests <-
+    FirstTrue <$> obj ..:? configMonoidNotifyIfNoRunTestsName
+  notifyIfNoRunBenchmarks <-
+    FirstTrue <$> obj ..:? configMonoidNotifyIfNoRunBenchmarksName
+  notifyIfBaseNotBoot <-
+    FirstTrue <$> obj ..:? configMonoidNotifyIfBaseNotBootName
+  casaOpts <- jsonSubWarnings (obj ..:? configMonoidCasaOptsName ..!= mempty)
+  casaRepoPrefix <- First <$> obj ..:? configMonoidCasaRepoPrefixName
+  snapshotLocation <- First <$> obj ..:? configMonoidSnapshotLocationName
+  globalHintsLocation <-
+    First <$> jsonSubWarningsT (obj ..:? configMonoidGlobalHintsLocationName)
+  noRunCompile <- FirstFalse <$> obj ..:? configMonoidNoRunCompileName
+  stackDeveloperMode <- First <$> obj ..:? configMonoidStackDeveloperModeName
+  pure ConfigMonoid
+    { stackRoot
+    , workDir
+    , buildOpts
+    , dockerOpts
+    , nixOpts
+    , connectionCount
+    , hideTHLoading
+    , prefixTimestamps
+    , latestSnapshot
+    , recentSnapshots
+    , packageIndex
+    , systemGHC
+    , installGHC
+    , installMsys
+    , skipGHCCheck
+    , skipMsys
+    , msysEnvironment
+    , compilerCheck
+    , compilerRepository
+    , compilerTarget
+    , compilerBindistPath
+    , requireStackVersion
+    , arch
+    , ghcVariant
+    , ghcBuild
+    , jobs
+    , extraIncludeDirs
+    , extraLibDirs
+    , customPreprocessorExts
+    , overrideGccPath
+    , overrideHpack
+    , hpackForce
+    , concurrentTests
+    , localBinPath
+    , fileWatchHook
+    , templateParameters
+    , scmInit
+    , ghcOptionsByName
+    , ghcOptionsByCat
+    , cabalConfigOpts
+    , extraPath
+    , setupInfoLocations
+    , setupInfoInline
+    , localProgramsBase
+    , pvpBounds
+    , modifyCodePage
+    , rebuildGhcOptions
+    , applyGhcOptions
+    , applyProgOptions
+    , allowNewer
+    , allowNewerDeps
+    , defaultInitSnapshot
+    , defaultTemplate
+    , allowDifferentUser
+    , dumpLogs
+    , saveHackageCreds
+    , hackageBaseUrl
+    , colorWhen
+    , styles
+    , hideSourcePaths
+    , recommendStackUpgrade
+    , notifyIfNixOnPath
+    , notifyIfGhcUntested
+    , notifyIfCabalUntested
+    , notifyIfArchUnknown
+    , notifyIfNoRunTests
+    , notifyIfNoRunBenchmarks
+    , notifyIfBaseNotBoot
+    , casaOpts
+    , casaRepoPrefix
+    , snapshotLocation
+    , globalHintsLocation
+    , noRunCompile
+    , stackDeveloperMode
+    }
+
+configMonoidWorkDirName :: Text
+configMonoidWorkDirName = "work-dir"
+
+configMonoidBuildOptsName :: Text
+configMonoidBuildOptsName = "build"
+
+configMonoidDockerOptsName :: Text
+configMonoidDockerOptsName = "docker"
+
+configMonoidNixOptsName :: Text
+configMonoidNixOptsName = "nix"
+
+configMonoidConfigureOptionsName :: Text
+configMonoidConfigureOptionsName = "configure-options"
+
+configMonoidConnectionCountName :: Text
+configMonoidConnectionCountName = "connection-count"
+
+configMonoidHideTHLoadingName :: Text
+configMonoidHideTHLoadingName = "hide-th-loading"
+
+configMonoidPrefixTimestampsName :: Text
+configMonoidPrefixTimestampsName = "build-output-timestamps"
+
+configMonoidUrlsName :: Text
+configMonoidUrlsName = "urls"
+
+configMonoidPackageIndexName :: Text
+configMonoidPackageIndexName = "package-index"
+
+configMonoidSystemGHCName :: Text
+configMonoidSystemGHCName = "system-ghc"
+
+configMonoidInstallGHCName :: Text
+configMonoidInstallGHCName = "install-ghc"
+
+configMonoidInstallMsysName :: Text
+configMonoidInstallMsysName = "install-msys"
+
+configMonoidSkipGHCCheckName :: Text
+configMonoidSkipGHCCheckName = "skip-ghc-check"
+
+configMonoidSkipMsysName :: Text
+configMonoidSkipMsysName = "skip-msys"
+
+configMonoidMsysEnvironmentName :: Text
+configMonoidMsysEnvironmentName = "msys-environment"
+
+configMonoidRequireStackVersionName :: Text
+configMonoidRequireStackVersionName = "require-stack-version"
+
+configMonoidArchName :: Text
+configMonoidArchName = "arch"
+
+configMonoidGHCVariantName :: Text
+configMonoidGHCVariantName = "ghc-variant"
+
+configMonoidGHCBuildName :: Text
+configMonoidGHCBuildName = "ghc-build"
+
+configMonoidJobsName :: Text
+configMonoidJobsName = "jobs"
+
+configMonoidExtraIncludeDirsName :: Text
+configMonoidExtraIncludeDirsName = "extra-include-dirs"
+
+configMonoidExtraLibDirsName :: Text
+configMonoidExtraLibDirsName = "extra-lib-dirs"
+
+configMonoidCustomPreprocessorExtsName  :: Text
+configMonoidCustomPreprocessorExtsName  = "custom-preprocessor-extensions"
+
+configMonoidOverrideGccPathName :: Text
+configMonoidOverrideGccPathName = "with-gcc"
+
+configMonoidOverrideHpackName :: Text
+configMonoidOverrideHpackName = "with-hpack"
+
+configMonoidHpackForceName :: Text
+configMonoidHpackForceName = "hpack-force"
+
+configMonoidConcurrentTestsName :: Text
+configMonoidConcurrentTestsName = "concurrent-tests"
+
+configMonoidLocalBinPathName :: Text
+configMonoidLocalBinPathName = "local-bin-path"
+
+configMonoidFileWatchHookName :: Text
+configMonoidFileWatchHookName = "file-watch-hook"
+
+configMonoidScmInitName :: Text
+configMonoidScmInitName = "scm-init"
+
+configMonoidTemplateParametersName :: Text
+configMonoidTemplateParametersName = "params"
+
+configMonoidCompilerCheckName :: Text
+configMonoidCompilerCheckName = "compiler-check"
+
+configMonoidCompilerRepositoryName :: Text
+configMonoidCompilerRepositoryName = "compiler-repository"
+
+configMonoidCompilerTargetName :: Text
+configMonoidCompilerTargetName = "compiler-target"
+
+configMonoidCompilerBindistPathName :: Text
+configMonoidCompilerBindistPathName = "compiler-bindist-path"
+
+configMonoidGhcOptionsName :: Text
+configMonoidGhcOptionsName = "ghc-options"
+
+configMonoidExtraPathName :: Text
+configMonoidExtraPathName = "extra-path"
+
+configMonoidSetupInfoLocationsName :: Text
+configMonoidSetupInfoLocationsName = "setup-info-locations"
+
+configMonoidSetupInfoInlineName :: Text
+configMonoidSetupInfoInlineName = "setup-info"
+
+configMonoidLocalProgramsBaseName :: Text
+configMonoidLocalProgramsBaseName = "local-programs-path"
+
+configMonoidPvpBoundsName :: Text
+configMonoidPvpBoundsName = "pvp-bounds"
+
+configMonoidModifyCodePageName :: Text
+configMonoidModifyCodePageName = "modify-code-page"
+
+configMonoidRebuildGhcOptionsName :: Text
+configMonoidRebuildGhcOptionsName = "rebuild-ghc-options"
+
+configMonoidApplyGhcOptionsName :: Text
+configMonoidApplyGhcOptionsName = "apply-ghc-options"
+
+configMonoidApplyProgOptionsName :: Text
+configMonoidApplyProgOptionsName = "apply-prog-options"
+
+configMonoidAllowNewerName :: Text
+configMonoidAllowNewerName = "allow-newer"
+
+configMonoidAllowNewerDepsName :: Text
+configMonoidAllowNewerDepsName = "allow-newer-deps"
+
+configMonoidDefaultInitSnapshotName :: Text
+configMonoidDefaultInitSnapshotName = "default-init-snapshot"
+
+configMonoidDefaultTemplateName :: Text
+configMonoidDefaultTemplateName = "default-template"
+
+configMonoidAllowDifferentUserName :: Text
+configMonoidAllowDifferentUserName = "allow-different-user"
+
+configMonoidDumpLogsName :: Text
+configMonoidDumpLogsName = "dump-logs"
+
+configMonoidSaveHackageCredsName :: Text
+configMonoidSaveHackageCredsName = "save-hackage-creds"
+
+configMonoidHackageBaseUrlName :: Text
+configMonoidHackageBaseUrlName = "hackage-base-url"
+
+configMonoidColorWhenUSName :: Text
+configMonoidColorWhenUSName = "color"
+
+configMonoidColorWhenGBName :: Text
+configMonoidColorWhenGBName = "colour"
+
+configMonoidStylesUSName :: Text
+configMonoidStylesUSName = "stack-colors"
+
+configMonoidStylesGBName :: Text
+configMonoidStylesGBName = "stack-colours"
+
+configMonoidHideSourcePathsName :: Text
+configMonoidHideSourcePathsName = "hide-source-paths"
+
+configMonoidRecommendStackUpgradeName :: Text
+configMonoidRecommendStackUpgradeName = "recommend-stack-upgrade"
+
+configMonoidNotifyIfNixOnPathName :: Text
+configMonoidNotifyIfNixOnPathName = "notify-if-nix-on-path"
+
+configMonoidNotifyIfGhcUntestedName :: Text
+configMonoidNotifyIfGhcUntestedName = "notify-if-ghc-untested"
+
+configMonoidNotifyIfCabalUntestedName :: Text
+configMonoidNotifyIfCabalUntestedName = "notify-if-cabal-untested"
+
+configMonoidNotifyIfArchUnknownName :: Text
+configMonoidNotifyIfArchUnknownName = "notify-if-arch-unknown"
+
+configMonoidNotifyIfNoRunTestsName :: Text
+configMonoidNotifyIfNoRunTestsName = "notify-if-no-run-tests"
+
+configMonoidNotifyIfNoRunBenchmarksName :: Text
+configMonoidNotifyIfNoRunBenchmarksName = "notify-if-no-run-benchmarks"
+
+configMonoidNotifyIfBaseNotBootName :: Text
+configMonoidNotifyIfBaseNotBootName = "notify-if-base-not-boot"
+
+configMonoidCasaOptsName :: Text
+configMonoidCasaOptsName = "casa"
+
+configMonoidCasaRepoPrefixName :: Text
+configMonoidCasaRepoPrefixName = "casa-repo-prefix"
+
+configMonoidSnapshotLocationName :: Text
+configMonoidSnapshotLocationName = "snapshot-location-base"
+
+configMonoidGlobalHintsLocationName :: Text
+configMonoidGlobalHintsLocationName = "global-hints-location"
+
+configMonoidNoRunCompileName :: Text
+configMonoidNoRunCompileName = "script-no-run-compile"
+
+configMonoidStackDeveloperModeName :: Text
+configMonoidStackDeveloperModeName = "stack-developer-mode"
diff --git a/src/Stack/Types/ConfigSetOpts.hs b/src/Stack/Types/ConfigSetOpts.hs
new file mode 100644
index 0000000000..afc9573e03
--- /dev/null
+++ b/src/Stack/Types/ConfigSetOpts.hs
@@ -0,0 +1,46 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.ConfigSetOpts
+Description : Types related to Stack's @config set@ command.
+License     : BSD-3-Clause
+
+Types related to Stack's @config set@ command.
+-}
+
+module Stack.Types.ConfigSetOpts
+  ( ConfigCmdSet (..)
+  , CommandScope (..)
+  , configCmdSetScope
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.Snapshot ( AbstractSnapshot )
+
+-- | Type representing options for Stack's @config set@ command.
+data ConfigCmdSet
+  = ConfigCmdSetSnapshot !(Unresolved AbstractSnapshot)
+  | ConfigCmdSetResolver !(Unresolved AbstractSnapshot)
+  | ConfigCmdSetSystemGhc !CommandScope !Bool
+  | ConfigCmdSetInstallGhc !CommandScope !Bool
+  | ConfigCmdSetInstallMsys !CommandScope !Bool
+  | ConfigCmdSetRecommendStackUpgrade !CommandScope !Bool
+  | ConfigCmdSetDownloadPrefix !CommandScope !Text
+
+-- | Type representing scopes for Stack's @config set@ command.
+data CommandScope
+  = CommandScopeGlobal
+    -- ^ Apply changes to Stack's global configuration file.
+  | CommandScopeProject
+    -- ^ Apply changes to Stack's project-level configuration file.
+
+-- | Yields the command scope for the given config command option.
+configCmdSetScope :: ConfigCmdSet -> CommandScope
+configCmdSetScope (ConfigCmdSetSnapshot _) = CommandScopeProject
+configCmdSetScope (ConfigCmdSetResolver _) = CommandScopeProject
+configCmdSetScope (ConfigCmdSetSystemGhc scope _) = scope
+configCmdSetScope (ConfigCmdSetInstallGhc scope _) = scope
+configCmdSetScope (ConfigCmdSetInstallMsys scope _) = scope
+configCmdSetScope (ConfigCmdSetRecommendStackUpgrade scope _) = scope
+configCmdSetScope (ConfigCmdSetDownloadPrefix scope _) = scope
diff --git a/src/Stack/Types/ConfigureOpts.hs b/src/Stack/Types/ConfigureOpts.hs
new file mode 100644
index 0000000000..860122d8c9
--- /dev/null
+++ b/src/Stack/Types/ConfigureOpts.hs
@@ -0,0 +1,53 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.ConfigureOpts
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ConfigureOpts
+  ( ConfigureOpts (..)
+  , BaseConfigOpts (..)
+  , PackageConfigureOpts (..)
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
+import           Stack.Types.BuildOptsCLI ( BuildOptsCLI )
+
+-- | Basic information used to calculate what the configure options are
+data BaseConfigOpts = BaseConfigOpts
+  { snapDB :: !(Path Abs Dir)
+  , localDB :: !(Path Abs Dir)
+  , snapInstallRoot :: !(Path Abs Dir)
+  , localInstallRoot :: !(Path Abs Dir)
+  , buildOpts :: !BuildOpts
+  , buildOptsCLI :: !BuildOptsCLI
+  , extraDBs :: ![Path Abs Dir]
+  }
+  deriving Show
+
+-- | All these fields come from the v'Package' data type but bringing the
+-- whole t'Package' is way too much, hence this datatype.
+data PackageConfigureOpts = PackageConfigureOpts
+  { pkgCabalConfigOpts :: [Text]
+  , pkgGhcOptions :: [Text]
+  , pkgFlags :: Map FlagName Bool
+  , pkgDefaultFlags :: Map FlagName Bool
+  , pkgIdentifier :: PackageIdentifier
+  }
+  deriving Show
+
+-- | Configure options to be sent to Setup.hs configure.
+data ConfigureOpts = ConfigureOpts
+  { pathRelated :: ![String]
+    -- ^ Options related to various paths. We separate these out since they do
+    -- not have an effect on the contents of the compiled binary for checking
+    -- if we can use an existing precompiled cache.
+  , nonPathRelated :: ![String]
+    -- ^ Options other than path-related options.
+  }
+  deriving (Data, Eq, Generic, Show)
+
+instance NFData ConfigureOpts
diff --git a/src/Stack/Types/Curator.hs b/src/Stack/Types/Curator.hs
new file mode 100644
index 0000000000..2ff638355d
--- /dev/null
+++ b/src/Stack/Types/Curator.hs
@@ -0,0 +1,67 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Types.Curator
+License     : BSD-3-Clause
+
+Module exporting the t'Curator' type, used to represent Stack's project-specific
+@curator@ option, which supports the needs of the
+[@curator@ tool](https://github.com/commercialhaskell/curator).
+-}
+
+module Stack.Types.Curator
+  ( Curator (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), ToJSON (..), (.=), object )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings (..), (..:?), (..!=), withObjectWarnings )
+import qualified Data.Set as Set
+import           Stack.Prelude
+
+-- | Type representing configuration options which support the needs of the
+-- [@curator@ tool](https://github.com/commercialhaskell/curator).
+data Curator = Curator
+  { skipTest :: !(Set PackageName)
+    -- ^ Packages for which Stack should ignore test suites.
+  , expectTestFailure :: !(Set PackageName)
+    -- ^ Packages for which Stack should expect building test suites to fail.
+  , skipBenchmark :: !(Set PackageName)
+    -- ^ Packages for which Stack should ignore benchmarks.
+  , expectBenchmarkFailure :: !(Set PackageName)
+    -- ^ Packages for which Stack should expect building benchmarks to fail.
+  , skipHaddock :: !(Set PackageName)
+    -- ^ Packages for which Stack should ignore creating Haddock documentation.
+  , expectHaddockFailure :: !(Set PackageName)
+    -- ^ Packages for which Stack should expect creating Haddock documentation
+    -- to fail.
+  }
+  deriving Show
+
+instance ToJSON Curator where
+  toJSON curator = object
+    [ "skip-test" .= Set.map CabalString curator.skipTest
+    , "expect-test-failure" .= Set.map CabalString curator.expectTestFailure
+    , "skip-bench" .= Set.map CabalString curator.skipBenchmark
+    , "expect-benchmark-failure" .=
+        Set.map CabalString curator.expectTestFailure
+    , "skip-haddock" .= Set.map CabalString curator.skipHaddock
+    , "expect-haddock-failure" .=
+        Set.map CabalString curator.expectHaddockFailure
+    ]
+
+instance FromJSON (WithJSONWarnings Curator) where
+  parseJSON = withObjectWarnings "Curator" $ \o -> Curator
+    <$> fmap (Set.map unCabalString) (o ..:? "skip-test" ..!= mempty)
+    <*> fmap (Set.map unCabalString) (o ..:? "expect-test-failure" ..!= mempty)
+    <*> fmap (Set.map unCabalString) (o ..:? "skip-bench" ..!= mempty)
+    <*> fmap
+          (Set.map unCabalString)
+          (o ..:? "expect-benchmark-failure" ..!= mempty)
+    <*> fmap (Set.map unCabalString) (o ..:? "skip-haddock" ..!= mempty)
+    <*> fmap
+          (Set.map unCabalString)
+          (o ..:? "expect-haddock-failure" ..!= mempty)
diff --git a/src/Stack/Types/Dependency.hs b/src/Stack/Types/Dependency.hs
new file mode 100644
index 0000000000..05129fbd84
--- /dev/null
+++ b/src/Stack/Types/Dependency.hs
@@ -0,0 +1,115 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Types.Dependency
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.Dependency
+  ( DepValue (..)
+  , DepType (..)
+  , DepLibrary (..)
+  , cabalToStackDep
+  , cabalExeToStackDep
+  , cabalSetupDepsToStackDep
+  , libraryDepFromVersionRange
+  , isDepTypeLibrary
+  , getDepSublib
+  , depValueToTarget
+  ) where
+
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import qualified Distribution.PackageDescription as Cabal
+import           Distribution.Types.VersionRange ( VersionRange )
+import           Stack.Prelude
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName (..), fromCabalName )
+import           Stack.Types.NamedComponent ( NamedComponent(..) )
+import           Stack.Types.SourceMap ( PackageType (..), Target (..) )
+
+-- | The value for a map from dependency name. This contains both the version
+-- range and the type of dependency.
+data DepValue = DepValue
+  { versionRange :: !VersionRange
+  , depType :: !DepType
+  }
+  deriving Show
+
+-- | Is this package being used as a library, or just as a build tool? If the
+-- former, we need to ensure that a library actually exists. See
+-- <https://github.com/commercialhaskell/stack/issues/2195>
+data DepType
+  = AsLibrary !DepLibrary
+    -- ^ Dependency is used as a library.
+  | AsBuildTool
+    -- ^ Dependency is used only to provide a build tool.
+  deriving (Eq, Show)
+
+-- | Type repesenting dependency packages used as a library.
+data DepLibrary = DepLibrary
+  { main :: !Bool
+    -- ^ Is the dependency on a main (unnamed) library component?
+  , subLib :: Set StackUnqualCompName
+    -- ^ A set (which may be empty) of dependencies on sub-library components.
+  }
+  deriving (Eq, Show)
+
+-- | A function to yield the set (which may be empty) of dependencies on
+-- sub-library components. Yields 'Nothing' if the dependency is used only to
+-- provide a build tool.
+getDepSublib :: DepValue -> Maybe (Set StackUnqualCompName)
+getDepSublib val = case val.depType of
+  AsLibrary libVal -> Just libVal.subLib
+  _ -> Nothing
+
+-- | Represents a dependency only on a main (unnamed) library component.
+defaultDepLibrary :: DepLibrary
+defaultDepLibrary = DepLibrary True mempty
+
+-- | Test whether the dependency is being used as a library.
+isDepTypeLibrary :: DepType -> Bool
+isDepTypeLibrary AsLibrary{} = True
+isDepTypeLibrary AsBuildTool = False
+
+-- | Given a 'Cabal.Dependency', yield the Stack equivalent.
+cabalToStackDep :: Cabal.Dependency -> DepValue
+cabalToStackDep (Cabal.Dependency _ verRange libNameSet) =
+  DepValue { versionRange = verRange, depType = AsLibrary depLibrary }
+ where
+  depLibrary = DepLibrary finalHasMain filteredItems
+
+  (finalHasMain, filteredItems) = foldr' iterator (False, mempty) libNameSet
+   where
+    iterator LMainLibName (_, newLibNameSet) = (True, newLibNameSet)
+    iterator (LSubLibName libName) (hasMain, newLibNameSet) =
+      (hasMain, Set.insert (fromCabalName libName) newLibNameSet)
+
+-- | Given an 'Cabal.ExeDependency', yield the Stack equivalent.
+cabalExeToStackDep :: Cabal.ExeDependency -> DepValue
+cabalExeToStackDep (Cabal.ExeDependency _ _name verRange) =
+  DepValue { versionRange = verRange, depType = AsBuildTool }
+
+cabalSetupDepsToStackDep :: Cabal.SetupBuildInfo -> Map PackageName DepValue
+cabalSetupDepsToStackDep setupInfo =
+  foldr' inserter mempty (Cabal.setupDepends setupInfo)
+ where
+  inserter d@(Cabal.Dependency packageName _ _) =
+    Map.insert packageName (cabalToStackDep d)
+
+libraryDepFromVersionRange :: VersionRange -> DepValue
+libraryDepFromVersionRange range = DepValue
+  { versionRange = range
+  , depType = AsLibrary defaultDepLibrary
+  }
+
+depValueToTarget :: DepValue -> Target
+depValueToTarget dv = case dv.depType of
+  AsLibrary dlib -> TargetComps (completeSet dlib)
+  AsBuildTool -> TargetAll PTDependency
+ where
+  completeSet dlib =
+    (if dlib.main then Set.insert CLib else id) $ sublibSet dlib
+  sublibSet dlib = Set.mapMonotonic CSubLib dlib.subLib
diff --git a/src/Stack/Types/DependencyTree.hs b/src/Stack/Types/DependencyTree.hs
new file mode 100644
index 0000000000..8e79019433
--- /dev/null
+++ b/src/Stack/Types/DependencyTree.hs
@@ -0,0 +1,103 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Types.DependencyTree
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.DependencyTree
+  ( DependencyTree (..)
+  , DependencyGraph
+  , DotPayload (..)
+  , licenseText
+  , versionText
+  ) where
+
+import           Data.Aeson ( ToJSON (..), Value, (.=), object )
+import qualified Data.Set as Set
+import qualified Data.Map as Map
+import qualified Data.Text as Text
+import           Distribution.License ( License (..), licenseFromSPDX )
+import qualified Distribution.SPDX.License as SPDX
+import           Distribution.Text ( display )
+import           Stack.Prelude hiding ( Display (..), pkgName, loadPackage )
+
+-- | Information about a package in the dependency graph, when available.
+data DotPayload = DotPayload
+  { version :: Maybe Version
+    -- ^ The package version.
+  , license :: Maybe (Either SPDX.License License)
+    -- ^ The license the package was released under.
+  , location :: Maybe PackageLocation
+    -- ^ The location of the package.
+  }
+  deriving (Eq, Show)
+
+-- | Type synoynm representing dependency graphs.
+type DependencyGraph = Map PackageName (Set PackageName, DotPayload)
+
+-- | Type representing dependency trees.
+data DependencyTree =
+  DependencyTree (Set PackageName) DependencyGraph
+
+instance ToJSON DependencyTree where
+  toJSON (DependencyTree _ dependencyMap) =
+    toJSON $ foldToList dependencyToJSON dependencyMap
+
+foldToList :: (k -> a -> b) -> Map k a -> [b]
+foldToList f = Map.foldrWithKey (\k a bs -> bs ++ [f k a]) []
+
+dependencyToJSON :: PackageName -> (Set PackageName, DotPayload) -> Value
+dependencyToJSON pkg (deps, payload) =
+  let fieldsAlwaysPresent = [ "name" .= packageNameString pkg
+                            , "license" .= licenseText payload
+                            , "version" .= versionText payload
+                            , "dependencies" .= Set.map packageNameString deps
+                            ]
+      loc = catMaybes
+              [("location" .=) . pkgLocToJSON <$> payload.location]
+  in  object $ fieldsAlwaysPresent ++ loc
+
+pkgLocToJSON :: PackageLocation -> Value
+pkgLocToJSON (PLMutable (ResolvedPath _ dir)) = object
+  [ "type" .= ("project package" :: Text)
+  , "url" .= ("file://" ++ toFilePath dir)
+  ]
+pkgLocToJSON (PLImmutable (PLIHackage pkgid _ _)) = object
+  [ "type" .= ("hackage" :: Text)
+  , "url" .= ("https://hackage.haskell.org/package/" ++ display pkgid)
+  ]
+pkgLocToJSON (PLImmutable (PLIArchive archive _)) =
+  let url = case archiveLocation archive of
+              ALUrl u -> u
+              ALFilePath (ResolvedPath _ path) ->
+                Text.pack $ "file://" ++ toFilePath path
+  in  object
+        [ "type" .= ("archive" :: Text)
+        , "url" .= url
+        , "sha256" .= archiveHash archive
+        , "size" .= archiveSize archive
+        ]
+pkgLocToJSON (PLImmutable (PLIRepo repo _)) = object
+  [ "type" .= case repoType repo of
+                RepoGit -> "git" :: Text
+                RepoHg -> "hg" :: Text
+  , "url" .= repoUrl repo
+  , "commit" .= repoCommit repo
+  , "subdir" .= repoSubdir repo
+  ]
+
+-- | For the given dot payload, yield a text representation of the name of the
+-- licence.
+licenseText :: DotPayload -> Text
+licenseText payload =
+  maybe "<unknown>" (Text.pack . display . either licenseFromSPDX id)
+                    payload.license
+
+-- | For the given dot payload, yield a text representation of the version.
+versionText :: DotPayload -> Text
+versionText payload =
+  maybe "<unknown>" (Text.pack . display) payload.version
diff --git a/src/Stack/Types/Docker.hs b/src/Stack/Types/Docker.hs
index 5fb60343c0..86d9e1581c 100644
--- a/src/Stack/Types/Docker.hs
+++ b/src/Stack/Types/Docker.hs
@@ -1,139 +1,389 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE FlexibleInstances  #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RecordWildCards    #-}
-
--- | Docker types.
-
-module Stack.Types.Docker where
-
-import Stack.Prelude hiding (Display (..))
-import Pantry.Internal.AesonExtended
-import Data.List (intercalate)
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Types.Docker
+Description : Docker types.
+License     : BSD-3-Clause
+
+Docker types.
+-}
+
+module Stack.Types.Docker
+  ( DockerException (..)
+  , DockerMonoidRepoOrImage (..)
+  , DockerOpts (..)
+  , DockerOptsMonoid (..)
+  , DockerStackExe (..)
+  , Mount (..)
+  , VersionRangeJSON (..)
+  , dockerAutoPullArgName
+  , dockerCmdName
+  , dockerContainerNameArgName
+  , dockerContainerPlatform
+  , dockerDetachArgName
+  , dockerEnableArgName
+  , dockerEntrypointArgName
+  , dockerEnvArgName
+  , dockerHelpOptName
+  , dockerImageArgName
+  , dockerMountArgName
+  , dockerMountModeArgName
+  , dockerNetworkArgName
+  , dockerPersistArgName
+  , dockerPullCmdName
+  , dockerRegistryLoginArgName
+  , dockerRegistryPasswordArgName
+  , dockerRegistryUsernameArgName
+  , dockerRepoArgName
+  , dockerRequireDockerVersionArgName
+  , dockerRunArgsArgName
+  , dockerSetUserArgName
+  , dockerStackExeArgName
+  , dockerStackExeDownloadVal
+  , dockerStackExeHostVal
+  , dockerStackExeImageVal
+  , parseDockerStackExe
+  , reExecArgName
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), withText )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings, (..:), (..:?), (..!=), withObjectWarnings
+                   )
+import           Data.List ( intercalate )
 import qualified Data.Text as T
-import Distribution.System (Platform(..), OS(..), Arch(..))
-import Distribution.Text (simpleParse, display)
-import Distribution.Version (anyVersion)
-import Generics.Deriving.Monoid (mappenddefault, memptydefault)
-import Path
-import Stack.Types.Version
-import Text.Read (Read (..))
+import           Distribution.System ( Arch (..), OS (..), Platform (..) )
+import           Distribution.Text ( display, simpleParse )
+import           Distribution.Version ( anyVersion )
+import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
+import           Path ( parseAbsFile )
+import           Stack.Constants ( stackProgName )
+import           Stack.Prelude hiding ( Display (..) )
+import           Stack.Types.Version
+                   ( IntersectingVersionRange (..), VersionRange
+                   , versionRangeText
+                   )
+import           Text.Read ( Read (..) )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Docker" module.
+data DockerException
+  = DockerMustBeEnabledException
+    -- ^ Docker must be enabled to use the command.
+  | OnlyOnHostException
+    -- ^ Command must be run on host OS (not in a container).
+  | InspectFailedException String
+    -- ^ @docker inspect@ failed.
+  | NotPulledException String
+    -- ^ Image does not exist.
+  | InvalidImagesOutputException String
+    -- ^ Invalid output from @docker images@.
+  | InvalidPSOutputException String
+    -- ^ Invalid output from @docker ps@.
+  | InvalidInspectOutputException String
+    -- ^ Invalid output from @docker inspect@.
+  | PullFailedException String
+    -- ^ Could not pull a Docker image.
+  | DockerTooOldException Version Version
+    -- ^ Installed version of @docker@ below minimum version.
+  | DockerVersionProhibitedException [Version] Version
+    -- ^ Installed version of @docker@ is prohibited.
+  | BadDockerVersionException VersionRange Version
+    -- ^ Installed version of @docker@ is out of range specified in config file.
+  | InvalidVersionOutputException
+    -- ^ Invalid output from @docker --version@.
+  | HostStackTooOldException Version (Maybe Version)
+    -- ^ Version of @stack@ on host is too old for version in image.
+  | ContainerStackTooOldException Version Version
+    -- ^ Version of @stack@ in container/image is too old for version on host.
+  | CannotDetermineProjectRootException
+    -- ^ Can't determine the project root (where to put docker sandbox).
+  | DockerNotInstalledException
+    -- ^ @docker --version@ failed.
+  | UnsupportedStackExeHostPlatformException
+    -- ^ Using host stack-exe on unsupported platform.
+  | DockerStackExeParseException String
+    -- ^ @stack-exe@ option fails to parse.
+  deriving Show
+
+instance Exception DockerException where
+  displayException DockerMustBeEnabledException =
+    "Error: [S-3223]\n"
+    ++ "Docker must be enabled in your configuration file to use this \
+       \command."
+  displayException OnlyOnHostException =
+    "Error: [S-9779]\n"
+    ++ "This command must be run on host OS (not in a Docker container)."
+  displayException (InspectFailedException image) = concat
+    [ "Error: [S-9105]\n"
+    , "'docker inspect' failed for image after pull: "
+    , image
+    , "."
+    ]
+  displayException (NotPulledException image) = concat
+    [ "Error: [S-6626]\n"
+    , "The Docker image referenced by your configuration file"
+    , " has not\nbeen downloaded:\n    "
+    , image
+    , "\n\nRun '"
+    , unwords [stackProgName, dockerCmdName, dockerPullCmdName]
+    , "' to download it, then try again."
+    ]
+  displayException (InvalidImagesOutputException l) = concat
+    [ "Error: [S-5841]\n"
+    , "Invalid 'docker images' output line: '"
+    , l
+    , "'."
+    ]
+  displayException (InvalidPSOutputException l) = concat
+    [ "Error: [S-9608]\n"
+    , "Invalid 'docker ps' output line: '"
+    , l
+    ,"'."
+    ]
+  displayException (InvalidInspectOutputException msg) = concat
+    [ "Error: [S-2240]\n"
+    , "Invalid 'docker inspect' output: "
+    , msg
+    , "."
+    ]
+  displayException (PullFailedException image) = concat
+    [ "Error: [S-6092]\n"
+    , "Could not pull Docker image:\n    "
+    , image
+    , "\nThere may not be an image on the registry for your snapshot's LTS \
+      \version in\n"
+    , "your configuration file."
+    ]
+  displayException (DockerTooOldException minVersion haveVersion) = concat
+    [ "Error: [S-6281]\n"
+    , "Minimum docker version '"
+    , versionString minVersion
+    , "' is required by "
+    , stackProgName
+    , " (you have '"
+    , versionString haveVersion
+    , "')."
+    ]
+  displayException (DockerVersionProhibitedException prohibitedVersions haveVersion) = concat
+    [ "Error: [S-8252]\n"
+    , "These Docker versions are incompatible with "
+    , stackProgName
+    , " (you have '"
+    , versionString haveVersion
+    , "'): "
+    , intercalate ", " (map versionString prohibitedVersions)
+    , "."
+    ]
+  displayException (BadDockerVersionException requiredRange haveVersion) = concat
+    [ "Error: [S-6170]\n"
+    , "The version of 'docker' you are using ("
+    , show haveVersion
+    , ") is outside the required\n"
+    , "version range specified in stack.yaml ("
+    , T.unpack (versionRangeText requiredRange)
+    , ")."
+    ]
+  displayException InvalidVersionOutputException =
+    "Error: [S-5827]\n"
+    ++ "Cannot get Docker version (invalid 'docker --version' output)."
+  displayException (HostStackTooOldException minVersion (Just hostVersion)) = concat
+    [ "Error: [S-7112]\n"
+    , "The host's version of '"
+    , stackProgName
+    , "' is too old for this Docker image.\nVersion "
+    , versionString minVersion
+    , " is required; you have "
+    , versionString hostVersion
+    , "."
+    ]
+  displayException (HostStackTooOldException minVersion Nothing) = concat
+    [ "Error: [S-7112]\n"
+    , "The host's version of '"
+    , stackProgName
+    , "' is too old.\nVersion "
+    , versionString minVersion
+    , " is required."
+    ]
+  displayException (ContainerStackTooOldException requiredVersion containerVersion) = concat
+    [ "Error: [S-5832]\n"
+    , "The Docker container's version of '"
+    , stackProgName
+    , "' is too old.\nVersion "
+    , versionString requiredVersion
+    , " is required; the container has "
+    , versionString containerVersion
+    , "."
+    ]
+  displayException CannotDetermineProjectRootException =
+    "Error: [S-4078]\n"
+    ++ "Cannot determine project root directory for Docker sandbox."
+  displayException DockerNotInstalledException =
+    "Error: [S-7058]\n"
+    ++ "Cannot find 'docker' in PATH.  Is Docker installed?"
+  displayException UnsupportedStackExeHostPlatformException = concat
+    [ "Error: [S-6894]\n"
+    , "Using host's "
+    , stackProgName
+    , " executable in Docker container is only supported on "
+    , display dockerContainerPlatform
+    , " platform."
+    ]
+  displayException (DockerStackExeParseException s) = concat
+    [ "Error: [S-1512]\n"
+    , "Failed to parse "
+    , show s
+    , ". Expected "
+    , show dockerStackExeDownloadVal
+    , ", "
+    , show dockerStackExeHostVal
+    , ", "
+    , show dockerStackExeImageVal
+    , " or absolute path to executable."
+    ]
 
 -- | Docker configuration.
 data DockerOpts = DockerOpts
-  {dockerEnable :: !Bool
-    -- ^ Is using Docker enabled?
-  ,dockerImage :: !(Either SomeException String)
-    -- ^ Exact Docker image tag or ID.  Overrides docker-repo-*/tag.
-  ,dockerRegistryLogin :: !Bool
-    -- ^ Does registry require login for pulls?
-  ,dockerRegistryUsername :: !(Maybe String)
-    -- ^ Optional username for Docker registry.
-  ,dockerRegistryPassword :: !(Maybe String)
-    -- ^ Optional password for Docker registry.
-  ,dockerAutoPull :: !Bool
-    -- ^ Automatically pull new images.
-  ,dockerDetach :: !Bool
-    -- ^ Whether to run a detached container
-  ,dockerPersist :: !Bool
-    -- ^ Create a persistent container (don't remove it when finished).  Implied by
-    -- `dockerDetach`.
-  ,dockerContainerName :: !(Maybe String)
-    -- ^ Container name to use, only makes sense from command-line with `dockerPersist`
-    -- or `dockerDetach`.
-  ,dockerNetwork :: !(Maybe String)
-   -- ^ The network docker uses.
-  ,dockerRunArgs :: ![String]
-    -- ^ Arguments to pass directly to @docker run@.
-  ,dockerMount :: ![Mount]
-    -- ^ Volumes to mount in the container.
-  ,dockerMountMode :: !(Maybe String)
-    -- ^ Volume mount mode
-  ,dockerEnv :: ![String]
-    -- ^ Environment variables to set in the container.
-  ,dockerStackExe :: !(Maybe DockerStackExe)
-    -- ^ Location of container-compatible Stack executable
-  ,dockerSetUser :: !(Maybe Bool)
-   -- ^ Set in-container user to match host's
-  ,dockerRequireDockerVersion :: !VersionRange
-   -- ^ Require a version of Docker within this range.
+  { enable :: !Bool
+     -- ^ Is using Docker enabled?
+  , image :: !(Either SomeException String)
+     -- ^ Exact Docker image tag or ID.  Overrides docker-repo-*/tag.
+  , registryLogin :: !Bool
+     -- ^ Does registry require login for pulls?
+  , registryUsername :: !(Maybe String)
+     -- ^ Optional username for Docker registry.
+  , registryPassword :: !(Maybe String)
+     -- ^ Optional password for Docker registry.
+  , autoPull :: !Bool
+     -- ^ Automatically pull new images.
+  , detach :: !Bool
+     -- ^ Whether to run a detached container
+  , persist :: !Bool
+     -- ^ Create a persistent container (don't remove it when finished). Implied
+     -- by 'DockerOpts.detach'.
+  , containerName :: !(Maybe String)
+     -- ^ Container name to use, only makes sense from command-line with
+     -- 'DockerOpts.persist' or 'DockerOpts.detach'.
+  , network :: !(Maybe String)
+    -- ^ The network docker uses.
+  , runArgs :: ![String]
+     -- ^ Arguments to pass directly to @docker run@.
+  , mount :: ![Mount]
+     -- ^ Volumes to mount in the container.
+  , mountMode :: !(Maybe String)
+     -- ^ Volume mount mode
+  , env :: ![String]
+     -- ^ Environment variables to set in the container.
+  , stackExe :: !(Maybe DockerStackExe)
+     -- ^ Location of container-compatible Stack executable
+  , setUser :: !(Maybe Bool)
+    -- ^ Set in-container user to match host's
+  , requireDockerVersion :: !VersionRange
+    -- ^ Require a version of Docker within this range.
   }
-  deriving (Show)
+  deriving Show
 
--- | An uninterpreted representation of docker options.
--- Configurations may be "cascaded" using mappend (left-biased).
+-- | An uninterpreted representation of docker options. Configurations may be
+-- "cascaded" using mappend (left-biased).
 data DockerOptsMonoid = DockerOptsMonoid
-  {dockerMonoidDefaultEnable :: !Any
-    -- ^ Should Docker be defaulted to enabled (does @docker:@ section exist in the config)?
-  ,dockerMonoidEnable :: !(First Bool)
+  { defaultEnable :: !Any
+    -- ^ Should Docker be defaulted to enabled (does @docker:@ section exist in
+    -- the config)?
+  , enable :: !(First Bool)
     -- ^ Is using Docker enabled?
-  ,dockerMonoidRepoOrImage :: !(First DockerMonoidRepoOrImage)
-    -- ^ Docker repository name (e.g. @fpco/stack-build@ or @fpco/stack-full:lts-2.8@)
-  ,dockerMonoidRegistryLogin :: !(First Bool)
+  , repoOrImage :: !(First DockerMonoidRepoOrImage)
+    -- ^ Docker repository name (e.g. @fpco/stack-build@ or
+    -- @fpco/stack-full:lts-2.8@)
+  , registryLogin :: !(First Bool)
     -- ^ Does registry require login for pulls?
-  ,dockerMonoidRegistryUsername :: !(First String)
+  , registryUsername :: !(First String)
     -- ^ Optional username for Docker registry.
-  ,dockerMonoidRegistryPassword :: !(First String)
+  , registryPassword :: !(First String)
     -- ^ Optional password for Docker registry.
-  ,dockerMonoidAutoPull :: !FirstTrue
+  , autoPull :: !FirstTrue
     -- ^ Automatically pull new images.
-  ,dockerMonoidDetach :: !FirstFalse
+  , detach :: !FirstFalse
     -- ^ Whether to run a detached container
-  ,dockerMonoidPersist :: !FirstFalse
-    -- ^ Create a persistent container (don't remove it when finished).  Implied by
-    -- `dockerDetach`.
-  ,dockerMonoidContainerName :: !(First String)
-    -- ^ Container name to use, only makes sense from command-line with `dockerPersist`
-    -- or `dockerDetach`.
-  ,dockerMonoidNetwork :: !(First String)
-    -- ^ See: 'dockerNetwork'
-  ,dockerMonoidRunArgs :: ![String]
+  , persist :: !FirstFalse
+    -- ^ Create a persistent container (don't remove it when finished). Implied
+    -- by 'DockerOpts.detach'.
+  , containerName :: !(First String)
+    -- ^ Container name to use, only makes sense from command-line with
+    -- 'DockerOpts.persist' or 'DockerOpts.detach'.
+  , network :: !(First String)
+    -- ^ See: 'DockerOpts.network'
+  , runArgs :: ![String]
     -- ^ Arguments to pass directly to @docker run@
-  ,dockerMonoidMount :: ![Mount]
+  , mount :: ![Mount]
     -- ^ Volumes to mount in the container
-  ,dockerMonoidMountMode :: !(First String)
+  , mountMode :: !(First String)
     -- ^ Volume mount mode
-  ,dockerMonoidEnv :: ![String]
+  , env :: ![String]
     -- ^ Environment variables to set in the container
-  ,dockerMonoidStackExe :: !(First DockerStackExe)
+  , stackExe :: !(First DockerStackExe)
     -- ^ Location of container-compatible Stack executable
-  ,dockerMonoidSetUser :: !(First Bool)
-   -- ^ Set in-container user to match host's
-  ,dockerMonoidRequireDockerVersion :: !IntersectingVersionRange
-  -- ^ See: 'dockerRequireDockerVersion'
+  , setUser :: !(First Bool)
+    -- ^ Set in-container user to match host's
+  , requireDockerVersion :: !IntersectingVersionRange
+    -- ^ See: 'DockerOpts.requireDockerVersion'
   }
   deriving (Show, Generic)
 
 -- | Decode uninterpreted docker options from JSON/YAML.
 instance FromJSON (WithJSONWarnings DockerOptsMonoid) where
-  parseJSON = withObjectWarnings "DockerOptsMonoid"
-    (\o -> do let dockerMonoidDefaultEnable = Any True
-              dockerMonoidEnable           <- First <$> o ..:? dockerEnableArgName
-              dockerMonoidRepoOrImage      <- First <$>
-                                              ((Just . DockerMonoidImage <$> o ..: dockerImageArgName) <|>
-                                              (Just . DockerMonoidRepo <$> o ..: dockerRepoArgName) <|>
-                                              pure Nothing)
-              dockerMonoidRegistryLogin    <- First <$> o ..:? dockerRegistryLoginArgName
-              dockerMonoidRegistryUsername <- First <$> o ..:? dockerRegistryUsernameArgName
-              dockerMonoidRegistryPassword <- First <$> o ..:? dockerRegistryPasswordArgName
-              dockerMonoidAutoPull         <- FirstTrue <$> o ..:? dockerAutoPullArgName
-              dockerMonoidDetach           <- FirstFalse <$> o ..:? dockerDetachArgName
-              dockerMonoidPersist          <- FirstFalse <$> o ..:? dockerPersistArgName
-              dockerMonoidContainerName    <- First <$> o ..:? dockerContainerNameArgName
-              dockerMonoidNetwork          <- First <$> o ..:? dockerNetworkArgName
-              dockerMonoidRunArgs          <- o ..:? dockerRunArgsArgName ..!= []
-              dockerMonoidMount            <- o ..:? dockerMountArgName ..!= []
-              dockerMonoidMountMode        <- First <$> o ..:? dockerMountModeArgName
-              dockerMonoidEnv              <- o ..:? dockerEnvArgName ..!= []
-              dockerMonoidStackExe         <- First <$> o ..:? dockerStackExeArgName
-              dockerMonoidSetUser          <- First <$> o ..:? dockerSetUserArgName
-              dockerMonoidRequireDockerVersion
-                                           <- IntersectingVersionRange . unVersionRangeJSON <$> (
-                                                 o ..:? dockerRequireDockerVersionArgName
-                                                   ..!= VersionRangeJSON anyVersion)
-              pure DockerOptsMonoid{..})
+  parseJSON = withObjectWarnings "DockerOptsMonoid" $ \o -> do
+    let defaultEnable = Any True
+    enable <- First <$> o ..:? dockerEnableArgName
+    repoOrImage <- First <$>
+      (   (Just . DockerMonoidImage <$> o ..: dockerImageArgName)
+      <|> (Just . DockerMonoidRepo <$> o ..: dockerRepoArgName)
+      <|> pure Nothing
+      )
+    registryLogin <- First <$> o ..:? dockerRegistryLoginArgName
+    registryUsername <-
+      First <$> o ..:? dockerRegistryUsernameArgName
+    registryPassword <-
+      First <$> o ..:? dockerRegistryPasswordArgName
+    autoPull <- FirstTrue <$> o ..:? dockerAutoPullArgName
+    detach <- FirstFalse <$> o ..:? dockerDetachArgName
+    persist <- FirstFalse <$> o ..:? dockerPersistArgName
+    containerName <- First <$> o ..:? dockerContainerNameArgName
+    network <- First <$> o ..:? dockerNetworkArgName
+    runArgs <- o ..:? dockerRunArgsArgName ..!= []
+    mount <- o ..:? dockerMountArgName ..!= []
+    mountMode <- First <$> o ..:? dockerMountModeArgName
+    env <- o ..:? dockerEnvArgName ..!= []
+    stackExe <- First <$> o ..:? dockerStackExeArgName
+    setUser <- First <$> o ..:? dockerSetUserArgName
+    requireDockerVersion <-
+      IntersectingVersionRange . (.versionRangeJSON) <$>
+        ( o ..:? dockerRequireDockerVersionArgName
+          ..!= VersionRangeJSON anyVersion
+        )
+    pure DockerOptsMonoid
+      { defaultEnable
+      , enable
+      , repoOrImage
+      , registryLogin
+      , registryUsername
+      , registryPassword
+      , autoPull
+      , detach
+      , persist
+      , containerName
+      , network
+      , runArgs
+      , mount
+      , mountMode
+      , env
+      , stackExe
+      , setUser
+      , requireDockerVersion
+      }
 
 -- | Left-biased combine Docker options
 instance Semigroup DockerOptsMonoid where
@@ -144,30 +394,30 @@ instance Monoid DockerOptsMonoid where
   mempty = memptydefault
   mappend = (<>)
 
--- | Where to get the `stack` executable to run in Docker containers
+-- | Where to get the \'stack\' executable to run in Docker containers
 data DockerStackExe
-    = DockerStackExeDownload  -- ^ Download from official bindist
-    | DockerStackExeHost  -- ^ Host's `stack` (linux-x86_64 only)
-    | DockerStackExeImage  -- ^ Docker image's `stack` (versions must match)
-    | DockerStackExePath (Path Abs File) -- ^ Executable at given path
-    deriving (Show)
+  = DockerStackExeDownload  -- ^ Download from official bindist
+  | DockerStackExeHost  -- ^ Host's \'stack\' (linux-x86_64 only)
+  | DockerStackExeImage  -- ^ Docker image's \'stack\' (versions must match)
+  | DockerStackExePath (Path Abs File) -- ^ Executable at given path
+  deriving Show
 
 instance FromJSON DockerStackExe where
-    parseJSON a = do
-        s <- parseJSON a
-        case parseDockerStackExe s of
-            Right dse -> pure dse
-            Left e -> fail (show e)
+  parseJSON a = do
+    s <- parseJSON a
+    case parseDockerStackExe s of
+      Right dse -> pure dse
+      Left e -> fail (displayException e)
 
 -- | Parse 'DockerStackExe'.
 parseDockerStackExe :: (MonadThrow m) => String -> m DockerStackExe
 parseDockerStackExe t
-    | t == dockerStackExeDownloadVal = pure DockerStackExeDownload
-    | t == dockerStackExeHostVal = pure DockerStackExeHost
-    | t == dockerStackExeImageVal = pure DockerStackExeImage
-    | otherwise = case parseAbsFile t of
-        Just p -> pure (DockerStackExePath p)
-        Nothing -> throwM (DockerStackExeParseException t)
+  | t == dockerStackExeDownloadVal = pure DockerStackExeDownload
+  | t == dockerStackExeHostVal = pure DockerStackExeHost
+  | t == dockerStackExeImageVal = pure DockerStackExeImage
+  | otherwise = case parseAbsFile t of
+      Just p -> pure (DockerStackExePath p)
+      Nothing -> throwM (DockerStackExeParseException t)
 
 -- | Docker volume mount.
 data Mount = Mount String String
@@ -176,15 +426,13 @@ data Mount = Mount String String
 instance Read Mount where
   readsPrec _ s =
     case break (== ':') s of
-      (a,':':b) -> [(Mount a b,"")]
-      (a,[]) -> [(Mount a a,"")]
+      (a, ':':b) -> [(Mount a b, "")]
+      (a, []) -> [(Mount a a, "")]
       _ -> fail "Invalid value for Docker mount (expect '/host/path:/container/path')"
 
 -- | Show instance.
 instance Show Mount where
-  show (Mount a b) = if a == b
-                        then a
-                        else concat [a,":",b]
+  show (Mount a b) = if a == b then a else concat [a, ":", b]
 
 -- | For YAML.
 instance FromJSON Mount where
@@ -198,152 +446,18 @@ instance FromJSON Mount where
 data DockerMonoidRepoOrImage
   = DockerMonoidRepo String
   | DockerMonoidImage String
-  deriving (Show)
+  deriving Show
 
 -- | Newtype for non-orphan FromJSON instance.
-newtype VersionRangeJSON = VersionRangeJSON { unVersionRangeJSON :: VersionRange }
+newtype VersionRangeJSON =
+  VersionRangeJSON { versionRangeJSON :: VersionRange }
 
 -- | Parse VersionRange.
 instance FromJSON VersionRangeJSON where
   parseJSON = withText "VersionRange"
-                (\s -> maybe (fail ("Invalid cabal-style VersionRange: " ++ T.unpack s))
-                             (pure . VersionRangeJSON)
-                             (Distribution.Text.simpleParse (T.unpack s)))
-
--- | Exceptions thrown by Stack.Docker.
-data StackDockerException
-    = DockerMustBeEnabledException
-      -- ^ Docker must be enabled to use the command.
-    | OnlyOnHostException
-      -- ^ Command must be run on host OS (not in a container).
-    | InspectFailedException String
-      -- ^ @docker inspect@ failed.
-    | NotPulledException String
-      -- ^ Image does not exist.
-    | InvalidImagesOutputException String
-      -- ^ Invalid output from @docker images@.
-    | InvalidPSOutputException String
-      -- ^ Invalid output from @docker ps@.
-    | InvalidInspectOutputException String
-      -- ^ Invalid output from @docker inspect@.
-    | PullFailedException String
-      -- ^ Could not pull a Docker image.
-    | DockerTooOldException Version Version
-      -- ^ Installed version of @docker@ below minimum version.
-    | DockerVersionProhibitedException [Version] Version
-      -- ^ Installed version of @docker@ is prohibited.
-    | BadDockerVersionException VersionRange Version
-      -- ^ Installed version of @docker@ is out of range specified in config file.
-    | InvalidVersionOutputException
-      -- ^ Invalid output from @docker --version@.
-    | HostStackTooOldException Version (Maybe Version)
-      -- ^ Version of @stack@ on host is too old for version in image.
-    | ContainerStackTooOldException Version Version
-      -- ^ Version of @stack@ in container/image is too old for version on host.
-    | CannotDetermineProjectRootException
-      -- ^ Can't determine the project root (where to put docker sandbox).
-    | DockerNotInstalledException
-      -- ^ @docker --version@ failed.
-    | UnsupportedStackExeHostPlatformException
-      -- ^ Using host stack-exe on unsupported platform.
-    | DockerStackExeParseException String
-      -- ^ @stack-exe@ option fails to parse.
-    deriving (Typeable)
-instance Exception StackDockerException
-
-instance Show StackDockerException where
-    show DockerMustBeEnabledException =
-        "Docker must be enabled in your configuration file to use this command."
-    show OnlyOnHostException =
-        "This command must be run on host OS (not in a Docker container)."
-    show (InspectFailedException image) =
-        concat ["'docker inspect' failed for image after pull: ",image,"."]
-    show (NotPulledException image) =
-        concat ["The Docker image referenced by your configuration file"
-               ," has not\nbeen downloaded:\n    "
-               ,image
-               ,"\n\nRun '"
-               ,unwords [stackProgName, dockerCmdName, dockerPullCmdName]
-               ,"' to download it, then try again."]
-    show (InvalidImagesOutputException line) =
-        concat ["Invalid 'docker images' output line: '",line,"'."]
-    show (InvalidPSOutputException line) =
-        concat ["Invalid 'docker ps' output line: '",line,"'."]
-    show (InvalidInspectOutputException msg) =
-        concat ["Invalid 'docker inspect' output: ",msg,"."]
-    show (PullFailedException image) =
-        concat ["Could not pull Docker image:\n    "
-               ,image
-               ,"\nThere may not be an image on the registry for your resolver's LTS version in\n"
-               ,"your configuration file."]
-    show (DockerTooOldException minVersion haveVersion) =
-        concat ["Minimum docker version '"
-               ,versionString minVersion
-               ,"' is required by "
-               ,stackProgName
-               ," (you have '"
-               ,versionString haveVersion
-               ,"')."]
-    show (DockerVersionProhibitedException prohibitedVersions haveVersion) =
-        concat ["These Docker versions are incompatible with "
-               ,stackProgName
-               ," (you have '"
-               ,versionString haveVersion
-               ,"'): "
-               ,intercalate ", " (map versionString prohibitedVersions)
-               ,"."]
-    show (BadDockerVersionException requiredRange haveVersion) =
-        concat ["The version of 'docker' you are using ("
-               ,show haveVersion
-               ,") is outside the required\n"
-               ,"version range specified in stack.yaml ("
-               ,T.unpack (versionRangeText requiredRange)
-               ,")."]
-    show InvalidVersionOutputException =
-        "Cannot get Docker version (invalid 'docker --version' output)."
-    show (HostStackTooOldException minVersion (Just hostVersion)) =
-        concat ["The host's version of '"
-               ,stackProgName
-               ,"' is too old for this Docker image.\nVersion "
-               ,versionString minVersion
-               ," is required; you have "
-               ,versionString hostVersion
-               ,"."]
-    show (HostStackTooOldException minVersion Nothing) =
-        concat ["The host's version of '"
-               ,stackProgName
-               ,"' is too old.\nVersion "
-               ,versionString minVersion
-               ," is required."]
-    show (ContainerStackTooOldException requiredVersion containerVersion) =
-        concat ["The Docker container's version of '"
-               ,stackProgName
-               ,"' is too old.\nVersion "
-               ,versionString requiredVersion
-               ," is required; the container has "
-               ,versionString containerVersion
-               ,"."]
-    show CannotDetermineProjectRootException =
-        "Cannot determine project root directory for Docker sandbox."
-    show DockerNotInstalledException =
-        "Cannot find 'docker' in PATH.  Is Docker installed?"
-    show UnsupportedStackExeHostPlatformException = concat
-        [ "Using host's "
-        , stackProgName
-        , " executable in Docker container is only supported on "
-        , display dockerContainerPlatform
-        , " platform" ]
-    show (DockerStackExeParseException s) = concat
-        [ "Failed to parse "
-        , show s
-        , ". Expected "
-        , show dockerStackExeDownloadVal
-        , ", "
-        , show dockerStackExeHostVal
-        , ", "
-        , show dockerStackExeImageVal
-        , " or absolute path to executable."
-        ]
+    (\s -> maybe (fail ("Invalid cabal-style VersionRange: " ++ T.unpack s))
+                 (pure . VersionRangeJSON)
+                 (Distribution.Text.simpleParse (T.unpack s)))
 
 -- | Docker enable argument name.
 dockerEnableArgName :: Text
@@ -437,6 +551,7 @@ dockerEntrypointArgName = "internal-docker-entrypoint"
 dockerCmdName :: String
 dockerCmdName = "docker"
 
+-- | Command-line option to show only @--docker-*@ options.
 dockerHelpOptName :: String
 dockerHelpOptName = dockerCmdName ++ "-help"
 
diff --git a/src/Stack/Types/DockerEntrypoint.hs b/src/Stack/Types/DockerEntrypoint.hs
new file mode 100644
index 0000000000..4d5ad69f1c
--- /dev/null
+++ b/src/Stack/Types/DockerEntrypoint.hs
@@ -0,0 +1,32 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.DockerEntrypoint
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.DockerEntrypoint
+  ( DockerEntrypoint (..)
+  , DockerUser (..)
+  ) where
+
+import           Stack.Prelude
+import           System.PosixCompat.Types ( FileMode, GroupID, UserID )
+
+-- | Data passed into Docker container for the Docker entrypoint's use
+newtype DockerEntrypoint = DockerEntrypoint
+  { user :: Maybe DockerUser
+    -- ^ UID/GID/etc of host user, if we wish to perform UID/GID switch in
+    -- container
+  }
+  deriving (Read, Show)
+
+-- | Docker host user info
+data DockerUser = DockerUser
+  { uid :: UserID -- ^ uid
+  , gid :: GroupID -- ^ gid
+  , groups :: [GroupID] -- ^ Supplemental groups
+  , umask :: FileMode -- ^ File creation mask }
+  }
+  deriving (Read, Show)
diff --git a/src/Stack/Types/DotConfig.hs b/src/Stack/Types/DotConfig.hs
new file mode 100644
index 0000000000..c624d8a9bb
--- /dev/null
+++ b/src/Stack/Types/DotConfig.hs
@@ -0,0 +1,71 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+
+{-|
+Module      : Stack.Types.DotConfig
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.DotConfig
+  ( DotConfig (..)
+  ) where
+
+import           RIO.Process ( HasProcessContext (..) )
+import           Stack.Prelude hiding ( Display (..), pkgName, loadPackage )
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.Config ( HasConfig (..) )
+import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.EnvConfig ( HasSourceMap (..) )
+import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( HasRunner (..) )
+import           Stack.Types.SourceMap ( SourceMap (..) )
+
+-- | Type representing configurations for the creation of a dependency graph.
+data DotConfig = DotConfig
+  { buildConfig :: !BuildConfig
+  , sourceMap :: !SourceMap
+  , globalDump :: ![DumpPackage]
+  }
+
+instance HasLogFunc DotConfig where
+  logFuncL = runnerL . logFuncL
+
+instance HasPantryConfig DotConfig where
+  pantryConfigL = configL . pantryConfigL
+
+instance HasTerm DotConfig where
+  useColorL = runnerL . useColorL
+  termWidthL = runnerL . termWidthL
+
+instance HasStylesUpdate DotConfig where
+  stylesUpdateL = runnerL . stylesUpdateL
+
+instance HasGHCVariant DotConfig where
+  ghcVariantL = configL . ghcVariantL
+  {-# INLINE ghcVariantL #-}
+
+instance HasPlatform DotConfig where
+  platformL = configL . platformL
+  {-# INLINE platformL #-}
+  platformVariantL = configL . platformVariantL
+  {-# INLINE platformVariantL #-}
+
+instance HasRunner DotConfig where
+  runnerL = configL . runnerL
+
+instance HasProcessContext DotConfig where
+  processContextL = runnerL . processContextL
+
+instance HasConfig DotConfig where
+  configL = buildConfigL . lens (.config) (\x y -> x { config = y })
+  {-# INLINE configL #-}
+
+instance HasBuildConfig DotConfig where
+  buildConfigL = lens (.buildConfig) (\x y -> x { buildConfig = y })
+
+instance HasSourceMap DotConfig where
+  sourceMapL = lens (.sourceMap) (\x y -> x { sourceMap = y })
diff --git a/src/Stack/Types/DotOpts.hs b/src/Stack/Types/DotOpts.hs
new file mode 100644
index 0000000000..dd8f4c9ba0
--- /dev/null
+++ b/src/Stack/Types/DotOpts.hs
@@ -0,0 +1,43 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.DotOpts
+License     : BSD-3-Clause
+
+Module exporting the t`DotOpts` type used by Stack's @dot@ and @ls dependencies@
+commands.
+-}
+
+module Stack.Types.DotOpts
+  ( DotOpts (..)
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.BuildOptsCLI ( ApplyCLIFlag )
+
+-- | Options record for @stack dot@ and @stack ls dependencies@
+data DotOpts = DotOpts
+  { includeExternal :: !Bool
+    -- ^ Include external dependencies
+  , includeBase :: !Bool
+    -- ^ Include dependencies on base
+  , dependencyDepth :: !(Maybe Int)
+    -- ^ Limit the depth of dependency resolution to (Just n) or continue until
+    -- fixpoint
+  , prune :: !(Set PackageName)
+    -- ^ Package names to prune from the graph
+  , reach :: !(Set PackageName)
+    -- ^ If not empty, packages in the pruned graph must be able to reach one or
+    -- more of these packages
+  , dotTargets :: [Text]
+    -- ^ Stack TARGETs to trace dependencies for
+  , flags :: !(Map ApplyCLIFlag (Map FlagName Bool))
+    -- ^ Flags to apply when calculating dependencies
+  , testTargets :: Bool
+    -- ^ Like the "--test" flag for build, affects the meaning of 'dotTargets'.
+  , benchTargets :: Bool
+    -- ^ Like the "--bench" flag for build, affects the meaning of 'dotTargets'.
+  , globalHints :: Bool
+    -- ^ Use global hints instead of relying on an actual GHC installation.
+  }
diff --git a/src/Stack/Types/DownloadInfo.hs b/src/Stack/Types/DownloadInfo.hs
new file mode 100644
index 0000000000..7e1ef35f35
--- /dev/null
+++ b/src/Stack/Types/DownloadInfo.hs
@@ -0,0 +1,50 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.DownloadInfo
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.DownloadInfo
+  ( DownloadInfo (..)
+  , parseDownloadInfoFromObject
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), Object )
+import           Data.Aeson.WarningParser
+                   ( WarningParser, WithJSONWarnings (..), (..:), (..:?)
+                   , withObjectWarnings
+                   )
+import           Stack.Prelude
+
+-- | Information for a file to download.
+data DownloadInfo = DownloadInfo
+  { url :: Text
+    -- ^ URL or absolute file path
+  , contentLength :: Maybe Int
+  , sha1 :: Maybe ByteString
+  , sha256 :: Maybe ByteString
+  }
+  deriving Show
+
+instance FromJSON (WithJSONWarnings DownloadInfo) where
+  parseJSON = withObjectWarnings "DownloadInfo" parseDownloadInfoFromObject
+
+-- | Parse JSON in existing object for t'DownloadInfo'
+parseDownloadInfoFromObject :: Object -> WarningParser DownloadInfo
+parseDownloadInfoFromObject o = do
+  url <- o ..: "url"
+  contentLength <- o ..:? "content-length"
+  sha1TextMay <- o ..:? "sha1"
+  sha256TextMay <- o ..:? "sha256"
+  let sha1 = fmap encodeUtf8 sha1TextMay
+      sha256 = fmap encodeUtf8 sha256TextMay
+  pure
+    DownloadInfo
+    { url
+    , contentLength
+    , sha1
+    , sha256
+    }
diff --git a/src/Stack/Types/DumpLogs.hs b/src/Stack/Types/DumpLogs.hs
new file mode 100644
index 0000000000..ea35f30d44
--- /dev/null
+++ b/src/Stack/Types/DumpLogs.hs
@@ -0,0 +1,35 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE MultiWayIf        #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.DumpLogs
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.DumpLogs
+  ( DumpLogs (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), Value (..), withText )
+import           Stack.Prelude
+
+-- | Which build log files to dump
+data DumpLogs
+  = DumpNoLogs -- ^ don't dump any logfiles
+  | DumpWarningLogs -- ^ dump logfiles containing warnings
+  | DumpAllLogs -- ^ dump all logfiles
+  deriving (Bounded, Enum, Eq, Ord, Read, Show)
+
+instance FromJSON DumpLogs where
+  parseJSON (Bool True) = pure DumpAllLogs
+  parseJSON (Bool False) = pure DumpNoLogs
+  parseJSON v =
+    withText
+      "DumpLogs"
+      (\t ->
+          if | t == "none" -> pure DumpNoLogs
+             | t == "warning" -> pure DumpWarningLogs
+             | t == "all" -> pure DumpAllLogs
+             | otherwise -> fail ("Invalid DumpLogs: " ++ show t))
+      v
diff --git a/src/Stack/Types/DumpPackage.hs b/src/Stack/Types/DumpPackage.hs
new file mode 100644
index 0000000000..24da19052e
--- /dev/null
+++ b/src/Stack/Types/DumpPackage.hs
@@ -0,0 +1,67 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Types.DumpPackage
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.DumpPackage
+  ( DumpPackage (..)
+  , SublibDump (..)
+  , DumpedGlobalPackage
+  , sublibParentPkgId
+  ) where
+
+import qualified Distribution.License as C
+import           Distribution.ModuleName ( ModuleName )
+import           Stack.Prelude
+import           Stack.Types.Component ( StackUnqualCompName )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+
+-- | Type representing dump information for a single installed package, as
+-- output by the @ghc-pkg describe@ command.
+data DumpPackage = DumpPackage
+  { ghcPkgId :: !GhcPkgId
+    -- ^ The @id@ field.
+  , packageIdent :: !PackageIdentifier
+    -- ^ The @name@ and @version@ fields. The @name@ field is the munged package
+    -- name. If the package is not for a sub-library, its munged name is its
+    -- name.
+  , sublib :: !(Maybe SublibDump)
+    -- ^ The sub-library information, if it is a sub-library.
+  , license :: !(Maybe C.License)
+  , libDirs :: ![FilePath]
+    -- ^ The @library-dirs@ field.
+  , libraries :: ![Text]
+    -- ^ The @hs-libraries@ field.
+  , hasExposedModules :: !Bool
+  , exposedModules :: !(Set ModuleName)
+  , depends :: ![GhcPkgId]
+    -- ^ The @depends@ field (packages on which this package depends).
+  , haddockInterfaces :: ![FilePath]
+  , haddockHtml :: !(Maybe FilePath)
+  , isExposed :: !Bool
+  }
+  deriving (Eq, Read, Show)
+
+-- | An installed package for a sub-library of a Cabal package has additional
+-- fields.
+data SublibDump = SublibDump
+  { packageName :: PackageName
+    -- ^ The @package-name@ field.
+  , libraryName :: StackUnqualCompName
+    -- ^ The @lib-name@ field.
+  }
+  deriving (Eq, Read, Show)
+
+-- | Type synonym representing dump information for a single installed package
+-- in the global package database.
+type DumpedGlobalPackage = DumpPackage
+
+-- | If the given t'DumpPackage' is for a sub-library of a Cabal package, yields
+-- the package identifier of the Cabal package.
+sublibParentPkgId :: DumpPackage -> Maybe PackageIdentifier
+sublibParentPkgId dp = dp.sublib <&> \subLibDump ->
+  PackageIdentifier subLibDump.packageName dp.packageIdent.pkgVersion
diff --git a/src/Stack/Types/EnvConfig.hs b/src/Stack/Types/EnvConfig.hs
new file mode 100644
index 0000000000..70ed68da86
--- /dev/null
+++ b/src/Stack/Types/EnvConfig.hs
@@ -0,0 +1,324 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Types.EnvConfig
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.EnvConfig
+  ( EnvConfig (..)
+  , HasEnvConfig (..)
+  , HasSourceMap (..)
+  , IsPath (..)
+  , actualCompilerVersionL
+  , appropriateGhcColorFlag
+  , bindirCompilerTools
+  , compilerVersionDir
+  , extraBinDirs
+  , hoogleDatabasePath
+  , hoogleRoot
+  , hpcReportDir
+  , installationRootDeps
+  , installationRootLocal
+  , packageDatabaseDeps
+  , packageDatabaseExtra
+  , packageDatabaseLocal
+  , platformGhcRelDir
+  , platformGhcVerOnlyRelDir
+  , platformSnapAndCompilerRel
+  , shouldForceGhcColorFlag
+  , snapshotsDir
+  , useShaPathOnWindows
+  , shaPathForBytes
+  ) where
+
+import           Crypto.Hash ( SHA1 (..), hashWith )
+import qualified Data.ByteArray.Encoding as Mem ( Base(Base16), convertToBase )
+import qualified Data.ByteString.Char8 as S8
+import qualified Data.Text as T
+import qualified Distribution.Text ( display )
+import           Path
+                   ( (</>), parseAbsDir, parseAbsFile, parseRelDir
+                   , parseRelFile
+                   )
+import           RIO.Process ( HasProcessContext (..) )
+import           Stack.Constants
+                   ( bindirSuffix, ghcColorForceFlag, osIsWindows
+                   , relDirCompilerTools, relDirHoogle, relDirHpc, relDirInstall
+                   , relDirPkgdb, relDirSnapshots, relFileDatabaseHoo
+                   )
+import           Stack.Prelude
+import           Stack.Types.BuildConfig
+                    ( BuildConfig (..), HasBuildConfig (..), getWorkDir )
+import           Stack.Types.BuildOptsCLI ( BuildOptsCLI )
+import           Stack.Types.Compiler
+                   ( ActualCompiler (..), compilerVersionString )
+import           Stack.Types.CompilerBuild ( compilerBuildSuffix )
+import           Stack.Types.CompilerPaths
+                   ( CompilerPaths (..), HasCompiler (..) )
+import           Stack.Types.Config ( HasConfig (..), stackRootL )
+import           Stack.Types.FileDigestCache ( FileDigestCache )
+import           Stack.Types.GHCVariant ( HasGHCVariant (..), ghcVariantSuffix )
+import           Stack.Types.Platform
+                   ( HasPlatform (..), platformVariantSuffix )
+import           Stack.Types.Runner ( HasRunner (..) )
+import           Stack.Types.SourceMap
+                   ( SourceMap (..), SourceMapHash, smRelDir )
+
+-- | Configuration after the environment has been setup.
+data EnvConfig = EnvConfig
+  { buildConfig :: !BuildConfig
+  , buildOptsCLI :: !BuildOptsCLI
+  , fileDigestCache :: !FileDigestCache
+  , sourceMap :: !SourceMap
+  , sourceMapHash :: !SourceMapHash
+  , compilerPaths :: !CompilerPaths
+  }
+
+instance HasConfig EnvConfig where
+  configL = buildConfigL . lens (.config) (\x y -> x { config = y })
+  {-# INLINE configL #-}
+
+instance HasBuildConfig EnvConfig where
+  buildConfigL = envConfigL . lens
+    (.buildConfig)
+    (\x y -> x { buildConfig = y })
+
+instance HasPlatform EnvConfig where
+  platformL = configL . platformL
+  {-# INLINE platformL #-}
+  platformVariantL = configL . platformVariantL
+  {-# INLINE platformVariantL #-}
+
+instance HasGHCVariant EnvConfig where
+  ghcVariantL = configL . ghcVariantL
+  {-# INLINE ghcVariantL #-}
+
+instance HasProcessContext EnvConfig where
+  processContextL = configL . processContextL
+
+instance HasPantryConfig EnvConfig where
+  pantryConfigL = configL . pantryConfigL
+
+instance HasCompiler EnvConfig where
+  compilerPathsL = to (.compilerPaths)
+
+instance HasRunner EnvConfig where
+  runnerL = configL . runnerL
+
+instance HasLogFunc EnvConfig where
+  logFuncL = runnerL . logFuncL
+
+instance HasStylesUpdate EnvConfig where
+  stylesUpdateL = runnerL . stylesUpdateL
+
+instance HasTerm EnvConfig where
+  useColorL = runnerL . useColorL
+  termWidthL = runnerL . termWidthL
+
+class (HasBuildConfig env, HasSourceMap env, HasCompiler env) => HasEnvConfig env where
+  envConfigL :: Lens' env EnvConfig
+
+instance HasEnvConfig EnvConfig where
+  envConfigL = id
+  {-# INLINE envConfigL #-}
+
+class HasSourceMap env where
+  sourceMapL :: Lens' env SourceMap
+
+instance HasSourceMap EnvConfig where
+  sourceMapL = lens (.sourceMap) (\x y -> x { sourceMap = y })
+
+shouldForceGhcColorFlag ::
+     (HasEnvConfig env, HasRunner env)
+  => RIO env Bool
+shouldForceGhcColorFlag = view useColorL
+
+appropriateGhcColorFlag ::
+     (HasEnvConfig env, HasRunner env)
+  => RIO env (Maybe String)
+appropriateGhcColorFlag = f <$> shouldForceGhcColorFlag
+ where
+  f True = Just ghcColorForceFlag
+  f False = Nothing
+
+-- | Directory containing snapshots
+snapshotsDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => m (Path Abs Dir)
+snapshotsDir = do
+  root <- view stackRootL
+  platform <- platformGhcRelDir
+  pure $ root </> relDirSnapshots </> platform
+{-# DEPRECATED snapshotsDir "Not used by Stack >= 1.0.4. May be removed from a future version of stack." #-}
+
+-- | Installation root for dependencies.
+installationRootDeps :: HasEnvConfig env => RIO env (Path Abs Dir)
+installationRootDeps = do
+  root <- view stackRootL
+  psc <- platformSnapAndCompilerRel
+  pure $ root </> relDirSnapshots </> psc
+
+-- | Installation root for locals.
+installationRootLocal :: HasEnvConfig env => RIO env (Path Abs Dir)
+installationRootLocal = do
+  workDir <- getWorkDir
+  psc <- platformSnapAndCompilerRel
+  pure $ workDir </> relDirInstall </> psc
+
+-- | Get the hoogle database path.
+hoogleDatabasePath :: HasEnvConfig env => RIO env (Path Abs File)
+hoogleDatabasePath = do
+  dir <- hoogleRoot
+  pure (dir </> relFileDatabaseHoo)
+
+-- | Path for platform followed by snapshot name followed by compiler
+-- name.
+platformSnapAndCompilerRel :: HasEnvConfig env => RIO env (Path Rel Dir)
+platformSnapAndCompilerRel = do
+  platform <- platformGhcRelDir
+  smh <- view $ envConfigL . to (.sourceMapHash)
+  name <- smRelDir smh
+  ghc <- compilerVersionDir
+  useShaPathOnWindows (platform </> name </> ghc)
+
+-- | Relative directory for the platform and GHC identifier
+platformGhcRelDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => m (Path Rel Dir)
+platformGhcRelDir = do
+  cp <- view compilerPathsL
+  let cbSuffix = compilerBuildSuffix cp.build
+  verOnly <- platformGhcVerOnlyRelDirStr
+  parseRelDir (mconcat [ verOnly, cbSuffix ])
+
+-- | Installation root for compiler tools
+bindirCompilerTools ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => m (Path Abs Dir)
+bindirCompilerTools = do
+  config <- view configL
+  platform <- platformGhcRelDir
+  compilerVersion <- view actualCompilerVersionL
+  compiler <- parseRelDir $ compilerVersionString compilerVersion
+  pure $
+    view stackRootL config </>
+    relDirCompilerTools </>
+    platform </>
+    compiler </>
+    bindirSuffix
+
+-- | Hoogle directory.
+hoogleRoot :: HasEnvConfig env => RIO env (Path Abs Dir)
+hoogleRoot = do
+  workDir <- getWorkDir
+  psc <- platformSnapAndCompilerRel
+  pure $ workDir </> relDirHoogle </> psc
+
+compilerVersionDir ::
+     (HasEnvConfig env, MonadReader env m, MonadThrow m)
+  => m (Path Rel Dir)
+compilerVersionDir = do
+  compilerVersion <- view actualCompilerVersionL
+  parseRelDir $ case compilerVersion of
+    ACGhc version -> versionString version
+    ACGhcGit {} -> compilerVersionString compilerVersion
+
+-- | Package database for installing dependencies into
+packageDatabaseDeps :: HasEnvConfig env => RIO env (Path Abs Dir)
+packageDatabaseDeps = do
+  root <- installationRootDeps
+  pure $ root </> relDirPkgdb
+
+-- | Package database for installing project packages and local extra-deps into.
+packageDatabaseLocal :: HasEnvConfig env => RIO env (Path Abs Dir)
+packageDatabaseLocal = do
+  root <- installationRootLocal
+  pure $ root </> relDirPkgdb
+
+-- | Extra package databases
+packageDatabaseExtra ::
+     (HasEnvConfig env, MonadReader env m)
+  => m [Path Abs Dir]
+packageDatabaseExtra = view $ buildConfigL . to (.extraPackageDBs)
+
+-- | Where HPC reports and tix files get stored.
+hpcReportDir :: HasEnvConfig env => RIO env (Path Abs Dir)
+hpcReportDir = do
+  root <- installationRootLocal
+  pure $ root </> relDirHpc
+
+-- | Get the extra bin directories (for the PATH). Puts more local first
+--
+-- Bool indicates whether or not to include the locals
+extraBinDirs :: HasEnvConfig env => RIO env (Bool -> [Path Abs Dir])
+extraBinDirs = do
+  deps <- installationRootDeps
+  local' <- installationRootLocal
+  tools <- bindirCompilerTools
+  pure $ \locals -> if locals
+    then [local' </> bindirSuffix, deps </> bindirSuffix, tools]
+    else [deps </> bindirSuffix, tools]
+
+-- | The version of the compiler which will actually be used. May be different
+-- than that specified in the snapshot and returned by
+-- 'Stack.Types.BuildConfig.wantedCompilerVersionL'.
+actualCompilerVersionL :: HasSourceMap env => SimpleGetter env ActualCompiler
+actualCompilerVersionL = sourceMapL . to (.compiler)
+
+-- | Relative directory for the platform and GHC identifier without GHC bindist
+-- build
+platformGhcVerOnlyRelDir ::
+     (HasGHCVariant env, HasPlatform env, MonadReader env m, MonadThrow m)
+  => m (Path Rel Dir)
+platformGhcVerOnlyRelDir =
+  parseRelDir =<< platformGhcVerOnlyRelDirStr
+
+-- | Relative directory for the platform and GHC identifier without GHC bindist
+-- build (before parsing into a Path)
+platformGhcVerOnlyRelDirStr ::
+     (HasGHCVariant env, HasPlatform env, MonadReader env m)
+  => m FilePath
+platformGhcVerOnlyRelDirStr = do
+  platform <- view platformL
+  platformVariant <- view platformVariantL
+  ghcVariant <- view ghcVariantL
+  pure $ mconcat [ Distribution.Text.display platform
+                   , platformVariantSuffix platformVariant
+                   , ghcVariantSuffix ghcVariant ]
+
+-- | This is an attempt to shorten Stack paths on Windows to decrease our
+-- chances of hitting 260 symbol path limit. The idea is to calculate
+-- SHA1 hash of the path used on other architectures, encode with base
+-- 16 and take first 8 symbols of it.
+useShaPathOnWindows :: MonadThrow m => Path Rel Dir -> m (Path Rel Dir)
+useShaPathOnWindows
+  | osIsWindows = shaPath
+  | otherwise = pure
+
+shaPath :: (IsPath Rel t, MonadThrow m) => Path Rel t -> m (Path Rel t)
+shaPath = shaPathForBytes . encodeUtf8 . T.pack . toFilePath
+
+shaPathForBytes :: (IsPath Rel t, MonadThrow m) => ByteString -> m (Path Rel t)
+shaPathForBytes
+  = parsePath . S8.unpack . S8.take 8
+  . Mem.convertToBase Mem.Base16 . hashWith SHA1
+
+-- TODO: Move something like this into the path package. Consider
+-- subsuming path-io's 'AnyPath'?
+class IsPath b t where
+  parsePath :: MonadThrow m => FilePath -> m (Path b t)
+
+instance IsPath Abs Dir where
+  parsePath = parseAbsDir
+
+instance IsPath Rel Dir where
+  parsePath = parseRelDir
+
+instance IsPath Abs File where
+  parsePath = parseAbsFile
+
+instance IsPath Rel File where
+  parsePath = parseRelFile
diff --git a/src/Stack/Types/EnvSettings.hs b/src/Stack/Types/EnvSettings.hs
new file mode 100644
index 0000000000..8d4ae31150
--- /dev/null
+++ b/src/Stack/Types/EnvSettings.hs
@@ -0,0 +1,70 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.EnvSettings
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.EnvSettings
+  ( EnvSettings (..)
+  , minimalEnvSettings
+  , defaultEnvSettings
+  , plainEnvSettings
+  ) where
+
+import           Stack.Prelude
+
+-- | Controls which version of the environment is used
+data EnvSettings = EnvSettings
+  { includeLocals :: !Bool
+  -- ^ include project's local bin directory, GHC_PACKAGE_PATH, etc
+  , includeGhcPackagePath :: !Bool
+  -- ^ include the GHC_PACKAGE_PATH variable
+  , stackExe :: !Bool
+  -- ^ set the STACK_EXE variable to the current executable name
+  , localeUtf8 :: !Bool
+  -- ^ set the locale to C.UTF-8
+  , keepGhcRts :: !Bool
+  -- ^ if True, keep GHCRTS variable in environment
+  }
+  deriving (Eq, Ord, Show)
+
+-- | Minimal @EnvSettings@ which do not embellish the environment and do not
+-- pass through the GHCRTS environment variable. See
+-- https://github.com/commercialhaskell/stack/issues/3444
+minimalEnvSettings :: EnvSettings
+minimalEnvSettings =
+  EnvSettings
+  { includeLocals = False
+  , includeGhcPackagePath = False
+  , stackExe = False
+  , localeUtf8 = False
+  , keepGhcRts = False
+  }
+
+-- | Default @EnvSettings@ which includes locals and GHC_PACKAGE_PATH.
+--
+-- Note that this also passes through the GHCRTS environment variable. See
+-- https://github.com/commercialhaskell/stack/issues/3444
+defaultEnvSettings :: EnvSettings
+defaultEnvSettings = EnvSettings
+  { includeLocals = True
+  , includeGhcPackagePath = True
+  , stackExe = True
+  , localeUtf8 = False
+  , keepGhcRts = True
+  }
+
+-- | Environment settings which do not embellish the environment
+--
+-- Note that this also passes through the GHCRTS environment variable. See
+-- https://github.com/commercialhaskell/stack/issues/3444
+plainEnvSettings :: EnvSettings
+plainEnvSettings = EnvSettings
+  { includeLocals = False
+  , includeGhcPackagePath = False
+  , stackExe = False
+  , localeUtf8 = False
+  , keepGhcRts = True
+  }
diff --git a/src/Stack/Types/ExtraDirs.hs b/src/Stack/Types/ExtraDirs.hs
new file mode 100644
index 0000000000..957db38bef
--- /dev/null
+++ b/src/Stack/Types/ExtraDirs.hs
@@ -0,0 +1,28 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.ExtraDirs
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ExtraDirs
+  ( ExtraDirs (..)
+  ) where
+
+import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
+import           Stack.Prelude
+
+data ExtraDirs = ExtraDirs
+  { bins :: ![Path Abs Dir]
+  , includes :: ![Path Abs Dir]
+  , libs :: ![Path Abs Dir]
+  }
+  deriving (Show, Generic)
+
+instance Semigroup ExtraDirs where
+  (<>) = mappenddefault
+
+instance Monoid ExtraDirs where
+  mempty = memptydefault
+  mappend = (<>)
diff --git a/src/Stack/Types/FileDigestCache.hs b/src/Stack/Types/FileDigestCache.hs
new file mode 100644
index 0000000000..2bb64d36e4
--- /dev/null
+++ b/src/Stack/Types/FileDigestCache.hs
@@ -0,0 +1,32 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.FileDigestCache
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.FileDigestCache
+  ( FileDigestCache
+  , newFileDigestCache
+  , readFileDigest
+  ) where
+
+import qualified Data.Map.Strict as Map
+import qualified Pantry.SHA256 as SHA256
+import           Stack.Prelude
+
+-- | Type synonym representing caches of digests of files.
+type FileDigestCache = IORef (Map FilePath SHA256)
+
+newFileDigestCache :: MonadIO m => m FileDigestCache
+newFileDigestCache = newIORef Map.empty
+
+readFileDigest :: MonadIO m => FileDigestCache -> FilePath -> m SHA256
+readFileDigest cache filePath = do
+  digests <- readIORef cache
+  case Map.lookup filePath digests of
+    Just digest -> pure digest
+    Nothing -> do
+      sha256 <- SHA256.hashFile filePath
+      writeIORef cache $ Map.insert filePath sha256 digests
+      pure sha256
diff --git a/src/Stack/Types/GHCDownloadInfo.hs b/src/Stack/Types/GHCDownloadInfo.hs
new file mode 100644
index 0000000000..3d86e980c4
--- /dev/null
+++ b/src/Stack/Types/GHCDownloadInfo.hs
@@ -0,0 +1,37 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.GHCDownloadInfo
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.GHCDownloadInfo
+  ( GHCDownloadInfo (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..) )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings (..), (..:?), (..!=), withObjectWarnings )
+import           Stack.Prelude
+import           Stack.Types.DownloadInfo
+                   ( DownloadInfo, parseDownloadInfoFromObject )
+
+data GHCDownloadInfo = GHCDownloadInfo
+  { configureOpts :: [Text]
+  , configureEnv :: Map Text Text
+  , downloadInfo :: DownloadInfo
+  }
+  deriving Show
+
+instance FromJSON (WithJSONWarnings GHCDownloadInfo) where
+  parseJSON = withObjectWarnings "GHCDownloadInfo" $ \o -> do
+    configureOpts <- o ..:? "configure-opts" ..!= mempty
+    configureEnv <- o ..:? "configure-env" ..!= mempty
+    downloadInfo <- parseDownloadInfoFromObject o
+    pure GHCDownloadInfo
+      { configureOpts
+      , configureEnv
+      , downloadInfo
+      }
diff --git a/src/Stack/Types/GHCVariant.hs b/src/Stack/Types/GHCVariant.hs
new file mode 100644
index 0000000000..03275a4a87
--- /dev/null
+++ b/src/Stack/Types/GHCVariant.hs
@@ -0,0 +1,70 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.GHCVariant
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.GHCVariant
+  ( GHCVariant (..)
+  , HasGHCVariant (..)
+  , ghcVariantName
+  , ghcVariantSuffix
+  , parseGHCVariant
+  ) where
+
+import           Data.Aeson.Types ( FromJSON, parseJSON, withText )
+import           Data.List ( stripPrefix )
+import qualified Data.Text as T
+import           Stack.Prelude
+
+-- | Specialized variant of GHC (e.g. libgmp4 or integer-simple)
+data GHCVariant
+  = GHCStandard
+  -- ^ Standard bindist
+  | GHCIntegerSimple
+  -- ^ Bindist that uses integer-simple
+  | GHCNativeBignum
+  -- ^ Bindist that uses the Haskell-native big-integer backend
+  | GHCCustom String
+  -- ^ Other bindists
+  deriving Show
+
+instance FromJSON GHCVariant where
+  -- Strange structuring is to give consistent error messages
+  parseJSON =
+    withText
+      "GHCVariant"
+      (either (fail . show) pure . parseGHCVariant . T.unpack)
+
+-- | Class for environment values which have a GHCVariant
+class HasGHCVariant env where
+  ghcVariantL :: SimpleGetter env GHCVariant
+
+instance HasGHCVariant GHCVariant where
+  ghcVariantL = id
+  {-# INLINE ghcVariantL #-}
+
+-- | Render a GHC variant to a String.
+ghcVariantName :: GHCVariant -> String
+ghcVariantName GHCStandard = "standard"
+ghcVariantName GHCIntegerSimple = "integersimple"
+ghcVariantName GHCNativeBignum = "int-native"
+ghcVariantName (GHCCustom name) = "custom-" ++ name
+
+-- | Render a GHC variant to a String suffix.
+ghcVariantSuffix :: GHCVariant -> String
+ghcVariantSuffix GHCStandard = ""
+ghcVariantSuffix v = "-" ++ ghcVariantName v
+
+-- | Parse GHC variant from a String.
+parseGHCVariant :: (MonadThrow m) => String -> m GHCVariant
+parseGHCVariant s =
+  case stripPrefix "custom-" s of
+    Just name -> pure (GHCCustom name)
+    Nothing
+      | s == "" -> pure GHCStandard
+      | s == "standard" -> pure GHCStandard
+      | s == "integersimple" -> pure GHCIntegerSimple
+      | s == "int-native" -> pure GHCNativeBignum
+      | otherwise -> pure (GHCCustom s)
diff --git a/src/Stack/Types/GhcOptionKey.hs b/src/Stack/Types/GhcOptionKey.hs
new file mode 100644
index 0000000000..43fdab62e5
--- /dev/null
+++ b/src/Stack/Types/GhcOptionKey.hs
@@ -0,0 +1,44 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.GhcOptionKey
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.GhcOptionKey
+  ( GhcOptionKey (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSONKey (..), FromJSONKeyFunction (..) )
+import qualified Data.Text as T
+import           Stack.Prelude
+
+-- | Type representing scopes of the application by Stack of GHC options.
+data GhcOptionKey
+  = GOKOldEverything
+    -- ^ All packages, project packages or otherwise (specified with legacy
+    -- syntax).
+  | GOKEverything
+    -- ^ All packages, project packages or otherwise.
+  | GOKLocals
+    -- ^ All project packages, targets or otherwise.
+  | GOKTargets
+    -- ^ All project packages that are targets.
+  | GOKPackage !PackageName
+    -- ^ A named package.
+  deriving (Eq, Ord)
+
+instance FromJSONKey GhcOptionKey where
+  fromJSONKey = FromJSONKeyTextParser $ \t ->
+    case t of
+      "*" -> pure GOKOldEverything
+      "$everything" -> pure GOKEverything
+      "$locals" -> pure GOKLocals
+      "$targets" -> pure GOKTargets
+      _ ->
+        case parsePackageName $ T.unpack t of
+          Nothing -> fail $ "Invalid package name: " ++ show t
+          Just x -> pure $ GOKPackage x
+  fromJSONKeyList =
+    FromJSONKeyTextParser $ \_ -> fail "GhcOptionKey.fromJSONKeyList"
diff --git a/src/Stack/Types/GhcOptions.hs b/src/Stack/Types/GhcOptions.hs
new file mode 100644
index 0000000000..6350bd8650
--- /dev/null
+++ b/src/Stack/Types/GhcOptions.hs
@@ -0,0 +1,25 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.GhcOptions
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.GhcOptions
+  ( GhcOptions (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), withText )
+import           Data.Attoparsec.Args ( EscapingMode (Escaping), parseArgs )
+import qualified Data.Text as T
+import           Stack.Prelude
+
+-- | Type representing lists of GHC options.
+newtype GhcOptions = GhcOptions { ghcOptions :: [Text] }
+
+instance FromJSON GhcOptions where
+  parseJSON = withText "GhcOptions" $ \t ->
+    case parseArgs Escaping t of
+      Left e -> fail e
+      Right opts -> pure $ GhcOptions $ map T.pack opts
diff --git a/src/Stack/Types/GhcPkgExe.hs b/src/Stack/Types/GhcPkgExe.hs
new file mode 100644
index 0000000000..5346f4c1d5
--- /dev/null
+++ b/src/Stack/Types/GhcPkgExe.hs
@@ -0,0 +1,135 @@
+
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.GhcPkgExe
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.GhcPkgExe
+  ( GhcPkgPrettyException (..)
+  , GlobPackageIdentifier (..)
+  , PackageArg (..)
+  ) where
+
+import           Distribution.Package ( UnitId )
+import           Distribution.Text ( display )
+import           Path ( SomeBase (..) )
+import           Stack.Prelude hiding ( display )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "GHC.Utils.GhcPkg.Main.Compat" module or the "Stack.GhcPkg" module.
+data GhcPkgPrettyException
+  = CannotParse !String !String !String
+  | CannotOpenDBForModification !(SomeBase Dir) !IOException
+  | SingleFileDBUnsupported !(SomeBase Dir)
+  | ParsePackageInfoExceptions !String
+  | CannotFindPackage !PackageArg !(Maybe (SomeBase Dir))
+  | CannotParseRelFileBug !String
+  | CannotParseDirectoryWithDBug !String
+  | CannotRecacheAfterUnregister !(Path Abs Dir) !SomeException
+  deriving Show
+
+instance Pretty GhcPkgPrettyException where
+  pretty (CannotParse str what e) =
+    "[S-6512]"
+    <> line
+    <> fillSep
+         [ flow "cannot parse"
+         , style Current (fromString str)
+         , flow "as a"
+         , fromString what <> ":"
+         ]
+    <> blankLine
+    <> fromString e
+  pretty (CannotOpenDBForModification db_path e) =
+    "[S-3384]"
+    <> line
+    <> fillSep
+         [ flow "Couldn't open database"
+         , pretty db_path
+         , flow "for modification:"
+         ]
+    <> blankLine
+    <> string (displayException e)
+  pretty (SingleFileDBUnsupported path) =
+    "[S-1430]"
+    <> line
+    <> fillSep
+         [ flow "ghc no longer supports single-file style package databases"
+         , parens (pretty path)
+         , "use"
+         , style Shell (flow "ghc-pkg init")
+         , flow "to create the database with the correct format."
+         ]
+  pretty (ParsePackageInfoExceptions errs) =
+    "[S-5996]"
+    <> line
+    <> flow errs
+  pretty (CannotFindPackage pkgarg mdb_path) =
+    "[S-3189]"
+    <> line
+    <> fillSep
+         [ flow "cannot find package"
+         , style Current (pkg_msg pkgarg)
+         , maybe
+             ""
+             (\db_path -> fillSep ["in", pretty db_path])
+             mdb_path
+         ]
+   where
+    pkg_msg (Substring pkgpat _) = fillSep ["matching", fromString pkgpat]
+    pkg_msg pkgarg' = fromString $ show pkgarg'
+  pretty (CannotParseRelFileBug relFileName) = bugPrettyReport "[S-9323]" $
+    fillSep
+      [ flow "changeDBDir': Could not parse"
+      , style File (fromString relFileName)
+      , flow "as a relative path to a file."
+      ]
+  pretty (CannotParseDirectoryWithDBug dirName) = bugPrettyReport "[S-7651]" $
+    fillSep
+      [ flow "adjustOldDatabasePath: Could not parse"
+      , style Dir (fromString dirName)
+      , flow "as a directory."
+      ]
+  pretty (CannotRecacheAfterUnregister pkgDb e) =
+    "[S-6590]"
+    <> line
+    <> fillSep
+         [ flow "While recaching"
+         , pretty pkgDb
+         , flow "after unregistering packages, Stack encountered the following \
+                \ error:"
+         ]
+    <> blankLine
+    <> string (displayException e)
+
+instance Exception GhcPkgPrettyException
+
+-- | Represents how a package may be specified by a user on the command line.
+data PackageArg
+    -- | A package identifier foo-0.1, or a glob foo-*
+  = Id GlobPackageIdentifier
+    -- | An installed package ID foo-0.1-HASH.  This is guaranteed to uniquely
+    -- match a single entry in the package database.
+  | IUId UnitId
+    -- | A glob against the package name.  The first string is the literal
+    -- glob, the second is a function which returns @True@ if the argument
+    -- matches.
+  | Substring String (String -> Bool)
+
+instance Show PackageArg where
+  show (Id pkgid) = displayGlobPkgId pkgid
+  show (IUId ipid) = display ipid
+  show (Substring pkgpat _) = pkgpat
+
+displayGlobPkgId :: GlobPackageIdentifier -> String
+displayGlobPkgId (ExactPackageIdentifier pid) = display pid
+displayGlobPkgId (GlobPackageIdentifier pn) = display pn ++ "-*"
+
+-- | Either an exact t'PackageIdentifier', or a glob for all packages
+-- matching 'PackageName'.
+data GlobPackageIdentifier
+  = ExactPackageIdentifier MungedPackageId
+  | GlobPackageIdentifier  MungedPackageName
diff --git a/src/Stack/Types/GhcPkgId.hs b/src/Stack/Types/GhcPkgId.hs
index a8fb2e9f6b..5334533064 100644
--- a/src/Stack/Types/GhcPkgId.hs
+++ b/src/Stack/Types/GhcPkgId.hs
@@ -1,44 +1,69 @@
-{-# LANGUAGE NoImplicitPrelude          #-}
-{-# LANGUAGE DeriveDataTypeable         #-}
-{-# LANGUAGE DeriveGeneric              #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 
--- | A ghc-pkg id.
+{-|
+Module      : Stack.Types.GhcPkgId
+Description : A ghc-pkg id.
+License     : BSD-3-Clause
+
+A ghc-pkg id.
+-}
 
 module Stack.Types.GhcPkgId
-  (GhcPkgId
-  ,unGhcPkgId
-  ,ghcPkgIdParser
-  ,parseGhcPkgId
-  ,ghcPkgIdString)
-  where
+  ( GhcPkgId
+  , ghcPkgIdToText
+  , ghcPkgIdParser
+  , parseGhcPkgId
+  , ghcPkgIdString
+  ) where
 
-import           Stack.Prelude
-import           Pantry.Internal.AesonExtended
+import           Data.Aeson.Types ( FromJSON (..), ToJSON (..), withText )
 import           Data.Attoparsec.Text
-import qualified Data.Text as T
-import           Database.Persist.Sql (PersistField, PersistFieldSql)
-import           Prelude (Read (..))
+                   ( Parser, (<?>), choice, endOfInput, many1, parseOnly
+                   , satisfy
+                   )
+import           Data.Char ( isAlphaNum )
+import           Data.Hashable ( Hashable(..) )
+import           Database.Persist.Sql
+                   ( PersistField (..), PersistFieldSql (..) )
+import           Distribution.Compat.Binary ( decode, encode )
+import           Distribution.Types.UnitId ( UnitId, mkUnitId, unUnitId )
+import           Stack.Prelude
+import           Text.Read ( Read (..) )
 
 -- | A parse fail.
 newtype GhcPkgIdParseFail
   = GhcPkgIdParseFail Text
-  deriving Typeable
-instance Show GhcPkgIdParseFail where
-    show (GhcPkgIdParseFail bs) = "Invalid package ID: " ++ show bs
-instance Exception GhcPkgIdParseFail
+  deriving Show
+
+instance Exception GhcPkgIdParseFail where
+  displayException (GhcPkgIdParseFail bs) = concat
+    [ "Error: [S-5359]\n"
+    , "Invalid package ID: "
+    , show bs
+    ]
 
 -- | A ghc-pkg package identifier.
-newtype GhcPkgId = GhcPkgId Text
-  deriving (Eq,Ord,Data,Typeable,Generic,PersistField,PersistFieldSql)
+newtype GhcPkgId
+  = GhcPkgId UnitId
+  deriving (Data, Eq, Generic, Ord)
+
+instance PersistField GhcPkgId where
+  toPersistValue = toPersistValue . ghcPkgIdToText
+  fromPersistValue = (fmap . fmap) ghcPkgIdFromText fromPersistValue
+
+instance PersistFieldSql GhcPkgId where
+  sqlType _ = sqlType @Text Proxy
+
+instance Hashable GhcPkgId where
+  hashWithSalt a (GhcPkgId v) = hashWithSalt a (encode v)
 
-instance Hashable GhcPkgId
 instance NFData GhcPkgId
 
 instance Show GhcPkgId where
   show = show . ghcPkgIdString
+
 instance Read GhcPkgId where
-  readsPrec i = map (first (GhcPkgId . T.pack)) . readsPrec i
+  readsPrec i = map (first (GhcPkgId . mkUnitId)) . readsPrec i
 
 instance FromJSON GhcPkgId where
   parseJSON = withText "GhcPkgId" $ \t ->
@@ -53,20 +78,31 @@ instance ToJSON GhcPkgId where
 -- | Convenient way to parse a package name from a 'Text'.
 parseGhcPkgId :: MonadThrow m => Text -> m GhcPkgId
 parseGhcPkgId x = go x
-  where go =
-          either (const (throwM (GhcPkgIdParseFail x))) pure .
-          parseOnly (ghcPkgIdParser <* endOfInput)
+ where
+  go = either
+         (const (throwM (GhcPkgIdParseFail x)))
+         pure . parseOnly (ghcPkgIdParser <* endOfInput)
 
 -- | A parser for a package-version-hash pair.
 ghcPkgIdParser :: Parser GhcPkgId
 ghcPkgIdParser =
-    let elements =  "_.-" :: String in
-    GhcPkgId . T.pack <$> many1 (choice [digit, letter, satisfy (`elem` elements)])
+  -- '+' is needed for Backpack instantiated unit IDs (e.g. "pkg-id-str-sig+hash")
+  let elements = "_.-+" :: String
+  in  GhcPkgId . mkUnitId <$>
+        many1 (choice [alphaNum, satisfy (`elem` elements)])
+
+-- | Parse an alphanumerical character, as recognised by `isAlphaNum`.
+alphaNum :: Parser Char
+alphaNum = satisfy isAlphaNum <?> "alphanumeric"
+{-# INLINE alphaNum #-}
 
 -- | Get a string representation of GHC package id.
 ghcPkgIdString :: GhcPkgId -> String
-ghcPkgIdString (GhcPkgId x) = T.unpack x
+ghcPkgIdString (GhcPkgId x) = unUnitId x
 
--- | Get a text value of GHC package id
-unGhcPkgId :: GhcPkgId -> Text
-unGhcPkgId (GhcPkgId v) = v
+-- | Get a text value of GHC package id.
+ghcPkgIdToText :: GhcPkgId -> Text
+ghcPkgIdToText (GhcPkgId v) = decode . encode $ v
+-- | Create GhcPkgId from Text.
+ghcPkgIdFromText :: Text -> GhcPkgId
+ghcPkgIdFromText = GhcPkgId . decode . encode
diff --git a/src/Stack/Types/GhciOpts.hs b/src/Stack/Types/GhciOpts.hs
new file mode 100644
index 0000000000..02b6bc4935
--- /dev/null
+++ b/src/Stack/Types/GhciOpts.hs
@@ -0,0 +1,37 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.GhciOpts
+Description : Types related to Stack's @ghci@ and @repl@ commands.
+License     : BSD-3-Clause
+
+Types related to Stack's @ghci@ and @repl@ commands.
+-}
+
+module Stack.Types.GhciOpts
+  ( GhciOpts (..)
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.BuildOptsCLI ( ApplyCLIFlag (..) )
+
+-- | Type respresenting command line options for Stack's @ghci@ and @repl@
+-- commands.
+data GhciOpts = GhciOpts
+  { targets            :: ![Text]
+    -- ^ Raw (unprocessed) targets from the command line.
+  , args               :: ![String]
+  , ghcOptions         :: ![String]
+  , flags              :: !(Map ApplyCLIFlag (Map FlagName Bool))
+  , ghcCommand         :: !(Maybe FilePath)
+  , noLoadModules      :: !Bool
+  , additionalPackages :: ![String]
+  , mainIs             :: !(Maybe Text)
+  , loadLocalDeps      :: !Bool
+  , hidePackages       :: !(Maybe Bool)
+  , noBuild            :: !Bool
+  , onlyMain           :: !Bool
+    -- ^ Only load and import the main module?
+  }
+  deriving Show
diff --git a/src/Stack/Types/GlobalOpts.hs b/src/Stack/Types/GlobalOpts.hs
new file mode 100644
index 0000000000..a1fa1d605e
--- /dev/null
+++ b/src/Stack/Types/GlobalOpts.hs
@@ -0,0 +1,59 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Types.GlobalOpts
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.GlobalOpts
+  ( GlobalOpts (..)
+  , globalOptsBuildOptsMonoidL
+  ) where
+
+import          Stack.Prelude
+import          Stack.Types.BuildOptsMonoid ( BuildOptsMonoid )
+import          Stack.Types.ConfigMonoid ( ConfigMonoid (..) )
+import          Stack.Types.DockerEntrypoint ( DockerEntrypoint )
+import          Stack.Types.LockFileBehavior ( LockFileBehavior )
+import          Stack.Types.StackYamlLoc ( StackYamlLoc )
+import          Stack.Types.Snapshot ( AbstractSnapshot )
+
+-- | Parsed global command-line options.
+data GlobalOpts = GlobalOpts
+  { reExecVersion    :: !(Maybe String)
+    -- ^ Expected re-exec in container version
+  , dockerEntrypoint :: !(Maybe DockerEntrypoint)
+    -- ^ Data used when Stack is acting as a Docker entrypoint (internal use
+    -- only)
+  , logLevel         :: !LogLevel -- ^ Log level
+  , timeInLog        :: !Bool -- ^ Whether to include timings in logs.
+  , rslInLog         :: !Bool
+    -- ^ Whether to include raw snapshot layer (RSL) in logs.
+  , planInLog        :: !Bool
+    -- ^ Whether to include debug information about the construction of the
+    -- build plan in logs.
+  , configMonoid     :: !ConfigMonoid
+    -- ^ Config monoid, for passing into 'Stack.Config.loadConfig'
+  , snapshot         :: !(Maybe AbstractSnapshot) -- ^ Snapshot override
+  , compiler         :: !(Maybe WantedCompiler) -- ^ Compiler override
+  , terminal         :: !Bool -- ^ We're in a terminal?
+  , stylesUpdate     :: !StylesUpdate -- ^ SGR (Ansi) codes for styles
+  , termWidthOpt     :: !(Maybe Int) -- ^ Terminal width override
+  , stackYaml        :: !StackYamlLoc -- ^ Override project stack.yaml
+  , lockFileBehavior :: !LockFileBehavior
+  , progName         :: !String
+    -- ^ The name of the current Stack executable, as it was invoked.
+  , mExecutablePath  :: !(Maybe (Path Abs File))
+    -- ^ The path to the current Stack executable, if the operating system
+    -- provides a reliable way to determine it and where a result was
+    -- available.
+  }
+
+-- | View or set the @buildOpts@ field of the @configMonoid@ field of a
+-- v'GlobalOpts'.
+globalOptsBuildOptsMonoidL :: Lens' GlobalOpts BuildOptsMonoid
+globalOptsBuildOptsMonoidL =
+    lens (.configMonoid) (\x y -> x { configMonoid = y })
+  . lens (.buildOpts) (\x y -> x { buildOpts = y })
diff --git a/src/Stack/Types/GlobalOptsMonoid.hs b/src/Stack/Types/GlobalOptsMonoid.hs
new file mode 100644
index 0000000000..105ae8188e
--- /dev/null
+++ b/src/Stack/Types/GlobalOptsMonoid.hs
@@ -0,0 +1,62 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.GlobalOptsMonoid
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.GlobalOptsMonoid
+  ( GlobalOptsMonoid (..)
+  ) where
+
+import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
+import           Stack.Prelude
+import           Stack.Types.ConfigMonoid ( ConfigMonoid )
+import           Stack.Types.DockerEntrypoint ( DockerEntrypoint )
+import           Stack.Types.LockFileBehavior ( LockFileBehavior )
+import           Stack.Types.Snapshot ( AbstractSnapshot )
+
+-- | Parsed global command-line options monoid.
+data GlobalOptsMonoid = GlobalOptsMonoid
+  { reExecVersion    :: !(First String)
+    -- ^ Expected re-exec in container version
+  , dockerEntrypoint :: !(First DockerEntrypoint)
+    -- ^ Data used when Stack is acting as a Docker entrypoint (internal use
+    -- only)
+  , logLevel         :: !(First LogLevel)
+    -- ^ Log level
+  , timeInLog        :: !FirstTrue
+    -- ^ Whether to include timings in logs.
+  , rslInLog         :: !FirstFalse
+    -- ^ Whether to include raw snapshot layer (RSL) in logs.
+  , planInLog        :: !FirstFalse
+    -- ^ Whether to include debug information about the construction of the
+    -- build plan in logs.
+  , configMonoid     :: !ConfigMonoid
+    -- ^ Config monoid, for passing into 'Stack.Config.loadConfig'
+  , snapshot         :: !(First (Unresolved AbstractSnapshot))
+    -- ^ Snapshot override
+  , snapshotRoot     :: !(First FilePath)
+    -- ^ root directory for snapshot relative path
+  , compiler         :: !(First WantedCompiler)
+    -- ^ Compiler override
+  , terminal         :: !(First Bool)
+    -- ^ We're in a terminal?
+  , styles           :: !StylesUpdate
+    -- ^ Stack's output styles
+  , termWidthOpt     :: !(First Int)
+    -- ^ Terminal width override
+  , stackYaml        :: !(First FilePath)
+    -- ^ Override project stack.yaml
+  , lockFileBehavior :: !(First LockFileBehavior)
+    -- ^ See 'Stack.Types.GlobalOpts.lockFileBehavior'
+  }
+  deriving Generic
+
+instance Semigroup GlobalOptsMonoid where
+  (<>) = mappenddefault
+
+instance Monoid GlobalOptsMonoid where
+  mempty = memptydefault
+  mappend = (<>)
diff --git a/src/Stack/Types/HpcReportOpts.hs b/src/Stack/Types/HpcReportOpts.hs
new file mode 100644
index 0000000000..b7b4ed0221
--- /dev/null
+++ b/src/Stack/Types/HpcReportOpts.hs
@@ -0,0 +1,25 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.HpcReportOpts
+Description : Types related to Stack's @hpc report@ command.
+License     : BSD-3-Clause
+
+Types related to Stack's @hpc report@ command.
+-}
+
+module Stack.Types.HpcReportOpts
+  ( HpcReportOpts (..)
+  ) where
+
+import           Stack.Prelude
+
+-- | Type representing command line options for the @stack hpc report@ command.
+data HpcReportOpts = HpcReportOpts
+  { inputs :: [Text]
+  , all :: Bool
+  , destDir :: Maybe String
+  , openBrowser :: Bool
+  }
+  deriving Show
diff --git a/src/Stack/Types/IdeOpts.hs b/src/Stack/Types/IdeOpts.hs
new file mode 100644
index 0000000000..682ae64784
--- /dev/null
+++ b/src/Stack/Types/IdeOpts.hs
@@ -0,0 +1,30 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.IdeOpts
+Description : Types for command line options for Stack's @ide@ commands.
+License     : BSD-3-Clause
+
+Types for command line options for Stack's @ide@ commands.
+-}
+
+module Stack.Types.IdeOpts
+  ( OutputStream (..)
+  , ListPackagesCmd (..)
+  ) where
+
+-- | Type representing output stream choices for the @stack ide packages@ and
+-- @stack ide targets@ commands.
+data OutputStream
+  = OutputLogInfo
+    -- ^ To the same output stream as other log information.
+  | OutputStdout
+    -- ^ To the standard output stream.
+
+-- | Type representing output choices for the @stack ide packages@ command.
+data ListPackagesCmd
+  = ListPackageNames
+    -- ^ Package names.
+  | ListPackageCabalFiles
+    -- ^ Paths to Cabal files.
diff --git a/src/Stack/Types/Installed.hs b/src/Stack/Types/Installed.hs
new file mode 100644
index 0000000000..6b7a159207
--- /dev/null
+++ b/src/Stack/Types/Installed.hs
@@ -0,0 +1,164 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Types.Installed
+License     : BSD-3-Clause
+
+This module contains all the types related to the idea of installing a package
+in the pkg-db or an executable on the file system.
+-}
+
+module Stack.Types.Installed
+  ( InstallLocation (..)
+  , InstalledPackageLocation (..)
+  , PackageDatabase (..)
+  , PackageDbVariety (..)
+  , InstallMap
+  , Installed (..)
+  , InstalledMap
+  , InstalledLibraryInfo (..)
+  , toPackageDbVariety
+  , installedLibraryInfoFromGhcPkgId
+  , simpleInstalledLib
+  , installedToPackageIdOpt
+  , installedPackageIdentifier
+  , installedVersion
+  , foldOnGhcPkgId'
+  ) where
+
+import qualified Data.Map as M
+import           Stack.Prelude
+import           Stack.Types.ComponentUtils ( StackUnqualCompName )
+import           Stack.Types.GhcPkgId ( GhcPkgId, ghcPkgIdString )
+
+-- | Type representing user package databases that packages can be installed
+-- into.
+data InstallLocation
+  = Snap
+    -- ^ The write-only package database, formerly known as the snapshot
+    -- database.
+  | Local
+    -- ^ The mutable package database, formerly known as the local database.
+  deriving (Eq, Show)
+
+instance Semigroup InstallLocation where
+  Local <> _ = Local
+  _ <> Local = Local
+  Snap <> Snap = Snap
+
+instance Monoid InstallLocation where
+  mempty = Snap
+  mappend = (<>)
+
+-- | Type representing user (non-global) package databases that can provide
+-- installed packages.
+data InstalledPackageLocation
+  = InstalledTo InstallLocation
+    -- ^ A package database that a package can be installed into.
+  | ExtraPkgDb
+    -- ^ An \'extra\' package database, specified by @extra-package-dbs@.
+  deriving (Eq, Show)
+
+-- | Type representing package databases that can provide installed packages.
+data PackageDatabase
+  = GlobalPkgDb
+    -- ^ GHC's global package database.
+  | UserPkgDb InstalledPackageLocation (Path Abs Dir)
+    -- ^ A user package database.
+  deriving (Eq, Show)
+
+-- | A function to yield the variety of package database for a given
+-- package database that can provide installed packages.
+toPackageDbVariety :: PackageDatabase -> PackageDbVariety
+toPackageDbVariety GlobalPkgDb = GlobalDb
+toPackageDbVariety (UserPkgDb ExtraPkgDb _) = ExtraDb
+toPackageDbVariety (UserPkgDb (InstalledTo Snap) _) = WriteOnlyDb
+toPackageDbVariety (UserPkgDb (InstalledTo Local) _) = MutableDb
+
+-- | Type representing varieties of package databases that can provide
+-- installed packages.
+data PackageDbVariety
+  = GlobalDb
+    -- ^ GHC's global package database.
+  | ExtraDb
+    -- ^ An \'extra\' package database, specified by @extra-package-dbs@.
+  | WriteOnlyDb
+    -- ^ The write-only package database, for immutable packages.
+  | MutableDb
+    -- ^ The mutable package database.
+  deriving (Eq, Show)
+
+-- | Type synonym representing dictionaries of package names for a project's
+-- packages and dependencies, and pairs of their relevant database (write-only
+-- or mutable) and package versions.
+type InstallMap = Map PackageName (InstallLocation, Version)
+
+-- | Type synonym representing dictionaries of package names, and a pair of in
+-- which package database the package is installed (write-only or mutable) and
+-- information about what is installed.
+type InstalledMap = Map PackageName (InstallLocation, Installed)
+
+-- TODO: This may not be the best type, as it allows invalid values to be
+-- represented.
+data InstalledLibraryInfo = InstalledLibraryInfo
+  { mMainGhcPkgId :: Maybe GhcPkgId
+    -- ^ The main library, if present. If absent, there must be one or more
+    -- installed sublibraries.
+  , subLib :: Map StackUnqualCompName GhcPkgId
+    -- ^ If there are no sublibraries, there must be a main library.
+  }
+  deriving (Eq, Show)
+
+-- | Type representing information about what is installed.
+data Installed
+  = Library PackageIdentifier InstalledLibraryInfo
+    -- ^ A library, including the ids of its installed packages.
+  | Executable PackageIdentifier
+    -- ^ An executable.
+  deriving (Eq, Show)
+
+installedLibraryInfoFromGhcPkgId :: GhcPkgId -> InstalledLibraryInfo
+installedLibraryInfoFromGhcPkgId ghcPkgId =
+  InstalledLibraryInfo (Just ghcPkgId) mempty
+
+simpleInstalledLib ::
+     PackageIdentifier
+  -> Maybe GhcPkgId
+     -- ^ The id of the installed main library, if any.
+  -> Map StackUnqualCompName GhcPkgId
+     -- ^ The id of any sublibraries.
+  -> Installed
+simpleInstalledLib pkgIdentifier mMainGhcPkgId =
+  Library pkgIdentifier . InstalledLibraryInfo mMainGhcPkgId
+
+installedToPackageIdOpt :: InstalledLibraryInfo -> [String]
+installedToPackageIdOpt libInfo =
+  let acc0 = toStr <$> maybeToList libInfo.mMainGhcPkgId
+  in  M.foldr' (iterator (++)) acc0 libInfo.subLib
+ where
+  toStr ghcPkgId = "-package-id=" <> ghcPkgIdString ghcPkgId
+  iterator op ghcPkgId acc = pure (toStr ghcPkgId) `op` acc
+
+installedPackageIdentifier :: Installed -> PackageIdentifier
+installedPackageIdentifier (Library pid _) = pid
+installedPackageIdentifier (Executable pid) = pid
+
+-- | A strict fold over the 'GhcPkgId' of the given installed package. This will
+-- iterate on the main library (if any) and sublibraries (if any).
+foldOnGhcPkgId' ::
+     (Maybe StackUnqualCompName -> GhcPkgId -> a -> a)
+  -> Installed
+  -> a
+  -> a
+foldOnGhcPkgId' _ Executable{} res = res
+foldOnGhcPkgId' fn (Library _ libInfo) res =
+  M.foldrWithKey' (fn . Just) base libInfo.subLib
+ where
+  base = maybe res (\ghcPkgId -> fn Nothing ghcPkgId res) libInfo.mMainGhcPkgId
+
+-- | Get the installed Version.
+installedVersion :: Installed -> Version
+installedVersion i =
+  let PackageIdentifier _ version = installedPackageIdentifier i
+  in  version
diff --git a/src/Stack/Types/InterfaceOpt.hs b/src/Stack/Types/InterfaceOpt.hs
new file mode 100644
index 0000000000..25629d7208
--- /dev/null
+++ b/src/Stack/Types/InterfaceOpt.hs
@@ -0,0 +1,26 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.InterfaceOpt
+Description : Type representing Haddock interface options.
+License     : BSD-3-Clause
+
+Type representing Haddock interface options.
+-}
+
+module Stack.Types.InterfaceOpt
+  ( InterfaceOpt (..)
+  ) where
+
+import           Data.Time ( UTCTime )
+import           Stack.Prelude
+
+-- | Type representing Haddock interface options.
+data InterfaceOpt = InterfaceOpt
+  { readInterfaceArgs :: ![String]
+  , srcInterfaceFileModTime :: !UTCTime
+  , srcInterfaceFile :: !(Path Abs File)
+  , destInterfaceFile :: !(Path Abs File)
+  }
+  deriving (Eq, Ord)
diff --git a/src/Stack/Types/IsMutable.hs b/src/Stack/Types/IsMutable.hs
new file mode 100644
index 0000000000..e5dad523ba
--- /dev/null
+++ b/src/Stack/Types/IsMutable.hs
@@ -0,0 +1,26 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.IsMutable
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.IsMutable
+  ( IsMutable (..)
+  ) where
+
+import           Stack.Prelude
+
+data IsMutable
+  = Mutable
+  | Immutable
+  deriving (Eq, Show)
+
+instance Semigroup IsMutable where
+  Mutable <> _ = Mutable
+  _ <> Mutable = Mutable
+  Immutable <> Immutable = Immutable
+
+instance Monoid IsMutable where
+  mempty = Immutable
+  mappend = (<>)
diff --git a/src/Stack/Types/LockFileBehavior.hs b/src/Stack/Types/LockFileBehavior.hs
new file mode 100644
index 0000000000..8f96d1ef1b
--- /dev/null
+++ b/src/Stack/Types/LockFileBehavior.hs
@@ -0,0 +1,46 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.LockFileBehavior
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.LockFileBehavior
+  ( LockFileBehavior (..)
+  , readLockFileBehavior
+  ) where
+
+import qualified Data.Map as Map
+import           Options.Applicative ( ReadM )
+import qualified Options.Applicative.Types as OA
+import qualified RIO.List as List
+import           Stack.Prelude
+
+-- | How to interact with lock files
+data LockFileBehavior
+  = LFBReadWrite
+    -- ^ Read and write lock files
+  | LFBReadOnly
+    -- ^ Read lock files, but do not write them
+  | LFBIgnore
+    -- ^ Entirely ignore lock files
+  | LFBErrorOnWrite
+    -- ^ Error out on trying to write a lock file. This can be used to
+    -- ensure that lock files in a repository already ensure
+    -- reproducible builds.
+  deriving (Bounded, Enum, Show)
+
+-- | Parser for 'LockFileBehavior'
+readLockFileBehavior :: ReadM LockFileBehavior
+readLockFileBehavior = do
+  s <- OA.readerAsk
+  case Map.lookup s m of
+    Just x -> pure x
+    Nothing -> OA.readerError $ "Invalid lock file behavior, valid options: " ++
+                                List.intercalate ", " (Map.keys m)
+ where
+  m = Map.fromList $ map (\x -> (render x, x)) [minBound..maxBound]
+  render LFBReadWrite = "read-write"
+  render LFBReadOnly = "read-only"
+  render LFBIgnore = "ignore"
+  render LFBErrorOnWrite = "error-on-write"
diff --git a/src/Stack/Types/LsOpts.hs b/src/Stack/Types/LsOpts.hs
new file mode 100644
index 0000000000..f476c06960
--- /dev/null
+++ b/src/Stack/Types/LsOpts.hs
@@ -0,0 +1,106 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.LsOpts
+Description : Types related to Stack's @ls@ command.
+License     : BSD-3-Clause
+
+Types related to Stack's @ls@ command.
+-}
+
+module Stack.Types.LsOpts
+  ( LsCmdOpts (..)
+  , LsCmds (..)
+  , SnapshotOpts (..)
+  , LsView (..)
+  , ListDepsOpts (..)
+  , ListDepsFormat (..)
+  , ListDepsFormatOpts (..)
+  , ListDepsTextItem (..)
+  , ListGlobalsOpts (..)
+  , ListStylesOpts (..)
+  , ListToolsOpts (..)
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.DotOpts ( DotOpts (..) )
+
+-- | Type representing command line options for the @stack ls@ command.
+newtype LsCmdOpts
+  = LsCmdOpts { lsCmds :: LsCmds }
+
+-- | Type representing subcommands for the @stack ls@ command.
+data LsCmds
+  = LsSnapshot SnapshotOpts
+  | LsGlobals ListGlobalsOpts
+  | LsDependencies ListDepsOpts
+  | LsStyles ListStylesOpts
+  | LsTools ListToolsOpts
+
+-- | Type representing command line options for the @stack ls snapshots@
+-- command.
+data SnapshotOpts = SnapshotOpts
+  { viewType :: LsView
+  , ltsSnapView :: Bool
+  , nightlySnapView :: Bool
+  }
+  deriving (Eq, Ord, Show)
+
+-- | Type representing subcommands for the @stack ls snapshots@ command.
+data LsView
+  = Local
+  | Remote
+  deriving (Eq, Ord, Show)
+
+-- | Type representing command line options for the @stack ls globals@ command.
+newtype ListGlobalsOpts = ListGlobalsOpts
+  { globalHints :: Bool
+    -- ^ Use global hints instead of relying on an actual GHC installation.
+  }
+
+-- | Type representing command line options for the @stack ls dependencies@
+-- command.
+data ListDepsOpts = ListDepsOpts
+  { format :: !ListDepsFormat
+    -- ^ Format of printing dependencies
+  , dotOpts :: !DotOpts
+    -- ^ The normal dot options.
+  }
+
+-- | Type representing formats for printing dependencies.
+data ListDepsFormat
+  = ListDepsText ListDepsFormatOpts [ListDepsTextItem] [ListDepsTextItem]
+  | ListDepsTree ListDepsFormatOpts
+  | ListDepsJSON
+  | ListDepsConstraints
+
+-- | Type representing command line options for the @stack ls dependencies text@
+-- command and similar @cabal@, @tree@ and @json@ commands.
+data ListDepsFormatOpts = ListDepsFormatOpts
+  { sep :: !Text
+    -- ^ Separator between the package name and details.
+  , license :: !Bool
+    -- ^ Print dependency licenses instead of versions.
+  }
+
+-- | Type representing items to query or filter from the results of
+-- @stack ls dependencies text@.
+data ListDepsTextItem
+  = PackageNameOnly PackageName
+    -- ^ Item is a package name.
+  | AllProjectPackages
+    -- ^ Item represents all project packages.
+
+-- | Type representing command line options for the @stack ls stack-colors@ and
+-- @stack ls stack-colours@ commands.
+data ListStylesOpts = ListStylesOpts
+  { basic   :: Bool
+  , sgr     :: Bool
+  , example :: Bool
+  }
+  deriving (Eq, Ord, Show)
+
+-- | Type representing command line options for the @stack ls tools@ command.
+newtype ListToolsOpts
+  = ListToolsOpts { filter  :: String }
diff --git a/src/Stack/Types/MsysEnvironment.hs b/src/Stack/Types/MsysEnvironment.hs
new file mode 100644
index 0000000000..efee5d6e60
--- /dev/null
+++ b/src/Stack/Types/MsysEnvironment.hs
@@ -0,0 +1,69 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.MsysEnvironment
+Description : Type representing MSYS2 environments and related functions.
+License     : BSD-3-Clause
+
+Type representing MSYS2 environments and related functions.
+-}
+
+module Stack.Types.MsysEnvironment
+  ( MsysEnvironment (..)
+  , msysEnvArch
+  , relDirMsysEnv
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..) )
+import           Distribution.System ( Arch (..) )
+import           Stack.Constants
+                   ( relDirClang32, relDirClang64, relDirClangArm64
+                   , relDirMingw32, relDirMingw64, relDirUcrt64
+                   )
+import           Stack.Prelude
+
+-- | Type representing MSYS2 environments.
+data MsysEnvironment
+  = CLANG32
+  | CLANG64
+    -- ^ Stack's default on architecture x86_64.
+  | CLANGARM64
+  | MINGW32
+  | MINGW64
+  | UCRT64
+  deriving (Eq, Ord, Show)
+
+-- | MSYS2 environment names are treated as case sensitive.
+instance FromJSON MsysEnvironment where
+  parseJSON v = do
+    s <- parseJSON v
+    case s of
+      "CLANG32" -> pure CLANG32
+      "CLANG64" -> pure CLANG64
+      "CLANGARM64" -> pure CLANGARM64
+      "MINGW32" -> pure MINGW32
+      "MINGW64" -> pure MINGW64
+      "UCRT64" -> pure UCRT64
+      _ -> fail ("Unknown MSYS2 environment: " <> s)
+
+-- | Function that yields the architecture relevant to an MSYS2 environment,
+-- based on https://www.msys2.org/docs/environments/.
+msysEnvArch :: MsysEnvironment -> Arch
+msysEnvArch env = case env of
+  CLANG32 -> I386
+  CLANG64 -> X86_64
+  CLANGARM64 -> AArch64
+  MINGW32 -> I386
+  MINGW64 -> X86_64
+  UCRT64 -> X86_64
+
+-- | Function that yields the prefix relevant to an MSYS2 environment, based on
+-- https://www.msys2.org/docs/environments/.
+relDirMsysEnv :: MsysEnvironment -> Path Rel Dir
+relDirMsysEnv env = case env of
+  CLANG32 -> relDirClang32
+  CLANG64 -> relDirClang64
+  CLANGARM64 -> relDirClangArm64
+  MINGW32 -> relDirMingw32
+  MINGW64 -> relDirMingw64
+  UCRT64 -> relDirUcrt64
diff --git a/src/Stack/Types/NamedComponent.hs b/src/Stack/Types/NamedComponent.hs
index 438a13190b..3235f4235e 100644
--- a/src/Stack/Types/NamedComponent.hs
+++ b/src/Stack/Types/NamedComponent.hs
@@ -1,80 +1,121 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
+{-|
+Module      : Stack.Types.NamedComponent
+Description : Module exporting the 'NamedComponent' type and related functions.
+License     : BSD-3-Clause
+
+Module exporting the 'NamedComponent' type and related functions.
+-}
+
 module Stack.Types.NamedComponent
   ( NamedComponent (..)
+  , componentCachePath
   , renderComponent
+  , renderComponentTo
   , renderPkgComponents
   , renderPkgComponent
   , exeComponents
   , testComponents
   , benchComponents
-  , internalLibComponents
+  , subLibComponents
   , isCLib
-  , isCInternalLib
+  , isCSubLib
   , isCExe
   , isCTest
   , isCBench
+  , isCInst
+  , isPotentialDependency
+  , splitComponents
   ) where
 
-import Pantry
-import Stack.Prelude
 import qualified Data.Set as Set
 import qualified Data.Text as T
+import           Stack.Prelude
+import           Stack.Types.ComponentUtils
+                   ( StackUnqualCompName, unqualCompToString, unqualCompToText
+                   )
 
--- | A single, fully resolved component of a package
+-- | Type representing components of a fully-resolved Cabal package.
 data NamedComponent
-    = CLib
-    | CInternalLib !Text
-    | CExe !Text
-    | CTest !Text
-    | CBench !Text
-    deriving (Show, Eq, Ord)
+  = CLib
+    -- The \'main\' unnamed library component.
+  | CSubLib !StackUnqualCompName
+    -- A named \'subsidiary\' or \'ancillary\` library component (sub-library).
+  | CFlib !StackUnqualCompName
+    -- A foreign library.
+  | CExe !StackUnqualCompName
+    -- A named executable component.
+  | CTest !StackUnqualCompName
+    -- A named test-suite component.
+  | CBench !StackUnqualCompName
+    -- A named benchmark component.
+  | CInst !Text
+    -- A Backpack instantiation (hash suffix identifying the instantiation).
+  deriving (Eq, Ord, Show)
+
+-- | Render a component to anything with an "IsString" instance. For 'Text'
+-- prefer 'renderComponent'.
+renderComponentTo :: IsString a => NamedComponent -> a
+renderComponentTo = fromString . T.unpack . renderComponent
 
 renderComponent :: NamedComponent -> Text
 renderComponent CLib = "lib"
-renderComponent (CInternalLib x) = "internal-lib:" <> x
-renderComponent (CExe x) = "exe:" <> x
-renderComponent (CTest x) = "test:" <> x
-renderComponent (CBench x) = "bench:" <> x
+renderComponent (CSubLib x) = "sub-lib:" <> unqualCompToText x
+renderComponent (CFlib x) = "flib:" <> unqualCompToText x
+renderComponent (CExe x) = "exe:" <> unqualCompToText x
+renderComponent (CTest x) = "test:" <> unqualCompToText x
+renderComponent (CBench x) = "bench:" <> unqualCompToText x
+renderComponent (CInst x) = "inst:" <> x
+
+componentCachePath :: NamedComponent -> String
+componentCachePath CLib = "lib"
+componentCachePath (CSubLib x) = "sub-lib-" <> unqualCompToString x
+componentCachePath (CFlib x) = "flib-" <> unqualCompToString x
+componentCachePath (CExe x) = "exe-" <> unqualCompToString x
+componentCachePath (CTest x) = "test-" <> unqualCompToString x
+componentCachePath (CBench x) = "bench-" <> unqualCompToString x
+componentCachePath (CInst x) = "inst-" <> T.unpack x
 
 renderPkgComponents :: [(PackageName, NamedComponent)] -> Text
 renderPkgComponents = T.intercalate " " . map renderPkgComponent
 
 renderPkgComponent :: (PackageName, NamedComponent) -> Text
-renderPkgComponent (pkg, comp) = fromString (packageNameString pkg) <> ":" <> renderComponent comp
+renderPkgComponent (pkg, comp) =
+  fromPackageName pkg <> ":" <> renderComponent comp
 
-exeComponents :: Set NamedComponent -> Set Text
+exeComponents :: Set NamedComponent -> Set StackUnqualCompName
 exeComponents = Set.fromList . mapMaybe mExeName . Set.toList
-  where
-    mExeName (CExe name) = Just name
-    mExeName _ = Nothing
+ where
+  mExeName (CExe name) = Just name
+  mExeName _ = Nothing
 
-testComponents :: Set NamedComponent -> Set Text
+testComponents :: Set NamedComponent -> Set StackUnqualCompName
 testComponents = Set.fromList . mapMaybe mTestName . Set.toList
-  where
-    mTestName (CTest name) = Just name
-    mTestName _ = Nothing
+ where
+  mTestName (CTest name) = Just name
+  mTestName _ = Nothing
 
-benchComponents :: Set NamedComponent -> Set Text
+benchComponents :: Set NamedComponent -> Set StackUnqualCompName
 benchComponents = Set.fromList . mapMaybe mBenchName . Set.toList
-  where
-    mBenchName (CBench name) = Just name
-    mBenchName _ = Nothing
+ where
+  mBenchName (CBench name) = Just name
+  mBenchName _ = Nothing
 
-internalLibComponents :: Set NamedComponent -> Set Text
-internalLibComponents = Set.fromList . mapMaybe mInternalName . Set.toList
-  where
-    mInternalName (CInternalLib name) = Just name
-    mInternalName _ = Nothing
+subLibComponents :: Set NamedComponent -> Set StackUnqualCompName
+subLibComponents = Set.fromList . mapMaybe mSubLibName . Set.toList
+ where
+  mSubLibName (CSubLib name) = Just name
+  mSubLibName _ = Nothing
 
 isCLib :: NamedComponent -> Bool
 isCLib CLib{} = True
 isCLib _ = False
 
-isCInternalLib :: NamedComponent -> Bool
-isCInternalLib CInternalLib{} = True
-isCInternalLib _ = False
+isCSubLib :: NamedComponent -> Bool
+isCSubLib CSubLib{} = True
+isCSubLib _ = False
 
 isCExe :: NamedComponent -> Bool
 isCExe CExe{} = True
@@ -87,3 +128,41 @@ isCTest _ = False
 isCBench :: NamedComponent -> Bool
 isCBench CBench{} = True
 isCBench _ = False
+
+isCInst :: NamedComponent -> Bool
+isCInst CInst{} = True
+isCInst _ = False
+
+isPotentialDependency :: NamedComponent -> Bool
+isPotentialDependency v = isCLib v || isCSubLib v || isCExe v || isCInst v
+
+-- | A function to split the given list of components into sets of the names of
+-- the named components by the type of component (sub-libraries, executables,
+-- test-suites, benchmarks), ignoring any \'main\' unnamed library component or
+-- foreign library component. This function should be used very sparingly; more
+-- often than not, you can keep/parse the components split from the start.
+splitComponents ::
+     [NamedComponent]
+  -> ( Set StackUnqualCompName
+       -- ^ Sub-libraries.
+     , Set StackUnqualCompName
+       -- ^ Executables.
+     , Set StackUnqualCompName
+       -- ^ Test-suites.
+     , Set StackUnqualCompName
+       -- ^ Benchmarks.
+     )
+splitComponents =
+  go id id id id
+ where
+  run c = Set.fromList $ c []
+  go s e t b [] = (run s, run e, run t, run b)
+  go s e t b (CLib : xs) = go s e t b xs
+  go s e t b (CSubLib x : xs) = go (s . (x:)) e t b xs
+  -- Ignore foreign libraries, for now.
+  go s e t b (CFlib _ : xs) = go s e t b xs
+  go s e t b (CExe x : xs) = go s (e . (x:)) t b xs
+  go s e t b (CTest x : xs) = go s e (t . (x:)) b xs
+  go s e t b (CBench x : xs) = go s e t (b . (x:)) xs
+  -- Ignore CInst (Backpack instantiation), like CFlib.
+  go s e t b (CInst _ : xs) = go s e t b xs
diff --git a/src/Stack/Types/Nix.hs b/src/Stack/Types/Nix.hs
index 4ea2543cf7..8be0b687ea 100644
--- a/src/Stack/Types/Nix.hs
+++ b/src/Stack/Types/Nix.hs
@@ -1,64 +1,100 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedStrings     #-}
 
--- | Nix types.
+{-|
+Module      : Stack.Types.Nix
+Description : Nix types.
+License     : BSD-3-Clause
 
-module Stack.Types.Nix where
+Nix types.
+-}
 
-import Pantry.Internal.AesonExtended
-import Stack.Prelude
-import Generics.Deriving.Monoid (mappenddefault, memptydefault)
+module Stack.Types.Nix
+  ( NixOpts (..)
+  , NixOptsMonoid (..)
+  , nixAddGCRootsArgName
+  , nixEnableArgName
+  , nixInitFileArgName
+  , nixPackagesArgName
+  , nixPathArgName
+  , nixPureShellArgName
+  , nixInstantiateOptsArgName
+  , nixShellOptsArgName
+  ) where
 
--- | Nix configuration. Parameterize by resolver type to avoid cyclic
+import           Data.Aeson.Types ( FromJSON (..) )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings, (..:?), withObjectWarnings )
+import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
+import           Stack.Prelude
+
+-- | Nix configuration. Parameterize by snapshot type to avoid cyclic
 -- dependency.
 data NixOpts = NixOpts
-  {nixEnable   :: !Bool
-  ,nixPureShell :: !Bool
-  ,nixPackages :: ![Text]
+  { enable :: !Bool
+  , pureShell :: !Bool
+  , packages :: ![Text]
     -- ^ The system packages to be installed in the environment before it runs
-  ,nixInitFile :: !(Maybe FilePath)
-    -- ^ The path of a file containing preconfiguration of the environment (e.g shell.nix)
-  ,nixShellOptions :: ![Text]
+  , initFile :: !(Maybe FilePath)
+    -- ^ The path of a file containing preconfiguration of the environment
+    -- (e.g shell.nix)
+  , instantiateOptions :: ![Text]
+    -- ^ Options to be given to the nix-instantiate command line
+  , shellOptions :: ![Text]
     -- ^ Options to be given to the nix-shell command line
-  ,nixAddGCRoots :: !Bool
-    -- ^ Should we register gc roots so running nix-collect-garbage doesn't remove nix dependencies
+  , addGCRoots :: !Bool
+    -- ^ Should we register gc roots so running nix-collect-garbage doesn't
+    -- remove nix dependencies
   }
-  deriving (Show)
+  deriving Show
 
 -- | An uninterpreted representation of nix options.
 -- Configurations may be "cascaded" using mappend (left-biased).
 data NixOptsMonoid = NixOptsMonoid
-  {nixMonoidEnable :: !(First Bool)
+  { enable :: !(First Bool)
     -- ^ Is using nix-shell enabled?
-  ,nixMonoidPureShell :: !(First Bool)
+  , pureShell :: !(First Bool)
     -- ^ Should the nix-shell be pure
-  ,nixMonoidPackages :: !(First [Text])
+  , packages :: !(First [Text])
     -- ^ System packages to use (given to nix-shell)
-  ,nixMonoidInitFile :: !(First FilePath)
-    -- ^ The path of a file containing preconfiguration of the environment (e.g shell.nix)
-  ,nixMonoidShellOptions :: !(First [Text])
+  , initFile :: !(First FilePath)
+    -- ^ The path of a file containing preconfiguration of the environment (e.g
+    -- shell.nix)
+  , instantiateOptions :: !(First [Text])
+    -- ^ Options to be given to the nix-instantiate command line
+  , shellOptions :: !(First [Text])
     -- ^ Options to be given to the nix-shell command line
-  ,nixMonoidPath :: !(First [Text])
-    -- ^ Override parts of NIX_PATH (notably 'nixpkgs')
-  ,nixMonoidAddGCRoots :: !FirstFalse
-    -- ^ Should we register gc roots so running nix-collect-garbage doesn't remove nix dependencies
+  , path :: !(First [Text])
+    -- ^ Override parts of NIX_PATH (notably \'nixpkgs\')
+  , addGCRoots :: !FirstFalse
+    -- ^ Should we register gc roots so running nix-collect-garbage doesn't
+    -- remove nix dependencies
   }
-  deriving (Eq, Show, Generic)
+  deriving (Eq, Generic, Show)
 
 -- | Decode uninterpreted nix options from JSON/YAML.
 instance FromJSON (WithJSONWarnings NixOptsMonoid) where
-  parseJSON = withObjectWarnings "NixOptsMonoid"
-    (\o -> do nixMonoidEnable        <- First <$> o ..:? nixEnableArgName
-              nixMonoidPureShell     <- First <$> o ..:? nixPureShellArgName
-              nixMonoidPackages      <- First <$> o ..:? nixPackagesArgName
-              nixMonoidInitFile      <- First <$> o ..:? nixInitFileArgName
-              nixMonoidShellOptions  <- First <$> o ..:? nixShellOptsArgName
-              nixMonoidPath          <- First <$> o ..:? nixPathArgName
-              nixMonoidAddGCRoots    <- FirstFalse <$> o ..:? nixAddGCRootsArgName
-              pure NixOptsMonoid{..})
+  parseJSON = withObjectWarnings "NixOptsMonoid" $ \o -> do
+    enable        <- First <$> o ..:? nixEnableArgName
+    pureShell     <- First <$> o ..:? nixPureShellArgName
+    packages      <- First <$> o ..:? nixPackagesArgName
+    initFile      <- First <$> o ..:? nixInitFileArgName
+    instantiateOptions  <- First <$> o ..:? nixInstantiateOptsArgName
+    shellOptions  <- First <$> o ..:? nixShellOptsArgName
+    path          <- First <$> o ..:? nixPathArgName
+    addGCRoots    <- FirstFalse <$> o ..:? nixAddGCRootsArgName
+    pure NixOptsMonoid
+      { enable
+      , pureShell
+      , packages
+      , initFile
+      , instantiateOptions
+      , shellOptions
+      , path
+      , addGCRoots
+      }
 
 -- | Left-biased combine Nix options
 instance Semigroup NixOptsMonoid where
@@ -85,6 +121,10 @@ nixPackagesArgName = "packages"
 nixInitFileArgName :: Text
 nixInitFileArgName = "shell-file"
 
+-- | Extra options for the nix-instantiate command argument name.
+nixInstantiateOptsArgName :: Text
+nixInstantiateOptsArgName = "nix-instantiate-options"
+
 -- | Extra options for the nix-shell command argument name.
 nixShellOptsArgName :: Text
 nixShellOptsArgName = "nix-shell-options"
diff --git a/src/Stack/Types/Package.hs b/src/Stack/Types/Package.hs
index 9cd7b686b1..a316fb397d 100644
--- a/src/Stack/Types/Package.hs
+++ b/src/Stack/Types/Package.hs
@@ -1,36 +1,90 @@
-{-# LANGUAGE NoImplicitPrelude          #-}
-{-# LANGUAGE ConstraintKinds            #-}
-{-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE DeriveDataTypeable         #-}
-{-# LANGUAGE DeriveFunctor              #-}
-{-# LANGUAGE DeriveGeneric              #-}
-{-# LANGUAGE FlexibleContexts           #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE RankNTypes                 #-}
-
-module Stack.Types.Package where
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Types.Package
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.Package
+  ( BioInput (..)
+  , BuildInfoOpts (..)
+  , ExeName (..)
+  , InstallLocation (..)
+  , Installed (..)
+  , InstalledLibraryInfo (..)
+  , InstalledPackageLocation (..)
+  , LocalPackage (..)
+  , MemoizedWith (..)
+  , Package (..)
+  , PackageConfig (..)
+  , PackageDatabase (..)
+  , PackageDbVariety (..)
+  , PackageException (..)
+  , PackageSource (..)
+  , dotCabalCFilePath
+  , dotCabalGetPath
+  , dotCabalMain
+  , dotCabalMainPath
+  , dotCabalModule
+  , dotCabalModulePath
+  , installedMapGhcPkgId
+  , installedPackageToGhcPkgId
+  , installedPackageToGhcPkgId'
+  , lpFiles
+  , lpFilesForComponents
+  , memoizeRefWith
+  , packageDefinedFlags
+  , packageIdentifier
+  , psVersion
+  , runMemoizedWith
+  , toCabalMungedPackageId
+  , toCabalMungedPackageName
+  , toPackageDbVariety
+  ) where
 
-import           Stack.Prelude
-import qualified RIO.Text as T
-import           Data.Aeson (ToJSON (..), FromJSON (..), (.=), (.:), object, withObject)
 import qualified Data.Map as M
 import qualified Data.Set as Set
 import           Distribution.CabalSpecVersion
-import           Distribution.Parsec (PError (..), PWarning (..), showPos)
+import           Distribution.Parsec ( PError (..), PWarning (..), showPos )
 import qualified Distribution.SPDX.License as SPDX
-import           Distribution.License (License)
-import           Distribution.ModuleName (ModuleName)
-import           Distribution.PackageDescription (TestSuiteInterface, BuildType)
-import           Distribution.System (Platform (..))
-import           Stack.Types.Compiler
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
-import           Stack.Types.NamedComponent
-import           Stack.Types.SourceMap
-import           Stack.Types.Version
-
--- | All exceptions thrown by the library.
+import           Distribution.License ( License )
+import           Distribution.ModuleName ( ModuleName )
+import           Distribution.PackageDescription ( BuildType )
+import           Distribution.System ( Platform (..) )
+import qualified RIO.Text as T
+import           Stack.Prelude
+import           Stack.Types.Cache ( FileCache )
+import           Stack.Types.CompCollection ( CompCollection )
+import           Stack.Types.Compiler ( ActualCompiler )
+import           Stack.Types.Component
+                   ( StackBenchmark, StackBuildInfo, StackExecutable
+                   , StackForeignLibrary, StackLibrary, StackTestSuite
+                   , StackUnqualCompName
+                   )
+import           Stack.Types.ComponentUtils (toCabalName)
+import           Stack.Types.Dependency ( DepValue )
+import           Stack.Types.EnvConfig ( EnvConfig, HasEnvConfig (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.Installed
+                   ( InstallLocation (..), InstallMap, Installed (..)
+                   , InstalledLibraryInfo (..), InstalledMap
+                   , InstalledPackageLocation (..), PackageDatabase (..)
+                   , PackageDbVariety(..), installedPackageIdentifier
+                   , toPackageDbVariety
+                   )
+import           Stack.Types.NamedComponent ( NamedComponent )
+import           Stack.Types.PackageFile
+                   ( DotCabalDescriptor (..), DotCabalPath (..)
+                   , StackPackageFile
+                   )
+import           Stack.Types.SourceMap ( CommonPackage, FromSnapshot )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Package" module.
 data PackageException
   = PackageInvalidCabalFile
       !(Either PackageIdentifierRevision (Path Abs File))
@@ -38,268 +92,235 @@ data PackageException
       ![PError]
       ![PWarning]
   | MismatchedCabalIdentifier !PackageIdentifierRevision !PackageIdentifier
-  deriving Typeable
-instance Exception PackageException
-instance Show PackageException where
-    show (PackageInvalidCabalFile loc _mversion errs warnings) = concat
-        [ "Unable to parse Cabal file "
-        , case loc of
-            Left pir -> "for " ++ T.unpack (utf8BuilderToText (display pir))
-            Right fp -> toFilePath fp
-        {-
-
-         Not actually needed, the errors will indicate if a newer version exists.
-         Also, it seems that this is set to Just the version even if we support it.
-
-        , case mversion of
-            Nothing -> ""
-            Just version -> "\nRequires newer Cabal file parser version: " ++
-                            versionString version
-        -}
-        , "\n\n"
-        , unlines $ map
-            (\(PError pos msg) -> concat
-                [ "- "
-                , showPos pos
-                , ": "
-                , msg
-                ])
-            errs
-        , unlines $ map
-            (\(PWarning _ pos msg) -> concat
-                [ "- "
-                , showPos pos
-                , ": "
-                , msg
-                ])
-            warnings
-        ]
-    show (MismatchedCabalIdentifier pir ident) = concat
-        [ "Mismatched package identifier."
-        , "\nFound:    "
-        , packageIdentifierString ident
-        , "\nExpected: "
-        , T.unpack $ utf8BuilderToText $ display pir
-        ]
-
--- | Libraries in a package. Since Cabal 2.0, internal libraries are a
--- thing.
-data PackageLibraries
-  = NoLibraries
-  | HasLibraries !(Set Text) -- ^ the foreign library names, sub libraries get built automatically without explicit component name passing
- deriving (Show,Typeable)
+  | CabalFileNameParseFail FilePath
+  | CabalFileNameInvalidPackageName FilePath
+  | ComponentNotParsedBug String
+  deriving Show
+
+instance Exception PackageException where
+  displayException (PackageInvalidCabalFile loc _mversion errs warnings) = concat
+    [ "Error: [S-8072]\n"
+    , "Unable to parse Cabal file "
+    , case loc of
+        Left pir -> "for " ++ T.unpack (utf8BuilderToText (display pir))
+        Right fp -> toFilePath fp
+    {-
+     Not actually needed, the errors will indicate if a newer version exists.
+     Also, it seems that this is set to Just the version even if we support it.
+    , case mversion of
+        Nothing -> ""
+        Just version -> "\nRequires newer Cabal file parser version: " ++
+                        versionString version
+    -}
+    , "\n\n"
+    , unlines $ map
+        (\(PError pos msg) -> concat
+            [ "- "
+            , showPos pos
+            , ": "
+            , msg
+            ])
+        errs
+    , unlines $ map
+        (\(PWarning _ pos msg) -> concat
+            [ "- "
+            , showPos pos
+            , ": "
+            , msg
+            ])
+        warnings
+    ]
+  displayException (MismatchedCabalIdentifier pir ident) = concat
+    [ "Error: [S-5394]\n"
+    , "Mismatched package identifier."
+    , "\nFound:    "
+    , packageIdentifierString ident
+    , "\nExpected: "
+    , T.unpack $ utf8BuilderToText $ display pir
+    ]
+  displayException (CabalFileNameParseFail fp) = concat
+    [ "Error: [S-2203]\n"
+    , "Invalid file path for Cabal file, must have a .cabal extension: "
+    , fp
+    ]
+  displayException (CabalFileNameInvalidPackageName fp) = concat
+    [ "Error: [S-8854]\n"
+    , "Cabal file names must use valid package names followed by a .cabal \
+      \extension, the following is invalid: "
+    , fp
+    ]
+  displayException (ComponentNotParsedBug name) = bugReport "[S-4623]"
+    (  "Component names should always parse as directory names. The component \
+       \name without a directory is '"
+    <> name
+    <> "'."
+    )
 
 -- | Name of an executable.
-newtype ExeName = ExeName { unExeName :: Text }
-    deriving (Show, Eq, Ord, Hashable, IsString, Generic, NFData, Data, Typeable)
+newtype ExeName
+  = ExeName { exeName :: Text }
+  deriving (Data, Eq, Generic, Hashable, IsString, NFData, Ord, Show)
 
 -- | Some package info.
-data Package =
-  Package {packageName :: !PackageName                    -- ^ Name of the package.
-          ,packageVersion :: !Version                     -- ^ Version of the package
-          ,packageLicense :: !(Either SPDX.License License) -- ^ The license the package was released under.
-          ,packageFiles :: !GetPackageFiles               -- ^ Get all files of the package.
-          ,packageDeps :: !(Map PackageName DepValue)     -- ^ Packages that the package depends on, both as libraries and build tools.
-          ,packageUnknownTools :: !(Set ExeName)          -- ^ Build tools specified in the legacy manner (build-tools:) that failed the hard-coded lookup.
-          ,packageAllDeps :: !(Set PackageName)           -- ^ Original dependencies (not sieved).
-          ,packageGhcOptions :: ![Text]                   -- ^ Ghc options used on package.
-          ,packageCabalConfigOpts :: ![Text]              -- ^ Additional options passed to ./Setup.hs configure
-          ,packageFlags :: !(Map FlagName Bool)           -- ^ Flags used on package.
-          ,packageDefaultFlags :: !(Map FlagName Bool)    -- ^ Defaults for unspecified flags.
-          ,packageLibraries :: !PackageLibraries          -- ^ does the package have a buildable library stanza?
-          ,packageInternalLibraries :: !(Set Text)        -- ^ names of internal libraries
-          ,packageTests :: !(Map Text TestSuiteInterface) -- ^ names and interfaces of test suites
-          ,packageBenchmarks :: !(Set Text)               -- ^ names of benchmarks
-          ,packageExes :: !(Set Text)                     -- ^ names of executables
-          ,packageOpts :: !GetPackageOpts                 -- ^ Args to pass to GHC.
-          ,packageHasExposedModules :: !Bool              -- ^ Does the package have exposed modules?
-          ,packageBuildType :: !BuildType                 -- ^ Package build-type.
-          ,packageSetupDeps :: !(Maybe (Map PackageName VersionRange))
-                                                          -- ^ If present: custom-setup dependencies
-          ,packageCabalSpec :: !CabalSpecVersion          -- ^ Cabal spec range
-          }
- deriving (Show,Typeable)
-
-packageIdent :: Package -> PackageIdentifier
-packageIdent p = PackageIdentifier (packageName p) (packageVersion p)
-
--- | The value for a map from dependency name. This contains both the
--- version range and the type of dependency, and provides a semigroup
--- instance.
-data DepValue = DepValue
-  { dvVersionRange :: !VersionRange
-  , dvType :: !DepType
+data Package = Package
+  { name :: !PackageName
+    -- ^ Name of the package.
+  , version :: !Version
+    -- ^ Version of the package
+  , license :: !(Either SPDX.License License)
+    -- ^ The license the package was released under.
+  , ghcOptions :: ![Text]
+    -- ^ Ghc options used on package.
+  , cabalConfigOpts :: ![Text]
+    -- ^ Additional options passed to ./Setup.hs configure
+  , flags :: !(Map FlagName Bool)
+    -- ^ Flags used on package.
+  , defaultFlags :: !(Map FlagName Bool)
+    -- ^ Defaults for unspecified flags.
+  , library :: !(Maybe StackLibrary)
+    -- ^ Does the package have a buildable main library stanza?
+  , subLibraries :: !(CompCollection StackLibrary)
+    -- ^ The sub-libraries of the package.
+  , foreignLibraries :: !(CompCollection StackForeignLibrary)
+    -- ^ The foreign libraries of the package.
+  , testSuites :: !(CompCollection StackTestSuite)
+    -- ^ The test suites of the package.
+  , benchmarks :: !(CompCollection StackBenchmark)
+    -- ^ The benchmarks of the package.
+  , executables :: !(CompCollection StackExecutable)
+    -- ^ The executables of the package.
+  , buildType :: !BuildType
+    -- ^ Package build-type.
+  , setupDeps :: !(Maybe (Map PackageName DepValue))
+    -- ^ If present: custom-setup dependencies
+  , cabalSpec :: !CabalSpecVersion
+    -- ^ Cabal spec range
+  , file :: StackPackageFile
+    -- ^ The Cabal sourced files related to the package at the package level
+    -- The components may have file information in their own types
+  , testEnabled :: Bool
+    -- ^ This is a requirement because when tests are not enabled, Stack's
+    -- package dependencies should ignore test dependencies. Directly set from
+    -- 'enableTests'.
+  , benchmarkEnabled :: Bool
+    -- ^ This is a requirement because when benchmark are not enabled, Stack's
+    -- package dependencies should ignore benchmark dependencies. Directly set
+    -- from 'enableBenchmarks'.
   }
-  deriving (Show,Typeable)
-instance Semigroup DepValue where
-  DepValue a x <> DepValue b y = DepValue (intersectVersionRanges a b) (x <> y)
-
--- | Is this package being used as a library, or just as a build tool?
--- If the former, we need to ensure that a library actually
--- exists. See
--- <https://github.com/commercialhaskell/stack/issues/2195>
-data DepType = AsLibrary | AsBuildTool
-  deriving (Show, Eq)
-instance Semigroup DepType where
-  AsLibrary <> _ = AsLibrary
-  AsBuildTool <> x = x
+  deriving Show
 
 packageIdentifier :: Package -> PackageIdentifier
-packageIdentifier pkg =
-    PackageIdentifier (packageName pkg) (packageVersion pkg)
+packageIdentifier p = PackageIdentifier p.name p.version
 
 packageDefinedFlags :: Package -> Set FlagName
-packageDefinedFlags = M.keysSet . packageDefaultFlags
-
-type InstallMap = Map PackageName (InstallLocation, Version)
-
--- | Files that the package depends on, relative to package directory.
--- Argument is the location of the Cabal file
-newtype GetPackageOpts = GetPackageOpts
-    { getPackageOpts :: forall env. HasEnvConfig env
-                     => InstallMap
-                     -> InstalledMap
-                     -> [PackageName]
-                     -> [PackageName]
-                     -> Path Abs File
-                     -> RIO env
-                          (Map NamedComponent (Map ModuleName (Path Abs File))
-                          ,Map NamedComponent [DotCabalPath]
-                          ,Map NamedComponent BuildInfoOpts)
-    }
-instance Show GetPackageOpts where
-    show _ = "<GetPackageOpts>"
+packageDefinedFlags = M.keysSet . (.defaultFlags)
 
 -- | GHC options based on cabal information and ghc-options.
 data BuildInfoOpts = BuildInfoOpts
-    { bioOpts :: [String]
-    , bioOneWordOpts :: [String]
-    , bioPackageFlags :: [String]
-    -- ^ These options can safely have 'nubOrd' applied to them, as
-    -- there are no multi-word options (see
+  { opts :: [String]
+  , oneWordOpts :: [String]
+  , packageFlags :: [String]
+    -- ^ These options can safely have 'nubOrd' applied to them, as there are no
+    -- multi-word options (see
     -- https://github.com/commercialhaskell/stack/issues/1255)
-    , bioCabalMacros :: Path Abs File
-    } deriving Show
-
--- | Files to get for a cabal package.
-data CabalFileType
-    = AllFiles
-    | Modules
-
--- | Files that the package depends on, relative to package directory.
--- Argument is the location of the Cabal file
-newtype GetPackageFiles = GetPackageFiles
-    { getPackageFiles :: forall env. HasEnvConfig env
-                      => Path Abs File
-                      -> RIO env
-                           (Map NamedComponent (Map ModuleName (Path Abs File))
-                           ,Map NamedComponent [DotCabalPath]
-                           ,Set (Path Abs File)
-                           ,[PackageWarning])
-    }
-instance Show GetPackageFiles where
-    show _ = "<GetPackageFiles>"
-
--- | Warning generated when reading a package
-data PackageWarning
-    = UnlistedModulesWarning NamedComponent [ModuleName]
-      -- ^ Modules found that are not listed in Cabal file
-
-    -- TODO: bring this back - see
-    -- https://github.com/commercialhaskell/stack/issues/2649
-    {-
-    | MissingModulesWarning (Path Abs File) (Maybe String) [ModuleName]
-      -- ^ Modules not found in file system, which are listed in Cabal file
-    -}
+  , cabalMacros :: Path Abs File
+  }
+  deriving Show
 
 -- | Package build configuration
-data PackageConfig =
-  PackageConfig {packageConfigEnableTests :: !Bool                -- ^ Are tests enabled?
-                ,packageConfigEnableBenchmarks :: !Bool           -- ^ Are benchmarks enabled?
-                ,packageConfigFlags :: !(Map FlagName Bool)       -- ^ Configured flags.
-                ,packageConfigGhcOptions :: ![Text]               -- ^ Configured ghc options.
-                ,packageConfigCabalConfigOpts :: ![Text]          -- ^ ./Setup.hs configure options
-                ,packageConfigCompilerVersion :: ActualCompiler   -- ^ GHC version
-                ,packageConfigPlatform :: !Platform               -- ^ host platform
-                }
- deriving (Show,Typeable)
+data PackageConfig = PackageConfig
+  { enableTests :: !Bool
+    -- ^ Are tests enabled?
+  , enableBenchmarks :: !Bool
+    -- ^ Are benchmarks enabled?
+  , flags :: !(Map FlagName Bool)
+    -- ^ Configured flags.
+  , ghcOptions :: ![Text]
+    -- ^ Configured ghc options.
+  , cabalConfigOpts :: ![Text]
+    -- ^ ./Setup.hs configure options
+  , compilerVersion :: ActualCompiler
+    -- ^ GHC version
+  , platform :: !Platform
+    -- ^ host platform
+  }
+ deriving Show
 
 -- | Compares the package name.
 instance Ord Package where
-  compare = on compare packageName
+  compare = on compare (.name)
 
 -- | Compares the package name.
 instance Eq Package where
-  (==) = on (==) packageName
+  (==) = on (==) (.name)
 
 -- | Where the package's source is located: local directory or package index
 data PackageSource
   = PSFilePath LocalPackage
-  -- ^ Package which exist on the filesystem
+    -- ^ Package which exist on the filesystem
   | PSRemote PackageLocationImmutable Version FromSnapshot CommonPackage
-  -- ^ Package which is downloaded remotely.
+    -- ^ Package which is downloaded remotely.
 
 instance Show PackageSource where
-    show (PSFilePath lp) = concat ["PSFilePath (", show lp, ")"]
-    show (PSRemote pli v fromSnapshot _) =
-        concat
-            [ "PSRemote"
-            , "(", show pli, ")"
-            , "(", show v, ")"
-            , show fromSnapshot
-            , "<CommonPackage>"
-            ]
-
+  show (PSFilePath lp) = concat ["PSFilePath (", show lp, ")"]
+  show (PSRemote pli v fromSnapshot _) =
+    concat
+      [ "PSRemote"
+      , "(", show pli, ")"
+      , "(", show v, ")"
+      , show fromSnapshot
+      , "<CommonPackage>"
+      ]
 
 psVersion :: PackageSource -> Version
-psVersion (PSFilePath lp) = packageVersion $ lpPackage lp
+psVersion (PSFilePath lp) = lp.package.version
 psVersion (PSRemote _ v _ _) = v
 
--- | Information on a locally available package of source code
+-- | Information on a locally available package of source code.
 data LocalPackage = LocalPackage
-    { lpPackage       :: !Package
-    -- ^ The @Package@ info itself, after resolution with package flags,
-    -- with tests and benchmarks disabled
-    , lpComponents    :: !(Set NamedComponent)
+  { package        :: !Package
+     -- ^ The @Package@ info itself, after resolution with package flags, with
+     -- tests and benchmarks disabled
+  , components     :: !(Set NamedComponent)
     -- ^ Components to build, not including the library component.
-    , lpUnbuildable   :: !(Set NamedComponent)
+  , unbuildable    :: !(Set NamedComponent)
     -- ^ Components explicitly requested for build, that are marked
     -- "buildable: false".
-    , lpWanted        :: !Bool -- FIXME Should completely drop this "wanted" terminology, it's unclear
+  , wanted         :: !Bool
     -- ^ Whether this package is wanted as a target.
-    , lpTestDeps      :: !(Map PackageName VersionRange)
-    -- ^ Used for determining if we can use --enable-tests in a normal build.
-    , lpBenchDeps     :: !(Map PackageName VersionRange)
-    -- ^ Used for determining if we can use --enable-benchmarks in a normal
-    -- build.
-    , lpTestBench     :: !(Maybe Package)
-    -- ^ This stores the 'Package' with tests and benchmarks enabled, if
-    -- either is asked for by the user.
-    , lpCabalFile     :: !(Path Abs File)
-    -- ^ The Cabal file
-    , lpBuildHaddocks :: !Bool
-    , lpForceDirty    :: !Bool
-    , lpDirtyFiles    :: !(MemoizedWith EnvConfig (Maybe (Set FilePath)))
+
+    -- FIXME Should completely drop this "wanted" terminology, it's unclear.
+  , testBench      :: !(Maybe Package)
+    -- ^ This stores the t'Package' with tests and benchmarks enabled, if either
+    -- is asked for by the user.
+  , cabalFP        :: !(Path Abs File)
+    -- ^ Absolute path to the Cabal file.
+  , buildHaddocks  :: !Bool
+    -- ^ Is Haddock documentation being built for this package?
+  , forceDirty     :: !Bool
+  , dirtyFiles     :: !(MemoizedWith EnvConfig (Maybe (Set FilePath)))
     -- ^ Nothing == not dirty, Just == dirty. Note that the Set may be empty if
     -- we forced the build to treat packages as dirty. Also, the Set may not
     -- include all modified files.
-    , lpNewBuildCaches :: !(MemoizedWith EnvConfig (Map NamedComponent (Map FilePath FileCacheInfo)))
-    -- ^ current state of the files
-    , lpComponentFiles :: !(MemoizedWith EnvConfig (Map NamedComponent (Set (Path Abs File))))
-    -- ^ all files used by this package
-    }
-    deriving Show
+  , newBuildCaches :: !(MemoizedWith EnvConfig (Map NamedComponent FileCache))
+    -- ^ Current state of the files.
+  , componentFiles :: !( MemoizedWith
+                           EnvConfig
+                           (Map NamedComponent (Set (Path Abs File)))
+                       )
+    -- ^ All files used by this package.
+  }
+  deriving Show
 
-newtype MemoizedWith env a = MemoizedWith { unMemoizedWith :: RIO env a }
-  deriving (Functor, Applicative, Monad)
+newtype MemoizedWith env a
+  = MemoizedWith { memoizedWith :: RIO env a }
+  deriving (Applicative, Functor, Monad)
 
 memoizeRefWith :: MonadIO m => RIO env a -> m (MemoizedWith env a)
 memoizeRefWith action = do
   ref <- newIORef Nothing
   pure $ MemoizedWith $ do
-    mres <- readIORef ref
-    res <-
-      case mres of
+    res <- readIORef ref >>= \case
         Just res -> pure res
         Nothing -> do
           res <- tryAny action
@@ -307,8 +328,8 @@ memoizeRefWith action = do
           pure res
     either throwIO pure res
 
-runMemoizedWith
-  :: (HasEnvConfig env, MonadReader env m, MonadIO m)
+runMemoizedWith ::
+     (HasEnvConfig env, MonadReader env m, MonadIO m)
   => MemoizedWith EnvConfig a
   -> m a
 runMemoizedWith (MemoizedWith action) = do
@@ -319,60 +340,17 @@ instance Show (MemoizedWith env a) where
   show _ = "<<MemoizedWith>>"
 
 lpFiles :: HasEnvConfig env => LocalPackage -> RIO env (Set.Set (Path Abs File))
-lpFiles = runMemoizedWith . fmap (Set.unions . M.elems) . lpComponentFiles
+lpFiles = runMemoizedWith . fmap (Set.unions . M.elems) . (.componentFiles)
 
-lpFilesForComponents :: HasEnvConfig env
-                     => Set NamedComponent
-                     -> LocalPackage
-                     -> RIO env (Set.Set (Path Abs File))
+lpFilesForComponents ::
+     HasEnvConfig env
+  => Set NamedComponent
+  -> LocalPackage
+  -> RIO env (Set.Set (Path Abs File))
 lpFilesForComponents components lp = runMemoizedWith $ do
-  componentFiles <- lpComponentFiles lp
+  componentFiles <- lp.componentFiles
   pure $ mconcat (M.elems (M.restrictKeys componentFiles components))
 
--- | A location to install a package into, either snapshot or local
-data InstallLocation = Snap | Local
-    deriving (Show, Eq)
-instance Semigroup InstallLocation where
-    Local <> _ = Local
-    _ <> Local = Local
-    Snap <> Snap = Snap
-instance Monoid InstallLocation where
-    mempty = Snap
-    mappend = (<>)
-
-data InstalledPackageLocation = InstalledTo InstallLocation | ExtraGlobal
-    deriving (Show, Eq)
-
-newtype FileCacheInfo = FileCacheInfo
-    { fciHash :: SHA256
-    }
-    deriving (Generic, Show, Eq, Typeable)
-instance NFData FileCacheInfo
-
--- Provided for storing the BuildCache values in a file. But maybe
--- JSON/YAML isn't the right choice here, worth considering.
-instance ToJSON FileCacheInfo where
-  toJSON (FileCacheInfo hash') = object
-    [ "hash" .= hash'
-    ]
-instance FromJSON FileCacheInfo where
-  parseJSON = withObject "FileCacheInfo" $ \o -> FileCacheInfo
-    <$> o .: "hash"
-
--- | A descriptor from a Cabal file indicating one of the following:
---
--- exposed-modules: Foo
--- other-modules: Foo
--- or
--- main-is: Foo.hs
---
-data DotCabalDescriptor
-    = DotCabalModule !ModuleName
-    | DotCabalMain !FilePath
-    | DotCabalFile !FilePath
-    | DotCabalCFile !FilePath
-    deriving (Eq,Ord,Show)
-
 -- | Maybe get the module name from the .cabal descriptor.
 dotCabalModule :: DotCabalDescriptor -> Maybe ModuleName
 dotCabalModule (DotCabalModule m) = Just m
@@ -383,15 +361,6 @@ dotCabalMain :: DotCabalDescriptor -> Maybe FilePath
 dotCabalMain (DotCabalMain m) = Just m
 dotCabalMain _ = Nothing
 
--- | A path resolved from the Cabal file, which is either main-is or
--- an exposed/internal/referenced module.
-data DotCabalPath
-    = DotCabalModulePath !(Path Abs File)
-    | DotCabalMainPath !(Path Abs File)
-    | DotCabalFilePath !(Path Abs File)
-    | DotCabalCFilePath !(Path Abs File)
-    deriving (Eq,Ord,Show)
-
 -- | Get the module path.
 dotCabalModulePath :: DotCabalPath -> Maybe (Path Abs File)
 dotCabalModulePath (DotCabalModulePath fp) = Just fp
@@ -410,25 +379,76 @@ dotCabalCFilePath _ = Nothing
 -- | Get the path.
 dotCabalGetPath :: DotCabalPath -> Path Abs File
 dotCabalGetPath dcp =
-    case dcp of
-        DotCabalModulePath fp -> fp
-        DotCabalMainPath fp -> fp
-        DotCabalFilePath fp -> fp
-        DotCabalCFilePath fp -> fp
-
-type InstalledMap = Map PackageName (InstallLocation, Installed)
-
-data Installed
-    = Library PackageIdentifier GhcPkgId (Maybe (Either SPDX.License License))
-    | Executable PackageIdentifier
-    deriving (Show, Eq)
-
-installedPackageIdentifier :: Installed -> PackageIdentifier
-installedPackageIdentifier (Library pid _ _) = pid
-installedPackageIdentifier (Executable pid) = pid
-
--- | Get the installed Version.
-installedVersion :: Installed -> Version
-installedVersion i =
-  let PackageIdentifier _ version = installedPackageIdentifier i
-   in version
+  case dcp of
+    DotCabalModulePath fp -> fp
+    DotCabalMainPath fp -> fp
+    DotCabalFilePath fp -> fp
+    DotCabalCFilePath fp -> fp
+
+-- | Gathers all the GhcPkgId provided by a library into a map, where the
+-- package identifier of a sublibrary is its munged package identifier.
+installedMapGhcPkgId ::
+     PackageIdentifier
+     -- ^ The name and version of a Cabal package.
+  -> InstalledLibraryInfo
+  -> Map MungedPackageId GhcPkgId
+installedMapGhcPkgId pkgId libInfo =
+  mAddMainGhcPkgId libInfo.mMainGhcPkgId subLibMap
+ where
+  mAddMainGhcPkgId = maybe id (M.insert mungedMainPkgId)
+  mungedMainPkgId = toCabalMungedPackageId pkgId Nothing
+  subLibMap =
+    M.mapKeysMonotonic (toCabalMungedPackageId pkgId . Just) libInfo.subLib
+
+installedPackageToGhcPkgId ::
+     PackageIdentifier
+     -- ^ The name and version of a Cabal package.
+  -> Installed
+     -- ^ Assumed to be for the same Cabal package name and version.
+  -> Map MungedPackageId GhcPkgId
+installedPackageToGhcPkgId pkgId installed =
+  assert (pkgId == installedPackageIdentifier installed)
+    (installedPackageToGhcPkgId' installed)
+
+installedPackageToGhcPkgId' :: Installed -> Map MungedPackageId GhcPkgId
+installedPackageToGhcPkgId' (Library pkgId libInfo) =
+  installedMapGhcPkgId pkgId libInfo
+installedPackageToGhcPkgId' (Executable _) = mempty
+
+-- | Creates a munged package identifier.
+toCabalMungedPackageId ::
+     PackageIdentifier
+     -- ^ The name and version of a Cabal package.
+  -> Maybe StackUnqualCompName
+     -- ^ 'Nothing', if a main library.
+  -> MungedPackageId
+toCabalMungedPackageId pkgId mLibName =
+  MungedPackageId (toCabalMungedPackageName pkgName mLibName) version
+ where
+  PackageIdentifier pkgName version = pkgId
+
+-- | Creates a munged package name.
+toCabalMungedPackageName ::
+     PackageName
+     -- ^ The name of a Cabal package.
+  -> Maybe StackUnqualCompName
+     -- ^ 'Nothing', if a main library.
+  -> MungedPackageName
+toCabalMungedPackageName pkgName mLibName = MungedPackageName pkgName $
+  maybe LMainLibName (LSubLibName . toCabalName) mLibName
+
+-- | Type representing inputs to 'Stack.Package.generateBuildInfoOpts'.
+data BioInput = BioInput
+  { installMap :: !InstallMap
+  , installedMap :: !InstalledMap
+  , cabalDir :: !(Path Abs Dir)
+  , distDir :: !(Path Abs Dir)
+  , omitPackages :: ![PackageName]
+  , addPackages :: ![PackageName]
+  , buildInfo :: !StackBuildInfo
+  , dotCabalPaths :: ![DotCabalPath]
+  , configLibDirs :: ![FilePath]
+  , configIncludeDirs :: ![FilePath]
+  , componentName :: !NamedComponent
+  , cabalVersion :: !Version
+  }
diff --git a/src/Stack/Types/PackageFile.hs b/src/Stack/Types/PackageFile.hs
new file mode 100644
index 0000000000..9c28ca8556
--- /dev/null
+++ b/src/Stack/Types/PackageFile.hs
@@ -0,0 +1,135 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Types.PackageFile
+License     : BSD-3-Clause
+
+The facility for retrieving all files from the main Stack 'Stack.Types.Package'
+type. This was moved into its own module to allow component-level file-gathering
+without circular dependency at the Package level.
+-}
+
+module Stack.Types.PackageFile
+  ( GetPackageFileContext (..)
+  , DotCabalPath (..)
+  , DotCabalDescriptor (..)
+  , PackageWarning (..)
+  , StackPackageFile (..)
+  , PackageComponentFile (..)
+  ) where
+
+import           Distribution.ModuleName ( ModuleName )
+import           RIO.Process ( HasProcessContext (..) )
+import           Stack.Prelude
+import           Stack.Types.BuildConfig
+                   ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.Config ( HasConfig (..) )
+import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
+import           Stack.Types.NamedComponent ( NamedComponent )
+import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Runner ( HasRunner (..) )
+
+-- | Type representing environments in which Stack gets all files referenced by
+-- a package.
+data GetPackageFileContext = GetPackageFileContext
+  { file :: !(Path Abs File)
+  , distDir :: !(Path Abs Dir)
+  , buildConfig :: !BuildConfig
+  , cabalVer :: !Version
+  }
+
+instance HasPlatform GetPackageFileContext where
+  platformL = configL . platformL
+  {-# INLINE platformL #-}
+  platformVariantL = configL . platformVariantL
+  {-# INLINE platformVariantL #-}
+
+instance HasGHCVariant GetPackageFileContext where
+  ghcVariantL = configL . ghcVariantL
+  {-# INLINE ghcVariantL #-}
+
+instance HasLogFunc GetPackageFileContext where
+  logFuncL = configL . logFuncL
+
+instance HasRunner GetPackageFileContext where
+  runnerL = configL . runnerL
+
+instance HasStylesUpdate GetPackageFileContext where
+  stylesUpdateL = runnerL . stylesUpdateL
+
+instance HasTerm GetPackageFileContext where
+  useColorL = runnerL . useColorL
+  termWidthL = runnerL . termWidthL
+
+instance HasConfig GetPackageFileContext where
+  configL = buildConfigL . lens (.config) (\x y -> x { config = y })
+  {-# INLINE configL #-}
+
+instance HasBuildConfig GetPackageFileContext where
+  buildConfigL = lens (.buildConfig) (\x y -> x { buildConfig = y })
+
+instance HasPantryConfig GetPackageFileContext where
+  pantryConfigL = configL . pantryConfigL
+
+instance HasProcessContext GetPackageFileContext where
+  processContextL = configL . processContextL
+
+-- | A path resolved from the Cabal file, which is either main-is or
+-- an exposed/internal/referenced module.
+data DotCabalPath
+  = DotCabalModulePath !(Path Abs File)
+  | DotCabalMainPath !(Path Abs File)
+  | DotCabalFilePath !(Path Abs File)
+  | DotCabalCFilePath !(Path Abs File)
+  deriving (Eq, Ord, Show)
+
+-- | A descriptor from a Cabal file indicating one of the following:
+--
+-- exposed-modules: Foo
+-- other-modules: Foo
+-- or
+-- main-is: Foo.hs
+--
+data DotCabalDescriptor
+  = DotCabalModule !ModuleName
+  | DotCabalMain !FilePath
+  | DotCabalFile !FilePath
+  | DotCabalCFile !FilePath
+  deriving (Eq, Ord, Show)
+
+-- | Warning generated when reading a package
+data PackageWarning
+  = UnlistedModulesWarning NamedComponent [ModuleName]
+    -- ^ Modules found that are not listed in Cabal file
+  -- TODO: bring this back - see
+  -- https://github.com/commercialhaskell/stack/issues/2649
+  {-
+  | MissingModulesWarning (Path Abs File) (Maybe String) [ModuleName]
+    -- ^ Modules not found in file system, which are listed in Cabal file
+  -}
+
+-- | This is the information from Cabal we need at the package level to track
+-- files.
+data StackPackageFile = StackPackageFile
+  { extraSrcFiles :: [FilePath]
+  , dataDir :: FilePath
+  , dataFiles :: [FilePath]
+  }
+  deriving Show
+
+-- | Files that the package depends on, relative to package directory.
+data PackageComponentFile = PackageComponentFile
+  { modulePathMap :: Map NamedComponent (Map ModuleName (Path Abs File))
+  , cabalFileMap :: !(Map NamedComponent [DotCabalPath])
+  , packageExtraFile :: Set (Path Abs File)
+  , warnings :: [PackageWarning]
+  }
+
+instance Semigroup PackageComponentFile where
+  PackageComponentFile x1 x2 x3 x4 <> PackageComponentFile y1 y2 y3 y4 =
+    PackageComponentFile (x1 <> y1) (x2 <> y2) (x3 <> y3) (x4 <> y4)
+
+instance Monoid PackageComponentFile where
+  mempty = PackageComponentFile mempty mempty mempty mempty
diff --git a/src/Stack/Types/PackageName.hs b/src/Stack/Types/PackageName.hs
index d988def9a7..be973d400e 100644
--- a/src/Stack/Types/PackageName.hs
+++ b/src/Stack/Types/PackageName.hs
@@ -1,30 +1,43 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleInstances #-}
 
--- | Names for packages.
+{-|
+Module      : Stack.Types.PackageName
+Description : Names for packages.
+License     : BSD-3-Clause
+
+Names for packages.
+-}
 
 module Stack.Types.PackageName
-    ( packageNameArgument
-    ) where
+  ( packageNameArgument
+  ) where
 
-import           Stack.Prelude
 import qualified Options.Applicative as O
-
+import           Stack.Prelude
 
 -- | An argument which accepts a template name of the format
 -- @foo.hsfiles@.
-packageNameArgument :: O.Mod O.ArgumentFields PackageName
-                    -> O.Parser PackageName
+packageNameArgument ::
+     O.Mod O.ArgumentFields PackageName
+  -> O.Parser PackageName
 packageNameArgument =
-    O.argument
-        (do s <- O.str
-            either O.readerError pure (p s))
-  where
-    p s =
-        case parsePackageName s of
-            Just x -> Right x
-            Nothing -> Left $ unlines
-                [ "Expected valid package name, but got: " ++ s
-                , "Package names consist of one or more alphanumeric words separated by hyphens."
-                , "To avoid ambiguity with version numbers, each of these words must contain at least one letter."
-                ]
+  O.argument
+    (do s <- O.str
+        either O.readerError pure (p s))
+ where
+  p s =
+    case parsePackageName s of
+      Just x -> Right x
+      Nothing -> Left $ unlines
+        [ "Expected a package name acceptable to Cabal, but got: " ++ s ++ "\n"
+        , "An acceptable package name comprises an alphanumeric 'word'; or \
+          \two or more"
+        , "such words, with the words separated by a hyphen/minus character ('-'). A \
+          \word"
+        , "cannot be comprised only of the characters '0' to '9'. \n"
+        , "An alphanumeric character is one in one of the Unicode Letter \
+          \categories"
+        , "(Lu (uppercase), Ll (lowercase), Lt (titlecase), Lm (modifier), or \
+          \Lo (other))"
+        , "or Number categories (Nd (decimal), Nl (letter), or No (other))."
+        ]
diff --git a/src/Stack/Types/ParentMap.hs b/src/Stack/Types/ParentMap.hs
new file mode 100644
index 0000000000..04dc940508
--- /dev/null
+++ b/src/Stack/Types/ParentMap.hs
@@ -0,0 +1,23 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.ParentMap
+Description : Module exporting the 'ParentMap' type synonym.
+License     : BSD-3-Clause
+
+Module exporting the 'ParentMap' type synonym.
+-}
+
+module Stack.Types.ParentMap
+  ( ParentMap
+  ) where
+
+import           Data.Monoid.Map ( MonoidMap (..) )
+import           Stack.Prelude
+import           Stack.Types.Version ( VersionRange )
+
+-- | Type synonym representing dictionaries of package names, and a list of
+-- pairs of the identifier of a package depending on the package and the
+-- version range specified for the dependency by that package.
+type ParentMap =
+  MonoidMap PackageName [(PackageIdentifier, VersionRange)]
diff --git a/src/Stack/Types/Plan.hs b/src/Stack/Types/Plan.hs
new file mode 100644
index 0000000000..5c9c2b9715
--- /dev/null
+++ b/src/Stack/Types/Plan.hs
@@ -0,0 +1,176 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Types.Plan
+Description : Plan-related types and functions.
+License     : BSD-3-Clause
+
+Plan-related types and functions.
+-}
+
+module Stack.Types.Plan
+  ( Plan (..)
+  , Task (..)
+  , TaskType (..)
+  , TaskConfigOpts (..)
+  , ComponentKey (..)
+  , componentKeyPkgName
+  , fromComponentKey
+  , taskAnyMissing
+  , taskIsTarget
+  , taskLocation
+  , taskProvides
+  , taskTargetIsMutable
+  , taskTypeLocation
+  , taskTypePackageIdentifier
+  , installLocationIsMutable
+  ) where
+
+import           Data.List as L
+import qualified Data.Text as T
+import           Distribution.ModuleName ( ModuleName )
+import qualified RIO.Set as Set
+import           Stack.Prelude
+import           Stack.Types.Cache ( CachePkgSrc )
+import           Stack.Types.ComponentUtils ( StackUnqualCompName )
+import           Stack.Types.ConfigureOpts
+                   ( BaseConfigOpts, PackageConfigureOpts )
+import           Stack.Types.EnvConfig ( EnvConfig )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.IsMutable ( IsMutable (..) )
+import           Stack.Types.NamedComponent
+                   ( NamedComponent, renderPkgComponent )
+import           Stack.Types.Package
+                   ( InstallLocation (..), LocalPackage (..), Package (..)
+                   , packageIdentifier
+                   )
+
+-- | A key that identifies a single buildable unit in the plan. For most
+-- packages this is @ComponentKey pkgName CLib@. When per-component building
+-- is enabled (Phase 2 Backpack support), each component gets its own key.
+data ComponentKey = ComponentKey !PackageName !NamedComponent
+  deriving (Eq, Ord, Show)
+
+-- | Extract the package name from a 'ComponentKey'.
+componentKeyPkgName :: ComponentKey -> PackageName
+componentKeyPkgName (ComponentKey n _) = n
+
+-- | Convert a 'ComponentKey' to a value of a string-like type.
+fromComponentKey :: IsString a => ComponentKey -> a
+fromComponentKey (ComponentKey pkgName component) =
+  fromString $ T.unpack $ renderPkgComponent (pkgName, component)
+
+-- | A complete plan of what needs to be built and how to do it
+data Plan = Plan
+  { tasks :: !(Map ComponentKey Task)
+  , finals :: !(Map ComponentKey Task)
+    -- ^ Final actions to be taken (test, benchmark, etc)
+  , unregisterLocal :: !(Map GhcPkgId (PackageIdentifier, Text))
+    -- ^ Text is reason we're unregistering, for display only
+  , installExes :: !(Map StackUnqualCompName InstallLocation)
+    -- ^ Executables that should be installed after successful building
+  }
+  deriving Show
+
+-- | A type representing tasks to perform when building.
+data Task = Task
+  { taskType        :: !TaskType
+    -- ^ The task type, telling us how to build this
+  , configOpts      :: !TaskConfigOpts
+    -- ^ A set of the package identifiers of dependencies for which 'GhcPkgId'
+    -- are missing and a function which yields configure options, given a
+    -- dictionary of those identifiers and their 'GhcPkgId'.
+  , buildHaddocks   :: !Bool
+  , allInOne        :: !Bool
+    -- ^ Meaningful for final (test\/benchmark) tasks in 'Plan' @finals@:
+    -- 'True' when the test\/benchmark build is folded into the package's
+    -- primary 'ATBuild' (the common case); 'False' when it needs its own
+    -- 'ATBuildFinal' step (curator builds that expect test failures, the
+    -- cyclic-plan fallback, or per-component CTest\/CBench keys). For primary
+    -- build tasks this field is not consulted and is set to 'True'.
+  , present         :: !(Map MungedPackageId GhcPkgId)
+    -- ^ A dictionary of the munged package identifiers of already-installed
+    -- dependencies, and their 'GhcPkgId'.
+  , cachePkgSrc     :: !CachePkgSrc
+  , buildTypeConfig :: !Bool
+    -- ^ Is the build type of this package Configure. Check out
+    -- ensureConfigureScript in Stack.Build.Execute for the motivation
+  , backpackInstEntries :: ![(ModuleName, PackageName, ModuleName)]
+    -- ^ For CInst tasks: [(sigName, implPkgName, implModuleName)].
+    -- Empty for non-instantiation tasks.
+  }
+  deriving Show
+
+-- | Type representing different types of task, depending on what is to be
+-- built.
+data TaskType
+  = TTLocalMutable LocalPackage
+    -- ^ Building local source code.
+  | TTRemotePackage IsMutable Package PackageLocationImmutable
+    -- ^ Building something from the package index (upstream).
+  deriving Show
+
+-- | Given the IDs of any missing packages, produce the configure options
+data TaskConfigOpts = TaskConfigOpts
+  { missing :: !(Set PackageIdentifier)
+    -- ^ Dependencies for which we don't yet have a 'GhcPkgId'
+  , envConfig :: EnvConfig
+  , baseConfigOpts :: BaseConfigOpts
+  , isLocalNonExtraDep :: !Bool
+  , isMutable :: !IsMutable
+  , pkgConfigOpts :: PackageConfigureOpts
+  , instantiationDeps :: ![ComponentKey]
+    -- ^ Additional deps on CInst tasks. Added to action deps at execution.
+    -- Empty for most tasks.
+  }
+
+instance Show TaskConfigOpts where
+  show tco = "Missing: " ++ show tco.missing
+
+-- | Were any of the dependencies missing?
+
+taskAnyMissing :: Task -> Bool
+taskAnyMissing task = not $ Set.null task.configOpts.missing
+
+-- | A function to yield the package name and version of a given 'TaskType'
+-- value.
+taskTypePackageIdentifier :: TaskType -> PackageIdentifier
+taskTypePackageIdentifier (TTLocalMutable lp) = packageIdentifier lp.package
+taskTypePackageIdentifier (TTRemotePackage _ p _) = packageIdentifier p
+
+taskIsTarget :: Task -> Bool
+taskIsTarget t =
+  case t.taskType of
+    TTLocalMutable lp -> lp.wanted
+    _ -> False
+
+-- | A function to yield the relevant database (write-only or mutable) of a
+-- given 'TaskType' value.
+taskTypeLocation :: TaskType -> InstallLocation
+taskTypeLocation (TTLocalMutable _) = Local
+taskTypeLocation (TTRemotePackage Mutable _ _) = Local
+taskTypeLocation (TTRemotePackage Immutable _ _) = Snap
+
+-- | A function to yield the relevant database (write-only or mutable) of the
+-- given task.
+taskLocation :: Task -> InstallLocation
+taskLocation = taskTypeLocation . (.taskType)
+
+-- | A function to yield the package name and version to be built by the given
+-- task.
+taskProvides :: Task -> PackageIdentifier
+taskProvides = taskTypePackageIdentifier . (.taskType)
+
+taskTargetIsMutable :: Task -> IsMutable
+taskTargetIsMutable task =
+  case task.taskType of
+    TTLocalMutable _ -> Mutable
+    TTRemotePackage mutable _ _ -> mutable
+
+installLocationIsMutable :: InstallLocation -> IsMutable
+installLocationIsMutable Snap = Immutable
+installLocationIsMutable Local = Mutable
diff --git a/src/Stack/Types/Platform.hs b/src/Stack/Types/Platform.hs
new file mode 100644
index 0000000000..5e329e886c
--- /dev/null
+++ b/src/Stack/Types/Platform.hs
@@ -0,0 +1,50 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.Platform
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.Platform
+  ( PlatformVariant (..)
+  , HasPlatform (..)
+  , platformVariantSuffix
+  , platformOnlyRelDir
+  ) where
+
+import           Distribution.System ( Platform )
+import           Distribution.Text ( display )
+import           Lens.Micro ( _1, _2 )
+import           Path ( parseRelDir )
+import           Stack.Prelude
+
+-- | A variant of the platform, used to differentiate Docker builds from host
+data PlatformVariant
+  = PlatformVariantNone
+  | PlatformVariant String
+
+-- | Class for environment values which have a Platform
+class HasPlatform env where
+  platformL :: Lens' env Platform
+  platformVariantL :: Lens' env PlatformVariant
+
+instance HasPlatform (Platform, PlatformVariant) where
+  platformL = _1
+  platformVariantL = _2
+
+-- | Render a platform variant to a String suffix.
+platformVariantSuffix :: PlatformVariant -> String
+platformVariantSuffix PlatformVariantNone = ""
+platformVariantSuffix (PlatformVariant v) = "-" ++ v
+
+-- | Relative directory for the platform identifier
+platformOnlyRelDir ::
+     (MonadReader env m, HasPlatform env, MonadThrow m)
+  => m (Path Rel Dir)
+platformOnlyRelDir = do
+  platform <- view platformL
+  platformVariant <- view platformVariantL
+  parseRelDir
+    (  Distribution.Text.display platform
+    ++ platformVariantSuffix platformVariant
+    )
diff --git a/src/Stack/Types/Project.hs b/src/Stack/Types/Project.hs
new file mode 100644
index 0000000000..efce6e53b5
--- /dev/null
+++ b/src/Stack/Types/Project.hs
@@ -0,0 +1,67 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Types.Project
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.Project
+  ( Project (..)
+  ) where
+
+import           Data.Aeson.Types ( ToJSON (..), (.=), object )
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import           Stack.Prelude
+import           Stack.Types.Curator ( Curator )
+
+-- | A project is a collection of packages. We can have multiple stack.yaml
+-- files, but only one of them may contain project information.
+data Project = Project
+  { userMsg :: !(Maybe String)
+    -- ^ A warning message to display to the user when the auto generated
+    -- config may have issues.
+  , packages :: ![RelFilePath]
+    -- ^ Packages which are actually part of the project (as opposed
+    -- to dependencies).
+  , extraDeps :: ![RawPackageLocation]
+    -- ^ Dependencies defined within the stack.yaml file, to be applied on top
+    -- of the snapshot.
+  , flagsByPkg :: !(Map PackageName (Map FlagName Bool))
+    -- ^ Flags to be applied on top of the snapshot flags.
+  , snapshot :: !RawSnapshotLocation
+    -- ^ How we resolve which @Snapshot@ to use
+  , compiler :: !(Maybe WantedCompiler)
+    -- ^ Override the compiler in 'snapshot'
+  , extraPackageDBs :: ![FilePath]
+  , curator :: !(Maybe Curator)
+    -- ^ Extra configuration intended exclusively for usage by the curator tool.
+    -- In other words, this is /not/ part of the documented and exposed Stack
+    -- API. SUBJECT TO CHANGE.
+  , dropPackages :: !(Set PackageName)
+    -- ^ Packages to drop from the 'snapshot'.
+  }
+  deriving Show
+
+instance ToJSON Project where
+  -- Expanding the constructor fully to ensure we don't miss any fields.
+  toJSON project = object $ concat
+    [ maybe [] (\cv -> ["compiler" .= cv]) project.compiler
+    , maybe [] (\msg -> ["user-message" .= msg]) project.userMsg
+    , [ "extra-package-dbs" .= project.extraPackageDBs
+      | not (null project.extraPackageDBs)
+      ]
+    , [ "extra-deps" .= project.extraDeps | not (null project.extraDeps) ]
+    , [ "flags" .= fmap toCabalStringMap (toCabalStringMap project.flagsByPkg)
+      | not (Map.null project.flagsByPkg)
+      ]
+    , ["packages" .= project.packages]
+    , ["snapshot" .= project.snapshot]
+    , maybe [] (\c -> ["curator" .= c]) project.curator
+    , [ "drop-packages" .= Set.map CabalString project.dropPackages
+      | not (Set.null project.dropPackages)
+      ]
+    ]
diff --git a/src/Stack/Types/ProjectAndConfigMonoid.hs b/src/Stack/Types/ProjectAndConfigMonoid.hs
new file mode 100644
index 0000000000..31eecd334d
--- /dev/null
+++ b/src/Stack/Types/ProjectAndConfigMonoid.hs
@@ -0,0 +1,65 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.ProjectAndConfigMonoid
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ProjectAndConfigMonoid
+  ( ProjectAndConfigMonoid (..)
+  , parseProjectAndConfigMonoid
+  ) where
+
+import           Data.Aeson.Types ( Value )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings, (...:), (..:?), (..!=), jsonSubWarnings
+                   , jsonSubWarningsT, jsonSubWarningsTT, withObjectWarnings
+                   )
+import qualified Data.Set as Set
+import qualified Data.Yaml as Yaml
+import           Stack.Prelude
+import           Stack.Types.ConfigMonoid
+                   ( ConfigMonoid, parseConfigMonoidObject )
+import           Stack.Types.Project ( Project (..) )
+
+data ProjectAndConfigMonoid
+  = ProjectAndConfigMonoid !Project !ConfigMonoid
+
+parseProjectAndConfigMonoid ::
+     Path Abs Dir
+  -> Value
+  -> Yaml.Parser (WithJSONWarnings (IO ProjectAndConfigMonoid))
+parseProjectAndConfigMonoid rootDir =
+  withObjectWarnings "ProjectAndConfigMonoid" $ \o -> do
+    packages <- o ..:? "packages" ..!= [RelFilePath "."]
+    deps <- jsonSubWarningsTT (o ..:? "extra-deps") ..!= []
+    flags' <- o ..:? "flags" ..!= mempty
+    let flagsByPkg = unCabalStringMap <$> unCabalStringMap
+                (flags' :: Map (CabalString PackageName) (Map (CabalString FlagName) Bool))
+
+    snapshot' <- jsonSubWarnings $ o ...: ["snapshot", "resolver"]
+    compiler <- o ..:? "compiler"
+    userMsg <- o ..:? "user-message"
+    config <- parseConfigMonoidObject rootDir o
+    extraPackageDBs <- o ..:? "extra-package-dbs" ..!= []
+    curator <- jsonSubWarningsT (o ..:? "curator")
+    drops <- o ..:? "drop-packages" ..!= mempty
+    let dropPackages = Set.map unCabalString drops
+    pure $ do
+      deps' <- mapM (resolvePaths (Just rootDir)) deps
+      let extraDeps =
+            concatMap toList (deps' :: [NonEmpty RawPackageLocation])
+      snapshot <- resolvePaths (Just rootDir) snapshot'
+      let project = Project
+            { userMsg
+            , snapshot
+            , compiler -- FIXME make sure snapshot' isn't SLCompiler
+            , extraPackageDBs
+            , packages
+            , extraDeps
+            , flagsByPkg
+            , curator
+            , dropPackages
+            }
+      pure $ ProjectAndConfigMonoid project config
diff --git a/src/Stack/Types/ProjectConfig.hs b/src/Stack/Types/ProjectConfig.hs
new file mode 100644
index 0000000000..60e38093dc
--- /dev/null
+++ b/src/Stack/Types/ProjectConfig.hs
@@ -0,0 +1,33 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.ProjectConfig
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.ProjectConfig
+  ( ProjectConfig (..)
+  , isPCGlobalProject
+  ) where
+
+import           Stack.Prelude
+
+-- | Project configuration information. Not every run of Stack has a
+-- true local project; see constructors below.
+data ProjectConfig a
+  = PCProject a
+    -- ^ Normal run: we want a project, and have one. This comes from
+    -- either 'Stack.Types.StackYamlLoc.SYLDefault' or
+    -- 'Stack.Types.StackYamlLoc.SYLOverride'.
+  | PCGlobalProject
+    -- ^ No project was found when using 'Stack.Types.StackYamlLoc.SYLDefault'.
+    -- Instead, use the implicit global.
+  | PCNoProject ![RawPackageLocationImmutable]
+    -- ^ Use a no project run. This comes from
+    -- 'Stack.Types.StackYamlLoc.SYLNoProject'.
+
+-- | Yields 'True' only if the project configuration information is for the
+-- implicit global project.
+isPCGlobalProject :: ProjectConfig a -> Bool
+isPCGlobalProject PCGlobalProject = True
+isPCGlobalProject _ = False
diff --git a/src/Stack/Types/PvpBounds.hs b/src/Stack/Types/PvpBounds.hs
new file mode 100644
index 0000000000..473de3abf2
--- /dev/null
+++ b/src/Stack/Types/PvpBounds.hs
@@ -0,0 +1,62 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.PvpBounds
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.PvpBounds
+  ( PvpBounds (..)
+  , PvpBoundsType (..)
+  , pvpBoundsText
+  , parsePvpBounds
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), ToJSON (..), withText )
+import qualified Data.Map as Map
+import qualified Data.Text as T
+import           Stack.Prelude
+
+-- | How PVP bounds should be added to .cabal files
+data PvpBoundsType
+  = PvpBoundsNone
+  | PvpBoundsUpper
+  | PvpBoundsLower
+  | PvpBoundsBoth
+  deriving (Bounded, Enum, Eq, Ord, Read, Show)
+
+data PvpBounds = PvpBounds
+  { pbType :: !PvpBoundsType
+  , pbAsRevision :: !Bool
+  }
+  deriving (Eq, Ord, Read, Show)
+
+pvpBoundsText :: PvpBoundsType -> Text
+pvpBoundsText PvpBoundsNone = "none"
+pvpBoundsText PvpBoundsUpper = "upper"
+pvpBoundsText PvpBoundsLower = "lower"
+pvpBoundsText PvpBoundsBoth = "both"
+
+parsePvpBounds :: Text -> Either String PvpBounds
+parsePvpBounds t = maybe err Right $ do
+  (t', asRevision) <-
+    case T.break (== '-') t of
+      (x, "") -> Just (x, False)
+      (x, "-revision") -> Just (x, True)
+      _ -> Nothing
+  x <- Map.lookup t' m
+  Just PvpBounds
+    { pbType = x
+    , pbAsRevision = asRevision
+    }
+ where
+  m = Map.fromList $ map (pvpBoundsText &&& id) [minBound..maxBound]
+  err = Left $ "Invalid PVP bounds: " ++ T.unpack t
+
+instance ToJSON PvpBounds where
+  toJSON (PvpBounds typ asRevision) =
+    toJSON (pvpBoundsText typ <> (if asRevision then "-revision" else ""))
+
+instance FromJSON PvpBounds where
+  parseJSON = withText "PvpBounds" (either fail pure . parsePvpBounds)
diff --git a/src/Stack/Types/Resolver.hs b/src/Stack/Types/Resolver.hs
deleted file mode 100644
index 7402c9475b..0000000000
--- a/src/Stack/Types/Resolver.hs
+++ /dev/null
@@ -1,105 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE ConstraintKinds      #-}
-{-# LANGUAGE DataKinds            #-}
-{-# LANGUAGE DeriveDataTypeable   #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE GADTs                #-}
-{-# LANGUAGE OverloadedStrings    #-}
-{-# LANGUAGE ScopedTypeVariables  #-}
-{-# LANGUAGE TypeFamilies         #-}
-{-# LANGUAGE UndecidableInstances #-}
-
-module Stack.Types.Resolver
-  (AbstractResolver(..)
-  ,readAbstractResolver
-  ,Snapshots (..)
-  ) where
-
-import           Pantry.Internal.AesonExtended
-                 (FromJSON, parseJSON,
-                  withObject, (.:), withText)
-import qualified Data.Aeson.Key as Key
-import qualified Data.Aeson.KeyMap as KeyMap
-import qualified Data.IntMap.Strict as IntMap
-import qualified Data.Text as T
-import           Data.Text.Read (decimal)
-import           Data.Time (Day)
-import           Options.Applicative (ReadM)
-import qualified Options.Applicative.Types as OA
-import           Stack.Prelude
-
--- | Either an actual resolver value, or an abstract description of one (e.g.,
--- latest nightly).
-data AbstractResolver
-    = ARLatestNightly
-    | ARLatestLTS
-    | ARLatestLTSMajor !Int
-    | ARResolver !RawSnapshotLocation
-    | ARGlobal
-
-instance Show AbstractResolver where
-  show = T.unpack . utf8BuilderToText . display
-
-instance Display AbstractResolver where
-  display ARLatestNightly = "nightly"
-  display ARLatestLTS = "lts"
-  display (ARLatestLTSMajor x) = "lts-" <> display x
-  display (ARResolver usl) = display usl
-  display ARGlobal = "global"
-
-readAbstractResolver :: ReadM (Unresolved AbstractResolver)
-readAbstractResolver = do
-    s <- OA.readerAsk
-    case s of
-        "global" -> pure $ pure ARGlobal
-        "nightly" -> pure $ pure ARLatestNightly
-        "lts" -> pure $ pure ARLatestLTS
-        'l':'t':'s':'-':x | Right (x', "") <- decimal $ T.pack x ->
-            pure $ pure $ ARLatestLTSMajor x'
-        _ -> pure $ ARResolver <$> parseRawSnapshotLocation (T.pack s)
-
-data BuildPlanTypesException
-    = ParseResolverException !Text
-    | FilepathInDownloadedSnapshot !Text
-    deriving Typeable
-instance Exception BuildPlanTypesException
-instance Show BuildPlanTypesException where
-    show (ParseResolverException t) = concat
-        [ "Invalid resolver value: "
-        , T.unpack t
-        , ". Possible valid values include lts-2.12, nightly-YYYY-MM-DD, ghc-7.10.2, and ghcjs-0.1.0_ghc-7.10.2. "
-        , "See https://www.stackage.org/snapshots for a complete list."
-        ]
-    show (FilepathInDownloadedSnapshot url) = unlines
-        [ "Downloaded snapshot specified a 'resolver: { location: filepath }' "
-        , "field, but filepaths are not allowed in downloaded snapshots.\n"
-        , "Filepath specified: " ++ T.unpack url
-        ]
-
--- | Most recent Nightly and newest LTS version per major release.
-data Snapshots = Snapshots
-    { snapshotsNightly :: !Day
-    , snapshotsLts     :: !(IntMap Int)
-    }
-    deriving Show
-instance FromJSON Snapshots where
-    parseJSON = withObject "Snapshots" $ \o -> Snapshots
-        <$> (o .: "nightly" >>= parseNightly)
-        <*> fmap IntMap.unions (mapM (parseLTS . snd)
-                $ filter (isLTS . Key.toText . fst)
-                $ KeyMap.toList o)
-      where
-        parseNightly t =
-            case parseSnapName t of
-                Left e -> fail $ show e
-                Right (LTS _ _) -> fail "Unexpected LTS value"
-                Right (Nightly d) -> pure d
-
-        isLTS = ("lts-" `T.isPrefixOf`)
-
-        parseLTS = withText "LTS" $ \t ->
-            case parseSnapName t of
-                Left e -> fail $ show e
-                Right (LTS x y) -> pure $ IntMap.singleton x y
-                Right (Nightly _) -> fail "Unexpected nightly value"
diff --git a/src/Stack/Types/Runner.hs b/src/Stack/Types/Runner.hs
new file mode 100644
index 0000000000..f4759221fb
--- /dev/null
+++ b/src/Stack/Types/Runner.hs
@@ -0,0 +1,118 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+
+{-|
+Module      : Stack.Types.Runner
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.Runner
+  ( Runner (..)
+  , HasRunner (..)
+  , HasDockerEntrypointMVar (..)
+  , globalOptsL
+  , stackYamlLocL
+  , lockFileBehaviorL
+  , terminalL
+  , reExecL
+  , rslInLogL
+  , progNameL
+  , mExecutablePathL
+  , viewExecutablePath
+  ) where
+
+import           RIO.Process ( HasProcessContext (..), ProcessContext )
+import           Stack.Prelude hiding ( stylesUpdate )
+import           Stack.Types.Config.Exception ( ConfigPrettyException (..) )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.LockFileBehavior ( LockFileBehavior )
+import           Stack.Types.StackYamlLoc ( StackYamlLoc )
+
+-- | The base environment that almost everything in Stack runs in, based off of
+-- parsing command line options in t'GlobalOpts'. Provides logging, process
+-- execution, and the MVar used to ensure that the Docker entrypoint is
+-- performed exactly once.
+data Runner = Runner
+  { globalOpts           :: !GlobalOpts
+  , useColor             :: !Bool
+  , logFunc              :: !LogFunc
+  , termWidth            :: !Int
+  , processContext       :: !ProcessContext
+  , dockerEntrypointMVar :: !(MVar Bool)
+  }
+
+instance HasLogFunc Runner where
+  logFuncL = lens (.logFunc) (\x y -> x { logFunc = y })
+
+instance HasProcessContext Runner where
+  processContextL =
+    lens (.processContext) (\x y -> x { processContext = y })
+
+instance HasRunner Runner where
+  runnerL = id
+
+instance HasStylesUpdate Runner where
+  stylesUpdateL :: Lens' Runner StylesUpdate
+  stylesUpdateL = globalOptsL . lens
+    (.stylesUpdate)
+    (\x y -> x { stylesUpdate = y })
+
+instance HasTerm Runner where
+  useColorL = lens (.useColor) (\x y -> x { useColor = y })
+  termWidthL = lens (.termWidth) (\x y -> x { termWidth  = y })
+
+instance HasDockerEntrypointMVar Runner where
+  dockerEntrypointMVarL =
+    lens (.dockerEntrypointMVar) (\x y -> x { dockerEntrypointMVar = y })
+
+-- | Class for environment values which have a t'Runner'.
+class (HasProcessContext env, HasLogFunc env) => HasRunner env where
+  runnerL :: Lens' env Runner
+
+-- | Class for environment values which have a Docker entrypoint 'MVar'.
+class HasRunner env => HasDockerEntrypointMVar env where
+  dockerEntrypointMVarL :: Lens' env (MVar Bool)
+
+-- | See the @stackYaml@ field of the v'GlobalOpts' data constructor.
+stackYamlLocL :: HasRunner env => Lens' env StackYamlLoc
+stackYamlLocL =
+  globalOptsL . lens (.stackYaml) (\x y -> x { stackYaml = y })
+
+-- | See the @lockFileBehavior@ field of the v'GlobalOpts' data constructor.
+lockFileBehaviorL :: HasRunner env => SimpleGetter env LockFileBehavior
+lockFileBehaviorL = globalOptsL . to (.lockFileBehavior)
+
+-- | See the t'GlobalOpts' type.
+globalOptsL :: HasRunner env => Lens' env GlobalOpts
+globalOptsL = runnerL . lens (.globalOpts) (\x y -> x { globalOpts = y })
+
+-- | See the @terminal@ field of the v'GlobalOpts' data constructor.
+terminalL :: HasRunner env => Lens' env Bool
+terminalL =
+  globalOptsL . lens (.terminal) (\x y -> x { terminal = y })
+
+-- | See the @reExecVersion@ field of the v'GlobalOpts' data constructor.
+reExecL :: HasRunner env => SimpleGetter env Bool
+reExecL = globalOptsL . to (isJust . (.reExecVersion))
+
+-- | See the @rslInLog@ field of the v'GlobalOpts' data constructor.
+rslInLogL :: HasRunner env => SimpleGetter env Bool
+rslInLogL = globalOptsL . to (.rslInLog)
+
+-- | See the @progNameL@ field of the v'GlobalOpts' data constructor.
+progNameL :: HasRunner env => SimpleGetter env String
+progNameL = globalOptsL . to (.progName)
+
+-- | See the @mExecutablePath@ field of the v'GlobalOpts' data constructor.
+mExecutablePathL :: HasRunner env => SimpleGetter env (Maybe (Path Abs File))
+mExecutablePathL = globalOptsL . to (.mExecutablePath)
+
+-- | Yield the path to the current Stack executable, if the operating system
+-- provides a reliable way to determine it. Otherwise throw
+-- 'Stack.Types.Config.Exception.NoExecutablePath'.
+viewExecutablePath :: HasRunner env => RIO env (Path Abs File)
+viewExecutablePath = view mExecutablePathL >>= \case
+    Nothing -> view progNameL >>= prettyThrowM . NoExecutablePath
+    Just executablePath -> pure executablePath
diff --git a/src/Stack/Types/SCM.hs b/src/Stack/Types/SCM.hs
new file mode 100644
index 0000000000..d1be2175fe
--- /dev/null
+++ b/src/Stack/Types/SCM.hs
@@ -0,0 +1,29 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.SCM
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.SCM
+  ( SCM (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..), ToJSON (..) )
+import           Stack.Prelude
+
+-- | A software control system.
+data SCM
+  = Git
+  deriving Show
+
+instance FromJSON SCM where
+  parseJSON v = do
+    s <- parseJSON v
+    case s of
+      "git" -> pure Git
+      _ -> fail ("Unknown or unsupported SCM: " <> s)
+
+instance ToJSON SCM where
+  toJSON Git = toJSON ("git" :: Text)
diff --git a/src/Stack/Types/SDistOpts.hs b/src/Stack/Types/SDistOpts.hs
new file mode 100644
index 0000000000..dc2dbfc823
--- /dev/null
+++ b/src/Stack/Types/SDistOpts.hs
@@ -0,0 +1,31 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.SDistOpts
+Description : Types related to Stack's @sdist@ command.
+License     : BSD-3-Clause
+
+Types related to Stack's @sdist@ command.
+-}
+
+module Stack.Types.SDistOpts
+  ( SDistOpts (..)
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.PvpBounds ( PvpBounds )
+
+-- | Type representing command line options for @stack sdist@ command.
+data SDistOpts = SDistOpts
+  { dirsToWorkWith :: [String]
+    -- ^ Directories to package
+  , pvpBounds :: Maybe PvpBounds
+    -- ^ PVP Bounds overrides
+  , ignoreCheck :: Bool
+    -- ^ Whether to ignore check of the package for common errors
+  , buildTarball :: Bool
+    -- ^ Whether to build the tarball
+  , tarPath :: Maybe FilePath
+    -- ^ Where to copy the tarball
+  }
diff --git a/src/Stack/Types/SetupInfo.hs b/src/Stack/Types/SetupInfo.hs
new file mode 100644
index 0000000000..906d0fef45
--- /dev/null
+++ b/src/Stack/Types/SetupInfo.hs
@@ -0,0 +1,74 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ViewPatterns        #-}
+
+{-|
+Module      : Stack.Types.SetupInfo
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.SetupInfo
+  ( SetupInfo (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..) )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings, (..:?), (..!=), jsonSubWarningsT
+                   , jsonSubWarningsTT, withObjectWarnings
+                   )
+import qualified Data.Map as Map
+import           Stack.Prelude
+import           Stack.Types.DownloadInfo ( DownloadInfo )
+import           Stack.Types.VersionedDownloadInfo ( VersionedDownloadInfo )
+import           Stack.Types.GHCDownloadInfo ( GHCDownloadInfo )
+
+data SetupInfo = SetupInfo
+  { sevenzExe :: Maybe DownloadInfo
+  , sevenzDll :: Maybe DownloadInfo
+  , msys2 :: Map Text VersionedDownloadInfo
+  , ghcByVersion :: Map Text (Map Version GHCDownloadInfo)
+  , stackByVersion :: Map Text (Map Version DownloadInfo)
+  }
+  deriving Show
+
+instance FromJSON (WithJSONWarnings SetupInfo) where
+  parseJSON = withObjectWarnings "SetupInfo" $ \o -> do
+    sevenzExe <- jsonSubWarningsT (o ..:? "sevenzexe-info")
+    sevenzDll <- jsonSubWarningsT (o ..:? "sevenzdll-info")
+    msys2 <- jsonSubWarningsT (o ..:? "msys2" ..!= mempty)
+    (fmap unCabalStringMap -> ghcByVersion) <-
+      jsonSubWarningsTT (o ..:? "ghc" ..!= mempty)
+    (fmap unCabalStringMap -> stackByVersion) <-
+      jsonSubWarningsTT (o ..:? "stack" ..!= mempty)
+    pure SetupInfo
+      { sevenzExe
+      , sevenzDll
+      , msys2
+      , ghcByVersion
+      , stackByVersion
+      }
+
+-- | For the @siGHCs@ field maps are deeply merged. For all fields the values
+-- from the first @SetupInfo@ win.
+instance Semigroup SetupInfo where
+  l <> r =
+    SetupInfo
+      { sevenzExe = l.sevenzExe <|> r.sevenzExe
+      , sevenzDll = l.sevenzDll <|> r.sevenzDll
+      , msys2 = l.msys2 <> r.msys2
+      , ghcByVersion = Map.unionWith (<>) l.ghcByVersion r.ghcByVersion
+      , stackByVersion = Map.unionWith (<>) l.stackByVersion r.stackByVersion
+      }
+
+instance Monoid SetupInfo where
+  mempty =
+    SetupInfo
+      { sevenzExe = Nothing
+      , sevenzDll = Nothing
+      , msys2 = Map.empty
+      , ghcByVersion = Map.empty
+      , stackByVersion = Map.empty
+      }
+  mappend = (<>)
diff --git a/src/Stack/Types/SetupOpts.hs b/src/Stack/Types/SetupOpts.hs
new file mode 100644
index 0000000000..37a40237f7
--- /dev/null
+++ b/src/Stack/Types/SetupOpts.hs
@@ -0,0 +1,25 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.SetupOpts
+Description : Types related to Stack's @setup@ command.
+License     : BSD-3-Clause
+
+Types related to Stack's @setup@ command.
+-}
+
+module Stack.Types.SetupOpts
+  ( SetupCmdOpts (..)
+  ) where
+
+import           Stack.Prelude
+
+-- | Type representing command line options for the @stack setup@ command.
+data SetupCmdOpts = SetupCmdOpts
+  { compilerVersion :: !(Maybe WantedCompiler)
+  , forceReinstall  :: !Bool
+  , ghcBindistUrl   :: !(Maybe String)
+  , ghcjsBootOpts   :: ![String]
+  , ghcjsBootClean  :: !Bool
+  }
diff --git a/src/Stack/Types/Snapshot.hs b/src/Stack/Types/Snapshot.hs
new file mode 100644
index 0000000000..e16943338a
--- /dev/null
+++ b/src/Stack/Types/Snapshot.hs
@@ -0,0 +1,115 @@
+{-# LANGUAGE NoImplicitPrelude    #-}
+{-# LANGUAGE NoFieldSelectors     #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# LANGUAGE TypeFamilies         #-}
+{-# LANGUAGE UndecidableInstances #-}
+
+{-|
+Module      : Stack.Types.Snapshot
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.Snapshot
+  ( AbstractSnapshot (..)
+  , readAbstractSnapshot
+  , Snapshots (..)
+  ) where
+
+import qualified Data.Aeson.Key as Key
+import qualified Data.Aeson.KeyMap as KeyMap
+import           Data.Aeson.Types
+                   ( FromJSON, parseJSON, withObject, withText )
+import           Data.Aeson.WarningParser ( (.:) )
+import qualified Data.IntMap.Strict as IntMap
+import qualified Data.Text as T
+import           Data.Text.Read ( decimal )
+import           Data.Time ( Day )
+import           Options.Applicative ( ReadM )
+import qualified Options.Applicative.Types as OA
+import           Stack.Prelude
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Types.Snapshot" module.
+data TypesSnapshotException
+  = ParseSnapshotException !Text
+  | FilepathInDownloadedSnapshot !Text
+  deriving Show
+
+instance Exception TypesSnapshotException where
+  displayException (ParseSnapshotException t) = concat
+    [ "Error: [S-8787]\n"
+    , "Invalid snapshot value: "
+    , T.unpack t
+    , ". Possible valid values include lts-2.12, nightly-YYYY-MM-DD, \
+      \ghc-7.10.2, and ghcjs-0.1.0_ghc-7.10.2. See \
+      \https://www.stackage.org/snapshots for a complete list."
+    ]
+  displayException (FilepathInDownloadedSnapshot url) = unlines
+    [ "Error: [S-4865]"
+    , "Downloaded snapshot specified 'snapshot: { location: filepath }', "
+    , "but filepaths are not allowed in downloaded snapshots.\n"
+    , "Filepath specified: " ++ T.unpack url
+    ]
+
+-- | Either an actual snapshot value, or an abstract description of one (e.g.,
+-- latest nightly).
+data AbstractSnapshot
+  = ASLatestNightly
+  | ASLatestLTS
+  | ASLatestLTSMajor !Int
+  | ASSnapshot !RawSnapshotLocation
+  | ASGlobal
+
+instance Show AbstractSnapshot where
+  show = T.unpack . utf8BuilderToText . display
+
+instance Display AbstractSnapshot where
+  display ASLatestNightly = "nightly"
+  display ASLatestLTS = "lts"
+  display (ASLatestLTSMajor x) = "lts-" <> display x
+  display (ASSnapshot usl) = display usl
+  display ASGlobal = "global"
+
+instance FromJSON (Unresolved AbstractSnapshot) where
+  parseJSON = withText "Unresolved AbstractSnapshot" $ \t ->
+    pure $ parseAbstractSnapshot $ T.unpack t
+
+readAbstractSnapshot :: ReadM (Unresolved AbstractSnapshot)
+readAbstractSnapshot = parseAbstractSnapshot <$> OA.readerAsk
+
+parseAbstractSnapshot :: String -> Unresolved AbstractSnapshot
+parseAbstractSnapshot s = case s of
+  "global" -> pure ASGlobal
+  "nightly" -> pure ASLatestNightly
+  "lts" -> pure ASLatestLTS
+  'l':'t':'s':'-':x | Right (x', "") <- decimal $ T.pack x ->
+      pure $ ASLatestLTSMajor x'
+  _ ->ASSnapshot <$> parseRawSnapshotLocation (T.pack s)
+
+-- | Most recent Nightly and newest LTS version per major release.
+data Snapshots = Snapshots
+  { nightly :: !Day
+  , lts     :: !(IntMap Int)
+  }
+  deriving Show
+
+instance FromJSON Snapshots where
+  parseJSON = withObject "Snapshots" $ \o -> Snapshots
+    <$> (o .: "nightly" >>= parseNightly)
+    <*> fmap IntMap.unions (mapM (parseLTS . snd)
+          $ filter (isLTS . Key.toText . fst)
+          $ KeyMap.toList o)
+   where
+    parseNightly t =
+      case parseSnapName t of
+        Left e -> fail $ displayException e
+        Right (LTS _ _) -> fail "Unexpected LTS value"
+        Right (Nightly d) -> pure d
+
+    isLTS = ("lts-" `T.isPrefixOf`)
+
+    parseLTS = withText "LTS" $ \t ->
+      case parseSnapName t of
+        Left e -> fail $ displayException e
+        Right (LTS x y) -> pure $ IntMap.singleton x y
+        Right (Nightly _) -> fail "Unexpected nightly value"
diff --git a/src/Stack/Types/SourceMap.hs b/src/Stack/Types/SourceMap.hs
index 0f81a86027..699319ccfc 100644
--- a/src/Stack/Types/SourceMap.hs
+++ b/src/Stack/Types/SourceMap.hs
@@ -1,11 +1,19 @@
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+
+{-|
+Module      : Stack.Types.SourceMap
+License     : BSD-3-Clause
+
+A source map maps a package name to how it should be built, including source
+code, flags and options. This module exports types used in various stages of
+source map construction. See @build_overview.md@ for details on these stages.
+-}
 
--- | A sourcemap maps a package name to how it should be built,
--- including source code, flags, options, etc. This module contains
--- various stages of source map construction. See the
--- @build_overview.md@ doc for details on these stages.
 module Stack.Types.SourceMap
-  ( -- * Different source map types
+  ( -- * Source map types
     SMWanted (..)
   , SMActual (..)
   , Target (..)
@@ -16,6 +24,11 @@ module Stack.Types.SourceMap
   , FromSnapshot (..)
   , DepPackage (..)
   , ProjectPackage (..)
+  , ppComponents
+  , ppComponentsMaybe
+  , ppGPD
+  , ppRoot
+  , ppVersion
   , CommonPackage (..)
   , GlobalPackageVersion (..)
   , GlobalPackage (..)
@@ -24,54 +37,64 @@ module Stack.Types.SourceMap
   , smRelDir
   ) where
 
+import qualified Data.Set as Set
 import qualified Data.Text as T
+import           Distribution.PackageDescription ( GenericPackageDescription )
+import qualified Distribution.PackageDescription as C
 import qualified Pantry.SHA256 as SHA256
-import Path
-import Stack.Prelude
-import Stack.Types.Compiler
-import Stack.Types.NamedComponent
-import Distribution.PackageDescription (GenericPackageDescription)
-
--- | Common settings for both dependency and project package.
+import           Path ( parent, parseRelDir )
+import           Stack.Prelude
+import           Stack.Types.Compiler ( ActualCompiler )
+import           Stack.Types.ComponentUtils ( fromCabalName )
+import           Stack.Types.NamedComponent ( NamedComponent (..) )
+
+-- | Settings common to dependency packages ('Stack.Types.SourceMap.DepPackage')
+-- and project packages ('Stack.Types.SourceMap.ProjectPackage').
 data CommonPackage = CommonPackage
-  { cpGPD :: !(IO GenericPackageDescription)
-  , cpName :: !PackageName
-  , cpFlags :: !(Map FlagName Bool)
-  -- ^ overrides default flags
-  , cpGhcOptions :: ![Text] -- also lets us know if we're doing profiling
-  , cpCabalConfigOpts :: ![Text]
-  , cpHaddocks :: !Bool
+  { gpd :: !(IO GenericPackageDescription)
+  , name :: !PackageName
+  , flags :: !(Map FlagName Bool)
+    -- ^ overrides default flags
+  , ghcOptions :: ![Text]
+    -- also lets us know if we're doing profiling
+  , cabalConfigOpts :: ![Text]
+  , buildHaddocks :: !Bool
+    -- ^ Should Haddock documentation be built for this package?
   }
 
--- | Flag showing if package comes from a snapshot
--- needed to ignore dependency bounds between such packages
+-- | Flag showing if package comes from a snapshot. Used to ignore dependency
+-- bounds between such packages.
 data FromSnapshot
-    = FromSnapshot
-    | NotFromSnapshot
-    deriving (Show)
+  = FromSnapshot
+  | NotFromSnapshot
+  deriving Show
 
 -- | A view of a dependency package, specified in stack.yaml
 data DepPackage = DepPackage
-  { dpCommon :: !CommonPackage
-  , dpLocation :: !PackageLocation
-  , dpHidden :: !Bool
-  -- ^ Should the package be hidden after registering?
-  -- Affects the script interpreter's module name import parser.
-  , dpFromSnapshot :: !FromSnapshot
-  -- ^ Needed to ignore bounds between snapshot packages
-  -- See https://github.com/commercialhaskell/stackage/issues/3185
+  { depCommon :: !CommonPackage
+  , location :: !PackageLocation
+  , hidden :: !Bool
+    -- ^ Should the package be hidden after registering? Affects the script
+    -- interpreter's module name import parser.
+  , fromSnapshot :: !FromSnapshot
+    -- ^ Needed to ignore bounds between snapshot packages
+    -- See https://github.com/commercialhaskell/stackage/issues/3185
   }
 
--- | A view of a project package needed for resolving components
+-- | A view of a project package. Used to resolve components.
 data ProjectPackage = ProjectPackage
-  { ppCommon :: !CommonPackage
-  , ppCabalFP    :: !(Path Abs File)
-  , ppResolvedDir :: !(ResolvedPath Dir)
+  { projectCommon :: !CommonPackage
+  , cabalFP :: !(Path Abs File)
+  , resolvedDir :: !(ResolvedPath Dir)
   }
 
--- | A view of a package installed in the global package database also
--- could include marker for a replaced global package (could be replaced
--- because of a replaced dependency)
+-- | A type representing versions of packages in the global package database.
+newtype GlobalPackageVersion
+  = GlobalPackageVersion Version
+
+-- | A view of a package installed in the global package database or a marker
+-- for a replaced global package. A global package could be replaced because of
+-- a replaced dependency.
 data GlobalPackage
   = GlobalPackage !Version
   | ReplacedGlobalPackage ![PackageName]
@@ -81,80 +104,117 @@ isReplacedGlobal :: GlobalPackage -> Bool
 isReplacedGlobal (ReplacedGlobalPackage _) = True
 isReplacedGlobal (GlobalPackage _) = False
 
--- | A source map with information on the wanted (but not actual)
--- compiler. This is derived by parsing the @stack.yaml@ file for
--- @packages@, @extra-deps@, their configuration (e.g., flags and
--- options), and parsing the snapshot it refers to. It does not
--- include global packages or any information from the command line.
+-- | A type representing how a package is intended to be built.
+data Target
+  = TargetAll !PackageType
+    -- ^ Build all of the default components.
+  | TargetComps !(Set NamedComponent)
+    -- ^ Only build specific components
+
+-- | A type representing types of packages.
+data PackageType
+  = PTProject
+    -- ^ The package is a project package.
+  | PTDependency
+    -- ^ The package is other than a project package and a dependency.
+  deriving (Eq, Show)
+
+-- | A source map with information on the wanted (but not actual) compiler. This
+-- is derived by parsing the @stack.yaml@ file for @packages@, @extra-deps@,
+-- their configuration (e.g., flags and options), and parsing the snapshot it
+-- refers to. It does not include global packages or any information from the
+-- command line.
 --
--- Invariant: a @PackageName@ appears in either 'smwProject' or
--- 'smwDeps', but not both.
+-- Invariant: a @PackageName@ appears in either 'SMWanted.project' or
+-- 'SMWanted.deps', but not both.
 data SMWanted = SMWanted
-  { smwCompiler :: !WantedCompiler
-  , smwProject :: !(Map PackageName ProjectPackage)
-  , smwDeps :: !(Map PackageName DepPackage)
-  , smwSnapshotLocation :: !RawSnapshotLocation
-  -- ^ Where this snapshot is loaded from.
+  { compiler :: !WantedCompiler
+  , project :: !(Map PackageName ProjectPackage)
+  , deps :: !(Map PackageName DepPackage)
+  , snapshotLocation :: !RawSnapshotLocation
+    -- ^ Where this snapshot is loaded from.
   }
 
--- | Adds in actual compiler information to 'SMWanted', in particular
--- the contents of the global package database.
+-- | A source map with information on the actual compiler, including the
+-- contents of its global package database. It does not include any information
+-- from the command line.
 --
 -- Invariant: a @PackageName@ appears in only one of the @Map@s.
 data SMActual global = SMActual
-  { smaCompiler :: !ActualCompiler
-  , smaProject :: !(Map PackageName ProjectPackage)
-  , smaDeps :: !(Map PackageName DepPackage)
-  , smaGlobal :: !(Map PackageName global)
+  { compiler :: !ActualCompiler
+  , project :: !(Map PackageName ProjectPackage)
+  , deps :: !(Map PackageName DepPackage)
+  , globals :: !(Map PackageName global)
   }
 
-newtype GlobalPackageVersion = GlobalPackageVersion Version
-
--- | How a package is intended to be built
-data Target
-  = TargetAll !PackageType
-  -- ^ Build all of the default components.
-  | TargetComps !(Set NamedComponent)
-  -- ^ Only build specific components
-
-data PackageType = PTProject | PTDependency
-  deriving (Eq, Show)
-
--- | Builds on an 'SMActual' by resolving the targets specified on the
--- command line, potentially adding in new dependency packages in the
--- process.
+-- | Builds on an t'SMActual' by resolving the targets specified on the command
+-- line, potentially adding in new dependency packages in the process.
 data SMTargets = SMTargets
-  { smtTargets :: !(Map PackageName Target)
-  , smtDeps :: !(Map PackageName DepPackage)
+  { targets :: !(Map PackageName Target)
+  , deps :: !(Map PackageName DepPackage)
   }
 
--- | The final source map, taking an 'SMTargets' and applying all
--- command line flags and GHC options.
+-- | The final source map, taking an t'SMTargets' and applying all command line
+-- flags and GHC options.
+--
+-- One source map value is distinguished from another by a hash of the parts of
+-- the value that are immutable.
 data SourceMap = SourceMap
-  { smTargets :: !SMTargets
-    -- ^ Doesn't need to be included in the hash, does not affect the
-    -- source map.
-  , smCompiler :: !ActualCompiler
-    -- ^ Need to hash the compiler version _and_ its installation
-    -- path.  Ideally there would be some kind of output from GHC
-    -- telling us some unique ID for the compiler itself.
-  , smProject :: !(Map PackageName ProjectPackage)
-    -- ^ Doesn't need to be included in hash, doesn't affect any of
-    -- the packages that get stored in the snapshot database.
-  , smDeps :: !(Map PackageName DepPackage)
-    -- ^ Need to hash all of the immutable dependencies, can ignore
-    -- the mutable dependencies.
-  , smGlobal :: !(Map PackageName GlobalPackage)
-    -- ^ Doesn't actually need to be hashed, implicitly captured by
-    -- smCompiler. Can be broken if someone installs new global
-    -- packages. We can document that as not supported, _or_ we could
-    -- actually include all of this in the hash and make Stack more
-    -- resilient.
+  { targets :: !SMTargets
+    -- ^ Doesn't need to be included in the hash, does not affect the source
+    -- map.
+  , compiler :: !ActualCompiler
+    -- ^ Need to hash the compiler version _and_ its installation path. Ideally
+    -- there would be some kind of output from GHC telling us some unique ID for
+    -- the compiler itself.
+  , project :: !(Map PackageName ProjectPackage)
+    -- ^ Doesn't need to be included in hash, doesn't affect any of the packages
+    -- that get stored in the snapshot database.
+  , deps :: !(Map PackageName DepPackage)
+    -- ^ Need to hash all of the immutable dependencies, can ignore the mutable
+    -- dependencies.
+  , globalPkgs :: !(Map PackageName GlobalPackage)
+    -- ^ Doesn't actually need to be hashed, implicitly captured by smCompiler.
+    -- Can be broken if someone installs new global packages. We can document
+    -- that as not supported, _or_ we could actually include all of this in the
+    -- hash and make Stack more resilient.
   }
 
--- | A unique hash for the immutable portions of a 'SourceMap'.
-newtype SourceMapHash = SourceMapHash SHA256
+-- | A unique hash for the immutable portions of a t'SourceMap'.
+newtype SourceMapHash
+  = SourceMapHash SHA256
 
 -- | Returns relative directory name with source map's hash
 smRelDir :: (MonadThrow m) => SourceMapHash -> m (Path Rel Dir)
 smRelDir (SourceMapHash smh) = parseRelDir $ T.unpack $ SHA256.toHexText smh
+
+ppGPD :: MonadIO m => ProjectPackage -> m GenericPackageDescription
+ppGPD = liftIO . (.projectCommon.gpd)
+
+-- | Root directory for the given t'ProjectPackage'
+ppRoot :: ProjectPackage -> Path Abs Dir
+ppRoot = parent . (.cabalFP)
+
+-- | All components available in the given t'ProjectPackage'
+ppComponents :: MonadIO m => ProjectPackage -> m (Set NamedComponent)
+ppComponents = ppComponentsMaybe Just
+
+ppComponentsMaybe ::
+     MonadIO m
+  => (NamedComponent -> Maybe NamedComponent)
+  -> ProjectPackage
+  -> m (Set NamedComponent)
+ppComponentsMaybe compType pp = do
+  gpd <- ppGPD pp
+  pure $ Set.fromList $ concat
+    [ maybe [] (const $ catMaybes [compType CLib]) (C.condLibrary gpd)
+    , mapMaybe ((compType . CExe . fromCabalName) . fst) (C.condExecutables gpd)
+    , mapMaybe ((compType . CTest . fromCabalName) . fst) (C.condTestSuites gpd)
+    , mapMaybe
+        ((compType . CBench . fromCabalName) . fst)
+        (C.condBenchmarks gpd)
+    ]
+
+-- | Version for the given t'ProjectPackage
+ppVersion :: MonadIO m => ProjectPackage -> m Version
+ppVersion = fmap gpdVersion . ppGPD
diff --git a/src/Stack/Types/StackYamlLoc.hs b/src/Stack/Types/StackYamlLoc.hs
new file mode 100644
index 0000000000..57827bfced
--- /dev/null
+++ b/src/Stack/Types/StackYamlLoc.hs
@@ -0,0 +1,26 @@
+
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.StackYamlLoc
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.StackYamlLoc
+  ( StackYamlLoc (..)
+  ) where
+
+import           Stack.Prelude
+
+-- | Location for the project's stack.yaml file.
+data StackYamlLoc
+  = SYLDefault
+    -- ^ Use the standard parent-directory-checking logic
+  | SYLOverride !(Path Abs File)
+    -- ^ Use a specific stack.yaml file provided
+  | SYLNoProject ![RawPackageLocationImmutable]
+    -- ^ Do not load up a project, just user configuration. Include
+    -- the given extra dependencies with the snapshot.
+  | SYLGlobalProject
+    -- ^ Do not look for a project configuration, and use the implicit global.
+  deriving Show
diff --git a/src/Stack/Types/Storage.hs b/src/Stack/Types/Storage.hs
new file mode 100644
index 0000000000..323b97e587
--- /dev/null
+++ b/src/Stack/Types/Storage.hs
@@ -0,0 +1,78 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.Storage
+Description : Types used by @Stack.Storage@ modules.
+License     : BSD-3-Clause
+
+Types used by @Stack.Storage@ modules.
+-}
+
+module Stack.Types.Storage
+  ( StoragePrettyException (..)
+  , ProjectStorage (..)
+  , UserStorage (..)
+  ) where
+
+import           Pantry.SQLite ( Storage )
+import           Stack.Prelude
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by
+-- modules beginning @Stack.Storage@.
+data StoragePrettyException
+  = StorageMigrationFailure !Text !(Path Abs File) !SomeException
+  deriving Show
+
+instance Pretty StoragePrettyException where
+  pretty (StorageMigrationFailure desc fp ex) =
+    "[S-8835]"
+    <> line
+    <> fillSep
+         [ flow "Stack could not migrate the the database"
+         , style File (fromString $ show desc)
+         , flow "located at"
+         , pretty fp
+         ]
+    <> "."
+    <> blankLine
+    <> flow "While migrating the database, Stack encountered the error:"
+    <> blankLine
+    <> string exMsg
+    <> blankLine
+    <> fillSep
+         [ flow "Please report this as an issue at"
+         , style Url "https://github.com/commercialhaskell/stack/issues"
+         ]
+    <> "."
+    <> blankLine
+    -- See https://github.com/commercialhaskell/stack/issues/5851
+    <> if exMsg == winIOGHCRTSMsg
+         then
+           flow "This error can be caused by a bug that arises if GHC's \
+                \'--io-manager=native' RTS option is set using the GHCRTS \
+                \environment variable. As a workaround try setting the option \
+                \in the project's Cabal file, Stack's configuration file or at \
+                \the command line."
+         else
+           flow "As a workaround you may delete the database. This \
+                \will cause the database to be recreated."
+   where
+    exMsg = displayException ex
+    winIOGHCRTSMsg =
+      "\\\\.\\NUL: hDuplicateTo: illegal operation (handles are incompatible)"
+
+instance Exception StoragePrettyException
+
+-- | Type representing SQL database connections to the user database. This
+-- provides a bit of type safety to ensure we're talking to the right database.
+newtype UserStorage = UserStorage
+  { userStorage :: Storage
+  }
+
+-- | Type representing SQL database connections to the project database for
+-- caches. This provides a bit of type safety to ensure we're talking to the
+-- right database.
+newtype ProjectStorage = ProjectStorage
+  { projectStorage :: Storage
+  }
diff --git a/src/Stack/Types/TemplateName.hs b/src/Stack/Types/TemplateName.hs
index 3e13145f53..df36489ed6 100644
--- a/src/Stack/Types/TemplateName.hs
+++ b/src/Stack/Types/TemplateName.hs
@@ -1,7 +1,13 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
--- | Template name handling.
+{-|
+Module      : Stack.Types.TemplateName
+Description : Template name handling.
+License     : BSD-3-Clause
+
+Template name handling.
+-}
 
 module Stack.Types.TemplateName
   ( TemplateName
@@ -17,92 +23,111 @@ module Stack.Types.TemplateName
   , defaultTemplateName
   ) where
 
-import           Data.Aeson (FromJSON (..), withText)
+import           Data.Aeson ( FromJSON (..), withText )
 import qualified Data.Text as T
-import           Network.HTTP.StackClient (parseRequest)
+import           Network.HTTP.StackClient ( parseRequest )
 import qualified Options.Applicative as O
-import           Path
+import           Path ( parseAbsFile, parseRelFile )
 import           Stack.Prelude
 
+-- | Type representing exceptions thrown by functions exported by the
+-- "Stack.Types.TemplateName" module.
+newtype TypeTemplateNameException
+  = DefaultTemplateNameNotParsedBug String
+  deriving Show
+
+instance Exception TypeTemplateNameException where
+  displayException (DefaultTemplateNameNotParsedBug s) = bugReport "[S-7410]" $
+    "Cannot parse default template name: "
+    ++ s
+
 -- | A template name.
-data TemplateName = TemplateName !Text !TemplatePath
-  deriving (Ord,Eq,Show)
-
-data TemplatePath = AbsPath (Path Abs File)
-                  -- ^ an absolute path on the filesystem
-                  | RelPath String (Path Rel File)
-                  -- ^ a relative path on the filesystem, or relative to
-                  -- the template repository. To avoid path separator conversion
-                  -- on Windows, the raw command-line parameter passed is also
-                  -- given as the first field (possibly with @.hsfiles@ appended).
-                  | UrlPath String
-                  -- ^ a full URL
-                  | RepoPath RepoTemplatePath
+data TemplateName
+  = TemplateName !Text !TemplatePath
+  deriving (Eq, Ord, Show)
+
+data TemplatePath
+  = AbsPath (Path Abs File)
+    -- ^ an absolute path on the filesystem
+  | RelPath String (Path Rel File)
+    -- ^ a relative path on the filesystem, or relative to the template
+    -- repository. To avoid path separator conversion on Windows, the raw
+    -- command-line parameter passed is also given as the first field (possibly
+    -- with @.hsfiles@ appended).
+  | UrlPath String
+    -- ^ a full URL
+  | RepoPath RepoTemplatePath
   deriving (Eq, Ord, Show)
 
 -- | Details for how to access a template from a remote repo.
 data RepoTemplatePath = RepoTemplatePath
-    { rtpService  :: RepoService
-    , rtpUser     :: Text
-    , rtpTemplate :: Text
-    }
-    deriving (Eq, Ord, Show)
+  { service  :: RepoService
+  , user     :: Text
+  , template :: Text
+  }
+  deriving (Eq, Ord, Show)
 
 -- | Services from which templates can be retrieved from a repository.
-data RepoService = GitHub | GitLab | Bitbucket
-    deriving (Eq, Ord, Show)
+data RepoService
+  = GitHub
+  | GitLab
+  | Bitbucket
+  | Codeberg
+  deriving (Eq, Ord, Show)
 
 instance FromJSON TemplateName where
-    parseJSON = withText "TemplateName" $
-        either fail pure . parseTemplateNameFromString . T.unpack
-
--- | An argument which accepts a template name of the format
--- @foo.hsfiles@ or @foo@, ultimately normalized to @foo@.
-templateNameArgument :: O.Mod O.ArgumentFields TemplateName
-                     -> O.Parser TemplateName
+  parseJSON = withText "TemplateName" $
+    either fail pure . parseTemplateNameFromString . T.unpack
+
+-- | An argument which accepts a template name of the format @foo.hsfiles@ or
+-- @foo@, ultimately normalized to @foo@.
+templateNameArgument ::
+     O.Mod O.ArgumentFields TemplateName
+  -> O.Parser TemplateName
 templateNameArgument =
-    O.argument
-        (do string <- O.str
-            either O.readerError pure (parseTemplateNameFromString string))
+  O.argument
+    (do s <- O.str
+        either O.readerError pure (parseTemplateNameFromString s))
 
 -- | An argument which accepts a @key:value@ pair for specifying parameters.
-templateParamArgument :: O.Mod O.OptionFields (Text,Text)
-                      -> O.Parser (Text,Text)
+templateParamArgument ::
+     O.Mod O.OptionFields (Text,Text)
+  -> O.Parser (Text,Text)
 templateParamArgument =
-    O.option
-        (do string <- O.str
-            either O.readerError pure (parsePair string))
-  where
-    parsePair :: String -> Either String (Text, Text)
-    parsePair s =
-        case break (==':') s of
-            (key,':':value@(_:_)) -> Right (T.pack key, T.pack value)
-            _ -> Left ("Expected key:value format for argument: " <> s)
+  O.option
+    (do s <- O.str
+        either O.readerError pure (parsePair s))
+ where
+  parsePair :: String -> Either String (Text, Text)
+  parsePair s =
+    case break (==':') s of
+      (key,':':value@(_:_)) -> Right (T.pack key, T.pack value)
+      _ -> Left ("Expected key:value format for argument: " <> s)
 
 -- | Parse a template name from a string.
 parseTemplateNameFromString :: String -> Either String TemplateName
 parseTemplateNameFromString fname =
-    case T.stripSuffix ".hsfiles" (T.pack fname) of
-        Nothing -> parseValidFile (T.pack fname) (fname <> ".hsfiles") fname
-        Just prefix -> parseValidFile prefix fname fname
-  where
-    parseValidFile prefix hsf orig = maybe (Left expected) Right
-                                           $ asum (validParses prefix hsf orig)
-    validParses prefix hsf orig =
-        -- NOTE: order is important
-        [ TemplateName prefix        . RepoPath <$> parseRepoPath hsf
-        , TemplateName (T.pack orig) . UrlPath <$> (parseRequest orig *> Just orig)
-        , TemplateName prefix        . AbsPath <$> parseAbsFile hsf
-        , TemplateName prefix        . RelPath hsf <$> parseRelFile hsf
-        ]
-    expected = "Expected a template like: foo or foo.hsfiles or\
-               \ https://example.com/foo.hsfiles or github:user/foo"
+  case T.stripSuffix ".hsfiles" (T.pack fname) of
+    Nothing -> parseValidFile (T.pack fname) (fname <> ".hsfiles") fname
+    Just prefix -> parseValidFile prefix fname fname
+ where
+  parseValidFile prefix hsf orig =
+    maybe (Left expected) Right $ asum (validParses prefix hsf orig)
+  validParses prefix hsf orig =
+    -- NOTE: order is important
+    [ TemplateName prefix        . RepoPath <$> parseRepoPath hsf
+    , TemplateName (T.pack orig) . UrlPath <$> (parseRequest orig *> Just orig)
+    , TemplateName prefix        . AbsPath <$> parseAbsFile hsf
+    , TemplateName prefix        . RelPath hsf <$> parseRelFile hsf
+    ]
+  expected = "Expected a template like: foo or foo.hsfiles or \
+             \https://example.com/foo.hsfiles or github:user/foo"
 
 -- | The default template name you can use if you don't have one.
 defaultTemplateName :: TemplateName
 defaultTemplateName =
   case parseTemplateNameFromString "new-template" of
-    Left s -> error $ "Bug in Stack codebase, cannot parse default template name: " ++ s
+    Left s -> impureThrow $ DefaultTemplateNameNotParsedBug s
     Right x -> x
 
 -- | Get a text representation of the template name.
@@ -124,6 +149,7 @@ parseRepoPath s =
     ["github"    , rest] -> parseRepoPathWithService GitHub rest
     ["gitlab"    , rest] -> parseRepoPathWithService GitLab rest
     ["bitbucket" , rest] -> parseRepoPathWithService Bitbucket rest
+    ["codeberg"  , rest] -> parseRepoPathWithService Codeberg rest
     _                    -> Nothing
 
 -- | Parses a template path of the form @user/template@, given a service
@@ -131,7 +157,7 @@ parseRepoPathWithService :: RepoService -> Text -> Maybe RepoTemplatePath
 parseRepoPathWithService service path =
   case T.splitOn "/" path of
     [user, name] -> Just $ RepoTemplatePath service user name
-    [name]       -> do
-        repoUser <- defaultRepoUserForService service
-        Just $ RepoTemplatePath service repoUser name
-    _            -> Nothing
+    [name] -> do
+      repoUser <- defaultRepoUserForService service
+      Just $ RepoTemplatePath service repoUser name
+    _ -> Nothing
diff --git a/src/Stack/Types/UnusedFlags.hs b/src/Stack/Types/UnusedFlags.hs
new file mode 100644
index 0000000000..bd92162502
--- /dev/null
+++ b/src/Stack/Types/UnusedFlags.hs
@@ -0,0 +1,28 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.UnusedFlags
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.UnusedFlags
+  ( UnusedFlags (..)
+  , FlagSource (..)
+  ) where
+
+import           Stack.Prelude
+
+data FlagSource
+  = FSCommandLine
+  | FSStackYaml
+  deriving (Eq, Ord, Show)
+
+data UnusedFlags
+  = UFNoPackage FlagSource PackageName
+  | UFFlagsNotDefined
+      FlagSource
+      PackageName
+      (Set FlagName) -- defined in package
+      (Set FlagName) -- not defined
+  | UFSnapshot PackageName
+  deriving (Eq, Ord, Show)
diff --git a/src/Stack/Types/UpgradeOpts.hs b/src/Stack/Types/UpgradeOpts.hs
new file mode 100644
index 0000000000..dac7d5777a
--- /dev/null
+++ b/src/Stack/Types/UpgradeOpts.hs
@@ -0,0 +1,46 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.UpgradeOpts
+Description : Types for command line options for Stack's @upgrade@ command.
+License     : BSD-3-Clause
+
+Types for command line options for Stack's @upgrade@ command.
+-}
+
+module Stack.Types.UpgradeOpts
+  ( UpgradeOpts (..)
+  , BinaryOpts (..)
+  , SourceOpts (..)
+  ) where
+
+import           Stack.Prelude
+
+-- | Type representing command line options for the @stack upgrade@ command.
+data UpgradeOpts = UpgradeOpts
+  { binary :: !(Maybe BinaryOpts)
+  , source :: !(Maybe SourceOpts)
+  }
+  deriving Show
+
+-- | Type representing options for upgrading Stack with a binary executable
+-- file.
+data BinaryOpts = BinaryOpts
+  { platform :: !(Maybe String)
+  , force :: !Bool
+    -- ^ Force a download, even if the downloaded version is older than what we
+    -- are.
+  , onlyLocalBin :: !Bool
+    -- ^ Only download to Stack's local binary directory.
+  , version :: !(Maybe String)
+    -- ^ Specific version to download
+  , gitHubOrg :: !(Maybe String)
+  , gitHubRepo :: !(Maybe String)
+  }
+  deriving Show
+
+-- | Type representing options for upgrading Stack from source code.
+newtype SourceOpts
+  = SourceOpts (Maybe (String, String)) -- repo and branch
+  deriving Show
diff --git a/src/Stack/Types/UploadOpts.hs b/src/Stack/Types/UploadOpts.hs
new file mode 100644
index 0000000000..04418f92b9
--- /dev/null
+++ b/src/Stack/Types/UploadOpts.hs
@@ -0,0 +1,40 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+
+{-|
+Module      : Stack.Types.UploadOpts
+Description : Types for command line options for Stack's @upload@ command.
+License     : BSD-3-Clause
+
+Types for command line options for Stack's @upload@ command.
+-}
+
+module Stack.Types.UploadOpts
+  ( UploadOpts (..)
+  , UploadVariant (..)
+  ) where
+
+import           Stack.Prelude
+import           Stack.Types.PvpBounds (PvpBounds)
+
+-- | Type representing command line options for the @stack upload@ command.
+data UploadOpts = UploadOpts
+  { itemsToWorkWith :: ![String]
+    -- ^ The items to work with.
+  , documentation :: !Bool
+    -- ^ Uploading documentation for packages?
+  , pvpBounds :: !(Maybe PvpBounds)
+  , check :: !Bool
+  , buildPackage :: !Bool
+  , tarPath :: !(Maybe FilePath)
+  , uploadVariant :: !UploadVariant
+  , saveHackageCreds :: !FirstTrue
+    -- ^ Save user's Hackage username and password in a local file?
+  }
+
+-- | Type representing variants for uploading to Hackage.
+data UploadVariant
+  = Publishing
+    -- ^ Publish the package/a published package.
+  | Candidate
+    -- ^ Create a package candidate/a package candidate.
diff --git a/src/Stack/Types/Version.hs b/src/Stack/Types/Version.hs
index 011164b145..244bed5cc6 100644
--- a/src/Stack/Types/Version.hs
+++ b/src/Stack/Types/Version.hs
@@ -1,56 +1,69 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE NoFieldSelectors  #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ViewPatterns      #-}
 
--- | Versions for packages.
+{-|
+Module      : Stack.Types.Version
+Description : Versions for packages.
+License     : BSD-3-Clause
+
+Versions for packages.
+-}
 
 module Stack.Types.Version
-  (Version
-  ,Cabal.VersionRange -- TODO in the future should have a newtype wrapper
-  ,IntersectingVersionRange(..)
-  ,VersionCheck(..)
-  ,versionRangeText
-  ,Cabal.withinRange
-  ,Stack.Types.Version.intersectVersionRanges
-  ,toMajorVersion
-  ,latestApplicableVersion
-  ,checkVersion
-  ,nextMajorVersion
-  ,minorVersion
-  ,stackVersion
-  ,stackMinorVersion)
-  where
-
-import           Stack.Prelude hiding (Vector)
-import           Pantry.Internal.AesonExtended
-import           Data.List (find)
+  ( Cabal.VersionRange -- TODO in the future should have a newtype wrapper
+  , IntersectingVersionRange (..)
+  , VersionCheck (..)
+  , versionRangeText
+  , Cabal.withinRange
+  , Stack.Types.Version.intersectVersionRanges
+  , toMajorVersion
+  , latestApplicableVersion
+  , checkVersion
+  , nextMajorVersion
+  , minorVersion
+  , stackVersion
+  , showStackVersion
+  , stackMajorVersion
+  , stackMinorVersion
+  ) where
+
+import           Data.Aeson.Types
+                   ( FromJSON (..), ToJSON (..), Value (..), withText )
+import           Data.List ( find )
 import qualified Data.Set as Set
 import qualified Data.Text as T
-import           Distribution.Pretty (pretty)
+import           Data.Version ( showVersion )
+import           Distribution.Pretty ( pretty )
 import qualified Distribution.Version as Cabal
 import qualified Paths_stack as Meta
-import           Text.PrettyPrint (render)
+import           Stack.Prelude hiding ( Vector, pretty )
+import           Text.PrettyPrint ( render )
 
-newtype IntersectingVersionRange =
-    IntersectingVersionRange { getIntersectingVersionRange :: Cabal.VersionRange }
-    deriving Show
+newtype IntersectingVersionRange = IntersectingVersionRange
+  { intersectingVersionRange :: Cabal.VersionRange }
+  deriving Show
 
 instance Semigroup IntersectingVersionRange where
-    IntersectingVersionRange l <> IntersectingVersionRange r =
-        IntersectingVersionRange (l `Cabal.intersectVersionRanges` r)
+  IntersectingVersionRange l <> IntersectingVersionRange r =
+    IntersectingVersionRange (l `Cabal.intersectVersionRanges` r)
 
 instance Monoid IntersectingVersionRange where
-    mempty = IntersectingVersionRange Cabal.anyVersion
-    mappend = (<>)
+  mempty = IntersectingVersionRange Cabal.anyVersion
+  mappend = (<>)
 
 -- | Display a version range
 versionRangeText :: Cabal.VersionRange -> Text
 versionRangeText = T.pack . render . pretty
 
 -- | A modified intersection which also simplifies, for better display.
-intersectVersionRanges :: Cabal.VersionRange -> Cabal.VersionRange -> Cabal.VersionRange
-intersectVersionRanges x y = Cabal.simplifyVersionRange $ Cabal.intersectVersionRanges x y
+intersectVersionRanges ::
+     Cabal.VersionRange
+  -> Cabal.VersionRange
+  -> Cabal.VersionRange
+intersectVersionRanges x y =
+  Cabal.simplifyVersionRange $ Cabal.intersectVersionRanges x y
 
 -- | Returns the first two components, defaulting to 0 if not present
 toMajorVersion :: Version -> Version
@@ -74,41 +87,43 @@ nextMajorVersion v =
     a:b:_ -> Cabal.mkVersion [a, b + 1]
 
 data VersionCheck
-    = MatchMinor
-    | MatchExact
-    | NewerMinor
-    deriving (Show, Eq, Ord)
+  = MatchMinor
+  | MatchExact
+  | NewerMinor
+  deriving (Eq, Ord, Show)
+
 instance ToJSON VersionCheck where
-    toJSON MatchMinor = String "match-minor"
-    toJSON MatchExact = String "match-exact"
-    toJSON NewerMinor = String "newer-minor"
+  toJSON MatchMinor = String "match-minor"
+  toJSON MatchExact = String "match-exact"
+  toJSON NewerMinor = String "newer-minor"
+
 instance FromJSON VersionCheck where
-    parseJSON = withText expected $ \t ->
-        case t of
-            "match-minor" -> pure MatchMinor
-            "match-exact" -> pure MatchExact
-            "newer-minor" -> pure NewerMinor
-            _ -> fail ("Expected " ++ expected ++ ", but got " ++ show t)
-      where
-        expected = "VersionCheck value (match-minor, match-exact, or newer-minor)"
+  parseJSON = withText expected $ \t ->
+    case t of
+      "match-minor" -> pure MatchMinor
+      "match-exact" -> pure MatchExact
+      "newer-minor" -> pure NewerMinor
+      _ -> fail ("Expected " ++ expected ++ ", but got " ++ show t)
+   where
+    expected = "VersionCheck value (match-minor, match-exact, or newer-minor)"
 
 checkVersion :: VersionCheck -> Version -> Version -> Bool
 checkVersion check (Cabal.versionNumbers -> wanted) (Cabal.versionNumbers -> actual) =
-    case check of
-        MatchMinor -> and (take 3 matching)
-        MatchExact -> length wanted == length actual && and matching
-        NewerMinor -> and (take 2 matching) && newerMinor
-  where
-    matching = zipWith (==) wanted actual
-
-    getMinor (_a:_b:c:_) = Just c
-    getMinor _ = Nothing
-
-    newerMinor =
-        case (getMinor wanted, getMinor actual) of
-            (Nothing, _) -> True
-            (Just _, Nothing) -> False
-            (Just w, Just a) -> a >= w
+  case check of
+    MatchMinor -> and (take 3 matching)
+    MatchExact -> length wanted == length actual && and matching
+    NewerMinor -> and (take 2 matching) && newerMinor
+ where
+  matching = zipWith (==) wanted actual
+
+  getMinor (_a:_b:c:_) = Just c
+  getMinor _ = Nothing
+
+  newerMinor =
+    case (getMinor wanted, getMinor actual) of
+      (Nothing, _) -> True
+      (Just _, Nothing) -> False
+      (Just w, Just a) -> a >= w
 
 -- | Get minor version (excludes any patchlevel)
 minorVersion :: Version -> Version
@@ -118,6 +133,16 @@ minorVersion = Cabal.mkVersion . take 3 . Cabal.versionNumbers
 stackVersion :: Version
 stackVersion = Cabal.mkVersion' Meta.version
 
+-- | Current Stack version in the same format as yielded by
+-- 'Data.Version.showVersion'.
+showStackVersion :: String
+showStackVersion = showVersion Meta.version
+
 -- | Current Stack minor version (excludes patchlevel)
 stackMinorVersion :: Version
 stackMinorVersion = minorVersion stackVersion
+
+-- | Current Stack major version. Returns the first two components, defaulting
+-- to 0 if not present
+stackMajorVersion :: Version
+stackMajorVersion = toMajorVersion stackVersion
diff --git a/src/Stack/Types/VersionedDownloadInfo.hs b/src/Stack/Types/VersionedDownloadInfo.hs
new file mode 100644
index 0000000000..e678b3b63a
--- /dev/null
+++ b/src/Stack/Types/VersionedDownloadInfo.hs
@@ -0,0 +1,34 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+{-|
+Module      : Stack.Types.VersionedDownloadInfo
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.VersionedDownloadInfo
+  ( VersionedDownloadInfo (..)
+  ) where
+
+import           Data.Aeson.Types ( FromJSON (..) )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings (..), (..:), withObjectWarnings )
+import           Stack.Prelude
+import           Stack.Types.DownloadInfo
+                   ( DownloadInfo, parseDownloadInfoFromObject )
+
+data VersionedDownloadInfo = VersionedDownloadInfo
+  { version :: Version
+  , downloadInfo :: DownloadInfo
+  }
+  deriving Show
+
+instance FromJSON (WithJSONWarnings VersionedDownloadInfo) where
+  parseJSON = withObjectWarnings "VersionedDownloadInfo" $ \o -> do
+    CabalString version <- o ..: "version"
+    downloadInfo <- parseDownloadInfoFromObject o
+    pure VersionedDownloadInfo
+      { version
+      , downloadInfo
+      }
diff --git a/src/Stack/Types/WantedCompilerSetter.hs b/src/Stack/Types/WantedCompilerSetter.hs
new file mode 100644
index 0000000000..6946faed55
--- /dev/null
+++ b/src/Stack/Types/WantedCompilerSetter.hs
@@ -0,0 +1,22 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Types.WantedCompilerSetter
+License     : BSD-3-Clause
+-}
+
+module Stack.Types.WantedCompilerSetter
+  ( WantedCompilerSetter (..)
+  ) where
+
+import           Stack.Prelude
+
+-- | Type representing ways that a wanted compiler is set.
+data WantedCompilerSetter
+  = CompilerAtCommandLine
+    -- ^ At the command line with --compiler option.
+  | SnapshotAtCommandLine
+    -- ^ At the command line with --snapshot or (deprecated) --resolver option.
+  | YamlConfiguration (Maybe (Path Abs File))
+    -- ^ Via a configuration file.
+  deriving Show
diff --git a/src/Stack/Uninstall.hs b/src/Stack/Uninstall.hs
new file mode 100644
index 0000000000..8378087e0b
--- /dev/null
+++ b/src/Stack/Uninstall.hs
@@ -0,0 +1,94 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+{-|
+Module      : Stack.Uninstall
+Description : Function related to Stack's @uninstall@ command.
+License     : BSD-3-Clause
+
+Function related to Stack's @uninstall@ command.
+-}
+
+module Stack.Uninstall
+  ( uninstallCmd
+  ) where
+
+import           Stack.Constants ( osIsWindows )
+import           Stack.Prelude
+import           Stack.Runners ( ShouldReexec (..), withConfig )
+import           Stack.Types.Config
+                   ( Config (..), configL, stackRootL, userGlobalConfigFileL )
+import           Stack.Types.Runner ( Runner )
+
+-- | Function underlying the @stack uninstall@ command. Display help for the
+-- command.
+uninstallCmd :: () -> RIO Runner ()
+uninstallCmd () = withConfig NoReexec $ do
+  stackRoot <- view stackRootL
+  userGlobalConfigFile <- view userGlobalConfigFileL
+  programsDir <- view $ configL . to (.localProgramsBase)
+  localBinDir <- view $ configL . to (.localBin)
+  let toStyleDoc = style Dir . fromString . toFilePath
+      stackRoot' = toStyleDoc stackRoot
+      userGlobalConfigFile' = toStyleDoc userGlobalConfigFile
+      programsDir' = toStyleDoc programsDir
+      localBinDir' = toStyleDoc localBinDir
+  putUtf8Builder =<< displayWithColor
+    (  vsep
+         [ flow "To uninstall Stack, it should be sufficient to delete:"
+         , hang 4 $ fillSep
+             [ flow "(1) the directory containing Stack's tools"
+             , "(" <> softbreak <> programsDir' <> softbreak <> ");"
+             ]
+         , hang 4 $ fillSep
+             [ flow "(2) the Stack root directory"
+             , "(" <> softbreak <> stackRoot' <> softbreak <> ");"
+             ]
+         , hang 4 $ fillSep
+             [ flow "(3) if different, the directory containing "
+             , flow "Stack's user-specific global configuration file"
+             , parens userGlobalConfigFile' <> ";"
+             , "and"
+             ]
+         , hang 4 $ fillSep
+             [ flow "(4) the 'stack' executable file (see the output"
+             , flow "of command"
+             , howToFindStack <> ","
+             , flow "if Stack is on the PATH;"
+             , flow "Stack is often installed in"
+             , localBinDir' <> softbreak <> ")."
+             ]
+         , fillSep
+             [flow "You may also want to delete"
+             , style File ".stack-work"
+             , flow "directories in any Haskell projects that you have built."
+             ]
+         ]
+    <> blankLine
+    <> vsep
+         [ fillSep
+             [ flow "To uninstall completely a Stack-supplied tool (such as \
+                    \GHC or, on Windows, MSYS2), delete from Stack's tools \
+                    \directory"
+             , parens programsDir' <> ":"
+             ]
+         , hang 4 $ fillSep
+             [ flow "(1) the tool's subdirectory;"
+             ]
+         , hang 4 $ fillSep
+             [ flow "(2) if present, the tool's archive file"
+             , parens (style File "<tool>.tar.xz") <> "; and"
+             ]
+         , hang 4 $ fillSep
+             [ flow "(3) the file marking that the tool is installed"
+             , parens (style File "<tool>.installed") <> "."
+             ]
+         ]
+    <> blankLine
+    )
+ where
+  styleShell = style Shell
+  howToFindStack
+    | osIsWindows = styleShell "where.exe stack"
+    | otherwise   = styleShell "which stack"
diff --git a/src/Stack/Unpack.hs b/src/Stack/Unpack.hs
index 5aab888ebc..3af72c8476 100644
--- a/src/Stack/Unpack.hs
+++ b/src/Stack/Unpack.hs
@@ -1,113 +1,222 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+
+{-|
+Module      : Stack.Unpack
+Description : Functions related to Stack's @unpack@ command.
+License     : BSD-3-Clause
+
+Functions related to Stack's @unpack@ command.
+-}
 
 module Stack.Unpack
-  ( unpackPackages
+  ( UnpackOpts (..)
+  , UnpackTarget
+  , unpackCmd
+  , unpackPackages
   ) where
 
-import Stack.Prelude
-import qualified RIO.Text as T
+import           Data.List.Extra ( notNull )
+import           Path ( SomeBase (..), (</>), parseRelDir )
+import           Path.IO ( doesDirExist, getCurrentDir )
 import qualified RIO.Map as Map
+import           RIO.Process ( HasProcessContext )
 import qualified RIO.Set as Set
-import RIO.List (intercalate)
-import RIO.Process (HasProcessContext)
-import Path ((</>), parseRelDir)
-import Path.IO (doesDirExist)
+import qualified RIO.Text as T
+import           Stack.Config ( getRawSnapshot )
+import           Stack.Constants ( relDirRoot )
+import           Stack.Prelude
+import           Stack.Runners ( ShouldReexec (..), withConfig )
+import           Stack.Types.Config ( Config (..), HasConfig, configL )
+import           Stack.Types.Runner ( Runner )
 
-data UnpackException
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Unpack" module.
+data UnpackPrettyException
   = UnpackDirectoryAlreadyExists (Set (Path Abs Dir))
-  | CouldNotParsePackageSelectors [String]
-    deriving Typeable
-instance Exception UnpackException
-instance Show UnpackException where
-    show (UnpackDirectoryAlreadyExists dirs) = unlines
-        $ "Unable to unpack due to already present directories:"
-        : map (("    " ++) . toFilePath) (Set.toList dirs)
-    show (CouldNotParsePackageSelectors strs) = unlines
-      $ "The following package selectors are not valid package names or identifiers:"
-      : map ("- " ++) strs
+  | CouldNotParsePackageSelectors [StyleDoc]
+  | PackageCandidatesRequireVersions [PackageName]
+  | PackageLocationInvalid PackageIdentifierRevision
+  deriving Show
+
+instance Pretty UnpackPrettyException where
+  pretty (UnpackDirectoryAlreadyExists dirs) =
+    "[S-3515]"
+    <> line
+    <> flow "Stack was unable to unpack due to directories already being \
+            \present:"
+    <> line
+    <> bulletedList (map pretty $ Set.toList dirs)
+  pretty (CouldNotParsePackageSelectors errs) =
+    "[S-2628]"
+    <> line
+    <> flow "The following package selectors are not valid package names or \
+            \identifiers:"
+    <> line
+    <> bulletedList errs
+  pretty (PackageCandidatesRequireVersions names) =
+    "[S-6114]"
+    <> line
+    <> flow "Package candidates to unpack cannot be identified by name only. \
+            \The following do not specify a version:"
+    <> line
+    <> bulletedList (map fromPackageName names)
+  pretty (PackageLocationInvalid pir) =
+    "[S-5170]"
+    <> line
+    <> fillSep
+         [ flow "While trying to unpack"
+         , style Target (fromString $ T.unpack $ textDisplay pir) <> ","
+         , flow "Stack encountered an error."
+         ]
+
+instance Exception UnpackPrettyException
+
+-- | Type synonymn representing packages to be unpacked by the @stack unpack@
+-- command, identified either by name only or by an identifier (including
+-- Hackage revision).
+type UnpackTarget = Either PackageName PackageIdentifierRevision
+
+-- | Type representing options for the @stack unpack@ command.
+data UnpackOpts = UnpackOpts
+  { targets :: [UnpackTarget]
+    -- ^ The packages or package candidates to be unpacked.
+  , areCandidates :: Bool
+    -- ^ Whether the targets are Hackage package candidates.
+  , dest :: Maybe (SomeBase Dir)
+    -- ^ The optional directory into which a target will be unpacked into a
+    -- subdirectory.
+  }
+
+-- | Function underlying the @stack unpack@ command. Unpack packages or package
+-- candidates to the filesystem.
+unpackCmd ::
+     UnpackOpts
+  -> RIO Runner ()
+unpackCmd (UnpackOpts targets areCandidates Nothing) =
+  unpackCmd (UnpackOpts targets areCandidates (Just $ Rel relDirRoot))
+unpackCmd (UnpackOpts targets areCandidates (Just dstPath)) =
+  withConfig NoReexec $ do
+    mSnapshot <- getRawSnapshot
+    dstPath' <- case dstPath of
+      Abs path -> pure path
+      Rel path -> do
+        wd <- getCurrentDir
+        pure $ wd </> path
+    unpackPackages mSnapshot dstPath' targets areCandidates
 
 -- | Intended to work for the command line command.
-unpackPackages
-  :: forall env. (HasPantryConfig env, HasLogFunc env, HasProcessContext env)
-  => Maybe RawSnapshot -- ^ when looking up by name, take from this build plan
-  -> Path Abs Dir -- ^ destination
-  -> [String] -- ^ names or identifiers
+unpackPackages ::
+     forall env.
+       (HasConfig env, HasPantryConfig env, HasProcessContext env, HasTerm env)
+  => Maybe RawSnapshot -- ^ When looking up by name, take from this build plan.
+  -> Path Abs Dir -- ^ Destination.
+  -> [UnpackTarget]
+  -> Bool
+     -- ^ Whether the targets are package candidates.
   -> RIO env ()
-unpackPackages mSnapshot dest input = do
-    let (errs1, (names, pirs1)) =
-          fmap partitionEithers $ partitionEithers $ map parse input
-    locs1 <- forM pirs1 $ \pir -> do
-      loc <- fmap cplComplete $ completePackageLocation $ RPLIHackage pir Nothing
-      pure (loc, packageLocationIdent loc)
-    (errs2, locs2) <- partitionEithers <$> traverse toLoc names
-    case errs1 ++ errs2 of
-      [] -> pure ()
-      errs -> throwM $ CouldNotParsePackageSelectors errs
-    locs <- Map.fromList <$> mapM
-          (\(pir, ident) -> do
-              suffix <- parseRelDir $ packageIdentifierString ident
-              pure (pir, dest </> suffix)
-          )
-          (locs1 ++ locs2)
-
-    alreadyUnpacked <- filterM doesDirExist $ Map.elems locs
-
-    unless (null alreadyUnpacked) $
-        throwM $ UnpackDirectoryAlreadyExists $ Set.fromList alreadyUnpacked
-
-    forM_ (Map.toList locs) $ \(loc, dest') -> do
-      unpackPackageLocation dest' loc
-      logInfo $
-        "Unpacked " <>
-        display loc <>
-        " to " <>
-        fromString (toFilePath dest')
-  where
-    toLoc | Just snapshot <- mSnapshot = toLocSnapshot snapshot
-          | otherwise = toLocNoSnapshot
-
-    toLocNoSnapshot :: PackageName -> RIO env (Either String (PackageLocationImmutable, PackageIdentifier))
-    toLocNoSnapshot name = do
-      mloc1 <- getLatestHackageLocation YesRequireHackageIndex name UsePreferredVersions
-      mloc <-
-        case mloc1 of
-          Just _ -> pure mloc1
-          Nothing -> do
-            updated <- updateHackageIndex $ Just $ "Could not find package " <> fromString (packageNameString name) <> ", updating"
-            case updated of
-              UpdateOccurred -> getLatestHackageLocation YesRequireHackageIndex name UsePreferredVersions
-              NoUpdateOccurred -> pure Nothing
-      case mloc of
-        Nothing -> do
-          candidates <- getHackageTypoCorrections name
-          pure $ Left $ concat
-            [ "Could not find package "
-            , packageNameString name
-            , " on Hackage"
-            , if null candidates
-                then ""
-                else ". Perhaps you meant: " ++ intercalate ", " (map packageNameString candidates)
-            ]
-        Just loc -> pure $ Right (loc, packageLocationIdent loc)
-
-    toLocSnapshot :: RawSnapshot -> PackageName -> RIO env (Either String (PackageLocationImmutable, PackageIdentifier))
-    toLocSnapshot snapshot name =
-        case Map.lookup name (rsPackages snapshot) of
-          Nothing ->
-            pure $ Left $ "Package does not appear in snapshot: " ++ packageNameString name
-          Just sp -> do
-            loc <- cplComplete <$> completePackageLocation (rspLocation sp)
-            pure $ Right (loc, packageLocationIdent loc)
-
-    -- Possible future enhancement: parse names as name + version range
-    parse s =
-        case parsePackageName (T.unpack t) of
-            Just x -> Right $ Left x
-            Nothing ->
-                case parsePackageIdentifierRevision t of
-                    Right x -> Right $ Right x
-                    Left _ -> Left $ "Could not parse as package name or identifier: " ++ s
-      where
-        t = T.pack s
+unpackPackages mSnapshot dest targets areCandidates = do
+  let (names, pirs) = partitionEithers targets
+      pisWithRevisions = any hasRevision pirs
+      hasRevision (PackageIdentifierRevision _ _ CFILatest) = False
+      hasRevision _ = True
+  when (areCandidates && notNull names) $
+    prettyThrowIO $ PackageCandidatesRequireVersions names
+  when (areCandidates && pisWithRevisions) $
+    prettyWarn $
+         flow "Package revisions are not meaningful for package candidates and \
+              \will be ignored."
+      <> line
+  locs1 <- forM pirs $ \pir -> do
+    hackageBaseUrl <- view $ configL . to (.hackageBaseUrl)
+    let rpli = if areCandidates
+          then
+            let -- Ignoring revisions for package candidates.
+                PackageIdentifierRevision candidateName candidateVersion _ = pir
+                candidatePkgId =
+                  PackageIdentifier candidateName candidateVersion
+                candidatePkgIdText =
+                  T.pack $ packageIdentifierString candidatePkgId
+                candidateUrl =
+                     hackageBaseUrl
+                  <> "package/"
+                  <> candidatePkgIdText
+                  <> "/candidate/"
+                  <> candidatePkgIdText
+                  <> ".tar.gz"
+                candidateLoc = ALUrl candidateUrl
+                candidateArchive = RawArchive candidateLoc Nothing Nothing ""
+                candidateMetadata = RawPackageMetadata Nothing Nothing Nothing
+            in RPLIArchive candidateArchive candidateMetadata
+          else RPLIHackage pir Nothing
+    loc <- cplComplete <$> completePackageLocation rpli
+      `catch` \(_ :: SomeException) -> prettyThrowIO $ PackageLocationInvalid pir
+    pure (loc, packageLocationIdent loc)
+  (errs, locs2) <- partitionEithers <$> traverse toLoc names
+  unless (null errs) $ prettyThrowM $ CouldNotParsePackageSelectors errs
+  locs <- Map.fromList <$> mapM
+    (\(pir, ident) -> do
+        suffix <- parseRelDir $ packageIdentifierString ident
+        pure (pir, dest </> suffix)
+    )
+    (locs1 ++ locs2)
+
+  alreadyUnpacked <- filterM doesDirExist $ Map.elems locs
+
+  unless (null alreadyUnpacked) $
+    prettyThrowM $ UnpackDirectoryAlreadyExists $ Set.fromList alreadyUnpacked
+
+  forM_ (Map.toList locs) $ \(loc, dest') -> do
+    unpackPackageLocation dest' loc
+    prettyInfoL
+      [ "Unpacked"
+      , fromString $ T.unpack $ textDisplay loc
+      , "to"
+      , pretty dest' <> "."
+      ]
+ where
+  toLoc name | Just snapshot <- mSnapshot = toLocSnapshot snapshot name
+             | otherwise = do
+                 void $ updateHackageIndex $ Just "Updating the package index."
+                 toLocNoSnapshot name
+
+  toLocNoSnapshot ::
+       PackageName
+    -> RIO env (Either StyleDoc (PackageLocationImmutable, PackageIdentifier))
+  toLocNoSnapshot name = do
+    mLoc <- getLatestHackageLocation
+      YesRequireHackageIndex
+      name
+      UsePreferredVersions
+    case mLoc of
+      Nothing -> do
+        candidates <- getHackageTypoCorrections name
+        pure $ Left $ fillSep
+          [ flow "Could not find package"
+          , style Current (fromPackageName name)
+          , flow "on Hackage."
+          , if null candidates
+              then mempty
+              else fillSep $
+                  flow "Perhaps you meant one of:"
+                : mkNarrativeList (Just Good) False
+                    (map fromPackageName candidates :: [StyleDoc])
+          ]
+      Just loc -> pure $ Right (loc, packageLocationIdent loc)
+
+  toLocSnapshot ::
+       RawSnapshot
+    -> PackageName
+    -> RIO env (Either StyleDoc (PackageLocationImmutable, PackageIdentifier))
+  toLocSnapshot snapshot name =
+    case Map.lookup name (rsPackages snapshot) of
+      Nothing ->
+        pure $ Left $ fillSep
+          [ flow "Package does not appear in snapshot:"
+          , style Current (fromPackageName name) <> "."
+          ]
+      Just sp -> do
+        loc <- cplComplete <$> completePackageLocation (rspLocation sp)
+        pure $ Right (loc, packageLocationIdent loc)
diff --git a/src/Stack/Update.hs b/src/Stack/Update.hs
new file mode 100644
index 0000000000..6b40fbe14a
--- /dev/null
+++ b/src/Stack/Update.hs
@@ -0,0 +1,21 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Update
+Description : Functions related to Stack's @update@ command.
+License     : BSD-3-Clause
+
+Functions related to Stack's @update@ command.
+-}
+
+module Stack.Update
+  ( updateCmd
+  ) where
+
+import          Stack.Prelude
+import          Stack.Runners ( ShouldReexec (..), withConfig )
+import          Stack.Types.Runner ( Runner )
+
+-- | Function underlying the @stack update@ command. Update the package index.
+updateCmd :: () -> RIO Runner ()
+updateCmd () = withConfig NoReexec (void (updateHackageIndex Nothing))
diff --git a/src/Stack/Upgrade.hs b/src/Stack/Upgrade.hs
index c5a68ccdb9..f34f4b7017 100644
--- a/src/Stack/Upgrade.hs
+++ b/src/Stack/Upgrade.hs
@@ -1,244 +1,273 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 {-# LANGUAGE OverloadedStrings     #-}
 
+{-|
+Module      : Stack.Upgrade
+Description : Function related to Stack's @upgrade@ command.
+License     : BSD-3-Clause
+
+Function related to Stack's @upgrade@ command.
+-}
+
 module Stack.Upgrade
-    ( upgrade
-    , UpgradeOpts
-    , upgradeOpts
-    ) where
+  ( upgradeCmd
+  ) where
 
-import           Stack.Prelude               hiding (force, Display (..))
 import qualified Data.Text as T
-import           Distribution.Version        (mkVersion')
-import           Options.Applicative
-import           Path
-import qualified Paths_stack as Paths
-import           Stack.Build
-import           Stack.Build.Target (NeedTargets(..))
-import           Stack.Constants
+import           Path ( (</>), parseRelDir )
+import           RIO.Process ( proc, runProcess_, withWorkingDir )
+import           Stack.Build ( build )
+import           Stack.Build.Target ( NeedTargets (..) )
+import           Stack.BuildInfo ( maybeGitHash )
+import           Stack.Constants ( relDirStackProgName, stackDotYaml )
+import           Stack.Prelude hiding ( force, Display (..) )
 import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withEnvConfig
+                   , withGlobalProject )
 import           Stack.Setup
-import           Stack.Types.Config
-import           System.Console.ANSI (hSupportsANSIWithoutEmulation)
-import           System.Process              (rawSystem, readProcess)
-import           RIO.PrettyPrint
-import           RIO.Process
-
-upgradeOpts :: Parser UpgradeOpts
-upgradeOpts = UpgradeOpts
-    <$> (sourceOnly <|> optional binaryOpts)
-    <*> (binaryOnly <|> optional sourceOpts)
-  where
-    binaryOnly = flag' Nothing (long "binary-only" <> help "Do not use a source upgrade path")
-    sourceOnly = flag' Nothing (long "source-only" <> help "Do not use a binary upgrade path")
-
-    binaryOpts = BinaryOpts
-        <$> optional (strOption
-              ( long "binary-platform"
-             <> help "Platform type for archive to download"
-             <> showDefault))
-        <*> switch
-         (long "force-download" <>
-          help "Download the latest available Stack executable")
-        <*> optional (strOption
-         (long "binary-version" <>
-          help "Download a specific Stack version"))
-        <*> optional (strOption
-         (long "github-org" <>
-          help "GitHub organization name"))
-        <*> optional (strOption
-         (long "github-repo" <>
-          help "GitHub repository name"))
+                   ( downloadStackExe, downloadStackReleaseInfo
+                   , getDownloadVersion, preferredPlatforms, stackVersion
+                   )
+import           Stack.Types.BuildOpts ( buildOptsInstallExesL )
+import           Stack.Types.BuildOptsCLI
+                   ( BuildOptsCLI (..), defaultBuildOptsCLI )
+import           Stack.Types.Config ( Config (..), HasConfig (..), buildOptsL )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Runner ( Runner, globalOptsL )
+import           Stack.Types.StackYamlLoc ( StackYamlLoc (..) )
+import           Stack.Types.UpgradeOpts
+                   ( BinaryOpts (..), SourceOpts (..), UpgradeOpts (..) )
+import           System.Process ( rawSystem, readProcess )
 
-    sourceOpts = SourceOpts
-        <$> ((\fromGit repo branch -> if fromGit then Just (repo, branch) else Nothing)
-                <$> switch
-                    ( long "git"
-                    <> help "Clone from Git instead of downloading from Hackage (more dangerous)" )
-                <*> strOption
-                    ( long "git-repo"
-                    <> help "Clone from specified git repository"
-                    <> value "https://github.com/commercialhaskell/stack"
-                    <> showDefault )
-                <*> strOption
-                    ( long "git-branch"
-                   <> help "Clone from this git branch"
-                   <> value "master"
-                   <> showDefault ))
+-- | Type representing \'pretty\' exceptions thrown by functions in the
+-- "Stack.Upgrade" module.
+data UpgradePrettyException
+  = SnapshotOptionInvalid
+  | NeitherBinaryOrSourceSpecified
+  | ExecutableFailure
+  | CommitsNotFound String String
+  | StackInPackageIndexNotFound
+  | VersionWithNoRevision
+  deriving Show
 
-data BinaryOpts = BinaryOpts
-    { _boPlatform :: !(Maybe String)
-    , _boForce :: !Bool
-    -- ^ force a download, even if the downloaded version is older
-    -- than what we are
-    , _boVersion :: !(Maybe String)
-    -- ^ specific version to download
-    , _boGitHubOrg :: !(Maybe String)
-    , _boGitHubRepo :: !(Maybe String)
-    }
-    deriving Show
-newtype SourceOpts = SourceOpts (Maybe (String, String)) -- repo and branch
-    deriving Show
+instance Pretty UpgradePrettyException where
+  pretty SnapshotOptionInvalid =
+    "[S-8761]"
+    <> line
+    <> fillSep
+         [ "The"
+         , style Shell "--snapshot"
+         , flow "option cannot be used with Stack's"
+         , style Shell "upgrade"
+         , "command."
+         ]
+  pretty NeitherBinaryOrSourceSpecified =
+    "[S-3642]"
+    <> line
+    <> flow "You must allow either binary or source upgrade paths."
+  pretty ExecutableFailure =
+    "[S-8716]"
+    <> line
+    <> flow "Non-success exit code from running newly downloaded executable."
+  pretty (CommitsNotFound branch repo) =
+    "[S-7114]"
+    <> line
+    <> fillSep
+         [ flow "No commits found for branch"
+         , style Current (fromString branch)
+         , flow "on repo"
+         , style Url (fromString repo) <> "."
+         ]
+  pretty StackInPackageIndexNotFound =
+    "[S-9668]"
+    <> line
+    <> flow "No Stack version found in package indices."
+  pretty VersionWithNoRevision =
+    "[S-6648]"
+    <> line
+    <> flow "Latest version with no revision."
 
-data UpgradeOpts = UpgradeOpts
-    { _uoBinary :: !(Maybe BinaryOpts)
-    , _uoSource :: !(Maybe SourceOpts)
-    }
-    deriving Show
+instance Exception UpgradePrettyException
 
-upgrade :: Maybe String -- ^ git hash at time of building, if known
-        -> UpgradeOpts
-        -> RIO Runner ()
-upgrade builtHash (UpgradeOpts mbo mso) =
-    case (mbo, mso) of
-        -- FIXME It would be far nicer to capture this case in the
-        -- options parser itself so we get better error messages, but
-        -- I can't think of a way to make it happen.
-        (Nothing, Nothing) -> throwString "You must allow either binary or source upgrade paths"
-        (Just bo, Nothing) -> binary bo
-        (Nothing, Just so) -> source so
-        -- See #2977 - if --git or --git-repo is specified, do source upgrade.
-        (_, Just so@(SourceOpts (Just _))) -> source so
-        (Just bo, Just so) -> binary bo `catchAny` \e -> do
-            prettyWarnL
-               [ flow "Exception occurred when trying to perform binary upgrade:"
-               , fromString . show $ e
-               , line <> flow "Falling back to source upgrade"
-               ]
+-- | Function underlying the @stack upgrade@ command.
+upgradeCmd :: UpgradeOpts -> RIO Runner ()
+upgradeCmd upgradeOpts = do
+  go <- view globalOptsL
+  case go.snapshot of
+    Just _ -> prettyThrowIO SnapshotOptionInvalid
+    Nothing -> withGlobalProject $ upgrade maybeGitHash upgradeOpts
 
-            source so
-  where
-    binary bo = binaryUpgrade bo
-    source so = sourceUpgrade builtHash so
+upgrade ::
+     Maybe String -- ^ git hash at time of building, if known
+  -> UpgradeOpts
+  -> RIO Runner ()
+upgrade builtHash (UpgradeOpts mbo mso) = case (mbo, mso) of
+  -- FIXME It would be far nicer to capture this case in the options parser
+  -- itself so we get better error messages, but I can't think of a way to
+  -- make it happen.
+  (Nothing, Nothing) -> prettyThrowIO NeitherBinaryOrSourceSpecified
+  (Just bo, Nothing) -> binary bo
+  (Nothing, Just so) -> source so
+  -- See #2977 - if --git or --git-repo is specified, do source upgrade.
+  (_, Just so@(SourceOpts (Just _))) -> source so
+  (Just bo, Just so) -> binary bo `catchAny` \e -> do
+    prettyWarn $
+         flow "When trying to perform binary upgrade, Stack encountered the \
+              \following error:"
+      <> blankLine
+      <> ppException e
+      <> blankLine
+      <> flow "Falling back to source upgrade."
+    source so
+ where
+  binary = binaryUpgrade
+  source = sourceUpgrade builtHash
 
 binaryUpgrade :: BinaryOpts -> RIO Runner ()
-binaryUpgrade (BinaryOpts mplatform force' mver morg mrepo) = withConfig NoReexec $ do
+binaryUpgrade (BinaryOpts mplatform force' onlyLocalBin mver morg mrepo) =
+  withConfig NoReexec $ do
     platforms0 <-
       case mplatform of
         Nothing -> preferredPlatforms
         Just p -> pure [("windows" `T.isInfixOf` T.pack p, p)]
     archiveInfo <- downloadStackReleaseInfo morg mrepo mver
-
     let mdownloadVersion = getDownloadVersion archiveInfo
         force =
           case mver of
             Nothing -> force'
             Just _ -> True -- specifying a version implies we're forcing things
     isNewer <-
-        case mdownloadVersion of
-            Nothing -> do
-                prettyErrorL $
-                    flow "Unable to determine upstream version from GitHub metadata"
-                  :
-                  [ line <> flow "Rerun with --force-download to force an upgrade"
-                    | not force]
-                pure False
-            Just downloadVersion -> do
-                prettyInfoL
-                    [ flow "Current Stack version:"
-                    , fromString (versionString stackVersion) <> ","
-                    , flow "available download version:"
-                    , fromString (versionString downloadVersion)
-                    ]
-                pure $ downloadVersion > stackVersion
-
+      case mdownloadVersion of
+        Nothing -> do
+          prettyError $
+               flow "Unable to determine upstream version from GitHub metadata."
+            <> if force
+                 then mempty
+                 else
+                      line
+                   <> fillSep
+                        [ flow "Rerun with"
+                        , style Shell "--force-download"
+                        , flow "to force an upgrade."
+                        ]
+          pure False
+        Just downloadVersion -> do
+          prettyInfoL
+            [ flow "Current Stack version:"
+            , fromString (versionString stackVersion) <> ";"
+            , flow "available download version:"
+            , fromString (versionString downloadVersion) <> "."
+            ]
+          pure $ downloadVersion > stackVersion
     toUpgrade <- case (force, isNewer) of
-        (False, False) -> do
-            prettyInfoS "Skipping binary upgrade, you are already running the most recent version"
-            pure False
-        (True, False) -> do
-            prettyInfoS "Forcing binary upgrade"
-            pure True
-        (_, True) -> do
-            prettyInfoS "Newer version detected, downloading"
-            pure True
+      (False, False) -> do
+        prettyInfoS "Skipping binary upgrade, you are already running the most \
+                    \recent version."
+        pure False
+      (True, False) -> do
+        prettyInfoS "Forcing binary upgrade."
+        pure True
+      (_, True) -> do
+        prettyInfoS "Newer version detected, downloading."
+        pure True
     when toUpgrade $ do
-        config <- view configL
-        downloadStackExe platforms0 archiveInfo (configLocalBin config) True $ \tmpFile -> do
+      config <- view configL
+      downloadStackExe
+        platforms0 archiveInfo config.localBin (not onlyLocalBin) $
+          \tmpFile -> do
             -- Sanity check!
             ec <- rawSystem (toFilePath tmpFile) ["--version"]
+            unless (ec == ExitSuccess) (prettyThrowIO ExecutableFailure)
 
-            unless (ec == ExitSuccess)
-                    $ throwString "Non-success exit code from running newly downloaded executable"
-
-sourceUpgrade
-  :: Maybe String
+sourceUpgrade ::
+     Maybe String
   -> SourceOpts
   -> RIO Runner ()
 sourceUpgrade builtHash (SourceOpts gitRepo) =
   withSystemTempDir "stack-upgrade" $ \tmp -> do
     mdir <- case gitRepo of
       Just (repo, branch) -> do
-        remote <- liftIO $ System.Process.readProcess "git" ["ls-remote", repo, branch] []
+        remote <- liftIO $ System.Process.readProcess
+          "git"
+          ["ls-remote", repo, branch]
+          []
         latestCommit <-
           case words remote of
-            [] -> throwString $ "No commits found for branch " ++ branch ++ " on repo " ++ repo
+            [] -> prettyThrowIO $ CommitsNotFound branch repo
             x:_ -> pure x
         when (isNothing builtHash) $
-            prettyWarnS $
-                       "Information about the commit this version of Stack was "
-                    <> "built from is not available due to how it was built. "
-                    <> "Will continue by assuming an upgrade is needed "
-                    <> "because we have no information to the contrary."
+          prettyWarnS
+            "Information about the commit this version of Stack was built from \
+            \is not available due to how it was built. Will continue by \
+            \assuming an upgrade is needed because we have no information to \
+            \the contrary."
         if builtHash == Just latestCommit
             then do
-                prettyInfoS "Already up-to-date, no upgrade required"
-                pure Nothing
+              prettyInfoS "Already up-to-date, no upgrade required."
+              pure Nothing
             else do
-                prettyInfoS "Cloning stack"
-                -- NOTE: "--recursive" was added after v1.0.0 (and before the
-                -- next release).  This means that we can't use submodules in
-                -- the Stack repo until we're comfortable with "stack upgrade
-                -- --git" not working for earlier versions.
-                let args = [ "clone", repo , "stack", "--depth", "1", "--recursive", "--branch", branch]
-                withWorkingDir (toFilePath tmp) $ proc "git" args runProcess_
-                -- On Windows 10, an upstream issue with the `git clone` command
-                -- means that command clears, but does not then restore, the
-                -- ENABLE_VIRTUAL_TERMINAL_PROCESSING flag for native terminals.
-                -- The following hack re-enables the lost ANSI-capability.
-                when osIsWindows $
-                  void $ liftIO $ hSupportsANSIWithoutEmulation stdout
-                pure $ Just $ tmp </> relDirStackProgName
-      -- We need to access the Pantry database to find out about the
-      -- latest Stack available on Hackage. We first use a standard
-      -- Config to do this, and once we have the source load up the
-      -- stack.yaml from inside that source.
+              prettyInfoS "Cloning stack."
+              -- NOTE: "--recursive" was added after v1.0.0 (and before the next
+              -- release).  This means that we can't use submodules in the Stack
+              -- repo until we're comfortable with "stack upgrade --git" not
+              -- working for earlier versions.
+              let args =
+                    [ "clone"
+                    , repo
+                    , "stack"
+                    , "--depth"
+                    , "1"
+                    , "--recursive"
+                    , "--branch"
+                    , branch
+                    ]
+              withWorkingDir (toFilePath tmp) $ proc "git" args runProcess_
+              pure $ Just $ tmp </> relDirStackProgName
+      -- We need to access the Pantry database to find out about the latest
+      -- Stack available on Hackage. We first use a standard Config to do this,
+      -- and once we have the source load up the stack.yaml from inside that
+      -- source.
       Nothing -> withConfig NoReexec $ do
-        void $ updateHackageIndex
-             $ Just "Updating index to make sure we find the latest Stack version"
-        mversion <- getLatestHackageVersion YesRequireHackageIndex "stack" UsePreferredVersions
+        void
+          $ updateHackageIndex
+          $ Just "Updating index to make sure we find the latest Stack version."
+        mversion <- getLatestHackageVersion
+          YesRequireHackageIndex
+          "stack"
+          UsePreferredVersions
         (PackageIdentifierRevision _ version _) <-
           case mversion of
-            Nothing -> throwString "No Stack version found in package indices"
+            Nothing -> prettyThrowIO StackInPackageIndexNotFound
             Just version -> pure version
-
-        if version <= mkVersion' Paths.version
-            then do
-                prettyInfoS "Already at latest version, no upgrade required"
-                pure Nothing
-            else do
-                suffix <- parseRelDir $ "stack-" ++ versionString version
-                let dir = tmp </> suffix
-                mrev <- getLatestHackageRevision YesRequireHackageIndex "stack" version
-                case mrev of
-                  Nothing -> throwString "Latest version with no revision"
-                  Just (_rev, cfKey, treeKey) -> do
-                    let ident = PackageIdentifier "stack" version
-                    unpackPackageLocation dir $ PLIHackage ident cfKey treeKey
-                    pure $ Just dir
+        if version <= stackVersion
+          then do
+            prettyInfoS "Already at latest version, no upgrade required."
+            pure Nothing
+          else do
+            suffix <- parseRelDir $ "stack-" ++ versionString version
+            let dir = tmp </> suffix
+            mrev <- getLatestHackageRevision
+              YesRequireHackageIndex
+              "stack"
+              version
+            case mrev of
+              Nothing -> prettyThrowIO VersionWithNoRevision
+              Just (_rev, cfKey, treeKey) -> do
+                let ident = PackageIdentifier "stack" version
+                unpackPackageLocation dir $ PLIHackage ident cfKey treeKey
+                pure $ Just dir
 
     let modifyGO dir go = go
-          { globalResolver = Nothing -- always use the resolver settings in the stack.yaml file
-          , globalStackYaml = SYLOverride $ dir </> stackDotYaml
-          }
-        boptsCLI = defaultBuildOptsCLI
-          { boptsCLITargets = ["stack"]
+          { snapshot = Nothing -- always use the snapshot settings in the
+                               -- stack.yaml file
+          , stackYaml = SYLOverride $ dir </> stackDotYaml
           }
+        boptsCLI = defaultBuildOptsCLI { targetsCLI = ["stack"] }
     forM_ mdir $ \dir ->
-      local (over globalOptsL (modifyGO dir)) $
-      withConfig NoReexec $ withEnvConfig AllowNoTargets boptsCLI $
-      local (set (buildOptsL.buildOptsInstallExesL) True) $
-      build Nothing
+      local (over globalOptsL (modifyGO dir))
+        $ withConfig NoReexec
+        $ withEnvConfig AllowNoTargets boptsCLI
+        $ local (set (buildOptsL . buildOptsInstallExesL) True)
+        $ build Nothing
diff --git a/src/Stack/Upload.hs b/src/Stack/Upload.hs
index e3fdc26a97..413d6b289f 100644
--- a/src/Stack/Upload.hs
+++ b/src/Stack/Upload.hs
@@ -1,107 +1,331 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE FlexibleInstances   #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections       #-}
-
--- | Provide ability to upload tarballs to Hackage.
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+{-|
+Module      : Stack.Upload
+Description : Types and functions related to Stack's @upload@ command.
+License     : BSD-3-Clause
+
+Types and functions related to Stack's @upload@ command.
+-}
+
 module Stack.Upload
-    ( -- * Upload
-      upload
-    , uploadBytes
-    , uploadRevision
-      -- * Credentials
-    , HackageCreds
-    , HackageAuth(..)
-    , HackageKey(..)
-    , loadAuth
-    , writeFilePrivate
-      -- * Internal
-    , maybeGetHackageKey
-    ) where
+  ( -- * Upload
+    UploadOpts (..)
+  , SDistOpts (..)
+  , UploadContent (..)
+  , UploadVariant (..)
+  , uploadCmd
+  , upload
+  , uploadBytes
+  , uploadRevision
+    -- * Credentials
+  , HackageCreds
+  , HackageAuth (..)
+  , HackageKey (..)
+  , loadAuth
+  , writeFilePrivate
+    -- * Internal
+  , maybeGetHackageKey
+  ) where
 
+import           Conduit ( mapOutput, sinkList )
+import           Data.Aeson
+                   ( FromJSON (..), ToJSON (..), (.:), (.=), decode'
+                   , fromEncoding, object, toEncoding, withObject
+                   )
+import           Data.ByteString.Builder ( lazyByteString )
+import qualified Data.ByteString.Char8 as S
+import qualified Data.ByteString.Lazy as L
+import qualified Data.Conduit.Binary as CB
+import qualified Data.Text as T
+import           Network.HTTP.StackClient
+                   ( Request, RequestBody (RequestBodyLBS), Response
+                   , applyDigestAuth, displayDigestAuthException, formDataBody
+                   , getGlobalManager, getResponseBody, getResponseStatusCode
+                   , httpNoBody, method, methodPost, methodPut, parseRequest
+                   , partBS, partFileRequestBody, partLBS, requestBody
+                   , setRequestHeader, setRequestHeaders, withResponse
+                   )
+import           Path ( (</>), addExtension, parseRelFile )
+import           Path.IO ( resolveDir', resolveFile' )
+import qualified Path.IO as Path
+import           Stack.Constants ( isStackUploadDisabled )
+import           Stack.Constants.Config ( distDirFromDir )
 import           Stack.Prelude
-import           Data.Aeson                            (FromJSON (..),
-                                                        ToJSON (..),
-                                                        decode', toEncoding, fromEncoding,
-                                                        object, withObject,
-                                                        (.:), (.=))
-import           Data.ByteString.Builder               (lazyByteString)
-import qualified Data.ByteString.Char8                 as S
-import qualified Data.ByteString.Lazy                  as L
-import qualified Data.Conduit.Binary                   as CB
-import qualified Data.Text                             as T
-import           Network.HTTP.StackClient              (Request,
-                                                        RequestBody(RequestBodyLBS),
-                                                        Response,
-                                                        withResponse,
-                                                        httpNoBody,
-                                                        getGlobalManager,
-                                                        getResponseStatusCode,
-                                                        getResponseBody,
-                                                        setRequestHeader,
-                                                        parseRequest,
-                                                        formDataBody, partFileRequestBody,
-                                                        partBS, partLBS,
-                                                        applyDigestAuth,
-                                                        displayDigestAuthException)
-import           Stack.Options.UploadParser
-import           Stack.Types.Config
-import           System.Directory                      (createDirectoryIfMissing,
-                                                        removeFile, renameFile)
-import           System.Environment                    (lookupEnv)
-import           System.FilePath                       ((</>), takeFileName, takeDirectory)
-import           System.PosixCompat.Files              (setFileMode)
+import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig )
+import           Stack.SDist
+                   ( SDistOpts (..), checkSDistTarball, checkSDistTarball'
+                   , getSDistTarball, readLocalPackage
+                   )
+import           Stack.Types.Config ( Config (..), configL, stackRootL )
+import qualified Stack.Types.Config as Config
+import           Stack.Types.EnvConfig ( HasEnvConfig )
+import           Stack.Types.Package ( LocalPackage (..), packageIdentifier )
+import           Stack.Types.Runner ( Runner )
+import           Stack.Types.UploadOpts ( UploadOpts (..), UploadVariant (..) )
+import           System.Directory
+                   ( createDirectoryIfMissing, doesDirectoryExist, doesFileExist
+                   , removeFile, renameFile
+                   )
+import           System.Environment ( lookupEnv )
+import qualified System.FilePath as FP
+import           System.PosixCompat.Files ( setFileMode )
+
+-- | Type representing \'pretty\' exceptions thrown by functions exported by the
+-- "Stack.Upload" module.
+data UploadPrettyException
+  = AuthenticationFailure
+  | ArchiveUploadFailure !Int ![String] !String
+  | DocsTarballInvalid ![(String, Path Abs File)]
+  | ItemsInvalid ![FilePath]
+  | NoItemSpecified !String
+  | PackageDirectoryInvalid ![FilePath]
+  | PackageIdNotSpecifiedForDocsUploadBug
+  | PackageIdSpecifiedForPackageUploadBug
+  | TarGzFileNameInvalidBug !String
+  deriving Show
+
+instance Pretty UploadPrettyException where
+  pretty AuthenticationFailure =
+    "[S-2256]"
+    <> line
+    <> flow "authentification failure"
+    <> line
+    <> flow "Authentication failure uploading to server"
+  pretty (ArchiveUploadFailure code res tarName) =
+    "[S-6108]"
+    <> line
+    <> flow "unhandled status code:" <+> fromString (show code)
+    <> line
+    <> flow "Upload failed on" <+> style File (fromString tarName)
+    <> line
+    <> vsep (map string res)
+  pretty (DocsTarballInvalid invalidItems) =
+    "[S-2837]"
+    <> line
+    <> flow "Stack can't find:"
+    <> line
+    <> invalidList
+   where
+    invalidItem (pkgIdName, tarGzFile) = fillSep
+      [ pretty tarGzFile
+      , "for"
+      , style Current (fromString pkgIdName) <> "."
+      ]
+    invalidList = bulletedList $ map invalidItem invalidItems
+  pretty (ItemsInvalid invalidItems) =
+    "[S-3179]"
+    <> line
+    <> flow "For package upload, Stack expects a list of relative paths to \
+            \tosdist tarballs or package directories. Stack can't find:"
+    <> line
+    <> invalidList
+   where
+    invalidList = bulletedList $ map (style File . fromString) invalidItems
+  pretty (NoItemSpecified subject) =
+    "[S-3030]"
+    <> line
+    <> fillSep
+         [ flow "An item must be specified. To upload"
+         , flow subject
+         , flow "please run"
+         , style Shell "stack upload ."
+         , flow "(with the period at the end)."
+         ]
+  pretty (PackageDirectoryInvalid invalidItems) =
+    "[S-5908]"
+    <> line
+    <> flow "For documentation upload, Stack expects a list of relative paths \
+            \to package directories. Stack can't find:"
+    <> line
+    <> invalidList
+   where
+    invalidList = bulletedList $ map (style Current . fromString) invalidItems
+  pretty PackageIdNotSpecifiedForDocsUploadBug = bugPrettyReport "[S-7274]" $
+    flow "uploadBytes: Documentation upload but package identifier not \
+         \specified."
+  pretty PackageIdSpecifiedForPackageUploadBug = bugPrettyReport "[S-5860]" $
+    flow "uploadBytes: Package upload but package identifier specified."
+  pretty (TarGzFileNameInvalidBug name) = bugPrettyReport "[S-5955]" $
+    fillSep
+      [ flow "uploadCmd: the name of the"
+      , fromString name <> ".tar.gz"
+      , flow "file could not be parsed."
+      ]
 
+instance Exception UploadPrettyException
 
+-- | Type representing forms of content for upload to Hackage.
+data UploadContent
+  = SDist
+    -- ^ Content in the form of an sdist tarball.
+  | DocArchive
+    -- ^ Content in the form of an archive file of package documentation.
+
+-- | Function underlying the @stack upload@ command. Upload to Hackage.
+uploadCmd :: UploadOpts -> RIO Runner ()
+uploadCmd (UploadOpts [] uoDocumentation _ _ _ _ _ _) = do
+  let subject = if uoDocumentation
+        then "documentation for the current package,"
+        else "the current package,"
+  prettyThrowIO $ NoItemSpecified subject
+uploadCmd uo = do
+  let setSaveHackageCreds config =
+        let saveHackageCreds = config.saveHackageCreds <> uo.saveHackageCreds
+        in config { Config.saveHackageCreds = saveHackageCreds }
+  withConfig YesReexec $ local setSaveHackageCreds $ withDefaultEnvConfig $ do
+    config <- view configL
+    let hackageUrl = T.unpack config.hackageBaseUrl
+    if uo.documentation
+      then do
+        (dirs, invalid) <-
+          liftIO $ partitionM doesDirectoryExist uo.itemsToWorkWith
+        unless (null invalid) $
+          prettyThrowIO $ PackageDirectoryInvalid invalid
+        (failed, items) <- partitionEithers <$> forM dirs checkDocsTarball
+        unless (null failed) $ do
+          prettyThrowIO $ DocsTarballInvalid failed
+        getCreds <- memoizeRef $ loadAuth config
+        forM_ items $ \(pkgIdName, tarGzFile) -> do
+          creds <- runMemoized getCreds
+          upload
+            hackageUrl
+            creds
+            DocArchive
+            (Just pkgIdName)
+            (toFilePath tarGzFile)
+            uo.uploadVariant
+      else do
+        (files, nonFiles) <-
+          liftIO $ partitionM doesFileExist uo.itemsToWorkWith
+        (dirs, invalid) <- liftIO $ partitionM doesDirectoryExist nonFiles
+        unless (null invalid) $ do
+          prettyThrowIO $ ItemsInvalid invalid
+        let sdistOpts = SDistOpts
+              uo.itemsToWorkWith
+              uo.pvpBounds
+              uo.check
+              uo.buildPackage
+              uo.tarPath
+        getCreds <- memoizeRef $ loadAuth config
+        mapM_ (resolveFile' >=> checkSDistTarball sdistOpts) files
+        forM_ files $ \file -> do
+          tarFile <- resolveFile' file
+          creds <- runMemoized getCreds
+          upload
+            hackageUrl
+            creds
+            SDist
+            Nothing
+            (toFilePath tarFile)
+            uo.uploadVariant
+        forM_ dirs $ \dir -> do
+          pkgDir <- resolveDir' dir
+          (tarName, tarBytes, mcabalRevision) <-
+            getSDistTarball uo.pvpBounds pkgDir
+          checkSDistTarball' sdistOpts tarName tarBytes
+          creds <- runMemoized getCreds
+          uploadBytes
+            hackageUrl
+            creds
+            SDist
+            Nothing
+            tarName
+            uo.uploadVariant
+            tarBytes
+          forM_ mcabalRevision $ uncurry $ uploadRevision hackageUrl creds
+   where
+    checkDocsTarball ::
+         HasEnvConfig env
+      => FilePath
+      -> RIO env (Either (String, Path Abs File) (String, Path Abs File))
+    checkDocsTarball dir = do
+      pkgDir <- resolveDir' dir
+      distDir <- distDirFromDir pkgDir
+      lp <- readLocalPackage pkgDir
+      let pkgId = packageIdentifier lp.package
+          pkgIdName = packageIdentifierString pkgId
+          name = pkgIdName <> "-docs"
+      tarGzFileName <- maybe
+        (prettyThrowIO $ TarGzFileNameInvalidBug name)
+        pure
+        ( do nameRelFile <- parseRelFile name
+             addExtension ".gz" =<< addExtension ".tar" nameRelFile
+        )
+      let tarGzFile = distDir Path.</> tarGzFileName
+      isFile <- Path.doesFileExist tarGzFile
+      pure $ (if isFile then Right else Left) (pkgIdName, tarGzFile)
+    partitionM _ [] = pure ([], [])
+    partitionM f (x:xs) = do
+      r <- f x
+      (as, bs) <- partitionM f xs
+      pure $ if r then (x:as, bs) else (as, x:bs)
+
+-- | Type representing Hackage API authentification tokens.
 newtype HackageKey = HackageKey Text
-    deriving (Eq, Show)
+  deriving (Eq, Show)
 
 -- | Username and password to log into Hackage.
 --
 -- Since 0.1.0.0
 data HackageCreds = HackageCreds
-    { hcUsername :: !Text
-    , hcPassword :: !Text
-    , hcCredsFile :: !FilePath
-    }
-    deriving (Eq, Show)
+  { username :: !Text
+  , password :: !Text
+  , credsFile :: !FilePath
+  }
+  deriving (Eq, Show)
 
-data HackageAuth = HAKey HackageKey
-                 | HACreds HackageCreds
-    deriving (Eq, Show)
+-- | Type representing Hackage authentifications
+data HackageAuth
+  = HAKey HackageKey
+    -- ^ With a Hackage API authentification token registered by a user.
+  | HACreds HackageCreds
+    -- ^ With a Hackage user's credentials.
+  deriving (Eq, Show)
 
 instance ToJSON HackageCreds where
-    toJSON (HackageCreds u p _) = object
-        [ "username" .= u
-        , "password" .= p
-        ]
+  toJSON (HackageCreds u p _) = object
+    [ "username" .= u
+    , "password" .= p
+    ]
+
 instance FromJSON (FilePath -> HackageCreds) where
-    parseJSON = withObject "HackageCreds" $ \o -> HackageCreds
-        <$> o .: "username"
-        <*> o .: "password"
+  parseJSON = withObject "HackageCreds" $ \o -> HackageCreds
+    <$> o .: "username"
+    <*> o .: "password"
 
 withEnvVariable :: Text -> IO Text -> IO Text
-withEnvVariable varName fromPrompt = lookupEnv (T.unpack varName) >>= maybe fromPrompt (pure . T.pack)
+withEnvVariable varName fromPrompt =
+  lookupEnv (T.unpack varName) >>= maybe fromPrompt (pure . T.pack)
 
+-- | Optionally, load Hackage API authentification token from the @HACKAGE_KEY@
+-- environment variable, if it exists.
 maybeGetHackageKey :: RIO m (Maybe HackageKey)
-maybeGetHackageKey = liftIO $ fmap (HackageKey . T.pack) <$> lookupEnv "HACKAGE_KEY"
+maybeGetHackageKey =
+  liftIO $ fmap (HackageKey . T.pack) <$> lookupEnv "HACKAGE_KEY"
 
-loadAuth :: HasLogFunc m => Config -> RIO m HackageAuth
-loadAuth config = do
-  maybeHackageKey <- maybeGetHackageKey
-  case maybeHackageKey of
-    Just key -> do
-      logInfo "HACKAGE_KEY found in env, using that for credentials."
-      pure $ HAKey key
-    Nothing -> HACreds <$> loadUserAndPassword config
+-- | Load Hackage authentification from the environment, if applicable, or from
+-- the given configuration.
+loadAuth :: (HasLogFunc m, HasTerm m) => Config -> RIO m HackageAuth
+loadAuth config = maybeGetHackageKey >>= \case
+  Just key -> do
+    prettyInfoL
+      [ style Shell "HACKAGE_KEY"
+      , flow "environment variable found, using that for credentials."
+      ]
+    pure $ HAKey key
+  Nothing -> HACreds <$> loadUserAndPassword config
 
 -- | Load Hackage credentials, either from a save file or the command
 -- line.
 --
 -- Since 0.1.0.0
-loadUserAndPassword :: HasLogFunc m => Config -> RIO m HackageCreds
+loadUserAndPassword :: HasTerm m => Config -> RIO m HackageCreds
 loadUserAndPassword config = do
   fp <- liftIO $ credsFile config
   elbs <- liftIO $ tryIO $ L.readFile fp
@@ -112,32 +336,41 @@ loadUserAndPassword config = do
       -- didn't do this
       writeFilePrivate fp $ lazyByteString lbs
 
-      unless (configSaveHackageCreds config) $ do
-        logWarn "WARNING: You've set save-hackage-creds to false"
-        logWarn "However, credentials were found at:"
-        logWarn $ "  " <> fromString fp
+      unless (fromFirstTrue config.saveHackageCreds) $ do
+        prettyWarnL
+          [ flow "You've set"
+          , style Shell "save-hackage-creds"
+          , "to"
+          , style Shell "false" <> "."
+          , flow "However, credentials were found at:"
+          , style File (fromString fp) <> "."
+          ]
       pure $ mkCreds fp
-  where
-    fromPrompt :: HasLogFunc m => FilePath -> RIO m HackageCreds
-    fromPrompt fp = do
-      username <- liftIO $ withEnvVariable "HACKAGE_USERNAME" (prompt "Hackage username: ")
-      password <- liftIO $ withEnvVariable "HACKAGE_PASSWORD" (promptPassword "Hackage password: ")
-      let hc = HackageCreds
-            { hcUsername = username
-            , hcPassword = password
-            , hcCredsFile = fp
-            }
-
-      when (configSaveHackageCreds config) $ do
-        shouldSave <- promptBool $ T.pack $
-          "Save hackage credentials to file at " ++ fp ++ " [y/n]? "
-        logInfo "NOTE: Avoid this prompt in the future by using: save-hackage-creds: false"
-        when shouldSave $ do
-          writeFilePrivate fp $ fromEncoding $ toEncoding hc
-          logInfo "Saved!"
-          hFlush stdout
-
-      pure hc
+ where
+  fromPrompt :: HasTerm m => FilePath -> RIO m HackageCreds
+  fromPrompt fp = do
+    username <- liftIO $ withEnvVariable "HACKAGE_USERNAME" (prompt "Hackage username: ")
+    password <- liftIO $ withEnvVariable "HACKAGE_PASSWORD" (promptPassword "Hackage password: ")
+    let hc = HackageCreds
+          { username
+          , password
+          , credsFile = fp
+          }
+
+    when (fromFirstTrue config.saveHackageCreds) $ do
+      shouldSave <- promptBool $ T.pack $
+        "Save Hackage credentials to file at " ++ fp ++ " [y/n]? "
+      prettyNoteL
+        [ flow "Avoid this prompt in the future by using the configuration \
+               \file option"
+        , style Shell (flow "save-hackage-creds: false") <> "."
+        ]
+      when shouldSave $ do
+        writeFilePrivate fp $ fromEncoding $ toEncoding hc
+        prettyInfoS "Saved!"
+        hFlush stdout
+
+    pure hc
 
 -- | Write contents to a file which is always private.
 --
@@ -147,103 +380,174 @@ loadUserAndPassword config = do
 --
 -- * https://github.com/commercialhaskell/stack/pull/4665
 writeFilePrivate :: MonadIO m => FilePath -> Builder -> m ()
-writeFilePrivate fp builder = liftIO $ withTempFile (takeDirectory fp) (takeFileName fp) $ \fpTmp h -> do
-  -- Temp file is created such that only current user can read and write it.
-  -- See docs for openTempFile: https://www.stackage.org/haddock/lts-13.14/base-4.12.0.0/System-IO.html#v:openTempFile
+writeFilePrivate fp builder =
+  liftIO $ withTempFile (FP.takeDirectory fp) (FP.takeFileName fp) $ \fpTmp h -> do
+    -- Temp file is created such that only current user can read and write it.
+    -- See docs for openTempFile:
+    -- https://www.stackage.org/haddock/lts-13.14/base-4.12.0.0/System-IO.html#v:openTempFile
 
-  -- Write to the file and close the handle.
-  hPutBuilder h builder
-  hClose h
+    -- Write to the file and close the handle.
+    hPutBuilder h builder
+    hClose h
 
-  -- Make sure the destination file, if present, is writeable
-  void $ tryIO $ setFileMode fp 0o600
+    -- Make sure the destination file, if present, is writeable
+    void $ tryIO $ setFileMode fp 0o600
 
-  -- And atomically move
-  renameFile fpTmp fp
+    -- And atomically move
+    renameFile fpTmp fp
 
 credsFile :: Config -> IO FilePath
 credsFile config = do
-    let dir = toFilePath (view stackRootL config) </> "upload"
-    createDirectoryIfMissing True dir
-    pure $ dir </> "credentials.json"
+  let dir = toFilePath (view stackRootL config) FP.</> "upload"
+  createDirectoryIfMissing True dir
+  pure $ dir FP.</> "credentials.json"
 
 addAPIKey :: HackageKey -> Request -> Request
-addAPIKey (HackageKey key) req =
-  setRequestHeader "Authorization" [fromString $ "X-ApiKey" ++ " " ++ T.unpack key] req
+addAPIKey (HackageKey key) = setRequestHeader
+  "Authorization"
+  [fromString $ "X-ApiKey" ++ " " ++ T.unpack key]
 
-applyAuth :: HasLogFunc m => HackageAuth -> Request -> RIO m Request
-applyAuth haAuth req0 = do
-    case haAuth of
-        HAKey key -> pure (addAPIKey key req0)
-        HACreds creds -> applyCreds creds req0
+applyAuth ::
+     (HasLogFunc m, HasTerm m)
+  => HackageAuth
+  -> Request
+  -> RIO m Request
+applyAuth haAuth req0 =
+  case haAuth of
+    HAKey key -> pure (addAPIKey key req0)
+    HACreds creds -> applyCreds creds req0
 
-applyCreds :: HasLogFunc m => HackageCreds -> Request -> RIO m Request
+applyCreds ::
+     (HasLogFunc m, HasTerm m)
+  => HackageCreds
+  -> Request
+  -> RIO m Request
 applyCreds creds req0 = do
   manager <- liftIO getGlobalManager
-  ereq <- liftIO $ applyDigestAuth
-    (encodeUtf8 $ hcUsername creds)
-    (encodeUtf8 $ hcPassword creds)
-    req0
-    manager
+  ereq <- if isStackUploadDisabled
+    then do
+      debugRequest "applyCreds" req0
+      pure (Left $ toException ExitSuccess )
+    else
+      liftIO $ applyDigestAuth
+        (encodeUtf8 creds.username)
+        (encodeUtf8 creds.password)
+        req0
+        manager
   case ereq of
-      Left e -> do
-          logWarn "WARNING: No HTTP digest prompt found, this will probably fail"
-          case fromException e of
-              Just e' -> logWarn $ fromString $ displayDigestAuthException e'
-              Nothing -> logWarn $ fromString $ displayException e
-          pure req0
-      Right req -> pure req
-
--- | Upload a single tarball with the given @Uploader@.  Instead of
--- sending a file like 'upload', this sends a lazy bytestring.
+    Left e -> do
+      prettyWarn $
+           flow "No HTTP digest prompt found, this will probably fail."
+        <> blankLine
+        <> string
+             ( case fromException e of
+                 Just e' -> displayDigestAuthException e'
+                 Nothing -> displayException e
+             )
+      pure req0
+    Right req -> pure req
+
+-- | Upload a single tarball with the given @Uploader@. Instead of sending a
+-- file like 'upload', this sends a lazy bytestring.
 --
 -- Since 0.1.2.1
-uploadBytes :: HasLogFunc m
-            => String -- ^ Hackage base URL
-            -> HackageAuth
-            -> String -- ^ tar file name
-            -> UploadVariant
-            -> L.ByteString -- ^ tar file contents
-            -> RIO m ()
-uploadBytes baseUrl auth tarName uploadVariant bytes = do
-    let req1 = setRequestHeader "Accept" ["text/plain"]
-               (fromString $ baseUrl
-                          <> "packages/"
-                          <> case uploadVariant of
-                               Publishing -> ""
-                               Candidate -> "candidates/"
-               )
-        formData = [partFileRequestBody "package" tarName (RequestBodyLBS bytes)]
-    req2 <- liftIO $ formDataBody formData req1
-    req3 <- applyAuth auth req2
-    logInfo $ "Uploading " <> fromString tarName <> "... "
-    hFlush stdout
-    withRunInIO $ \runInIO -> withResponse req3 (runInIO . inner)
+uploadBytes ::
+     HasTerm m
+  => String -- ^ Hackage base URL
+  -> HackageAuth
+  -> UploadContent
+     -- ^ Form of the content to be uploaded.
+  -> Maybe String
+     -- ^ Optional package identifier name, applies only to the upload of
+     -- documentation.
+  -> String -- ^ tar file name
+  -> UploadVariant
+  -> L.ByteString -- ^ tar file contents
+  -> RIO m ()
+uploadBytes baseUrl auth contentForm mPkgIdName tarName uploadVariant bytes = do
+  (url, headers, uploadMethod) <- case contentForm of
+    SDist -> do
+      unless (isNothing mPkgIdName) $
+        prettyThrowIO PackageIdSpecifiedForPackageUploadBug
+      let variant = case uploadVariant of
+            Publishing -> ""
+            Candidate -> "candidates/"
+      pure
+        ( baseUrl <> "packages/" <> variant
+        , [("Accept", "text/plain")]
+        , methodPost
+        )
+    DocArchive -> case mPkgIdName of
+      Nothing -> prettyThrowIO PackageIdNotSpecifiedForDocsUploadBug
+      Just pkgIdName -> do
+        let variant = case uploadVariant of
+              Publishing -> ""
+              Candidate -> "candidate/"
+        pure
+          ( baseUrl <> "package/" <> pkgIdName <> "/" <> variant <> "docs"
+          , [ ("Content-Type", "application/x-tar")
+            , ("Content-Encoding", "gzip")
+            ]
+          , methodPut
+          )
+  let req1 = setRequestHeaders headers (fromString url)
+      reqData = RequestBodyLBS bytes
+      formData = [partFileRequestBody "package" tarName reqData]
+
+  req2 <- case contentForm of
+    SDist -> liftIO $ formDataBody formData req1
+    DocArchive -> pure $ req1 { requestBody = reqData }
+  let req3 = req2 { method = uploadMethod }
+  req4 <- applyAuth auth req3
+  prettyInfoL
+    [ "Uploading"
+    , style Current (fromString tarName) <> "..."
+    ]
+  hFlush stdout
+  if isStackUploadDisabled
+    then
+      debugRequest "uploadBytes" req4
+    else
+      withRunInIO $ \runInIO -> withResponse req4 (runInIO . inner)
  where
-    inner :: HasLogFunc m => Response (ConduitM () S.ByteString IO ()) -> RIO m ()
-    inner res =
-        case getResponseStatusCode res of
-            200 -> logInfo "done!"
-            401 -> do
-                logError "authentication failure"
-                case auth of
-                  HACreds creds -> handleIO (const $ pure ()) (liftIO $ removeFile (hcCredsFile creds))
-                  _ -> pure ()
-                throwString "Authentication failure uploading to server"
-            403 -> do
-                logError "forbidden upload"
-                logError "Usually means: you've already uploaded this package/version combination"
-                logError "Ignoring error and continuing, full message from Hackage below:\n"
-                liftIO $ printBody res
-            503 -> do
-                logError "service unavailable"
-                logError "This error some times gets sent even though the upload succeeded"
-                logError "Check on Hackage to see if your package is present"
-                liftIO $ printBody res
-            code -> do
-                logError $ "unhandled status code: " <> fromString (show code)
-                liftIO $ printBody res
-                throwString $ "Upload failed on " <> fromString tarName
+  inner :: HasTerm m => Response (ConduitM () S.ByteString IO ()) -> RIO m ()
+  inner res =
+    case getResponseStatusCode res of
+      200 -> prettyInfoS "done!"
+      401 -> do
+        case auth of
+          HACreds creds ->
+            handleIO
+              (const $ pure ())
+              (liftIO $ removeFile creds.credsFile)
+          _ -> pure ()
+        prettyThrowIO AuthenticationFailure
+      403 -> do
+        prettyError $
+          "[S-2804]"
+          <> line
+          <> flow "forbidden upload"
+          <> line
+          <> flow "Usually means: you've already uploaded this package/version \
+                  \combination. Ignoring error and continuing. The full \
+                  \message from Hackage is below:"
+          <> blankLine
+        liftIO $ printBody res
+      503 -> do
+        prettyError $
+          "[S-4444]"
+          <> line
+          <> flow "service unavailable"
+          <> line
+          <> flow "This error some times gets sent even though the upload \
+                  \succeeded. Check on Hackage to see if your package is \
+                  \present. The full message form Hackage is below:"
+          <> blankLine
+        liftIO $ printBody res
+      code -> do
+        let resBody = mapOutput show (getResponseBody res)
+        resBody' <- liftIO $ runConduit $ resBody .| sinkList
+        prettyThrowIO (ArchiveUploadFailure code resBody' tarName)
 
 printBody :: Response (ConduitM () S.ByteString IO ()) -> IO ()
 printBody res = runConduit $ getResponseBody res .| CB.sinkHandle stdout
@@ -251,21 +555,31 @@ printBody res = runConduit $ getResponseBody res .| CB.sinkHandle stdout
 -- | Upload a single tarball with the given @Uploader@.
 --
 -- Since 0.1.0.0
-upload :: HasLogFunc m
-       => String -- ^ Hackage base URL
-       -> HackageAuth
-       -> FilePath
-       -> UploadVariant
-       -> RIO m ()
-upload baseUrl auth fp uploadVariant =
-  uploadBytes baseUrl auth (takeFileName fp) uploadVariant =<< liftIO (L.readFile fp)
-
-uploadRevision :: HasLogFunc m
-               => String -- ^ Hackage base URL
-               -> HackageAuth
-               -> PackageIdentifier
-               -> L.ByteString
-               -> RIO m ()
+upload ::
+     (HasLogFunc m, HasTerm m)
+  => String -- ^ Hackage base URL
+  -> HackageAuth
+  -> UploadContent
+  -> Maybe String
+     -- ^ Optional package identifier name, applies only to the upload of
+     -- documentation.
+  -> FilePath
+     -- ^ Path to archive file.
+  -> UploadVariant
+  -> RIO m ()
+upload baseUrl auth contentForm mPkgIdName fp uploadVariant =
+  uploadBytes
+    baseUrl auth contentForm mPkgIdName (FP.takeFileName fp) uploadVariant
+      =<< liftIO (L.readFile fp)
+
+-- | Upload a revised Cabal file for the given package.
+uploadRevision ::
+     (HasLogFunc m, HasTerm m)
+  => String -- ^ Hackage base URL
+  -> HackageAuth
+  -> PackageIdentifier
+  -> L.ByteString
+  -> RIO m ()
 uploadRevision baseUrl auth ident@(PackageIdentifier name _) cabalFile = do
   req0 <- parseRequest $ concat
     [ baseUrl
@@ -281,4 +595,17 @@ uploadRevision baseUrl auth ident@(PackageIdentifier name _) cabalFile = do
     ]
     req0
   req2 <- applyAuth auth req1
-  void $ httpNoBody req2
+  if isStackUploadDisabled
+    then
+      debugRequest "uploadRevision" req2
+    else
+      void $ httpNoBody req2
+
+debugRequest :: HasTerm env => String -> Request -> RIO env ()
+debugRequest callSite req = prettyInfo $
+     fillSep
+       [ fromString callSite <> ":"
+       , flow "When enabled, would apply the following request:"
+       ]
+  <> line
+  <> fromString (show req)
diff --git a/src/System/Process/Pager.hs b/src/System/Process/Pager.hs
index c4f40b341d..ac696351ce 100644
--- a/src/System/Process/Pager.hs
+++ b/src/System/Process/Pager.hs
@@ -1,65 +1,73 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE DeriveDataTypeable  #-}
-{-# LANGUAGE RankNTypes          #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
--- | Run external pagers (@$PAGER@, @less@, @more@).
+{-|
+Module      : System.Process.Pager
+Description : Run external pagers (@$PAGER@, @less@, @more@).
+License     : BSD-3-Clause
+
+Run external pagers (@$PAGER@, @less@, @more@).
+-}
+
 module System.Process.Pager
   ( pageWriter
   , pageText
   , PagerException (..)
   ) where
 
-import Stack.Prelude
-import System.Directory (findExecutable)
-import System.Environment (lookupEnv)
-import System.Process ( createProcess, cmdspec, shell, proc, waitForProcess
-                      , CmdSpec (ShellCommand, RawCommand)
-                      , StdStream (CreatePipe)
-                      , CreateProcess (std_in, close_fds, delegate_ctlc)
-                      )
-import Control.Monad.Trans.Maybe (MaybeT (runMaybeT, MaybeT))
+import           Control.Monad.Trans.Maybe ( MaybeT (runMaybeT, MaybeT) )
 import qualified Data.Text.IO as T
+import           Stack.Prelude
+import           System.Directory ( findExecutable )
+import           System.Environment ( lookupEnv )
+import           System.Process
+                   ( createProcess, cmdspec, shell, proc, waitForProcess
+                   , CmdSpec (ShellCommand, RawCommand)
+                   , StdStream (CreatePipe)
+                   , CreateProcess (std_in, close_fds, delegate_ctlc)
+                   )
+
+-- | Type representing exceptions thrown by functions exported by the
+-- "System.Process.Pager" module.
+data PagerException
+  = PagerExitFailure CmdSpec Int
+  deriving Show
+
+instance Exception PagerException where
+  displayException (PagerExitFailure cmd n) =
+    let getStr (ShellCommand c) = c
+        getStr (RawCommand exePath _) = exePath
+    in  concat
+          [ "Error: [S-9392]\n"
+          , "Pager (`"
+          , getStr cmd
+          , "') exited with non-zero status: "
+          , show n
+          ]
 
 -- | Run pager, providing a function that writes to the pager's input.
 pageWriter :: (Handle -> IO ()) -> IO ()
-pageWriter writer =
-  do mpager <- runMaybeT $ cmdspecFromEnvVar
-                       <|> cmdspecFromExeName "less"
-                       <|> cmdspecFromExeName "more"
-     case mpager of
-       Just pager ->
-         do (Just h,_,_,procHandle) <- createProcess pager
-                                         { std_in = CreatePipe
-                                         , close_fds = True
-                                         , delegate_ctlc = True
-                                         }
-            (_ :: Either IOException ()) <- try (do writer h
-                                                    hClose h)
-            exit <- waitForProcess procHandle
-            case exit of
-              ExitSuccess -> pure ()
-              ExitFailure n -> throwIO (PagerExitFailure (cmdspec pager) n)
-            pure ()
-       Nothing -> writer stdout
-  where
-    cmdspecFromEnvVar = shell <$> MaybeT (lookupEnv "PAGER")
-    cmdspecFromExeName =
-      fmap (\path -> proc path []) . MaybeT . findExecutable
+pageWriter writer = do
+  let alternatives =
+            cmdspecFromEnvVar
+        <|> cmdspecFromExeName "less"
+        <|> cmdspecFromExeName "more"
+  runMaybeT alternatives >>= \case
+    Just pager -> do
+      (Just h,_,_,procHandle) <- createProcess pager
+                                   { std_in = CreatePipe
+                                   , close_fds = True
+                                   , delegate_ctlc = True
+                                   }
+      (_ :: Either IOException ()) <- try (do writer h; hClose h)
+      waitForProcess procHandle >>= \case
+        ExitSuccess -> pure ()
+        ExitFailure n -> throwIO (PagerExitFailure (cmdspec pager) n)
+    Nothing -> writer stdout
+ where
+  cmdspecFromEnvVar = shell <$> MaybeT (lookupEnv "PAGER")
+  cmdspecFromExeName =
+    fmap (\command -> proc command []) . MaybeT . findExecutable
 
 -- | Run pager to display a 'Text'
 pageText :: Text -> IO ()
 pageText = pageWriter . flip T.hPutStr
-
--- | Exception running pager.
-data PagerException = PagerExitFailure CmdSpec Int
-  deriving Typeable
-instance Show PagerException where
-  show (PagerExitFailure cmd n) =
-    let
-      getStr (ShellCommand c) = c
-      getStr (RawCommand exePath _) = exePath
-    in
-      "Pager (`" ++ getStr cmd ++ "') exited with non-zero status: " ++ show n
-
-instance Exception PagerException
diff --git a/src/main/BuildInfo.hs b/src/main/BuildInfo.hs
deleted file mode 100644
index d716a4f62d..0000000000
--- a/src/main/BuildInfo.hs
+++ /dev/null
@@ -1,95 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE CPP               #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-#ifdef USE_GIT_INFO
-{-# LANGUAGE TemplateHaskell   #-}
-#endif
-
--- Extracted from Main so that the Main module does not use CPP or TH,
--- and therefore doesn't need to be recompiled as often.
-module BuildInfo
-  ( versionString'
-  , maybeGitHash
-  , hpackVersion
-  ) where
-
-import Stack.Prelude
-import qualified Paths_stack as Meta
-import qualified Distribution.Text as Cabal (display)
-import           Distribution.System (buildArch)
-
-#ifndef HIDE_DEP_VERSIONS
-import qualified Build_stack
-#endif
-
-#ifdef USE_GIT_INFO
-import           GitHash (giCommitCount, giHash, tGitInfoCwdTry)
-#endif
-
-#ifdef USE_GIT_INFO
-import           Options.Applicative.Simple (simpleVersion)
-#endif
-
-#ifdef USE_GIT_INFO
-import           Data.Version (versionBranch)
-#else
-import           Data.Version (showVersion, versionBranch)
-#endif
-
-versionString' :: String
-#ifdef USE_GIT_INFO
-versionString' = concat $ concat
-    [ [$(simpleVersion Meta.version)]
-      -- Leave out number of commits for --depth=1 clone
-      -- See https://github.com/commercialhaskell/stack/issues/792
-    , case giCommitCount <$> $$tGitInfoCwdTry of
-        Left _ -> []
-        Right 1 -> []
-        Right count -> [" (", show count, " commits)"]
-    , [afterVersion]
-    ]
-#else
-versionString' = showVersion Meta.version ++ afterVersion
-#endif
-  where
-    afterVersion = concat
-      [ preReleaseString
-      , ' ' : Cabal.display buildArch
-      , depsString
-      , warningString
-      ]
-    preReleaseString =
-      case versionBranch Meta.version of
-        (_:y:_) | even y -> " PRE-RELEASE"
-        (_:_:z:_) | even z -> " RELEASE-CANDIDATE"
-        _ -> ""
-#ifdef HIDE_DEP_VERSIONS
-    depsString = " hpack-" ++ VERSION_hpack
-#else
-    depsString = "\nCompiled with:\n" ++ unlines (map ("- " ++) Build_stack.deps)
-#endif
-#ifdef SUPPORTED_BUILD
-    warningString = ""
-#else
-    warningString = unlines
-      [ ""
-      , "Warning: this is an unsupported build that may use different versions of"
-      , "dependencies and GHC than the officially released binaries, and therefore may"
-      , "not behave identically.  If you encounter problems, please try the latest"
-      , "official build by running 'stack upgrade --force-download'."
-      ]
-#endif
-
--- | If USE_GIT_INFO is enabled, the Git hash in the build directory, otherwise Nothing.
-maybeGitHash :: Maybe String
-maybeGitHash =
-#ifdef USE_GIT_INFO
-        (either (const Nothing) (Just . giHash) $$tGitInfoCwdTry)
-#else
-        Nothing
-#endif
-
--- | Hpack version we're compiled against
-hpackVersion :: String
-hpackVersion = VERSION_hpack
diff --git a/src/main/Main.hs b/src/main/Main.hs
deleted file mode 100644
index b4a2b44a7e..0000000000
--- a/src/main/Main.hs
+++ /dev/null
@@ -1,920 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE DeriveDataTypeable  #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE GADTs               #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE RecordWildCards     #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
--- | Main Stack tool entry point.
-
-module Main (main) where
-
-import           BuildInfo
-import           Stack.Prelude hiding (Display (..))
-import           Conduit (runConduitRes, sourceLazy, sinkFileCautious)
-import           Data.Attoparsec.Args (parseArgs, EscapingMode (Escaping))
-import           Data.Attoparsec.Interpreter (getInterpreterArgs)
-import qualified Data.List as L
-import qualified Data.Map.Strict as Map
-import qualified Data.Set as Set
-import qualified Data.Text as T
-import           Data.Version (showVersion)
-import           RIO.Process
-import           Distribution.Version (mkVersion')
-import           GHC.IO.Encoding (mkTextEncoding, textEncodingName)
-import           Options.Applicative
-import           Options.Applicative.Help (errorHelp, stringChunk, vcatChunks)
-import           Options.Applicative.Builder.Extra
-import           Options.Applicative.Complicated
-import           Pantry (loadSnapshot)
-import           Path
-import           Path.IO
-import qualified Paths_stack as Meta
-import           RIO.PrettyPrint
-import qualified RIO.PrettyPrint as PP (style)
-import           Stack.Build
-import           Stack.Build.Target (NeedTargets(..))
-import           Stack.Clean (CleanCommand(..), CleanOpts(..), clean)
-import           Stack.Config
-import           Stack.ConfigCmd as ConfigCmd
-import           Stack.Constants
-import           Stack.Constants.Config
-import           Stack.Coverage
-import qualified Stack.Docker as Docker
-import           Stack.Dot
-import           Stack.GhcPkg (findGhcPkgField)
-import qualified Stack.Nix as Nix
-import           Stack.FileWatch
-import           Stack.Ghci
-import           Stack.Hoogle
-import           Stack.List
-import           Stack.Ls
-import qualified Stack.IDE as IDE
-import           Stack.Init
-import           Stack.New
-import           Stack.Options.BuildParser
-import           Stack.Options.CleanParser
-import           Stack.Options.DockerParser
-import           Stack.Options.DotParser
-import           Stack.Options.ExecParser
-import           Stack.Options.GhciParser
-import           Stack.Options.GlobalParser
-
-import           Stack.Options.HpcReportParser
-import           Stack.Options.NewParser
-import           Stack.Options.NixParser
-import           Stack.Options.ScriptParser
-import           Stack.Options.SDistParser
-import           Stack.Options.UploadParser
-import           Stack.Options.Utils
-import qualified Stack.Path
-import           Stack.Runners
-import           Stack.Script
-import           Stack.SDist (getSDistTarball, checkSDistTarball, checkSDistTarball', SDistOpts(..))
-import           Stack.Setup (withNewLocalBuildTargets)
-import           Stack.SetupCmd
-import           Stack.Types.Version
-import           Stack.Types.Config
-import           Stack.Types.NamedComponent
-import           Stack.Types.SourceMap
-import           Stack.Unpack
-import           Stack.Upgrade
-import qualified Stack.Upload as Upload
-import qualified System.Directory as D
-import           System.Environment (getProgName, getArgs, withArgs)
-import           System.FilePath (isValid, pathSeparator, takeDirectory)
-import qualified System.FilePath as FP
-import           System.IO (hPutStrLn, hGetEncoding, hSetEncoding)
-import           System.Terminal (hIsTerminalDeviceOrMinTTY)
-
--- | Change the character encoding of the given Handle to transliterate
--- on unsupported characters instead of throwing an exception
-hSetTranslit :: Handle -> IO ()
-hSetTranslit h = do
-    menc <- hGetEncoding h
-    case fmap textEncodingName menc of
-        Just name
-          | '/' `notElem` name -> do
-              enc' <- mkTextEncoding $ name ++ "//TRANSLIT"
-              hSetEncoding h enc'
-        _ -> pure ()
-
-main :: IO ()
-main = do
-  -- Line buffer the output by default, particularly for non-terminal runs.
-  -- See https://github.com/commercialhaskell/stack/pull/360
-  hSetBuffering stdout LineBuffering
-  hSetBuffering stdin  LineBuffering
-  hSetBuffering stderr LineBuffering
-  hSetTranslit stdout
-  hSetTranslit stderr
-  args <- getArgs
-  progName <- getProgName
-  isTerminal <- hIsTerminalDeviceOrMinTTY stdout
-  -- On Windows, where applicable, defaultColorWhen has the side effect of
-  -- enabling ANSI for ANSI-capable native (ConHost) terminals, if not already
-  -- ANSI-enabled.
-  execExtraHelp args
-                Docker.dockerHelpOptName
-                (dockerOptsParser False)
-                ("Only showing --" ++ Docker.dockerCmdName ++ "* options.")
-  execExtraHelp args
-                Nix.nixHelpOptName
-                (nixOptsParser False)
-                ("Only showing --" ++ Nix.nixCmdName ++ "* options.")
-
-  currentDir <- D.getCurrentDirectory
-  eGlobalRun <- try $ commandLineHandler currentDir progName False
-  case eGlobalRun of
-    Left (exitCode :: ExitCode) ->
-      throwIO exitCode
-    Right (globalMonoid,run) -> do
-      global <- globalOptsFromMonoid isTerminal globalMonoid
-      when (globalLogLevel global == LevelDebug) $ hPutStrLn stderr versionString'
-      case globalReExecVersion global of
-          Just expectVersion -> do
-              expectVersion' <- parseVersionThrowing expectVersion
-              unless (checkVersion MatchMinor expectVersion' (mkVersion' Meta.version))
-                  $ throwIO $ InvalidReExecVersion expectVersion (showVersion Meta.version)
-          _ -> pure ()
-      withRunnerGlobal global $ run `catch` \e ->
-          -- This special handler stops "stack: " from being printed before the
-          -- exception
-          case fromException e of
-              Just ec -> exitWith ec
-              Nothing -> do
-                  logError $ fromString $ displayException e
-                  exitFailure
-
--- Vertically combine only the error component of the first argument with the
--- error component of the second.
-vcatErrorHelp :: ParserHelp -> ParserHelp -> ParserHelp
-vcatErrorHelp h1 h2 = h2 { helpError = vcatChunks [helpError h2, helpError h1] }
-
-commandLineHandler
-  :: FilePath
-  -> String
-  -> Bool
-  -> IO (GlobalOptsMonoid, RIO Runner ())
-commandLineHandler currentDir progName isInterpreter = complicatedOptions
-  (mkVersion' Meta.version)
-  (Just versionString')
-  hpackVersion
-  "stack - The Haskell Tool Stack"
-  ""
-  "Stack's documentation is available at https://docs.haskellstack.org/. \
-  \Command 'stack COMMAND --help' for help about a Stack command."
-  (globalOpts OuterGlobalOpts)
-  (Just failureCallback)
-  addCommands
-  where
-    failureCallback f args =
-      case L.stripPrefix "Invalid argument" (fst (renderFailure f "")) of
-          Just _ -> if isInterpreter
-                    then parseResultHandler args f
-                    else secondaryCommandHandler args f
-                        >>= interpreterHandler currentDir args
-          Nothing -> parseResultHandler args f
-
-    parseResultHandler args f =
-      if isInterpreter
-      then do
-        let hlp = errorHelp $ stringChunk
-              (unwords ["Error executing interpreter command:"
-                        , progName
-                        , unwords args])
-        handleParseResult (overFailure (vcatErrorHelp hlp) (Failure f))
-      else handleParseResult (Failure f)
-
-    addCommands = do
-      unless isInterpreter (do
-        addBuildCommand' "build"
-                         "Build the package(s) in this directory/configuration"
-                         buildCmd
-                         (buildOptsParser Build)
-        addBuildCommand' "install"
-                         "Shortcut for 'build --copy-bins'"
-                         buildCmd
-                         (buildOptsParser Install)
-        addCommand' "uninstall"
-         (unwords [ "Show how to uninstall Stack. This command does not"
-                  , "itself uninstall Stack."
-                  ] )
-                    uninstallCmd
-                    (pure())
-        addBuildCommand' "test"
-                         "Shortcut for 'build --test'"
-                         buildCmd
-                         (buildOptsParser Test)
-        addBuildCommand' "bench"
-                         "Shortcut for 'build --bench'"
-                         buildCmd
-                         (buildOptsParser Bench)
-        addBuildCommand' "haddock"
-                         "Shortcut for 'build --haddock'"
-                         buildCmd
-                         (buildOptsParser Haddock)
-        addCommand' "new"
-         (unwords [ "Create a new project from a template."
-                  , "Run 'stack templates' to see available templates. Will"
-                  , "also initialise if there is no stack.yaml file."
-                  , "Note: you can also specify a local file or a"
-                  , "remote URL as a template; or force an initialisation."
-                  ] )
-                    newCmd
-                    newOptsParser
-        addCommand' "templates"
-         (unwords [ "Show how to find templates available for 'stack new'."
-                  , "'stack new' can accept a template from a remote repository"
-                  , "(default: github), local file or remote URL."
-                  , "Note: this downloads the help file."
-                  ] )
-                    templatesCmd
-                    (pure ())
-        addCommand' "init"
-                    "Create Stack project configuration from Cabal or Hpack package specifications"
-                    initCmd
-                    initOptsParser
-        addCommand' "setup"
-                    "Get the appropriate GHC for your project"
-                    setupCmd
-                    setupParser
-        addCommand' "path"
-                    "Print out handy path information"
-                    Stack.Path.path
-                    Stack.Path.pathParser
-        addCommand' "ls"
-                    "List command. (Supports snapshots, dependencies, Stack's styles and installed tools)"
-                    lsCmd
-                    lsParser
-        addCommand' "unpack"
-                    "Unpack one or more packages locally"
-                    unpackCmd
-                    ((,) <$> some (strArgument $ metavar "PACKAGE")
-                         <*> optional (textOption $ long "to" <>
-                                         help "Optional path to unpack the package into (will unpack into subdirectory)"))
-        addCommand' "update"
-                    "Update the package index"
-                    updateCmd
-                    (pure ())
-        addCommand'' "upgrade"
-                     "Upgrade Stack, installing to Stack's local-bin directory \
-                     \and, if different and permitted, the directory of the \
-                     \current Stack executable"
-                     upgradeCmd
-                     "Warning: if you use GHCup to install Stack, use only \
-                     \GHCup to upgrade Stack."
-                     upgradeOpts
-        addCommand'
-            "upload"
-            "Upload a package to Hackage"
-            uploadCmd
-            uploadOptsParser
-        addCommand'
-            "sdist"
-            "Create source distribution tarballs"
-            sdistCmd
-            sdistOptsParser
-        addCommand' "dot"
-                    "Visualize your project's dependency graph using Graphviz dot"
-                    dot
-                    (dotOptsParser False) -- Default for --external is False.
-        addCommand' "ghc"
-                    "Run ghc"
-                    execCmd
-                    (execOptsParser $ Just ExecGhc)
-        addCommand' "hoogle"
-                    ("Run hoogle, the Haskell API search engine. Use the '-- ARGUMENT(S)' syntax " ++
-                     "to pass Hoogle arguments, e.g. 'stack hoogle -- --count=20', or " ++
-                     "'stack hoogle -- server --local'.")
-                    hoogleCmd
-                    ((,,,) <$> many (strArgument
-                                 (metavar "-- ARGUMENT(S) (e.g. 'stack hoogle -- server --local')"))
-                          <*> boolFlags
-                                  True
-                                  "setup"
-                                  "If needed: install hoogle, build haddocks and generate a hoogle database"
-                                  idm
-                          <*> switch
-                                  (long "rebuild" <>
-                                   help "Rebuild the hoogle database")
-                          <*> switch
-                                  (long "server" <>
-                                   help "Start local Hoogle server"))
-        )
-
-      -- These are the only commands allowed in interpreter mode as well
-      addCommand' "exec"
-                  "Execute a command. If the command is absent, the first of any arguments is taken as the command."
-                  execCmd
-                  (execOptsParser Nothing)
-      addCommand' "run"
-                  "Build and run an executable. Defaults to the first available executable if none is provided as the first argument."
-                  execCmd
-                  (execOptsParser $ Just ExecRun)
-      addGhciCommand' "ghci"
-                      "Run ghci in the context of package(s) (experimental)"
-                      ghciCmd
-                      ghciOptsParser
-      addGhciCommand' "repl"
-                      "Run ghci in the context of package(s) (experimental) (alias for 'ghci')"
-                      ghciCmd
-                      ghciOptsParser
-      addCommand' "runghc"
-                  "Run runghc"
-                  execCmd
-                  (execOptsParser $ Just ExecRunGhc)
-      addCommand' "runhaskell"
-                  "Run runghc (alias for 'runghc')"
-                  execCmd
-                  (execOptsParser $ Just ExecRunGhc)
-      addCommand "script"
-                 "Run a Stack Script"
-                 globalFooter
-                 scriptCmd
-                 (\so gom ->
-                    gom
-                      { globalMonoidResolverRoot = First $ Just $ takeDirectory $ soFile so
-                      })
-                 (globalOpts OtherCmdGlobalOpts)
-                 scriptOptsParser
-
-      unless isInterpreter (do
-        addCommand' "eval"
-                    "Evaluate some haskell code inline. Shortcut for 'stack exec ghc -- -e CODE'"
-                    evalCmd
-                    (evalOptsParser "CODE")
-        addCommand' "clean"
-                    "Delete build artefacts for the project packages."
-                    cleanCmd
-                    (cleanOptsParser Clean)
-        addCommand' "purge"
-                    "Delete the project Stack working directories (.stack-work by default). Shortcut for 'stack clean --full'"
-                    cleanCmd
-                    (cleanOptsParser Purge)
-        addCommand' "query"
-                    "Query general build information (experimental)"
-                    queryCmd
-                    (many $ strArgument $ metavar "SELECTOR...")
-        addCommand' "list"
-                    "List package id's in snapshot (experimental)"
-                    listCmd
-                    (many $ strArgument $ metavar "PACKAGE")
-        addSubCommands'
-            "ide"
-            "IDE-specific commands"
-            (let outputFlag = flag
-                   IDE.OutputLogInfo
-                   IDE.OutputStdout
-                   (long "stdout" <>
-                    help "Send output to stdout instead of the default, stderr")
-                 cabalFileFlag = flag
-                   IDE.ListPackageNames
-                   IDE.ListPackageCabalFiles
-                   (long "cabal-files" <>
-                    help "Print paths to package cabal-files instead of package names")
-             in
-             do addCommand'
-                    "packages"
-                    "List all available local loadable packages"
-                    idePackagesCmd
-                    ((,) <$> outputFlag <*> cabalFileFlag)
-                addCommand'
-                    "targets"
-                    "List all available Stack targets"
-                    ideTargetsCmd
-                    outputFlag)
-        addSubCommands'
-          Docker.dockerCmdName
-          "Subcommands specific to Docker use"
-          (do addCommand' Docker.dockerPullCmdName
-                          "Pull latest version of Docker image from registry"
-                          dockerPullCmd
-                          (pure ())
-              addCommand' "reset"
-                          "Reset the Docker sandbox"
-                          dockerResetCmd
-                          (switch (long "keep-home" <>
-                                   help "Do not delete sandbox's home directory")))
-        addSubCommands'
-            ConfigCmd.cfgCmdName
-            "Subcommands for accessing and modifying configuration values"
-            (do
-               addCommand' ConfigCmd.cfgCmdSetName
-                          "Sets a key in YAML configuration file to value"
-                          (withConfig NoReexec . cfgCmdSet)
-                          configCmdSetParser
-               addCommand' ConfigCmd.cfgCmdEnvName
-                          "Print environment variables for use in a shell"
-                          (withConfig YesReexec . withDefaultEnvConfig . cfgCmdEnv)
-                          configCmdEnvParser)
-        addSubCommands'
-          "hpc"
-          "Subcommands specific to Haskell Program Coverage"
-          (addCommand' "report"
-                        "Generate unified HPC coverage report from tix files and project targets"
-                        hpcReportCmd
-                        hpcReportOptsParser)
-        )
-      where
-        -- addCommand hiding global options
-        addCommand' :: String -> String -> (a -> RIO Runner ()) -> Parser a
-                    -> AddCommand
-        addCommand' cmd title constr =
-            addCommand cmd title globalFooter constr (\_ gom -> gom) (globalOpts OtherCmdGlobalOpts)
-
-        -- addCommand with custom footer hiding global options
-        addCommand'' :: String
-                     -> String
-                     -> (a -> RIO Runner ())
-                     -> String
-                     -> Parser a
-                     -> AddCommand
-        addCommand'' cmd title constr cmdFooter =
-            addCommand cmd title (globalFooter <> " " <> cmdFooter) constr
-                       (\_ gom -> gom) (globalOpts OtherCmdGlobalOpts)
-
-        addSubCommands' :: String -> String -> AddCommand
-                        -> AddCommand
-        addSubCommands' cmd title =
-            addSubCommands cmd title globalFooter (globalOpts OtherCmdGlobalOpts)
-
-        -- Additional helper that hides global options and shows build options
-        addBuildCommand' :: String -> String -> (a -> RIO Runner ()) -> Parser a
-                         -> AddCommand
-        addBuildCommand' cmd title constr =
-            addCommand cmd title globalFooter constr (\_ gom -> gom) (globalOpts BuildCmdGlobalOpts)
-
-        -- Additional helper that hides global options and shows some ghci options
-        addGhciCommand' :: String -> String -> (a -> RIO Runner ()) -> Parser a
-                         -> AddCommand
-        addGhciCommand' cmd title constr =
-            addCommand cmd title globalFooter constr (\_ gom -> gom) (globalOpts GhciCmdGlobalOpts)
-
-    globalOpts :: GlobalOptsContext -> Parser GlobalOptsMonoid
-    globalOpts kind =
-        extraHelpOption hide progName (Docker.dockerCmdName ++ "*") Docker.dockerHelpOptName <*>
-        extraHelpOption hide progName (Nix.nixCmdName ++ "*") Nix.nixHelpOptName <*>
-        globalOptsParser currentDir kind
-            (if isInterpreter
-                -- Silent except when errors occur - see #2879
-                then Just LevelError
-                else Nothing)
-        where hide = kind /= OuterGlobalOpts
-
--- | fall-through to external executables in `git` style if they exist
--- (i.e. `stack something` looks for `stack-something` before
--- failing with "Invalid argument `something'")
-secondaryCommandHandler
-  :: [String]
-  -> ParserFailure ParserHelp
-  -> IO (ParserFailure ParserHelp)
-secondaryCommandHandler args f =
-    -- don't even try when the argument looks like a path or flag
-    if elem pathSeparator cmd || "-" `L.isPrefixOf` L.head args
-       then pure f
-    else do
-      mExternalExec <- D.findExecutable cmd
-      case mExternalExec of
-        Just ex -> withProcessContextNoLogging $ do
-          -- TODO show the command in verbose mode
-          -- hPutStrLn stderr $ unwords $
-          --   ["Running", "[" ++ ex, unwords (tail args) ++ "]"]
-          _ <- exec ex (L.tail args)
-          pure f
-        Nothing -> pure $ fmap (vcatErrorHelp (noSuchCmd cmd)) f
-  where
-    -- FIXME this is broken when any options are specified before the command
-    -- e.g. stack --verbosity silent cmd
-    cmd = stackProgName ++ "-" ++ L.head args
-    noSuchCmd name = errorHelp $ stringChunk
-      ("Auxiliary command not found in path `" ++ name ++ "'")
-
-interpreterHandler
-  :: Monoid t
-  => FilePath
-  -> [String]
-  -> ParserFailure ParserHelp
-  -> IO (GlobalOptsMonoid, (RIO Runner (), t))
-interpreterHandler currentDir args f = do
-  -- args can include top-level config such as --extra-lib-dirs=... (set by
-  -- nix-shell) - we need to find the first argument which is a file, everything
-  -- afterwards is an argument to the script, everything before is an argument
-  -- to Stack
-  (stackArgs, fileArgs) <- spanM (fmap not . D.doesFileExist) args
-  case fileArgs of
-    (file:fileArgs') -> runInterpreterCommand file stackArgs fileArgs'
-    [] -> parseResultHandler (errorCombine (noSuchFile firstArg))
-  where
-    firstArg = L.head args
-
-    spanM _ [] = pure ([], [])
-    spanM p xs@(x:xs') = do
-      r <- p x
-      if r
-      then do
-        (ys, zs) <- spanM p xs'
-        pure (x:ys, zs)
-      else
-        pure ([], xs)
-
-    -- if the first argument contains a path separator then it might be a file,
-    -- or a Stack option referencing a file. In that case we only show the
-    -- interpreter error message and exclude the command related error messages.
-    errorCombine =
-      if pathSeparator `elem` firstArg
-      then overrideErrorHelp
-      else vcatErrorHelp
-
-    overrideErrorHelp h1 h2 = h2 { helpError = helpError h1 }
-
-    parseResultHandler fn = handleParseResult (overFailure fn (Failure f))
-    noSuchFile name = errorHelp $ stringChunk
-      ("File does not exist or is not a regular file `" ++ name ++ "'")
-
-    runInterpreterCommand path stackArgs fileArgs = do
-      progName <- getProgName
-      iargs <- getInterpreterArgs path
-      let parseCmdLine = commandLineHandler currentDir progName True
-          -- Implicit file arguments are put before other arguments that
-          -- occur after "--". See #3658
-          cmdArgs = stackArgs ++ case break (== "--") iargs of
-            (beforeSep, []) -> beforeSep ++ ["--"] ++ [path] ++ fileArgs
-            (beforeSep, optSep : afterSep) ->
-              beforeSep ++ [optSep] ++ [path] ++ fileArgs ++ afterSep
-       -- TODO show the command in verbose mode
-       -- hPutStrLn stderr $ unwords $
-       --   ["Running", "[" ++ progName, unwords cmdArgs ++ "]"]
-      (a,b) <- withArgs cmdArgs parseCmdLine
-      pure (a,(b,mempty))
-
-setupCmd :: SetupCmdOpts -> RIO Runner ()
-setupCmd sco@SetupCmdOpts{..} = withConfig YesReexec $ withBuildConfig $ do
-  (wantedCompiler, compilerCheck, mstack) <-
-    case scoCompilerVersion of
-      Just v -> pure (v, MatchMinor, Nothing)
-      Nothing -> (,,)
-        <$> view wantedCompilerVersionL
-        <*> view (configL.to configCompilerCheck)
-        <*> (Just <$> view stackYamlL)
-  setup sco wantedCompiler compilerCheck mstack
-
-cleanCmd :: CleanOpts -> RIO Runner ()
-cleanCmd = withConfig NoReexec . clean
-
--- | Helper for build and install commands
-buildCmd :: BuildOptsCLI -> RIO Runner ()
-buildCmd opts = do
-  when (any (("-prof" `elem`) . fromRight [] . parseArgs Escaping) (boptsCLIGhcOptions opts)) $ do
-    logError "Error: When building with Stack, you should not use the -prof GHC option"
-    logError "Instead, please use --library-profiling and --executable-profiling"
-    logError "See: https://github.com/commercialhaskell/stack/issues/1015"
-    exitFailure
-  local (over globalOptsL modifyGO) $
-    case boptsCLIFileWatch opts of
-      FileWatchPoll -> fileWatchPoll (inner . Just)
-      FileWatch -> fileWatch (inner . Just)
-      NoFileWatch -> inner Nothing
-  where
-    inner
-      :: Maybe (Set (Path Abs File) -> IO ())
-      -> RIO Runner ()
-    inner setLocalFiles = withConfig YesReexec $ withEnvConfig NeedTargets opts $
-        Stack.Build.build setLocalFiles
-    -- Read the build command from the CLI and enable it to run
-    modifyGO =
-      case boptsCLICommand opts of
-        Test -> set (globalOptsBuildOptsMonoidL.buildOptsMonoidTestsL) (Just True)
-        Haddock -> set (globalOptsBuildOptsMonoidL.buildOptsMonoidHaddockL) (Just True)
-        Bench -> set (globalOptsBuildOptsMonoidL.buildOptsMonoidBenchmarksL) (Just True)
-        Install -> set (globalOptsBuildOptsMonoidL.buildOptsMonoidInstallExesL) (Just True)
-        Build -> id -- Default case is just Build
-
--- | Display help for the uninstall command.
-uninstallCmd :: () -> RIO Runner ()
-uninstallCmd () = withConfig NoReexec $ do
-  stackRoot <- view stackRootL
-  programsDir <- view $ configL.to configLocalProgramsBase
-  localBinDir <- view $ configL.to configLocalBin
-  let toStyleDoc = PP.style Dir . fromString . toFilePath
-      stackRoot' = toStyleDoc stackRoot
-      programsDir' = toStyleDoc programsDir
-      localBinDir' = toStyleDoc localBinDir
-  prettyInfo $ vsep
-    [ flow "To uninstall Stack, it should be sufficient to delete:"
-    , hang 4 $ fillSep [flow "(1) the directory containing Stack's tools",
-      "(" <> softbreak <> programsDir' <> softbreak <> ");"]
-    , hang 4 $ fillSep [flow "(2) the Stack root directory",
-      "(" <> softbreak <> stackRoot' <> softbreak <> ");", "and"]
-    , hang 4 $ fillSep [flow "(3) the 'stack' executable file (see the output",
-      flow "of command", howToFindStack <> ",", flow "if Stack is on the PATH;",
-      flow "Stack is often installed in", localBinDir' <> softbreak <> ")."]
-    , fillSep [flow "You may also want to delete", PP.style File ".stack-work",
-      flow "directories in any Haskell projects that you have built."]
-    ]
- where
-  styleShell = PP.style Shell
-  howToFindStack
-    | osIsWindows = styleShell "where.exe stack"
-    | otherwise   = styleShell "which stack"
-
--- | Unpack packages to the filesystem
-unpackCmd :: ([String], Maybe Text) -> RIO Runner ()
-unpackCmd (names, Nothing) = unpackCmd (names, Just ".")
-unpackCmd (names, Just dstPath) = withConfig NoReexec $ do
-    mresolver <- view $ globalOptsL.to globalResolver
-    mSnapshot <- forM mresolver $ \resolver -> do
-      concrete <- makeConcreteResolver resolver
-      loc <- completeSnapshotLocation concrete
-      loadSnapshot loc
-    dstPath' <- resolveDir' $ T.unpack dstPath
-    unpackPackages mSnapshot dstPath' names
-
--- | Update the package index
-updateCmd :: () -> RIO Runner ()
-updateCmd () = withConfig NoReexec (void (updateHackageIndex Nothing))
-
-upgradeCmd :: UpgradeOpts -> RIO Runner ()
-upgradeCmd upgradeOpts' = do
-  go <- view globalOptsL
-  case globalResolver go of
-    Just _ -> do
-      logError "You cannot use the --resolver option with the upgrade command"
-      liftIO exitFailure
-    Nothing ->
-      withGlobalProject $
-      upgrade
-        maybeGitHash
-        upgradeOpts'
-
--- | Upload to Hackage
-uploadCmd :: UploadOpts -> RIO Runner ()
-uploadCmd (UploadOpts (SDistOpts [] _ _ _ _) _) = do
-    prettyErrorL
-        [ flow "To upload the current package, please run"
-        , PP.style Shell "stack upload ."
-        , flow "(with the period at the end)"
-        ]
-    liftIO exitFailure
-uploadCmd uploadOpts = do
-    let partitionM _ [] = pure ([], [])
-        partitionM f (x:xs) = do
-            r <- f x
-            (as, bs) <- partitionM f xs
-            pure $ if r then (x:as, bs) else (as, x:bs)
-        sdistOpts = uoptsSDistOpts uploadOpts
-    (files, nonFiles) <- liftIO $ partitionM D.doesFileExist (sdoptsDirsToWorkWith sdistOpts)
-    (dirs, invalid) <- liftIO $ partitionM D.doesDirectoryExist nonFiles
-    withConfig YesReexec $ withDefaultEnvConfig $ do
-        unless (null invalid) $ do
-            let invalidList = bulletedList $ map (PP.style File . fromString) invalid
-            prettyErrorL
-                [ PP.style Shell "stack upload"
-                , flow "expects a list of sdist tarballs or package directories."
-                , flow "Can't find:"
-                , line <> invalidList
-                ]
-            exitFailure
-        when (null files && null dirs) $ do
-            prettyErrorL
-                [ PP.style Shell "stack upload"
-                , flow "expects a list of sdist tarballs or package directories, but none were specified."
-                ]
-            exitFailure
-        config <- view configL
-        let hackageUrl = T.unpack $ configHackageBaseUrl config
-            uploadVariant = uoptsUploadVariant uploadOpts
-        getCreds <- memoizeRef $ Upload.loadAuth config
-        mapM_ (resolveFile' >=> checkSDistTarball sdistOpts) files
-        forM_ files $ \file -> do
-            tarFile <- resolveFile' file
-            creds <- runMemoized getCreds
-            Upload.upload hackageUrl creds (toFilePath tarFile) uploadVariant
-        forM_ dirs $ \dir -> do
-            pkgDir <- resolveDir' dir
-            (tarName, tarBytes, mcabalRevision) <- getSDistTarball (sdoptsPvpBounds sdistOpts) pkgDir
-            checkSDistTarball' sdistOpts tarName tarBytes
-            creds <- runMemoized getCreds
-            Upload.uploadBytes hackageUrl creds tarName uploadVariant tarBytes
-            forM_ mcabalRevision $ uncurry $ Upload.uploadRevision hackageUrl creds
-
-sdistCmd :: SDistOpts -> RIO Runner ()
-sdistCmd sdistOpts =
-    withConfig YesReexec $ withDefaultEnvConfig $ do
-        -- If no directories are specified, build all sdist tarballs.
-        dirs' <- if null (sdoptsDirsToWorkWith sdistOpts)
-            then do
-                dirs <- view $ buildConfigL.to (map ppRoot . Map.elems . smwProject . bcSMWanted)
-                when (null dirs) $ do
-                    stackYaml <- view stackYamlL
-                    prettyErrorL
-                        [ PP.style Shell "stack sdist"
-                        , flow "expects a list of targets, and otherwise defaults to all of the project's packages."
-                        , flow "However, the configuration at"
-                        , pretty stackYaml
-                        , flow "contains no packages, so no sdist tarballs will be generated."
-                        ]
-                    exitFailure
-                pure dirs
-            else mapM resolveDir' (sdoptsDirsToWorkWith sdistOpts)
-        forM_ dirs' $ \dir -> do
-            (tarName, tarBytes, _mcabalRevision) <- getSDistTarball (sdoptsPvpBounds sdistOpts) dir
-            distDir <- distDirFromDir dir
-            tarPath <- (distDir </>) <$> parseRelFile tarName
-            ensureDir (parent tarPath)
-            runConduitRes $
-              sourceLazy tarBytes .|
-              sinkFileCautious (toFilePath tarPath)
-            prettyInfoL [flow "Wrote sdist tarball to", pretty tarPath]
-            checkSDistTarball sdistOpts tarPath
-            forM_ (sdoptsTarPath sdistOpts) $ copyTarToTarPath tarPath tarName
-        where
-          copyTarToTarPath tarPath tarName targetDir = liftIO $ do
-            let targetTarPath = targetDir FP.</> tarName
-            D.createDirectoryIfMissing True $ FP.takeDirectory targetTarPath
-            D.copyFile (toFilePath tarPath) targetTarPath
-
--- | Execute a command.
-execCmd :: ExecOpts -> RIO Runner ()
-execCmd ExecOpts {..} =
-  withConfig YesReexec $ withEnvConfig AllowNoTargets boptsCLI $ do
-    unless (null targets) $ Stack.Build.build Nothing
-
-    config <- view configL
-    menv <- liftIO $ configProcessContextSettings config eoEnvSettings
-    withProcessContext menv $ do
-      -- Add RTS options to arguments
-      let argsWithRts args = if null eoRtsOptions
-                  then args :: [String]
-                  else args ++ ["+RTS"] ++ eoRtsOptions ++ ["-RTS"]
-      (cmd, args) <- case (eoCmd, argsWithRts eoArgs) of
-          (ExecCmd cmd, args) -> pure (cmd, args)
-          (ExecRun, args) -> getRunCmd args
-          (ExecGhc, args) -> getGhcCmd eoPackages args
-          (ExecRunGhc, args) -> getRunGhcCmd eoPackages args
-
-      runWithPath eoCwd $ exec cmd args
-  where
-      ExecOptsExtra {..} = eoExtra
-
-      targets = concatMap words eoPackages
-      boptsCLI = defaultBuildOptsCLI
-                 { boptsCLITargets = map T.pack targets
-                 }
-
-      -- return the package-id of the first package in GHC_PACKAGE_PATH
-      getPkgId name = do
-          pkg <- getGhcPkgExe
-          mId <- findGhcPkgField pkg [] name "id"
-          case mId of
-              Just i -> pure (L.head $ words (T.unpack i))
-              -- should never happen as we have already installed the packages
-              _      -> do
-                  logError ("Could not find package id of package " <> fromString name)
-                  exitFailure
-
-      getPkgOpts pkgs =
-          map ("-package-id=" ++) <$> mapM getPkgId pkgs
-
-      getRunCmd args = do
-          packages <- view $ buildConfigL.to (smwProject . bcSMWanted)
-          pkgComponents <- for (Map.elems packages) ppComponents
-          let executables = filter isCExe $ concatMap Set.toList pkgComponents
-          let (exe, args') = case args of
-                             []   -> (firstExe, args)
-                             x:xs -> case L.find (\y -> y == CExe (T.pack x)) executables of
-                                     Nothing -> (firstExe, args)
-                                     argExe -> (argExe, xs)
-                             where
-                                firstExe = listToMaybe executables
-          case exe of
-              Just (CExe exe') -> do
-                withNewLocalBuildTargets [T.cons ':' exe'] $ Stack.Build.build Nothing
-                pure (T.unpack exe', args')
-              _                -> do
-                  logError "No executables found."
-                  exitFailure
-
-      getGhcCmd pkgs args = do
-          pkgopts <- getPkgOpts pkgs
-          compiler <- view $ compilerPathsL.to cpCompiler
-          pure (toFilePath compiler, pkgopts ++ args)
-
-      getRunGhcCmd pkgs args = do
-          pkgopts <- getPkgOpts pkgs
-          interpret <- view $ compilerPathsL.to cpInterpreter
-          pure (toFilePath interpret, pkgopts ++ args)
-
-      runWithPath :: Maybe FilePath -> RIO EnvConfig () -> RIO EnvConfig ()
-      runWithPath path callback = case path of
-        Nothing                  -> callback
-        Just p | not (isValid p) -> throwIO $ InvalidPathForExec p
-        Just p                   -> withUnliftIO $ \ul -> D.withCurrentDirectory p $ unliftIO ul callback
-
--- | Evaluate some haskell code inline.
-evalCmd :: EvalOpts -> RIO Runner ()
-evalCmd EvalOpts {..} = execCmd execOpts
-    where
-      execOpts =
-          ExecOpts { eoCmd = ExecGhc
-                   , eoArgs = ["-e", evalArg]
-                   , eoExtra = evalExtra
-                   }
-
--- | Run GHCi in the context of a project.
-ghciCmd :: GhciOpts -> RIO Runner ()
-ghciCmd ghciOpts =
-  let boptsCLI = defaultBuildOptsCLI
-          -- using only additional packages, targets then get overridden in `ghci`
-          { boptsCLITargets = map T.pack (ghciAdditionalPackages  ghciOpts)
-          , boptsCLIInitialBuildSteps = True
-          , boptsCLIFlags = ghciFlags ghciOpts
-          , boptsCLIGhcOptions = map T.pack (ghciGhcOptions ghciOpts)
-          }
-  in withConfig YesReexec $ withEnvConfig AllowNoTargets boptsCLI $ do
-    bopts <- view buildOptsL
-    -- override env so running of tests and benchmarks is disabled
-    let boptsLocal = bopts
-               { boptsTestOpts = (boptsTestOpts bopts) { toDisableRun = True }
-               , boptsBenchmarkOpts = (boptsBenchmarkOpts bopts) { beoDisableRun = True }
-               }
-    local (set buildOptsL boptsLocal)
-          (ghci ghciOpts)
-
--- | List packages in the project.
-idePackagesCmd :: (IDE.OutputStream, IDE.ListPackagesCmd) -> RIO Runner ()
-idePackagesCmd = withConfig NoReexec . withBuildConfig . uncurry IDE.listPackages
-
--- | List targets in the project.
-ideTargetsCmd :: IDE.OutputStream -> RIO Runner ()
-ideTargetsCmd = withConfig NoReexec . withBuildConfig . IDE.listTargets
-
--- | Pull the current Docker image.
-dockerPullCmd :: () -> RIO Runner ()
-dockerPullCmd () = withConfig NoReexec $ Docker.preventInContainer Docker.pull
-
--- | Reset the Docker sandbox.
-dockerResetCmd :: Bool -> RIO Runner ()
-dockerResetCmd = withConfig NoReexec . Docker.preventInContainer . Docker.reset
-
--- | Project initialization
-initCmd :: InitOpts -> RIO Runner ()
-initCmd initOpts = do
-    pwd <- getCurrentDir
-    go <- view globalOptsL
-    withGlobalProject $ withConfig YesReexec (initProject pwd initOpts (globalResolver go))
-
--- | Create a project directory structure and initialize the Stack config.
-newCmd :: (NewOpts, InitOpts) -> RIO Runner ()
-newCmd (newOpts, initOpts) =
-    withGlobalProject $ withConfig YesReexec $ do
-        dir <- new newOpts (forceOverwrite initOpts)
-        exists <- doesFileExist $ dir </> stackDotYaml
-        when (forceOverwrite initOpts || not exists) $ do
-            go <- view globalOptsL
-            initProject dir initOpts (globalResolver go)
-
--- | Display instructions for how to use templates
-templatesCmd :: () -> RIO Runner ()
-templatesCmd () = withConfig NoReexec templatesHelp
-
--- | Query build information
-queryCmd :: [String] -> RIO Runner ()
-queryCmd selectors = withConfig YesReexec $ withDefaultEnvConfig $ queryBuildInfo $ map T.pack selectors
-
--- | List packages
-listCmd :: [String] -> RIO Runner ()
-listCmd names = withConfig NoReexec $ do
-    mresolver <- view $ globalOptsL.to globalResolver
-    mSnapshot <- forM mresolver $ \resolver -> do
-      concrete <- makeConcreteResolver resolver
-      loc <- completeSnapshotLocation concrete
-      loadSnapshot loc
-    listPackages mSnapshot names
-
--- | generate a combined HPC report
-hpcReportCmd :: HpcReportOpts -> RIO Runner ()
-hpcReportCmd hropts = do
-    let (tixFiles, targetNames) = L.partition (".tix" `T.isSuffixOf`) (hroptsInputs hropts)
-        boptsCLI = defaultBuildOptsCLI
-          { boptsCLITargets = if hroptsAll hropts then [] else targetNames }
-    withConfig YesReexec $ withEnvConfig AllowNoTargets boptsCLI $
-        generateHpcReportForTargets hropts tixFiles targetNames
-
-data MainException = InvalidReExecVersion String String
-                   | InvalidPathForExec FilePath
-     deriving (Typeable)
-instance Exception MainException
-instance Show MainException where
-    show (InvalidReExecVersion expected actual) = concat
-        [ "When re-executing '"
-        , stackProgName
-        , "' in a container, the incorrect version was found\nExpected: "
-        , expected
-        , "; found: "
-        , actual]
-    show (InvalidPathForExec path) = concat
-        [ "Got an invalid --cwd argument for stack exec ("
-        , path
-        , ")"]
diff --git a/src/setup-shim/StackSetupShim.hs b/src/setup-shim/StackSetupShim.hs
index c9c33ffc07..a87ec81fc9 100644
--- a/src/setup-shim/StackSetupShim.hs
+++ b/src/setup-shim/StackSetupShim.hs
@@ -1,32 +1,165 @@
+{-# LANGUAGE CPP            #-}
 {-# LANGUAGE PackageImports #-}
+
 module StackSetupShim where
+
+-- Stack no longer supports Cabal < 2.2 and, consequently, GHC versions before
+-- GHC 8.4 or base < 4.11.0.0. Consequently, we do not need to test for the
+-- existence of the MIN_VERSION_Cabal macro (provided from GHC 8.0).
+
+import Data.List ( stripPrefix )
+import Distribution.ReadE ( ReadE (..) )
+import Distribution.Simple.Configure ( getPersistBuildConfig )
+-- Temporary, can be removed if initialBuildSteps restored to Cabal's API.
+#if MIN_VERSION_Cabal(3,11,0)
+import Distribution.Simple.Build ( writeBuiltinAutogenFiles )
+#else
+import Distribution.Simple.Build ( initialBuildSteps )
+#endif
+#if MIN_VERSION_Cabal(3,11,0)
+import Distribution.Simple.Errors ( exceptionMessage )
+#endif
+-- Temporary, can be removed if initialBuildSteps restored to Cabal's API.
+#if MIN_VERSION_Cabal(3,11,0)
+import Distribution.Simple.LocalBuildInfo
+         ( componentBuildDir, withAllComponentsInBuildOrder )
+#endif
+#if MIN_VERSION_Cabal(3,8,1)
+import Distribution.Simple.PackageDescription ( readGenericPackageDescription )
+#else
+-- Avoid confusion with Cabal-syntax module of same name
+import "Cabal" Distribution.PackageDescription.Parsec
+         ( readGenericPackageDescription )
+#endif
+import Distribution.Simple.Utils
+         ( createDirectoryIfMissingVerbose, findPackageDesc )
+#if MIN_VERSION_Cabal(3,8,1)
+import Distribution.Types.GenericPackageDescription
+         ( GenericPackageDescription (..) )
+#else
+-- Avoid confusion with Cabal-syntax module of same name
+import "Cabal" Distribution.Types.GenericPackageDescription
+         ( GenericPackageDescription (..) )
+#endif
+-- Temporary, can be removed if initialBuildSteps restored to Cabal's API.
+#if MIN_VERSION_Cabal(3,11,0)
+import Distribution.Types.ComponentLocalBuildInfo ( ComponentLocalBuildInfo )
+import Distribution.Types.LocalBuildInfo ( LocalBuildInfo )
+import Distribution.Types.PackageDescription ( PackageDescription )
+#if MIN_VERSION_Cabal(3,14,0)
+import Distribution.Utils.Path
+         ( interpretSymbolicPathCWD, makeSymbolicPath, relativeSymbolicPath )
+#endif
+import Distribution.Verbosity ( Verbosity )
+#endif
+import Distribution.Verbosity ( flagToVerbosity )
 import Main
-import "Cabal" Distribution.PackageDescription (PackageDescription, emptyHookedBuildInfo)
-import Distribution.Simple
-import Distribution.Simple.Build
-import Distribution.Simple.Setup (ReplFlags, fromFlag, replDistPref, replVerbosity)
-import Distribution.Simple.LocalBuildInfo (LocalBuildInfo)
-import System.Environment (getArgs)
+import System.Environment ( getArgs )
 
 mainOverride :: IO ()
 mainOverride = do
-    args <- getArgs
-    if "repl" `elem` args && "stack-initial-build-steps" `elem` args
-        then do
-            defaultMainWithHooks simpleUserHooks
-                { preRepl = \_ _ -> pure emptyHookedBuildInfo
-                , replHook = stackReplHook
-                , postRepl = \_ _ _ _ -> pure ()
-                }
-        else main
+  args <- getArgs
+  case args of
+    [arg1, arg2, "repl", "stack-initial-build-steps"] -> stackReplHook arg1 arg2
+    _ -> main
+
+-- | The name of the function is a mismomer, but is kept for historical reasons.
+-- This function relies on Stack calling the 'setup' executable with:
+--
+-- --verbose=<Cabal_verbosity>
+-- --builddir=<path_to_dist_prefix>
+-- repl
+-- stack-initial-build-steps
+stackReplHook :: String -> String -> IO ()
+stackReplHook arg1 arg2 = do
+  let mRawVerbosity = stripPrefix "--verbose=" arg1
+      mRawBuildDir = stripPrefix "--builddir=" arg2
+  case (mRawVerbosity, mRawBuildDir) of
+    (Nothing, _) -> fail $
+      "Misuse of running Setup.hs with stack-initial-build-steps, expected " <>
+      "first argument to start --verbose="
+    (_, Nothing) -> fail $
+      "Misuse of running Setup.hs with stack-initial-build-steps, expected" <>
+      "second argument to start --builddir="
+    (Just rawVerbosity, Just rawBuildDir) -> do
+        let eVerbosity = runReadE flagToVerbosity rawVerbosity
+        case eVerbosity of
+          Left msg1 -> fail $
+            "Unexpected happened running Setup.hs with " <>
+            "stack-initial-build-steps, expected to parse Cabal verbosity: " <>
+            msg1
+          Right verbosity -> do
+            eFp <-
+#if MIN_VERSION_Cabal(3,14,0)
+              findPackageDesc Nothing
+#else
+              findPackageDesc ""
+#endif
+            case eFp of
+              Left err -> fail $
+                "Unexpected happened running Setup.hs with " <>
+                "stack-initial-build-steps, expected to find a Cabal file: " <>
+                msg2
+               where
+#if MIN_VERSION_Cabal(3,11,0)
+                -- The type of findPackageDesc changed in Cabal-3.11.0.0.
+                msg2 = exceptionMessage err
+#else
+                msg2 = err
+#endif
+              Right fp -> do
+                gpd <-
+                  readGenericPackageDescription
+                    verbosity
+#if MIN_VERSION_Cabal(3,14,0)
+                    Nothing
+                    (relativeSymbolicPath fp)
+#else
+                    fp
+#endif
+                let pd = packageDescription gpd
+                lbi <- getPersistBuildConfig
+#if MIN_VERSION_Cabal(3,14,0)
+                  Nothing
+                  (makeSymbolicPath rawBuildDir)
+#else
+                  rawBuildDir
+#endif
+                initialBuildSteps rawBuildDir pd lbi verbosity
+
+-- | Temporary, can be removed if initialBuildSteps restored to Cabal's API.
+-- Based on the functions of the same name provided by Cabal-3.10.3.0.
+#if MIN_VERSION_Cabal(3,11,0)
+-- | Runs 'componentInitialBuildSteps' on every configured component.
+initialBuildSteps ::
+     FilePath -- ^"dist" prefix
+  -> PackageDescription  -- ^mostly information from the .cabal file
+  -> LocalBuildInfo -- ^Configuration information
+  -> Verbosity -- ^The verbosity to use
+  -> IO ()
+initialBuildSteps distPref pkg_descr lbi verbosity =
+  withAllComponentsInBuildOrder pkg_descr lbi $ \_comp clbi ->
+    componentInitialBuildSteps distPref pkg_descr lbi clbi verbosity
 
-stackReplHook :: PackageDescription -> LocalBuildInfo -> UserHooks -> ReplFlags -> [String] -> IO ()
-stackReplHook pkg_descr lbi hooks flags args = do
-    let distPref = fromFlag (replDistPref flags)
-        verbosity = fromFlag (replVerbosity flags)
-    case args of
-        ("stack-initial-build-steps":rest)
-            | null rest -> initialBuildSteps distPref pkg_descr lbi verbosity
-            | otherwise ->
-                fail "Misuse of running Setup.hs with stack-initial-build-steps, expected no arguments"
-        _ -> replHook simpleUserHooks pkg_descr lbi hooks flags args
+-- | Creates the autogenerated files for a particular configured component.
+componentInitialBuildSteps ::
+     FilePath -- ^"dist" prefix
+  -> PackageDescription  -- ^mostly information from the .cabal file
+  -> LocalBuildInfo -- ^Configuration information
+  -> ComponentLocalBuildInfo
+  -> Verbosity -- ^The verbosity to use
+  -> IO ()
+componentInitialBuildSteps _distPref pkg_descr lbi clbi verbosity = do
+  createDirectoryIfMissingVerbose
+    verbosity
+    True
+#if MIN_VERSION_Cabal(3,14,0)
+    (interpretSymbolicPathCWD $ componentBuildDir lbi clbi)
+#else
+    (componentBuildDir lbi clbi)
+#endif
+  -- Cabal-3.10.3.0 used writeAutogenFiles, that generated and wrote out the
+  -- Paths_<pkg>.hs, PackageInfo_<pkg>.hs, and cabal_macros.h files. This
+  -- appears to be the equivalent function for Cabal-3.11.0.0.
+  writeBuiltinAutogenFiles verbosity pkg_descr lbi clbi
+#endif
diff --git a/src/test/Spec.hs b/src/test/Spec.hs
deleted file mode 100644
index a824f8c30c..0000000000
--- a/src/test/Spec.hs
+++ /dev/null
@@ -1 +0,0 @@
-{-# OPTIONS_GHC -F -pgmF hspec-discover #-}
diff --git a/src/test/Stack/ArgsSpec.hs b/src/test/Stack/ArgsSpec.hs
deleted file mode 100644
index a578db53e1..0000000000
--- a/src/test/Stack/ArgsSpec.hs
+++ /dev/null
@@ -1,167 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-
--- | Args parser test suite.
-
-module Stack.ArgsSpec where
-
-import Control.Monad
-import Data.Attoparsec.Args (EscapingMode(..), parseArgsFromString)
-import Data.Attoparsec.Interpreter (interpreterArgsParser)
-import qualified Data.Attoparsec.Text as P
-import Data.Text (pack)
-import Stack.Prelude
-import Test.Hspec
-import Prelude (head)
-
--- | Test spec.
-spec :: Spec
-spec = do
-    argsSpec
-    interpreterArgsSpec
-
-argsSpec :: Spec
-argsSpec = forM_ argsInputOutput
-    (\(input,output) -> it input (parseArgsFromString Escaping input == output))
-
--- | Fairly comprehensive checks.
-argsInputOutput :: [(String, Either String [String])]
-argsInputOutput =
-    [ ("x", Right ["x"])
-    , ("x y z", Right ["x", "y", "z"])
-    , ("aaa bbb ccc", Right ["aaa", "bbb", "ccc"])
-    , ("    aaa    bbb    ccc   ", Right ["aaa", "bbb", "ccc"])
-    , ("aaa\"", Left "unterminated string: endOfInput")
-    , ("\"", Left "unterminated string: endOfInput")
-    , ("\"\"", Right [""])
-    , ("\"aaa", Left "unterminated string: endOfInput")
-    , ("\"aaa\" bbb ccc \"ddd\"", Right ["aaa", "bbb", "ccc", "ddd"])
-    , ("\"aa\\\"a\" bbb ccc \"ddd\"", Right ["aa\"a", "bbb", "ccc", "ddd"])
-    , ("\"aa\\\"a\" bb\\b ccc \"ddd\"", Right ["aa\"a", "bb\\b", "ccc", "ddd"])
-    , ("\"\" \"\" c", Right ["","","c"])]
-
-interpreterArgsSpec :: Spec
-interpreterArgsSpec =
-    describe "Script interpreter parser" $ do
-      describe "Success cases" $ do
-        describe "Line comments" $ do
-          checkLines ""
-          checkLines " --x"
-          checkLines " --x --y"
-        describe "Literate line comments" $ do
-          checkLiterateLines ""
-          checkLiterateLines " --x"
-          checkLiterateLines " --x --y"
-        describe "Block comments" $ do
-          checkBlocks ""
-          checkBlocks "\n"
-          checkBlocks " --x"
-          checkBlocks "\n--x"
-          checkBlocks " --x --y"
-          checkBlocks "\n--x\n--y"
-          checkBlocks "\n\t--x\n\t--y"
-        describe "Literate block comments" $ do
-          checkLiterateBlocks "" ""
-          checkLiterateBlocks "\n>" ""
-          checkLiterateBlocks " --x" " --x"
-          checkLiterateBlocks "\n>--x" "--x"
-          checkLiterateBlocks " --x --y " "--x --y"
-          checkLiterateBlocks "\n>--x\n>--y" "--x --y"
-          checkLiterateBlocks "\n>\t--x\n>\t--y" "--x --y"
-      describe "Failure cases" $ do
-        checkFailures
-        describe "Bare directives in literate files" $ do
-          forM_ (interpreterGenValid lineComment []) $
-            testAndCheck (acceptFailure True) []
-          forM_ (interpreterGenValid blockComment []) $
-            testAndCheck (acceptFailure True) []
-    where
-      parse isLiterate s =
-        P.parseOnly (interpreterArgsParser isLiterate stackProgName) (pack s)
-
-      acceptSuccess :: Bool -> String -> String -> Bool
-      acceptSuccess isLiterate args s = case parse isLiterate s of
-                               Right x | words x == words args -> True
-                               _ -> False
-
-      acceptFailure isLiterate _ s =  case parse isLiterate s of
-                           Left _ -> True
-                           Right _ -> False
-
-      testAndCheck checker out inp = it (show inp) $ checker out inp
-
-      checkLines args = forM_
-        (interpreterGenValid lineComment args)
-        (testAndCheck (acceptSuccess False) args)
-
-      checkLiterateLines args = forM_
-        (interpreterGenValid literateLineComment args)
-        (testAndCheck (acceptSuccess True) args)
-
-      checkBlocks args = forM_
-        (interpreterGenValid blockComment args)
-        (testAndCheck (acceptSuccess False) args)
-
-      checkLiterateBlocks inp args = forM_
-        (interpreterGenValid literateBlockComment inp)
-        (testAndCheck (acceptSuccess True) args)
-
-      checkFailures = forM_
-        interpreterGenInvalid
-        (testAndCheck (acceptFailure False) "unused")
-
-      -- Generate a set of acceptable inputs for given format and args
-      interpreterGenValid fmt args = shebang <++> newLine <++> fmt args
-
-      interpreterGenInvalid :: [String]
-      -- Generate a set of Invalid inputs
-      interpreterGenInvalid =
-        ["-stack\n"] -- random input
-        -- just the shebang
-        <|> shebang <++> ["\n"]
-        -- invalid shebang
-        <|> blockSpace <++> [head (interpreterGenValid lineComment args)]
-        -- something between shebang and Stack comment
-        <|> shebang
-            <++> newLine
-            <++> blockSpace
-            <++> ([head (lineComment args)] <|> [head (blockComment args)])
-        -- unterminated block comment
-        -- just chop the closing chars from a valid block comment
-        <|> shebang
-            <++> ["\n"]
-            <++> let
-                    c = head (blockComment args)
-                    l = length c - 2
-                 in [assert (drop l c == "-}") (take l c)]
-        -- nested block comment
-        <|> shebang
-            <++> ["\n"]
-            <++> [head (blockComment "--x {- nested -} --y")]
-        where args = " --x --y"
-      (<++>) = liftA2 (++)
-
-      -- Generative grammar for the interpreter comments
-      shebang = ["#!/usr/bin/env stack"]
-      newLine = ["\n"] <|> ["\r\n"]
-
-      -- A comment may be the last line or followed by something else
-      postComment = [""] <|> newLine
-
-      -- A command starts with zero or more whitespace followed by "stack"
-      makeComment maker space args =
-        let makePrefix s = (s <|> [""]) <++> [stackProgName]
-        in (maker <$> (makePrefix space <++> [args])) <++> postComment
-
-      lineSpace = [" "] <|> ["\t"]
-      lineComment = makeComment makeLine lineSpace
-        where makeLine s = "--" ++ s
-
-      literateLineComment = makeComment ("> --" ++) lineSpace
-
-      blockSpace = lineSpace <|> newLine
-      blockComment = makeComment makeBlock blockSpace
-        where makeBlock s = "{-" ++ s ++ "-}"
-
-      literateBlockComment = makeComment
-        (\s -> "> {-" ++ s ++ "-}")
-        (lineSpace <|> map (++ ">") newLine)
diff --git a/src/test/Stack/Build/ExecuteSpec.hs b/src/test/Stack/Build/ExecuteSpec.hs
deleted file mode 100644
index 32f9769a3f..0000000000
--- a/src/test/Stack/Build/ExecuteSpec.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-
-module Stack.Build.ExecuteSpec (main, spec) where
-
-import Stack.Prelude
-import Test.Hspec
-
-main :: IO ()
-main = hspec spec
-
-spec :: Spec
-spec = pure ()
diff --git a/src/test/Stack/Config/DockerSpec.hs b/src/test/Stack/Config/DockerSpec.hs
deleted file mode 100644
index 310cc45cec..0000000000
--- a/src/test/Stack/Config/DockerSpec.hs
+++ /dev/null
@@ -1,27 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Stack.Config.DockerSpec (spec) where
-
-import Test.Hspec
-import Stack.Prelude
-import Stack.Types.Resolver
-import RIO.Time (fromGregorian)
-import Stack.Config.Docker (addDefaultTag)
-
-spec :: Spec
-spec = do
-  describe "addDefaultTag" $ do
-    it "succeeds fails no resolver" $ addDefaultTag "foo/bar" Nothing Nothing `shouldBe` Nothing
-    it "succeeds on LTS" $
-      addDefaultTag
-        "foo/bar"
-        Nothing
-        (Just $ ARResolver $ RSLSynonym $ LTS 1 2)
-      `shouldBe` Just "foo/bar:lts-1.2"
-    it "fails on nightly" $
-      addDefaultTag
-        "foo/bar"
-        Nothing
-        (Just $ ARResolver $ RSLSynonym $ Nightly $ fromGregorian 2018 1 1)
-      `shouldBe` Nothing
diff --git a/src/test/Stack/ConfigSpec.hs b/src/test/Stack/ConfigSpec.hs
deleted file mode 100644
index 88bbc5bdcf..0000000000
--- a/src/test/Stack/ConfigSpec.hs
+++ /dev/null
@@ -1,229 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
-
-module Stack.ConfigSpec where
-
-import Control.Arrow
-import Distribution.Verbosity (verbose)
-import Pantry.Internal.AesonExtended
-import Data.Yaml
-import Pantry.Internal (pcHpackExecutable)
-import Path
-import Path.IO hiding (withSystemTempDir)
-import Stack.Config
-import Stack.Prelude
-import Stack.Runners
-import Stack.Types.Config
-import Stack.Options.GlobalParser (globalOptsFromMonoid)
-import System.Directory
-import System.Environment
-import System.IO (writeFile)
-import Test.Hspec
-
-sampleConfig :: String
-sampleConfig =
-  "resolver: lts-19.22\n" ++
-  "packages: ['.']\n"
-
-buildOptsConfig :: String
-buildOptsConfig =
-  "resolver: lts-19.22\n" ++
-  "packages: ['.']\n" ++
-  "build:\n" ++
-  "  library-profiling: true\n" ++
-  "  executable-profiling: true\n" ++
-  "  haddock: true\n" ++
-  "  haddock-deps: true\n" ++
-  "  copy-bins: true\n" ++
-  "  prefetch: true\n" ++
-  "  force-dirty: true\n" ++
-  "  keep-going: true\n" ++
-  "  keep-tmp-files: true\n" ++
-  "  test: true\n" ++
-  "  test-arguments:\n" ++
-  "    rerun-tests: true\n" ++
-  "    additional-args: ['-fprof']\n" ++
-  "    coverage: true\n" ++
-  "    no-run-tests: true\n" ++
-  "  bench: true\n" ++
-  "  benchmark-opts:\n" ++
-  "    benchmark-arguments: -O2\n" ++
-  "    no-run-benchmarks: true\n" ++
-  "  reconfigure: true\n" ++
-  "  cabal-verbose: true\n"
-
-hpackConfig :: String
-hpackConfig =
-  "resolver: lts-19.22\n" ++
-  "with-hpack: /usr/local/bin/hpack\n" ++
-  "packages: ['.']\n"
-
-resolverConfig :: String
-resolverConfig =
-  "resolver: lts-19.22\n" ++
-  "packages: ['.']\n"
-
-snapshotConfig :: String
-snapshotConfig =
-  "snapshot: lts-19.22\n" ++
-  "packages: ['.']\n"
-
-resolverSnapshotConfig :: String
-resolverSnapshotConfig =
-  "resolver: lts-19.22\n" ++
-  "snapshot: lts-19.22\n" ++
-  "packages: ['.']\n"
-
-stackDotYaml :: Path Rel File
-stackDotYaml = either impureThrow id (parseRelFile "stack.yaml")
-
-setup :: IO ()
-setup = unsetEnv "STACK_YAML"
-
-noException :: Selector SomeException
-noException = const False
-
-spec :: Spec
-spec = beforeAll setup $ do
-  let logLevel = LevelOther "silent"
-  -- TODO(danburton): not use inTempDir
-  let inTempDir action = do
-        currentDirectory <- getCurrentDirectory
-        withSystemTempDirectory "Stack_ConfigSpec" $ \tempDir -> do
-          let enterDir = setCurrentDirectory tempDir
-          let exitDir = setCurrentDirectory currentDirectory
-          bracket_ enterDir exitDir action
-  -- TODO(danburton): a safer version of this?
-  let withEnvVar name newValue action = do
-        originalValue <- fromMaybe "" <$> lookupEnv name
-        let setVar = setEnv name newValue
-        let resetVar = setEnv name originalValue
-        bracket_ setVar resetVar action
-
-  describe "parseProjectAndConfigMonoid" $ do
-    let loadProject' fp inner = do
-          globalOpts <- globalOptsFromMonoid False mempty
-          withRunnerGlobal globalOpts { globalLogLevel = logLevel } $ do
-              iopc <- loadConfigYaml (
-                parseProjectAndConfigMonoid (parent fp)
-                ) fp
-              ProjectAndConfigMonoid project _ <- liftIO iopc
-              liftIO $ inner project
-
-        toAbsPath path = do
-          parentDir <- getCurrentDirectory >>= parseAbsDir
-          pure (parentDir </> path)
-
-        loadProject config inner = do
-          yamlAbs <- toAbsPath stackDotYaml
-          writeFile (toFilePath yamlAbs) config
-          loadProject' yamlAbs inner
-
-    it "parses snapshot using 'resolver'" $ inTempDir $ do
-      loadProject resolverConfig $ \Project{..} ->
-        projectResolver `shouldBe` RSLSynonym (LTS 19 22)
-
-    it "parses snapshot using 'snapshot'" $ inTempDir $ do
-      loadProject snapshotConfig $ \Project{..} ->
-        projectResolver `shouldBe` RSLSynonym (LTS 19 22)
-
-    it "throws if both 'resolver' and 'snapshot' are present" $ inTempDir $ do
-      loadProject resolverSnapshotConfig (const (pure ()))
-        `shouldThrow` anyException
-
-  describe "loadConfig" $ do
-    let loadConfig' inner = do
-          globalOpts <- globalOptsFromMonoid False mempty
-          withRunnerGlobal globalOpts { globalLogLevel = logLevel } $
-            loadConfig inner
-    -- TODO(danburton): make sure parent dirs also don't have config file
-    it "works even if no config file exists" $ example $
-      loadConfig' $ const $ pure ()
-
-    it "works with a blank config file" $ inTempDir $ do
-      writeFile (toFilePath stackDotYaml) ""
-      -- TODO(danburton): more specific test for exception
-      loadConfig' (const (pure ())) `shouldThrow` anyException
-
-    let configOverrideHpack = pcHpackExecutable . view pantryConfigL
-
-    it "parses config option with-hpack" $ inTempDir $ do
-      writeFile (toFilePath stackDotYaml) hpackConfig
-      loadConfig' $ \config ->
-        liftIO $ configOverrideHpack config `shouldBe`
-        HpackCommand "/usr/local/bin/hpack"
-
-    it "parses config bundled Hpack" $ inTempDir $ do
-      writeFile (toFilePath stackDotYaml) sampleConfig
-      loadConfig' $ \config ->
-        liftIO $ configOverrideHpack config `shouldBe` HpackBundled
-
-    it "parses build config options" $ inTempDir $ do
-     writeFile (toFilePath stackDotYaml) buildOptsConfig
-     loadConfig' $ \config -> liftIO $ do
-      let BuildOpts{..} = configBuild  config
-      boptsLibProfile `shouldBe` True
-      boptsExeProfile `shouldBe` True
-      boptsHaddock `shouldBe` True
-      boptsHaddockDeps `shouldBe` Just True
-      boptsInstallExes `shouldBe` True
-      boptsPreFetch `shouldBe` True
-      boptsKeepGoing `shouldBe` Just True
-      boptsKeepTmpFiles `shouldBe` True
-      boptsForceDirty `shouldBe` True
-      boptsTests `shouldBe` True
-      boptsTestOpts `shouldBe` TestOpts {toRerunTests = True
-                                         ,toAdditionalArgs = ["-fprof"]
-                                         ,toCoverage = True
-                                         ,toDisableRun = True
-                                         ,toMaximumTimeSeconds = Nothing}
-      boptsBenchmarks `shouldBe` True
-      boptsBenchmarkOpts `shouldBe` BenchmarkOpts {beoAdditionalArgs = Just "-O2"
-                                                   ,beoDisableRun = True}
-      boptsReconfigure `shouldBe` True
-      boptsCabalVerbose `shouldBe` CabalVerbosity verbose
-
-    it "finds the config file in a parent directory" $ inTempDir $ do
-      writeFile "package.yaml" "name: foo"
-      writeFile (toFilePath stackDotYaml) sampleConfig
-      parentDir <- getCurrentDirectory >>= parseAbsDir
-      let childDir = "child"
-      createDirectory childDir
-      setCurrentDirectory childDir
-      loadConfig' $ \config -> liftIO $ do
-        bc <- runRIO config $ withBuildConfig ask
-        view projectRootL bc `shouldBe` parentDir
-
-    it "respects the STACK_YAML env variable" $ inTempDir $ do
-      withSystemTempDir "config-is-here" $ \dir -> do
-        let stackYamlFp = toFilePath (dir </> stackDotYaml)
-        writeFile stackYamlFp sampleConfig
-        writeFile (toFilePath dir ++ "/package.yaml") "name: foo"
-        withEnvVar "STACK_YAML" stackYamlFp $ loadConfig' $ \config -> liftIO $ do
-          BuildConfig{..} <- runRIO config $ withBuildConfig ask
-          bcStackYaml `shouldBe` dir </> stackDotYaml
-          parent bcStackYaml `shouldBe` dir
-
-    it "STACK_YAML can be relative" $ inTempDir $ do
-        parentDir <- getCurrentDirectory >>= parseAbsDir
-        let childRel = either impureThrow id (parseRelDir "child")
-            yamlRel = childRel </> either impureThrow id (parseRelFile "some-other-name.config")
-            yamlAbs = parentDir </> yamlRel
-            packageYaml = childRel </> either impureThrow id (parseRelFile "package.yaml")
-        createDirectoryIfMissing True $ toFilePath $ parent yamlAbs
-        writeFile (toFilePath yamlAbs) "resolver: ghc-9.0"
-        writeFile (toFilePath packageYaml) "name: foo"
-        withEnvVar "STACK_YAML" (toFilePath yamlRel) $ loadConfig' $ \config -> liftIO $ do
-            BuildConfig{..} <- runRIO config $ withBuildConfig ask
-            bcStackYaml `shouldBe` yamlAbs
-
-  describe "defaultConfigYaml" $
-    it "is parseable" $ \_ -> do
-        curDir <- getCurrentDir
-        let parsed :: Either String (Either String (WithJSONWarnings ConfigMonoid))
-            parsed = parseEither (parseConfigMonoid curDir) <$> left show (decodeEither' defaultConfigYaml)
-        case parsed of
-            Right (Right _) -> pure () :: IO ()
-            _ -> fail "Failed to parse default config yaml"
diff --git a/src/test/Stack/DotSpec.hs b/src/test/Stack/DotSpec.hs
deleted file mode 100644
index 315d191a7c..0000000000
--- a/src/test/Stack/DotSpec.hs
+++ /dev/null
@@ -1,121 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TupleSections     #-}
-
--- | Test suite for Stack.Dot
-module Stack.DotSpec where
-
-import           Data.Functor.Identity
-import           Data.List ((\\))
-import qualified Data.Map as Map
-import qualified Data.Set as Set
-import           Distribution.License (License (BSD3))
-import qualified RIO.Text as T
-import           Stack.Prelude hiding (pkgName)
-import           Test.Hspec
-import           Test.Hspec.QuickCheck (prop)
-import           Test.QuickCheck (forAll,choose,Gen)
-
-import           Stack.Dot
-
-dummyPayload :: DotPayload
-dummyPayload = DotPayload (parseVersion "0.0.0.0") (Just (Right BSD3)) Nothing
-
-spec :: Spec
-spec = do
-  let graph =
-         Map.mapKeys pkgName
-       . fmap (\p -> (Set.map pkgName p, dummyPayload))
-       . Map.fromList $ [("one",Set.fromList ["base","free"])
-                        ,("two",Set.fromList ["base","free","mtl","transformers","one"])
-                        ]
-  describe "Stack.Dot" $ do
-    it "does nothing if depth is 0" $
-      resolveDependencies (Just 0) graph stubLoader `shouldBe` pure graph
-
-    it "with depth 1, more dependencies are resolved" $ do
-      let graph' = Map.insert (pkgName "cycle")
-                              (Set.singleton (pkgName "cycle"), dummyPayload)
-                              graph
-          resultGraph = runIdentity (resolveDependencies (Just 0) graph stubLoader)
-          resultGraph' = runIdentity (resolveDependencies (Just 1) graph' stubLoader)
-      Map.size resultGraph < Map.size resultGraph' `shouldBe` True
-
-    it "cycles are ignored" $ do
-       let graph' = Map.insert (pkgName "cycle")
-                               (Set.singleton (pkgName "cycle"), dummyPayload)
-                                graph
-           resultGraph = resolveDependencies Nothing graph stubLoader
-           resultGraph' = resolveDependencies Nothing graph' stubLoader
-       fmap Map.size resultGraph' `shouldBe` fmap ((+1) . Map.size) resultGraph
-
-    let graphElem e = Set.member e . Set.unions . Map.elems
-
-    prop "requested packages are pruned" $ do
-      let resolvedGraph = runIdentity (resolveDependencies Nothing graph stubLoader)
-          allPackages g = Map.keysSet g `Set.union` foldMap fst g
-      forAll (sublistOf (Set.toList (allPackages resolvedGraph))) $ \toPrune ->
-        let pruned = pruneGraph [pkgName "one", pkgName "two"] toPrune resolvedGraph
-        in Set.null (allPackages pruned `Set.intersection` Set.fromList toPrune)
-
-    prop "pruning removes orphans" $ do
-      let resolvedGraph = runIdentity (resolveDependencies Nothing graph stubLoader)
-          allPackages g = Map.keysSet g `Set.union` foldMap fst g
-          orphans g = Map.filterWithKey (\k _ -> not (graphElem k g)) g
-      forAll (sublistOf (Set.toList (allPackages resolvedGraph))) $ \toPrune ->
-        let pruned = pruneGraph [pkgName "one", pkgName "two"] toPrune resolvedGraph
-        in null (Map.keys (orphans (fmap fst pruned)) \\ [pkgName "one", pkgName "two"])
-
-{- Helper functions below -}
--- Backport from QuickCheck 2.8 to 2.7.6
-sublistOf :: [a] -> Gen [a]
-sublistOf = filterM (\_ -> choose (False, True))
-
--- Unsafe internal helper to create a package name
-pkgName :: Text -> PackageName
-pkgName = fromMaybe failure . parsePackageName . T.unpack
-  where
-   failure = error "Internal error during package name creation in DotSpec.pkgName"
-
--- Stub, simulates the function to load package dependencies
-stubLoader :: PackageName -> Identity (Set PackageName, DotPayload)
-stubLoader name = pure . (, dummyPayload) . Set.fromList . map pkgName $ case show name of
-  "StateVar" -> ["stm","transformers"]
-  "array" -> []
-  "bifunctors" -> ["semigroupoids","semigroups","tagged"]
-  "binary" -> ["array","bytestring","containers"]
-  "bytestring" -> ["deepseq","ghc-prim","integer-gmp"]
-  "comonad" -> ["containers","contravariant","distributive"
-               ,"semigroups","tagged","transformers","transformers-compat"
-               ]
-  "cont" -> ["StateVar","semigroups","transformers","transformers-compat","void"]
-  "containers" -> ["array","deepseq","ghc-prim"]
-  "deepseq" -> ["array"]
-  "distributive" -> ["ghc-prim","tagged","transformers","transformers-compat"]
-  "free" -> ["bifunctors","comonad","distributive","mtl"
-            ,"prelude-extras","profunctors","semigroupoids"
-            ,"semigroups","template-haskell","transformers"
-            ]
-  "ghc" -> []
-  "hashable" -> ["bytestring","ghc-prim","integer-gmp","text"]
-  "integer" -> []
-  "mtl" -> ["transformers"]
-  "nats" -> []
-  "one" -> ["free"]
-  "prelude" -> []
-  "profunctors" -> ["comonad","distributive","semigroupoids","tagged","transformers"]
-  "semigroupoids" -> ["comonad","containers","contravariant","distributive"
-                     ,"semigroups","transformers","transformers-compat"
-                     ]
-  "semigroups" -> ["bytestring","containers","deepseq","hashable"
-                  ,"nats","text","unordered-containers"
-                  ]
-  "stm" -> ["array"]
-  "tagged" -> ["template-haskell"]
-  "template" -> []
-  "text" -> ["array","binary","bytestring","deepseq","ghc-prim","integer-gmp"]
-  "transformers" -> []
-  "two" -> ["free","mtl","one","transformers"]
-  "unordered" -> ["deepseq","hashable"]
-  "void" -> ["ghc-prim","hashable","semigroups"]
-  _ -> []
diff --git a/src/test/Stack/Ghci/PortableFakePaths.hs b/src/test/Stack/Ghci/PortableFakePaths.hs
deleted file mode 100644
index 920162834c..0000000000
--- a/src/test/Stack/Ghci/PortableFakePaths.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-{-# LANGUAGE CPP #-}
-
--- | Helpers for writing fake paths for test suite for the GhciScript DSL.
--- This must be a separate module because it is used in Template Haskell splices.
-module Stack.Ghci.PortableFakePaths where
-
-defaultDrive :: FilePath
-#ifdef WINDOWS
-defaultDrive = "C:\\"
-#else
-defaultDrive = "/"
-#endif
diff --git a/src/test/Stack/Ghci/ScriptSpec.hs b/src/test/Stack/Ghci/ScriptSpec.hs
deleted file mode 100644
index bf3dfd6fb6..0000000000
--- a/src/test/Stack/Ghci/ScriptSpec.hs
+++ /dev/null
@@ -1,63 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE OverloadedLists   #-}
-{-# LANGUAGE TemplateHaskell   #-}
-
--- | Test suite for the GhciScript DSL
-module Stack.Ghci.ScriptSpec where
-
-import qualified Data.Set as S
-import           Distribution.ModuleName
-import           Test.Hspec
-import qualified System.FilePath as FP
-import           Stack.Ghci.PortableFakePaths
-import           Stack.Prelude hiding (fromString)
-import           Path
-import           Path.Extra (pathToLazyByteString)
-
-import           Stack.Ghci.Script
-
-spec :: Spec
-spec = do
-  describe "GHCi" $ do
-    describe "Script DSL" $ do
-
-      describe "script" $ do
-        it "should separate commands with a newline" $ do
-          let dir = $(mkAbsDir $ defaultDrive FP.</> "src" FP.</> "package-a")
-              script = cmdCdGhc dir
-                    <> cmdAdd [Left (fromString "Lib.A")]
-          scriptToLazyByteString script `shouldBe`
-            ":cd-ghc " <> pathToLazyByteString dir <> "\n:add Lib.A\n"
-
-      describe ":add" $ do
-        it "should not render empty add commands" $ do
-          let script = cmdAdd S.empty
-          scriptToLazyByteString script `shouldBe` ""
-
-        it "should ensure that a space exists between each module in an add command" $ do
-          let script = cmdAdd (S.fromList [Left (fromString "Lib.A"), Left (fromString "Lib.B")])
-          scriptToLazyByteString script `shouldBe` ":add Lib.A Lib.B\n"
-
-      describe ":add (by file)" $ do
-        it "should render a full file path" $ do
-          let file = $(mkAbsFile $ defaultDrive FP.</> "Users" FP.</> "someone" FP.</> "src" FP.</> "project" FP.</> "package-a" FP.</> "src" FP.</> "Main.hs")
-              script = cmdAdd (S.fromList [Right file])
-          scriptToLazyByteString script `shouldBe`
-            ":add " <> pathToLazyByteString file <> "\n"
-
-      describe ":cd-ghc" $ do
-        it "should render a full absolute path" $ do
-          let dir = $(mkAbsDir $ defaultDrive FP.</> "Users" FP.</> "someone" FP.</> "src" FP.</> "project" FP.</> "package-a")
-              script = cmdCdGhc dir
-          scriptToLazyByteString script `shouldBe`
-            ":cd-ghc " <> pathToLazyByteString dir <> "\n"
-
-      describe ":module" $ do
-        it "should render empty module as ':module +'" $ do
-          let script = cmdModule []
-          scriptToLazyByteString script `shouldBe` ":module +\n"
-
-        it "should ensure that a space exists between each module in a module command" $ do
-          let script = cmdModule [fromString "Lib.A", fromString "Lib.B"]
-          scriptToLazyByteString script `shouldBe` ":module + Lib.A Lib.B\n"
diff --git a/src/test/Stack/NixSpec.hs b/src/test/Stack/NixSpec.hs
deleted file mode 100644
index d1e3ebdad2..0000000000
--- a/src/test/Stack/NixSpec.hs
+++ /dev/null
@@ -1,106 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Stack.NixSpec where
-
-import Data.Maybe (fromJust)
-import Options.Applicative
-import Path
-import Prelude (writeFile)
-import Stack.Config
-import Stack.Config.Nix
-import Stack.Constants
-import Stack.Options.GlobalParser (globalOptsFromMonoid)
-import Stack.Options.NixParser
-import Stack.Prelude
-import Stack.Runners
-import Stack.Types.Config
-import Stack.Types.Nix
-import System.Directory
-import System.Environment
-import Test.Hspec
-
-sampleConfigNixEnabled :: String
-sampleConfigNixEnabled =
-  "resolver: lts-19.22\n" ++
-  "packages: ['.']\n" ++
-  "system-ghc: true\n" ++
-  "nix:\n" ++
-  "   enable: True\n" ++
-  "   packages: [glpk]"
-
-sampleConfigNixDisabled :: String
-sampleConfigNixDisabled =
-  "resolver: lts-19.22\n" ++
-  "packages: ['.']\n" ++
-  "nix:\n" ++
-  "   enable: False"
-
-setup :: IO ()
-setup = unsetEnv "STACK_YAML"
-
-spec :: Spec
-spec = beforeAll setup $ do
-  let loadConfig' :: ConfigMonoid -> (Config -> IO ()) -> IO ()
-      loadConfig' cmdLineArgs inner = do
-        globalOpts <- globalOptsFromMonoid False mempty { globalMonoidConfigMonoid = cmdLineArgs }
-        withRunnerGlobal globalOpts { globalLogLevel = LevelOther "silent" } $
-          loadConfig (liftIO . inner)
-      inTempDir test = do
-        currentDirectory <- getCurrentDirectory
-        withSystemTempDirectory "Stack_ConfigSpec" $ \tempDir -> do
-          let enterDir = setCurrentDirectory tempDir
-              exitDir = setCurrentDirectory currentDirectory
-          bracket_ enterDir exitDir test
-      withStackDotYaml config test = inTempDir $ do
-        writeFile (toFilePath stackDotYaml) config
-        test
-      parseNixOpts cmdLineOpts = fromJust $ getParseResult $ execParserPure
-        defaultPrefs
-        (info (nixOptsParser False) mempty)
-        cmdLineOpts
-      parseOpts cmdLineOpts = mempty { configMonoidNixOpts = parseNixOpts cmdLineOpts }
-  let trueOnNonWindows = not osIsWindows
-  describe "nix disabled in config file" $
-    around_ (withStackDotYaml sampleConfigNixDisabled) $ do
-      it "sees that the nix shell is not enabled" $ loadConfig' mempty $ \config ->
-        nixEnable (configNix config) `shouldBe` False
-      describe "--nix given on command line" $
-        it "sees that the nix shell is enabled" $
-          loadConfig' (parseOpts ["--nix"]) $ \config ->
-          nixEnable (configNix config) `shouldBe` trueOnNonWindows
-      describe "--nix-pure given on command line" $
-        it "sees that the nix shell is enabled" $
-          loadConfig' (parseOpts ["--nix-pure"]) $ \config ->
-          nixEnable (configNix config) `shouldBe` trueOnNonWindows
-      describe "--no-nix given on command line" $
-        it "sees that the nix shell is not enabled" $
-          loadConfig' (parseOpts ["--no-nix"]) $ \config ->
-          nixEnable (configNix config) `shouldBe` False
-      describe "--no-nix-pure given on command line" $
-        it "sees that the nix shell is not enabled" $
-          loadConfig' (parseOpts ["--no-nix-pure"]) $ \config ->
-          nixEnable (configNix config) `shouldBe` False
-  describe "nix enabled in config file" $
-    around_ (withStackDotYaml sampleConfigNixEnabled) $ do
-      it "sees that the nix shell is enabled" $
-        loadConfig' mempty $ \config ->
-        nixEnable (configNix config) `shouldBe` trueOnNonWindows
-      describe "--no-nix given on command line" $
-        it "sees that the nix shell is not enabled" $
-          loadConfig' (parseOpts ["--no-nix"]) $ \config ->
-          nixEnable (configNix config) `shouldBe` False
-      describe "--nix-pure given on command line" $
-        it "sees that the nix shell is enabled" $
-          loadConfig' (parseOpts ["--nix-pure"]) $ \config ->
-          nixEnable (configNix config) `shouldBe` trueOnNonWindows
-      describe "--no-nix-pure given on command line" $
-        it "sees that the nix shell is enabled" $
-          loadConfig' (parseOpts ["--no-nix-pure"]) $ \config ->
-          nixEnable (configNix config) `shouldBe` trueOnNonWindows
-      it "sees that the only package asked for is glpk and asks for the correct GHC derivation" $ loadConfig' mempty $ \config -> do
-        nixPackages (configNix config) `shouldBe` ["glpk"]
-        v <- parseVersionThrowing "9.0.2"
-        ghc <- either throwIO pure $ nixCompiler (WCGhc v)
-        ghc `shouldBe` "haskell.compiler.ghc902"
diff --git a/src/test/Stack/PackageDumpSpec.hs b/src/test/Stack/PackageDumpSpec.hs
deleted file mode 100644
index 2c01247377..0000000000
--- a/src/test/Stack/PackageDumpSpec.hs
+++ /dev/null
@@ -1,270 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TupleSections     #-}
-
-module Stack.PackageDumpSpec where
-
-import           Conduit
-import qualified Data.Conduit.List             as CL
-import           Data.Conduit.Text             (decodeUtf8)
-import qualified Data.Map                      as Map
-import qualified Data.Set                      as Set
-import           Distribution.License          (License(..))
-import           Distribution.Types.PackageName (mkPackageName)
-import           Distribution.Version          (mkVersion)
-import           Path                          (parseAbsFile)
-import           Stack.PackageDump
-import           Stack.Prelude
-import           Stack.Types.Config
-import           Stack.Types.GhcPkgId
-import           RIO.Process
-import           Test.Hspec
-import           Test.Hspec.QuickCheck
-
-main :: IO ()
-main = hspec spec
-
-spec :: Spec
-spec = do
-    describe "eachSection" $ do
-        let test name content expected = it name $ do
-                actual <- runConduit $ yield content .| eachSection CL.consume .| CL.consume
-                actual `shouldBe` expected
-        test
-            "unix line endings"
-            "foo\nbar\n---\nbaz---\nbin\n---\n"
-            [ ["foo", "bar"]
-            , ["baz---", "bin"]
-            ]
-        test
-            "windows line endings"
-            "foo\r\nbar\r\n---\r\nbaz---\r\nbin\r\n---\r\n"
-            [ ["foo", "bar"]
-            , ["baz---", "bin"]
-            ]
-
-    it "eachPair" $ do
-        let bss =
-                [ "key1: val1"
-                , "key2: val2a"
-                , "      val2b"
-                , "key3:"
-                , "key4:"
-                , "   val4a"
-                , "   val4b"
-                ]
-            sink k = fmap (k, ) CL.consume
-        actual <- runConduit $ mapM_ yield bss .| eachPair sink .| CL.consume
-        actual `shouldBe`
-            [ ("key1", ["val1"])
-            , ("key2", ["val2a", "val2b"])
-            , ("key3", [])
-            , ("key4", ["val4a", "val4b"])
-            ]
-
-    describe "conduitDumpPackage" $ do
-        it "ghc 7.8" $ do
-            haskell2010:_ <-
-                  withSourceFile "test/package-dump/ghc-7.8.txt" $ \src ->
-                  runConduit
-                $ src
-               .| decodeUtf8
-               .| conduitDumpPackage
-               .| CL.consume
-            ghcPkgId <- parseGhcPkgId "haskell2010-1.1.2.0-05c8dd51009e08c6371c82972d40f55a"
-            packageIdent <- maybe (fail "Not parsable package id") pure $
-              parsePackageIdentifier "haskell2010-1.1.2.0"
-            depends <- mapM parseGhcPkgId
-                [ "array-0.5.0.0-470385a50d2b78598af85cfe9d988e1b"
-                , "base-4.7.0.2-bfd89587617e381ae01b8dd7b6c7f1c1"
-                , "ghc-prim-0.3.1.0-a24f9c14c632d75b683d0f93283aea37"
-                ]
-            haskell2010 { dpExposedModules = mempty } `shouldBe` DumpPackage
-                { dpGhcPkgId = ghcPkgId
-                , dpPackageIdent = packageIdent
-                , dpParentLibIdent = Nothing
-                , dpLicense = Just BSD3
-                , dpLibDirs = ["/opt/ghc/7.8.4/lib/ghc-7.8.4/haskell2010-1.1.2.0"]
-                , dpDepends = depends
-                , dpLibraries = ["HShaskell2010-1.1.2.0"]
-                , dpHasExposedModules = True
-                , dpHaddockInterfaces = ["/opt/ghc/7.8.4/share/doc/ghc/html/libraries/haskell2010-1.1.2.0/haskell2010.haddock"]
-                , dpHaddockHtml = Just "/opt/ghc/7.8.4/share/doc/ghc/html/libraries/haskell2010-1.1.2.0"
-                , dpIsExposed = False
-                , dpExposedModules = mempty
-                }
-
-        it "ghc 7.10" $ do
-            haskell2010:_ <-
-                  withSourceFile "test/package-dump/ghc-7.10.txt" $ \src ->
-                  runConduit
-                $ src
-               .| decodeUtf8
-               .| conduitDumpPackage
-               .| CL.consume
-            ghcPkgId <- parseGhcPkgId "ghc-7.10.1-325809317787a897b7a97d646ceaa3a3"
-            pkgIdent <- maybe (fail "Not parsable package id") pure $
-              parsePackageIdentifier "ghc-7.10.1"
-            depends <- mapM parseGhcPkgId
-                [ "array-0.5.1.0-e29cdbe82692341ebb7ce6e2798294f9"
-                , "base-4.8.0.0-1b689eb8d72c4d4cc88f445839c1f01a"
-                , "bin-package-db-0.0.0.0-708fc7d634a370b311371a5bcde40b62"
-                , "bytestring-0.10.6.0-0909f8f31271f3d75749190bf2ee35db"
-                , "containers-0.5.6.2-2114032c163425cc264e6e1169dc2f6d"
-                , "directory-1.2.2.0-b4959b472d9eee380c6b32291ade29e0"
-                , "filepath-1.4.0.0-40d643aa87258c186441a1f8f3e13ca6"
-                , "hoopl-3.10.0.2-8c8dfc4c3140e5f7c982da224c3cb1f0"
-                , "hpc-0.6.0.2-ac9064885aa8cb08a93314222939ead4"
-                , "process-1.2.3.0-3b1e9bca6ac38225806ff7bbf3f845b1"
-                , "template-haskell-2.10.0.0-e895139a0ffff267d412e3d0191ce93b"
-                , "time-1.5.0.1-e17a9220d438435579d2914e90774246"
-                , "transformers-0.4.2.0-c1a7bb855a176fe475d7b665301cd48f"
-                , "unix-2.7.1.0-e5915eb989e568b732bc7286b0d0817f"
-                ]
-            haskell2010 { dpExposedModules = mempty } `shouldBe` DumpPackage
-                { dpGhcPkgId = ghcPkgId
-                , dpPackageIdent = pkgIdent
-                , dpParentLibIdent = Nothing
-                , dpLicense = Just BSD3
-                , dpLibDirs = ["/opt/ghc/7.10.1/lib/ghc-7.10.1/ghc_EMlWrQ42XY0BNVbSrKixqY"]
-                , dpHaddockInterfaces = ["/opt/ghc/7.10.1/share/doc/ghc/html/libraries/ghc-7.10.1/ghc.haddock"]
-                , dpHaddockHtml = Just "/opt/ghc/7.10.1/share/doc/ghc/html/libraries/ghc-7.10.1"
-                , dpDepends = depends
-                , dpLibraries = ["HSghc-7.10.1-EMlWrQ42XY0BNVbSrKixqY"]
-                , dpHasExposedModules = True
-                , dpIsExposed = False
-                , dpExposedModules = mempty
-                }
-        it "ghc 7.8.4 (osx)" $ do
-            hmatrix:_ <-
-                  withSourceFile "test/package-dump/ghc-7.8.4-osx.txt" $ \src ->
-                  runConduit
-                $ src
-               .| decodeUtf8
-               .| conduitDumpPackage
-               .| CL.consume
-            ghcPkgId <- parseGhcPkgId "hmatrix-0.16.1.5-12d5d21f26aa98774cdd8edbc343fbfe"
-            pkgId <- maybe (fail "Not parsable package id") pure $
-              parsePackageIdentifier "hmatrix-0.16.1.5"
-            depends <- mapM parseGhcPkgId
-                [ "array-0.5.0.0-470385a50d2b78598af85cfe9d988e1b"
-                , "base-4.7.0.2-918c7ac27f65a87103264a9f51652d63"
-                , "binary-0.7.1.0-108d06eea2ef05e517f9c1facf10f63c"
-                , "bytestring-0.10.4.0-78bc8f2c724c765c78c004a84acf6cc3"
-                , "deepseq-1.3.0.2-0ddc77716bd2515426e1ba39f6788a4f"
-                , "random-1.1-822c19b7507b6ac1aaa4c66731e775ae"
-                , "split-0.2.2-34cfb851cc3784e22bfae7a7bddda9c5"
-                , "storable-complex-0.2.2-e962c368d58acc1f5b41d41edc93da72"
-                , "vector-0.10.12.3-f4222db607fd5fdd7545d3e82419b307"]
-            hmatrix `shouldBe` DumpPackage
-                { dpGhcPkgId = ghcPkgId
-                , dpPackageIdent = pkgId
-                , dpParentLibIdent = Nothing
-                , dpLicense = Just BSD3
-                , dpLibDirs =
-                      [ "/Users/alexbiehl/.stack/snapshots/x86_64-osx/lts-2.13/7.8.4/lib/x86_64-osx-ghc-7.8.4/hmatrix-0.16.1.5"
-                      , "/opt/local/lib/"
-                      , "/usr/local/lib/"
-                      ,  "C:/Program Files/Example/"]
-                , dpHaddockInterfaces = ["/Users/alexbiehl/.stack/snapshots/x86_64-osx/lts-2.13/7.8.4/doc/html/hmatrix.haddock"]
-                , dpHaddockHtml = Just "/Users/alexbiehl/.stack/snapshots/x86_64-osx/lts-2.13/7.8.4/doc/html"
-                , dpDepends = depends
-                , dpLibraries = ["HShmatrix-0.16.1.5"]
-                , dpHasExposedModules = True
-                , dpIsExposed = True
-                , dpExposedModules = Set.fromList ["Data.Packed","Data.Packed.Vector","Data.Packed.Matrix","Data.Packed.Foreign","Data.Packed.ST","Data.Packed.Development","Numeric.LinearAlgebra","Numeric.LinearAlgebra.LAPACK","Numeric.LinearAlgebra.Algorithms","Numeric.Container","Numeric.LinearAlgebra.Util","Numeric.LinearAlgebra.Devel","Numeric.LinearAlgebra.Data","Numeric.LinearAlgebra.HMatrix","Numeric.LinearAlgebra.Static"]
-                }
-        it "ghc HEAD" $ do
-          ghcBoot:_ <-
-                withSourceFile "test/package-dump/ghc-head.txt" $ \src ->
-                runConduit
-              $ src
-             .| decodeUtf8
-             .| conduitDumpPackage
-             .| CL.consume
-          ghcPkgId <- parseGhcPkgId "ghc-boot-0.0.0.0"
-          pkgId <- maybe (fail "Not parsable package id") pure $
-            parsePackageIdentifier "ghc-boot-0.0.0.0"
-          depends <- mapM parseGhcPkgId
-            [ "base-4.9.0.0"
-            , "binary-0.7.5.0"
-            , "bytestring-0.10.7.0"
-            , "directory-1.2.5.0"
-            , "filepath-1.4.1.0"
-            ]
-          ghcBoot `shouldBe` DumpPackage
-            { dpGhcPkgId = ghcPkgId
-            , dpPackageIdent = pkgId
-            , dpParentLibIdent = Nothing
-            , dpLicense = Just BSD3
-            , dpLibDirs =
-                  ["/opt/ghc/head/lib/ghc-7.11.20151213/ghc-boot-0.0.0.0"]
-            , dpHaddockInterfaces = ["/opt/ghc/head/share/doc/ghc/html/libraries/ghc-boot-0.0.0.0/ghc-boot.haddock"]
-            , dpHaddockHtml = Just "/opt/ghc/head/share/doc/ghc/html/libraries/ghc-boot-0.0.0.0"
-            , dpDepends = depends
-            , dpLibraries = ["HSghc-boot-0.0.0.0"]
-            , dpHasExposedModules = True
-            , dpIsExposed = True
-            , dpExposedModules = Set.fromList ["GHC.Lexeme", "GHC.PackageDb"]
-            }
-
-
-    it "sinkMatching" $ runEnvNoLogging $ \pkgexe -> do
-        m <- ghcPkgDump pkgexe []
-            $  conduitDumpPackage
-            .| sinkMatching (Map.singleton (mkPackageName "transformers") (mkVersion [0, 0, 0, 0, 0, 0, 1]))
-        case Map.lookup (mkPackageName "base") m of
-            Nothing -> error "base not present"
-            Just _ -> pure ()
-        liftIO $ do
-          Map.lookup (mkPackageName "transformers") m `shouldBe` Nothing
-          Map.lookup (mkPackageName "ghc") m `shouldBe` Nothing
-
-    describe "pruneDeps" $ do
-        it "sanity check" $ do
-            let prunes =
-                    [ ((1, 'a'), [])
-                    , ((1, 'b'), [])
-                    , ((2, 'a'), [(1, 'b')])
-                    , ((2, 'b'), [(1, 'a')])
-                    , ((3, 'a'), [(1, 'c')])
-                    , ((4, 'a'), [(2, 'a')])
-                    ]
-                actual = fst <$> pruneDeps fst fst snd bestPrune prunes
-            actual `shouldBe` Map.fromList
-                [ (1, (1, 'b'))
-                , (2, (2, 'a'))
-                , (4, (4, 'a'))
-                ]
-
-        prop "invariant holds" $ \prunes' ->
-            -- Force uniqueness
-            let prunes = Map.toList $ Map.fromList prunes'
-             in checkDepsPresent prunes $ fst <$> pruneDeps fst fst snd bestPrune prunes
-
-type PruneCheck = ((Int, Char), [(Int, Char)])
-
-bestPrune :: PruneCheck -> PruneCheck -> PruneCheck
-bestPrune x y
-    | fst x > fst y = x
-    | otherwise = y
-
-checkDepsPresent :: [PruneCheck] -> Map Int (Int, Char) -> Bool
-checkDepsPresent prunes selected =
-    all hasDeps $ Set.toList allIds
-  where
-    depMap = Map.fromList prunes
-    allIds = Set.fromList $ Map.elems selected
-
-    hasDeps ident =
-        case Map.lookup ident depMap of
-            Nothing -> error "checkDepsPresent: missing in depMap"
-            Just deps -> Set.null $ Set.difference (Set.fromList deps) allIds
-
-runEnvNoLogging :: (GhcPkgExe -> RIO LoggedProcessContext a) -> IO a
-runEnvNoLogging inner = do
-  envVars <- view envVarsL <$> mkDefaultProcessContext
-  menv <- mkProcessContext $ Map.delete "GHC_PACKAGE_PATH" envVars
-  let find name = runRIO menv (findExecutable name) >>= either throwIO parseAbsFile
-  pkg <- GhcPkgExe <$> find "ghc-pkg"
-  runRIO (LoggedProcessContext menv mempty) (inner pkg)
diff --git a/src/test/Stack/UploadSpec.hs b/src/test/Stack/UploadSpec.hs
deleted file mode 100644
index 1819460281..0000000000
--- a/src/test/Stack/UploadSpec.hs
+++ /dev/null
@@ -1,41 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Stack.UploadSpec (spec) where
-
-import RIO
-import RIO.Directory
-import RIO.FilePath ((</>))
-import Stack.Upload
-import Test.Hspec
-import System.Permissions (osIsWindows)
-import System.PosixCompat.Files (getFileStatus, fileMode)
-import System.Environment (setEnv, unsetEnv)
-import Data.Bits ((.&.))
-
-spec :: Spec
-spec = do
-  it "writeFilePrivate" $ example $ withSystemTempDirectory "writeFilePrivate" $ \dir -> replicateM_ 2 $ do
-    let fp = dir </> "filename"
-        contents :: IsString s => s
-        contents = "These are the contents"
-    writeFilePrivate fp contents
-    actual <- readFileBinary fp
-    actual `shouldBe` contents
-    perms <- getPermissions fp
-    perms `shouldBe` setOwnerWritable True (setOwnerReadable True emptyPermissions)
-
-    unless osIsWindows $ do
-      status <- getFileStatus fp
-      (fileMode status .&. 0o777) `shouldBe` 0o600
-
-  it "finds a HACKAGE_KEY env variable" $ do
-    runRIO () maybeGetHackageKey `shouldReturn` Nothing
-
-    withEnv "HACKAGE_KEY" "api_key"
-      $ runRIO () maybeGetHackageKey `shouldReturn` Just (HackageKey "api_key")
-
-withEnv :: String -> String -> IO a -> IO a
-withEnv k v f = do
-  setEnv k v
-  f `finally` unsetEnv k
diff --git a/src/unix/Stack/Build/TestSuiteTimeout.hs b/src/unix/Stack/Build/TestSuiteTimeout.hs
new file mode 100644
index 0000000000..e496a661d9
--- /dev/null
+++ b/src/unix/Stack/Build/TestSuiteTimeout.hs
@@ -0,0 +1,40 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Build.TestSuiteTimeout
+Description : OS-specific test suite timeout termination helpers.
+License     : BSD-3-Clause
+-}
+
+module Stack.Build.TestSuiteTimeout
+  ( prepareForEscalation
+  , terminateGracefully
+  , forceKill
+  ) where
+
+import           RIO.Process ( ProcessConfig, setNewSession )
+import qualified RIO.Process as RP ( Process, unsafeProcessHandle )
+import           Stack.Prelude
+import           System.Posix.Signals
+                   ( sigKILL, sigTERM, signalProcess, signalProcessGroup )
+import qualified System.Process as Process
+
+prepareForEscalation :: ProcessConfig stdin stdout stderr -> ProcessConfig stdin stdout stderr
+prepareForEscalation = setNewSession True
+
+terminateGracefully :: RP.Process stdin stdout stderr -> RIO env ()
+terminateGracefully p = do
+  let processHandle = RP.unsafeProcessHandle p
+  mpid <- liftIO $ Process.getPid processHandle
+  forM_ mpid $ \pid -> do
+    -- In a new session, the initial pid is also the process group id.
+    void $ tryAny $ liftIO $ signalProcessGroup sigTERM pid
+    void $ tryAny $ liftIO $ signalProcess sigTERM pid
+
+forceKill :: RP.Process stdin stdout stderr -> RIO env ()
+forceKill p = do
+  let processHandle = RP.unsafeProcessHandle p
+  mpid <- liftIO $ Process.getPid processHandle
+  forM_ mpid $ \pid -> do
+    void $ tryAny $ liftIO $ signalProcessGroup sigKILL pid
+    void $ tryAny $ liftIO $ signalProcess sigKILL pid
diff --git a/src/unix/Stack/Constants/UsrLibDirs.hs b/src/unix/Stack/Constants/UsrLibDirs.hs
new file mode 100644
index 0000000000..ac99a49ae4
--- /dev/null
+++ b/src/unix/Stack/Constants/UsrLibDirs.hs
@@ -0,0 +1,27 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE TemplateHaskell   #-}
+
+{-|
+Module      : Stack.Constants.UsrLibDirs
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the non-Windows version.
+-}
+
+module Stack.Constants.UsrLibDirs
+  ( libDirs
+  , usrLibDirs
+  ) where
+
+import          Path ( mkAbsDir )
+import          Stack.Prelude
+
+-- | Used in Stack.Setup for detecting libc.musl-x86_64.so.1, see comments at
+-- use site
+libDirs :: [Path Abs Dir]
+libDirs = [$(mkAbsDir "/lib"), $(mkAbsDir "/lib64")]
+
+-- | Used in Stack.Setup for detecting libtinfo, see comments at use site
+usrLibDirs :: [Path Abs Dir]
+usrLibDirs = [$(mkAbsDir "/usr/lib"), $(mkAbsDir "/usr/lib64")]
diff --git a/src/unix/Stack/Docker/Handlers.hs b/src/unix/Stack/Docker/Handlers.hs
new file mode 100644
index 0000000000..ca60462054
--- /dev/null
+++ b/src/unix/Stack/Docker/Handlers.hs
@@ -0,0 +1,69 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Docker.Handlers
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the non-Windows version.
+-}
+
+module Stack.Docker.Handlers
+  ( handleSetGroups
+  , handleSignals
+  ) where
+
+import           RIO.Process
+                   ( ExitCodeException, proc, runProcess_, setDelegateCtlc )
+import           Stack.Prelude
+import           Stack.Types.Config ( HasConfig )
+import           Stack.Types.Docker ( DockerOpts (..) )
+import           System.Posix.Signals
+                   ( Handler (..), installHandler, sigABRT, sigHUP, sigINT
+                   , sigPIPE, sigTERM, sigUSR1, sigUSR2
+                   )
+import qualified System.Posix.User as PosixUser
+import           System.PosixCompat.Types ( GroupID )
+
+handleSetGroups :: [GroupID] -> IO ()
+handleSetGroups = PosixUser.setGroups
+
+-- MSS 2018-08-30 can the CPP below be removed entirely, and instead exec the
+-- `docker` process so that it can handle the signals directly?
+handleSignals ::
+     (Exception e, HasConfig env)
+  => DockerOpts
+  -> Bool
+  -> String
+  -> RIO env (Either e ())
+handleSignals docker keepStdinOpen containerID = do
+  run <- askRunInIO
+  oldHandlers <- forM signals $ \sig -> do
+    let sigHandler = run $ do
+          readProcessNull
+            "docker"
+            ["kill", "--signal=" ++ show sig, containerID]
+          when (sig `elem` [sigTERM, sigABRT]) $ do
+            -- Give the container 30 seconds to exit gracefully, then send a
+            -- sigKILL to force it
+            threadDelay 30000000
+            readProcessNull "docker" ["kill", containerID]
+    oldHandler <- liftIO $ installHandler sig (Catch sigHandler) Nothing
+    pure (sig, oldHandler)
+  let args' = concat
+        [ ["start"]
+        , ["-a" | not docker.detach]
+        , ["-i" | keepStdinOpen]
+        , [containerID]
+        ]
+  finally
+    (try $ proc "docker" args' $ runProcess_ . setDelegateCtlc False)
+    ( do unless (docker.persist || docker.detach) $
+           readProcessNull "docker" ["rm", "-f", containerID]
+             `catch` (\(_ :: ExitCodeException) -> pure ())
+         forM_ oldHandlers $ \(sig, oldHandler) ->
+           liftIO $ installHandler sig oldHandler Nothing
+    )
+ where
+  signals = [sigINT, sigABRT, sigHUP, sigPIPE, sigTERM, sigUSR1, sigUSR2]
diff --git a/src/unix/System/Info/ShortPathName.hs b/src/unix/System/Info/ShortPathName.hs
index 1486971e95..09182d47a5 100644
--- a/src/unix/System/Info/ShortPathName.hs
+++ b/src/unix/System/Info/ShortPathName.hs
@@ -1,12 +1,20 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
+{-|
+Module      : System.Info.ShortPathName
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the non-Windows version.
+-}
+
 module System.Info.ShortPathName
   ( getShortPathName
   ) where
 
-import RIO.FilePath (FilePath)
-import RIO.Prelude (pure)
-import RIO.Prelude.Types (IO)
+import           RIO.FilePath ( FilePath )
+import           RIO.Prelude ( pure )
+import           RIO.Prelude.Types ( IO )
 
 getShortPathName :: FilePath -> IO FilePath
 getShortPathName = pure
diff --git a/src/unix/System/Permissions.hs b/src/unix/System/Permissions.hs
index ece2010af9..e1b9927b69 100644
--- a/src/unix/System/Permissions.hs
+++ b/src/unix/System/Permissions.hs
@@ -1,25 +1,39 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
+{-|
+Module      : System.Permissions
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the non-Windows version.
+-}
+
 module System.Permissions
-  ( setScriptPerms
+  ( osIsMacOS
   , osIsWindows
   , setFileExecutable
+  , setScriptPerms
   ) where
 
+import           RIO
 import qualified System.Posix.Files as Posix
-import RIO
+import           System.Info ( os )
 
--- | True if using Windows OS.
+-- | True if using macOS.
+osIsMacOS :: Bool
+osIsMacOS = os == "darwin"
+
+-- | False if not using Windows.
 osIsWindows :: Bool
 osIsWindows = False
 
-setScriptPerms :: MonadIO m => FilePath -> m ()
-setScriptPerms fp = do
-    liftIO $ Posix.setFileMode fp $
-        Posix.ownerReadMode `Posix.unionFileModes`
-        Posix.ownerWriteMode `Posix.unionFileModes`
-        Posix.groupReadMode `Posix.unionFileModes`
-        Posix.otherReadMode
-
 setFileExecutable :: MonadIO m => FilePath -> m ()
 setFileExecutable fp = liftIO $ Posix.setFileMode fp 0o755
+
+setScriptPerms :: MonadIO m => FilePath -> m ()
+setScriptPerms fp =
+  liftIO $ Posix.setFileMode fp $
+    Posix.ownerReadMode `Posix.unionFileModes`
+    Posix.ownerWriteMode `Posix.unionFileModes`
+    Posix.groupReadMode `Posix.unionFileModes`
+    Posix.otherReadMode
diff --git a/src/unix/System/Terminal.hsc b/src/unix/System/Terminal.hsc
index 89053d23c2..0b57ecbbdf 100644
--- a/src/unix/System/Terminal.hsc
+++ b/src/unix/System/Terminal.hsc
@@ -1,15 +1,21 @@
 {-# LANGUAGE CApiFFI                  #-}
-{-# LANGUAGE ForeignFunctionInterface #-}
+
+{-|
+Module      : System.Terminal
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the non-Windows version.
+-}
 
 module System.Terminal
-( fixCodePage
-, getTerminalWidth
+( getTerminalWidth
 , hIsTerminalDeviceOrMinTTY
 ) where
 
 import           Foreign
 import           Foreign.C.Types
-import           RIO (MonadIO, Handle, hIsTerminalDevice)
+import           RIO ( Handle, MonadIO, hIsTerminalDevice )
 
 #include <sys/ioctl.h>
 #include <unistd.h>
@@ -30,18 +36,16 @@ instance Storable WindowWidth where
 foreign import capi "sys/ioctl.h ioctl"
   ioctl :: CInt -> CInt -> Ptr WindowWidth -> IO CInt
 
+-- | If available, yields the width of the terminal.
 getTerminalWidth :: IO (Maybe Int)
 getTerminalWidth =
-    alloca $ \p -> do
-        errno <- ioctl (#const STDOUT_FILENO) (#const TIOCGWINSZ) p
-        if errno < 0
-        then return Nothing
-        else do
-            WindowWidth w <- peek p
-            return . Just . fromIntegral $ w
-
-fixCodePage :: x -> y -> a -> a
-fixCodePage _ _ = id
+  alloca $ \p -> do
+    errno <- ioctl (#const STDOUT_FILENO) (#const TIOCGWINSZ) p
+    if errno < 0
+    then return Nothing
+    else do
+      WindowWidth w <- peek p
+      return . Just . fromIntegral $ w
 
 -- | hIsTerminaDevice does not recognise handles to mintty terminals as terminal
 -- devices, but isMinTTYHandle does.
diff --git a/src/unix/System/Uname.hsc b/src/unix/System/Uname.hsc
index 3f6a1a465b..2d19a0e429 100644
--- a/src/unix/System/Uname.hsc
+++ b/src/unix/System/Uname.hsc
@@ -1,3 +1,11 @@
+{-|
+Module      : System.Uname
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the non-Windows version.
+-}
+
 module System.Uname
     ( getRelease
     )
@@ -5,8 +13,8 @@ module System.Uname
 
 #include <sys/utsname.h>
 
-import Foreign
-import Foreign.C
+import           Foreign
+import           Foreign.C
 
 getRelease :: IO String
 getRelease = do
@@ -31,10 +39,10 @@ foreign import ccall unsafe "haskell_uname"
 data Utsname
 
 instance Storable Utsname where
-    sizeOf    = const #size struct utsname
-    alignment = const #alignment struct utsname
-    poke      = error "Storable Utsname: peek: unsupported operation"
-    peek      = error "Storable Utsname: poke: unsupported operation"
+  sizeOf    = const #size struct utsname
+  alignment = const #alignment struct utsname
+  poke      = error "Storable Utsname: peek: unsupported operation"
+  peek      = error "Storable Utsname: poke: unsupported operation"
 
 release :: Ptr Utsname -> CString
 release = (#ptr struct utsname, release)
diff --git a/src/windows/Stack/Build/TestSuiteTimeout.hs b/src/windows/Stack/Build/TestSuiteTimeout.hs
new file mode 100644
index 0000000000..2603b01ce1
--- /dev/null
+++ b/src/windows/Stack/Build/TestSuiteTimeout.hs
@@ -0,0 +1,29 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Build.TestSuiteTimeout
+Description : OS-specific test suite timeout termination helpers.
+License     : BSD-3-Clause
+-}
+
+module Stack.Build.TestSuiteTimeout
+  ( prepareForEscalation
+  , terminateGracefully
+  , forceKill
+  ) where
+
+import           RIO.Process ( ProcessConfig )
+import qualified RIO.Process as RP ( Process, unsafeProcessHandle )
+import           Stack.Prelude
+import qualified System.Process as Process
+
+prepareForEscalation :: ProcessConfig stdin stdout stderr -> ProcessConfig stdin stdout stderr
+prepareForEscalation = id
+
+terminateGracefully :: RP.Process stdin stdout stderr -> RIO env ()
+terminateGracefully p =
+  void $ tryAny $ liftIO $ Process.terminateProcess $ RP.unsafeProcessHandle p
+
+forceKill :: RP.Process stdin stdout stderr -> RIO env ()
+forceKill p =
+  void $ tryAny $ liftIO $ Process.terminateProcess $ RP.unsafeProcessHandle p
diff --git a/src/windows/Stack/Constants/UsrLibDirs.hs b/src/windows/Stack/Constants/UsrLibDirs.hs
new file mode 100644
index 0000000000..527f530fa5
--- /dev/null
+++ b/src/windows/Stack/Constants/UsrLibDirs.hs
@@ -0,0 +1,25 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+{-|
+Module      : Stack.Constants.UsrLibDirs
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the Windows version.
+-}
+
+module Stack.Constants.UsrLibDirs
+  ( libDirs
+  , usrLibDirs
+  ) where
+
+import          Stack.Prelude
+
+-- | Used in Stack.Setup for detecting libc.musl-x86_64.so.1, see comments at
+-- use site
+libDirs :: [Path Abs Dir]
+libDirs = []
+
+-- | Used in Stack.Setup for detecting libtinfo, see comments at use site
+usrLibDirs :: [Path Abs Dir]
+usrLibDirs = []
diff --git a/src/windows/Stack/Docker/Handlers.hs b/src/windows/Stack/Docker/Handlers.hs
new file mode 100644
index 0000000000..2bb07ca9ff
--- /dev/null
+++ b/src/windows/Stack/Docker/Handlers.hs
@@ -0,0 +1,45 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : Stack.Docker.Handlers
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the Windows version.
+-}
+
+module Stack.Docker.Handlers
+  ( handleSetGroups
+  , handleSignals
+  ) where
+
+import           RIO.Process
+                   ( ExitCodeException, proc , runProcess_, setDelegateCtlc )
+import           Stack.Types.Config ( HasConfig )
+import           Stack.Types.Docker ( DockerOpts (..))
+import           Stack.Prelude
+import           System.PosixCompat.Types ( GroupID )
+
+handleSetGroups :: [GroupID] -> IO ()
+handleSetGroups _ = pure ()
+
+handleSignals ::
+     (Exception e, HasConfig env)
+  => DockerOpts
+  -> Bool
+  -> String
+  -> RIO env (Either e ())
+handleSignals docker keepStdinOpen containerID = do
+  let args' = concat
+        [ ["start"]
+        , ["-a" | not docker.detach]
+        , ["-i" | keepStdinOpen]
+        , [containerID]
+        ]
+  finally
+    (try $ proc "docker" args' $ runProcess_ . setDelegateCtlc False)
+    ( unless (docker.persist || docker.detach) $
+        readProcessNull "docker" ["rm", "-f", containerID]
+          `catch` (\(_ :: ExitCodeException) -> pure ())
+    )
diff --git a/src/windows/System/Info/ShortPathName.hs b/src/windows/System/Info/ShortPathName.hs
index 71a1a7e235..ef2fdcbccb 100644
--- a/src/windows/System/Info/ShortPathName.hs
+++ b/src/windows/System/Info/ShortPathName.hs
@@ -1,5 +1,13 @@
+{-|
+Module      : System.Info.ShortPathName
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the Windows version.
+-}
+
 module System.Info.ShortPathName
   ( getShortPathName
   ) where
 
-import System.Win32.Info (getShortPathName)
+import           System.Win32.Info ( getShortPathName )
diff --git a/src/windows/System/Permissions.hs b/src/windows/System/Permissions.hs
index 2c1258b9c9..0c2101fb33 100644
--- a/src/windows/System/Permissions.hs
+++ b/src/windows/System/Permissions.hs
@@ -1,15 +1,28 @@
+{-|
+Module      : System.Permissions
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the Windows version.
+-}
+
 module System.Permissions
-  ( setScriptPerms
+  ( osIsMacOS
   , osIsWindows
   , setFileExecutable
+  , setScriptPerms
   ) where
 
--- | True if using Windows OS.
+-- | False if using Windows.
+osIsMacOS :: Bool
+osIsMacOS = False
+
+-- | True if using Windows.
 osIsWindows :: Bool
 osIsWindows = True
 
-setScriptPerms :: Monad m => FilePath -> m ()
-setScriptPerms _ = pure ()
-
 setFileExecutable :: Monad m => FilePath -> m ()
 setFileExecutable _ = pure ()
+
+setScriptPerms :: Monad m => FilePath -> m ()
+setScriptPerms _ = pure ()
diff --git a/src/windows/System/Posix/User.hs b/src/windows/System/Posix/User.hs
new file mode 100644
index 0000000000..fdb5872fdb
--- /dev/null
+++ b/src/windows/System/Posix/User.hs
@@ -0,0 +1,60 @@
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+
+{-|
+Module      : System.Posix.User
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the Windows version. Non-Windows builds rely on the unix package, which
+exposes a module of the same name.
+-}
+
+module System.Posix.User
+  ( getEffectiveUserID
+  , getEffectiveGroupID
+  , getGroups
+  , getUserEntryForName
+  , homeDirectory
+  , setGroupID
+  , setUserID
+  ) where
+
+import           System.IO.Error ( illegalOperationErrorType, mkIOError )
+import           System.PosixCompat.Types ( GroupID, UserID )
+
+unsupported :: String -> IO a
+unsupported f = ioError $ mkIOError illegalOperationErrorType x Nothing Nothing
+ where
+  x = "System.Posix.User." ++ f ++ ": not supported on Windows."
+
+getEffectiveUserID :: IO UserID
+getEffectiveUserID = unsupported "getEffectiveUserID"
+
+getEffectiveGroupID :: IO GroupID
+getEffectiveGroupID = unsupported "getEffectiveGroupID"
+
+getGroups :: IO [GroupID]
+getGroups = return []
+
+getUserEntryForName :: String -> IO UserEntry
+getUserEntryForName _ = unsupported "getUserEntryForName"
+
+setGroupID :: GroupID -> IO ()
+setGroupID _ = return ()
+
+setUserID :: UserID -> IO ()
+setUserID _ = return ()
+
+data UserEntry = UserEntry
+    { userName      :: String
+    , userPassword  :: String
+    , userID        :: UserID
+    , userGroupID   :: GroupID
+    , userGecos     :: String
+    , homeDirectory :: String
+    , userShell     :: String
+    } deriving (Eq, Read, Show)
+
+homeDirectory :: UserEntry -> String
+homeDirectory ue = ue.homeDirectory
diff --git a/src/windows/System/Terminal.hs b/src/windows/System/Terminal.hs
index 56dcaad39f..86074141bf 100644
--- a/src/windows/System/Terminal.hs
+++ b/src/windows/System/Terminal.hs
@@ -1,23 +1,29 @@
-{-# LANGUAGE NoImplicitPrelude        #-}
-{-# LANGUAGE ForeignFunctionInterface #-}
-{-# LANGUAGE OverloadedStrings        #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 
-module System.Terminal
-( fixCodePage
-, getTerminalWidth
-, hIsTerminalDeviceOrMinTTY
-) where
+{-|
+Module      : System.Terminal
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the Windows version.
+-}
 
-import Distribution.Types.Version (mkVersion)
-import Foreign.Ptr
-import Foreign.Storable
-import Foreign.Marshal.Alloc
-import Stack.Prelude
-import System.IO hiding (hIsTerminalDevice)
-import System.Process
-import System.Win32 (isMinTTYHandle, withHandleToHANDLE)
-import System.Win32.Console (setConsoleCP, setConsoleOutputCP, getConsoleCP, getConsoleOutputCP)
-import RIO.Partial (read)
+module System.Terminal
+  ( getTerminalWidth
+  , hIsTerminalDeviceOrMinTTY
+  ) where
+
+import           Foreign.Marshal.Alloc ( allocaBytes )
+import           Foreign.Ptr ( Ptr )
+import           Foreign.Storable ( peekByteOff )
+import           Stack.Prelude
+import           System.IO ( hGetContents )
+import           System.Process
+                   ( StdStream (..), createProcess, shell, std_err, std_in
+                   , std_out, waitForProcess
+                   )
+import           System.Win32 ( isMinTTYHandle, withHandleToHANDLE )
 
 type HANDLE = Ptr ()
 
@@ -33,88 +39,41 @@ c_STD_OUTPUT_HANDLE :: Int
 c_STD_OUTPUT_HANDLE = -11
 
 foreign import ccall unsafe "windows.h GetConsoleScreenBufferInfo"
-    c_GetConsoleScreenBufferInfo :: HANDLE -> Ptr CONSOLE_SCREEN_BUFFER_INFO -> IO Bool
+  c_GetConsoleScreenBufferInfo :: HANDLE -> Ptr CONSOLE_SCREEN_BUFFER_INFO -> IO Bool
 
 foreign import ccall unsafe "windows.h GetStdHandle"
-    c_GetStdHandle :: Int -> IO HANDLE
-
+  c_GetStdHandle :: Int -> IO HANDLE
 
+-- | If available, yields the width of the terminal.
 getTerminalWidth :: IO (Maybe Int)
 getTerminalWidth = do
-    hdl <- c_GetStdHandle c_STD_OUTPUT_HANDLE
-    allocaBytes sizeCONSOLE_SCREEN_BUFFER_INFO $ \p -> do
-        b <- c_GetConsoleScreenBufferInfo hdl p
-        if not b
-            then do -- This could happen on Cygwin or MSYS
-                let stty = (shell "stty size") {
-                      std_in  = UseHandle stdin
-                    , std_out = CreatePipe
-                    , std_err = CreatePipe
-                    }
-                (_, mbStdout, _, rStty) <- createProcess stty
-                exStty <- waitForProcess rStty
-                case exStty of
-                    ExitFailure _ -> pure Nothing
-                    ExitSuccess ->
-                        maybe (pure Nothing)
-                              (\hSize -> do
-                                  sizeStr <- hGetContents hSize
-                                  case map read $ words sizeStr :: [Int] of
-                                    [_r, c] -> pure $ Just c
-                                    _ -> pure Nothing
-                              )
-                              mbStdout
-            else do
-                [left,_top,right,_bottom] <- forM [0..3] $ \i -> do
-                    v <- peekByteOff p ((i*2) + posCONSOLE_SCREEN_BUFFER_INFO_srWindow)
-                    pure $ fromIntegral (v :: Word16)
-                pure $ Just (1+right-left)
-
--- | Set the code page for this process as necessary. Only applies to Windows.
--- See: https://github.com/commercialhaskell/stack/issues/738
-fixCodePage
-  :: HasLogFunc env
-  => Bool -- ^ modify code page?
-  -> Version -- ^ GHC version
-  -> RIO env a
-  -> RIO env a
-fixCodePage mcp ghcVersion inner = do
-    if mcp && ghcVersion < mkVersion [7, 10, 3]
-        then fixCodePage'
-        -- GHC >=7.10.3 doesn't need this code page hack.
-        else inner
-  where
-    fixCodePage' = do
-        origCPI <- liftIO getConsoleCP
-        origCPO <- liftIO getConsoleOutputCP
-
-        let setInput = origCPI /= expected
-            setOutput = origCPO /= expected
-            fixInput
-                | setInput = bracket_
-                    (liftIO $ do
-                        setConsoleCP expected)
-                    (liftIO $ setConsoleCP origCPI)
-                | otherwise = id
-            fixOutput
-                | setOutput = bracket_
-                    (liftIO $ do
-                        setConsoleOutputCP expected)
-                    (liftIO $ setConsoleOutputCP origCPO)
-                | otherwise = id
-
-        case (setInput, setOutput) of
-            (False, False) -> pure ()
-            (True, True) -> warn ""
-            (True, False) -> warn " input"
-            (False, True) -> warn " output"
-
-        fixInput $ fixOutput inner
-    expected = 65001 -- UTF-8
-    warn typ = logInfo $
-        "Setting" <>
-        typ <>
-        " codepage to UTF-8 (65001) to ensure correct output from GHC"
+  hdl <- c_GetStdHandle c_STD_OUTPUT_HANDLE
+  allocaBytes sizeCONSOLE_SCREEN_BUFFER_INFO $ \p -> do
+    b <- c_GetConsoleScreenBufferInfo hdl p
+    if not b
+      then do -- This could happen on Cygwin or MSYS
+        let stty = (shell "stty size") {
+              std_in  = UseHandle stdin
+            , std_out = CreatePipe
+            , std_err = CreatePipe
+            }
+        (_, mbStdout, _, rStty) <- createProcess stty
+        waitForProcess rStty >>= \case
+          ExitFailure _ -> pure Nothing
+          ExitSuccess ->
+            maybe (pure Nothing)
+                  (\hSize -> do
+                      sizeStr <- hGetContents hSize
+                      case map readMaybe $ words sizeStr :: [Maybe Int] of
+                        [Just _r, Just c] -> pure $ Just c
+                        _ -> pure Nothing
+                  )
+                  mbStdout
+      else do
+        [left,_top,right,_bottom] <- forM [0..3] $ \i -> do
+          v <- peekByteOff p (i * 2 + posCONSOLE_SCREEN_BUFFER_INFO_srWindow)
+          pure $ fromIntegral (v :: Word16)
+        pure $ Just (1 + right - left)
 
 -- | hIsTerminaDevice does not recognise handles to mintty terminals as terminal
 -- devices, but isMinTTYHandle does.
diff --git a/src/windows/System/Uname.hs b/src/windows/System/Uname.hs
index 9507233f38..0ae7ce7275 100644
--- a/src/windows/System/Uname.hs
+++ b/src/windows/System/Uname.hs
@@ -1,3 +1,11 @@
+{-|
+Module      : System.Uname
+License     : BSD-3-Clause
+
+The module of this name differs as between Windows and non-Windows builds. This
+is the Windows version.
+-}
+
 module System.Uname
   ( getRelease
   ) where
diff --git a/stack-ghc-9.12.4.yaml b/stack-ghc-9.12.4.yaml
new file mode 100644
index 0000000000..bebac9a0f5
--- /dev/null
+++ b/stack-ghc-9.12.4.yaml
@@ -0,0 +1,23 @@
+# This is an experimental project-level configuration, to see if Stack can be
+# built with GHC 9.12.4.
+snapshot: nightly-2026-07-12 # GHC 9.12.4
+compiler-check: match-exact # Protect against RCs of GHC 9.12.5
+
+extra-deps:
+# nightly-2026-07-12 specifies Cabal-3.14.2.0
+- Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+- Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+
+docker:
+  enable: false
+  repo: quay.io/benz0li/ghc-musl:9.12.4
+
+nix:
+  # --nix on the command-line to enable.
+  packages:
+  - pkg-config
+  - zlib
+
+flags:
+  stack:
+    developer-mode: true
diff --git a/stack-ghc-9.12.4.yaml.lock b/stack-ghc-9.12.4.yaml.lock
new file mode 100644
index 0000000000..bf3b5091f0
--- /dev/null
+++ b/stack-ghc-9.12.4.yaml.lock
@@ -0,0 +1,26 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
+
+packages:
+- completed:
+    hackage: Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+    pantry-tree:
+      sha256: b6ac49163659ec305805fc0d2c0564c35fac7132f4c5be6689d0c80a6405ecf0
+      size: 12139
+  original:
+    hackage: Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+- completed:
+    hackage: Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+    pantry-tree:
+      sha256: 1db24d3ca877095a7c4f99fda3c58155a33d8041dfe9faa886420c43572330a3
+      size: 11238
+  original:
+    hackage: Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+snapshots:
+- completed:
+    sha256: cb7d0b9185684418fac8da3353d4054f002a98d065b70d501dd6b93cc3289fef
+    size: 757765
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2026/7/12.yaml
+  original: nightly-2026-07-12
diff --git a/stack-ghc-9.12.5.yaml b/stack-ghc-9.12.5.yaml
new file mode 100644
index 0000000000..08d370e444
--- /dev/null
+++ b/stack-ghc-9.12.5.yaml
@@ -0,0 +1,26 @@
+# This is an experimental project-level configuration, to see if Stack can be
+# built with GHC 9.12.5-rc2.
+snapshot: nightly-2026-07-12 # GHC 9.12.4
+compiler: ghc-9.12.4.20260614
+compiler-check: match-exact # Anticipating future rc releases
+
+extra-deps:
+# nightly-2026-07-02 specifies Cabal-3.14.2.0
+- Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+- Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+# ghc-9.12.4.20260614 specifies semaphore-compat-2.0.0
+- semaphore-compat-1.0.0@sha256:2dff81c2c0ec9bac9f8bae364db497188654d2e1e4330f4a0e2f12310149f3e9,1176
+
+docker:
+  enable: false
+  repo: quay.io/benz0li/ghc-musl:9.12.4
+
+nix:
+  # --nix on the command-line to enable.
+  packages:
+  - pkg-config
+  - zlib
+
+flags:
+  stack:
+    developer-mode: true
diff --git a/stack-ghc-9.12.5.yaml.lock b/stack-ghc-9.12.5.yaml.lock
new file mode 100644
index 0000000000..8fa7656f00
--- /dev/null
+++ b/stack-ghc-9.12.5.yaml.lock
@@ -0,0 +1,33 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
+
+packages:
+- completed:
+    hackage: Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+    pantry-tree:
+      sha256: b6ac49163659ec305805fc0d2c0564c35fac7132f4c5be6689d0c80a6405ecf0
+      size: 12139
+  original:
+    hackage: Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+- completed:
+    hackage: Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+    pantry-tree:
+      sha256: 1db24d3ca877095a7c4f99fda3c58155a33d8041dfe9faa886420c43572330a3
+      size: 11238
+  original:
+    hackage: Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+- completed:
+    hackage: semaphore-compat-1.0.0@sha256:2dff81c2c0ec9bac9f8bae364db497188654d2e1e4330f4a0e2f12310149f3e9,1176
+    pantry-tree:
+      sha256: 73f47245a0a2804e907df243638bef51c8b815c3dd5e6a016dbb61628353197e
+      size: 277
+  original:
+    hackage: semaphore-compat-1.0.0@sha256:2dff81c2c0ec9bac9f8bae364db497188654d2e1e4330f4a0e2f12310149f3e9,1176
+snapshots:
+- completed:
+    sha256: cb7d0b9185684418fac8da3353d4054f002a98d065b70d501dd6b93cc3289fef
+    size: 757765
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2026/7/12.yaml
+  original: nightly-2026-07-12
diff --git a/stack-ghc-9.14.1.yaml b/stack-ghc-9.14.1.yaml
new file mode 100644
index 0000000000..f241efeaef
--- /dev/null
+++ b/stack-ghc-9.14.1.yaml
@@ -0,0 +1,23 @@
+# This is an experimental project-level configuration, to see if Stack can be
+# built with GHC 9.14.1.
+snapshot: nightly-2026-07-12 # GHC 9.12.4
+compiler: ghc-9.14.1
+
+extra-deps:
+# nightly-2026-06-22 specifies Cabal-3.14.2.0
+- Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+- Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+
+docker:
+  enable: false
+  repo: quay.io/benz0li/ghc-musl:9.14.1
+
+nix:
+  # --nix on the command-line to enable.
+  packages:
+  - pkg-config
+  - zlib
+
+flags:
+  stack:
+    developer-mode: true
diff --git a/stack-ghc-9.14.1.yaml.lock b/stack-ghc-9.14.1.yaml.lock
new file mode 100644
index 0000000000..bf3b5091f0
--- /dev/null
+++ b/stack-ghc-9.14.1.yaml.lock
@@ -0,0 +1,26 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
+
+packages:
+- completed:
+    hackage: Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+    pantry-tree:
+      sha256: b6ac49163659ec305805fc0d2c0564c35fac7132f4c5be6689d0c80a6405ecf0
+      size: 12139
+  original:
+    hackage: Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+- completed:
+    hackage: Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+    pantry-tree:
+      sha256: 1db24d3ca877095a7c4f99fda3c58155a33d8041dfe9faa886420c43572330a3
+      size: 11238
+  original:
+    hackage: Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+snapshots:
+- completed:
+    sha256: cb7d0b9185684418fac8da3353d4054f002a98d065b70d501dd6b93cc3289fef
+    size: 757765
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2026/7/12.yaml
+  original: nightly-2026-07-12
diff --git a/stack-ghc-942.yaml b/stack-ghc-942.yaml
deleted file mode 100644
index e5b4b4c900..0000000000
--- a/stack-ghc-942.yaml
+++ /dev/null
@@ -1,211 +0,0 @@
-# This is an experimental project-level configuration, to see if Stack can be
-# built with GHC 9.4.2.
-
-# GHC 9.4.2
-resolver: ghc-9.4.2
-
-packages:
-- .
-
-extra-deps:
-# A Stackage snapshot does not exist for GHC 9.4.2, so everything that is not a
-# global package needs to be specified as an extra-dep.
-- Glob-0.10.2@sha256:dd2ddbecae8f84e8f4cacb5b856901a19c25ceaa11f2525d3ee88d034acb0081,2938
-- OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262
-- QuickCheck-2.14.2@sha256:4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa,7736
-- StateVar-1.2.2@sha256:3c022c00485fe165e3080d5da6b3ca9c9b02f62c5deebc584d1b3d1309ce673e,1673
-- aeson-2.1.0.0@sha256:18a5e5f6f4224d04565e97cec140affb1728c488bf07ef497430ef7d95cd05ff,5959
-- annotated-wl-pprint-0.7.0@sha256:5d6e26cfeb17a187e992d482d8811d89df6a061f2bf0c6dba120d1dd3111138d,1142
-- ansi-terminal-0.11.3@sha256:cc499d5f4c09a7213cd752ee69dbb5a5b8f3d1c777274e609eea4bca5c68ac8c,3321
-- ansi-wl-pprint-0.6.9@sha256:212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce,2425
-- appar-0.1.8@sha256:a5d529bacbb74d566e4c5f9479af0637eac5957705f6db4d2670517489795de8,1070
-- asn1-encoding-0.9.6@sha256:27ed8f6043aed79630313bb931f7c8e2b510f0b4586cd55c16ae040c7d1ea098,2060
-- asn1-parse-0.9.5@sha256:77c0126d63070df2d82cb4cfa4febb26c4e280f6d854bc778c2fa4d80ce692b8,976
-- asn1-types-0.3.4@sha256:8e879b3a5bbdd0031232eb84d904b5a3a2c20a18847692b996d774f4ff811355,1025
-- assoc-1.0.2@sha256:e0d9d1febc172e2a1b22aacd25df7f90be557dcf12ff87359f43128f8c194d9e,1237
-- async-2.2.4@sha256:b83dec34a53520de84c6dd3dc7aae45d22409b46eb471c478b98108215a370f0,3095
-- attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810
-- attoparsec-iso8601-1.1.0.0@sha256:29d590f21adc4112973ad5e874d095f8b403b886932fe7e15567b239f5483539,1370
-- auto-update-0.1.6@sha256:10adca282e131a2fa01fb7a411b02811685c1cea02e9813df2d7fb468b5ef638,1373
-- base-compat-0.12.1@sha256:20e50848d9dfee1523fafe8950060b04fae43d402c15553da5c7cacd116f7846,6960
-- base-compat-batteries-0.12.1@sha256:ee819d7570b2fda1012d29db945a1778c388ef8c0c282e45c8fe4eae7616a25c,8891
-- base-orphans-0.8.6@sha256:eb6758d0160d607e0c45dbd6b196f515b9a589fd4f6d2f926929dd5d56282d37,3175
-- base16-bytestring-1.0.2.0@sha256:64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a,2541
-- base64-bytestring-1.2.1.0@sha256:50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8,2396
-- basement-0.0.15@sha256:2bf8ea6a351fb049399ccf1fa2c2513ddb0d8274b87bd9146ed7603fa06cd8a8,5404
-- bifunctors-5.5.12@sha256:be0f858c893274deab8aa21f9e43b2f5931d9419604f23f82bb5c8a5d9b2c3e9,3948
-- bitvec-1.1.3.0@sha256:54fea850c9e3d3f8f771d569c0c2b339f2dea1085b6cb9da108bce6594dc9682,4188
-- blaze-builder-0.4.2.2@sha256:f0017df374c330de0ebe0eb15eae8c48427bddefa1d81a3cb31c0a4812ecdb08,3685
-- blaze-html-0.9.1.2@sha256:74b89ffa665891f528f571ce9e3c2dce24f698563f14b6f5e9e0512eccdf5dc2,3062
-- blaze-markup-0.8.2.8@sha256:38d7a3840163aeaff8194d8a3af354a8c4c4db833f172b88f8bfb7d23dd59f1c,2413
-- byteorder-1.0.4@sha256:a952817dcbe20af0346fb55a28c13e95e2ddbf3e99f9b4fffdc063f150f13b20,636
-- casa-client-0.0.1@sha256:7c254d0f21fa96c1e64fff027a479ba2e93b2d53bb1938b62dc63dc6018f12a1,892
-- casa-types-0.0.2@sha256:8257f0031665d0f132d9dceb28aed104e67a69448dddc2b9288ba9c9d49ab4f4,715
-- case-insensitive-1.2.1.0@sha256:9dfd3171fc7698cf8d931727d3af3a7b389135b583e46b5adac1f9d2026fff61,2244
-- cereal-0.5.8.3@sha256:87a227c7b510217ea059db3dd59d9665edd8f0d1d3d8de39458e371a1d9402fb,2767
-- clock-0.8.3@sha256:a692159828c2cd278eaec317b3a7e9fb6d7b787c8a19f086004d15d9fa1fd72c,4601
-- cmdargs-0.10.21@sha256:a347cf8a16af30b9d8378209de0d1b7ac2b7b39e3af5d384383d8ef82315b37f,4241
-- colour-2.3.6@sha256:ebdcbf15023958838a527e381ab3c3b1e99ed12d1b25efeb7feaa4ad8c37664a,2378
-- comonad-5.0.8@sha256:1f1aabd73ec7f80f20cf078a748a60cd48d8e57277802fdf6a9ab3601a9b8f7e,3631
-- conduit-1.3.4.2@sha256:92165c9fc22f4e8c75b936b8ed4739360e8318bec2a05cd2c8c5b293d126b477,5129
-- conduit-combinators-1.3.0@sha256:0ada7712bd8291c958cbd0db1ccc8374936f260cfa41422d7a5d979d1c7ea757,1024
-- conduit-extra-1.3.6@sha256:83303e6fea78a683fdbb41682fc8dbc47b1d8830da1f09e88940f9a744a7f984,4355
-- connection-0.3.1@sha256:65da1c055610095733bcd228d85dff80804b23a5d18fede994a0f9fcd1b0c121,1554
-- contravariant-1.5.5@sha256:470ed0e040e879e2da4af1b2c8f94e199f6135852a8107858d5ae0a95365835f,3041
-- cookie-0.4.5@sha256:22bbe2bea34cfc546eaca2468386035fec521b8dbae52f5aa2f994ed68b35e0e,1448
-- cryptohash-sha256-0.11.102.1@sha256:188d0b5a0491e8b686b32d9b144c9287760ba333d2509bf3f17e3d846fbc2332,5629
-- cryptonite-0.30@sha256:12c85dea7be63e5ad90bcb487eb3846bf3c413347f94336fa1dede7b28f9936a,18301
-- cryptonite-conduit-0.2.2@sha256:bfbae677a44f3a5cf3bf7f36271682979a402825f3d1e8767cfd62f2ddb702c2,1984
-- data-default-class-0.1.2.0@sha256:63e62120b7efd733a5a17cf59ceb43268e9a929c748127172d7d42f4a336e327,542
-- data-fix-0.3.2@sha256:e909776381648a75e82438a40df33c05397b57119b80bb83e38189370319b67a,1692
-- digest-0.0.1.3@sha256:2658eec5dd3516cd349aad4c2e734d4a6dbd5f3247c3feebd1e75d54a538c213,1575
-- distributive-0.6.2.1@sha256:0f99f5541cca04acf89b64432b03422b6408e830a8dff30e6c4334ef1a48680c,2996
-- dlist-1.0@sha256:124cb3aa1decebd5171b46601b1f74cca6cfae12d266ace3799b86dd05ef7cb4,3560
-- easy-file-0.2.2@sha256:72303120495a9fed82276a7987434361edd6dfecafad241d7c6c03b68e4801e5,1048
-- echo-0.1.4@sha256:ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42,2834
-- ed25519-0.0.5.0@sha256:24ac7b5f3d9fa3c2f70262b329f2a75f24e7fd829f88c189b388efa1bcd67eb2,4165
-- extra-1.7.10@sha256:e384751317577554f873812358fab022da02aa9a286c9341308fac83f4d766c5,2691
-- fast-logger-3.1.1@sha256:9ffbb0d475edf6c3ed13cae0b24202a22a1a29848d9810785849f1f2332b6ee1,2398
-- file-embed-0.0.15.0@sha256:18beed8999dff37bcffd0d1d8a59dcd406be8e517c10213afefc941091985c06,1426
-- filelock-0.1.1.5@sha256:1d394c8ba29e410a57a451fbe6fc650d0392333b6b73ffc33afe1766f81c4486,1927
-- fsnotify-0.3.0.1@sha256:fbec8cddd3f991d5b905df16895c67717b0f580e1ef33de34d93de814af1a08a,2988
-- generic-deriving-1.14.2@sha256:55ea5f8c2c386f1791ca0053c89e6dd9d7d8c8fda0bd677f230164cad891539b,6803
-- generically-0.1@sha256:16d54a08bcdf708395c2200a28ffcba55e90479dc96ed617dbb94f0411f7a7af,1024
-- githash-0.1.6.2@sha256:9a136fa54b3e71e7a90d9dcb62259ffe6d55d083556ab2f15027dd4a4109d41d,1527
-- hackage-security-0.6.2.1@sha256:1d4b292bd90970f7ef52c72f2ae365f88bd2c6a75627dc34a31d24bc8f53f2e4,12645
-- hashable-1.4.0.2@sha256:0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55,5005
-- hi-file-parser-0.1.3.0@sha256:b868e1bcb73fffe5963de6879f0a0a4c5ced97e08fc09c2c9428af884cdcaa74,2488
-- hourglass-0.2.12@sha256:e083f5e030dfebe432e30a9c0fa07a99a54eac992f622442646be561fd7a44e8,3085
-- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
-- http-api-data-0.5@sha256:da4cca5dc892447f32ab6ad6213638f16e1264c14b446f42640c8c1047181883,3503
-- http-client-0.7.13@sha256:e732a3284f21fda4aa2d92c1605d6389cd64ce529e103bb446d2d7ff9cae8e55,5594
-- http-client-tls-0.3.6.1@sha256:c986b98a06ddde487fcfe139f024717d9263c61037ff45a4c63dae93b290c27f,2042
-- http-conduit-2.3.8@sha256:5a5f23a594dc47754d8670de5b6dffbdf1849417ce9f0a41c4d77ea52232c255,3110
-- http-download-0.2.0.0@sha256:54f94fbb3f28c5da2002d9f1c9ed1d72f8abfb0c41eefe40073e26500b015b63,1802
-- http-types-0.12.3@sha256:f35229edb1bc7b3ae27f961b2407dadb5bfa69d43a8f5337ab46cdc79ca4afe9,2035
-- indexed-traversable-0.1.2@sha256:d66228887242f93ccb4fc7101a1e25a6560c8e4708f6e9ee1d3dd21901756c65,2519
-- indexed-traversable-instances-0.1.1@sha256:8b3f359bf1ffb73ab2a3327a6985b3587ae38f6b8f7705dccd724e118e63a598,3246
-- infer-license-0.2.0@sha256:98dbe0e8d726fd698f9961e69cc69343f37952b4b7428283d0b8dbe3b09f8125,1804
-- integer-logarithms-1.0.3.1@sha256:b65e11ec6f4b29c5278716da0544b951a49ab5310608df0fc41eec29f15691d9,3229
-- iproute-1.7.12@sha256:85d181599fab8ceebf4c849110ad571bea2834d6c8c95ae7da33856c42453f40,2999
-- libyaml-0.1.2@sha256:7f14f69ceb14659699974e8e47e1ea6f226ea21ff42a802db03e721c319d201d,2125
-- lift-type-0.1.0.1@sha256:6e38e49bf086fd2203346417d96ad2e6c300d8d8f41d222780abdccc7a4e451b,1106
-- lifted-base-0.2.3.12@sha256:e94ad0692c9c5d85c373e508f23654f2da8ac8c3e475c2b65ffbc04fb165ad69,3369
-- lukko-0.1.1.3@sha256:c084c043a40632d3cafcac50fb5eeff84d91edb070a54baa94945f1c976f97c0,4556
-- megaparsec-9.2.1@sha256:0b709575e3440a7bc07ef3f57ada765c1808151d56103d9fe42f6faa9763fe2e,3220
-- memory-0.18.0@sha256:e12bde756b01c1a28c62e46f0f8433c4890898051a786794a7d88907ca14abca,4468
-- microlens-0.4.13.0@sha256:40794f266977558e1138ac034701fa3ff66518bc4ca6a1fba5c575d4157cf0ba,4573
-- microlens-mtl-0.2.0.2@sha256:ab8f264c6fecd763818c2e73740487ac371a4fd92cc32031c1c9de284a10518e,1875
-- microlens-th-0.4.3.10@sha256:601fe4d52e6b5e7246aedbde50ebb3096b6d7da331e603dc22d04d9dd577f7bf,2258
-- mime-types-0.1.0.9@sha256:d631fe56daed713ec7798933aaa1429dc9912d85375619aa6e25a0fefe8e95e7,826
-- mintty-0.1.4@sha256:045829806c38221f8e61bba674131147e6ef969882e33b6ce34c39a66e8179be,3334
-- monad-control-1.0.3.1@sha256:2d657279839e1a760c86a69f00f0c36473ef6972d413ec0f83a40249c70e098e,2365
-- monad-logger-0.3.36@sha256:1863168667967ed5898870ad4faa963379fedb7f6d01bfae023d9cc3f9e4e592,1873
-- monad-loops-0.4.3@sha256:ada4f1295ece07f9a7398bc5b40c4532f95a733a8604d2a2f57f05f878766df2,1751
-- mono-traversable-1.0.15.3@sha256:059bf3c05cdbef2d06b765333fe41c2168ced2503a23de674e2a59ceb2548c48,2060
-- mtl-compat-0.2.2@sha256:4257fb56e5690734973aad060010bec6c2857f5c1ac6cf87fc335ed3bc7c85f4,3333
-- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
-- neat-interpolation-0.5.1.3@sha256:d7ec83ccacabb447f582f9742aefdc34a5121f6127c91d0b1ad84a1e14b6c91c,2996
-- network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888
-- network-uri-2.6.4.1@sha256:a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d,2936
-- old-locale-1.0.0.7@sha256:fa998be2c7e00cd26a6e9075bea790caaf3932caa3e9497ad69bc20380dd6911,1071
-- old-time-1.1.0.3@sha256:c91fbb3ee73d20ccd015842b30f1f29a304893ebe0ae3128b7bbc13d5bb0d4c8,1328
-- open-browser-0.2.1.0@sha256:e4be4a206f5ab6ddb5ae4fbb39101529196e20af5670c5d33326fea6eff886fd,1529
-- optparse-applicative-0.17.0.0@sha256:0713e54cbb341e5cae979e2ac441eb3a5ff42e303001f432bd58c19e5638bdda,4967
-- optparse-simple-0.1.1.4@sha256:833326c18a91f7d09e94167b39936835c772b40edf31ee6368da1ced7e1a2e8d,1851
-- pantry-0.5.7@sha256:f96119ad2cc3771fe0891939d8a29c7f089fb333a70646e8deb2ec60532ea948,3914
-- parser-combinators-1.3.0@sha256:edd54ba56cbae8fadbcceebcfef31b2c70a835e92e5eda41151b939c40647281,1570
-- path-0.9.2@sha256:2f2a7f01737cd350b30381b619e1a862601c83f10ede4d6935f76f66e63ae0c7,3273
-- path-io-1.7.0@sha256:38b1dd6ccaf18ebbc1f3da1a48061c059aa49348ed99ac842a375a23346bb9bd,2059
-- path-pieces-0.2.1@sha256:c713a8d04b3e6b89f1116c1d5fe434305031e17a9f0ad30a457a8402e1d5fc5c,1233
-- pem-0.2.4@sha256:cc8e62118b783e284dc0fa032f54fe386a3861a948ec88079370a433c103a705,1441
-- persistent-2.13.3.5@sha256:7c0b876cee0cb1a37e2ee70db7a59280b20201130dc1568f95f2ed468d1200f5,7056
-- persistent-sqlite-2.13.1.0@sha256:20dc8067acd7ddc022f9d811d7344cc9e7def2d7c2a223ceff8cfae6ca4752f3,5155
-- persistent-template-2.12.0.0@sha256:7c68de6624ff83e14b674745e1c895dcf7c8676f6f24be131c89e2e4c2fa4510,1008
-- primitive-0.7.4.0@sha256:89b88a3e08493b7727fa4089b0692bfbdf7e1e666ef54635f458644eb8358764,2857
-- project-template-0.2.1.0@sha256:2345f65b3f3c178f66d7877c48c126748a6604772df80ee5f82dfec6b7154cba,1963
-- random-1.2.1.1@sha256:dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9,6541
-- resource-pool-0.3.1.0@sha256:dbaadfcc3c1be5391336e2016b28bb2d0c534f245ba9f5af5ed1d5125afc8c1a,1280
-- resourcet-1.2.6@sha256:0c55be13d24c1e9c1e6d82327ac039a0bf41469c456e3ae678efa8a9beda3a74,1739
-- retry-0.9.3.0@sha256:add44b9b2add217df6f5293785e8b592cdb3721a3a70250a951ebc7b227fd8b0,2426
-- rio-0.1.22.0@sha256:95fc3725a638bb7d6e11be7a2cf8d601097ebc8cb992661b211a6e36ed1da726,3669
-- rio-orphans-0.1.2.0@sha256:aa125f7633fbe99e7f68a097fe6953684fea1a5282e3642a709e71b29656d21c,1651
-- rio-prettyprint-0.1.1.0@sha256:75deb6dab0249c657f6b4002e6ff7b554759a2348f7eee16d9ff22a46a7c44e8,1311
-- safe-0.3.19@sha256:0910dafb8898f52bde4c646e560228a0fd08b1fca5457f222d2f5c0fad6d2039,2317
-- safe-exceptions-0.1.7.3@sha256:6e9b1b233af80cc0aa17ea858d2641ba146fb11cbcc5970a52649e89d77282e2,1398
-- scientific-0.3.7.0@sha256:76465a82beb2af6ea83ebd00684acc0ffe659e7da7066329931dc8f02fc97507,4826
-- semialign-1.2.0.1@sha256:2ab22ab4f7e67028a745e549ae49f1ddecbd83e62d7e6ecce4ab0685410da536,2836
-- semigroupoids-5.3.7@sha256:fb1a86c250997c269106645724a67bc358235245cf385b589f855ac070d4ada0,7488
-- semigroups-0.20@sha256:925341e6f7eb104cb490bef06eab93bb7995c7c67c51ee938185a2ddefa7aaf2,6333
-- silently-1.2.5.2@sha256:1496b654d2113b9653d14f92e39acb40d0e1ed5de830214857191622b8ed4653,2302
-- socks-0.6.1@sha256:ac190808eea704672df18f702e8f2ad0b7a4d0af528e95ee55ea6ee0be672e2a,1258
-- split-0.2.3.4@sha256:a6df9c3e806ee7cb50bc980a183fc1156f35022a39430dabac0bf9456fe18a4b,2647
-- splitmix-0.1.0.4@sha256:714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1,6483
-- stm-chans-3.0.0.6@sha256:146039ef0f5331e796165305198c66c91d61a4fc56219914401cab50f1cf0679,2239
-- streaming-commons-0.2.2.4@sha256:cda37e6d0320ef05160bac35c180b3e980f9267bf00393af6578a632f1ea8429,4751
-- strict-0.4.0.1@sha256:d6205a748eb8db4cd17a7179be970c94598809709294ccfa43159c7f3cc4bf5d,4187
-- syb-0.7.2.1@sha256:bf42655a213402215299e435c52f799e76cbec0b984cd7153d6b9af8a1c0803f,3815
-- tagged-0.8.6.1@sha256:8a24aef29b8e35447ccc56658ea07c2aded30bfa8130ea057e382936e17c74a6,2874
-- tar-0.5.1.1@sha256:bc14969ea4adfec6eee20264decf4a07c4002b38b2aa802d58d86b1a2cf7b895,5459
-- tar-conduit-0.3.2@sha256:17cb1c05343ed32db111c3f929f57ccce2b92a01d3ebd95a339db5e9b8bf147b,2951
-- temporary-1.3@sha256:3a66c136f700dbf42f3c5000ca93e80b26dead51e54322c83272b236c1ec8ef1,1485
-- text-metrics-0.3.2@sha256:07431d6e6ff23ed3dee1b0eb6806feffb5ec8fc1c74c78f983c531b32087871b,2563
-- text-short-0.1.5@sha256:962c6228555debdc46f758d0317dea16e5240d01419b42966674b08a5c3d8fa6,3498
-- th-abstraction-0.4.4.0@sha256:89aa9d81c94883c9e16c3534041f31949194011fdcf43be450f090bfb300b58d,2148
-- th-compat-0.1.4@sha256:6ca77c4e80b4e4109e30549c269631a9cc295c8fc2431ce4123972a5f80f7bfc,3135
-- th-expand-syns-0.4.10.0@sha256:4f0ae7278cf7b4485a37d550463bf8507e7550b93abcb085dc7bf41c3852def8,2130
-- th-lift-0.8.2@sha256:f135f67b018c22889e68b094773273dcf8f9e16fcfa330bf4778f84fce8925e9,2677
-- th-lift-instances-0.1.20@sha256:c7886eb39760825b8861c68e48b2b5efb5eff8d2cb76201fdd0fb04bcbeff78e,2608
-- th-reify-many-0.1.10@sha256:1827dcffb0c9f214e9739053fc808683336ea65c3749ff2d6148db189cbbd2a4,1753
-- these-1.1.1.1@sha256:f069e766b8fed73d457fca20cc197f5c539bcdd03d7636e478ddf14dbb67684a,2748
-- time-compat-1.9.6.1@sha256:42d8f2e08e965e1718917d54ad69e1d06bd4b87d66c41dc7410f59313dba4ed1,5033
-- tls-1.6.0@sha256:7ae39373fd2de27fb80e90f76d22aeeb9a074a0ddd120cbd02c9c52f516a9e55,6987
-- transformers-base-0.4.6@sha256:6f18f320e371c8954c4b6b211e2fdd5d15a6d6310bd605b9d640f47ede408961,1643
-- transformers-compat-0.7.2@sha256:044fb9955f63ee138fcebedfdcbe54afe741f2d5892a2d0bdf3a8052bd342643,5601
-- typed-process-0.2.10.1@sha256:cc35b76f2ce32c708cb2f68a1c4f661a8138196d958e34a2f214208333a73f46,2070
-- unicode-data-0.3.0@sha256:0545e079705a5381d0893f8fe8daaa08fc9174baeab269b9cf651817d8eadbc6,5123
-- unicode-transforms-0.4.0.1@sha256:64e17917792316ab4244bb1ed0091d292c6ce1487a374a97268b91c7d87c0a7e,5634
-- unix-compat-0.6@sha256:db47d4ad77f3f865d162a531d9b759ed30e2722710a8358aa6df1d3fcf83f552,3569
-- unix-time-0.4.7@sha256:c0d971d04561875b908451c563df8728fe6d8639c90e070b244227f13f76ab8e,2570
-- unliftio-0.2.22.0@sha256:2a3f0298a293c48eddd10c25cbbd6206b6e745cee2e648e48e16531a3ef21ce8,3314
-- unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082
-- unordered-containers-0.2.19.1@sha256:7d43e557b32a30eeac22e68b8430384bf829b0b2313761026a7f103395b047d5,3638
-- uuid-types-1.0.5@sha256:8447b8a08723877400da13b6329b3fb19ea9e4c20fabe62888841eb3708d7474,2608
-- vault-0.3.1.5@sha256:d1647db5a222db5e8abf5d9252a2912a34b70fc5160762dcc2213a209b54641d,2366
-- vector-0.13.0.0@sha256:ec337a1371bc306658e8338612e975f37a3f7700716441608b7afb66ae356d4c,8774
-- vector-algorithms-0.9.0.1@sha256:c8c86f969bad1c279d17f9be9d450c3324278c0323231602e101b500a69163f9,3652
-- vector-stream-0.1.0.0@sha256:5500b39bd69ba5384638db0b451c8eaf40ef52544355741bd73436b0da9ec3a8,1336
-- witherable-0.4.2@sha256:cccb36175e088abb4291ee5044b8c04d71acd5c36636902d2520f91508dd4bb8,2294
-- x509-1.7.7@sha256:90eef2d745a654146fc1c325e035eaddac531e4d2145d4bc1dcf4b8fad439d34,2276
-- x509-store-1.6.9@sha256:1f1abeab5bacf1407b920d0f34f4c35a5ad450ff0d8121cd3dc76460f81e711d,1716
-- x509-system-1.6.7@sha256:45ddd5db19f18be80614e058e8838765f2749a8afcfd2b292bd6afb36820a3c0,1492
-- x509-validation-1.6.12@sha256:4f4af20ec77f02c042ecd4726c195bb0e0b694b336de81e7bd4515b2917bd9bc,2169
-- yaml-0.11.8.0@sha256:049261f85bdcaf06e5298709edcfd0337fe706683b3631a81dc49aa4a18ba1a5,4936
-- zip-archive-0.4.2.1@sha256:15385412cda223a137b4c5be389c02c3e0b7a810d61e5cec997d9e0062480ca8,3915
-- zlib-0.6.3.0@sha256:8214a9d37580f17f8b675109578a5dbe6853559eef156e34dc2233f1123ace33,5216
-
-drop-packages:
-# See https://github.com/commercialhaskell/stack/pull/4712
-- cabal-install
-
-# The upper bounds of some dependencies are inconsistent with GHC 9.4.2's base
-allow-newer: true
-
-docker:
-  enable: false
-  repo: fpco/alpine-haskell-stack:8.10.4
-
-nix:
-  # --nix on the command-line to enable.
-  packages:
-  - zlib
-  - unzip
-
-flags:
-  stack:
-    developer-mode: true
-  mintty:
-    win32-2-13-1: false
-
-ghc-options:
-  "$locals": -fhide-source-paths
diff --git a/stack-ghc-942.yaml.lock b/stack-ghc-942.yaml.lock
deleted file mode 100644
index b1251e1850..0000000000
--- a/stack-ghc-942.yaml.lock
+++ /dev/null
@@ -1,1218 +0,0 @@
-# This file was autogenerated by Stack.
-# You should not edit this file by hand.
-# For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
-
-packages:
-- completed:
-    hackage: Glob-0.10.2@sha256:dd2ddbecae8f84e8f4cacb5b856901a19c25ceaa11f2525d3ee88d034acb0081,2938
-    pantry-tree:
-      sha256: 3c9d365a19c0e15d7cf5e93ee994bdc81958c8e4056f43ec0408f34f1a3bb970
-      size: 1432
-  original:
-    hackage: Glob-0.10.2@sha256:dd2ddbecae8f84e8f4cacb5b856901a19c25ceaa11f2525d3ee88d034acb0081,2938
-- completed:
-    hackage: OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262
-    pantry-tree:
-      sha256: a685b08622f1fe0641e4f228a290878a1db4f7ef3eb63d00b10e8632097d1e6f
-      size: 506
-  original:
-    hackage: OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262
-- completed:
-    hackage: QuickCheck-2.14.2@sha256:4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa,7736
-    pantry-tree:
-      sha256: 2fe423d0ed7cd64f0f165d708779f48814e66c4f181c568468134af55d86a5f8
-      size: 2315
-  original:
-    hackage: QuickCheck-2.14.2@sha256:4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa,7736
-- completed:
-    hackage: StateVar-1.2.2@sha256:3c022c00485fe165e3080d5da6b3ca9c9b02f62c5deebc584d1b3d1309ce673e,1673
-    pantry-tree:
-      sha256: 204cac98219e99334f47b12c565945611748ea03a4d629273dd697d738bcfd7f
-      size: 314
-  original:
-    hackage: StateVar-1.2.2@sha256:3c022c00485fe165e3080d5da6b3ca9c9b02f62c5deebc584d1b3d1309ce673e,1673
-- completed:
-    hackage: aeson-2.1.0.0@sha256:18a5e5f6f4224d04565e97cec140affb1728c488bf07ef497430ef7d95cd05ff,5959
-    pantry-tree:
-      sha256: b6547599e564e528e357f236426fa8ed8bcc3e38b40b4c766a62fa22e0b5b930
-      size: 38191
-  original:
-    hackage: aeson-2.1.0.0@sha256:18a5e5f6f4224d04565e97cec140affb1728c488bf07ef497430ef7d95cd05ff,5959
-- completed:
-    hackage: annotated-wl-pprint-0.7.0@sha256:5d6e26cfeb17a187e992d482d8811d89df6a061f2bf0c6dba120d1dd3111138d,1142
-    pantry-tree:
-      sha256: 4ec0cbb6e21f9fe243328ee47eaa6bf1e25f1f4e0fab008b469017de7c6eb191
-      size: 242
-  original:
-    hackage: annotated-wl-pprint-0.7.0@sha256:5d6e26cfeb17a187e992d482d8811d89df6a061f2bf0c6dba120d1dd3111138d,1142
-- completed:
-    hackage: ansi-terminal-0.11.3@sha256:cc499d5f4c09a7213cd752ee69dbb5a5b8f3d1c777274e609eea4bca5c68ac8c,3321
-    pantry-tree:
-      sha256: 71d732f3f95c8ddcebaa7645ff743dd91e680b5b5063e8707ef53d2eaf94c94e
-      size: 1461
-  original:
-    hackage: ansi-terminal-0.11.3@sha256:cc499d5f4c09a7213cd752ee69dbb5a5b8f3d1c777274e609eea4bca5c68ac8c,3321
-- completed:
-    hackage: ansi-wl-pprint-0.6.9@sha256:212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce,2425
-    pantry-tree:
-      sha256: 0a2390ba39c3b84f68e382cb25b58cea66d61a89dab818bb5e2a6c12642e2e21
-      size: 472
-  original:
-    hackage: ansi-wl-pprint-0.6.9@sha256:212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce,2425
-- completed:
-    hackage: appar-0.1.8@sha256:a5d529bacbb74d566e4c5f9479af0637eac5957705f6db4d2670517489795de8,1070
-    pantry-tree:
-      sha256: c8bae7bc8c04b6c3593b48f19f1d626face90832f268f6857aba934bccd4272d
-      size: 506
-  original:
-    hackage: appar-0.1.8@sha256:a5d529bacbb74d566e4c5f9479af0637eac5957705f6db4d2670517489795de8,1070
-- completed:
-    hackage: asn1-encoding-0.9.6@sha256:27ed8f6043aed79630313bb931f7c8e2b510f0b4586cd55c16ae040c7d1ea098,2060
-    pantry-tree:
-      sha256: 09963511234ed8fdd0682b10e8366de5105cc513d4daa014d7990496b788b122
-      size: 981
-  original:
-    hackage: asn1-encoding-0.9.6@sha256:27ed8f6043aed79630313bb931f7c8e2b510f0b4586cd55c16ae040c7d1ea098,2060
-- completed:
-    hackage: asn1-parse-0.9.5@sha256:77c0126d63070df2d82cb4cfa4febb26c4e280f6d854bc778c2fa4d80ce692b8,976
-    pantry-tree:
-      sha256: 2a6766aa05af5b045ff2d097b5f99621f983d471e254079ef4e56acff26b2248
-      size: 212
-  original:
-    hackage: asn1-parse-0.9.5@sha256:77c0126d63070df2d82cb4cfa4febb26c4e280f6d854bc778c2fa4d80ce692b8,976
-- completed:
-    hackage: asn1-types-0.3.4@sha256:8e879b3a5bbdd0031232eb84d904b5a3a2c20a18847692b996d774f4ff811355,1025
-    pantry-tree:
-      sha256: 254adba538008f12853e83b8909ba11ef11e9b8bcb1edc3a97dc6fdb29dad45a
-      size: 525
-  original:
-    hackage: asn1-types-0.3.4@sha256:8e879b3a5bbdd0031232eb84d904b5a3a2c20a18847692b996d774f4ff811355,1025
-- completed:
-    hackage: assoc-1.0.2@sha256:e0d9d1febc172e2a1b22aacd25df7f90be557dcf12ff87359f43128f8c194d9e,1237
-    pantry-tree:
-      sha256: 760f0aa60d4beb6a893ae9f73f64f5e93dc4414487bc0c8dfa33dadffd338de9
-      size: 290
-  original:
-    hackage: assoc-1.0.2@sha256:e0d9d1febc172e2a1b22aacd25df7f90be557dcf12ff87359f43128f8c194d9e,1237
-- completed:
-    hackage: async-2.2.4@sha256:b83dec34a53520de84c6dd3dc7aae45d22409b46eb471c478b98108215a370f0,3095
-    pantry-tree:
-      sha256: 08b8a9f8d2e27d51b04fb9c14f65e1209c7f24160d2a4557963900edb2c0f07d
-      size: 501
-  original:
-    hackage: async-2.2.4@sha256:b83dec34a53520de84c6dd3dc7aae45d22409b46eb471c478b98108215a370f0,3095
-- completed:
-    hackage: attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810
-    pantry-tree:
-      sha256: 5b8e087f73d334019252606b1f64b986cef61946a085ccb77c6bc4d038691c48
-      size: 5039
-  original:
-    hackage: attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810
-- completed:
-    hackage: attoparsec-iso8601-1.1.0.0@sha256:29d590f21adc4112973ad5e874d095f8b403b886932fe7e15567b239f5483539,1370
-    pantry-tree:
-      sha256: 7eddd7d3bd0f3d51a3b0fe8284ed996bc2bf83effc8cf6afce360e5f0e54fbe5
-      size: 361
-  original:
-    hackage: attoparsec-iso8601-1.1.0.0@sha256:29d590f21adc4112973ad5e874d095f8b403b886932fe7e15567b239f5483539,1370
-- completed:
-    hackage: auto-update-0.1.6@sha256:10adca282e131a2fa01fb7a411b02811685c1cea02e9813df2d7fb468b5ef638,1373
-    pantry-tree:
-      sha256: 5e27352ca8e89e569204445b3f7be4951afbcd10cbac701ece75d2070cbed130
-      size: 828
-  original:
-    hackage: auto-update-0.1.6@sha256:10adca282e131a2fa01fb7a411b02811685c1cea02e9813df2d7fb468b5ef638,1373
-- completed:
-    hackage: base-compat-0.12.1@sha256:20e50848d9dfee1523fafe8950060b04fae43d402c15553da5c7cacd116f7846,6960
-    pantry-tree:
-      sha256: 2f2c14615443954f117613d77835234b598718e611fb4cf4522e01980bf1bcbd
-      size: 9038
-  original:
-    hackage: base-compat-0.12.1@sha256:20e50848d9dfee1523fafe8950060b04fae43d402c15553da5c7cacd116f7846,6960
-- completed:
-    hackage: base-compat-batteries-0.12.1@sha256:ee819d7570b2fda1012d29db945a1778c388ef8c0c282e45c8fe4eae7616a25c,8891
-    pantry-tree:
-      sha256: 64edb51a988b4a362f0ba4172ad4e3d140ee69129dd68a4d08004fe506cc09ae
-      size: 11169
-  original:
-    hackage: base-compat-batteries-0.12.1@sha256:ee819d7570b2fda1012d29db945a1778c388ef8c0c282e45c8fe4eae7616a25c,8891
-- completed:
-    hackage: base-orphans-0.8.6@sha256:eb6758d0160d607e0c45dbd6b196f515b9a589fd4f6d2f926929dd5d56282d37,3175
-    pantry-tree:
-      sha256: f889d6903383305688e6e703982bfdc985649b7d4538429e44f98f99d8f73c07
-      size: 1272
-  original:
-    hackage: base-orphans-0.8.6@sha256:eb6758d0160d607e0c45dbd6b196f515b9a589fd4f6d2f926929dd5d56282d37,3175
-- completed:
-    hackage: base16-bytestring-1.0.2.0@sha256:64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a,2541
-    pantry-tree:
-      sha256: f8f13565abcd98fd400c19bbbe02531bdfc8a80f2949662bb6996e367c834114
-      size: 595
-  original:
-    hackage: base16-bytestring-1.0.2.0@sha256:64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a,2541
-- completed:
-    hackage: base64-bytestring-1.2.1.0@sha256:50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8,2396
-    pantry-tree:
-      sha256: 1154783dd163be45502456716ca44c4244d0aa6e7cf1aa4e7763efb3485a509c
-      size: 850
-  original:
-    hackage: base64-bytestring-1.2.1.0@sha256:50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8,2396
-- completed:
-    hackage: basement-0.0.15@sha256:2bf8ea6a351fb049399ccf1fa2c2513ddb0d8274b87bd9146ed7603fa06cd8a8,5404
-    pantry-tree:
-      sha256: 0ab19e9c07571797bc6c278bcc3fa2e7d056d2e8be368784a2f4d8f0e2ca43ba
-      size: 5799
-  original:
-    hackage: basement-0.0.15@sha256:2bf8ea6a351fb049399ccf1fa2c2513ddb0d8274b87bd9146ed7603fa06cd8a8,5404
-- completed:
-    hackage: bifunctors-5.5.12@sha256:be0f858c893274deab8aa21f9e43b2f5931d9419604f23f82bb5c8a5d9b2c3e9,3948
-    pantry-tree:
-      sha256: 63073a0d1ebc4d3a3d59ed8b5a77c6510bc25f4b357e5c51df1bd772a41f591c
-      size: 1758
-  original:
-    hackage: bifunctors-5.5.12@sha256:be0f858c893274deab8aa21f9e43b2f5931d9419604f23f82bb5c8a5d9b2c3e9,3948
-- completed:
-    hackage: bitvec-1.1.3.0@sha256:54fea850c9e3d3f8f771d569c0c2b339f2dea1085b6cb9da108bce6594dc9682,4188
-    pantry-tree:
-      sha256: 22d5a9218f251361e7ffb86ebd1aa72f8d6f5e29d63e1d5ef31dfc2ceb5e843e
-      size: 2388
-  original:
-    hackage: bitvec-1.1.3.0@sha256:54fea850c9e3d3f8f771d569c0c2b339f2dea1085b6cb9da108bce6594dc9682,4188
-- completed:
-    hackage: blaze-builder-0.4.2.2@sha256:f0017df374c330de0ebe0eb15eae8c48427bddefa1d81a3cb31c0a4812ecdb08,3685
-    pantry-tree:
-      sha256: 5b6b4f7b1c9ca98bd7cb979849fc9e018b48ef49089c98b2766179b5087695ea
-      size: 3102
-  original:
-    hackage: blaze-builder-0.4.2.2@sha256:f0017df374c330de0ebe0eb15eae8c48427bddefa1d81a3cb31c0a4812ecdb08,3685
-- completed:
-    hackage: blaze-html-0.9.1.2@sha256:74b89ffa665891f528f571ce9e3c2dce24f698563f14b6f5e9e0512eccdf5dc2,3062
-    pantry-tree:
-      sha256: 4dba326368b9b70ffd85876cae05dbf5514fb6277b43b146a8c278b08533717a
-      size: 2227
-  original:
-    hackage: blaze-html-0.9.1.2@sha256:74b89ffa665891f528f571ce9e3c2dce24f698563f14b6f5e9e0512eccdf5dc2,3062
-- completed:
-    hackage: blaze-markup-0.8.2.8@sha256:38d7a3840163aeaff8194d8a3af354a8c4c4db833f172b88f8bfb7d23dd59f1c,2413
-    pantry-tree:
-      sha256: 0c2cc6a93d3f83070a66de8d28f12b78e5c5f586fed97a3c47311e7d30b7dfac
-      size: 818
-  original:
-    hackage: blaze-markup-0.8.2.8@sha256:38d7a3840163aeaff8194d8a3af354a8c4c4db833f172b88f8bfb7d23dd59f1c,2413
-- completed:
-    hackage: byteorder-1.0.4@sha256:a952817dcbe20af0346fb55a28c13e95e2ddbf3e99f9b4fffdc063f150f13b20,636
-    pantry-tree:
-      sha256: 1544dc41983f7fe963740d9a8ce2aec1daef17bcb0916fda253dbfa73a14c77a
-      size: 212
-  original:
-    hackage: byteorder-1.0.4@sha256:a952817dcbe20af0346fb55a28c13e95e2ddbf3e99f9b4fffdc063f150f13b20,636
-- completed:
-    hackage: casa-client-0.0.1@sha256:7c254d0f21fa96c1e64fff027a479ba2e93b2d53bb1938b62dc63dc6018f12a1,892
-    pantry-tree:
-      sha256: 0ddc768a7a4c0d1e2ba595eeff8a4f5a1a1c23f0a01d3fc1f80b326dc9d8315b
-      size: 167
-  original:
-    hackage: casa-client-0.0.1@sha256:7c254d0f21fa96c1e64fff027a479ba2e93b2d53bb1938b62dc63dc6018f12a1,892
-- completed:
-    hackage: casa-types-0.0.2@sha256:8257f0031665d0f132d9dceb28aed104e67a69448dddc2b9288ba9c9d49ab4f4,715
-    pantry-tree:
-      sha256: 0f91d276c4ecb84af1c1cad368c0916eb8732e724f59792436cb33490cb0ece2
-      size: 216
-  original:
-    hackage: casa-types-0.0.2@sha256:8257f0031665d0f132d9dceb28aed104e67a69448dddc2b9288ba9c9d49ab4f4,715
-- completed:
-    hackage: case-insensitive-1.2.1.0@sha256:9dfd3171fc7698cf8d931727d3af3a7b389135b583e46b5adac1f9d2026fff61,2244
-    pantry-tree:
-      sha256: d6f175b17eacce002fc5336c17e119d989bd97f8ad9702446163c9e27c7c79b7
-      size: 688
-  original:
-    hackage: case-insensitive-1.2.1.0@sha256:9dfd3171fc7698cf8d931727d3af3a7b389135b583e46b5adac1f9d2026fff61,2244
-- completed:
-    hackage: cereal-0.5.8.3@sha256:87a227c7b510217ea059db3dd59d9665edd8f0d1d3d8de39458e371a1d9402fb,2767
-    pantry-tree:
-      sha256: 2d570ae699908d131b63fe176115809982f86ec4589cdbf42848aa2ca79209cb
-      size: 641
-  original:
-    hackage: cereal-0.5.8.3@sha256:87a227c7b510217ea059db3dd59d9665edd8f0d1d3d8de39458e371a1d9402fb,2767
-- completed:
-    hackage: clock-0.8.3@sha256:a692159828c2cd278eaec317b3a7e9fb6d7b787c8a19f086004d15d9fa1fd72c,4601
-    pantry-tree:
-      sha256: 3e62393d5c7671b21d8aa84ef9ee0550334053711c80b5beeca295466a6615c7
-      size: 499
-  original:
-    hackage: clock-0.8.3@sha256:a692159828c2cd278eaec317b3a7e9fb6d7b787c8a19f086004d15d9fa1fd72c,4601
-- completed:
-    hackage: cmdargs-0.10.21@sha256:a347cf8a16af30b9d8378209de0d1b7ac2b7b39e3af5d384383d8ef82315b37f,4241
-    pantry-tree:
-      sha256: 97fc2d781012c77d60a239edb0b4fafdc680f7caa9aa123992bfd8bb4aeed276
-      size: 3122
-  original:
-    hackage: cmdargs-0.10.21@sha256:a347cf8a16af30b9d8378209de0d1b7ac2b7b39e3af5d384383d8ef82315b37f,4241
-- completed:
-    hackage: colour-2.3.6@sha256:ebdcbf15023958838a527e381ab3c3b1e99ed12d1b25efeb7feaa4ad8c37664a,2378
-    pantry-tree:
-      sha256: 03f8e22f364deb86098dbfbe0bf83c896437b2355f139abdac0402658fb6ac7e
-      size: 1183
-  original:
-    hackage: colour-2.3.6@sha256:ebdcbf15023958838a527e381ab3c3b1e99ed12d1b25efeb7feaa4ad8c37664a,2378
-- completed:
-    hackage: comonad-5.0.8@sha256:1f1aabd73ec7f80f20cf078a748a60cd48d8e57277802fdf6a9ab3601a9b8f7e,3631
-    pantry-tree:
-      sha256: 394660fe7fa4127e5a181890bce28b9fcd6eb180ba25aa5566bc8b5bdd385517
-      size: 1618
-  original:
-    hackage: comonad-5.0.8@sha256:1f1aabd73ec7f80f20cf078a748a60cd48d8e57277802fdf6a9ab3601a9b8f7e,3631
-- completed:
-    hackage: conduit-1.3.4.2@sha256:92165c9fc22f4e8c75b936b8ed4739360e8318bec2a05cd2c8c5b293d126b477,5129
-    pantry-tree:
-      sha256: 8f5f18d84acb44440b7de5df4a02c2954a5c25c38b86268cdccb055ed4ee5e8b
-      size: 1957
-  original:
-    hackage: conduit-1.3.4.2@sha256:92165c9fc22f4e8c75b936b8ed4739360e8318bec2a05cd2c8c5b293d126b477,5129
-- completed:
-    hackage: conduit-combinators-1.3.0@sha256:0ada7712bd8291c958cbd0db1ccc8374936f260cfa41422d7a5d979d1c7ea757,1024
-    pantry-tree:
-      sha256: e646fb1c31357c358f9082c93975abe3bb5ff8cf22b853b30d5fe28c7c493919
-      size: 264
-  original:
-    hackage: conduit-combinators-1.3.0@sha256:0ada7712bd8291c958cbd0db1ccc8374936f260cfa41422d7a5d979d1c7ea757,1024
-- completed:
-    hackage: conduit-extra-1.3.6@sha256:83303e6fea78a683fdbb41682fc8dbc47b1d8830da1f09e88940f9a744a7f984,4355
-    pantry-tree:
-      sha256: af351369329e815381147ccb834deaac9c942d7526528103b1426a3b1130f0da
-      size: 2332
-  original:
-    hackage: conduit-extra-1.3.6@sha256:83303e6fea78a683fdbb41682fc8dbc47b1d8830da1f09e88940f9a744a7f984,4355
-- completed:
-    hackage: connection-0.3.1@sha256:65da1c055610095733bcd228d85dff80804b23a5d18fede994a0f9fcd1b0c121,1554
-    pantry-tree:
-      sha256: 13a2c21049e69068e4c3d725533d94729772f2d3e05f5ef611bef28363b08798
-      size: 386
-  original:
-    hackage: connection-0.3.1@sha256:65da1c055610095733bcd228d85dff80804b23a5d18fede994a0f9fcd1b0c121,1554
-- completed:
-    hackage: contravariant-1.5.5@sha256:470ed0e040e879e2da4af1b2c8f94e199f6135852a8107858d5ae0a95365835f,3041
-    pantry-tree:
-      sha256: 9eb62fea28548dc8a0f60fd47c12843092b78b24ed771b8ad63a0bb34dba8bc4
-      size: 652
-  original:
-    hackage: contravariant-1.5.5@sha256:470ed0e040e879e2da4af1b2c8f94e199f6135852a8107858d5ae0a95365835f,3041
-- completed:
-    hackage: cookie-0.4.5@sha256:22bbe2bea34cfc546eaca2468386035fec521b8dbae52f5aa2f994ed68b35e0e,1448
-    pantry-tree:
-      sha256: 60ea383838fb35f55265cbf84905a8f17434bb498f90d691621cbd2156da43e4
-      size: 360
-  original:
-    hackage: cookie-0.4.5@sha256:22bbe2bea34cfc546eaca2468386035fec521b8dbae52f5aa2f994ed68b35e0e,1448
-- completed:
-    hackage: cryptohash-sha256-0.11.102.1@sha256:188d0b5a0491e8b686b32d9b144c9287760ba333d2509bf3f17e3d846fbc2332,5629
-    pantry-tree:
-      sha256: 081a11b38601ba83db14767b7a0664846bd6bc4902c1d3c5efa6ca5e5ee45f51
-      size: 726
-  original:
-    hackage: cryptohash-sha256-0.11.102.1@sha256:188d0b5a0491e8b686b32d9b144c9287760ba333d2509bf3f17e3d846fbc2332,5629
-- completed:
-    hackage: cryptonite-0.30@sha256:12c85dea7be63e5ad90bcb487eb3846bf3c413347f94336fa1dede7b28f9936a,18301
-    pantry-tree:
-      sha256: df1cbe4cc40d569cc75ffed40bc5deac43cb085653980b42b9b6a5d4b745a30a
-      size: 23323
-  original:
-    hackage: cryptonite-0.30@sha256:12c85dea7be63e5ad90bcb487eb3846bf3c413347f94336fa1dede7b28f9936a,18301
-- completed:
-    hackage: cryptonite-conduit-0.2.2@sha256:bfbae677a44f3a5cf3bf7f36271682979a402825f3d1e8767cfd62f2ddb702c2,1984
-    pantry-tree:
-      sha256: 251e4a1b3d382e4cbf9d378a5550cf617bb2650d61339db93253f2189bbfa918
-      size: 595
-  original:
-    hackage: cryptonite-conduit-0.2.2@sha256:bfbae677a44f3a5cf3bf7f36271682979a402825f3d1e8767cfd62f2ddb702c2,1984
-- completed:
-    hackage: data-default-class-0.1.2.0@sha256:63e62120b7efd733a5a17cf59ceb43268e9a929c748127172d7d42f4a336e327,542
-    pantry-tree:
-      sha256: 5017630b11698aefa65fc61cab84a257ce97833c968d425e1b2d53d6c3b5c096
-      size: 224
-  original:
-    hackage: data-default-class-0.1.2.0@sha256:63e62120b7efd733a5a17cf59ceb43268e9a929c748127172d7d42f4a336e327,542
-- completed:
-    hackage: data-fix-0.3.2@sha256:e909776381648a75e82438a40df33c05397b57119b80bb83e38189370319b67a,1692
-    pantry-tree:
-      sha256: 327440e3a8d6c69617f67d49e3904c8d4b69558ea9f92f7856658b930ee64717
-      size: 262
-  original:
-    hackage: data-fix-0.3.2@sha256:e909776381648a75e82438a40df33c05397b57119b80bb83e38189370319b67a,1692
-- completed:
-    hackage: digest-0.0.1.3@sha256:2658eec5dd3516cd349aad4c2e734d4a6dbd5f3247c3feebd1e75d54a538c213,1575
-    pantry-tree:
-      sha256: 9ddc6a9b87b7213cd83afce2dd0bbbedd1a43c666cd9ffed465cbfb2e4f2cb83
-      size: 467
-  original:
-    hackage: digest-0.0.1.3@sha256:2658eec5dd3516cd349aad4c2e734d4a6dbd5f3247c3feebd1e75d54a538c213,1575
-- completed:
-    hackage: distributive-0.6.2.1@sha256:0f99f5541cca04acf89b64432b03422b6408e830a8dff30e6c4334ef1a48680c,2996
-    pantry-tree:
-      sha256: a42bed5fe0ba295643538312dee6c9436314c05a6f7efdd32b4303979f8bd744
-      size: 735
-  original:
-    hackage: distributive-0.6.2.1@sha256:0f99f5541cca04acf89b64432b03422b6408e830a8dff30e6c4334ef1a48680c,2996
-- completed:
-    hackage: dlist-1.0@sha256:124cb3aa1decebd5171b46601b1f74cca6cfae12d266ace3799b86dd05ef7cb4,3560
-    pantry-tree:
-      sha256: 8467afe9c94b2756e5703fed0950b51418bd877acbdd72e9dc3488b8f28f4e82
-      size: 953
-  original:
-    hackage: dlist-1.0@sha256:124cb3aa1decebd5171b46601b1f74cca6cfae12d266ace3799b86dd05ef7cb4,3560
-- completed:
-    hackage: easy-file-0.2.2@sha256:72303120495a9fed82276a7987434361edd6dfecafad241d7c6c03b68e4801e5,1048
-    pantry-tree:
-      sha256: 218acf3e0001825c43d70948e42a7b702de342fa34eab6fd41dd035a2f6ce8cf
-      size: 417
-  original:
-    hackage: easy-file-0.2.2@sha256:72303120495a9fed82276a7987434361edd6dfecafad241d7c6c03b68e4801e5,1048
-- completed:
-    hackage: echo-0.1.4@sha256:ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42,2834
-    pantry-tree:
-      sha256: 853bd0f0fd83133b9b720414ebb1b6c490ff04a08181d6befc6f6b35e0c76815
-      size: 440
-  original:
-    hackage: echo-0.1.4@sha256:ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42,2834
-- completed:
-    hackage: ed25519-0.0.5.0@sha256:24ac7b5f3d9fa3c2f70262b329f2a75f24e7fd829f88c189b388efa1bcd67eb2,4165
-    pantry-tree:
-      sha256: af03af9ea33e9d7a1a7115d3460804b22ebe9380babf322822f8e4a341951d37
-      size: 5818
-  original:
-    hackage: ed25519-0.0.5.0@sha256:24ac7b5f3d9fa3c2f70262b329f2a75f24e7fd829f88c189b388efa1bcd67eb2,4165
-- completed:
-    hackage: extra-1.7.10@sha256:e384751317577554f873812358fab022da02aa9a286c9341308fac83f4d766c5,2691
-    pantry-tree:
-      sha256: fe513979693efb8777d5afdaf45ed6d958d09b3e9eb002ebbe6c297602d9f1cd
-      size: 1896
-  original:
-    hackage: extra-1.7.10@sha256:e384751317577554f873812358fab022da02aa9a286c9341308fac83f4d766c5,2691
-- completed:
-    hackage: fast-logger-3.1.1@sha256:9ffbb0d475edf6c3ed13cae0b24202a22a1a29848d9810785849f1f2332b6ee1,2398
-    pantry-tree:
-      sha256: a3e9413b93e9a6ed6f786ba03866a7c9a3f04c0cd2a575d8b443338fdd55a0d6
-      size: 1148
-  original:
-    hackage: fast-logger-3.1.1@sha256:9ffbb0d475edf6c3ed13cae0b24202a22a1a29848d9810785849f1f2332b6ee1,2398
-- completed:
-    hackage: file-embed-0.0.15.0@sha256:18beed8999dff37bcffd0d1d8a59dcd406be8e517c10213afefc941091985c06,1426
-    pantry-tree:
-      sha256: 19e38c295f02ea4cf3891ccb8048ed10d426b937bb14215f64aadc0cd62bda72
-      size: 478
-  original:
-    hackage: file-embed-0.0.15.0@sha256:18beed8999dff37bcffd0d1d8a59dcd406be8e517c10213afefc941091985c06,1426
-- completed:
-    hackage: filelock-0.1.1.5@sha256:1d394c8ba29e410a57a451fbe6fc650d0392333b6b73ffc33afe1766f81c4486,1927
-    pantry-tree:
-      sha256: e810a78d319c604b265b9a20f7a84b3669324be25c00b90ed56133af2fb4f564
-      size: 541
-  original:
-    hackage: filelock-0.1.1.5@sha256:1d394c8ba29e410a57a451fbe6fc650d0392333b6b73ffc33afe1766f81c4486,1927
-- completed:
-    hackage: fsnotify-0.3.0.1@sha256:fbec8cddd3f991d5b905df16895c67717b0f580e1ef33de34d93de814af1a08a,2988
-    pantry-tree:
-      sha256: 37a2111006e61b752f3d4690dc81d76a4cedf3415dc486779addb2a033f5de58
-      size: 1130
-  original:
-    hackage: fsnotify-0.3.0.1@sha256:fbec8cddd3f991d5b905df16895c67717b0f580e1ef33de34d93de814af1a08a,2988
-- completed:
-    hackage: generic-deriving-1.14.2@sha256:55ea5f8c2c386f1791ca0053c89e6dd9d7d8c8fda0bd677f230164cad891539b,6803
-    pantry-tree:
-      sha256: 51c214c6fde33815332e7c63d4360f0690e849e9e073629859e82b2a0b6f17f3
-      size: 2361
-  original:
-    hackage: generic-deriving-1.14.2@sha256:55ea5f8c2c386f1791ca0053c89e6dd9d7d8c8fda0bd677f230164cad891539b,6803
-- completed:
-    hackage: generically-0.1@sha256:16d54a08bcdf708395c2200a28ffcba55e90479dc96ed617dbb94f0411f7a7af,1024
-    pantry-tree:
-      sha256: 302b140ee5ccf6754ab96154486051f9ab989d3cbaa7c9674e1e9f0de7cdd07b
-      size: 232
-  original:
-    hackage: generically-0.1@sha256:16d54a08bcdf708395c2200a28ffcba55e90479dc96ed617dbb94f0411f7a7af,1024
-- completed:
-    hackage: githash-0.1.6.2@sha256:9a136fa54b3e71e7a90d9dcb62259ffe6d55d083556ab2f15027dd4a4109d41d,1527
-    pantry-tree:
-      sha256: e24580786048e91643331b62b4113ed35b90a79e66e796a31c1770430878543a
-      size: 617
-  original:
-    hackage: githash-0.1.6.2@sha256:9a136fa54b3e71e7a90d9dcb62259ffe6d55d083556ab2f15027dd4a4109d41d,1527
-- completed:
-    hackage: hackage-security-0.6.2.1@sha256:1d4b292bd90970f7ef52c72f2ae365f88bd2c6a75627dc34a31d24bc8f53f2e4,12645
-    pantry-tree:
-      sha256: 9c2fe63cb8977b381e2aa14b5f001e3bf30f20bceafc25c02e0be78c0f703e9a
-      size: 4033
-  original:
-    hackage: hackage-security-0.6.2.1@sha256:1d4b292bd90970f7ef52c72f2ae365f88bd2c6a75627dc34a31d24bc8f53f2e4,12645
-- completed:
-    hackage: hashable-1.4.0.2@sha256:0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55,5005
-    pantry-tree:
-      sha256: 51dda0aa70849588d074125f324beba1c8736cfa486e7f4a90a798b1d0e6019d
-      size: 1248
-  original:
-    hackage: hashable-1.4.0.2@sha256:0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55,5005
-- completed:
-    hackage: hi-file-parser-0.1.3.0@sha256:b868e1bcb73fffe5963de6879f0a0a4c5ced97e08fc09c2c9428af884cdcaa74,2488
-    pantry-tree:
-      sha256: 43b8556254dde11c40335bf05e3f8ae5fa6e198fcf37d2cf51da141fe218be31
-      size: 1929
-  original:
-    hackage: hi-file-parser-0.1.3.0@sha256:b868e1bcb73fffe5963de6879f0a0a4c5ced97e08fc09c2c9428af884cdcaa74,2488
-- completed:
-    hackage: hourglass-0.2.12@sha256:e083f5e030dfebe432e30a9c0fa07a99a54eac992f622442646be561fd7a44e8,3085
-    pantry-tree:
-      sha256: 2b452cfac948057203679468e3e856e7fdf884c3c051f42bc52ba6253ca896e0
-      size: 1605
-  original:
-    hackage: hourglass-0.2.12@sha256:e083f5e030dfebe432e30a9c0fa07a99a54eac992f622442646be561fd7a44e8,3085
-- completed:
-    hackage: hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
-    pantry-tree:
-      sha256: f143c1cb86d6ae954be5b3cc04629fb00631290c8eb9e3c795f65e10d6ccf220
-      size: 3615
-  original:
-    hackage: hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
-- completed:
-    hackage: http-api-data-0.5@sha256:da4cca5dc892447f32ab6ad6213638f16e1264c14b446f42640c8c1047181883,3503
-    pantry-tree:
-      sha256: 831a8cea01caf4bae5143c46637c1cded41f878d1c425e5243fb17c3fd3eddf4
-      size: 887
-  original:
-    hackage: http-api-data-0.5@sha256:da4cca5dc892447f32ab6ad6213638f16e1264c14b446f42640c8c1047181883,3503
-- completed:
-    hackage: http-client-0.7.13@sha256:e732a3284f21fda4aa2d92c1605d6389cd64ce529e103bb446d2d7ff9cae8e55,5594
-    pantry-tree:
-      sha256: 59dc2f38541d4736d6c35bc2a9dcd1451d42a10228b61be58a8d6c2b947df78c
-      size: 2547
-  original:
-    hackage: http-client-0.7.13@sha256:e732a3284f21fda4aa2d92c1605d6389cd64ce529e103bb446d2d7ff9cae8e55,5594
-- completed:
-    hackage: http-client-tls-0.3.6.1@sha256:c986b98a06ddde487fcfe139f024717d9263c61037ff45a4c63dae93b290c27f,2042
-    pantry-tree:
-      sha256: ac30cb48175d969b839bbcef4b8b1dc3d970751fdf030fcd4df34e0fb62e228a
-      size: 435
-  original:
-    hackage: http-client-tls-0.3.6.1@sha256:c986b98a06ddde487fcfe139f024717d9263c61037ff45a4c63dae93b290c27f,2042
-- completed:
-    hackage: http-conduit-2.3.8@sha256:5a5f23a594dc47754d8670de5b6dffbdf1849417ce9f0a41c4d77ea52232c255,3110
-    pantry-tree:
-      sha256: 5e8acb3ec6325e9bbb6624f831932a3d770e8e062b2ed314d69f3b3dab61dc88
-      size: 784
-  original:
-    hackage: http-conduit-2.3.8@sha256:5a5f23a594dc47754d8670de5b6dffbdf1849417ce9f0a41c4d77ea52232c255,3110
-- completed:
-    hackage: http-download-0.2.0.0@sha256:54f94fbb3f28c5da2002d9f1c9ed1d72f8abfb0c41eefe40073e26500b015b63,1802
-    pantry-tree:
-      sha256: bb0b44f49b70ebd39b773f4bb627e44028ea9061e2b79d07bef5ebc6dfc8a0e1
-      size: 393
-  original:
-    hackage: http-download-0.2.0.0@sha256:54f94fbb3f28c5da2002d9f1c9ed1d72f8abfb0c41eefe40073e26500b015b63,1802
-- completed:
-    hackage: http-types-0.12.3@sha256:f35229edb1bc7b3ae27f961b2407dadb5bfa69d43a8f5337ab46cdc79ca4afe9,2035
-    pantry-tree:
-      sha256: c9b77e1ba204fffbe4e1be80412bc48e47440a07e4b7db4cdc77d573a3e21b9a
-      size: 833
-  original:
-    hackage: http-types-0.12.3@sha256:f35229edb1bc7b3ae27f961b2407dadb5bfa69d43a8f5337ab46cdc79ca4afe9,2035
-- completed:
-    hackage: indexed-traversable-0.1.2@sha256:d66228887242f93ccb4fc7101a1e25a6560c8e4708f6e9ee1d3dd21901756c65,2519
-    pantry-tree:
-      sha256: 7edfd8672d45016089df7227d9f6452117632a7236d4e71b24a2a1041cab4701
-      size: 495
-  original:
-    hackage: indexed-traversable-0.1.2@sha256:d66228887242f93ccb4fc7101a1e25a6560c8e4708f6e9ee1d3dd21901756c65,2519
-- completed:
-    hackage: indexed-traversable-instances-0.1.1@sha256:8b3f359bf1ffb73ab2a3327a6985b3587ae38f6b8f7705dccd724e118e63a598,3246
-    pantry-tree:
-      sha256: 5fd36ec0df3d99a44300b9b405256da4affc5c3608a620d3781466186f30118f
-      size: 480
-  original:
-    hackage: indexed-traversable-instances-0.1.1@sha256:8b3f359bf1ffb73ab2a3327a6985b3587ae38f6b8f7705dccd724e118e63a598,3246
-- completed:
-    hackage: infer-license-0.2.0@sha256:98dbe0e8d726fd698f9961e69cc69343f37952b4b7428283d0b8dbe3b09f8125,1804
-    pantry-tree:
-      sha256: f9005d8279c4180eee1220abd909576043284340944e5e4b7de9baea4cad56cf
-      size: 1291
-  original:
-    hackage: infer-license-0.2.0@sha256:98dbe0e8d726fd698f9961e69cc69343f37952b4b7428283d0b8dbe3b09f8125,1804
-- completed:
-    hackage: integer-logarithms-1.0.3.1@sha256:b65e11ec6f4b29c5278716da0544b951a49ab5310608df0fc41eec29f15691d9,3229
-    pantry-tree:
-      sha256: 804c8c0d77470f84640ee70c66155f770798e295c0a0572e41d071f69e24ca4e
-      size: 865
-  original:
-    hackage: integer-logarithms-1.0.3.1@sha256:b65e11ec6f4b29c5278716da0544b951a49ab5310608df0fc41eec29f15691d9,3229
-- completed:
-    hackage: iproute-1.7.12@sha256:85d181599fab8ceebf4c849110ad571bea2834d6c8c95ae7da33856c42453f40,2999
-    pantry-tree:
-      sha256: 0f4179868c6f644d7ba8d4d6ccaefd13ae17ff1cd188c924ef4c2db40d1c4f02
-      size: 962
-  original:
-    hackage: iproute-1.7.12@sha256:85d181599fab8ceebf4c849110ad571bea2834d6c8c95ae7da33856c42453f40,2999
-- completed:
-    hackage: libyaml-0.1.2@sha256:7f14f69ceb14659699974e8e47e1ea6f226ea21ff42a802db03e721c319d201d,2125
-    pantry-tree:
-      sha256: 7d03826965c52ffef8ce22179a1c0211e4cafb5f73f2a723169ef14b3677e262
-      size: 1096
-  original:
-    hackage: libyaml-0.1.2@sha256:7f14f69ceb14659699974e8e47e1ea6f226ea21ff42a802db03e721c319d201d,2125
-- completed:
-    hackage: lift-type-0.1.0.1@sha256:6e38e49bf086fd2203346417d96ad2e6c300d8d8f41d222780abdccc7a4e451b,1106
-    pantry-tree:
-      sha256: 9de4bdc6ce32b78c28b4bce75b5b2e488bf0f875a136ae269a02df804eb94a1a
-      size: 361
-  original:
-    hackage: lift-type-0.1.0.1@sha256:6e38e49bf086fd2203346417d96ad2e6c300d8d8f41d222780abdccc7a4e451b,1106
-- completed:
-    hackage: lifted-base-0.2.3.12@sha256:e94ad0692c9c5d85c373e508f23654f2da8ac8c3e475c2b65ffbc04fb165ad69,3369
-    pantry-tree:
-      sha256: a1d78bdab90ed2863854f825f6ab277e5df0af856fec06ac1c39131e8019aef5
-      size: 1129
-  original:
-    hackage: lifted-base-0.2.3.12@sha256:e94ad0692c9c5d85c373e508f23654f2da8ac8c3e475c2b65ffbc04fb165ad69,3369
-- completed:
-    hackage: lukko-0.1.1.3@sha256:c084c043a40632d3cafcac50fb5eeff84d91edb070a54baa94945f1c976f97c0,4556
-    pantry-tree:
-      sha256: f2f51a487f064b52d659b6330d2ea3a68cde484face4803c29f6af84a05a8cf2
-      size: 1145
-  original:
-    hackage: lukko-0.1.1.3@sha256:c084c043a40632d3cafcac50fb5eeff84d91edb070a54baa94945f1c976f97c0,4556
-- completed:
-    hackage: megaparsec-9.2.1@sha256:0b709575e3440a7bc07ef3f57ada765c1808151d56103d9fe42f6faa9763fe2e,3220
-    pantry-tree:
-      sha256: 5ed212b347221e94e502a123d04e4aaf926e58b3476f76f149f1eb01885cecce
-      size: 1518
-  original:
-    hackage: megaparsec-9.2.1@sha256:0b709575e3440a7bc07ef3f57ada765c1808151d56103d9fe42f6faa9763fe2e,3220
-- completed:
-    hackage: memory-0.18.0@sha256:e12bde756b01c1a28c62e46f0f8433c4890898051a786794a7d88907ca14abca,4468
-    pantry-tree:
-      sha256: 55d15393452ad50b1f8dbe3ff2c4961a3cde9381f2c348f904449a3339c6951d
-      size: 2436
-  original:
-    hackage: memory-0.18.0@sha256:e12bde756b01c1a28c62e46f0f8433c4890898051a786794a7d88907ca14abca,4468
-- completed:
-    hackage: microlens-0.4.13.0@sha256:40794f266977558e1138ac034701fa3ff66518bc4ca6a1fba5c575d4157cf0ba,4573
-    pantry-tree:
-      sha256: 7e3c2e67a573a4ba4bd8ebff631b7a6e0e2d81fb785b9e9fcd6bd02f18743ac3
-      size: 461
-  original:
-    hackage: microlens-0.4.13.0@sha256:40794f266977558e1138ac034701fa3ff66518bc4ca6a1fba5c575d4157cf0ba,4573
-- completed:
-    hackage: microlens-mtl-0.2.0.2@sha256:ab8f264c6fecd763818c2e73740487ac371a4fd92cc32031c1c9de284a10518e,1875
-    pantry-tree:
-      sha256: 672cebfcd8f371f2841f269c4c0a35a2c1de4c6e24ebb00cdfe5b2651fcc795b
-      size: 344
-  original:
-    hackage: microlens-mtl-0.2.0.2@sha256:ab8f264c6fecd763818c2e73740487ac371a4fd92cc32031c1c9de284a10518e,1875
-- completed:
-    hackage: microlens-th-0.4.3.10@sha256:601fe4d52e6b5e7246aedbde50ebb3096b6d7da331e603dc22d04d9dd577f7bf,2258
-    pantry-tree:
-      sha256: e66eef492e2ed16ae0ad7c5f6bee440aca15743bcc737fda3705fb36e62ae486
-      size: 558
-  original:
-    hackage: microlens-th-0.4.3.10@sha256:601fe4d52e6b5e7246aedbde50ebb3096b6d7da331e603dc22d04d9dd577f7bf,2258
-- completed:
-    hackage: mime-types-0.1.0.9@sha256:d631fe56daed713ec7798933aaa1429dc9912d85375619aa6e25a0fefe8e95e7,826
-    pantry-tree:
-      sha256: 5cf87fbc920b9d268dde4964e91baac137708fdbdcf80e2bd6f23812a09d97f0
-      size: 311
-  original:
-    hackage: mime-types-0.1.0.9@sha256:d631fe56daed713ec7798933aaa1429dc9912d85375619aa6e25a0fefe8e95e7,826
-- completed:
-    hackage: mintty-0.1.4@sha256:045829806c38221f8e61bba674131147e6ef969882e33b6ce34c39a66e8179be,3334
-    pantry-tree:
-      sha256: 6359f865770675cf37ca2633af7923e308bce2a1c130503dd3d3c8889e20da6d
-      size: 525
-  original:
-    hackage: mintty-0.1.4@sha256:045829806c38221f8e61bba674131147e6ef969882e33b6ce34c39a66e8179be,3334
-- completed:
-    hackage: monad-control-1.0.3.1@sha256:2d657279839e1a760c86a69f00f0c36473ef6972d413ec0f83a40249c70e098e,2365
-    pantry-tree:
-      sha256: f6b2e10b7ad03cbc2bd1df28543c9d514d54bd39833e318b48e5f0998d876df5
-      size: 292
-  original:
-    hackage: monad-control-1.0.3.1@sha256:2d657279839e1a760c86a69f00f0c36473ef6972d413ec0f83a40249c70e098e,2365
-- completed:
-    hackage: monad-logger-0.3.36@sha256:1863168667967ed5898870ad4faa963379fedb7f6d01bfae023d9cc3f9e4e592,1873
-    pantry-tree:
-      sha256: 146be7c0f788020203aca62ba51d73873b2f40d16b791e8ea2810b400121efc5
-      size: 396
-  original:
-    hackage: monad-logger-0.3.36@sha256:1863168667967ed5898870ad4faa963379fedb7f6d01bfae023d9cc3f9e4e592,1873
-- completed:
-    hackage: monad-loops-0.4.3@sha256:ada4f1295ece07f9a7398bc5b40c4532f95a733a8604d2a2f57f05f878766df2,1751
-    pantry-tree:
-      sha256: c8d919cbf7cda1c8551534cb17844c56cbfcbf1b18667b1a0700b97c87ff5059
-      size: 243
-  original:
-    hackage: monad-loops-0.4.3@sha256:ada4f1295ece07f9a7398bc5b40c4532f95a733a8604d2a2f57f05f878766df2,1751
-- completed:
-    hackage: mono-traversable-1.0.15.3@sha256:059bf3c05cdbef2d06b765333fe41c2168ced2503a23de674e2a59ceb2548c48,2060
-    pantry-tree:
-      sha256: 20193844369b5e6e0ed2c0df9946db5bd65a6206e3cc9f7cf059523e27a818b8
-      size: 710
-  original:
-    hackage: mono-traversable-1.0.15.3@sha256:059bf3c05cdbef2d06b765333fe41c2168ced2503a23de674e2a59ceb2548c48,2060
-- completed:
-    hackage: mtl-compat-0.2.2@sha256:4257fb56e5690734973aad060010bec6c2857f5c1ac6cf87fc335ed3bc7c85f4,3333
-    pantry-tree:
-      sha256: 73dd4eacfba46bea22462e6fda23367e346ffc96286b1a90e9347dffc571cd48
-      size: 324
-  original:
-    hackage: mtl-compat-0.2.2@sha256:4257fb56e5690734973aad060010bec6c2857f5c1ac6cf87fc335ed3bc7c85f4,3333
-- completed:
-    hackage: mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
-    pantry-tree:
-      sha256: d201b56e6402cf92b69f60718658bf25fc602fabe87d3c84934d07c910194e38
-      size: 1182
-  original:
-    hackage: mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
-- completed:
-    hackage: neat-interpolation-0.5.1.3@sha256:d7ec83ccacabb447f582f9742aefdc34a5121f6127c91d0b1ad84a1e14b6c91c,2996
-    pantry-tree:
-      sha256: 350fa6bf54cfa8cc1792635bd8c020321d22e48a96b6e96041fc99f75171bf3f
-      size: 566
-  original:
-    hackage: neat-interpolation-0.5.1.3@sha256:d7ec83ccacabb447f582f9742aefdc34a5121f6127c91d0b1ad84a1e14b6c91c,2996
-- completed:
-    hackage: network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888
-    pantry-tree:
-      sha256: 1981a732d1917213de7f51d26255af733a61918c59eebb6c6f6ca939856839ef
-      size: 3971
-  original:
-    hackage: network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888
-- completed:
-    hackage: network-uri-2.6.4.1@sha256:a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d,2936
-    pantry-tree:
-      sha256: 68ccb16e252378b2ee6da3e076f6eb55dd7928f0d4dd8beb1969433e9bf6f549
-      size: 551
-  original:
-    hackage: network-uri-2.6.4.1@sha256:a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d,2936
-- completed:
-    hackage: old-locale-1.0.0.7@sha256:fa998be2c7e00cd26a6e9075bea790caaf3932caa3e9497ad69bc20380dd6911,1071
-    pantry-tree:
-      sha256: 462ef15cb35164d585aa3860f717c9685fbf05578330490860abd544381d2e24
-      size: 263
-  original:
-    hackage: old-locale-1.0.0.7@sha256:fa998be2c7e00cd26a6e9075bea790caaf3932caa3e9497ad69bc20380dd6911,1071
-- completed:
-    hackage: old-time-1.1.0.3@sha256:c91fbb3ee73d20ccd015842b30f1f29a304893ebe0ae3128b7bbc13d5bb0d4c8,1328
-    pantry-tree:
-      sha256: 890bbbdf4175a409efd7c7c9fe153b71680e33bebeb74c9351d7d9d3a59d3d0e
-      size: 810
-  original:
-    hackage: old-time-1.1.0.3@sha256:c91fbb3ee73d20ccd015842b30f1f29a304893ebe0ae3128b7bbc13d5bb0d4c8,1328
-- completed:
-    hackage: open-browser-0.2.1.0@sha256:e4be4a206f5ab6ddb5ae4fbb39101529196e20af5670c5d33326fea6eff886fd,1529
-    pantry-tree:
-      sha256: fa4684ddfdb2bf393407014e2ec065e269c4b717feed26978ea15eca6d2a59c0
-      size: 462
-  original:
-    hackage: open-browser-0.2.1.0@sha256:e4be4a206f5ab6ddb5ae4fbb39101529196e20af5670c5d33326fea6eff886fd,1529
-- completed:
-    hackage: optparse-applicative-0.17.0.0@sha256:0713e54cbb341e5cae979e2ac441eb3a5ff42e303001f432bd58c19e5638bdda,4967
-    pantry-tree:
-      sha256: 3b4398845ee6718fe2303870a5ab75bd190eb712fed2f22caaae30f790c490fd
-      size: 3124
-  original:
-    hackage: optparse-applicative-0.17.0.0@sha256:0713e54cbb341e5cae979e2ac441eb3a5ff42e303001f432bd58c19e5638bdda,4967
-- completed:
-    hackage: optparse-simple-0.1.1.4@sha256:833326c18a91f7d09e94167b39936835c772b40edf31ee6368da1ced7e1a2e8d,1851
-    pantry-tree:
-      sha256: 7c44a882637c994fc6358d98c26161857c64bcb0133f78e3869d8ebaae20f5b9
-      size: 443
-  original:
-    hackage: optparse-simple-0.1.1.4@sha256:833326c18a91f7d09e94167b39936835c772b40edf31ee6368da1ced7e1a2e8d,1851
-- completed:
-    hackage: pantry-0.5.7@sha256:f96119ad2cc3771fe0891939d8a29c7f089fb333a70646e8deb2ec60532ea948,3914
-    pantry-tree:
-      sha256: c96fe10d96d1b1a9439c473bf27eeb2d94ad2fdbb93ccc4d9f0c69643b868c6d
-      size: 2524
-  original:
-    hackage: pantry-0.5.7@sha256:f96119ad2cc3771fe0891939d8a29c7f089fb333a70646e8deb2ec60532ea948,3914
-- completed:
-    hackage: parser-combinators-1.3.0@sha256:edd54ba56cbae8fadbcceebcfef31b2c70a835e92e5eda41151b939c40647281,1570
-    pantry-tree:
-      sha256: 0754c8d3f213156877f8085da2ad74433167a6c30272b8b64119a2628bd7ade0
-      size: 795
-  original:
-    hackage: parser-combinators-1.3.0@sha256:edd54ba56cbae8fadbcceebcfef31b2c70a835e92e5eda41151b939c40647281,1570
-- completed:
-    hackage: path-0.9.2@sha256:2f2a7f01737cd350b30381b619e1a862601c83f10ede4d6935f76f66e63ae0c7,3273
-    pantry-tree:
-      sha256: 2acf94a62daeeb0aee9b77d044ece55b5e03445b574e6980a2e84a5a514f5517
-      size: 1206
-  original:
-    hackage: path-0.9.2@sha256:2f2a7f01737cd350b30381b619e1a862601c83f10ede4d6935f76f66e63ae0c7,3273
-- completed:
-    hackage: path-io-1.7.0@sha256:38b1dd6ccaf18ebbc1f3da1a48061c059aa49348ed99ac842a375a23346bb9bd,2059
-    pantry-tree:
-      sha256: 98dce3e5e3eb0dcd4d47abd1d7066372e616e516bcacb738d8084af3aecda16c
-      size: 364
-  original:
-    hackage: path-io-1.7.0@sha256:38b1dd6ccaf18ebbc1f3da1a48061c059aa49348ed99ac842a375a23346bb9bd,2059
-- completed:
-    hackage: path-pieces-0.2.1@sha256:c713a8d04b3e6b89f1116c1d5fe434305031e17a9f0ad30a457a8402e1d5fc5c,1233
-    pantry-tree:
-      sha256: 462e78a9125d57e2645140121ada25daf5fe2db4617cbdf502a3c5a6691c48d4
-      size: 368
-  original:
-    hackage: path-pieces-0.2.1@sha256:c713a8d04b3e6b89f1116c1d5fe434305031e17a9f0ad30a457a8402e1d5fc5c,1233
-- completed:
-    hackage: pem-0.2.4@sha256:cc8e62118b783e284dc0fa032f54fe386a3861a948ec88079370a433c103a705,1441
-    pantry-tree:
-      sha256: 2413dd2c97c72d6e00330057b158973faa6336de068a9be4d6fdcfd474485f77
-      size: 425
-  original:
-    hackage: pem-0.2.4@sha256:cc8e62118b783e284dc0fa032f54fe386a3861a948ec88079370a433c103a705,1441
-- completed:
-    hackage: persistent-2.13.3.5@sha256:7c0b876cee0cb1a37e2ee70db7a59280b20201130dc1568f95f2ed468d1200f5,7056
-    pantry-tree:
-      sha256: 04f70c14d7d4c0589faf1f43c4f7ffc08212f58f530e4de6649b46e8aaa7cbfb
-      size: 6427
-  original:
-    hackage: persistent-2.13.3.5@sha256:7c0b876cee0cb1a37e2ee70db7a59280b20201130dc1568f95f2ed468d1200f5,7056
-- completed:
-    hackage: persistent-sqlite-2.13.1.0@sha256:20dc8067acd7ddc022f9d811d7344cc9e7def2d7c2a223ceff8cfae6ca4752f3,5155
-    pantry-tree:
-      sha256: c65043c4702cb767e992088b6bfbf79fb90fbc6d83d67087cbe0286b6953b1a4
-      size: 834
-  original:
-    hackage: persistent-sqlite-2.13.1.0@sha256:20dc8067acd7ddc022f9d811d7344cc9e7def2d7c2a223ceff8cfae6ca4752f3,5155
-- completed:
-    hackage: persistent-template-2.12.0.0@sha256:7c68de6624ff83e14b674745e1c895dcf7c8676f6f24be131c89e2e4c2fa4510,1008
-    pantry-tree:
-      sha256: 6d31d8a3bde912d0c8b28d9d18caa77a5a7add42104d8bb109f7cd298f21a78f
-      size: 267
-  original:
-    hackage: persistent-template-2.12.0.0@sha256:7c68de6624ff83e14b674745e1c895dcf7c8676f6f24be131c89e2e4c2fa4510,1008
-- completed:
-    hackage: primitive-0.7.4.0@sha256:89b88a3e08493b7727fa4089b0692bfbdf7e1e666ef54635f458644eb8358764,2857
-    pantry-tree:
-      sha256: 71a850c658b70e869da19f61615d87d9d6ecec597f0e3d4b498da56559114829
-      size: 1655
-  original:
-    hackage: primitive-0.7.4.0@sha256:89b88a3e08493b7727fa4089b0692bfbdf7e1e666ef54635f458644eb8358764,2857
-- completed:
-    hackage: project-template-0.2.1.0@sha256:2345f65b3f3c178f66d7877c48c126748a6604772df80ee5f82dfec6b7154cba,1963
-    pantry-tree:
-      sha256: d6fb62a5090735ab0942c54d7f606f394c65a97fdd96907e509151e6f5ec5199
-      size: 449
-  original:
-    hackage: project-template-0.2.1.0@sha256:2345f65b3f3c178f66d7877c48c126748a6604772df80ee5f82dfec6b7154cba,1963
-- completed:
-    hackage: random-1.2.1.1@sha256:dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9,6541
-    pantry-tree:
-      sha256: 646ee77fe01178837ee928b61ae8653dcf190e9b5353ebebd094079c77a18b76
-      size: 1528
-  original:
-    hackage: random-1.2.1.1@sha256:dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9,6541
-- completed:
-    hackage: resource-pool-0.3.1.0@sha256:dbaadfcc3c1be5391336e2016b28bb2d0c534f245ba9f5af5ed1d5125afc8c1a,1280
-    pantry-tree:
-      sha256: e2fc51ec2b5a126caab04688b40ec64fd6f7e3d9251e947a87c5ce3a6bc447bc
-      size: 406
-  original:
-    hackage: resource-pool-0.3.1.0@sha256:dbaadfcc3c1be5391336e2016b28bb2d0c534f245ba9f5af5ed1d5125afc8c1a,1280
-- completed:
-    hackage: resourcet-1.2.6@sha256:0c55be13d24c1e9c1e6d82327ac039a0bf41469c456e3ae678efa8a9beda3a74,1739
-    pantry-tree:
-      sha256: 397267a06a83fafe7a5a89eb68bdb4eb55421e7557deb21133b720389028b3aa
-      size: 648
-  original:
-    hackage: resourcet-1.2.6@sha256:0c55be13d24c1e9c1e6d82327ac039a0bf41469c456e3ae678efa8a9beda3a74,1739
-- completed:
-    hackage: retry-0.9.3.0@sha256:add44b9b2add217df6f5293785e8b592cdb3721a3a70250a951ebc7b227fd8b0,2426
-    pantry-tree:
-      sha256: e2dbd5a5605e55e2c028ead250a5b7f7bf1065a34700fbde6eb961c854623c5b
-      size: 564
-  original:
-    hackage: retry-0.9.3.0@sha256:add44b9b2add217df6f5293785e8b592cdb3721a3a70250a951ebc7b227fd8b0,2426
-- completed:
-    hackage: rio-0.1.22.0@sha256:95fc3725a638bb7d6e11be7a2cf8d601097ebc8cb992661b211a6e36ed1da726,3669
-    pantry-tree:
-      sha256: 02b0cdf9cf7901434c248c2e35a219ebc3c411d46729ba491d0e8fbd5042ced9
-      size: 4802
-  original:
-    hackage: rio-0.1.22.0@sha256:95fc3725a638bb7d6e11be7a2cf8d601097ebc8cb992661b211a6e36ed1da726,3669
-- completed:
-    hackage: rio-orphans-0.1.2.0@sha256:aa125f7633fbe99e7f68a097fe6953684fea1a5282e3642a709e71b29656d21c,1651
-    pantry-tree:
-      sha256: fd8b71d333e60c6949dad2e724e7c178861068379f268ca1171350ba5c962e1f
-      size: 428
-  original:
-    hackage: rio-orphans-0.1.2.0@sha256:aa125f7633fbe99e7f68a097fe6953684fea1a5282e3642a709e71b29656d21c,1651
-- completed:
-    hackage: rio-prettyprint-0.1.1.0@sha256:75deb6dab0249c657f6b4002e6ff7b554759a2348f7eee16d9ff22a46a7c44e8,1311
-    pantry-tree:
-      sha256: ea8302ce5ba5ac7e1a81760d72aa0c7a1ae3abab31c6f9466690ad2758c31a37
-      size: 479
-  original:
-    hackage: rio-prettyprint-0.1.1.0@sha256:75deb6dab0249c657f6b4002e6ff7b554759a2348f7eee16d9ff22a46a7c44e8,1311
-- completed:
-    hackage: safe-0.3.19@sha256:0910dafb8898f52bde4c646e560228a0fd08b1fca5457f222d2f5c0fad6d2039,2317
-    pantry-tree:
-      sha256: 40010636c24cebf3f3e29e9b3b8e6c35f249f5e5d253925433140bb0b4e3f891
-      size: 564
-  original:
-    hackage: safe-0.3.19@sha256:0910dafb8898f52bde4c646e560228a0fd08b1fca5457f222d2f5c0fad6d2039,2317
-- completed:
-    hackage: safe-exceptions-0.1.7.3@sha256:6e9b1b233af80cc0aa17ea858d2641ba146fb11cbcc5970a52649e89d77282e2,1398
-    pantry-tree:
-      sha256: 41e57c663a86bd61931f3b9d221c2eca508b394bace069e096c32823e77286a3
-      size: 510
-  original:
-    hackage: safe-exceptions-0.1.7.3@sha256:6e9b1b233af80cc0aa17ea858d2641ba146fb11cbcc5970a52649e89d77282e2,1398
-- completed:
-    hackage: scientific-0.3.7.0@sha256:76465a82beb2af6ea83ebd00684acc0ffe659e7da7066329931dc8f02fc97507,4826
-    pantry-tree:
-      sha256: 2e5436cd8a2d2fa045aadc7619aa06cf18f4f77d01b70d8c517213b718b69a2b
-      size: 657
-  original:
-    hackage: scientific-0.3.7.0@sha256:76465a82beb2af6ea83ebd00684acc0ffe659e7da7066329931dc8f02fc97507,4826
-- completed:
-    hackage: semialign-1.2.0.1@sha256:2ab22ab4f7e67028a745e549ae49f1ddecbd83e62d7e6ecce4ab0685410da536,2836
-    pantry-tree:
-      sha256: 3ba68adbdcb1927d1bca9d9f3889cbe65e10fd3907675e35bb81271e74e59de6
-      size: 537
-  original:
-    hackage: semialign-1.2.0.1@sha256:2ab22ab4f7e67028a745e549ae49f1ddecbd83e62d7e6ecce4ab0685410da536,2836
-- completed:
-    hackage: semigroupoids-5.3.7@sha256:fb1a86c250997c269106645724a67bc358235245cf385b589f855ac070d4ada0,7488
-    pantry-tree:
-      sha256: 1ddbcc4c07bb3a195e718ecd432caa37f9b25c4d4b3fe270d16f480a3d925c4a
-      size: 2404
-  original:
-    hackage: semigroupoids-5.3.7@sha256:fb1a86c250997c269106645724a67bc358235245cf385b589f855ac070d4ada0,7488
-- completed:
-    hackage: semigroups-0.20@sha256:925341e6f7eb104cb490bef06eab93bb7995c7c67c51ee938185a2ddefa7aaf2,6333
-    pantry-tree:
-      sha256: d4d3f0b32a68cf8808fcb8d2de117ab9ec09dbfec93a297aa3d386ca79a0fe05
-      size: 481
-  original:
-    hackage: semigroups-0.20@sha256:925341e6f7eb104cb490bef06eab93bb7995c7c67c51ee938185a2ddefa7aaf2,6333
-- completed:
-    hackage: silently-1.2.5.2@sha256:1496b654d2113b9653d14f92e39acb40d0e1ed5de830214857191622b8ed4653,2302
-    pantry-tree:
-      sha256: 4d933f0543e1c1b2c87948844cd84890259388d4b14705313c76bdc602df8e8e
-      size: 374
-  original:
-    hackage: silently-1.2.5.2@sha256:1496b654d2113b9653d14f92e39acb40d0e1ed5de830214857191622b8ed4653,2302
-- completed:
-    hackage: socks-0.6.1@sha256:ac190808eea704672df18f702e8f2ad0b7a4d0af528e95ee55ea6ee0be672e2a,1258
-    pantry-tree:
-      sha256: 53d29c06c42e737ae99660e077c7c4b286f1272b3394ad7f74163867a5b3b8fa
-      size: 692
-  original:
-    hackage: socks-0.6.1@sha256:ac190808eea704672df18f702e8f2ad0b7a4d0af528e95ee55ea6ee0be672e2a,1258
-- completed:
-    hackage: split-0.2.3.4@sha256:a6df9c3e806ee7cb50bc980a183fc1156f35022a39430dabac0bf9456fe18a4b,2647
-    pantry-tree:
-      sha256: 4e7559f1be32a70cdbdb96d14db768561dd36b8fdff36b3ffac94751f5b5ae6d
-      size: 439
-  original:
-    hackage: split-0.2.3.4@sha256:a6df9c3e806ee7cb50bc980a183fc1156f35022a39430dabac0bf9456fe18a4b,2647
-- completed:
-    hackage: splitmix-0.1.0.4@sha256:714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1,6483
-    pantry-tree:
-      sha256: 79f4645c11b7a3861db0b596297f72804f509444d639a8fd7c0162b1ed80c578
-      size: 1519
-  original:
-    hackage: splitmix-0.1.0.4@sha256:714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1,6483
-- completed:
-    hackage: stm-chans-3.0.0.6@sha256:146039ef0f5331e796165305198c66c91d61a4fc56219914401cab50f1cf0679,2239
-    pantry-tree:
-      sha256: 57f6821bb3f67013274e7d65a039ef21902c149daade08c59548df293d326a03
-      size: 689
-  original:
-    hackage: stm-chans-3.0.0.6@sha256:146039ef0f5331e796165305198c66c91d61a4fc56219914401cab50f1cf0679,2239
-- completed:
-    hackage: streaming-commons-0.2.2.4@sha256:cda37e6d0320ef05160bac35c180b3e980f9267bf00393af6578a632f1ea8429,4751
-    pantry-tree:
-      sha256: 711456a76d9decbb1a18111503b20b2613ad0fcbd1da0d35f7e74ca406317b68
-      size: 2947
-  original:
-    hackage: streaming-commons-0.2.2.4@sha256:cda37e6d0320ef05160bac35c180b3e980f9267bf00393af6578a632f1ea8429,4751
-- completed:
-    hackage: strict-0.4.0.1@sha256:d6205a748eb8db4cd17a7179be970c94598809709294ccfa43159c7f3cc4bf5d,4187
-    pantry-tree:
-      sha256: 2a8171b3ff2960552163a6e1dbb640b83e049f22a5b7764cc27c0941334496bd
-      size: 654
-  original:
-    hackage: strict-0.4.0.1@sha256:d6205a748eb8db4cd17a7179be970c94598809709294ccfa43159c7f3cc4bf5d,4187
-- completed:
-    hackage: syb-0.7.2.1@sha256:bf42655a213402215299e435c52f799e76cbec0b984cd7153d6b9af8a1c0803f,3815
-    pantry-tree:
-      sha256: 3ee55cc33d69da2953e7093f99199fbc0bfa9d90dccd19cac101d09befa5bbb3
-      size: 3396
-  original:
-    hackage: syb-0.7.2.1@sha256:bf42655a213402215299e435c52f799e76cbec0b984cd7153d6b9af8a1c0803f,3815
-- completed:
-    hackage: tagged-0.8.6.1@sha256:8a24aef29b8e35447ccc56658ea07c2aded30bfa8130ea057e382936e17c74a6,2874
-    pantry-tree:
-      sha256: 38c9b55d6918304b17a6c70a51ad9d981e9f64e08121482d9a801d4e4681a7db
-      size: 496
-  original:
-    hackage: tagged-0.8.6.1@sha256:8a24aef29b8e35447ccc56658ea07c2aded30bfa8130ea057e382936e17c74a6,2874
-- completed:
-    hackage: tar-0.5.1.1@sha256:bc14969ea4adfec6eee20264decf4a07c4002b38b2aa802d58d86b1a2cf7b895,5459
-    pantry-tree:
-      sha256: 08d6b352f588d34f24cd1ddb27cfde91e56f5e40ce34aa1756936935397972f0
-      size: 1069
-  original:
-    hackage: tar-0.5.1.1@sha256:bc14969ea4adfec6eee20264decf4a07c4002b38b2aa802d58d86b1a2cf7b895,5459
-- completed:
-    hackage: tar-conduit-0.3.2@sha256:17cb1c05343ed32db111c3f929f57ccce2b92a01d3ebd95a339db5e9b8bf147b,2951
-    pantry-tree:
-      sha256: b5bdd45ea88fafc5f773a96697009757fe9ed7ad4417b9bdc223279efed90ce0
-      size: 828
-  original:
-    hackage: tar-conduit-0.3.2@sha256:17cb1c05343ed32db111c3f929f57ccce2b92a01d3ebd95a339db5e9b8bf147b,2951
-- completed:
-    hackage: temporary-1.3@sha256:3a66c136f700dbf42f3c5000ca93e80b26dead51e54322c83272b236c1ec8ef1,1485
-    pantry-tree:
-      sha256: 5bfb8569e9c83e1b17604fc4375b5efd280f28146a7c42524f13a986f5a3bbc5
-      size: 318
-  original:
-    hackage: temporary-1.3@sha256:3a66c136f700dbf42f3c5000ca93e80b26dead51e54322c83272b236c1ec8ef1,1485
-- completed:
-    hackage: text-metrics-0.3.2@sha256:07431d6e6ff23ed3dee1b0eb6806feffb5ec8fc1c74c78f983c531b32087871b,2563
-    pantry-tree:
-      sha256: b59a0ace8cc37012f7186ccf6178bdc41d053ff381bcc45ceae16166951c55bf
-      size: 498
-  original:
-    hackage: text-metrics-0.3.2@sha256:07431d6e6ff23ed3dee1b0eb6806feffb5ec8fc1c74c78f983c531b32087871b,2563
-- completed:
-    hackage: text-short-0.1.5@sha256:962c6228555debdc46f758d0317dea16e5240d01419b42966674b08a5c3d8fa6,3498
-    pantry-tree:
-      sha256: 1fc6561c4acb94a41e58cd8f8c7cce161c18c5629dac63a54a9c62f9c778c52b
-      size: 727
-  original:
-    hackage: text-short-0.1.5@sha256:962c6228555debdc46f758d0317dea16e5240d01419b42966674b08a5c3d8fa6,3498
-- completed:
-    hackage: th-abstraction-0.4.4.0@sha256:89aa9d81c94883c9e16c3534041f31949194011fdcf43be450f090bfb300b58d,2148
-    pantry-tree:
-      sha256: 4ba3b66edafbc0a947bf94033d66fdff72f19cd64da14f812bbf61064c865f46
-      size: 670
-  original:
-    hackage: th-abstraction-0.4.4.0@sha256:89aa9d81c94883c9e16c3534041f31949194011fdcf43be450f090bfb300b58d,2148
-- completed:
-    hackage: th-compat-0.1.4@sha256:6ca77c4e80b4e4109e30549c269631a9cc295c8fc2431ce4123972a5f80f7bfc,3135
-    pantry-tree:
-      sha256: 263eba2c771ba43657c15c4f0b1989d88b92ba6acdba6f854b0dcc97366739f1
-      size: 530
-  original:
-    hackage: th-compat-0.1.4@sha256:6ca77c4e80b4e4109e30549c269631a9cc295c8fc2431ce4123972a5f80f7bfc,3135
-- completed:
-    hackage: th-expand-syns-0.4.10.0@sha256:4f0ae7278cf7b4485a37d550463bf8507e7550b93abcb085dc7bf41c3852def8,2130
-    pantry-tree:
-      sha256: 572868c0f5b15aab460da93f5e1783907e45f17f8804b39ae81d5ef08a89a0a6
-      size: 550
-  original:
-    hackage: th-expand-syns-0.4.10.0@sha256:4f0ae7278cf7b4485a37d550463bf8507e7550b93abcb085dc7bf41c3852def8,2130
-- completed:
-    hackage: th-lift-0.8.2@sha256:f135f67b018c22889e68b094773273dcf8f9e16fcfa330bf4778f84fce8925e9,2677
-    pantry-tree:
-      sha256: b1043dc39a4763e79847596f7be723a2638da42cd3a572c25e867845bc60df2e
-      size: 543
-  original:
-    hackage: th-lift-0.8.2@sha256:f135f67b018c22889e68b094773273dcf8f9e16fcfa330bf4778f84fce8925e9,2677
-- completed:
-    hackage: th-lift-instances-0.1.20@sha256:c7886eb39760825b8861c68e48b2b5efb5eff8d2cb76201fdd0fb04bcbeff78e,2608
-    pantry-tree:
-      sha256: 0498495a69ca395d95b12a67b6884adaec4ca9ab76b9a62ca76ba064e35a08ff
-      size: 526
-  original:
-    hackage: th-lift-instances-0.1.20@sha256:c7886eb39760825b8861c68e48b2b5efb5eff8d2cb76201fdd0fb04bcbeff78e,2608
-- completed:
-    hackage: th-reify-many-0.1.10@sha256:1827dcffb0c9f214e9739053fc808683336ea65c3749ff2d6148db189cbbd2a4,1753
-    pantry-tree:
-      sha256: 3aed327bc5dff9c9c22bb7d1ea3e4e437b9f74face6fc682cefffe462913dfd0
-      size: 373
-  original:
-    hackage: th-reify-many-0.1.10@sha256:1827dcffb0c9f214e9739053fc808683336ea65c3749ff2d6148db189cbbd2a4,1753
-- completed:
-    hackage: these-1.1.1.1@sha256:f069e766b8fed73d457fca20cc197f5c539bcdd03d7636e478ddf14dbb67684a,2748
-    pantry-tree:
-      sha256: 09a71077d04df022d79d341f69eb5dad8e8e103839b51f21a28920bba1e1ad9f
-      size: 351
-  original:
-    hackage: these-1.1.1.1@sha256:f069e766b8fed73d457fca20cc197f5c539bcdd03d7636e478ddf14dbb67684a,2748
-- completed:
-    hackage: time-compat-1.9.6.1@sha256:42d8f2e08e965e1718917d54ad69e1d06bd4b87d66c41dc7410f59313dba4ed1,5033
-    pantry-tree:
-      sha256: b262c5ae8d72d2073d12e1de1863abd234fad8c138df28f32bb51bc232ced608
-      size: 4113
-  original:
-    hackage: time-compat-1.9.6.1@sha256:42d8f2e08e965e1718917d54ad69e1d06bd4b87d66c41dc7410f59313dba4ed1,5033
-- completed:
-    hackage: tls-1.6.0@sha256:7ae39373fd2de27fb80e90f76d22aeeb9a074a0ddd120cbd02c9c52f516a9e55,6987
-    pantry-tree:
-      sha256: a64b0c6cdfc37b48ebb7c0e30fe23a0e1a172baf3819ff6d0ca281ae4a56041a
-      size: 4897
-  original:
-    hackage: tls-1.6.0@sha256:7ae39373fd2de27fb80e90f76d22aeeb9a074a0ddd120cbd02c9c52f516a9e55,6987
-- completed:
-    hackage: transformers-base-0.4.6@sha256:6f18f320e371c8954c4b6b211e2fdd5d15a6d6310bd605b9d640f47ede408961,1643
-    pantry-tree:
-      sha256: 6c2d24a9678865e2a5f4b6286cb17228673a6987fb546bf07b89ffbd19716ad2
-      size: 275
-  original:
-    hackage: transformers-base-0.4.6@sha256:6f18f320e371c8954c4b6b211e2fdd5d15a6d6310bd605b9d640f47ede408961,1643
-- completed:
-    hackage: transformers-compat-0.7.2@sha256:044fb9955f63ee138fcebedfdcbe54afe741f2d5892a2d0bdf3a8052bd342643,5601
-    pantry-tree:
-      sha256: f49610c6a2faf82111e5d4222576f4afbcfa904bf56665232c5aa077dfc7578f
-      size: 1724
-  original:
-    hackage: transformers-compat-0.7.2@sha256:044fb9955f63ee138fcebedfdcbe54afe741f2d5892a2d0bdf3a8052bd342643,5601
-- completed:
-    hackage: typed-process-0.2.10.1@sha256:cc35b76f2ce32c708cb2f68a1c4f661a8138196d958e34a2f214208333a73f46,2070
-    pantry-tree:
-      sha256: b3d6511483d5c869fdfb7220dc13b205730502162a1f6bdca9307a676f3fcb8c
-      size: 529
-  original:
-    hackage: typed-process-0.2.10.1@sha256:cc35b76f2ce32c708cb2f68a1c4f661a8138196d958e34a2f214208333a73f46,2070
-- completed:
-    hackage: unicode-data-0.3.0@sha256:0545e079705a5381d0893f8fe8daaa08fc9174baeab269b9cf651817d8eadbc6,5123
-    pantry-tree:
-      sha256: 6ccabf28007368d01c8c9ed9353e781e33c0037b74fbe908c5da0af9d09c299a
-      size: 2555
-  original:
-    hackage: unicode-data-0.3.0@sha256:0545e079705a5381d0893f8fe8daaa08fc9174baeab269b9cf651817d8eadbc6,5123
-- completed:
-    hackage: unicode-transforms-0.4.0.1@sha256:64e17917792316ab4244bb1ed0091d292c6ce1487a374a97268b91c7d87c0a7e,5634
-    pantry-tree:
-      sha256: 7c2fbacb9e1c6a714f964bd2318aac9ed5528ff18aa85f1d12d9f8cebe295e7f
-      size: 1833
-  original:
-    hackage: unicode-transforms-0.4.0.1@sha256:64e17917792316ab4244bb1ed0091d292c6ce1487a374a97268b91c7d87c0a7e,5634
-- completed:
-    hackage: unix-compat-0.6@sha256:db47d4ad77f3f865d162a531d9b759ed30e2722710a8358aa6df1d3fcf83f552,3569
-    pantry-tree:
-      sha256: 530668be5ded77879c925433ec40e1e4f4a9113a8527410f8f282d3cf92eb950
-      size: 1267
-  original:
-    hackage: unix-compat-0.6@sha256:db47d4ad77f3f865d162a531d9b759ed30e2722710a8358aa6df1d3fcf83f552,3569
-- completed:
-    hackage: unix-time-0.4.7@sha256:c0d971d04561875b908451c563df8728fe6d8639c90e070b244227f13f76ab8e,2570
-    pantry-tree:
-      sha256: bc28cbe467d99caa6399e7cd85cf33548776bbd2c1e91369fe10268c9de546e6
-      size: 1073
-  original:
-    hackage: unix-time-0.4.7@sha256:c0d971d04561875b908451c563df8728fe6d8639c90e070b244227f13f76ab8e,2570
-- completed:
-    hackage: unliftio-0.2.22.0@sha256:2a3f0298a293c48eddd10c25cbbd6206b6e745cee2e648e48e16531a3ef21ce8,3314
-    pantry-tree:
-      sha256: bac61d98c6852bb5f80eabb0a82369f3b2760b965f66fd52738b1e22b1362798
-      size: 2423
-  original:
-    hackage: unliftio-0.2.22.0@sha256:2a3f0298a293c48eddd10c25cbbd6206b6e745cee2e648e48e16531a3ef21ce8,3314
-- completed:
-    hackage: unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082
-    pantry-tree:
-      sha256: 9955bc1336dd07c94928892f1a97aed6e5fe63a4242f089a0efd2e95174490ea
-      size: 328
-  original:
-    hackage: unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082
-- completed:
-    hackage: unordered-containers-0.2.19.1@sha256:7d43e557b32a30eeac22e68b8430384bf829b0b2313761026a7f103395b047d5,3638
-    pantry-tree:
-      sha256: 1870de393820b94af9efb8fcdd31940543569cdcd3d13296bc224438b2b107d8
-      size: 1517
-  original:
-    hackage: unordered-containers-0.2.19.1@sha256:7d43e557b32a30eeac22e68b8430384bf829b0b2313761026a7f103395b047d5,3638
-- completed:
-    hackage: uuid-types-1.0.5@sha256:8447b8a08723877400da13b6329b3fb19ea9e4c20fabe62888841eb3708d7474,2608
-    pantry-tree:
-      sha256: 53d0b46a614d80bc1dfa5f51bffa7cab89a88dfe4f46d24b505cf696604f33b6
-      size: 480
-  original:
-    hackage: uuid-types-1.0.5@sha256:8447b8a08723877400da13b6329b3fb19ea9e4c20fabe62888841eb3708d7474,2608
-- completed:
-    hackage: vault-0.3.1.5@sha256:d1647db5a222db5e8abf5d9252a2912a34b70fc5160762dcc2213a209b54641d,2366
-    pantry-tree:
-      sha256: dcfef7442499db8bd17b15cf9ab9753a23b3d6e564f08f08ce4daf059c42ff63
-      size: 771
-  original:
-    hackage: vault-0.3.1.5@sha256:d1647db5a222db5e8abf5d9252a2912a34b70fc5160762dcc2213a209b54641d,2366
-- completed:
-    hackage: vector-0.13.0.0@sha256:ec337a1371bc306658e8338612e975f37a3f7700716441608b7afb66ae356d4c,8774
-    pantry-tree:
-      sha256: 61263e71050e1c895bb67e4c0f05497419818e8e79b8bff9e3eabf17759e3232
-      size: 4092
-  original:
-    hackage: vector-0.13.0.0@sha256:ec337a1371bc306658e8338612e975f37a3f7700716441608b7afb66ae356d4c,8774
-- completed:
-    hackage: vector-algorithms-0.9.0.1@sha256:c8c86f969bad1c279d17f9be9d450c3324278c0323231602e101b500a69163f9,3652
-    pantry-tree:
-      sha256: bb57212deb9e7b74161059ab2b1a53bb0ccf1f5a5c7e28c69efad4e9e7c2510f
-      size: 1510
-  original:
-    hackage: vector-algorithms-0.9.0.1@sha256:c8c86f969bad1c279d17f9be9d450c3324278c0323231602e101b500a69163f9,3652
-- completed:
-    hackage: vector-stream-0.1.0.0@sha256:5500b39bd69ba5384638db0b451c8eaf40ef52544355741bd73436b0da9ec3a8,1336
-    pantry-tree:
-      sha256: 99de0751367cf53df872999edfb9e3c24207cf946442ccccf7487d74c7f12c1d
-      size: 325
-  original:
-    hackage: vector-stream-0.1.0.0@sha256:5500b39bd69ba5384638db0b451c8eaf40ef52544355741bd73436b0da9ec3a8,1336
-- completed:
-    hackage: witherable-0.4.2@sha256:cccb36175e088abb4291ee5044b8c04d71acd5c36636902d2520f91508dd4bb8,2294
-    pantry-tree:
-      sha256: 614b5410bc909e3f230d440c9c2de812d77490c955929ff8e4eed592e7696fcf
-      size: 384
-  original:
-    hackage: witherable-0.4.2@sha256:cccb36175e088abb4291ee5044b8c04d71acd5c36636902d2520f91508dd4bb8,2294
-- completed:
-    hackage: x509-1.7.7@sha256:90eef2d745a654146fc1c325e035eaddac531e4d2145d4bc1dcf4b8fad439d34,2276
-    pantry-tree:
-      sha256: d81ffd09633c0417bcedbfc29f870cc843ec0750edd2f73c8fd60a5e5df278d2
-      size: 1124
-  original:
-    hackage: x509-1.7.7@sha256:90eef2d745a654146fc1c325e035eaddac531e4d2145d4bc1dcf4b8fad439d34,2276
-- completed:
-    hackage: x509-store-1.6.9@sha256:1f1abeab5bacf1407b920d0f34f4c35a5ad450ff0d8121cd3dc76460f81e711d,1716
-    pantry-tree:
-      sha256: 9fc5a6a997af3569c79d5062534cc9836721b39df86bef56308f209164ab500d
-      size: 398
-  original:
-    hackage: x509-store-1.6.9@sha256:1f1abeab5bacf1407b920d0f34f4c35a5ad450ff0d8121cd3dc76460f81e711d,1716
-- completed:
-    hackage: x509-system-1.6.7@sha256:45ddd5db19f18be80614e058e8838765f2749a8afcfd2b292bd6afb36820a3c0,1492
-    pantry-tree:
-      sha256: bc736fef360079192c471d5cf122f696442f29e5332aaa45f1d8571f50a4210e
-      size: 391
-  original:
-    hackage: x509-system-1.6.7@sha256:45ddd5db19f18be80614e058e8838765f2749a8afcfd2b292bd6afb36820a3c0,1492
-- completed:
-    hackage: x509-validation-1.6.12@sha256:4f4af20ec77f02c042ecd4726c195bb0e0b694b336de81e7bd4515b2917bd9bc,2169
-    pantry-tree:
-      sha256: f95c21aa9671b10f9384b89c018874246f68220b63266172b47a747b62695e23
-      size: 631
-  original:
-    hackage: x509-validation-1.6.12@sha256:4f4af20ec77f02c042ecd4726c195bb0e0b694b336de81e7bd4515b2917bd9bc,2169
-- completed:
-    hackage: yaml-0.11.8.0@sha256:049261f85bdcaf06e5298709edcfd0337fe706683b3631a81dc49aa4a18ba1a5,4936
-    pantry-tree:
-      sha256: 7f32163524a27865c85074a9e17011879e9e17ae342e0a35c0dd883df381fe2e
-      size: 2044
-  original:
-    hackage: yaml-0.11.8.0@sha256:049261f85bdcaf06e5298709edcfd0337fe706683b3631a81dc49aa4a18ba1a5,4936
-- completed:
-    hackage: zip-archive-0.4.2.1@sha256:15385412cda223a137b4c5be389c02c3e0b7a810d61e5cec997d9e0062480ca8,3915
-    pantry-tree:
-      sha256: 044b5d8d5917dd5b92ae1f7dfabf59270bc78044af6fb7be11ff494b5559df4a
-      size: 878
-  original:
-    hackage: zip-archive-0.4.2.1@sha256:15385412cda223a137b4c5be389c02c3e0b7a810d61e5cec997d9e0062480ca8,3915
-- completed:
-    hackage: zlib-0.6.3.0@sha256:8214a9d37580f17f8b675109578a5dbe6853559eef156e34dc2233f1123ace33,5216
-    pantry-tree:
-      sha256: 87b7fd16379d679eb01d9fae78b4db97356d301fce4a040ba9e690d16eeb98b2
-      size: 2622
-  original:
-    hackage: zlib-0.6.3.0@sha256:8214a9d37580f17f8b675109578a5dbe6853559eef156e34dc2233f1123ace33,5216
-snapshots: []
diff --git a/stack-macos.yaml b/stack-macos.yaml
deleted file mode 100644
index 788480b207..0000000000
--- a/stack-macos.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# This project-level configuration file is intended to be used with, and only
-# with, macOS. It specifies process-1.6.15.0 as a dependency, which includes
-# important bug fixes for macOS. When building test suite stack-test, Stack will
-# warn:
-#
-#   This package indirectly depends on multiple versions of the same package.
-#   This is very likely to cause a compile failure.
-#
-# but macOS, unlike other operating systems, appears able to avoid that failure.
-
-# GHC 9.2.4
-resolver: nightly-2022-09-05
-
-packages:
-- .
-
-extra-deps:
-# GHC 9.2.4 comes with process-1.6.13.2, which lacks important bug fixes
-- process-1.6.15.0@sha256:04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf,2845
-# Although Cabal-3.6.3.0 is a global package, it depends on process and so has
-# to be expressly added as an extra-dep
-- Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459
-- pantry-0.6.0@sha256:c87056df8151441911bece5c09d11738110284dc1eacb292686aa33c4308c8c2,4099
-
-drop-packages:
-# See https://github.com/commercialhaskell/stack/pull/4712
-- cabal-install
-
-docker:
-  enable: false
-  repo: psibi/alpine-haskell-stack:9.2.4
-
-nix:
-  # --nix on the command-line to enable.
-  packages:
-  - zlib
-  - unzip
-
-flags:
-  stack:
-    developer-mode: true
-
-ghc-options:
-  "$locals": -fhide-source-paths
diff --git a/stack-macos.yaml.lock b/stack-macos.yaml.lock
deleted file mode 100644
index e9ce31d0e1..0000000000
--- a/stack-macos.yaml.lock
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was autogenerated by Stack.
-# You should not edit this file by hand.
-# For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
-
-packages:
-- completed:
-    hackage: process-1.6.15.0@sha256:04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf,2845
-    pantry-tree:
-      sha256: 291f5800ffb87af7ed910582ae0ec00ef9ffab0643ed62c36fcfe58c52e90a24
-      size: 1545
-  original:
-    hackage: process-1.6.15.0@sha256:04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf,2845
-- completed:
-    hackage: Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459
-    pantry-tree:
-      sha256: b250a53bdb56844f047a2927833bb565b936a289abfa85dfc2a63148d776368a
-      size: 19757
-  original:
-    hackage: Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459
-- completed:
-    hackage: pantry-0.6.0@sha256:c87056df8151441911bece5c09d11738110284dc1eacb292686aa33c4308c8c2,4099
-    pantry-tree:
-      sha256: a6ed2ac03d6ef3c156bf01390e70751c13cdfbdb2a24f626f5a3024d552f302d
-      size: 2524
-  original:
-    hackage: pantry-0.6.0@sha256:c87056df8151441911bece5c09d11738110284dc1eacb292686aa33c4308c8c2,4099
-snapshots:
-- completed:
-    sha256: 1c049df0b264500e22262aa42a6f0a81cddd639cfd04f55c4acb0359f282dab2
-    size: 633665
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/9/5.yaml
-  original: nightly-2022-09-05
diff --git a/stack.cabal b/stack.cabal
index 51f6bd1e2f..de64e8cb37 100644
--- a/stack.cabal
+++ b/stack.cabal
@@ -1,30 +1,36 @@
-cabal-version: 2.0
+cabal-version: 2.2
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.39.6.
 --
 -- see: https://github.com/sol/hpack
 
 name:           stack
-version:        2.10.0
-synopsis:       The Haskell Tool Stack
-description:    Please see the documentation at <https://docs.haskellstack.org>
-                for usage information.
+version:        4.2.0
+synopsis:       A program for developing Haskell projects
+description:    Stack (the Haskell Tool Stack) is a program for developing Haskell projects.
+                It is aimed at new and experienced users of Haskell and seeks to support them
+                fully on Linux, macOS and Windows.
+                .
+                For information about how to use Stack, see <https://docs.haskellstack.org>.
                 .
                 If building a 'stack' executable for distribution, please download the
                 source code from <https://github.com/commercialhaskell/stack/releases>
-                and build it using Stack itself in order to ensure identical behaviour
-                to official binaries.  This package on Hackage is provided for convenience
-                and bootstrapping purposes.
+                and build it with Stack in order to ensure identical behaviour to official
+                binaries.
+                .
+                This package is provided on Hackage for convenience and bootstrapping
+                purposes.
                 .
-                Note that the API for the library is not currently stable, and may
-                change significantly, even between minor releases. It is
-                currently only intended for use by the executable.
+                Currently, the library exposed by the package is intended for use only by the
+                executable. The library's API may change significantly, even between minor
+                releases.
 category:       Development
 homepage:       http://haskellstack.org
 bug-reports:    https://github.com/commercialhaskell/stack/issues
 author:         Commercial Haskell SIG
-maintainer:     manny@fpcomplete.com
-license:        BSD3
+maintainer:     Mike Pilgrem <public@pilgrem.com>,
+                Emanuel Borsboom <manny@fpcomplete.com>
+license:        BSD-3-Clause
 license-file:   LICENSE
 build-type:     Custom
 extra-source-files:
@@ -32,41 +38,124 @@ extra-source-files:
     ChangeLog.md
     README.md
     stack.yaml
-    stack-macos.yaml
-    doc/azure_ci.md
-    doc/build_command.md
     doc/build_overview.md
     doc/ChangeLog.md
+    doc/commands/bench_command.md
+    doc/commands/build_command.md
+    doc/commands/clean_command.md
+    doc/commands/config_command.md
+    doc/commands/docker_command.md
+    doc/commands/dot_command.md
+    doc/commands/eval_command.md
+    doc/commands/exec_command.md
+    doc/commands/ghc_command.md
+    doc/commands/ghci_command.md
+    doc/commands/haddock_command.md
+    doc/commands/hoogle_command.md
+    doc/commands/hpc_command.md
+    doc/commands/ide_command.md
+    doc/commands/index.md
+    doc/commands/init_command.md
+    doc/commands/install_command.md
+    doc/commands/list_command.md
+    doc/commands/ls_command.md
+    doc/commands/new_command.md
+    doc/commands/path_command.md
+    doc/commands/purge_command.md
+    doc/commands/query_command.md
+    doc/commands/repl_command.md
+    doc/commands/run_command.md
+    doc/commands/runghc_command.md
+    doc/commands/runhaskell_command.md
+    doc/commands/script_command.md
+    doc/commands/sdist_command.md
+    doc/commands/setup_command.md
+    doc/commands/templates_command.md
+    doc/commands/test_command.md
+    doc/commands/uninstall_command.md
+    doc/commands/unpack_command.md
+    doc/commands/update_command.md
+    doc/commands/upgrade_command.md
+    doc/commands/upload_command.md
+    doc/community/index.md
+    doc/configure/customisation_scripts.md
+    doc/configure/environment_variables.md
+    doc/configure/global_flags.md
+    doc/configure/index.md
+    doc/configure/yaml/include.md
+    doc/configure/yaml/index.md
+    doc/configure/yaml/non-project.md
+    doc/configure/yaml/project.md
     doc/CONTRIBUTING.md
-    doc/coverage.md
-    doc/custom_snapshot.md
-    doc/dependency_visualization.md
-    doc/developing_on_windows.md
-    doc/docker_integration.md
+    doc/dev_containers.md
     doc/faq.md
-    doc/ghci.md
     doc/glossary.md
-    doc/GUIDE.md
-    doc/GUIDE_advanced.md
     doc/install_and_upgrade.md
-    doc/lock_files.md
-    doc/nix_integration.md
-    doc/nonstandard_project_init.md
-    doc/pantry.md
+    doc/maintainers/7zip.md
+    doc/maintainers/archive/docker.md
+    doc/maintainers/archive/docker_images.md
+    doc/maintainers/archive/README.md
+    doc/maintainers/archive/releases.md
+    doc/maintainers/ghc.md
+    doc/maintainers/haskellstack.org.md
+    doc/maintainers/msys.md
+    doc/maintainers/releases.md
+    doc/maintainers/self-hosted_runners.md
+    doc/maintainers/stack_errors.md
+    doc/maintainers/team_process.md
+    doc/maintainers/version_scheme.md
+    doc/other_resources.md
     doc/README.md
-    doc/shell_autocompletion.md
     doc/SIGNING_KEY.md
-    doc/Stack_and_VS_Code.md
-    doc/stack_yaml_vs_cabal_package_file.md
-    doc/travis_ci.md
-    doc/yaml_configuration.md
+    doc/topics/azure_ci.md
+    doc/topics/backpack.md
+    doc/topics/CI.md
+    doc/topics/custom_snapshot.md
+    doc/topics/debugging.md
+    doc/topics/developing_on_windows.md
+    doc/topics/docker_integration.md
+    doc/topics/editor_integration.md
+    doc/topics/GHC_from_source.md
+    doc/topics/haskell_and_c_code.md
+    doc/topics/index.md
+    doc/topics/lock_files.md
+    doc/topics/nix_integration.md
+    doc/topics/nonstandard_project_init.md
+    doc/topics/package_location.md
+    doc/topics/scripts.md
+    doc/topics/shell_autocompletion.md
+    doc/topics/snapshot_location.md
+    doc/topics/Stack_and_VS_Code.md
+    doc/topics/stack_environment.md
+    doc/topics/stack_root.md
+    doc/topics/stack_work.md
+    doc/topics/stack_yaml_vs_cabal_package_file.md
+    doc/topics/travis_ci.md
+    doc/tutorial/building_existing_projects.md
+    doc/tutorial/building_your_project.md
+    doc/tutorial/cabal_flags_and_ghc_options.md
+    doc/tutorial/executing_commands.md
+    doc/tutorial/hello_world_example.md
+    doc/tutorial/index.md
+    doc/tutorial/installed_package_databases.md
+    doc/tutorial/locations_used_by_stack.md
+    doc/tutorial/multi-package_projects.md
+    doc/tutorial/package_description.md
+    doc/tutorial/project_configuration.md
+    doc/tutorial/stack_build_synonyms.md
+    doc/tutorial/stack_build_targets.md
+    doc/tutorial/stack_configuration.md
+    doc/tutorial/tutorial_conclusion.md
+    doc/tutorial/using_ghc_interactively.md
     src/setup-shim/StackSetupShim.hs
-    test/package-dump/ghc-7.10.txt
-    test/package-dump/ghc-7.8.4-osx.txt
-    test/package-dump/ghc-7.8.txt
-    test/package-dump/ghc-head.txt
-    src/test/Stack/Untar/test1.tar.gz
-    src/test/Stack/Untar/test2.tar.gz
+    tests/unit/package-dump/ghc-7.10.txt
+    tests/unit/package-dump/ghc-7.8.4-osx.txt
+    tests/unit/package-dump/ghc-7.8.txt
+    tests/unit/package-dump/ghc-head.txt
+    tests/unit/Stack/Untar/test1.tar.gz
+    tests/unit/Stack/Untar/test2.tar.gz
+    cabal.project
+    cabal.config
 
 source-repository head
   type: git
@@ -74,37 +163,42 @@ source-repository head
 
 custom-setup
   setup-depends:
-      Cabal
+      Cabal >=3.14 && <3.18
     , base >=4.14.3.0 && <5
     , filepath
 
 flag developer-mode
-  description: By default, should extra developer information be output?
+  description: By default, output extra developer information.
   manual: True
   default: False
 
 flag disable-git-info
-  description: Disable compile-time inclusion of current git info in stack
+  description: Disable inclusion of current Git information in the Stack executable when it is built.
+  manual: True
+  default: False
+
+flag disable-stack-upload
+  description: For use only during development and debugging. Disable 'stack upload' so that it does not make HTTP requests. Stack will output information about the HTTP request(s) that it would have made if the command was enabled.
   manual: True
   default: False
 
 flag hide-dependency-versions
-  description: Hides dependency versions from 'stack --version', used only by building Stack and the default 'stack.yaml'.  Note to packagers/distributors: DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING 'stack' ANY OTHER WAY (e.g. using cabal or from Hackage), as it makes debugging support requests more difficult.
+  description: Hides dependency versions from 'stack --version'. Used only when building a Stack executable for official release. Note to packagers/distributors: DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING STACK ANY OTHER WAY (e.g. using Cabal or from Hackage), as it makes debugging support requests more difficult.
   manual: True
   default: False
 
 flag integration-tests
-  description: Run the integration test suite
+  description: Run the integration test suite.
   manual: True
   default: False
 
 flag static
-  description: Pass -static/-pthread to ghc when linking the stack binary.
+  description: When building the Stack executable, or the stack-integration-test executable, pass the -static and -pthread flags to the linker used by GHC.
   manual: True
   default: False
 
 flag supported-build
-  description: If false, causes 'stack --version' to issue a warning about the build being unsupported.  Should be True only if building with Stack and the default 'stack.yaml'.  Note to packagers/distributors: DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING 'stack' ANY OTHER WAY (e.g. using cabal or from Hackage), as it makes debugging support requests more difficult.
+  description: If false, causes 'stack --version' to issue a warning about the build being unsupported. Used only when building a Stack executable for official release. Note to packagers/distributors: DO NOT OVERRIDE THIS FLAG IF YOU ARE BUILDING STACK ANY OTHER WAY (e.g. using Cabal or from Hackage), as it makes debugging support requests more difficult.
   manual: True
   default: False
 
@@ -115,6 +209,7 @@ library
       Data.Attoparsec.Combinators
       Data.Attoparsec.Interpreter
       Data.Monoid.Map
+      GHC.Utils.GhcPkg.Main.Compat
       Network.HTTP.StackClient
       Options.Applicative.Args
       Options.Applicative.Builder.Extra
@@ -122,27 +217,43 @@ library
       Path.CheckInstall
       Path.Extra
       Path.Find
+      Stack
       Stack.Build
+      Stack.Build.Backpack
       Stack.Build.Cache
       Stack.Build.ConstructPlan
       Stack.Build.Execute
+      Stack.Build.ExecuteEnv
+      Stack.Build.ExecutePackage
       Stack.Build.Haddock
       Stack.Build.Installed
       Stack.Build.Source
       Stack.Build.Target
+      Stack.BuildInfo
+      Stack.BuildOpts
       Stack.BuildPlan
+      Stack.CLI
       Stack.Clean
+      Stack.Component
+      Stack.ComponentFile
       Stack.Config
       Stack.Config.Build
+      Stack.Config.ConfigureScript
       Stack.Config.Docker
       Stack.Config.Nix
+      Stack.ConfigureOpts
       Stack.ConfigCmd
       Stack.Constants
       Stack.Constants.Config
+      Stack.Constants.StackProgName
       Stack.Coverage
       Stack.DefaultColorWhen
+      Stack.DependencyGraph
       Stack.Docker
+      Stack.DockerCmd
       Stack.Dot
+      Stack.Eval
+      Stack.Exec
       Stack.FileWatch
       Stack.GhcPkg
       Stack.Ghci
@@ -160,30 +271,45 @@ library
       Stack.Options.BuildParser
       Stack.Options.CleanParser
       Stack.Options.ConfigParser
+      Stack.Options.ConfigEnvParser
+      Stack.Options.ConfigSetParser
       Stack.Options.Completion
       Stack.Options.DockerParser
       Stack.Options.DotParser
+      Stack.Options.EvalParser
       Stack.Options.ExecParser
+      Stack.Options.FlagsParser
       Stack.Options.GhcBuildParser
       Stack.Options.GhciParser
       Stack.Options.GhcVariantParser
       Stack.Options.GlobalParser
       Stack.Options.HaddockParser
       Stack.Options.HpcReportParser
+      Stack.Options.IdeParser
+      Stack.Options.InitParser
       Stack.Options.LogLevelParser
+      Stack.Options.LsParser
       Stack.Options.NewParser
       Stack.Options.NixParser
       Stack.Options.PackageParser
-      Stack.Options.ResolverParser
-      Stack.Options.ScriptParser
+      Stack.Options.PackagesParser
+      Stack.Options.PathParser
+      Stack.Options.PvpBoundsParser
       Stack.Options.SDistParser
+      Stack.Options.ScriptParser
+      Stack.Options.SetupParser
+      Stack.Options.SnapshotParser
       Stack.Options.TestParser
+      Stack.Options.UnpackParser
+      Stack.Options.UpgradeParser
       Stack.Options.UploadParser
       Stack.Options.Utils
       Stack.Package
       Stack.PackageDump
+      Stack.PackageFile
       Stack.Path
       Stack.Prelude
+      Stack.Query
       Stack.Runners
       Stack.Script
       Stack.SDist
@@ -194,57 +320,127 @@ library
       Stack.Storage.Project
       Stack.Storage.User
       Stack.Storage.Util
+      Stack.Templates
+      Stack.Types.AddCommand
+      Stack.Types.AllowNewerDeps
+      Stack.Types.ApplyGhcOptions
+      Stack.Types.ApplyProgOptions
       Stack.Types.Build
+      Stack.Types.Build.ConstructPlan
+      Stack.Types.Build.Exception
+      Stack.Types.BuildConfig
+      Stack.Types.BuildOpts
+      Stack.Types.BuildOptsCLI
+      Stack.Types.BuildOptsMonoid
+      Stack.Types.CabalConfigKey
+      Stack.Types.Cache
+      Stack.Types.Casa
+      Stack.Types.ColorWhen
+      Stack.Types.CompCollection
       Stack.Types.CompilerBuild
+      Stack.Types.CompilerPaths
       Stack.Types.Compiler
+      Stack.Types.Component
+      Stack.Types.ComponentUtils
       Stack.Types.Config
-      Stack.Types.Config.Build
+      Stack.Types.ConfigExtra
+      Stack.Types.Config.Exception
+      Stack.Types.ConfigMonoid
+      Stack.Types.ConfigSetOpts
+      Stack.Types.ConfigureOpts
+      Stack.Types.Curator
+      Stack.Types.Dependency
+      Stack.Types.DependencyTree
       Stack.Types.Docker
+      Stack.Types.DockerEntrypoint
+      Stack.Types.DotConfig
+      Stack.Types.DotOpts
+      Stack.Types.DownloadInfo
+      Stack.Types.DumpLogs
+      Stack.Types.DumpPackage
+      Stack.Types.EnvConfig
+      Stack.Types.EnvSettings
+      Stack.Types.ExtraDirs
+      Stack.Types.FileDigestCache
+      Stack.Types.GHCDownloadInfo
+      Stack.Types.GHCVariant
+      Stack.Types.GhcOptionKey
+      Stack.Types.GhcOptions
+      Stack.Types.GhcPkgExe
       Stack.Types.GhcPkgId
+      Stack.Types.GhciOpts
+      Stack.Types.GlobalOpts
+      Stack.Types.GlobalOptsMonoid
+      Stack.Types.HpcReportOpts
+      Stack.Types.IdeOpts
+      Stack.Types.Installed
+      Stack.Types.InterfaceOpt
+      Stack.Types.IsMutable
+      Stack.Types.LockFileBehavior
+      Stack.Types.LsOpts
+      Stack.Types.MsysEnvironment
       Stack.Types.NamedComponent
       Stack.Types.Nix
       Stack.Types.Package
+      Stack.Types.PackageFile
       Stack.Types.PackageName
-      Stack.Types.Resolver
+      Stack.Types.ParentMap
+      Stack.Types.Plan
+      Stack.Types.Platform
+      Stack.Types.Project
+      Stack.Types.ProjectAndConfigMonoid
+      Stack.Types.ProjectConfig
+      Stack.Types.PvpBounds
+      Stack.Types.Runner
+      Stack.Types.SCM
+      Stack.Types.SDistOpts
+      Stack.Types.SetupInfo
+      Stack.Types.SetupOpts
+      Stack.Types.Snapshot
       Stack.Types.SourceMap
+      Stack.Types.StackYamlLoc
+      Stack.Types.Storage
       Stack.Types.TemplateName
+      Stack.Types.UnusedFlags
+      Stack.Types.UpgradeOpts
+      Stack.Types.UploadOpts
       Stack.Types.Version
+      Stack.Types.VersionedDownloadInfo
+      Stack.Types.WantedCompilerSetter
+      Stack.Uninstall
       Stack.Unpack
+      Stack.Update
       Stack.Upgrade
       Stack.Upload
       System.Info.ShortPathName
       System.Permissions
       System.Process.Pager
       System.Terminal
+      Build_stack
       Paths_stack
-  other-modules:
-      Path.Extended
-      Stack.Types.Cache
   autogen-modules:
+      Build_stack
       Paths_stack
   hs-source-dirs:
-      src/
-  ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -fwarn-identities
+      src
+  ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -Widentities
   build-depends:
-      Cabal >=3.6.3.0
+      Cabal >=3.14 && <3.17
     , aeson >=2.0.3.0
-    , annotated-wl-pprint
-    , ansi-terminal
+    , aeson-warning-parser >=0.1.1
+    , ansi-terminal >=1.0.2
     , array
     , async
     , attoparsec
-    , base >=4.14.3.0 && <5
+    , base >=4.16.0.0 && <5
     , base64-bytestring
     , bytestring
-    , casa-client
-    , casa-types
-    , colour
+    , casa-client >=0.0.2
+    , companion
     , conduit
     , conduit-extra
     , containers
-    , cryptonite
-    , cryptonite-conduit
-    , deepseq
+    , crypton
     , directory
     , echo
     , exceptions
@@ -252,65 +448,50 @@ library
     , file-embed
     , filelock
     , filepath
-    , fsnotify <0.4
+    , fsnotify >=0.4.1
     , generic-deriving
-    , hackage-security
+    , ghc-boot
     , hashable
-    , hi-file-parser
-    , hpack
+    , hi-file-parser >=0.1.9.0
+    , hpack >=0.36.0
     , hpc
     , http-client
-    , http-client-tls
+    , http-client-tls >=0.3.6.2
     , http-conduit
-    , http-download
+    , http-download >=0.2.2.0
     , http-types
-    , memory
     , microlens
-    , mintty
-    , mono-traversable
     , mtl
     , mustache
     , neat-interpolation
-    , network-uri
     , open-browser
-    , optparse-applicative >=0.17.0.0
-    , pantry >=0.6.0
-    , path
+    , optparse-applicative >=0.18.1.0
+    , pantry >=0.11.4
+    , path >=0.9.5
     , path-io
-    , persistent >=2.13.3.5 && <2.14
+    , persistent >=2.14.0.0 && <2.19
     , persistent-sqlite
-    , persistent-template
     , pretty
-    , primitive
     , process >=1.6.13.2
     , project-template
+    , ram
     , random
-    , retry
-    , rio >=0.1.22.0
-    , rio-prettyprint >=0.1.1.0
-    , semigroups
+    , rio >=0.1.22.0 && (<0.1.23.0 || >0.1.23.0)
+    , rio-prettyprint >=0.1.8.0
+    , semaphore-compat <2
     , split
     , stm
-    , streaming-commons
-    , tar
+    , tar >=0.6.2.0
     , template-haskell
-    , temporary
     , text
-    , text-metrics
-    , th-reify-many
     , time
-    , tls
     , transformers
-    , typed-process
-    , unicode-transforms
     , unix-compat
-    , unliftio
     , unordered-containers
     , vector
     , yaml
-    , zip-archive
     , zlib
-  default-language: Haskell2010
+  default-language: GHC2024
   if os(windows)
     cpp-options: -DWINDOWS
     build-depends:
@@ -320,55 +501,72 @@ library
         unix
     build-tool-depends:
         hsc2hs:hsc2hs
+  if impl(ghc >= 9.4.5) && os(windows)
+    build-depends:
+        network >=3.1.2.9
   if flag(developer-mode)
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True
   else
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False
+  if flag(disable-stack-upload)
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True
+  else
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False
   if os(windows)
     other-modules:
+        Stack.Build.TestSuiteTimeout
+        Stack.Constants.UsrLibDirs
+        Stack.Docker.Handlers
+        System.Posix.User
         System.Uname
     hs-source-dirs:
         src/windows/
   else
     other-modules:
+        Stack.Build.TestSuiteTimeout
+        Stack.Constants.UsrLibDirs
+        Stack.Docker.Handlers
         System.Uname
     hs-source-dirs:
         src/unix/
     c-sources:
         src/unix/cbits/uname.c
+  if !(flag(disable-git-info))
+    cpp-options: -DUSE_GIT_INFO
+    build-depends:
+        githash
+      , optparse-simple
+  if flag(hide-dependency-versions)
+    cpp-options: -DHIDE_DEP_VERSIONS
+  if flag(supported-build)
+    cpp-options: -DSUPPORTED_BUILD
 
 executable stack
   main-is: Main.hs
   other-modules:
-      BuildInfo
-      Build_stack
       Paths_stack
   autogen-modules:
-      Build_stack
       Paths_stack
   hs-source-dirs:
-      src/main
-  ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -threaded -rtsopts
+      app
+  ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -threaded -rtsopts
   build-depends:
-      Cabal >=3.6.3.0
+      Cabal >=3.14 && <3.17
     , aeson >=2.0.3.0
-    , annotated-wl-pprint
-    , ansi-terminal
+    , aeson-warning-parser >=0.1.1
+    , ansi-terminal >=1.0.2
     , array
     , async
     , attoparsec
-    , base >=4.14.3.0 && <5
+    , base >=4.16.0.0 && <5
     , base64-bytestring
     , bytestring
-    , casa-client
-    , casa-types
-    , colour
+    , casa-client >=0.0.2
+    , companion
     , conduit
     , conduit-extra
     , containers
-    , cryptonite
-    , cryptonite-conduit
-    , deepseq
+    , crypton
     , directory
     , echo
     , exceptions
@@ -376,66 +574,51 @@ executable stack
     , file-embed
     , filelock
     , filepath
-    , fsnotify <0.4
+    , fsnotify >=0.4.1
     , generic-deriving
-    , hackage-security
+    , ghc-boot
     , hashable
-    , hi-file-parser
-    , hpack
+    , hi-file-parser >=0.1.9.0
+    , hpack >=0.36.0
     , hpc
     , http-client
-    , http-client-tls
+    , http-client-tls >=0.3.6.2
     , http-conduit
-    , http-download
+    , http-download >=0.2.2.0
     , http-types
-    , memory
     , microlens
-    , mintty
-    , mono-traversable
     , mtl
     , mustache
     , neat-interpolation
-    , network-uri
     , open-browser
-    , optparse-applicative >=0.17.0.0
-    , pantry >=0.6.0
-    , path
+    , optparse-applicative >=0.18.1.0
+    , pantry >=0.11.4
+    , path >=0.9.5
     , path-io
-    , persistent >=2.13.3.5 && <2.14
+    , persistent >=2.14.0.0 && <2.19
     , persistent-sqlite
-    , persistent-template
     , pretty
-    , primitive
     , process >=1.6.13.2
     , project-template
+    , ram
     , random
-    , retry
-    , rio >=0.1.22.0
-    , rio-prettyprint >=0.1.1.0
-    , semigroups
+    , rio >=0.1.22.0 && (<0.1.23.0 || >0.1.23.0)
+    , rio-prettyprint >=0.1.8.0
+    , semaphore-compat <2
     , split
     , stack
     , stm
-    , streaming-commons
-    , tar
+    , tar >=0.6.2.0
     , template-haskell
-    , temporary
     , text
-    , text-metrics
-    , th-reify-many
     , time
-    , tls
     , transformers
-    , typed-process
-    , unicode-transforms
     , unix-compat
-    , unliftio
     , unordered-containers
     , vector
     , yaml
-    , zip-archive
     , zlib
-  default-language: Haskell2010
+  default-language: GHC2024
   if os(windows)
     cpp-options: -DWINDOWS
     build-depends:
@@ -445,53 +628,49 @@ executable stack
         unix
     build-tool-depends:
         hsc2hs:hsc2hs
+  if impl(ghc >= 9.4.5) && os(windows)
+    build-depends:
+        network >=3.1.2.9
   if flag(developer-mode)
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True
   else
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False
+  if flag(disable-stack-upload)
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True
+  else
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False
   if flag(static)
     ld-options: -static -pthread
-  if !(flag(disable-git-info))
-    cpp-options: -DUSE_GIT_INFO
-    build-depends:
-        githash
-      , optparse-simple
-  if flag(hide-dependency-versions)
-    cpp-options: -DHIDE_DEP_VERSIONS
-  if flag(supported-build)
-    cpp-options: -DSUPPORTED_BUILD
 
 executable stack-integration-test
   main-is: IntegrationSpec.hs
   other-modules:
       StackTest
+      StackTest.Repl
       Paths_stack
   autogen-modules:
       Paths_stack
   hs-source-dirs:
-      test/integration
-      test/integration/lib
-  ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N
+      tests/integration
+      tests/integration/lib
+  ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N
   build-depends:
-      Cabal >=3.6.3.0
+      Cabal >=3.14 && <3.17
     , aeson >=2.0.3.0
-    , annotated-wl-pprint
-    , ansi-terminal
+    , aeson-warning-parser >=0.1.1
+    , ansi-terminal >=1.0.2
     , array
     , async
     , attoparsec
-    , base >=4.14.3.0 && <5
+    , base >=4.16.0.0 && <5
     , base64-bytestring
     , bytestring
-    , casa-client
-    , casa-types
-    , colour
+    , casa-client >=0.0.2
+    , companion
     , conduit
     , conduit-extra
     , containers
-    , cryptonite
-    , cryptonite-conduit
-    , deepseq
+    , crypton
     , directory
     , echo
     , exceptions
@@ -499,67 +678,52 @@ executable stack-integration-test
     , file-embed
     , filelock
     , filepath
-    , fsnotify <0.4
+    , fsnotify >=0.4.1
     , generic-deriving
-    , hackage-security
+    , ghc-boot
     , hashable
-    , hi-file-parser
-    , hpack
+    , hi-file-parser >=0.1.9.0
+    , hpack >=0.36.0
     , hpc
     , hspec
     , http-client
-    , http-client-tls
+    , http-client-tls >=0.3.6.2
     , http-conduit
-    , http-download
+    , http-download >=0.2.2.0
     , http-types
-    , memory
     , microlens
-    , mintty
-    , mono-traversable
     , mtl
     , mustache
     , neat-interpolation
-    , network-uri
     , open-browser
-    , optparse-applicative >=0.17.0.0
+    , optparse-applicative >=0.18.1.0
     , optparse-generic
-    , pantry >=0.6.0
-    , path
+    , pantry >=0.11.4
+    , path >=0.9.5
     , path-io
-    , persistent >=2.13.3.5 && <2.14
+    , persistent >=2.14.0.0 && <2.19
     , persistent-sqlite
-    , persistent-template
     , pretty
-    , primitive
     , process >=1.6.13.2
     , project-template
+    , ram
     , random
-    , retry
-    , rio >=0.1.22.0
-    , rio-prettyprint >=0.1.1.0
-    , semigroups
+    , rio >=0.1.22.0 && (<0.1.23.0 || >0.1.23.0)
+    , rio-prettyprint >=0.1.8.0
+    , semaphore-compat <2
     , split
     , stm
-    , streaming-commons
-    , tar
+    , tar >=0.6.2.0
     , template-haskell
-    , temporary
     , text
-    , text-metrics
-    , th-reify-many
     , time
-    , tls
     , transformers
-    , typed-process
-    , unicode-transforms
     , unix-compat
-    , unliftio
     , unordered-containers
     , vector
     , yaml
-    , zip-archive
     , zlib
-  default-language: Haskell2010
+  default-language: GHC2024
   if os(windows)
     cpp-options: -DWINDOWS
     build-depends:
@@ -569,60 +733,65 @@ executable stack-integration-test
         unix
     build-tool-depends:
         hsc2hs:hsc2hs
+  if impl(ghc >= 9.4.5) && os(windows)
+    build-depends:
+        network >=3.1.2.9
   if flag(developer-mode)
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True
   else
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False
+  if flag(disable-stack-upload)
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True
+  else
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False
   if !(flag(integration-tests))
     buildable: False
   if flag(static)
     ld-options: -static -pthread
 
-test-suite stack-test
+test-suite stack-unit-test
   type: exitcode-stdio-1.0
   main-is: Spec.hs
   other-modules:
       Stack.ArgsSpec
+      Stack.Build.ConstructPlanSpec
       Stack.Build.ExecuteSpec
       Stack.Build.TargetSpec
       Stack.Config.DockerSpec
       Stack.ConfigSpec
       Stack.DotSpec
-      Stack.Ghci.PortableFakePaths
       Stack.Ghci.ScriptSpec
       Stack.GhciSpec
       Stack.LockSpec
       Stack.NixSpec
       Stack.PackageDumpSpec
+      Stack.Types.PlanSpec
       Stack.Types.TemplateNameSpec
       Stack.UploadSpec
       Paths_stack
   autogen-modules:
       Paths_stack
   hs-source-dirs:
-      src/test
-  ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -threaded
+      tests/unit
+  ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -threaded
   build-depends:
-      Cabal >=3.6.3.0
+      Cabal >=3.14 && <3.17
     , QuickCheck
     , aeson >=2.0.3.0
-    , annotated-wl-pprint
-    , ansi-terminal
+    , aeson-warning-parser >=0.1.1
+    , ansi-terminal >=1.0.2
     , array
     , async
     , attoparsec
-    , base >=4.14.3.0 && <5
+    , base >=4.16.0.0 && <5
     , base64-bytestring
     , bytestring
-    , casa-client
-    , casa-types
-    , colour
+    , casa-client >=0.0.2
+    , companion
     , conduit
     , conduit-extra
     , containers
-    , cryptonite
-    , cryptonite-conduit
-    , deepseq
+    , crypton
     , directory
     , echo
     , exceptions
@@ -630,69 +799,53 @@ test-suite stack-test
     , file-embed
     , filelock
     , filepath
-    , fsnotify <0.4
+    , fsnotify >=0.4.1
     , generic-deriving
-    , hackage-security
+    , ghc-boot
     , hashable
-    , hi-file-parser
-    , hpack
+    , hi-file-parser >=0.1.9.0
+    , hpack >=0.36.0
     , hpc
     , hspec
     , http-client
-    , http-client-tls
+    , http-client-tls >=0.3.6.2
     , http-conduit
-    , http-download
+    , http-download >=0.2.2.0
     , http-types
-    , memory
     , microlens
-    , mintty
-    , mono-traversable
     , mtl
     , mustache
     , neat-interpolation
-    , network-uri
     , open-browser
-    , optparse-applicative >=0.17.0.0
-    , pantry >=0.6.0
-    , path
+    , optparse-applicative >=0.18.1.0
+    , pantry >=0.11.4
+    , path >=0.9.5
     , path-io
-    , persistent >=2.13.3.5 && <2.14
+    , persistent >=2.14.0.0 && <2.19
     , persistent-sqlite
-    , persistent-template
     , pretty
-    , primitive
     , process >=1.6.13.2
     , project-template
+    , ram
     , random
     , raw-strings-qq
-    , retry
-    , rio >=0.1.22.0
-    , rio-prettyprint >=0.1.1.0
-    , semigroups
-    , smallcheck
+    , rio >=0.1.22.0 && (<0.1.23.0 || >0.1.23.0)
+    , rio-prettyprint >=0.1.8.0
+    , semaphore-compat <2
     , split
     , stack
     , stm
-    , streaming-commons
-    , tar
+    , tar >=0.6.2.0
     , template-haskell
-    , temporary
     , text
-    , text-metrics
-    , th-reify-many
     , time
-    , tls
     , transformers
-    , typed-process
-    , unicode-transforms
     , unix-compat
-    , unliftio
     , unordered-containers
     , vector
     , yaml
-    , zip-archive
     , zlib
-  default-language: Haskell2010
+  default-language: GHC2024
   if os(windows)
     cpp-options: -DWINDOWS
     build-depends:
@@ -702,9 +855,26 @@ test-suite stack-test
         unix
     build-tool-depends:
         hsc2hs:hsc2hs
+  if impl(ghc >= 9.4.5) && os(windows)
+    build-depends:
+        network >=3.1.2.9
   if flag(developer-mode)
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True
   else
     cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False
+  if flag(disable-stack-upload)
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=True
+  else
+    cpp-options: -DSTACK_DISABLE_STACK_UPLOAD=False
+  if os(windows)
+    other-modules:
+        Stack.Ghci.FakePaths
+    hs-source-dirs:
+        tests/unit/windows/
+  else
+    other-modules:
+        Stack.Ghci.FakePaths
+    hs-source-dirs:
+        tests/unit/unix/
   build-tool-depends:
       hspec-discover:hspec-discover
diff --git a/stack.yaml b/stack.yaml
index 3fd1fc358c..b6055cbd5c 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,37 +1,68 @@
-# GHC 9.2.4
-resolver: nightly-2022-09-05
-
-packages:
-- .
+snapshot: lts-24.55 # GHC 9.10.3
 
 extra-deps:
-- pantry-0.6.0@sha256:c87056df8151441911bece5c09d11738110284dc1eacb292686aa33c4308c8c2,4099
-
-drop-packages:
-# See https://github.com/commercialhaskell/stack/pull/4712
-- cabal-install
+# lts-24.55 specifies Cabal-3.12.1.0
+- Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+- Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+# lts-24.55 specifies crypton-1.0.6
+- crypton-1.1.4@sha256:500174e81f6ad6b4c23a4e773771b934834ab3b953ef544cc6163eb952196c64,15142
+# lts-24.55 excludes crypton-asn1-encoding
+- crypton-asn1-encoding-0.10.0@sha256:45494a1723a047a815d0d620481c1028dca28a4ea5cf2554868687da90753961,2497
+# lts-24.55 excludes crypton-asn1-parse
+- crypton-asn1-parse-0.10.0@sha256:4a2cfc4980957d1a279ef69137ee5f665c247ccd8bb962812d5b071d543893fb,1359
+# lts-24.55 excludes crypton-asn1-types
+- crypton-asn1-types-0.4.1@sha256:02f3ec473011b3da92f7bf738bea19cadf88a6470b25a6cb5042216c7549c912,1326
+# lts-24.55 specifies crypton-conduit-0.2.3
+- crypton-conduit-0.3.0@sha256:20946683890fa9fd2519c6c734039d413888ccd9b64692db9aa390388ea58921,2016
+# lts-24.55 specifies crypton-connection-0.4.5
+- crypton-connection-0.4.6@sha256:a3764a44de9f43b1e9f590009ebbea1401fc3911e3ba41ce4d9b93d9f2a8d22e,1599
+# lts-24.55 specifies crypton-x509-1.7.7
+- crypton-x509-1.9.1@sha256:6ed60424bd0664695db63cfda2052172bf6842b560dfb6f48478448c6f39ec65,2010
+# lts-24.55 specifies crypton-x509-store-1.6.14
+- crypton-x509-store-1.9.0@sha256:9746160b993c24c175e560e27051dfe4616c6413014712776f1297e2ca8bba8a,1700
+# lts-24.55 specifies crypton-x509-system-1.6.8
+- crypton-x509-system-1.9.0@sha256:ccdc92bf98d7693c63dc680ff665b6487a28a701003dbee6695a6dbd38244392,1539
+# lts-24.55 specifies crypton-x509-validation-1.6.14
+- crypton-x509-validation-1.9.1@sha256:7fd1231e0ce13be7bbb95a348da58919174d341572309ff4471e39c3b3f4e68a,2113
+# lts-24.55 specifies hpack-0.38.3
+- hpack-0.39.6@sha256:3dcd46245401aec2239ff63680880f04817635c7df00ee8ebe2bea9b57393891,5263
+# lts-24.55 specifies hpke-0.0.0
+- hpke-0.1.0@sha256:fb107670a0aeb91b4626e0b1dff4e7ec3342e48931cc994938d95af1a23f645d,1801
+# lts-24.55 provides http-client-tls-0.3.6.4
+- http-client-tls-0.4.0@sha256:39fc60a864134946c773953fb96a836cd769b3af6fa03a4bfc547168a15e541d,2117
+# lts-24.55 provides http-download-0.2.1.0
+- http-download-0.2.2.0@sha256:cfe4722fcbad837db43b5758a49b6ea54b9fd475b1825b622e25f96a8406a4d0,1812
+# lts-24.55 excludes mlkem
+- mlkem-0.2.2.0@sha256:c16cb61190e915593767e716dd08957607f6045a01d7c3a1313fbd74eb31c75d,4759
+# lts-24.55 specifies open-browser-0.4.0.0
+- open-browser-0.5.1.0@sha256:0dc8dc33b9bba0e025e444355f6c2d806f62a4656446961c3647165f80f0d278,1959
+# lts-24.55 specifies pantry-0.10.1
+- pantry-0.11.4@sha256:9885d02c58e8725179146352b6d3f57395d3f1337c7713dc1409c61c9c21bb09,7668
+# lts-24.55 specifies persistent-2.17.1.0
+- persistent-2.18.1.0@sha256:6a111b26c3e710f1e080a7543cf93766c4cc53ac560dbaa0d4b7ddc98a2f7b1d,7096
+# lts-24.55 excludes ram
+- ram-0.22.0@sha256:f6ce64a025929eb6ce42deeb80d072960a9ea2d83b9b9b28de668cc2b623127c,2814
+# lts-24.55 provides static-bytes-0.1.1
+- static-bytes-0.2.0@sha256:d61293dd0e810b78716e841462defadefc8698f8cfd59b899bb1b1abe34c4939,1617
+# lts-24.55 excludes time-hourglass
+- time-hourglass-0.3.0@sha256:ee02356fe24919ec43ae17fc0007398c2fd0bbe822833b2d7a9c849537b90580,3114
+# lts-24.55 specifies tls-2.1.8
+- tls-2.4.3@sha256:b69bad4c980463bebe216e3b1f88443884daff19878e2fec45661358abdbe6e8,7391
 
 docker:
   enable: false
-  repo: psibi/alpine-haskell-stack:9.2.4
+  repo: quay.io/benz0li/ghc-musl:9.10.3
+
+# See LICENSE. In order to build a statically-linked Stack executable for Linux
+# that is not linked against GMP, use this alternative Docker image:
+# repo: quay.io/benz0li/ghc-musl:9.10.3-int-native
 
 nix:
   # --nix on the command-line to enable.
   packages:
+  - pkg-config
   - zlib
-  - unzip
 
 flags:
   stack:
     developer-mode: true
-
-ghc-options:
-  "$locals": -fhide-source-paths
-
-user-message: |
-  If building Stack on macOS, you are advised to use stack-macos.yaml as the
-  project-level configuration file, and command:
-
-  stack --stack-yaml stack-macos.yaml build
-
-  See that configuration file for further information.
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 60f297fb25..fe20acc0df 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -1,19 +1,180 @@
 # This file was autogenerated by Stack.
 # You should not edit this file by hand.
 # For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
 
 packages:
 - completed:
-    hackage: pantry-0.6.0@sha256:c87056df8151441911bece5c09d11738110284dc1eacb292686aa33c4308c8c2,4099
+    hackage: Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
     pantry-tree:
-      sha256: a6ed2ac03d6ef3c156bf01390e70751c13cdfbdb2a24f626f5a3024d552f302d
-      size: 2524
+      sha256: b6ac49163659ec305805fc0d2c0564c35fac7132f4c5be6689d0c80a6405ecf0
+      size: 12139
   original:
-    hackage: pantry-0.6.0@sha256:c87056df8151441911bece5c09d11738110284dc1eacb292686aa33c4308c8c2,4099
+    hackage: Cabal-3.16.1.0@sha256:39873317ab895194547c3fd72c91cdb97c800a49b2656920854747ee466627ca,14459
+- completed:
+    hackage: Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+    pantry-tree:
+      sha256: 1db24d3ca877095a7c4f99fda3c58155a33d8041dfe9faa886420c43572330a3
+      size: 11238
+  original:
+    hackage: Cabal-syntax-3.16.1.0@sha256:17cf54d07d7aa65ea24ba4045912b8a8af065f10e429fd1811d43810b313c504,7778
+- completed:
+    hackage: crypton-1.1.4@sha256:500174e81f6ad6b4c23a4e773771b934834ab3b953ef544cc6163eb952196c64,15142
+    pantry-tree:
+      sha256: 5c3b08f14c438643625daf0eb5eb079c3aefc563d55d2886de1683c78ddcc2da
+      size: 23413
+  original:
+    hackage: crypton-1.1.4@sha256:500174e81f6ad6b4c23a4e773771b934834ab3b953ef544cc6163eb952196c64,15142
+- completed:
+    hackage: crypton-asn1-encoding-0.10.0@sha256:45494a1723a047a815d0d620481c1028dca28a4ea5cf2554868687da90753961,2497
+    pantry-tree:
+      sha256: c2ff6c426e6910075a971ee2801d200c8dc0f88cfcb8619534097902e6e655a8
+      size: 1011
+  original:
+    hackage: crypton-asn1-encoding-0.10.0@sha256:45494a1723a047a815d0d620481c1028dca28a4ea5cf2554868687da90753961,2497
+- completed:
+    hackage: crypton-asn1-parse-0.10.0@sha256:4a2cfc4980957d1a279ef69137ee5f665c247ccd8bb962812d5b071d543893fb,1359
+    pantry-tree:
+      sha256: c78bd2c09da1390c124cff07844ddb99778a8cff82df98c5d53b52adb04dfef9
+      size: 326
+  original:
+    hackage: crypton-asn1-parse-0.10.0@sha256:4a2cfc4980957d1a279ef69137ee5f665c247ccd8bb962812d5b071d543893fb,1359
+- completed:
+    hackage: crypton-asn1-types-0.4.1@sha256:02f3ec473011b3da92f7bf738bea19cadf88a6470b25a6cb5042216c7549c912,1326
+    pantry-tree:
+      sha256: 03e810ce724980eacfd49ed816d769ae74769f3941d8cc3c9067de4a896eedf2
+      size: 722
+  original:
+    hackage: crypton-asn1-types-0.4.1@sha256:02f3ec473011b3da92f7bf738bea19cadf88a6470b25a6cb5042216c7549c912,1326
+- completed:
+    hackage: crypton-conduit-0.3.0@sha256:20946683890fa9fd2519c6c734039d413888ccd9b64692db9aa390388ea58921,2016
+    pantry-tree:
+      sha256: 38fce92e00b9c7d7d15cde14ac1dc539465a96fbb624930db535c968cd45b34c
+      size: 592
+  original:
+    hackage: crypton-conduit-0.3.0@sha256:20946683890fa9fd2519c6c734039d413888ccd9b64692db9aa390388ea58921,2016
+- completed:
+    hackage: crypton-connection-0.4.6@sha256:a3764a44de9f43b1e9f590009ebbea1401fc3911e3ba41ce4d9b93d9f2a8d22e,1599
+    pantry-tree:
+      sha256: 87455e2624bb4ee57043d5c64854b07c7d83cf90a69c5f02447dc6bd79a1d82d
+      size: 464
+  original:
+    hackage: crypton-connection-0.4.6@sha256:a3764a44de9f43b1e9f590009ebbea1401fc3911e3ba41ce4d9b93d9f2a8d22e,1599
+- completed:
+    hackage: crypton-x509-1.9.1@sha256:6ed60424bd0664695db63cfda2052172bf6842b560dfb6f48478448c6f39ec65,2010
+    pantry-tree:
+      sha256: 6d22024e664c8d098a4fb3799290c44985de667e16bbf43f2916becea7478dd7
+      size: 1132
+  original:
+    hackage: crypton-x509-1.9.1@sha256:6ed60424bd0664695db63cfda2052172bf6842b560dfb6f48478448c6f39ec65,2010
+- completed:
+    hackage: crypton-x509-store-1.9.0@sha256:9746160b993c24c175e560e27051dfe4616c6413014712776f1297e2ca8bba8a,1700
+    pantry-tree:
+      sha256: 52bdc316b066536be88adc53b141f52e292c074a79d72bf57688cd78fc463871
+      size: 458
+  original:
+    hackage: crypton-x509-store-1.9.0@sha256:9746160b993c24c175e560e27051dfe4616c6413014712776f1297e2ca8bba8a,1700
+- completed:
+    hackage: crypton-x509-system-1.9.0@sha256:ccdc92bf98d7693c63dc680ff665b6487a28a701003dbee6695a6dbd38244392,1539
+    pantry-tree:
+      sha256: ff147d414b88b2ed368ad2d28167ba3126cd180aa2932555563e7a089d807775
+      size: 512
+  original:
+    hackage: crypton-x509-system-1.9.0@sha256:ccdc92bf98d7693c63dc680ff665b6487a28a701003dbee6695a6dbd38244392,1539
+- completed:
+    hackage: crypton-x509-validation-1.9.1@sha256:7fd1231e0ce13be7bbb95a348da58919174d341572309ff4471e39c3b3f4e68a,2113
+    pantry-tree:
+      sha256: 6a558dc57b826114decf8b70b06fb72170a5cbba1716cbb0aae6b7d25ecd80f4
+      size: 691
+  original:
+    hackage: crypton-x509-validation-1.9.1@sha256:7fd1231e0ce13be7bbb95a348da58919174d341572309ff4471e39c3b3f4e68a,2113
+- completed:
+    hackage: hpack-0.39.6@sha256:3dcd46245401aec2239ff63680880f04817635c7df00ee8ebe2bea9b57393891,5263
+    pantry-tree:
+      sha256: c8839695b53b682930d9a359357d1c6b7ded84a1e16d5b75ab7c77c99c3561f8
+      size: 3799
+  original:
+    hackage: hpack-0.39.6@sha256:3dcd46245401aec2239ff63680880f04817635c7df00ee8ebe2bea9b57393891,5263
+- completed:
+    hackage: hpke-0.1.0@sha256:fb107670a0aeb91b4626e0b1dff4e7ec3342e48931cc994938d95af1a23f645d,1801
+    pantry-tree:
+      sha256: 9bb04f6d3456c81ac18fa50815c128cef8f86b5676f08af4037930e0fbd7cf76
+      size: 1320
+  original:
+    hackage: hpke-0.1.0@sha256:fb107670a0aeb91b4626e0b1dff4e7ec3342e48931cc994938d95af1a23f645d,1801
+- completed:
+    hackage: http-client-tls-0.4.0@sha256:39fc60a864134946c773953fb96a836cd769b3af6fa03a4bfc547168a15e541d,2117
+    pantry-tree:
+      sha256: bd70a8c19ffb88ba8b26f803e4dcf6af24010f14321be26ff764bb6f236ce2e5
+      size: 435
+  original:
+    hackage: http-client-tls-0.4.0@sha256:39fc60a864134946c773953fb96a836cd769b3af6fa03a4bfc547168a15e541d,2117
+- completed:
+    hackage: http-download-0.2.2.0@sha256:cfe4722fcbad837db43b5758a49b6ea54b9fd475b1825b622e25f96a8406a4d0,1812
+    pantry-tree:
+      sha256: 24abfb5cdd8d359cd58a084e67b394418f58f48940e66dfbeedfb62e839522ab
+      size: 393
+  original:
+    hackage: http-download-0.2.2.0@sha256:cfe4722fcbad837db43b5758a49b6ea54b9fd475b1825b622e25f96a8406a4d0,1812
+- completed:
+    hackage: mlkem-0.2.2.0@sha256:c16cb61190e915593767e716dd08957607f6045a01d7c3a1313fbd74eb31c75d,4759
+    pantry-tree:
+      sha256: 298f091aa073627626cea668774160a8af1b42771d4f00069a60239f4704d465
+      size: 1777
+  original:
+    hackage: mlkem-0.2.2.0@sha256:c16cb61190e915593767e716dd08957607f6045a01d7c3a1313fbd74eb31c75d,4759
+- completed:
+    hackage: open-browser-0.5.1.0@sha256:0dc8dc33b9bba0e025e444355f6c2d806f62a4656446961c3647165f80f0d278,1959
+    pantry-tree:
+      sha256: 394f3f9827acccd1522a46a34a42f4dee79859947869063632fa84cee95950d8
+      size: 673
+  original:
+    hackage: open-browser-0.5.1.0@sha256:0dc8dc33b9bba0e025e444355f6c2d806f62a4656446961c3647165f80f0d278,1959
+- completed:
+    hackage: pantry-0.11.4@sha256:9885d02c58e8725179146352b6d3f57395d3f1337c7713dc1409c61c9c21bb09,7668
+    pantry-tree:
+      sha256: cafafe0eb53f80194e20b7332db8e306c9eb949193f17cd48a71a79c8a3c30d2
+      size: 2722
+  original:
+    hackage: pantry-0.11.4@sha256:9885d02c58e8725179146352b6d3f57395d3f1337c7713dc1409c61c9c21bb09,7668
+- completed:
+    hackage: persistent-2.18.1.0@sha256:6a111b26c3e710f1e080a7543cf93766c4cc53ac560dbaa0d4b7ddc98a2f7b1d,7096
+    pantry-tree:
+      sha256: bddc723b5069ed2dbf2eee6e01f8eaac00e324eee3520c32ced3044072372172
+      size: 7184
+  original:
+    hackage: persistent-2.18.1.0@sha256:6a111b26c3e710f1e080a7543cf93766c4cc53ac560dbaa0d4b7ddc98a2f7b1d,7096
+- completed:
+    hackage: ram-0.22.0@sha256:f6ce64a025929eb6ce42deeb80d072960a9ea2d83b9b9b28de668cc2b623127c,2814
+    pantry-tree:
+      sha256: 701a4505989d85ba17aabe4695bc63eabffbbb61fc6af195c63e526d77181f83
+      size: 2285
+  original:
+    hackage: ram-0.22.0@sha256:f6ce64a025929eb6ce42deeb80d072960a9ea2d83b9b9b28de668cc2b623127c,2814
+- completed:
+    hackage: static-bytes-0.2.0@sha256:d61293dd0e810b78716e841462defadefc8698f8cfd59b899bb1b1abe34c4939,1617
+    pantry-tree:
+      sha256: 99bbd86dfc2448f01a1cd3c50d570b489da25c8485ff0801c0996f9e53c059aa
+      size: 440
+  original:
+    hackage: static-bytes-0.2.0@sha256:d61293dd0e810b78716e841462defadefc8698f8cfd59b899bb1b1abe34c4939,1617
+- completed:
+    hackage: time-hourglass-0.3.0@sha256:ee02356fe24919ec43ae17fc0007398c2fd0bbe822833b2d7a9c849537b90580,3114
+    pantry-tree:
+      sha256: 7d6acc1a643fe8692d1858c96cc04a417b8da53e53b6bdba6fe0ce6aa6aba774
+      size: 1594
+  original:
+    hackage: time-hourglass-0.3.0@sha256:ee02356fe24919ec43ae17fc0007398c2fd0bbe822833b2d7a9c849537b90580,3114
+- completed:
+    hackage: tls-2.4.3@sha256:b69bad4c980463bebe216e3b1f88443884daff19878e2fec45661358abdbe6e8,7391
+    pantry-tree:
+      sha256: 931c12273944f13ba91c9043630bf43d6653949154ffbc081f4e3bf3311c76f7
+      size: 7127
+  original:
+    hackage: tls-2.4.3@sha256:b69bad4c980463bebe216e3b1f88443884daff19878e2fec45661358abdbe6e8,7391
 snapshots:
 - completed:
-    sha256: 1c049df0b264500e22262aa42a6f0a81cddd639cfd04f55c4acb0359f282dab2
-    size: 633665
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/9/5.yaml
-  original: nightly-2022-09-05
+    sha256: 1c2140555bdf61c30a893b3ec1033987d01eda75ce82a1dda033e8fb6f8b322c
+    size: 732456
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/55.yaml
+  original: lts-24.55
diff --git a/test/integration/IntegrationSpec.hs b/test/integration/IntegrationSpec.hs
deleted file mode 100644
index 0eabeaa89f..0000000000
--- a/test/integration/IntegrationSpec.hs
+++ /dev/null
@@ -1,256 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE BangPatterns        #-}
-{-# LANGUAGE DeriveGeneric       #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE RankNTypes          #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-import           Conduit
-import           Data.List                (stripPrefix)
-import           Options.Generic
-import           RIO
-import           RIO.Char                 (toLower)
-import           RIO.Directory            hiding (findExecutable)
-import           RIO.FilePath
-import           RIO.List                 (isInfixOf, partition)
-import qualified RIO.Map                  as Map
-import           RIO.Process
-import qualified RIO.Set                  as Set
-import qualified RIO.Text                 as T
-import           System.Environment       (lookupEnv, getExecutablePath)
-import           System.Info (os)
-import           System.PosixCompat.Files
-
--- This code does not use a test framework so that we get direct
--- control of how the output is displayed.
-
-main :: IO ()
-main = runSimpleApp $ do
-  logInfo "Initiating Stack integration test running"
-
-  options <- getRecord "Stack integration tests"
-  results <- runApp options $ do
-    logInfo "Running with the following environment"
-    proc "env" [] runProcess_
-    tests <- asks appTestDirs
-    let count = Set.size tests
-        loop !idx rest !accum =
-          case rest of
-            [] -> pure accum
-            next:rest' -> do
-              logInfo $ "Running integration test "
-                     <> display idx
-                     <> "/"
-                     <> display count
-                     <> ": "
-                     <> fromString (takeFileName next)
-              res <- test next
-              loop (idx + 1) rest' (res <> accum)
-
-    loop (1 :: Int) (Set.toList tests) mempty
-
-  let (successes, failures) = partition ((== ExitSuccess) . snd)
-                            $ Map.toList results
-
-  unless (null successes) $ do
-    logInfo "Successful tests:"
-    for_ successes $ \(x, _) -> logInfo $ "- " <> display x
-    logInfo ""
-
-  if null failures
-    then logInfo "No failures!"
-    else do
-      logInfo "Failed tests:"
-      for_ failures $ \(x, ec) -> logInfo $ "- " <> display x <> " - " <> displayShow ec
-      exitFailure
-
-data Options = Options
-  { optSpeed :: Maybe Speed
-  , optMatch :: Maybe String
-  } deriving Generic
-
-instance ParseRecord Options where
-  parseRecord = parseRecordWithModifiers modifiers
-    where
-      optName = map toLower . drop 3
-      modifiers = defaultModifiers { fieldNameModifier = optName
-                                   , shortNameModifier = firstLetter . optName
-                                   }
-
-data Speed = Fast | Normal | Superslow
-  deriving (Read, Generic)
-
-instance ParseField Speed
-
-exeExt :: String
-exeExt = if isWindows then ".exe" else ""
-
-isWindows :: Bool
-isWindows = os == "mingw32"
-
-runApp :: Options -> RIO App a -> RIO SimpleApp a
-runApp options inner = do
-  let speed = fromMaybe Normal $ optSpeed options
-  simpleApp <- ask
-  runghc <- findExecutable "runghc" >>= either throwIO pure
-  srcDir <- canonicalizePath ""
-  testsRoot <- canonicalizePath $ srcDir </> "test/integration"
-  libdir <- canonicalizePath $ testsRoot </> "lib"
-  myPath <- liftIO getExecutablePath
-
-  stack <- canonicalizePath $ takeDirectory myPath </> "stack" ++ exeExt
-  logInfo $ "Using Stack located at " <> fromString stack
-  proc stack ["--version"] runProcess_
-  logInfo $ "Using runghc located at " <> fromString runghc
-  proc runghc ["--version"] runProcess_
-
-  let matchTest = case optMatch options of
-        Nothing -> const True
-        Just str -> (str `isInfixOf`)
-  testDirs
-    <- runConduitRes
-     $ sourceDirectory (testsRoot </> "tests")
-    .| filterMC (liftIO . hasTest)
-    .| filterC matchTest
-    .| foldMapC Set.singleton
-
-  let modifyEnvCommon
-        = Map.insert "SRC_DIR" (fromString srcDir)
-        . Map.insert "STACK_EXE" (fromString stack)
-        . Map.delete "GHC_PACKAGE_PATH"
-        . Map.insert "STACK_TEST_SPEED"
-            (case speed of
-              Superslow -> "SUPERSLOW"
-              _ -> "NORMAL")
-        . Map.fromList
-        . map (first T.toUpper)
-        . Map.toList
-
-  case speed of
-    Fast -> do
-      let app = App
-            { appSimpleApp = simpleApp
-            , appRunghc = runghc
-            , appLibDir = libdir
-            , appSetupHome = id
-            , appTestDirs = testDirs
-            }
-      runRIO app $ withModifyEnvVars modifyEnvCommon inner
-    _ -> do
-      morigStackRoot <- liftIO $ lookupEnv "STACK_ROOT"
-      origStackRoot <-
-        case morigStackRoot of
-          Nothing -> getAppUserDataDirectory "stack"
-          Just x -> pure x
-
-      logInfo "Initializing/updating the original Pantry store"
-      proc stack ["update"] runProcess_
-
-      pantryRoot <- canonicalizePath $ origStackRoot </> "pantry"
-      let modifyEnv
-               = Map.insert "PANTRY_ROOT" (fromString pantryRoot)
-               . modifyEnvCommon
-
-          app = App
-            { appSimpleApp = simpleApp
-            , appRunghc = runghc
-            , appLibDir = libdir
-            , appSetupHome = \inner' -> withSystemTempDirectory "home" $ \newHome -> do
-                let newStackRoot = newHome </> ".stack"
-                createDirectoryIfMissing True newStackRoot
-                let modifyEnv'
-                      = Map.insert "HOME" (fromString newHome)
-                      . Map.insert "APPDATA" (fromString newHome)
-                      . Map.insert "STACK_ROOT" (fromString newStackRoot)
-                writeFileBinary (newStackRoot </> "config.yaml") "system-ghc: true\ninstall-ghc: false\n"
-                withModifyEnvVars modifyEnv' inner'
-            , appTestDirs = testDirs
-            }
-
-      runRIO app $ withModifyEnvVars modifyEnv inner
-
-
-hasTest :: FilePath -> IO Bool
-hasTest dir = doesFileExist $ dir </> "Main.hs"
-
-data App = App
-  { appRunghc :: !FilePath
-  , appLibDir :: !FilePath
-  , appSetupHome :: !(forall a. RIO App a -> RIO App a)
-  , appSimpleApp :: !SimpleApp
-  , appTestDirs :: !(Set FilePath)
-  }
-simpleAppL :: Lens' App SimpleApp
-simpleAppL = lens appSimpleApp (\x y -> x { appSimpleApp = y })
-instance HasLogFunc App where
-  logFuncL = simpleAppL.logFuncL
-instance HasProcessContext App where
-  processContextL = simpleAppL.processContextL
-
--- | Call 'appSetupHome' on the inner action
-withHome :: RIO App a -> RIO App a
-withHome inner = do
-  app <- ask
-  appSetupHome app inner
-
-test :: FilePath -- ^ test dir
-     -> RIO App (Map Text ExitCode)
-test testDir = withDir $ \dir -> withHome $ do
-    runghc <- asks appRunghc
-    libDir <- asks appLibDir
-    let mainFile = testDir </> "Main.hs"
-
-    copyTree (testDir </> "files") dir
-
-    withSystemTempFile (name <.> "log") $ \logfp logh -> do
-      ec <- withWorkingDir dir
-          $ withModifyEnvVars (Map.insert "TEST_DIR" $ fromString testDir)
-          $ proc runghc
-              [ "-clear-package-db"
-              , "-global-package-db"
-              , "-i" ++ libDir
-              , mainFile
-              ]
-           $ runProcess
-           . setStdin closed
-           . setStdout (useHandleOpen logh)
-           . setStderr (useHandleOpen logh)
-      hClose logh
-
-      case ec of
-        ExitSuccess -> logInfo "Success!"
-        _ -> do
-          logError "Failure, dumping log\n\n"
-          withSourceFile logfp $ \src ->
-            runConduit $ src .| stderrC
-          logError $ "\n\nEnd of log for " <> fromString name
-      pure $ Map.singleton (fromString name) ec
-  where
-    name = takeFileName testDir
-    withDir = withSystemTempDirectory ("stack-integration-" ++ name)
-
-copyTree :: MonadIO m => FilePath -> FilePath -> m ()
-copyTree src dst =
-    liftIO $
-    runResourceT (sourceDirectoryDeep False src `connect` mapM_C go)
-        `catch` \(_ :: IOException) -> pure ()
-  where
-    go srcfp = liftIO $ do
-        Just suffix <- pure $ stripPrefix src srcfp
-        let dstfp = dst </> stripHeadSeparator suffix
-        createDirectoryIfMissing True $ takeDirectory dstfp
-        -- copying yaml files so lock files won't get created in
-        -- the source directory
-        if takeFileName srcfp /= "package.yaml" &&
-           (takeExtensions srcfp == ".yaml" || takeExtensions srcfp == ".yml")
-          then
-            copyFile srcfp dstfp
-          else
-            createSymbolicLink srcfp dstfp `catch` \(_ :: IOException) ->
-                copyFile srcfp dstfp -- for Windows
-
-    stripHeadSeparator :: FilePath -> FilePath
-    stripHeadSeparator [] = []
-    stripHeadSeparator fp@(x:xs) = if isPathSeparator x
-                                   then xs
-                                   else fp
diff --git a/test/integration/README.md b/test/integration/README.md
deleted file mode 100644
index 1b9b28b0cb..0000000000
--- a/test/integration/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Stack Integration Tests
-
-This directory contains a bunch of integration tests for Stack. Each
-directory inside the `tests` subdirectory represents a single
-test. Each of those directories has:
-
-* A `Main.hs` file, which provides the script to be run
-* A `files `directory, providing the working directory the script will
-  be run from. (If you have a test that doesn't require any specific
-  working directory, there may be no `files` directory.)
-
-It would be great to expand this file into a full tutorial, but for
-now, the easiest way to get started with writing an integration test
-is to copy an existing example.
-
-## Running
-
-One simple way to run a single test is:
-
-* Change into the `files` directory
-* Run the command `stack runghc -- -i../../../lib ../Main.hs`
-
-A more thorough way to run the tests is with command:
-
-~~~text
-stack build --flag stack:integration-tests stack --exec stack-integration-test
-~~~
-
-Note that this command can take a _long_ time. It's also more thorough
-than the quick command given above, as it will run each test with a
-clean `STACK_ROOT`.
-
-## Helper scripts
-
-There are two helper scripts in this directory. Note that these may
-not always work as anticipated, since some of the tests expect a clean
-`STACK_ROOT`, and these scripts do not set that up.
-
-* `run-sort-tests.sh` will run all of the tests in the `tests`
-  directory, and move the successful ones into `tests-success`, and
-  the failing ones into `tests-fail`. It will keep the logs of failing
-  tests in `logs`.
-* `run-single-test.sh` takes a single argument (the name of a test),
-  and runs just that test.
diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs
deleted file mode 100644
index bdceabf1ff..0000000000
--- a/test/integration/lib/StackTest.hs
+++ /dev/null
@@ -1,324 +0,0 @@
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module StackTest where
-
-import Control.Monad
-import Control.Monad.IO.Class
-import Control.Monad.Trans.Reader
-import Control.Concurrent
-import Control.Exception
-import Data.Maybe (fromMaybe)
-import System.Environment
-import System.Directory
-import System.IO
-import System.IO.Error
-import System.Process
-import System.Exit
-import System.Info (arch, os)
-import GHC.Stack (HasCallStack)
-
-run' :: HasCallStack => FilePath -> [String] -> IO ExitCode
-run' cmd args = do
-    logInfo $ "Running: " ++ cmd ++ " " ++ unwords (map showProcessArgDebug args)
-    (Nothing, Nothing, Nothing, ph) <- createProcess (proc cmd args)
-    waitForProcess ph
-
-run :: HasCallStack => FilePath -> [String] -> IO ()
-run cmd args = do
-    ec <- run' cmd args
-    unless (ec == ExitSuccess) $ error $ "Exited with exit code: " ++ show ec
-
-runShell :: HasCallStack => String -> IO ()
-runShell cmd = do
-    logInfo $ "Running: " ++ cmd
-    (Nothing, Nothing, Nothing, ph) <- createProcess (shell cmd)
-    ec <- waitForProcess ph
-    unless (ec == ExitSuccess) $ error $ "Exited with exit code: " ++ show ec
-
-runWithCwd :: HasCallStack => FilePath -> String -> [String] -> IO String
-runWithCwd cwdPath cmd args = do
-    logInfo $ "Running: " ++ cmd
-    let cp = proc cmd args
-    (ec, stdoutStr, _) <- readCreateProcessWithExitCode (cp { cwd = Just cwdPath }) ""
-    unless (ec == ExitSuccess) $ error $ "Exited with exit code: " ++ show ec
-    pure stdoutStr
-
-stackExe :: IO String
-stackExe = getEnv "STACK_EXE"
-
-stackSrc :: IO String
-stackSrc = getEnv "SRC_DIR"
-
-testDir :: IO String
-testDir = getEnv "TEST_DIR"
-
-stack' :: HasCallStack => [String] -> IO ExitCode
-stack' args = do
-    stackEnv <- stackExe
-    run' stackEnv args
-
-stack :: HasCallStack => [String] -> IO ()
-stack args = do
-    ec <- stack' args
-    unless (ec == ExitSuccess) $ error $ "Exited with exit code: " ++ show ec
-
--- Temporary workaround for Windows to ignore exceptions arising out
--- of Windows when we do stack clean. More info here: https://github.com/commercialhaskell/stack/issues/4936
-stackCleanFull :: HasCallStack => IO ()
-stackCleanFull = stackIgnoreException ["clean", "--full"]
-
--- Temporary workaround for Windows to ignore exceptions arising out
--- of Windows when we do stack clean. More info here: https://github.com/commercialhaskell/stack/issues/4936
-stackIgnoreException :: HasCallStack => [String] -> IO ()
-stackIgnoreException args = if isWindows
-                            then void (stack' args) `catch` (\(_e :: IOException) -> pure ())
-                            else stack args
-
-stackErr :: HasCallStack => [String] -> IO ()
-stackErr args = do
-    ec <- stack' args
-    when (ec == ExitSuccess) $ error "stack was supposed to fail, but didn't"
-
-type Repl = ReaderT ReplConnection IO
-
-data ReplConnection
-  = ReplConnection
-    { replStdin  :: Handle
-    , replStdout :: Handle
-    }
-
-nextPrompt :: Repl ()
-nextPrompt = do
-    (ReplConnection _ inputHandle) <- ask
-    c <- liftIO $ hGetChar inputHandle
-    if c == '>'
-      then do _ <- liftIO $ hGetChar inputHandle
-              pure ()
-      else nextPrompt
-
-replCommand :: String -> Repl ()
-replCommand cmd = do
-    (ReplConnection input _) <- ask
-    liftIO $ hPutStrLn input cmd
-
-replGetLine :: Repl String
-replGetLine = ask >>= liftIO . hGetLine . replStdout
-
-replGetChar :: Repl Char
-replGetChar = ask >>= liftIO . hGetChar . replStdout
-
-runRepl :: HasCallStack => FilePath -> [String] -> ReaderT ReplConnection IO () -> IO ExitCode
-runRepl cmd args actions = do
-    logInfo $ "Running: " ++ cmd ++ " " ++ unwords (map showProcessArgDebug args)
-    (Just rStdin, Just rStdout, Just rStderr, ph) <-
-        createProcess (proc cmd args)
-        { std_in = CreatePipe
-        , std_out = CreatePipe
-        , std_err = CreatePipe
-        }
-    hSetBuffering rStdin NoBuffering
-    hSetBuffering rStdout NoBuffering
-    hSetBuffering rStderr NoBuffering
-
-    tempDir <- if isWindows
-                    then fromMaybe "" <$> lookupEnv "TEMP"
-                    else pure "/tmp"
-    let tempFP = tempDir ++ "/stderr"
-
-    _ <- forkIO $ withFile tempFP WriteMode
-        $ \err -> do
-            hSetBuffering err NoBuffering
-            forever $ catch (hGetChar rStderr >>= hPutChar err)
-                    $ \e -> unless (isEOFError e) $ throw e
-
-    runReaderT (nextPrompt >> actions) (ReplConnection rStdin rStdout)
-    waitForProcess ph
-
-repl :: HasCallStack => [String] -> Repl () -> IO ()
-repl args action = do
-    stackExe' <- stackExe
-    ec <- runRepl stackExe' ("repl":args) action
-    unless (ec == ExitSuccess) $ pure ()
-        -- TODO: Understand why the exit code is 1 despite running GHCi tests
-        -- successfully.
-        -- else error $ "Exited with exit code: " ++ show ec
-
-stackStderr :: HasCallStack => [String] -> IO (ExitCode, String)
-stackStderr args = do
-    stackExe' <- stackExe
-    logInfo $ "Running: " ++ stackExe' ++ " " ++ unwords (map showProcessArgDebug args)
-    (ec, _, err) <- readProcessWithExitCode stackExe' args ""
-    hPutStr stderr err
-    pure (ec, err)
-
--- | Run stack with arguments and apply a check to the resulting
--- stderr output if the process succeeded.
-stackCheckStderr :: HasCallStack => [String] -> (String -> IO ()) -> IO ()
-stackCheckStderr args check = do
-    (ec, err) <- stackStderr args
-    if ec /= ExitSuccess
-        then error $ "Exited with exit code: " ++ show ec
-        else check err
-
--- | Same as 'stackCheckStderr', but ensures that the Stack process
--- fails.
-stackErrStderr :: HasCallStack => [String] -> (String -> IO ()) -> IO ()
-stackErrStderr args check = do
-    (ec, err) <- stackStderr args
-    if ec == ExitSuccess
-        then error "Stack process succeeded, but it shouldn't"
-        else check err
-
-runEx :: HasCallStack => FilePath -> String -> IO (ExitCode, String, String)
-runEx cmd args = runEx' cmd $ words args
-
-runEx' :: HasCallStack => FilePath -> [String] -> IO (ExitCode, String, String)
-runEx' cmd args = do
-    logInfo $ "Running: " ++ cmd ++ " " ++ unwords (map showProcessArgDebug args)
-    (ec, out, err) <- readProcessWithExitCode cmd args ""
-    putStr out
-    hPutStr stderr err
-    pure (ec, out, err)
-
--- | Run stack with arguments and apply a check to the resulting
--- stdout output if the process succeeded.
---
--- Take care with newlines; if the output includes a newline character that
--- should not be there, use 'Data.List.Extra.trimEnd' to remove it.
-stackCheckStdout :: HasCallStack => [String] -> (String -> IO ()) -> IO ()
-stackCheckStdout args check = do
-    stackExe' <- stackExe
-    (ec, out, _) <- runEx' stackExe' args
-    if ec /= ExitSuccess
-        then error $ "Exited with exit code: " ++ show ec
-        else check out
-
-doesNotExist :: HasCallStack => FilePath -> IO ()
-doesNotExist fp = do
-    logInfo $ "doesNotExist " ++ fp
-    exists <- doesFileOrDirExist fp
-    case exists of
-      (Right msg) -> error msg
-      (Left _) -> pure ()
-
-doesExist :: HasCallStack => FilePath -> IO ()
-doesExist fp = do
-    logInfo $ "doesExist " ++ fp
-    exists <- doesFileOrDirExist fp
-    case exists of
-      (Right _) -> pure ()
-      (Left _) -> error "No file or directory exists"
-
-doesFileOrDirExist :: HasCallStack => FilePath -> IO (Either () String)
-doesFileOrDirExist fp = do
-    isFile <- doesFileExist fp
-    if isFile
-        then pure (Right ("File exists: " ++ fp))
-        else do
-            isDir <- doesDirectoryExist fp
-            if isDir
-                then pure (Right ("Directory exists: " ++ fp))
-                else pure (Left ())
-
-copy :: HasCallStack => FilePath -> FilePath -> IO ()
-copy src dest = do
-    logInfo ("Copy " ++ show src ++ " to " ++ show dest)
-    System.Directory.copyFile src dest
-
-fileContentsMatch :: HasCallStack => FilePath -> FilePath -> IO ()
-fileContentsMatch f1 f2 = do
-    doesExist f1
-    doesExist f2
-    f1Contents <- readFile f1
-    f2Contents <- readFile f2
-    unless (f1Contents == f2Contents) $
-        error ("contents do not match for " ++ show f1 ++ " " ++ show f2)
-
-logInfo :: String -> IO ()
-logInfo = hPutStrLn stderr
-
--- TODO: use Stack's process running utilities?  (better logging)
--- for now just copy+modifying this one from System.Process.Log
-
--- | Show a process arg including speechmarks when necessary. Just for
--- debugging purposes, not functionally important.
-showProcessArgDebug :: String -> String
-showProcessArgDebug x
-    | any special x = show x
-    | otherwise = x
-  where special '"' = True
-        special ' ' = True
-        special _ = False
-
--- | Extension of executables
-exeExt :: String
-exeExt = if isWindows then ".exe" else ""
-
--- | Is the OS Windows?
-isWindows :: Bool
-isWindows = os == "mingw32"
-
-isLinux :: Bool
-isLinux = os == "linux"
-
--- | Is the OS Alpine Linux?
-getIsAlpine :: IO Bool
-getIsAlpine = doesFileExist "/etc/alpine-release"
-
--- | Is the architecture ARM?
-isARM :: Bool
-isARM = arch == "arm"
-
--- | Is the OS Mac OS X?
-isMacOSX :: Bool
-isMacOSX = os == "darwin"
-
--- | To avoid problems with GHC version mismatch when a new LTS major
--- version is released, pass this argument to @stack@ when running in
--- a global context. The LTS major version here should match that of
--- the main @stack.yaml@.
---
-defaultResolverArg :: String
-defaultResolverArg = "--resolver=nightly-2022-09-05"
-
--- | Remove a file and ignore any warnings about missing files.
-removeFileIgnore :: HasCallStack => FilePath -> IO ()
-removeFileIgnore fp = removeFile fp `catch` \e ->
-  if isDoesNotExistError e
-    then pure ()
-    else throwIO e
-
--- | Remove a directory and ignore any warnings about missing files.
-removeDirIgnore :: HasCallStack => FilePath -> IO ()
-removeDirIgnore fp = removeDirectoryRecursive fp `catch` \e ->
-  if isDoesNotExistError e
-    then pure ()
-    else throwIO e
-
--- | Changes to the specified working directory.
-withCwd :: HasCallStack => FilePath -> IO () -> IO ()
-withCwd dir action = do
-  currentDirectory <- getCurrentDirectory
-  let enterDir = setCurrentDirectory dir
-      exitDir = setCurrentDirectory currentDirectory
-  bracket_ enterDir exitDir action
-
--- | Changes working directory to Stack source directory.
-withSourceDirectory :: HasCallStack => IO () -> IO ()
-withSourceDirectory action = do
-  dir <- stackSrc
-  withCwd dir action
-
--- | Mark a test as superslow, only to be run when explicitly requested.
-superslow :: HasCallStack => IO () -> IO ()
-superslow inner = do
-  mres <- lookupEnv "STACK_TEST_SPEED"
-  case mres of
-    Just "NORMAL" -> logInfo "Skipping superslow test"
-    Just "SUPERSLOW" -> do
-      logInfo "Running superslow test, hold on to your butts"
-      inner
-    Nothing -> do
-      logInfo "No STACK_TEST_SPEED specified. Executing superslow test, hold on to your butts"
-      inner
-    Just x -> error $ "Invalid value for STACK_TEST_SPEED env var: " ++ show x
diff --git a/test/integration/tests/111-custom-snapshot/Main.hs b/test/integration/tests/111-custom-snapshot/Main.hs
deleted file mode 100644
index e61b083aa4..0000000000
--- a/test/integration/tests/111-custom-snapshot/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stack ["build"]
diff --git a/test/integration/tests/111-custom-snapshot/files/files.cabal b/test/integration/tests/111-custom-snapshot/files/files.cabal
deleted file mode 100644
index 66525ce056..0000000000
--- a/test/integration/tests/111-custom-snapshot/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5, mtl
-  default-language:    Haskell2010
diff --git a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml b/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml
deleted file mode 100644
index 3fe8764af0..0000000000
--- a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-compiler: ghc-9.2.4
-name: my-snapshot
-packages:
-- mtl-2.2.1
diff --git a/test/integration/tests/111-custom-snapshot/files/src/Lib.hs b/test/integration/tests/111-custom-snapshot/files/src/Lib.hs
deleted file mode 100644
index 4844564d1b..0000000000
--- a/test/integration/tests/111-custom-snapshot/files/src/Lib.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-import Control.Monad.Reader ()
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/111-custom-snapshot/files/stack.yaml b/test/integration/tests/111-custom-snapshot/files/stack.yaml
deleted file mode 100644
index 6ae11d4e7a..0000000000
--- a/test/integration/tests/111-custom-snapshot/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: my-snapshot.yaml
diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/Main.hs b/test/integration/tests/1198-multiple-exes-with-same-name/Main.hs
deleted file mode 100644
index 4e8344263d..0000000000
--- a/test/integration/tests/1198-multiple-exes-with-same-name/Main.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-import Control.Monad (unless,when)
-import Data.List (isInfixOf)
-import StackTest
-
-main :: IO ()
-main = do
-    stack [defaultResolverArg, "clean"]
-    stack [defaultResolverArg, "init", "--force"]
-    stackCheckStderr
-        ["build", "also-has-exe-foo", "has-exe-foo"]
-        (expectMessage buildMessage1)
-    stackCheckStderr
-        ["build", "has-exe-foo-too"]
-        (expectMessage buildMessage2)
-
-expectMessage :: String -> String -> IO ()
-expectMessage msg stderr =
-    unless (msg `isInfixOf` stderr)
-        (error $ "Expected a warning: \n" ++ show msg)
-
-buildMessage1 =
-    unlines
-        [ "Building several executables with the same name: 'also-has-exe-foo:foo', 'has-exe-foo:foo'."
-        , "Only one of them will be available via 'stack exec' or locally installed."
-        , "Other executables with the same name might be overwritten: 'has-exe-foo-too:foo'."
-        ]
-
-buildMessage2 =
-    unlines
-        [ "Building executable 'has-exe-foo-too:foo'."
-        , "Other executables with the same name might be overwritten: 'also-has-exe-foo:foo', 'has-exe-foo:foo'."
-        ]
diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/also-has-exe-foo.cabal b/test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/also-has-exe-foo.cabal
deleted file mode 100644
index 97d9c1fd90..0000000000
--- a/test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/also-has-exe-foo.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
-name:                also-has-exe-foo
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-executable foo
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/app/Main.hs b/test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/app/Main.hs
deleted file mode 100644
index ed0f47faf7..0000000000
--- a/test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/app/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Main where
-
-main :: IO ()
-main = putStrLn "This is foo from also-has-exe-foo"
diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/app/Main.hs b/test/integration/tests/1198-multiple-exes-with-same-name/files/app/Main.hs
deleted file mode 100644
index d62e2f2117..0000000000
--- a/test/integration/tests/1198-multiple-exes-with-same-name/files/app/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Main where
-
-main :: IO ()
-main = putStrLn "This is foo from has-exe-foo"
diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/app/Main.hs b/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/app/Main.hs
deleted file mode 100644
index 90ac2ae946..0000000000
--- a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/app/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Main where
-
-main :: IO ()
-main = putStrLn "This is foo from has-exe-foo-too"
diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/has-exe-foo-too.cabal b/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/has-exe-foo-too.cabal
deleted file mode 100644
index 05db41b4b7..0000000000
--- a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/has-exe-foo-too.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
-name:                has-exe-foo-too
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-executable foo
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo.cabal b/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo.cabal
deleted file mode 100644
index 19b222b3a1..0000000000
--- a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
-name:                has-exe-foo
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-executable foo
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/test/integration/tests/1265-extensible-snapshots/Main.hs b/test/integration/tests/1265-extensible-snapshots/Main.hs
deleted file mode 100644
index 606ea188a7..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import           StackTest
-
-main :: IO ()
-main = do
-    stack ["build", "async"]
-    stackErr ["build", "zlib-bindings"]
-    stack ["build", "--stack-yaml", "stack-modify-lts.yaml", "async"]
-    stack ["build", "--stack-yaml", "stack-local-snapshot.yaml", "async"]
-    stack ["build", "--stack-yaml", "stack-remote-snapshot.yaml", "async"]
-    stackErr ["build", "--stack-yaml", "stack-modify-lts.yaml", "zlib-bindings"]
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml
deleted file mode 100644
index c8c618da82..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-resolver: ghc-9.2.4
-name: test-snapshot-2
-packages:
-- stm-2.5.0.0
-- async-2.1.0
-- zlib-0.6.2.1@sha256:201b3f7d4edd0a6a0b235105a4d1aa8d30dcb7c8b4043102487407a4753657ef,4508
-# FIXME: test these here
-flags: {}
-ghc-options: {}
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml
deleted file mode 100644
index 0496a4e51f..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: nightly-2022-09-05
-name: snapshot-modify-lts
-drop-packages:
-- zlib
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot.yaml
deleted file mode 100644
index fb53016c66..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/snapshot.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: snapshot-2.yaml
-name: test-snapshot
-packages:
-- microlens-0.4.3.0
-drop-packages:
-- zlib
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml
deleted file mode 100644
index 2e0400bae9..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-resolver: nightly-2022-09-05
-name: local-snapshot
-packages:
-- archive: package-0.1.2.3.tar.gz
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/package-0.1.2.3.tar.gz b/test/integration/tests/1265-extensible-snapshots/files/snapshots/package-0.1.2.3.tar.gz
deleted file mode 100644
index a28a03742b..0000000000
Binary files a/test/integration/tests/1265-extensible-snapshots/files/snapshots/package-0.1.2.3.tar.gz and /dev/null differ
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml
deleted file mode 100644
index 37f4c4132c..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-resolver: nightly-2022-09-05
-name: remote-snapshot
-packages:
-- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.8.0.tar.gz
diff --git a/test/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml
deleted file mode 100644
index 067e75d93f..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: snapshots/local-snapshot.yaml
-packages: []
-allow-newer: true
diff --git a/test/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml b/test/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml
deleted file mode 100644
index cf6706ac8a..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resolver: snapshot-modify-lts.yaml
-packages: []
diff --git a/test/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml
deleted file mode 100644
index 1829e19131..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: snapshots/remote-snapshot.yaml
-packages: []
-allow-newer: true
diff --git a/test/integration/tests/1265-extensible-snapshots/files/stack.yaml b/test/integration/tests/1265-extensible-snapshots/files/stack.yaml
deleted file mode 100644
index a6b61436c4..0000000000
--- a/test/integration/tests/1265-extensible-snapshots/files/stack.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: snapshot.yaml
-packages: []
-allow-newer: true
diff --git a/test/integration/tests/1336-1337-new-package-names/Main.hs b/test/integration/tests/1336-1337-new-package-names/Main.hs
deleted file mode 100644
index 56722c43f6..0000000000
--- a/test/integration/tests/1336-1337-new-package-names/Main.hs
+++ /dev/null
@@ -1,31 +0,0 @@
-import StackTest
-import Control.Monad
-import System.Directory
-import System.FilePath
-
-{-# ANN module "HLint: ignore Use unless" #-}
-main :: IO ()
-main =
-    if isWindows
-        then logInfo "Disabled on Windows (see https://github.com/commercialhaskell/stack/issues/1337#issuecomment-166118678)"
-        else when isLinux $ do
-            safeNew "1234a-4b-b4-abc-12b34"
-            doesExist "./1234a-4b-b4-abc-12b34/stack.yaml"
-            stackErr ["new", "1234-abc"]
-            doesNotExist "./1234-abc/stack.yaml"
-            doesNotExist "./1234-abc"
-            stackErr ["new", "1-abc"]
-            stackErr ["new", "44444444444444"]
-            stackErr ["new", "abc-1"]
-            stackErr ["new", "444-ば日本-4本"]
-            unless isMacOSX $ safeNew "ば日本-4本"
-            safeNew "אבהץש"
-            safeNew "ΔΘΩϬ"
-            doesExist "./ΔΘΩϬ/stack.yaml"
-            doesExist "./ΔΘΩϬ/ΔΘΩϬ.cabal"
-
-safeNew :: String -> IO ()
-safeNew name = do
-  exists <- doesDirectoryExist name
-  when exists $ removeDirectoryRecursive name
-  stack ["new", name]
diff --git a/test/integration/tests/1337-unicode-everywhere/Main.hs b/test/integration/tests/1337-unicode-everywhere/Main.hs
deleted file mode 100644
index 2b34396fbd..0000000000
--- a/test/integration/tests/1337-unicode-everywhere/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-
-{-# ANN module "HLint: ignore Use unless" #-}
-main :: IO ()
-main =
-    if isWindows
-        then logInfo "Disabled on Windows (see https://github.com/commercialhaskell/stack/issues/1337#issuecomment-166118678)"
-        else do
-            stack ["build"]
-            stack ["exec", "以-exe"]
diff --git a/test/integration/tests/1337-unicode-everywhere/files/app/Main.hs b/test/integration/tests/1337-unicode-everywhere/files/app/Main.hs
deleted file mode 100644
index 0bb0cef9be..0000000000
--- a/test/integration/tests/1337-unicode-everywhere/files/app/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Main where
-
-import Пσε
-
-main :: IO ()
-main = putStrLn θυπε
diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml
deleted file mode 100644
index 0c36aee4dc..0000000000
--- a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- '.'
-extra-deps: []
-flags: {}
-extra-package-dbs: []
diff --git "a/test/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs" "b/test/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs"
deleted file mode 100644
index c3df827706..0000000000
--- "a/test/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs"
+++ /dev/null
@@ -1,6 +0,0 @@
-module Пσε
-    ( θυπε
-    ) where
-
-θυπε :: String
-θυπε = "以呂波耳本部止"
diff --git "a/test/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE" "b/test/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE"
deleted file mode 100644
index ce91414e00..0000000000
--- "a/test/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE"
+++ /dev/null
@@ -1 +0,0 @@
-Whatever license. This is a project that only exists for integration testing and all rights are granted to it to whoever wants to do anything with it. It's mostly automatically generated content anyway.
diff --git "a/test/integration/tests/1337-unicode-everywhere/files/\344\273\245.cabal" "b/test/integration/tests/1337-unicode-everywhere/files/\344\273\245.cabal"
deleted file mode 100644
index 8c683dac94..0000000000
--- "a/test/integration/tests/1337-unicode-everywhere/files/\344\273\245.cabal"
+++ /dev/null
@@ -1,72 +0,0 @@
-name:                以
-version:             0.1.0.0
-synopsis:            سقوط المدن من ذات.
-description:
-    以呂波耳本部止
-    千利奴流乎和加
-    餘多連曽津祢那
-    良牟有為能於久
-    耶万計不己衣天
-    阿佐伎喩女美之
-    恵比毛勢須
-
-    いろはにほへと
-    ちりぬるを
-    わかよたれそ
-    つねならむ
-    うゐのおくやま
-    けふこえて
-    あさきゆめみし
-    ゑひもせす
-
-    永
-
-    The quick brown fox jumps over the lazy dog
-
-    Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich
-
-    Δάματρα μέλπω Κόραν τε Κλυμένοι᾽ ἄλοχον
-    μελιβόαν ὕμνον ἀναγνέων
-    Αἰολίδ᾽ ἂμ βαρύβρομον ἁρμονίαν
-
-    Ед эож алььтэрюм витюпэраторебуз, фалля пожйдонёюм нэ квуй. Зюаз атоморюм эю вэл, экз агам магна жкряпшэрит нам. Примич вокынт дэлььякатезшимя эа мэль, ыам факэтэ пытынтёюм волуптатум ку. Квуым квюаэчтио йн пэр, дольор форынчйбюж ут еюж. Эжт нонюмэш янвыняры эю.
-
-    Υθ φιμ λιβερ δισερετ κυαεστιο. Νε δυο σονγυε φιθυπερατοριβυς, θε φις αθκυι σενσεριτ δεφινιεβας, μολλις θαμκυαμ ηας εα. Ιν φιμ εραντ μυσιυς, αλιι δισαντ σομμοδο νο συμ. Πρι αμετ πορρω σονσεκυυντυρ ατ. Ιδ σεα ηομερω αδιπισι, ομνεσκυε επισυρει ετ μελ, σεα αφφερθ σωνσεκυαθ θε.
-
-    नीचे खरिदे समस्याओ व्रुद्धि सुना शीघ्र व्याख्या निरपेक्ष शुरुआत असरकारक अविरोधता खरिदे मेमत उसीएक् असरकारक आंतरकार्यक्षमता केवल करता। असक्षम सामूहिक विवरण हीकम सुनत सदस्य खरिदने उदेशीत
-
-    引全堀記物質行上初野年謝止質警細物競。委目態政業諸好岡積米真香冒班分団時大一夏。帝同手怠問来視旧記次禁身妨性直権員。州駅都稿頂風著報計個勢意時言進整。作敗約秘都並断旬検面事真区。則局世紙文般百校車社金名室権金練危。水夫動間始旅円典中所場針仁暮中。書稿準提選別推五玲常能船岡味。詩聞誌寧真身性業遠国無軽春臨個鳥相契断者。
-
-    紙ウ主転ね加必キト聴4水そない岩者づど会前ラシ総過権ぜ聞快にクげそ庫辺はぴず意掲ひに真価トしざが。体ろ名録ふいに公問築ムミ数基ー原多ぞぎすど済進ハレ見況ヤラエロ館刊キイ構読増禎ヨモメ提信最フ済席ワモキル弘28思弾5健はーろ提館ぱっるけ社除左てがひ。全てれ理時渉ン勝境チ測試ヌエマラ年9億ち込全クテヒカ土止びぎこぐ署進アカモヌ同賞誕傾吹敏こ。
-
-    سقوط المدن من ذات. ٠٨٠٤ تعديل إبّان عن هذه, لمّ في هامش الدمج. فرنسية الجنوب ولكسمبورغ حتى أم, مع بحث لكون الشمل استطاعوا, فعل بلاده انتهت تم. كما مع واحدة الخاسر, أخذ وإعلان الشمال رجوعهم أن. تعد تم بشكل مشارف الشرقي, هو مئات مهمّات أخذ.
-
-    בקר את הארץ מיתולוגיה. ובמתן העזרה דת מלא, שמו זקוק לחיבור אגרונומיה על. אל זכר התוכן מונחונים ארכיאולוגיה, ויש קצרמרים פסיכולוגיה אל. כתב אם בארגז אחרונים וכמקובל. ספינות ומדעים האטמוספירה ויש מה, צ'ט משחקים הקהילה ארכיאולוגיה על. אל כימיה המדינה סדר, זכר של שמות להפוך, ייִדיש לעריכת דת ויש.
-
-    😀😁😂😃😄😅😆😇😈😉😊😋😌😍😎😏
-    ➀➁➂➃➄➅➆➇➈➉
-    ♀♁♂♃♄♅♆♇♈♉♊♋♌♍♎♏
-    💩
-homepage:            http://invalid/以#readme
-license:             BSD3
-license-file:        いろは-LICENSE
-author:              Fake 💩💩💩💩💩 Name
-maintainer:          以呂波耳本部止@invalid
-copyright:           BSD3
-category:            Δσαντ
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      ארץ
-  exposed-modules:     Пσε
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
-
-executable 以-exe
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-                     , 以
-  default-language:    Haskell2010
diff --git a/test/integration/tests/1438-configure-options/Main.hs b/test/integration/tests/1438-configure-options/Main.hs
deleted file mode 100644
index 5e98e1d8ef..0000000000
--- a/test/integration/tests/1438-configure-options/Main.hs
+++ /dev/null
@@ -1,18 +0,0 @@
-import StackTest
-import Control.Monad (unless)
-import Data.Foldable (for_)
-import Data.List (isInfixOf)
-
-main :: IO ()
-main = do
-  stackCleanFull
-  let stackYamlFiles = words "stack-locals.yaml stack-everything.yaml stack-targets.yaml stack-name.yaml"
-  for_ stackYamlFiles $ \stackYaml ->
-    stackErrStderr ["build", "--stack-yaml", stackYaml] $ \str ->
-      unless ("this is an invalid option" `isInfixOf` str) $
-      error "Configure option is not present"
-
-  stack ["build", "--stack-yaml", "stack-locals.yaml", "acme-dont"]
-  stack ["build", "--stack-yaml", "stack-targets.yaml", "acme-dont"]
-  stackErr ["build", "--stack-yaml", "stack-name.yaml", "acme-dont"]
-  stackErr ["build", "--stack-yaml", "stack-everything.yaml", "acme-dont"]
diff --git a/test/integration/tests/1438-configure-options/files/.gitignore b/test/integration/tests/1438-configure-options/files/.gitignore
deleted file mode 100644
index e9c64431ea..0000000000
--- a/test/integration/tests/1438-configure-options/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-name.cabal
diff --git a/test/integration/tests/1438-configure-options/files/package.yaml b/test/integration/tests/1438-configure-options/files/package.yaml
deleted file mode 100644
index 13ccbf73ec..0000000000
--- a/test/integration/tests/1438-configure-options/files/package.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: name
-version: 0
-
-dependencies: base
-library: {}
diff --git a/test/integration/tests/1438-configure-options/files/stack-name.yaml b/test/integration/tests/1438-configure-options/files/stack-name.yaml
deleted file mode 100644
index f722757251..0000000000
--- a/test/integration/tests/1438-configure-options/files/stack-name.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-resolver: ghc-9.2.4
-
-extra-deps:
-- acme-dont-1.1@rev:0
-
-configure-options:
-  name:
-  - this is an invalid option
-  acme-dont:
-  - this is an invalid option
diff --git a/test/integration/tests/1659-skip-component/Main.hs b/test/integration/tests/1659-skip-component/Main.hs
deleted file mode 100644
index 47ff86f83e..0000000000
--- a/test/integration/tests/1659-skip-component/Main.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-import StackTest
-
-import Control.Exception (bracket)
-import qualified Data.ByteString as S
-
-main :: IO ()
-main = do
-  -- we need to build all the executables first to be able to skip them later (see issue #3229)
-  stack ["build"]
-  bracket
-    (S.readFile "app/MainFail.hs")
-    (S.writeFile "app/MainFail.hs")
-    (const $ do
-        writeFile "app/MainFail.hs" "bdsf"
-        stack ["build", "--test", "--bench", "--skip", "failing-test", "--skip", "failing-bench", "--skip", "failing-exe"]
-        stack ["build", ":failing-test", ":failing-bench", ":exe", ":failing-exe", "--skip", "failing-test", "--skip", "failing-bench", "--skip", "failing-exe"])
diff --git a/test/integration/tests/1659-skip-component/files/README.md b/test/integration/tests/1659-skip-component/files/README.md
deleted file mode 100644
index 560a646766..0000000000
--- a/test/integration/tests/1659-skip-component/files/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# files
diff --git a/test/integration/tests/1659-skip-component/files/Setup.hs b/test/integration/tests/1659-skip-component/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/1659-skip-component/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/1659-skip-component/files/bench/Bench.hs b/test/integration/tests/1659-skip-component/files/bench/Bench.hs
deleted file mode 100644
index d3f940c1ef..0000000000
--- a/test/integration/tests/1659-skip-component/files/bench/Bench.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-main :: IO ()
-main = asdf
diff --git a/test/integration/tests/1659-skip-component/files/skip-component.cabal b/test/integration/tests/1659-skip-component/files/skip-component.cabal
deleted file mode 100644
index 2b4def57e6..0000000000
--- a/test/integration/tests/1659-skip-component/files/skip-component.cabal
+++ /dev/null
@@ -1,44 +0,0 @@
-name:                skip-component
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
-
-executable exe
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-  default-language:    Haskell2010
-
-executable failing-exe
-  hs-source-dirs:      app
-  main-is:             MainFail.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-  default-language:    Haskell2010
-
-test-suite failing-test
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      test
-  main-is:             Spec.hs
-  build-depends:       base
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  default-language:    Haskell2010
-
-benchmark failing-bench
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      bench
-  main-is:             Bench.hs
-  build-depends:       base
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  default-language:    Haskell2010
-
-source-repository head
-  type:     git
-  location: https://github.com/githubuser/files
diff --git a/test/integration/tests/1659-skip-component/files/stack.yaml b/test/integration/tests/1659-skip-component/files/stack.yaml
deleted file mode 100644
index 0c36aee4dc..0000000000
--- a/test/integration/tests/1659-skip-component/files/stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- '.'
-extra-deps: []
-flags: {}
-extra-package-dbs: []
diff --git a/test/integration/tests/1659-skip-component/files/test/Spec.hs b/test/integration/tests/1659-skip-component/files/test/Spec.hs
deleted file mode 100644
index d3f940c1ef..0000000000
--- a/test/integration/tests/1659-skip-component/files/test/Spec.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-main :: IO ()
-main = asdf
diff --git a/test/integration/tests/1884-url-to-tarball/Main.hs b/test/integration/tests/1884-url-to-tarball/Main.hs
deleted file mode 100644
index c93c2e734d..0000000000
--- a/test/integration/tests/1884-url-to-tarball/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stackCleanFull
-    stack ["build", "--dry-run"]
diff --git a/test/integration/tests/1884-url-to-tarball/files/.gitignore b/test/integration/tests/1884-url-to-tarball/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/1884-url-to-tarball/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/1884-url-to-tarball/files/package.yaml b/test/integration/tests/1884-url-to-tarball/files/package.yaml
deleted file mode 100644
index 2ab76b4002..0000000000
--- a/test/integration/tests/1884-url-to-tarball/files/package.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: foo
-dependencies:
-- base
-- half
-library: {}
diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/test/integration/tests/1884-url-to-tarball/files/stack.yaml
deleted file mode 100644
index 242067c222..0000000000
--- a/test/integration/tests/1884-url-to-tarball/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-extra-deps:
-- location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz
-  sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c
-  size: 6050
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/2195-depend-on-exe/Main.hs b/test/integration/tests/2195-depend-on-exe/Main.hs
deleted file mode 100644
index 11f81255a9..0000000000
--- a/test/integration/tests/2195-depend-on-exe/Main.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-main :: IO ()
-main = stackErrStderr ["build"] (expectMessage "package provides no library")
-
-expectMessage :: String -> String -> IO ()
-expectMessage msg stderr =
-    unless (msg `isInfixOf` stderr)
-        (error $ "Expected a warning: \n" ++ show msg)
diff --git a/test/integration/tests/2195-depend-on-exe/files/files.cabal b/test/integration/tests/2195-depend-on-exe/files/files.cabal
deleted file mode 100644
index 5edf065804..0000000000
--- a/test/integration/tests/2195-depend-on-exe/files/files.cabal
+++ /dev/null
@@ -1,7 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  build-depends:       happy
diff --git a/test/integration/tests/2195-depend-on-exe/files/stack.yaml b/test/integration/tests/2195-depend-on-exe/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/2195-depend-on-exe/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/2433-ghc-by-version/Main.hs b/test/integration/tests/2433-ghc-by-version/Main.hs
deleted file mode 100644
index 271c259449..0000000000
--- a/test/integration/tests/2433-ghc-by-version/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import System.Process (rawSystem)
-import Control.Exception (throwIO)
-import StackTest
-import Control.Monad (unless)
-
-main :: IO ()
-main = unless isWindows $ rawSystem "bash" ["run.sh"] >>= throwIO
diff --git a/test/integration/tests/2433-ghc-by-version/files/run.sh b/test/integration/tests/2433-ghc-by-version/files/run.sh
deleted file mode 100755
index 2e075e231e..0000000000
--- a/test/integration/tests/2433-ghc-by-version/files/run.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -exuo pipefail
-
-export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.2.4 --compiler-bin):$PATH
-export STACK_ROOT=$(pwd)/fake-root
-
-which ghc
-
-"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.4 ghc -- --info
-"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.2.4 runghc foo.hs
diff --git a/test/integration/tests/2465-init-no-packages/Main.hs b/test/integration/tests/2465-init-no-packages/Main.hs
deleted file mode 100644
index 8b4bedda64..0000000000
--- a/test/integration/tests/2465-init-no-packages/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-import System.Directory
-import Control.Monad (unless)
-
-main :: IO ()
-main = do
-  removeFileIgnore "stack.yaml"
-  stack ["init", "--resolver", "ghc-9.2.4"]
-  exists <- doesFileExist "stack.yaml"
-  unless exists $ error "stack.yaml not created!"
diff --git a/test/integration/tests/2465-init-no-packages/files/.gitignore b/test/integration/tests/2465-init-no-packages/files/.gitignore
deleted file mode 100644
index 684dbffa96..0000000000
--- a/test/integration/tests/2465-init-no-packages/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-stack.yaml
diff --git a/test/integration/tests/2643-copy-compiler-tool/Main.hs b/test/integration/tests/2643-copy-compiler-tool/Main.hs
deleted file mode 100644
index 085311d230..0000000000
--- a/test/integration/tests/2643-copy-compiler-tool/Main.hs
+++ /dev/null
@@ -1,61 +0,0 @@
-import StackTest
-import System.Directory
-import Control.Monad (unless)
-
-main :: IO ()
-main = do
-  -- init
-  removeFileIgnore "stack.yaml"
-  removeDirIgnore ".stack-work"
-  stack ["init", defaultResolverArg]
-
-  -- place to throw some exes
-  removeDirIgnore "binny"
-  createDirectory "binny"
-
-  -- check assumptions on exec and the build flags and clean
-  stack ["build", "--flag", "copy-compiler-tool-test:build-baz"]
-  stack ["exec", "--", "baz-exe" ++ exeExt]
-  stackErr ["exec", "--", "bar-exe" ++ exeExt]
-  stackCleanFull
-  -- See #4936 for details regarding the windows condition
-  unless isWindows $ stackErr ["exec", "--", "baz-exe" ++ exeExt]
-
-  -- install one exe normally
-  stack ["install",
-         "--local-bin-path", "./binny",
-         "--flag", "*:build-foo"
-        ]
-
-  -- and install two compiler-tools, opposite ways
-  -- (build or install)
-  stack ["build",
-         "--local-bin-path", "./binny",
-         "--copy-compiler-tool",
-         "--flag", "*:build-bar"
-        ]
-  stack ["install",
-         "--local-bin-path", "./binny",
-         "--copy-compiler-tool",
-         "--flag", "*:build-baz"
-        ]
-
-  -- nuke the built things that go in .stack-work/, so we can test if
-  -- the installed ones exist for sure
-  stackCleanFull
-
-  -- bar and baz were installed as compiler tools, should work fine
-  stack ["exec", "--", "bar-exe" ++ exeExt]
-  stack ["exec", "--", "baz-exe" ++ exeExt]
-
-  -- foo was installed as a normal exe (in .binny/, which can't be on PATH),
-  -- so shouldn't
-  stackErr ["exec", "--", "foo-exe" ++ exeExt]
-
-  -- check existences make sense
-  doesExist $ "./binny/foo-exe" ++ exeExt
-  doesNotExist $ "./binny/bar-exe" ++ exeExt
-  doesNotExist $ "./binny/baz-exe" ++ exeExt
-
-  -- just check that this exists
-  stack ["path", "--compiler-tools-bin"]
diff --git a/test/integration/tests/2643-copy-compiler-tool/files/.gitignore b/test/integration/tests/2643-copy-compiler-tool/files/.gitignore
deleted file mode 100644
index 56f4748f50..0000000000
--- a/test/integration/tests/2643-copy-compiler-tool/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-binny/
-stack.yaml
diff --git a/test/integration/tests/2643-copy-compiler-tool/files/Bar.hs b/test/integration/tests/2643-copy-compiler-tool/files/Bar.hs
deleted file mode 100644
index 7498d2965c..0000000000
--- a/test/integration/tests/2643-copy-compiler-tool/files/Bar.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = putStrLn "twotwotwo"
diff --git a/test/integration/tests/2643-copy-compiler-tool/files/Baz.hs b/test/integration/tests/2643-copy-compiler-tool/files/Baz.hs
deleted file mode 100644
index 3f276659c9..0000000000
--- a/test/integration/tests/2643-copy-compiler-tool/files/Baz.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = putStrLn "threethreethree"
diff --git a/test/integration/tests/2643-copy-compiler-tool/files/Foo.hs b/test/integration/tests/2643-copy-compiler-tool/files/Foo.hs
deleted file mode 100644
index 8abe1be7d5..0000000000
--- a/test/integration/tests/2643-copy-compiler-tool/files/Foo.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = putStrLn "oneoneone"
diff --git a/test/integration/tests/2643-copy-compiler-tool/files/LICENSE b/test/integration/tests/2643-copy-compiler-tool/files/LICENSE
deleted file mode 100644
index d05408d876..0000000000
--- a/test/integration/tests/2643-copy-compiler-tool/files/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Your name here nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/test/integration/tests/2643-copy-compiler-tool/files/Setup.hs b/test/integration/tests/2643-copy-compiler-tool/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/2643-copy-compiler-tool/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal b/test/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal
deleted file mode 100644
index e1f66caf91..0000000000
--- a/test/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal
+++ /dev/null
@@ -1,54 +0,0 @@
-name:                copy-compiler-tool-test
-version:             0.1.0.0
-synopsis:            Initial project template from stack
-description:         Please see README.md
-homepage:            http://invalid/
-license:             BSD3
-license-file:        LICENSE
-author:              Your name here
-maintainer:          your.address@example.com
--- copyright:
-category:            Web
-build-type:          Simple
--- extra-source-files:
-cabal-version:       >=1.10
-
-flag build-foo
-  manual: True
-  default: False
-  description: Build foo
-
-flag build-bar
-  manual: True
-  default: False
-  description: Build bar
-
-flag build-baz
-  manual: True
-  default: False
-  description: Build baz
-
-executable foo-exe
-  main-is:             Foo.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  if !flag(build-foo)
-    buildable: False
-
-executable bar-exe
-  main-is:             Bar.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  if !flag(build-bar)
-    buildable: False
-
-executable baz-exe
-  main-is:             Baz.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  if !flag(build-baz)
-    buildable: False
-
-source-repository head
-  type:     git
-  location: https://invalid/
diff --git a/test/integration/tests/2781-shadow-bug/Main.hs b/test/integration/tests/2781-shadow-bug/Main.hs
deleted file mode 100644
index 057606262e..0000000000
--- a/test/integration/tests/2781-shadow-bug/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-import System.Directory
-
-main :: IO ()
-main = do
-  createDirectoryIfMissing True "foo/src"
-  readFile "foo/v1/Foo.hs" >>= writeFile "foo/src/Foo.hs"
-  stack ["bench"]
-  readFile "foo/v2/Foo.hs" >>= writeFile "foo/src/Foo.hs"
-  stack ["bench"]
diff --git a/test/integration/tests/2781-shadow-bug/files/.gitignore b/test/integration/tests/2781-shadow-bug/files/.gitignore
deleted file mode 100644
index da86f0dbe2..0000000000
--- a/test/integration/tests/2781-shadow-bug/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-foo/src/
diff --git a/test/integration/tests/2781-shadow-bug/files/bar/bar.cabal b/test/integration/tests/2781-shadow-bug/files/bar/bar.cabal
deleted file mode 100644
index 19985b85a0..0000000000
--- a/test/integration/tests/2781-shadow-bug/files/bar/bar.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
-name:                bar
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Bar
-  build-depends:       base, foo
-  default-language:    Haskell2010
-
-benchmark bench
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      bench
-  main-is:             bench.hs
-  build-depends:       base
-                     , bar
-  default-language:    Haskell2010
diff --git a/test/integration/tests/2781-shadow-bug/files/bar/src/Bar.hs b/test/integration/tests/2781-shadow-bug/files/bar/src/Bar.hs
deleted file mode 100644
index 3eef52eeed..0000000000
--- a/test/integration/tests/2781-shadow-bug/files/bar/src/Bar.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Bar
-    ( bar
-    ) where
-
-import Foo
-
-bar :: IO ()
-bar = foo
diff --git a/test/integration/tests/2781-shadow-bug/files/foo/foo.cabal b/test/integration/tests/2781-shadow-bug/files/foo/foo.cabal
deleted file mode 100644
index 4b9dc19942..0000000000
--- a/test/integration/tests/2781-shadow-bug/files/foo/foo.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                foo
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Foo
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/test/integration/tests/2781-shadow-bug/files/foo/v1/Foo.hs b/test/integration/tests/2781-shadow-bug/files/foo/v1/Foo.hs
deleted file mode 100644
index 0783893feb..0000000000
--- a/test/integration/tests/2781-shadow-bug/files/foo/v1/Foo.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Foo
-    ( foo
-    ) where
-
-foo :: IO ()
-foo = putStrLn "foo1"
diff --git a/test/integration/tests/2781-shadow-bug/files/foo/v2/Foo.hs b/test/integration/tests/2781-shadow-bug/files/foo/v2/Foo.hs
deleted file mode 100644
index 819d884e1e..0000000000
--- a/test/integration/tests/2781-shadow-bug/files/foo/v2/Foo.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Foo
-    ( foo
-    ) where
-
-foo :: IO ()
-foo = putStrLn "foo2"
diff --git a/test/integration/tests/2781-shadow-bug/files/stack.yaml b/test/integration/tests/2781-shadow-bug/files/stack.yaml
deleted file mode 100644
index a2c986e19a..0000000000
--- a/test/integration/tests/2781-shadow-bug/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: ghc-9.2.4
-packages:
-- foo
-- bar
diff --git a/test/integration/tests/2997-ensure-warnings-output/Main.hs b/test/integration/tests/2997-ensure-warnings-output/Main.hs
deleted file mode 100644
index ff41be9abb..0000000000
--- a/test/integration/tests/2997-ensure-warnings-output/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-import Data.List (isInfixOf)
-
-main :: IO ()
-main = do
-  stackCleanFull
-  stackCheckStderr ["build", "--terminal", "--color=always"] $ \str ->
-    if "no type signature" `isInfixOf` str
-      then pure ()
-      else error "Warnings are not being shown"
diff --git a/test/integration/tests/2997-ensure-warnings-output/files/.gitignore b/test/integration/tests/2997-ensure-warnings-output/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/2997-ensure-warnings-output/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/2997-ensure-warnings-output/files/bar/package.yaml b/test/integration/tests/2997-ensure-warnings-output/files/bar/package.yaml
deleted file mode 100644
index 0c7f62c5c5..0000000000
--- a/test/integration/tests/2997-ensure-warnings-output/files/bar/package.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: bar
-version: 0
-
-dependencies:
-- base
-
-library:
-  source-dirs: src
-  ghc-options: -Wall
diff --git a/test/integration/tests/2997-ensure-warnings-output/files/bar/src/Bar.hs b/test/integration/tests/2997-ensure-warnings-output/files/bar/src/Bar.hs
deleted file mode 100644
index 08a38856f5..0000000000
--- a/test/integration/tests/2997-ensure-warnings-output/files/bar/src/Bar.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module Bar where
-
-bar = ()
diff --git a/test/integration/tests/2997-ensure-warnings-output/files/foo/package.yaml b/test/integration/tests/2997-ensure-warnings-output/files/foo/package.yaml
deleted file mode 100644
index 0de19a6188..0000000000
--- a/test/integration/tests/2997-ensure-warnings-output/files/foo/package.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: foo
-version: 0
-
-dependencies:
-- base
-
-library:
-  source-dirs: src
-  ghc-options: -Wall
diff --git a/test/integration/tests/2997-ensure-warnings-output/files/foo/src/Foo.hs b/test/integration/tests/2997-ensure-warnings-output/files/foo/src/Foo.hs
deleted file mode 100644
index 11391a4814..0000000000
--- a/test/integration/tests/2997-ensure-warnings-output/files/foo/src/Foo.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module Foo where
-
-foo = ()
diff --git a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml b/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml
deleted file mode 100644
index 9250e65599..0000000000
--- a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: ghc-9.2.4
-packages:
-- foo
-- bar
-dump-logs: warning
diff --git a/test/integration/tests/32-unlisted-module/Main.hs b/test/integration/tests/32-unlisted-module/Main.hs
deleted file mode 100644
index 1559b530c7..0000000000
--- a/test/integration/tests/32-unlisted-module/Main.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-import Control.Concurrent
-import StackTest
-
-main :: IO ()
-main = do
-    copy "src/Unlisted_OK.hs" "src/Unlisted.hs"
-    copy "embed_OK.txt" "embed.txt"
-    stack ["build"]
-    pause
-    copy "src/Unlisted_FAIL.hs" "src/Unlisted.hs"
-    stackErr ["build"]
-    pause
-    copy "src/Unlisted_OK.hs" "src/Unlisted.hs"
-    stack ["build"]
-    stack ["exec", "files-exe"]
-    pause
-    copy "embed_FAIL.txt" "embed.txt"
-    stack ["build"]
-    stackErr ["exec", "files-exe"]
-    pause
-    copy "embed_OK.txt" "embed.txt"
-    stack ["build"]
-    stack ["exec", "files-exe"]
-
-pause = threadDelay 1000000
diff --git a/test/integration/tests/32-unlisted-module/files/.gitignore b/test/integration/tests/32-unlisted-module/files/.gitignore
deleted file mode 100644
index 6c87a5ea83..0000000000
--- a/test/integration/tests/32-unlisted-module/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-embed.txt
-src/Unlisted.hs
diff --git a/test/integration/tests/32-unlisted-module/files/files.cabal b/test/integration/tests/32-unlisted-module/files/files.cabal
deleted file mode 100644
index b789af591e..0000000000
--- a/test/integration/tests/32-unlisted-module/files/files.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
-name:                files
-version:             0.1.0.0
-synopsis:            Initial project template from stack
-description:         Please see README.md
-homepage:            http://github.com/githubuser/files#readme
-license:             BSD3
-build-type:          Simple
--- extra-source-files:
-cabal-version:       >=1.10
-
-executable files-exe
-  hs-source-dirs:      src/../src
-  main-is:             Main.hs
-  build-depends:       base >= 4.7 && < 5
-                     , bytestring
-                     , file-embed
-  default-language:    Haskell2010
diff --git a/test/integration/tests/32-unlisted-module/files/src/Main.hs b/test/integration/tests/32-unlisted-module/files/src/Main.hs
deleted file mode 100644
index dde0892cc5..0000000000
--- a/test/integration/tests/32-unlisted-module/files/src/Main.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE OverloadedStrings #-}
-module Main where
-
-import           Control.Monad
-import qualified Data.ByteString.Char8 as C8
-import           Data.FileEmbed
-import           Data.List
-import           Unlisted
-
-main :: IO ()
-main = do
-    putStrLn ("main " ++ show foo ++ " " ++ show embedded)
-    when ("FAIL" `C8.isPrefixOf` embedded) $ error "embedded contains FAIL"
-
-embedded = $(embedFile "embed.txt")
diff --git a/test/integration/tests/32-unlisted-module/files/src/Unlisted_FAIL.hs b/test/integration/tests/32-unlisted-module/files/src/Unlisted_FAIL.hs
deleted file mode 100644
index b15130820b..0000000000
--- a/test/integration/tests/32-unlisted-module/files/src/Unlisted_FAIL.hs
+++ /dev/null
@@ -1,5 +0,0 @@
--- | Version of Unlisted with different export that causes failure to compile.
-module Unlisted where
-
-fooRenamed :: String
-fooRenamed = "foo"
diff --git a/test/integration/tests/32-unlisted-module/files/src/Unlisted_OK.hs b/test/integration/tests/32-unlisted-module/files/src/Unlisted_OK.hs
deleted file mode 100644
index 73caa00bcc..0000000000
--- a/test/integration/tests/32-unlisted-module/files/src/Unlisted_OK.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Unlisted where
-
-foo :: String
-foo = "foo"
diff --git a/test/integration/tests/32-unlisted-module/files/src/main/Main.hs b/test/integration/tests/32-unlisted-module/files/src/main/Main.hs
deleted file mode 100644
index b768742deb..0000000000
--- a/test/integration/tests/32-unlisted-module/files/src/main/Main.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module Main where
-
-main = do putStrLn "Hello, world."
diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml
deleted file mode 100644
index 0ba9c320d5..0000000000
--- a/test/integration/tests/32-unlisted-module/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/3229-exe-targets/Main.hs b/test/integration/tests/3229-exe-targets/Main.hs
deleted file mode 100644
index 502030659d..0000000000
--- a/test/integration/tests/3229-exe-targets/Main.hs
+++ /dev/null
@@ -1,42 +0,0 @@
--- | Stack should build all executables once, and in subsequent
--- invocations only build those executables requested by the program
--- arguments.
---
--- Issue: https://github.com/commercialhaskell/stack/issues/3229
-
-module Main where
-
-import           Control.Exception
-import           Control.Monad (unless, when)
-import qualified Data.ByteString as S
-import           Data.List (isInfixOf)
-import           StackTest
-
-main :: IO ()
-main = do
-    removeDirIgnore ".stack-work"
-    removeFileIgnore "stack.yaml"
-    stack [defaultResolverArg, "init"]
-    stack ["build", ":alpha"]
-    bracket
-        (S.readFile alphaFile)
-        (S.writeFile alphaFile)
-        (const
-             (do appendFile alphaFile "\n--"
-                 stackCheckStderr
-                     ["build", ":alpha"]
-                     (rejectMessage
-                          (unlines
-                               ["Preprocessing executable 'beta' for foo-0..."]))))
-  where
-    alphaFile = "app/Alpha.hs"
-
-expectMessage :: String -> String -> IO ()
-expectMessage msg stderr =
-    unless (msg `isInfixOf` stderr)
-        (error $ "Expected in output: \n" ++ show msg)
-
-rejectMessage :: String -> String -> IO ()
-rejectMessage msg stderr =
-    when (msg `isInfixOf` stderr)
-            (error $ "Did not expect message here: \n" ++ show msg)
diff --git a/test/integration/tests/3229-exe-targets/files/.gitignore b/test/integration/tests/3229-exe-targets/files/.gitignore
deleted file mode 100644
index 684dbffa96..0000000000
--- a/test/integration/tests/3229-exe-targets/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-stack.yaml
diff --git a/test/integration/tests/3229-exe-targets/files/app/Alpha.hs b/test/integration/tests/3229-exe-targets/files/app/Alpha.hs
deleted file mode 100644
index 76a9bdb5d4..0000000000
--- a/test/integration/tests/3229-exe-targets/files/app/Alpha.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = pure ()
diff --git a/test/integration/tests/3229-exe-targets/files/app/Beta.hs b/test/integration/tests/3229-exe-targets/files/app/Beta.hs
deleted file mode 100644
index 76a9bdb5d4..0000000000
--- a/test/integration/tests/3229-exe-targets/files/app/Beta.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = pure ()
diff --git a/test/integration/tests/3229-exe-targets/files/foo.cabal b/test/integration/tests/3229-exe-targets/files/foo.cabal
deleted file mode 100644
index 4a68648e6d..0000000000
--- a/test/integration/tests/3229-exe-targets/files/foo.cabal
+++ /dev/null
@@ -1,22 +0,0 @@
-name:                foo
-version:             0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Foo
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
-
-executable alpha
-  hs-source-dirs:      app
-  main-is:             Alpha.hs
-  build-depends:       base, foo
-  default-language:    Haskell2010
-
-executable beta
-  hs-source-dirs:      app
-  main-is:             Beta.hs
-  build-depends:       base, foo
-  default-language:    Haskell2010
diff --git a/test/integration/tests/3229-exe-targets/files/src/Foo.hs b/test/integration/tests/3229-exe-targets/files/src/Foo.hs
deleted file mode 100644
index efbf93bbde..0000000000
--- a/test/integration/tests/3229-exe-targets/files/src/Foo.hs
+++ /dev/null
@@ -1 +0,0 @@
-module Foo where
diff --git a/test/integration/tests/3315-multi-ghc-options/Main.hs b/test/integration/tests/3315-multi-ghc-options/Main.hs
deleted file mode 100644
index 1a0ea36fce..0000000000
--- a/test/integration/tests/3315-multi-ghc-options/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["build", "--ghc-options=-ddump-simpl -ddump-asm -DBAR -DBAZ"]
-  repl ["--ghc-options=-ddump-simpl -ddump-asm"] (pure ())
diff --git a/test/integration/tests/3315-multi-ghc-options/files/multi-ghc-options.cabal b/test/integration/tests/3315-multi-ghc-options/files/multi-ghc-options.cabal
deleted file mode 100644
index 2f25278446..0000000000
--- a/test/integration/tests/3315-multi-ghc-options/files/multi-ghc-options.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                multi-ghc-options
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/3315-multi-ghc-options/files/src/Lib.hs b/test/integration/tests/3315-multi-ghc-options/files/src/Lib.hs
deleted file mode 100644
index 58ced13fba..0000000000
--- a/test/integration/tests/3315-multi-ghc-options/files/src/Lib.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE CPP #-}
-
-module Lib where
-
-#ifndef BAR
-#error BAR isn't defined
-#endif
-
-#ifndef BAZ
-#error BAZ isn't defined
-#endif
diff --git a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml
deleted file mode 100644
index 2115d80d5c..0000000000
--- a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- '.'
diff --git a/test/integration/tests/335-multi-package-flags/Main.hs b/test/integration/tests/335-multi-package-flags/Main.hs
deleted file mode 100644
index e9ff7fa6ac..0000000000
--- a/test/integration/tests/335-multi-package-flags/Main.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stackErr ["build"]
-    stack ["build", "--flag", "new-template:necessary"]
-    stackErr ["build"]
-    stack ["build", "--flag", "*:necessary"]
diff --git a/test/integration/tests/335-multi-package-flags/files/Setup.hs b/test/integration/tests/335-multi-package-flags/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/335-multi-package-flags/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/335-multi-package-flags/files/new-template.cabal b/test/integration/tests/335-multi-package-flags/files/new-template.cabal
deleted file mode 100644
index 50876be0ce..0000000000
--- a/test/integration/tests/335-multi-package-flags/files/new-template.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
-name:                new-template
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-flag necessary
-  manual: True
-  default: False
-  description: Won't build without this flag on
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base
-  default-language:    Haskell2010
-  if flag(necessary)
-    cpp-options: -DWORK
diff --git a/test/integration/tests/335-multi-package-flags/files/src/Lib.hs b/test/integration/tests/335-multi-package-flags/files/src/Lib.hs
deleted file mode 100644
index 3f119fcab7..0000000000
--- a/test/integration/tests/335-multi-package-flags/files/src/Lib.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE CPP #-}
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
-
-#if !WORK
-#error Not going to work, sorry
-#endif
diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml
deleted file mode 100644
index 0ba9c320d5..0000000000
--- a/test/integration/tests/335-multi-package-flags/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/3390-unbuildable-test/Main.hs b/test/integration/tests/3390-unbuildable-test/Main.hs
deleted file mode 100644
index fb222afc69..0000000000
--- a/test/integration/tests/3390-unbuildable-test/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stack ["test"]
diff --git a/test/integration/tests/3390-unbuildable-test/files/files.cabal b/test/integration/tests/3390-unbuildable-test/files/files.cabal
deleted file mode 100644
index 4909fb438a..0000000000
--- a/test/integration/tests/3390-unbuildable-test/files/files.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base
-  default-language:    Haskell2010
-
-test-suite test
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      test
-  main-is:             Spec.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  buildable:           False
\ No newline at end of file
diff --git a/test/integration/tests/3390-unbuildable-test/files/src/Lib.hs b/test/integration/tests/3390-unbuildable-test/files/src/Lib.hs
deleted file mode 100644
index e1ee993010..0000000000
--- a/test/integration/tests/3390-unbuildable-test/files/src/Lib.hs
+++ /dev/null
@@ -1 +0,0 @@
-module Lib () where
diff --git a/test/integration/tests/3390-unbuildable-test/files/stack.yaml b/test/integration/tests/3390-unbuildable-test/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/3390-unbuildable-test/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/3396-package-indices/Main.hs b/test/integration/tests/3396-package-indices/Main.hs
deleted file mode 100644
index 1c6cc3ba8c..0000000000
--- a/test/integration/tests/3396-package-indices/Main.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-import           StackTest
-import           System.Directory   (createDirectoryIfMissing)
-import           System.Environment (getEnv, setEnv)
-import           System.FilePath    ((</>))
-
-main :: IO ()
-main = do
-  putStrLn "With pantry, non-Hackage Security indices are no longer supported, skipping test"
-  {-
-  home <- getEnv "HOME"
-  setEnv "STACK_ROOT" (home </> ".stack") -- Needed for Windows
-  createDirectoryIfMissing True (home </> ".stack" </> "indices" </> "CustomIndex")
-  copy "CustomIndex/01-index.tar" (home </> ".stack"  </> "indices" </> "CustomIndex" </> "01-index.tar")
-  stack ["build"]
-  -}
diff --git a/test/integration/tests/3396-package-indices/files/CustomIndex/01-index.tar b/test/integration/tests/3396-package-indices/files/CustomIndex/01-index.tar
deleted file mode 100644
index 1388955d58..0000000000
Binary files a/test/integration/tests/3396-package-indices/files/CustomIndex/01-index.tar and /dev/null differ
diff --git a/test/integration/tests/3396-package-indices/files/files.cabal b/test/integration/tests/3396-package-indices/files/files.cabal
deleted file mode 100644
index 5f500a7dd5..0000000000
--- a/test/integration/tests/3396-package-indices/files/files.cabal
+++ /dev/null
@@ -1,19 +0,0 @@
-name:                files
-version:             0.1.0.0
--- synopsis:
--- description:
-homepage:            https://github.com/githubuser/files#readme
-license:             BSD3
-author:              Author name here
-maintainer:          example@example.com
-copyright:           2000 Author name here
-category:            Web
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
-
diff --git a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml b/test/integration/tests/3396-package-indices/files/my-snapshot.yaml
deleted file mode 100644
index fc7db78304..0000000000
--- a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-compiler: ghc-9.2.4
-name: my-snapshot
-
-packages:
-- base-4.10.0.0
-- dinamo-0.1.0.0
-
-flags:
-  dinamo:
-    debug: true
diff --git a/test/integration/tests/3396-package-indices/files/src/Lib.hs b/test/integration/tests/3396-package-indices/files/src/Lib.hs
deleted file mode 100644
index f323c86f10..0000000000
--- a/test/integration/tests/3396-package-indices/files/src/Lib.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-
-someFunc :: IO ()
-someFunc = print "some func"
-
diff --git a/test/integration/tests/3396-package-indices/files/stack.yaml b/test/integration/tests/3396-package-indices/files/stack.yaml
deleted file mode 100644
index cc7ad71a9c..0000000000
--- a/test/integration/tests/3396-package-indices/files/stack.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-resolver: my-snapshot.yaml
-
-packages:
-- .
-
-extra-deps: []
-
-# Override default flag values for local packages and extra-deps
-flags: {}
-
-# Extra package databases containing global packages
-extra-package-dbs: []
-
-package-indices:
-- name: CustomIndex
-  download-prefix: http://0.0.0.0:8080/
-  http: http://0.0.0.0:8080/custom.index.tar.gz
diff --git a/test/integration/tests/3397-ghc-solver/Main.hs b/test/integration/tests/3397-ghc-solver/Main.hs
deleted file mode 100644
index 137c3db9a2..0000000000
--- a/test/integration/tests/3397-ghc-solver/Main.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-{--
-
-import StackTest
-
-main :: IO ()
-main = do
-  removeFileIgnore "stack.yaml"
-  removeFileIgnore "issue3397.cabal"
-  stack ["init", "--solver", "--resolver", "ghc-8.2.2"]
-  stack ["solver", "--update-config"]
-
-// --}
-
-main :: IO ()
-main = putStrLn "This test is disabled (see https://github.com/commercialhaskell/stack/issues/4410)."
diff --git a/test/integration/tests/3397-ghc-solver/files/.gitignore b/test/integration/tests/3397-ghc-solver/files/.gitignore
deleted file mode 100644
index 85a0a53562..0000000000
--- a/test/integration/tests/3397-ghc-solver/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.cabal
-stack.yaml
diff --git a/test/integration/tests/3397-ghc-solver/files/package.yaml b/test/integration/tests/3397-ghc-solver/files/package.yaml
deleted file mode 100644
index 2b19276ec4..0000000000
--- a/test/integration/tests/3397-ghc-solver/files/package.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: issue3397
-
-library:
-  dependencies:
-  - base
-  - stm
-  exposed-modules:
-  - Lib
diff --git a/test/integration/tests/3431-precompiled-works/Main.hs b/test/integration/tests/3431-precompiled-works/Main.hs
deleted file mode 100644
index 7d9e8ce5c5..0000000000
--- a/test/integration/tests/3431-precompiled-works/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-import Control.Monad
-import Data.List
-
-main :: IO ()
-main = do
-    stack ["build", "random-1.1", "--stack-yaml", "custom1/stack.yaml"]
-    stackCheckStderr ["build", "random-1.1", "--stack-yaml", "custom2/stack.yaml"] $ \out -> do
-      print out
-      unless ("precompiled" `isInfixOf` out) $ error "Didn't use precompiled!"
diff --git a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml b/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml
deleted file mode 100644
index 939c55db49..0000000000
--- a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: ghc-9.2.4
-name: custom1
-packages:
-- stm-2.5.0.0
-- acme-missiles-0.3
diff --git a/test/integration/tests/3431-precompiled-works/files/custom1/stack.yaml b/test/integration/tests/3431-precompiled-works/files/custom1/stack.yaml
deleted file mode 100644
index 818b612b05..0000000000
--- a/test/integration/tests/3431-precompiled-works/files/custom1/stack.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resolver: custom1.yaml
-packages: []
diff --git a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml
deleted file mode 100644
index 2691422861..0000000000
--- a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: ghc-9.2.4
-name: custom2
-packages:
-- stm-2.5.0.0
-- acme-missiles-0.2
diff --git a/test/integration/tests/3431-precompiled-works/files/custom2/stack.yaml b/test/integration/tests/3431-precompiled-works/files/custom2/stack.yaml
deleted file mode 100644
index ab08e1142a..0000000000
--- a/test/integration/tests/3431-precompiled-works/files/custom2/stack.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resolver: custom2.yaml
-packages: []
diff --git a/test/integration/tests/345-override-bytestring/Main.hs b/test/integration/tests/345-override-bytestring/Main.hs
deleted file mode 100644
index 248a59a3df..0000000000
--- a/test/integration/tests/345-override-bytestring/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stack ["build", "--dry-run"] -- for useful error output
-    stack ["build"]
diff --git a/test/integration/tests/345-override-bytestring/files/Foo.hs b/test/integration/tests/345-override-bytestring/files/Foo.hs
deleted file mode 100644
index d282cc6fb6..0000000000
--- a/test/integration/tests/345-override-bytestring/files/Foo.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Foo where
-
-import Data.Binary ()
-import Data.ByteString ()
diff --git a/test/integration/tests/345-override-bytestring/files/foo.cabal b/test/integration/tests/345-override-bytestring/files/foo.cabal
deleted file mode 100644
index 4c23cac18d..0000000000
--- a/test/integration/tests/345-override-bytestring/files/foo.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                foo
-version:             0.0.0
-synopsis:            foo
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  exposed-modules:   Foo
-  build-depends:     base, bytestring, binary
-  default-language:  Haskell2010
diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml
deleted file mode 100644
index f45b96f163..0000000000
--- a/test/integration/tests/345-override-bytestring/files/stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: nightly-2022-09-05
-extra-deps:
-- bytestring-0.11.3.1
-- binary-0.8.9.0
-packages:
-- .
diff --git a/test/integration/tests/3520-revision-matching/Main.hs b/test/integration/tests/3520-revision-matching/Main.hs
deleted file mode 100644
index 5d01c83bf3..0000000000
--- a/test/integration/tests/3520-revision-matching/Main.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-import StackTest
-import Control.Monad
-import Data.List
-import System.Directory
-
-main :: IO ()
-main = do
-  putStrLn "Test disabled due to switch to pantry"
-  {-
-  copyFile "bad-stack.yaml" "stack.yaml"
-  stackErrStderr ["build", "--dry-run"] $ \msg ->
-    unless ("legacy 00-index.tar.gz" `isInfixOf` msg) $
-      error "Expected a warning about 00-index usage"
-  copyFile "good-stack.yaml" "stack.yaml"
-  stack ["build", "--dry-run"]
-  -}
diff --git a/test/integration/tests/3520-revision-matching/files/.gitignore b/test/integration/tests/3520-revision-matching/files/.gitignore
deleted file mode 100644
index b894371d9b..0000000000
--- a/test/integration/tests/3520-revision-matching/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-stack.yaml
-*.cabal
diff --git a/test/integration/tests/3520-revision-matching/files/bad-stack.yaml b/test/integration/tests/3520-revision-matching/files/bad-stack.yaml
deleted file mode 100644
index 9cc624df28..0000000000
--- a/test/integration/tests/3520-revision-matching/files/bad-stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: lts-10.10
-
-package-indices:
-- name: Hackage00
-  download-prefix: https://hackage.haskell.org/package
-  http: https://hackage.haskell.org/00-index.tar.gz
diff --git a/test/integration/tests/3520-revision-matching/files/good-stack.yaml b/test/integration/tests/3520-revision-matching/files/good-stack.yaml
deleted file mode 100644
index bb0f9c3e3c..0000000000
--- a/test/integration/tests/3520-revision-matching/files/good-stack.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-resolver: lts-10.10
-
-package-indices:
-- name: Hackage00
-  download-prefix: https://hackage.haskell.org/package
-  http: https://hackage.haskell.org/00-index.tar.gz
-
-ignore-revision-mismatch: true
diff --git a/test/integration/tests/3520-revision-matching/files/package.yaml b/test/integration/tests/3520-revision-matching/files/package.yaml
deleted file mode 100644
index ed129d64f0..0000000000
--- a/test/integration/tests/3520-revision-matching/files/package.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: issue3520
-version: 0.1.0.0
-
-dependencies:
-- base
-- mtl
-
-library:
-  source-dirs: src
diff --git a/test/integration/tests/3520-revision-matching/files/src/Foo.hs b/test/integration/tests/3520-revision-matching/files/src/Foo.hs
deleted file mode 100644
index efbf93bbde..0000000000
--- a/test/integration/tests/3520-revision-matching/files/src/Foo.hs
+++ /dev/null
@@ -1 +0,0 @@
-module Foo where
diff --git a/test/integration/tests/3533-extra-deps-solver/Main.hs b/test/integration/tests/3533-extra-deps-solver/Main.hs
deleted file mode 100644
index b5bafedd7b..0000000000
--- a/test/integration/tests/3533-extra-deps-solver/Main.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-{--
-
-import StackTest
-import System.Directory
-
-main :: IO ()
-main = do
-    copyFile "orig-stack.yaml" "stack.yaml"
-    stack [defaultResolverArg, "solver", "--update-config"]
-    stack ["build"]
-
-// --}
-
-main :: IO ()
-main = putStrLn "This test is disabled (see https://github.com/commercialhaskell/stack/issues/4410)."
diff --git a/test/integration/tests/3533-extra-deps-solver/files/.gitignore b/test/integration/tests/3533-extra-deps-solver/files/.gitignore
deleted file mode 100644
index 4c65edffd7..0000000000
--- a/test/integration/tests/3533-extra-deps-solver/files/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.stack-work/
-*.cabal
-stack.yaml
diff --git a/test/integration/tests/3533-extra-deps-solver/files/local-mmorph/package.yaml b/test/integration/tests/3533-extra-deps-solver/files/local-mmorph/package.yaml
deleted file mode 100644
index 05a16e68a5..0000000000
--- a/test/integration/tests/3533-extra-deps-solver/files/local-mmorph/package.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: mmorph
-version: 1.2.0
-
-dependencies:
-- base
-- acme-missiles
-
-library:
-  source-dirs:
-  - src
diff --git a/test/integration/tests/3533-extra-deps-solver/files/local-mmorph/src/Lib.hs b/test/integration/tests/3533-extra-deps-solver/files/local-mmorph/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/3533-extra-deps-solver/files/local-mmorph/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml
deleted file mode 100644
index edd13b06ff..0000000000
--- a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: nightly-2022-09-05
-
-packages:
-- ./local-mmorph
-- ./uses-mmorph
diff --git a/test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/package.yaml b/test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/package.yaml
deleted file mode 100644
index cd73e5ab0f..0000000000
--- a/test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/package.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: uses-mmorph
-version: 1.2.0
-
-dependencies:
-- base
-- mmorph >= 1.1
-
-library:
-  source-dirs:
-  - src
diff --git a/test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/src/Lib.hs b/test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/3574-extra-dep-local/Main.hs b/test/integration/tests/3574-extra-dep-local/Main.hs
deleted file mode 100644
index b1b93683df..0000000000
--- a/test/integration/tests/3574-extra-dep-local/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stack ["build", "foo"]
diff --git a/test/integration/tests/3574-extra-dep-local/files/foo/Foo.hs b/test/integration/tests/3574-extra-dep-local/files/foo/Foo.hs
deleted file mode 100644
index a23b501b27..0000000000
--- a/test/integration/tests/3574-extra-dep-local/files/foo/Foo.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module Foo(foo) where
-
-foo = "foo"
diff --git a/test/integration/tests/3574-extra-dep-local/files/foo/foo.cabal b/test/integration/tests/3574-extra-dep-local/files/foo/foo.cabal
deleted file mode 100644
index b37e615a97..0000000000
--- a/test/integration/tests/3574-extra-dep-local/files/foo/foo.cabal
+++ /dev/null
@@ -1,8 +0,0 @@
-cabal-version:      >= 1.2
-build-type:         Simple
-name:               foo
-version:            0
-
-library
-    build-depends: base
-    exposed-modules: Foo
diff --git a/test/integration/tests/3574-extra-dep-local/files/stack.yaml b/test/integration/tests/3574-extra-dep-local/files/stack.yaml
deleted file mode 100644
index ed2a16fd7f..0000000000
--- a/test/integration/tests/3574-extra-dep-local/files/stack.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-resolver: ghc-9.2.4
-
-packages: []
-
-extra-deps:
-- foo
-
-ghc-options:
-  $locals: -bob
diff --git a/test/integration/tests/3591-cabal-warnings-once/Main.hs b/test/integration/tests/3591-cabal-warnings-once/Main.hs
deleted file mode 100644
index 4efb8cb5e8..0000000000
--- a/test/integration/tests/3591-cabal-warnings-once/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-import Data.List (isInfixOf)
-
-main :: IO ()
-main = do
-  stackCheckStderr ["build", "--dry-run"] $ \str ->
-    case filter ("unknown-field-name" `isInfixOf`) (lines str) of
-      [] -> error "unknown-field-name didn't appear once"
-      [_] -> pure ()
-      _:_:_ -> error "unknown-field-name appeared multiple times"
diff --git a/test/integration/tests/3591-cabal-warnings-once/files/foo.cabal b/test/integration/tests/3591-cabal-warnings-once/files/foo.cabal
deleted file mode 100644
index 411bd8742d..0000000000
--- a/test/integration/tests/3591-cabal-warnings-once/files/foo.cabal
+++ /dev/null
@@ -1,16 +0,0 @@
--- This file has been generated from package.yaml by hpack version 0.20.0.
---
--- see: https://github.com/sol/hpack
---
--- hash: 43a4e1612fc5dee2ab88c588fee639840be01569a600ab2955961c341b89058d
-
-name:           foo
-version:        0.1.0.0
-build-type:     Simple
-cabal-version:  >= 1.10
-
-unknown-field-name: makes a warning!
-
-library
-  hs-source-dirs: src
-  exposed-modules: Lib
diff --git a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/3631-build-http2/Main.hs b/test/integration/tests/3631-build-http2/Main.hs
deleted file mode 100644
index e5c2bd0142..0000000000
--- a/test/integration/tests/3631-build-http2/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["build", defaultResolverArg, "--dry-run", "http2"]
-  stack ["build", defaultResolverArg, "http2"]
diff --git a/test/integration/tests/365-invalid-success/Main.hs b/test/integration/tests/365-invalid-success/Main.hs
deleted file mode 100644
index b978282dd4..0000000000
--- a/test/integration/tests/365-invalid-success/Main.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stackErr ["build"]
-    stackErr ["build"]
-    writeFile "app/Foo.hs" "module Foo where"
-    stack ["build"]
-    writeFile "app/Foo.hs" "module Foo wher e"
-    stackErr ["build"]
-    stackErr ["build"]
diff --git a/test/integration/tests/365-invalid-success/files/.gitignore b/test/integration/tests/365-invalid-success/files/.gitignore
deleted file mode 100644
index 8fec4903f5..0000000000
--- a/test/integration/tests/365-invalid-success/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-app/Foo.hs
diff --git a/test/integration/tests/365-invalid-success/files/app/Main.hs b/test/integration/tests/365-invalid-success/files/app/Main.hs
deleted file mode 100644
index 0d6c14399b..0000000000
--- a/test/integration/tests/365-invalid-success/files/app/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import Foo
-
-main :: IO ()
-main = pure ()
diff --git a/test/integration/tests/365-invalid-success/files/new-template.cabal b/test/integration/tests/365-invalid-success/files/new-template.cabal
deleted file mode 100644
index 6ab719dc58..0000000000
--- a/test/integration/tests/365-invalid-success/files/new-template.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
-name:                new-template
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-executable new-template-exe
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-  default-language:    Haskell2010
-  other-modules:       Foo
diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml
deleted file mode 100644
index 0ba9c320d5..0000000000
--- a/test/integration/tests/365-invalid-success/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/366-non-root-dir/Main.hs b/test/integration/tests/366-non-root-dir/Main.hs
deleted file mode 100644
index f1dd62cefb..0000000000
--- a/test/integration/tests/366-non-root-dir/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-import System.Directory
-
-main :: IO ()
-main = do
-    removeDirIgnore ".stack-work"
-    stackErr ["exec", "hello-world"]
-    setCurrentDirectory "app"
-    stack ["build"]
-    stack ["exec", "hello-world"]
diff --git a/test/integration/tests/366-non-root-dir/files/new-template.cabal b/test/integration/tests/366-non-root-dir/files/new-template.cabal
deleted file mode 100644
index 1ce3458647..0000000000
--- a/test/integration/tests/366-non-root-dir/files/new-template.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
-name:                new-template
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-executable hello-world
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml
deleted file mode 100644
index 0ba9c320d5..0000000000
--- a/test/integration/tests/366-non-root-dir/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/3685-config-yaml-for-allow-newer/Main.hs b/test/integration/tests/3685-config-yaml-for-allow-newer/Main.hs
deleted file mode 100644
index 6b56e9f48b..0000000000
--- a/test/integration/tests/3685-config-yaml-for-allow-newer/Main.hs
+++ /dev/null
@@ -1,24 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-import System.Directory
-
-main :: IO ()
-main = do
-  removeFileIgnore "stack.yaml"
-  stack ["init", defaultResolverArg]
-  (_, stdErr) <- stackStderr ["install", "intero-0.1.23"]
-  -- here we check stderr for 'allow-newer: true' and
-  -- config.yaml sitting either on the same line or on
-  -- two consecutive lines
-  let errLines = lines stdErr
-      hasNewer l = "'allow-newer: true'" `isInfixOf` l
-      withNewer = map hasNewer errLines
-      userConfig = "config.yaml"
-      hasConfigForAllowNewer prevNewer l =
-         (prevNewer || hasNewer l) &&
-        userConfig `isInfixOf` l
-      hasProperLines =
-        or $ zipWith hasConfigForAllowNewer (False:withNewer) errLines
-  unless hasProperLines $
-    error $ "Not stderr lines with 'allow-newer: true' and " ++ userConfig
diff --git a/test/integration/tests/3685-config-yaml-for-allow-newer/files/.gitignore b/test/integration/tests/3685-config-yaml-for-allow-newer/files/.gitignore
deleted file mode 100644
index 684dbffa96..0000000000
--- a/test/integration/tests/3685-config-yaml-for-allow-newer/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-stack.yaml
diff --git a/test/integration/tests/3685-config-yaml-for-allow-newer/files/files.cabal b/test/integration/tests/3685-config-yaml-for-allow-newer/files/files.cabal
deleted file mode 100644
index 917c8f3f46..0000000000
--- a/test/integration/tests/3685-config-yaml-for-allow-newer/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:           files
-version:        0.1.0.0
-build-type:     Simple
-cabal-version:  >= 2.0
-
-library
-  exposed-modules: Src
-  hs-source-dirs: src
-  build-depends: base
-  default-language: Haskell2010
diff --git a/test/integration/tests/3685-config-yaml-for-allow-newer/files/src/Src.hs b/test/integration/tests/3685-config-yaml-for-allow-newer/files/src/Src.hs
deleted file mode 100644
index 0f8db7fb77..0000000000
--- a/test/integration/tests/3685-config-yaml-for-allow-newer/files/src/Src.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module Src where
-
--- | A function of the main library
-funMainLib :: Int -> Int
-funMainLib = succ
diff --git a/test/integration/tests/370-invalid-setup-hs/Main.hs b/test/integration/tests/370-invalid-setup-hs/Main.hs
deleted file mode 100644
index e61b083aa4..0000000000
--- a/test/integration/tests/370-invalid-setup-hs/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stack ["build"]
diff --git a/test/integration/tests/370-invalid-setup-hs/files/LICENSE b/test/integration/tests/370-invalid-setup-hs/files/LICENSE
deleted file mode 100644
index d05408d876..0000000000
--- a/test/integration/tests/370-invalid-setup-hs/files/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Your name here nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/test/integration/tests/370-invalid-setup-hs/files/Setup.hs b/test/integration/tests/370-invalid-setup-hs/files/Setup.hs
deleted file mode 100644
index 4b147db695..0000000000
--- a/test/integration/tests/370-invalid-setup-hs/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Make (defaultMain)
-main = defaultMain
diff --git a/test/integration/tests/370-invalid-setup-hs/files/new-template.cabal b/test/integration/tests/370-invalid-setup-hs/files/new-template.cabal
deleted file mode 100644
index 7306959dcc..0000000000
--- a/test/integration/tests/370-invalid-setup-hs/files/new-template.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
-name:                new-template
-version:             0.1.0.0
-synopsis:            Initial project template from stack
-description:         Please see README.md
-homepage:            http://github.com/name/project
-license:             BSD3
-license-file:        LICENSE
-author:              Your name here
-maintainer:          your.address@example.com
-category:            Web
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/370-invalid-setup-hs/files/src/Lib.hs b/test/integration/tests/370-invalid-setup-hs/files/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/370-invalid-setup-hs/files/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml b/test/integration/tests/370-invalid-setup-hs/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs b/test/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs
deleted file mode 100644
index 09bd4aa3b0..0000000000
--- a/test/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["clean"]
-  stack ["build"]
diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/exe/Main.hs b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/exe/Main.hs
deleted file mode 100644
index 83db768ed3..0000000000
--- a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/exe/Main.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = putStrLn "OK"
diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/files.cabal b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/files.cabal
deleted file mode 100644
index 631f10c48d..0000000000
--- a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/files.cabal
+++ /dev/null
@@ -1,16 +0,0 @@
-name:           files
-version:        0.1.0.0
-build-type:     Simple
-cabal-version:  >= 2.0
-
-library sublib
-  exposed-modules: B
-  hs-source-dirs: src-sublib
-  build-depends: base
-  default-language: Haskell2010
-
-executable exe
-  main-is: Main.hs
-  hs-source-dirs: exe
-  build-depends: base, sublib
-  default-language: Haskell2010
diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/src-sublib/B.hs b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/src-sublib/B.hs
deleted file mode 100644
index 53253d5dcc..0000000000
--- a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/src-sublib/B.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module B where
-
--- | A function of the internal library
-funInternal :: Int -> Int
-funInternal = pred
diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/384-local-deps/Main.hs b/test/integration/tests/384-local-deps/Main.hs
deleted file mode 100644
index fe0186368f..0000000000
--- a/test/integration/tests/384-local-deps/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    removeFileIgnore "stack.yaml"
-    stack ["init", defaultResolverArg]
-    stack ["test"]
diff --git a/test/integration/tests/384-local-deps/files/.gitignore b/test/integration/tests/384-local-deps/files/.gitignore
deleted file mode 100644
index 684dbffa96..0000000000
--- a/test/integration/tests/384-local-deps/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-stack.yaml
diff --git a/test/integration/tests/384-local-deps/files/dir1/dir1.cabal b/test/integration/tests/384-local-deps/files/dir1/dir1.cabal
deleted file mode 100644
index 87ea412999..0000000000
--- a/test/integration/tests/384-local-deps/files/dir1/dir1.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                dir1
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/384-local-deps/files/dir1/src/Lib.hs b/test/integration/tests/384-local-deps/files/dir1/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/384-local-deps/files/dir1/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/384-local-deps/files/dir2/dir2.cabal b/test/integration/tests/384-local-deps/files/dir2/dir2.cabal
deleted file mode 100644
index 40d8a85084..0000000000
--- a/test/integration/tests/384-local-deps/files/dir2/dir2.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                dir2
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5, dir1
-  default-language:    Haskell2010
diff --git a/test/integration/tests/384-local-deps/files/dir2/src/Lib.hs b/test/integration/tests/384-local-deps/files/dir2/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/384-local-deps/files/dir2/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/3850-cached-templates-network-errors/Main.hs b/test/integration/tests/3850-cached-templates-network-errors/Main.hs
deleted file mode 100644
index e136507279..0000000000
--- a/test/integration/tests/3850-cached-templates-network-errors/Main.hs
+++ /dev/null
@@ -1,38 +0,0 @@
-import StackTest
-import Control.Monad (when, unless)
-import Data.List (isInfixOf)
-import Data.Maybe (fromMaybe)
-import System.Directory
-import System.Environment (lookupEnv, setEnv)
-import System.FilePath
-
-main :: IO ()
-main = when isLinux $ do
-  performCachingTest templateUrl
-  performCachingTest githubTemplate
-  where
-    performCachingTest :: String -> IO ()
-    performCachingTest template = do
-      let arguments = ["new", "tmp", template]
-      originalHttpProxy <- lookupEnv "HTTPS_PROXY"
-      stack arguments
-      removeDirectoryRecursive "tmp"
-      setEnv "HTTPS_PROXY" "http://sdsgsfgslfgsjflgkjs" -- make https requests fail
-      stackCheckStderr arguments $ \stderr ->
-        unless ("Using cached local version" `isInfixOf` stderr)
-        (error "stack didn't load the cached template")
-
-      removeDirectoryRecursive "tmp"
-      setEnv "HTTPS_PROXY" (fromMaybe "" originalHttpProxy)
-
-    -- this template has a `stack.yaml` file
-    -- so `stack new` does not have to `stack init`
-    -- and therefore the test runs faster
-    templateUrl :: String
-    templateUrl =
-      "https://raw.githubusercontent.com/commercialhaskell/stack-templates/986836cc85b0c8c5bbb78d7b94347ba095089b03/tasty-discover.hsfiles"
-
-    -- the same template, cached differently
-    githubTemplate :: String
-    githubTemplate = "github:commercialhaskell/tasty-discover.hsfiles"
-
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs b/test/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs
deleted file mode 100644
index 38e0123f5b..0000000000
--- a/test/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stackIgnoreException ["clean", "--stack-yaml", "stack-good.yaml", "--full"]
-  stackErr ["build", "--stack-yaml", "stack-bad.yaml"]
-  stack ["build", "--stack-yaml", "stack-good.yaml"]
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore
deleted file mode 100644
index 0afa51175a..0000000000
--- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-foo.cabal
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml
deleted file mode 100644
index aaa0f35c7c..0000000000
--- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: foo
-version: 0
-
-dependencies:
-- base
-- bad-bounds
-
-library: {}
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml
deleted file mode 100644
index ddb89a7055..0000000000
--- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-resolver: ghc-9.2.4
-packages:
-- ./bad-bounds.tar
-
-# Include a flag to get a different snapshot hash
-flags:
-  bad-bounds:
-    unimportant: false
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml
deleted file mode 100644
index f85922da9d..0000000000
--- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-resolver: ghc-9.2.4
-extra-deps:
-- ./bad-bounds.tar
-
-# Include a flag to get a different snapshot hash
-flags:
-  bad-bounds:
-    unimportant: true
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml
deleted file mode 100644
index 6de0480e0e..0000000000
--- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: snapshot.yaml
diff --git a/test/integration/tests/3863-purge-command/Main.hs b/test/integration/tests/3863-purge-command/Main.hs
deleted file mode 100644
index a40a9e1528..0000000000
--- a/test/integration/tests/3863-purge-command/Main.hs
+++ /dev/null
@@ -1,48 +0,0 @@
-{-# LANGUAGE ViewPatterns #-}
-
-import StackTest
-import Data.Char (isSpace)
-import Data.List (dropWhileEnd)
-import Data.Maybe (listToMaybe, fromMaybe)
-import Control.Monad (unless)
-import System.Directory
-import System.FilePath
-
-trimEnd :: String -> String
-trimEnd = dropWhileEnd isSpace
-
-main :: IO ()
-main =
-  -- For these commands, we'll need to know the `dist` directory.
-  -- This is usually `.stack-work/dist/$compiler-variant/Cabal-xxxx`
-  stackCheckStdout [defaultResolverArg, "path", "--dist-dir"] $ \(trimEnd -> distDir) -> do
-    stackCheckStdout [defaultResolverArg, "path", "--local-install-root"] $ \(trimEnd -> localInstallRoot) -> do
-      -- Usually `.stack-work`
-      let stackWork = fromMaybe (error "There must be a Stack working directory.") $
-            listToMaybe (splitDirectories distDir)
-
-      -- First, clean the .stack-work directory.
-      -- This is only necessary when running individual tests.
-      stackIgnoreException [defaultResolverArg, "purge"]
-      -- See #4936 for details regarding the windows condition
-      unless isWindows $ doesNotExist stackWork
-
-      -- The dist directory should exist after a build
-      stack [defaultResolverArg, "build"]
-      doesExist distDir
-      doesExist localInstallRoot
-      doesExist stackWork
-
-      -- The dist directory should not exist after a clean, whereas the
-      -- .stack-work directory should
-      stackIgnoreException [defaultResolverArg, "clean"]
-      -- See #4936 for details regarding the windows condition
-      unless isWindows $ do
-        doesNotExist distDir
-        doesExist localInstallRoot
-        doesExist stackWork
-
-      -- The .stack-work directory should not exist after a purge
-      stackIgnoreException [defaultResolverArg, "purge"]
-      -- See #4936 for details regarding the windows condition
-      unless isWindows $ doesNotExist stackWork
diff --git a/test/integration/tests/3863-purge-command/files/new-template.cabal b/test/integration/tests/3863-purge-command/files/new-template.cabal
deleted file mode 100644
index 192e0b2dfb..0000000000
--- a/test/integration/tests/3863-purge-command/files/new-template.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
-name:                new-template
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/3863-purge-command/files/src/Lib.hs b/test/integration/tests/3863-purge-command/files/src/Lib.hs
deleted file mode 100644
index 1c88a82644..0000000000
--- a/test/integration/tests/3863-purge-command/files/src/Lib.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Lib where
-
-someFunc :: ()
-someFunc = ()
diff --git a/test/integration/tests/3863-purge-command/files/stack.yaml b/test/integration/tests/3863-purge-command/files/stack.yaml
deleted file mode 100644
index 0ba9c320d5..0000000000
--- a/test/integration/tests/3863-purge-command/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/Main.hs b/test/integration/tests/3899-dont-rebuild-sublibraries/Main.hs
deleted file mode 100644
index fa6835ebe7..0000000000
--- a/test/integration/tests/3899-dont-rebuild-sublibraries/Main.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["clean"]
-  stack ["build"]
-  res <- compilingModulesLines . snd <$> stackStderr ["build"]
-  unless (null res) $ fail "Stack recompiled code"
-
--- Returns the lines where a module is compiled
-compilingModulesLines :: String -> [String]
-compilingModulesLines = filter (isInfixOf " Compiling ") . lines
diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/Setup.hs b/test/integration/tests/3899-dont-rebuild-sublibraries/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/3899-dont-rebuild-sublibraries/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/files.cabal b/test/integration/tests/3899-dont-rebuild-sublibraries/files/files.cabal
deleted file mode 100644
index 867797cb7b..0000000000
--- a/test/integration/tests/3899-dont-rebuild-sublibraries/files/files.cabal
+++ /dev/null
@@ -1,22 +0,0 @@
-name:           files
-version:        0.1.0.0
-build-type:     Simple
-cabal-version:  >= 2.0
-
-library
-  hs-source-dirs:   src
-  exposed-modules:  Lib
-  build-depends:    base, lib
-  default-language: Haskell2010
-
-library lib
-  hs-source-dirs:   src-internal
-  exposed-modules:  Internal
-  build-depends:    base
-  default-language: Haskell2010
-
-executable exe
-  hs-source-dirs:   src-exe
-  main-is:          Main.hs
-  build-depends:    base, files
-  default-language: Haskell2010
diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/src-exe/Main.hs b/test/integration/tests/3899-dont-rebuild-sublibraries/files/src-exe/Main.hs
deleted file mode 100644
index cafae24793..0000000000
--- a/test/integration/tests/3899-dont-rebuild-sublibraries/files/src-exe/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Main where
-
-import Lib
-
-main :: IO ()
-main = do
-  putStrLn "hello world"
diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml b/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml
deleted file mode 100644
index 4f0854d44b..0000000000
--- a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: ghc-9.2.4
-extra-deps:
-- stm-2.4.4.1
-- mtl-2.2.1
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/Main.hs b/test/integration/tests/3926-ghci-with-sublibraries/Main.hs
deleted file mode 100644
index 08c9c20bf7..0000000000
--- a/test/integration/tests/3926-ghci-with-sublibraries/Main.hs
+++ /dev/null
@@ -1,45 +0,0 @@
-import Control.Concurrent
-import Control.Monad.IO.Class
-import Control.Monad
-import Data.List
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["clean"] -- to make sure we can load the code even after a clean
-  copy "src/Lib.v1" "src/Lib.hs"
-  copy "src-internal/Internal.v1" "src-internal/Internal.hs"
-  stack ["build"] -- need a build before ghci at the moment, see #4148
-  forkIO fileEditingThread
-  replThread
-
-replThread :: IO ()
-replThread = repl [] $ do
-  replCommand ":main"
-  line <- replGetLine
-  when (line /= "hello world") $ error "Main module didn't load correctly."
-  liftIO $ threadDelay 1000000 -- wait for an edit of the internal library
-  reloadAndTest "testInt" "42" "Internal library didn't reload."
-  liftIO $ threadDelay 1000000 -- wait for an edit of the internal library
-  reloadAndTest "testStr" "\"OK\"" "Main library didn't reload."
-
-fileEditingThread :: IO ()
-fileEditingThread = do
-  threadDelay 1000000
-  -- edit the internal library and pure to ghci
-  copy "src-internal/Internal.v2" "src-internal/Internal.hs"
-  threadDelay 1000000
-  -- edit the internal library and end thread, returning to ghci
-  copy "src/Lib.v2" "src/Lib.hs"
-
-reloadAndTest :: String -> String -> String -> Repl ()
-reloadAndTest cmd exp err = do
-  reload
-  replCommand cmd
-  line <- replGetLine
-  unless (exp `isSuffixOf` line) $ error err
-
-reload :: Repl ()
-reload = replCommand ":reload" >> loop
-  where
-    loop = replGetLine >>= \line -> unless ("Ok" `isInfixOf` line) loop
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/.gitignore b/test/integration/tests/3926-ghci-with-sublibraries/files/.gitignore
deleted file mode 100644
index 54bdefd6ee..0000000000
--- a/test/integration/tests/3926-ghci-with-sublibraries/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-src/Lib.hs
-src-internal/Internal.hs
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/Setup.hs b/test/integration/tests/3926-ghci-with-sublibraries/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/3926-ghci-with-sublibraries/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal b/test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal
deleted file mode 100644
index 867797cb7b..0000000000
--- a/test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal
+++ /dev/null
@@ -1,22 +0,0 @@
-name:           files
-version:        0.1.0.0
-build-type:     Simple
-cabal-version:  >= 2.0
-
-library
-  hs-source-dirs:   src
-  exposed-modules:  Lib
-  build-depends:    base, lib
-  default-language: Haskell2010
-
-library lib
-  hs-source-dirs:   src-internal
-  exposed-modules:  Internal
-  build-depends:    base
-  default-language: Haskell2010
-
-executable exe
-  hs-source-dirs:   src-exe
-  main-is:          Main.hs
-  build-depends:    base, files
-  default-language: Haskell2010
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src-exe/Main.hs b/test/integration/tests/3926-ghci-with-sublibraries/files/src-exe/Main.hs
deleted file mode 100644
index cafae24793..0000000000
--- a/test/integration/tests/3926-ghci-with-sublibraries/files/src-exe/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Main where
-
-import Lib
-
-main :: IO ()
-main = do
-  putStrLn "hello world"
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v2 b/test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v2
deleted file mode 100644
index da8a642c7b..0000000000
--- a/test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v2
+++ /dev/null
@@ -1,4 +0,0 @@
-module Internal where
-
-testInt :: Int
-testInt = 42
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2 b/test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2
deleted file mode 100644
index d9892d6826..0000000000
--- a/test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib where
-
-import Internal
-
-testStr :: String
-testStr = "OK"
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml b/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml
deleted file mode 100644
index 4f0854d44b..0000000000
--- a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: ghc-9.2.4
-extra-deps:
-- stm-2.4.4.1
-- mtl-2.2.1
diff --git a/test/integration/tests/3940-base-upgrade-warning/Main.hs b/test/integration/tests/3940-base-upgrade-warning/Main.hs
deleted file mode 100644
index f79bbfb7a5..0000000000
--- a/test/integration/tests/3940-base-upgrade-warning/Main.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-unattainableBaseWarning :: String
-unattainableBaseWarning =
-  "Build requires unattainable version of base. Since base is a part of GHC, \
-  \you most likely need to use a different GHC version with the matching base."
-
-noBaseUpgradeWarning :: String
-noBaseUpgradeWarning =
-  "You are trying to upgrade/downgrade base, which is almost certainly \
-  \not what you really want. Please, consider using another GHC version \
-  \if you need a certain version of base, or removing base from extra-deps. \
-  \See more at https://github.com/commercialhaskell/stack/issues/3940."
-
-main :: IO ()
-main = do
-  stackErrStderr ["build", "--stack-yaml", "unattainable-base.yaml"] (expectMessage unattainableBaseWarning)
-  stackErrStderr ["build", "--stack-yaml", "no-base-upgrade.yaml"] (expectMessage noBaseUpgradeWarning)
-
-expectMessage :: String -> String -> IO ()
-expectMessage msg stderr =
-  unless (words msg `isInfixOf` words stderr)
-         (error $ "Expected a warning: \n" ++ show msg)
diff --git a/test/integration/tests/3940-base-upgrade-warning/files/files.cabal b/test/integration/tests/3940-base-upgrade-warning/files/files.cabal
deleted file mode 100644
index 1a0eb3c82e..0000000000
--- a/test/integration/tests/3940-base-upgrade-warning/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                   files
-version:                0.0.1.0
-build-type:             Simple
-cabal-version:          >= 1.18
-
-library
-  hs-source-dirs:       src
-  exposed-modules:      Lib
-  build-depends:        base < 4.10 && >= 4.6.0.1
-  default-language:     Haskell2010
diff --git a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml b/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml
deleted file mode 100644
index 975e782ac5..0000000000
--- a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: nightly-2022-09-05
-extra-deps:
-- base-4.10.1.0
diff --git a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml b/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/3942-solver-error-output/Main.hs b/test/integration/tests/3942-solver-error-output/Main.hs
deleted file mode 100644
index 2e3482683c..0000000000
--- a/test/integration/tests/3942-solver-error-output/Main.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-planFailure :: String
-planFailure =
-  "While constructing the build plan, the following exceptions were encountered:"
-
-main :: IO ()
-main = do
-  stackErrStderr ["./script.hs"] (expectMessage planFailure)
-
-expectMessage :: String -> String -> IO ()
-expectMessage msg stderr = do
-  unless (words msg `isInfixOf` words stderr)
-         (error $ "Expected a warning: \n" ++ show msg)
diff --git a/test/integration/tests/3942-solver-error-output/files/.gitignore b/test/integration/tests/3942-solver-error-output/files/.gitignore
deleted file mode 100644
index 4c65edffd7..0000000000
--- a/test/integration/tests/3942-solver-error-output/files/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.stack-work/
-*.cabal
-stack.yaml
diff --git a/test/integration/tests/3942-solver-error-output/files/no-deps/package.yaml b/test/integration/tests/3942-solver-error-output/files/no-deps/package.yaml
deleted file mode 100644
index 63f22d1796..0000000000
--- a/test/integration/tests/3942-solver-error-output/files/no-deps/package.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: no-deps
-version: 0.1.0.0
-synopsis: A package with no dependencies, other than base
-license: BSD3
-author: Author name here
-copyright: 2000 Author name here
-category: Development
-extra-source-files: []
-
-dependencies:
-- base
-
-library:
-  source-dirs: '.'
-  exposed-modules: []
diff --git a/test/integration/tests/3942-solver-error-output/files/one-deps/package.yaml b/test/integration/tests/3942-solver-error-output/files/one-deps/package.yaml
deleted file mode 100644
index 59dce7c0fe..0000000000
--- a/test/integration/tests/3942-solver-error-output/files/one-deps/package.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: one-deps
-version: 0.1.0.0
-synopsis: A package with one dependency (no-deps) other than base
-license: BSD3
-author: Author name here
-copyright: 2000 Author name here
-category: Development
-extra-source-files: []
-
-dependencies:
-- base
-- no-deps
-
-library:
-  source-dirs: '.'
-  exposed-modules: []
diff --git a/test/integration/tests/3942-solver-error-output/files/script.hs b/test/integration/tests/3942-solver-error-output/files/script.hs
deleted file mode 100755
index 51083db266..0000000000
--- a/test/integration/tests/3942-solver-error-output/files/script.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env stack
--- stack runhaskell --stack-yaml test-stack.yml --package one-deps
-
-main :: IO ()
-main = putStrLn "yo"
diff --git a/test/integration/tests/3942-solver-error-output/files/test-stack.yml b/test/integration/tests/3942-solver-error-output/files/test-stack.yml
deleted file mode 100644
index 05be0e6106..0000000000
--- a/test/integration/tests/3942-solver-error-output/files/test-stack.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: nightly-2022-09-05
-
-packages: []
-
-extra-deps:
-- ./one-deps
diff --git a/test/integration/tests/3959-order-of-flags/Main.hs b/test/integration/tests/3959-order-of-flags/Main.hs
deleted file mode 100644
index 650bf92469..0000000000
--- a/test/integration/tests/3959-order-of-flags/Main.hs
+++ /dev/null
@@ -1,21 +0,0 @@
-import StackTest
-
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-
--- Integration test for https://github.com/commercialhaskell/stack/issues/3959
-main :: IO ()
-main = do
-  checkFlagsBeforeCommand
-  checkFlagsAfterCommand
-
-checkFlagsBeforeCommand :: IO ()
-checkFlagsBeforeCommand = stackCheckStderr ["--test", "--no-run-tests", "build"] checker
-
-checkFlagsAfterCommand :: IO ()
-checkFlagsAfterCommand = stackCheckStderr ["build", "--test", "--no-run-tests"] checker
-
-checker :: String -> IO ()
-checker output = do
-  let testsAreDisabled = any (\ln -> "Test running disabled by" `isInfixOf` ln) (lines output)
-  unless testsAreDisabled $ fail "Tests should not be run"
diff --git a/test/integration/tests/3959-order-of-flags/files/.gitignore b/test/integration/tests/3959-order-of-flags/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/3959-order-of-flags/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/3959-order-of-flags/files/package.yaml b/test/integration/tests/3959-order-of-flags/files/package.yaml
deleted file mode 100644
index 0eb6d8f2f9..0000000000
--- a/test/integration/tests/3959-order-of-flags/files/package.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: issue3959
-version: 0.1.0.0
-
-dependencies:
-- base
-
-tests:
-  test:
-    main: Spec.hs
-    source-dirs: test
diff --git a/test/integration/tests/3959-order-of-flags/files/stack.yaml b/test/integration/tests/3959-order-of-flags/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/3959-order-of-flags/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/397-case-insensitive-flags/Main.hs b/test/integration/tests/397-case-insensitive-flags/Main.hs
deleted file mode 100644
index 65bbe49cc7..0000000000
--- a/test/integration/tests/397-case-insensitive-flags/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stackErr ["build"]
-    stack ["build", "--flag", "new-template:fixIt"]
-    stack ["build", "--flag", "new-template:fixit"]
-    stack ["build", "--flag", "new-template:fiXit"]
-    stack ["build", "--flag", "*:fiXit"]
-    stackErr ["build", "--flag", "*:fiXit-else"]
diff --git a/test/integration/tests/397-case-insensitive-flags/files/new-template.cabal b/test/integration/tests/397-case-insensitive-flags/files/new-template.cabal
deleted file mode 100644
index f9c9dd087a..0000000000
--- a/test/integration/tests/397-case-insensitive-flags/files/new-template.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
-name:                new-template
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-flag fixIt
-  manual: True
-  default: False
-  description: Make the build work
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  default-language:    Haskell2010
-  if flag(fixIt)
-    build-depends: base >= 4.7
-  else
-    build-depends: base < 4.7 && > 4.7
diff --git a/test/integration/tests/397-case-insensitive-flags/files/src/Lib.hs b/test/integration/tests/397-case-insensitive-flags/files/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/397-case-insensitive-flags/files/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/3996-sublib-not-depended-upon/Main.hs b/test/integration/tests/3996-sublib-not-depended-upon/Main.hs
deleted file mode 100644
index d2479bd056..0000000000
--- a/test/integration/tests/3996-sublib-not-depended-upon/Main.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["clean"]
-  stack ["build"]
diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/Setup.hs b/test/integration/tests/3996-sublib-not-depended-upon/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/3996-sublib-not-depended-upon/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/files.cabal b/test/integration/tests/3996-sublib-not-depended-upon/files/files.cabal
deleted file mode 100644
index bf9a55bd17..0000000000
--- a/test/integration/tests/3996-sublib-not-depended-upon/files/files.cabal
+++ /dev/null
@@ -1,16 +0,0 @@
-name:           files
-version:        0.1.0.0
-build-type:     Simple
-cabal-version:  >= 2.0
-
-library
-  hs-source-dirs:   src
-  exposed-modules:  Lib
-  build-depends:    base
-  default-language: Haskell2010
-
-library lib
-  hs-source-dirs:   src-internal
-  exposed-modules:  Internal
-  build-depends:    base
-  default-language: Haskell2010
diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/src-internal/Internal.hs b/test/integration/tests/3996-sublib-not-depended-upon/files/src-internal/Internal.hs
deleted file mode 100644
index 462baca786..0000000000
--- a/test/integration/tests/3996-sublib-not-depended-upon/files/src-internal/Internal.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Internal where
-
-test :: Int
-test = 42
diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs b/test/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs
deleted file mode 100644
index a35e444b85..0000000000
--- a/test/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Lib where
-
-testLib :: Int
-testLib = 42
diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml b/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml
deleted file mode 100644
index 4f0854d44b..0000000000
--- a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: ghc-9.2.4
-extra-deps:
-- stm-2.4.4.1
-- mtl-2.2.1
diff --git a/test/integration/tests/3997-coverage-with-cabal-3/Main.hs b/test/integration/tests/3997-coverage-with-cabal-3/Main.hs
deleted file mode 100644
index 56d487f527..0000000000
--- a/test/integration/tests/3997-coverage-with-cabal-3/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-main :: IO ()
-main = do
-    stack ["setup"]
-    stackCheckStderr ["test", "--coverage"] $ \out -> do
-        unless ("The coverage report for foo's test-suite \"foo-test\" is available at" `isInfixOf` out) $
-            fail "Coverage report didn't build"
diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/package.yaml b/test/integration/tests/3997-coverage-with-cabal-3/files/package.yaml
deleted file mode 100644
index d4a5b288c7..0000000000
--- a/test/integration/tests/3997-coverage-with-cabal-3/files/package.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: foo
-
-dependencies:
-- base
-
-library:
-  source-dirs: src
-
-tests:
-  foo-test:
-    source-dirs: test
-    main: Main.hs
-    dependencies:
-    - foo
diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml b/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/4001-excess-recompilation/Main.hs b/test/integration/tests/4001-excess-recompilation/Main.hs
deleted file mode 100644
index 20b99b9a5a..0000000000
--- a/test/integration/tests/4001-excess-recompilation/Main.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-main :: IO ()
-main = do
-  copy "test/Main1.hs" "test/Main.hs"
-  copy "bench/Main1.hs" "bench/Main.hs"
-  stack ["build"]
-
-  copy "test/Main2.hs" "test/Main.hs"
-  copy "bench/Main2.hs" "bench/Main.hs"
-  res <- unregisteringLines . snd <$> stackStderr ["build"]
-  removeFileIgnore "test/Main.hs"
-  removeFileIgnore "bench/Main.hs"
-  unless (null res) $ fail "Stack recompiled when a test or benchmark file was changed, but only the library was targeted"
-
-unregisteringLines :: String -> [String]
-unregisteringLines = filter (isInfixOf " unregistering ") . lines
diff --git a/test/integration/tests/4001-excess-recompilation/files/Setup.hs b/test/integration/tests/4001-excess-recompilation/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/4001-excess-recompilation/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/4001-excess-recompilation/files/bench/Main1.hs b/test/integration/tests/4001-excess-recompilation/files/bench/Main1.hs
deleted file mode 100644
index dbd8a1e159..0000000000
--- a/test/integration/tests/4001-excess-recompilation/files/bench/Main1.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-import  Lib
-
-main :: IO ()
-main = putStrLn "I am Main1"
-
diff --git a/test/integration/tests/4001-excess-recompilation/files/bench/Main2.hs b/test/integration/tests/4001-excess-recompilation/files/bench/Main2.hs
deleted file mode 100644
index 9c51c0f9ef..0000000000
--- a/test/integration/tests/4001-excess-recompilation/files/bench/Main2.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-import  Lib
-
-main :: IO ()
-main = putStrLn "I am Main2"
-
diff --git a/test/integration/tests/4001-excess-recompilation/files/files.cabal b/test/integration/tests/4001-excess-recompilation/files/files.cabal
deleted file mode 100644
index 00c3ca0303..0000000000
--- a/test/integration/tests/4001-excess-recompilation/files/files.cabal
+++ /dev/null
@@ -1,25 +0,0 @@
-name:           files
-version:        0.1.0.0
-build-type:     Simple
-cabal-version:  >= 2.0
-
-library
-  hs-source-dirs:   src
-  exposed-modules:  Lib
-  build-depends:    base
-  default-language: Haskell2010
-
-test-suite test
-  hs-source-dirs:   test
-  main-is:          Main.hs
-  build-depends:    base, files
-  default-language: Haskell2010
-  type:             exitcode-stdio-1.0
-
-benchmark bench
-  hs-source-dirs:   bench
-  main-is:          Main.hs
-  build-depends:    base, files
-  default-language: Haskell2010
-  type:             exitcode-stdio-1.0
-
diff --git a/test/integration/tests/4001-excess-recompilation/files/stack.yaml b/test/integration/tests/4001-excess-recompilation/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/4001-excess-recompilation/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/4001-excess-recompilation/files/test/Main1.hs b/test/integration/tests/4001-excess-recompilation/files/test/Main1.hs
deleted file mode 100644
index dbd8a1e159..0000000000
--- a/test/integration/tests/4001-excess-recompilation/files/test/Main1.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-import  Lib
-
-main :: IO ()
-main = putStrLn "I am Main1"
-
diff --git a/test/integration/tests/4001-excess-recompilation/files/test/Main2.hs b/test/integration/tests/4001-excess-recompilation/files/test/Main2.hs
deleted file mode 100644
index 9c51c0f9ef..0000000000
--- a/test/integration/tests/4001-excess-recompilation/files/test/Main2.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-import  Lib
-
-main :: IO ()
-main = putStrLn "I am Main2"
-
diff --git a/test/integration/tests/4044-no-run-tests-config/Main.hs b/test/integration/tests/4044-no-run-tests-config/Main.hs
deleted file mode 100644
index 81d3e5a402..0000000000
--- a/test/integration/tests/4044-no-run-tests-config/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["test"]
-  stack ["build", "foo:test:foo"]
diff --git a/test/integration/tests/4044-no-run-tests-config/files/.gitignore b/test/integration/tests/4044-no-run-tests-config/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/4044-no-run-tests-config/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/4044-no-run-tests-config/files/Test.hs b/test/integration/tests/4044-no-run-tests-config/files/Test.hs
deleted file mode 100644
index 72891941af..0000000000
--- a/test/integration/tests/4044-no-run-tests-config/files/Test.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-main :: IO ()
-main = error "You shall not pass!"
diff --git a/test/integration/tests/4044-no-run-tests-config/files/package.yaml b/test/integration/tests/4044-no-run-tests-config/files/package.yaml
deleted file mode 100644
index ba64b2afad..0000000000
--- a/test/integration/tests/4044-no-run-tests-config/files/package.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: foo
-version: 0
-dependencies:
-- base
-
-library: {}
-
-tests:
-  foo:
-    main: Test.hs
diff --git a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml b/test/integration/tests/4044-no-run-tests-config/files/stack.yaml
deleted file mode 100644
index 35e51a204f..0000000000
--- a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-build:
-  test-arguments:
-    no-run-tests: true
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/4085-insufficient-error-message/Main.hs b/test/integration/tests/4085-insufficient-error-message/Main.hs
deleted file mode 100644
index a996d8d66d..0000000000
--- a/test/integration/tests/4085-insufficient-error-message/Main.hs
+++ /dev/null
@@ -1,98 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-{--
-
-import StackTest
-import System.Environment (getEnv)
-import System.Directory
-import System.FilePath
-import System.Process
-import System.Exit
-import Control.Exception.Base (bracket, bracket_)
-import Control.Monad (guard, when, unless, msum)
-import Control.Concurrent (threadDelay)
-import Data.List (isInfixOf, delete, repeat)
-
-createDockerVolume :: Int -> IO String
-createDockerVolume sizeInMB = do
-  (ec, stdout, stderr) <- runEx "docker" $ "volume create"
-    ++ " --driver local"
-    ++ " --opt type=tmpfs"
-    ++ " --opt device=tmpfs"
-    ++ " --opt o=size=" ++ show sizeInMB ++ "m"
-  unless (ec == ExitSuccess) $ error $ "Exited with exit code: " ++ show ec
-  pure $ delete '\n' stdout
-
-removeDockerVolume :: Int -> String -> IO ()
-removeDockerVolume attempts name | attempts <= 0 =
-  error $ "Can't remove docker volume " ++ name
-removeDockerVolume attempts name = do
-  (ec, _, stderr) <- runEx "docker" $ "volume rm --force " ++ name
-  let wasRemoved = (ec == ExitSuccess) || isInfixOf "No such volume" stderr
-  unless wasRemoved $
-    threadDelay 3000000 >> -- sometimes docker releases a volume slowly
-    removeDockerVolume (attempts - 1) name
-
-withDockerVolume :: Int -> (String -> IO a) -> IO a
-withDockerVolume sizeInMB =
-  bracket (createDockerVolume sizeInMB) (removeDockerVolume 5)
-
-buildDockerImageWithStackSourceInside :: String -> IO ()
-buildDockerImageWithStackSourceInside tag = withSourceDirectory $ do
-  dir <- testDir
-  runShell ("docker build"
-            ++ " --file " ++ (dir </> "Dockerfile")
-            ++ " --tag " ++ tag
-            ++ " --memory-swap -1"
-            ++ " .")
-  removeDanglingImages
-
-removeDanglingImages :: IO ()
-removeDanglingImages =
-  runShell "docker rmi -f $(docker images --quiet --filter 'dangling=true')"
-
-runDockerContainerWithVolume
-  :: String
-  -> String
-  -> String
-  -> String
-  -> IO (ExitCode, String, String)
-runDockerContainerWithVolume imageTag volumeName volumeLocation cmd =
-  runEx "docker" $ "run"
-    ++ " --rm"
-    ++ " --workdir " ++ volumeLocation
-    ++ " --mount type=volume,dst=" ++ volumeLocation ++ ",src=" ++ volumeName
-    ++ " " ++ imageTag
-    ++ " " ++ cmd
-
-validateSrderr :: String -> Bool
-validateSrderr = isInfixOf "No space left on device"
-
-imageTag :: String
-imageTag = "4085-fix"
-
-spaceInMBJustEnoughToFailInTheExactMoment :: Int
-spaceInMBJustEnoughToFailInTheExactMoment = 2000
-
-main :: IO ()
-main = do
-  buildDockerImageWithStackSourceInside imageTag
-  (ec, _, stderr) <- withDockerVolume
-    spaceInMBJustEnoughToFailInTheExactMoment
-    (\volumeName ->
-        runDockerContainerWithVolume imageTag volumeName "/app" $
-          "stack"
-          ++ " --stack-root " ++ "/app"
-          ++ " --resolver nightly-2018-06-05"
-          ++ " --no-terminal"
-          ++ " --install-ghc"
-          ++ " test")
-  unless (ec /= ExitSuccess) $
-    error "stack process succeeded, but it shouldn't"
-  unless (validateSrderr stderr) $
-    error "stderr validation failed"
-
-// --}
-
-main :: IO ()
-main = putStrLn "This test is disabled (see https://github.com/commercialhaskell/stack/issues/4427)."
diff --git a/test/integration/tests/4095-utf8-pure-nix/Main.hs b/test/integration/tests/4095-utf8-pure-nix/Main.hs
deleted file mode 100644
index e85159620a..0000000000
--- a/test/integration/tests/4095-utf8-pure-nix/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-
-main :: IO ()
-main
-  | isWindows = logInfo "Disabled on Windows as Nix is not currently supported on Windows."
-  | isMacOSX = logInfo "Takes too long to run, since it tries to build GHC"
-  | otherwise = do
-       logInfo "This isn't even working on Linux anymore, disabling for now"
-       -- stack ["build", "--nix-pure"]
-       -- stack ["exec", "--nix-pure", "ShowUnicode"]
diff --git a/test/integration/tests/4095-utf8-pure-nix/files/.gitignore b/test/integration/tests/4095-utf8-pure-nix/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/4095-utf8-pure-nix/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/4095-utf8-pure-nix/files/ShowUnicode.hs b/test/integration/tests/4095-utf8-pure-nix/files/ShowUnicode.hs
deleted file mode 100644
index 91011a6576..0000000000
--- a/test/integration/tests/4095-utf8-pure-nix/files/ShowUnicode.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-import System.IO (stdout)
-import Text.Printf (hPrintf)
-
-main :: IO ()
-main = hPrintf stdout "平和"
diff --git a/test/integration/tests/4095-utf8-pure-nix/files/package.yaml b/test/integration/tests/4095-utf8-pure-nix/files/package.yaml
deleted file mode 100644
index 955fb0705e..0000000000
--- a/test/integration/tests/4095-utf8-pure-nix/files/package.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-executables:
-  ShowUnicode:
-    dependencies: [base]
-    main: ShowUnicode.hs
diff --git a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml b/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/4101-dependency-tree/Main.hs b/test/integration/tests/4101-dependency-tree/Main.hs
deleted file mode 100644
index 3ab04f3233..0000000000
--- a/test/integration/tests/4101-dependency-tree/Main.hs
+++ /dev/null
@@ -1,51 +0,0 @@
-import Control.Monad (when, unless)
-import StackTest
-import System.Directory (getCurrentDirectory)
-import Data.List (isPrefixOf)
-
-main :: IO ()
-main =
-  if isWindows
-  then do pure ()
-  else do
-
-  stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do
-    let expected = unlines [ "Packages"
-                           , "├─┬ files 0.1.0.0"
-                           , "│ ├─┬ base 4.16.3.0"
-                           ]
-    unless (expected `isPrefixOf` stdOut) $
-      error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
-
-  stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do
-    let expected = unlines [ "Packages"
-                           , "├─┬ files 0.1.0.0"
-                           , "│ ├── base 4.16.3.0"
-                           , "│ ├── filelock 0.1.1.2"
-                           , "│ ├── mtl 2.2.2"
-                           , "│ └── subproject 0.1.0.0"
-                           , "└─┬ subproject 0.1.0.0"
-                           , "  └── base 4.16.3.0"
-                           ]
-    when (stdOut /= expected) $
-      error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
-
-  stackCheckStdout ["ls", "dependencies", "tree", "subproject"] $ \stdOut -> do
-    let expected = unlines [ "Packages"
-                           , "└─┬ subproject 0.1.0.0"
-                           , "  └─┬ base 4.16.3.0"
-                           ,"    ├─┬ ghc-bignum 1.2"
-                           ,"    │ └─┬ ghc-prim 0.8.0"
-                           ,"    │   └── rts 1.0.2"
-                           ,"    ├─┬ ghc-prim 0.8.0"
-                           ,"    │ └── rts 1.0.2"
-                           ,"    └── rts 1.0.2"
-                           ]
-    when (stdOut /= expected) $
-      error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
-
-  stackCheckStdout ["ls", "dependencies", "json"] $ \stdOut -> do
-    currdir <- getCurrentDirectory
-    let expected = "[{\"dependencies\":[\"base\",\"bytestring\",\"time\"]"
-    unless (expected `isPrefixOf` stdOut) $
-      error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
diff --git a/test/integration/tests/4101-dependency-tree/files/files.cabal b/test/integration/tests/4101-dependency-tree/files/files.cabal
deleted file mode 100644
index bd96bcbf9c..0000000000
--- a/test/integration/tests/4101-dependency-tree/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5, mtl, subproject, filelock
-  default-language:    Haskell2010
diff --git a/test/integration/tests/4101-dependency-tree/files/src/Main.hs b/test/integration/tests/4101-dependency-tree/files/src/Main.hs
deleted file mode 100644
index 9cd992d9e5..0000000000
--- a/test/integration/tests/4101-dependency-tree/files/src/Main.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module Main where
-
-main :: IO ()
-main = do
-  putStrLn "hello world"
diff --git a/test/integration/tests/4101-dependency-tree/files/stack.yaml b/test/integration/tests/4101-dependency-tree/files/stack.yaml
deleted file mode 100644
index a15e4df1e5..0000000000
--- a/test/integration/tests/4101-dependency-tree/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- .
-- subproject
-extra-deps:
-- github: snoyberg/filelock
-  commit: 4f080496d8bf153fbe26e64d1f52cf73c7db25f6
diff --git a/test/integration/tests/4101-dependency-tree/files/subproject/src/Main.hs b/test/integration/tests/4101-dependency-tree/files/subproject/src/Main.hs
deleted file mode 100644
index 9cd992d9e5..0000000000
--- a/test/integration/tests/4101-dependency-tree/files/subproject/src/Main.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module Main where
-
-main :: IO ()
-main = do
-  putStrLn "hello world"
diff --git a/test/integration/tests/4101-dependency-tree/files/subproject/subproject.cabal b/test/integration/tests/4101-dependency-tree/files/subproject/subproject.cabal
deleted file mode 100644
index 6c3a2f939d..0000000000
--- a/test/integration/tests/4101-dependency-tree/files/subproject/subproject.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                subproject
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/Main.hs b/test/integration/tests/4105-test-coverage-of-internal-lib/Main.hs
deleted file mode 100644
index f03c0433fc..0000000000
--- a/test/integration/tests/4105-test-coverage-of-internal-lib/Main.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf, isPrefixOf)
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["clean"]
-  stack ["build"]
-  res <- getCoverageLines . snd <$> stackStderr ["test", "--coverage", "--color", "never"]
-  case res of
-    _:exprs:_ -> unless ("2/2" `isInfixOf` exprs) testFail
-    _ -> testFail
-  where
-    testFail = fail "Stack didn't generate coverage from both libraries"
-
-getCoverageLines :: String -> [String]
-getCoverageLines = dropWhile (not . isCoverageHeader) . lines
-  where
-    isCoverageHeader = isPrefixOf "Generating coverage report for "
diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/files.cabal b/test/integration/tests/4105-test-coverage-of-internal-lib/files/files.cabal
deleted file mode 100644
index 49cd5a2431..0000000000
--- a/test/integration/tests/4105-test-coverage-of-internal-lib/files/files.cabal
+++ /dev/null
@@ -1,23 +0,0 @@
-name:           files
-version:        0.1.0.0
-build-type:     Simple
-cabal-version:  >= 2.0
-
-library
-  exposed-modules: Src
-  hs-source-dirs: src
-  build-depends: base
-  default-language: Haskell2010
-
-library sublib
-  exposed-modules: B
-  hs-source-dirs: src-sublib
-  build-depends: base
-  default-language: Haskell2010
-
-test-suite test
-  type: exitcode-stdio-1.0
-  main-is: Main.hs
-  hs-source-dirs: test
-  build-depends: base, files, sublib
-  default-language: Haskell2010
diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/src-sublib/B.hs b/test/integration/tests/4105-test-coverage-of-internal-lib/files/src-sublib/B.hs
deleted file mode 100644
index 53253d5dcc..0000000000
--- a/test/integration/tests/4105-test-coverage-of-internal-lib/files/src-sublib/B.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module B where
-
--- | A function of the internal library
-funInternal :: Int -> Int
-funInternal = pred
diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/src/Src.hs b/test/integration/tests/4105-test-coverage-of-internal-lib/files/src/Src.hs
deleted file mode 100644
index 0f8db7fb77..0000000000
--- a/test/integration/tests/4105-test-coverage-of-internal-lib/files/src/Src.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module Src where
-
--- | A function of the main library
-funMainLib :: Int -> Int
-funMainLib = succ
diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml b/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs b/test/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs
deleted file mode 100644
index b1cf81b0dc..0000000000
--- a/test/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import Control.Monad (when)
-
-import Src
-import B
-
-main = when (funMainLib 41 /= funInternal 43) $ error "test failed"
diff --git a/test/integration/tests/4181-clean-wo-dl-ghc/Main.hs b/test/integration/tests/4181-clean-wo-dl-ghc/Main.hs
deleted file mode 100644
index 415380a7e6..0000000000
--- a/test/integration/tests/4181-clean-wo-dl-ghc/Main.hs
+++ /dev/null
@@ -1,12 +0,0 @@
--- |
--- The integration tests have no ghc present, initially. Stack should not
--- require ghc present to run the `clean` command.
-
-import StackTest
-
-main :: IO ()
-main = do
-  -- `stack clean` should succeed even though there is no ghc available.
-  -- See the stack.yaml file for how this works.
-  stackIgnoreException ["clean"]
-  stackCleanFull
diff --git a/test/integration/tests/4181-clean-wo-dl-ghc/files/foo.cabal b/test/integration/tests/4181-clean-wo-dl-ghc/files/foo.cabal
deleted file mode 100644
index 45446b7f9c..0000000000
--- a/test/integration/tests/4181-clean-wo-dl-ghc/files/foo.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
-cabal-version: >= 1.10
-
--- This file has been generated from package.yaml by hpack version 0.29.6.
---
--- see: https://github.com/sol/hpack
---
--- hash: 941a1ab4bea2f0ee229dd6ab7fe9730517a0397fb9141fe2841a0f9748dbfd57
-
-name:           foo
-version:        0.1.0.0
-build-type:     Simple
-
-library
diff --git a/test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml b/test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml
deleted file mode 100644
index 654a70d662..0000000000
--- a/test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Update the resolver as necessary
-resolver: ghc-8.22
-# Do not use the system ghc, as ghc must not be available
-system-ghc: false
-# Do not install any other ghc, as ghc must not be available
-install-ghc: false
-packages:
-- '.'
diff --git a/test/integration/tests/4215-missing-unregister/Main.hs b/test/integration/tests/4215-missing-unregister/Main.hs
deleted file mode 100644
index 83056eb580..0000000000
--- a/test/integration/tests/4215-missing-unregister/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["build", "--stack-yaml", "stack1.yaml"]
-  stack ["build", "--stack-yaml", "stack2.yaml"]
diff --git a/test/integration/tests/4215-missing-unregister/files/.gitignore b/test/integration/tests/4215-missing-unregister/files/.gitignore
deleted file mode 100644
index 0afa51175a..0000000000
--- a/test/integration/tests/4215-missing-unregister/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-foo.cabal
diff --git a/test/integration/tests/4215-missing-unregister/files/stack1.yaml b/test/integration/tests/4215-missing-unregister/files/stack1.yaml
deleted file mode 100644
index b868fd3798..0000000000
--- a/test/integration/tests/4215-missing-unregister/files/stack1.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: ghc-9.2.4
-packages:
-- v1
diff --git a/test/integration/tests/4215-missing-unregister/files/stack2.yaml b/test/integration/tests/4215-missing-unregister/files/stack2.yaml
deleted file mode 100644
index 7c73f404c6..0000000000
--- a/test/integration/tests/4215-missing-unregister/files/stack2.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: ghc-9.2.4
-packages:
-- v2
diff --git a/test/integration/tests/4215-missing-unregister/files/v1/package.yaml b/test/integration/tests/4215-missing-unregister/files/v1/package.yaml
deleted file mode 100644
index 7bcacfcb87..0000000000
--- a/test/integration/tests/4215-missing-unregister/files/v1/package.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: foo
-version: 1
-
-dependencies:
-- base
-
-library: {}
diff --git a/test/integration/tests/4215-missing-unregister/files/v2/package.yaml b/test/integration/tests/4215-missing-unregister/files/v2/package.yaml
deleted file mode 100644
index e49b4fdc65..0000000000
--- a/test/integration/tests/4215-missing-unregister/files/v2/package.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: foo
-version: 2
-
-dependencies:
-- base
-
-library: {}
diff --git a/test/integration/tests/4270-files-order/Main.hs b/test/integration/tests/4270-files-order/Main.hs
deleted file mode 100644
index 8bbb1f82aa..0000000000
--- a/test/integration/tests/4270-files-order/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import Control.Monad
-import StackTest
-
-main :: IO ()
-main = do
-    stack ["build"]
-    repl [] $ do
-        replCommand "putStrLn greeting"
-        line <- replGetLine
-        when (line /= "Hello, world!") $ error "Didn't load correctly."
diff --git a/test/integration/tests/4270-files-order/files/cbits-ordering.cabal b/test/integration/tests/4270-files-order/files/cbits-ordering.cabal
deleted file mode 100644
index e943116685..0000000000
--- a/test/integration/tests/4270-files-order/files/cbits-ordering.cabal
+++ /dev/null
@@ -1,27 +0,0 @@
--- This file has been generated from package.yaml by hpack version 0.28.2.
---
--- see: https://github.com/sol/hpack
---
--- hash: e76488d28476ba7cd8aa51be80b2c7eb71e870238b2a548581cf6093bd7c7994
-
-name:           cbits-ordering
-version:        0.0.0
-build-type:     Simple
-cabal-version:  >= 1.10
-
-library
-  exposed-modules:
-      Lib
-  other-modules:
-      Paths_cbits_ordering
-  hs-source-dirs:
-      src
-  include-dirs:
-      cbits
-  c-sources:
-      cbits/the_dependency.c
-      cbits/a_dependent.c
-
-  build-depends:
-      base >=4.7 && <5
-  default-language: Haskell2010
diff --git a/test/integration/tests/4270-files-order/files/src/Lib.hs b/test/integration/tests/4270-files-order/files/src/Lib.hs
deleted file mode 100644
index 9668a03fe0..0000000000
--- a/test/integration/tests/4270-files-order/files/src/Lib.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
-
-module Lib where
-
-import Foreign.C.String
-import System.IO.Unsafe
-
-foreign import ccall unsafe "a_dependent.h greeting"
-  c_greeting :: CString
-
-{-# NOINLINE greeting #-}
-greeting :: String
-greeting = unsafePerformIO $ peekCString c_greeting
diff --git a/test/integration/tests/4270-files-order/files/stack.yaml b/test/integration/tests/4270-files-order/files/stack.yaml
deleted file mode 100644
index d34071c113..0000000000
--- a/test/integration/tests/4270-files-order/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: nightly-2022-09-05
-
-packages:
-- .
diff --git a/test/integration/tests/4324-dot-includes-boot-packages/Main.hs b/test/integration/tests/4324-dot-includes-boot-packages/Main.hs
deleted file mode 100644
index 493cd2b8ca..0000000000
--- a/test/integration/tests/4324-dot-includes-boot-packages/Main.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-import StackTest
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-
-main :: IO ()
-main = do
-  stackCheckStdout ["dot", "--external"] $ \str ->
-    unless ("\n\"process\" ->" `isInfixOf` str) $
-    error "Not showing dependencies of process"
diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/.gitignore b/test/integration/tests/4324-dot-includes-boot-packages/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/4324-dot-includes-boot-packages/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/package.yaml b/test/integration/tests/4324-dot-includes-boot-packages/files/package.yaml
deleted file mode 100644
index 0708d2f2d3..0000000000
--- a/test/integration/tests/4324-dot-includes-boot-packages/files/package.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: foo
-
-dependencies:
-- base
-- process
-
-library: {}
diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml b/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/4390-dot-no-ghc/Main.hs b/test/integration/tests/4390-dot-no-ghc/Main.hs
deleted file mode 100644
index ae94e7eeda..0000000000
--- a/test/integration/tests/4390-dot-no-ghc/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["ls", "dependencies", "--global-hints"]
-  stack ["dot", "--global-hints"]
diff --git a/test/integration/tests/4390-dot-no-ghc/files/.gitignore b/test/integration/tests/4390-dot-no-ghc/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/4390-dot-no-ghc/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/4390-dot-no-ghc/files/package.yaml b/test/integration/tests/4390-dot-no-ghc/files/package.yaml
deleted file mode 100644
index b1eda63d9f..0000000000
--- a/test/integration/tests/4390-dot-no-ghc/files/package.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: foo
-version: 0
-dependencies:
-- base
-- process
-library: {}
diff --git a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml b/test/integration/tests/4390-dot-no-ghc/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/4408-init-internal-libs/Main.hs b/test/integration/tests/4408-init-internal-libs/Main.hs
deleted file mode 100644
index bc135f1c2d..0000000000
--- a/test/integration/tests/4408-init-internal-libs/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stack ["init", "--resolver", "ghc-9.2.4", "--force"]
diff --git a/test/integration/tests/4408-init-internal-libs/files/.gitignore b/test/integration/tests/4408-init-internal-libs/files/.gitignore
deleted file mode 100644
index 684dbffa96..0000000000
--- a/test/integration/tests/4408-init-internal-libs/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-stack.yaml
diff --git a/test/integration/tests/4408-init-internal-libs/files/foo.cabal b/test/integration/tests/4408-init-internal-libs/files/foo.cabal
deleted file mode 100644
index 0e4d4898ae..0000000000
--- a/test/integration/tests/4408-init-internal-libs/files/foo.cabal
+++ /dev/null
@@ -1,15 +0,0 @@
-cabal-version: 2.0
-name:          foo
-version:       0
-build-type:    Simple
-
-library
-  hs-source-dirs:      src
-  build-depends:       base, some-internal-lib
-  default-language:    Haskell2010
-
-library some-internal-lib
-  hs-source-dirs:      src-internal
-  exposed-modules:     Internal
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/test/integration/tests/443-specify-path/.gitignore b/test/integration/tests/443-specify-path/.gitignore
deleted file mode 100644
index 027271b9b2..0000000000
--- a/test/integration/tests/443-specify-path/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-files
diff --git a/test/integration/tests/443-specify-path/Main.hs b/test/integration/tests/443-specify-path/Main.hs
deleted file mode 100644
index 3bde2d2dd1..0000000000
--- a/test/integration/tests/443-specify-path/Main.hs
+++ /dev/null
@@ -1,30 +0,0 @@
-import StackTest
-import System.Directory
-import System.FilePath
-import System.Info (os)
-
-main :: IO ()
-main = do
-  -- install in relative path
-  removeDirIgnore "bin"
-  createDirectory "bin"
-  stack [defaultResolverArg, "--local-bin-path", "./bin", "install" , "happy"]
-  doesExist ("./bin/happy" ++ exeExt)
-
-  -- Default install
-  -- This seems to fail due to directory being cleaned up,
-  -- a manual test of the default stack install is required
-  -- defaultDir <- getAppUserDataDirectory "local"
-  -- stack ["install", "happy"]
-  -- doesExist (defaultDir ++ "/bin/happy" ++ exeExt)
-
-  -- install in current dir
-  stack [defaultResolverArg, "--local-bin-path", ".", "install", "happy" ]
-  doesExist ("happy" ++ exeExt)
-
-  -- install in absolute path
-  tmpDirectory <- fmap (</> "absolute-bin") getCurrentDirectory
-  removeDirIgnore tmpDirectory
-  createDirectory tmpDirectory
-  stack [defaultResolverArg, "--local-bin-path", tmpDirectory, "install", "happy" ]
-  doesExist (tmpDirectory </> ("happy" ++ exeExt))
diff --git a/test/integration/tests/444-package-option/Main.hs b/test/integration/tests/444-package-option/Main.hs
deleted file mode 100644
index 1ecb9f564d..0000000000
--- a/test/integration/tests/444-package-option/Main.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  isAlpine <- getIsAlpine
-  if isAlpine || isARM
-    then logInfo "Disabled on Alpine Linux and ARM since it cannot yet install its own GHC."
-    else stack [defaultResolverArg, "--install-ghc", "runghc", "--package", "safe", "Test.hs"]
diff --git a/test/integration/tests/444-package-option/files/Test.hs b/test/integration/tests/444-package-option/files/Test.hs
deleted file mode 100644
index 681ec416d9..0000000000
--- a/test/integration/tests/444-package-option/files/Test.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import Safe
-
-main :: IO ()
-main = print $ headMay ([] :: [Int])
diff --git a/test/integration/tests/4453-detailed/Main.hs b/test/integration/tests/4453-detailed/Main.hs
deleted file mode 100644
index 8f13e72bcd..0000000000
--- a/test/integration/tests/4453-detailed/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import StackTest
-import System.Directory
-
-main :: IO ()
-main = do
-    removeDirIgnore ".stack-work"
-    stack [defaultResolverArg, "test"]
diff --git a/test/integration/tests/4453-detailed/files/src/Lib.hs b/test/integration/tests/4453-detailed/files/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/4453-detailed/files/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/4453-detailed/files/stack.yaml b/test/integration/tests/4453-detailed/files/stack.yaml
deleted file mode 100644
index 2115d80d5c..0000000000
--- a/test/integration/tests/4453-detailed/files/stack.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- '.'
diff --git a/test/integration/tests/4453-detailed/files/test-detailed-example.cabal b/test/integration/tests/4453-detailed/files/test-detailed-example.cabal
deleted file mode 100644
index 87a973ce4d..0000000000
--- a/test/integration/tests/4453-detailed/files/test-detailed-example.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
-name:                test-detailed-example
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.20
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
-
-test-suite test-detailed-example-test
-  type:                detailed-0.9
-  hs-source-dirs:      test
-  test-module:         Spec
-  build-depends:       base >= 4.7,
-                       Cabal >= 1.20
-  default-language:    Haskell2010
diff --git a/test/integration/tests/4453-detailed/files/test/Spec.hs b/test/integration/tests/4453-detailed/files/test/Spec.hs
deleted file mode 100644
index 3084a22747..0000000000
--- a/test/integration/tests/4453-detailed/files/test/Spec.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-module Spec (tests) where
-
-import Distribution.TestSuite
-
-tests :: IO [Test]
-tests = do
-  pure [
-      test "foo" Pass
-    ]
-
-test :: String -> Result -> Test
-test name r = Test t
-  where
-    t = TestInstance {
-        run = pure (Finished r)
-      , name = name
-      , tags = []
-      , options = []
-      , setOption = \_ _ -> Right t
-      }
diff --git a/test/integration/tests/4488-newer-cabal-version/Main.hs b/test/integration/tests/4488-newer-cabal-version/Main.hs
deleted file mode 100644
index 0b87c0ee1d..0000000000
--- a/test/integration/tests/4488-newer-cabal-version/Main.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  -- Sibi: Commenting this because we are supporting latest cabal
-  -- version with this change. You can uncomment it when a newer cabal
-  -- release is made.
-  -- https://cabal.readthedocs.io/en/3.6/file-format-changelog.html
-  -- stackErr ["--stack-yaml", "stack-bad.yaml", "build", "--dry-run"]
-  --
-  stack ["--stack-yaml", "stack-good.yaml", "build", "--dry-run"]
diff --git a/test/integration/tests/4488-newer-cabal-version/files/Setup.hs b/test/integration/tests/4488-newer-cabal-version/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/4488-newer-cabal-version/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/4488-newer-cabal-version/files/foo.cabal b/test/integration/tests/4488-newer-cabal-version/files/foo.cabal
deleted file mode 100644
index fcc3fda5bd..0000000000
--- a/test/integration/tests/4488-newer-cabal-version/files/foo.cabal
+++ /dev/null
@@ -1,7 +0,0 @@
-cabal-version: 3.6
-name: foo
-version: 0
-build-type: Simple
-
-library
-  default-language: Haskell2010
diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml
deleted file mode 100644
index a208d6c121..0000000000
--- a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: ghc-9.2.4
-extra-deps:
-- Cabal-2.4.1.0
diff --git a/test/integration/tests/4706-ignore-ghc-env-files/Main.hs b/test/integration/tests/4706-ignore-ghc-env-files/Main.hs
deleted file mode 100644
index 7c963b085b..0000000000
--- a/test/integration/tests/4706-ignore-ghc-env-files/Main.hs
+++ /dev/null
@@ -1,27 +0,0 @@
-import StackTest
-import Control.Exception (bracket_)
-import Control.Monad (when)
-import System.Environment
-import System.Directory
-import System.Info (arch, os)
-
-main :: IO ()
-main = when False $ do -- skip this test until we start using GHC 8.4.4 or later for integration tests
-  let ghcVer = "8.4.4"
-      fp = concat
-        [ ".ghc.environment."
-        , arch
-        , "-"
-        , os
-        , "-"
-        , ghcVer
-        ]
-  writeFile "stack.yaml" $ "resolver: ghc-" ++ ghcVer
-  bracket_
-    (writeFile fp "This is an invalid GHC environment file")
-    (removeFile fp) $ do
-      envFile <- canonicalizePath fp
-      setEnv "GHC_ENVIRONMENT" envFile
-      stack ["clean"]
-      stack ["build"]
-      stack ["runghc", "Main.hs"]
diff --git a/test/integration/tests/4706-ignore-ghc-env-files/files/.gitignore b/test/integration/tests/4706-ignore-ghc-env-files/files/.gitignore
deleted file mode 100644
index 0afaa560b3..0000000000
--- a/test/integration/tests/4706-ignore-ghc-env-files/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-foo.cabal
-stack.yaml
diff --git a/test/integration/tests/4706-ignore-ghc-env-files/files/package.yaml b/test/integration/tests/4706-ignore-ghc-env-files/files/package.yaml
deleted file mode 100644
index 9bd223a0a0..0000000000
--- a/test/integration/tests/4706-ignore-ghc-env-files/files/package.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: foo
-version: 0
-
-dependencies:
-- base
-
-library: {}
diff --git a/test/integration/tests/4754-rebuild-haddocks/Main.hs b/test/integration/tests/4754-rebuild-haddocks/Main.hs
deleted file mode 100644
index ad3239c26c..0000000000
--- a/test/integration/tests/4754-rebuild-haddocks/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stackCleanFull
-  stackErr ["haddock"]
-  stackCleanFull
-  stackErr ["haddock", "--no-haddock-deps"]
-  stack ["build"]
-  stackErr ["haddock", "--no-haddock-deps"]
diff --git a/test/integration/tests/4754-rebuild-haddocks/files/.gitignore b/test/integration/tests/4754-rebuild-haddocks/files/.gitignore
deleted file mode 100644
index 0afa51175a..0000000000
--- a/test/integration/tests/4754-rebuild-haddocks/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-foo.cabal
diff --git a/test/integration/tests/4754-rebuild-haddocks/files/package.yaml b/test/integration/tests/4754-rebuild-haddocks/files/package.yaml
deleted file mode 100644
index 42a00e8f20..0000000000
--- a/test/integration/tests/4754-rebuild-haddocks/files/package.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: foo
-version: 0
-
-dependencies:
-- base
-
-library:
-  source-dirs: src
-  ghc-options:
-  - -Werror
-  - -Winvalid-haddock
diff --git a/test/integration/tests/4754-rebuild-haddocks/files/src/Foo.hs b/test/integration/tests/4754-rebuild-haddocks/files/src/Foo.hs
deleted file mode 100644
index 3caec84bf1..0000000000
--- a/test/integration/tests/4754-rebuild-haddocks/files/src/Foo.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module Foo where
-
--- | The function below intentionally contains invalid Haddock
-foo :: ()
-foo = () -- ^ this should fail!!!
diff --git a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml b/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/4783-doctest-deps/Main.hs b/test/integration/tests/4783-doctest-deps/Main.hs
deleted file mode 100644
index d35e0cf24c..0000000000
--- a/test/integration/tests/4783-doctest-deps/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stackCleanFull
-  stack ["build", "acme-dont-copy"]
-  stack ["test"]
diff --git a/test/integration/tests/4783-doctest-deps/files/.gitignore b/test/integration/tests/4783-doctest-deps/files/.gitignore
deleted file mode 100644
index 0afa51175a..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-foo.cabal
diff --git a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs b/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs
deleted file mode 100644
index b1a35a6cc5..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs
+++ /dev/null
@@ -1,31 +0,0 @@
--- |
--- Module      : Acme.Dont
--- Copyright   : Gracjan Polak 2009
--- License     : BSD-style
--- Maintainer  : Gracjan Polak <gracjanpolak@gmail.com>
--- Stability   : experimental
--- Portability : portable
---
--- The Acme.Dont module provides the indispensable don't command,
--- ported from Perl.
---
--- For more information see influential documentation:
--- <http://search.cpan.org/~dconway/Acme-Don-t-1.01/t.pm>
---
--- Usage:
---
--- > main = don't $ do
--- >     name <- getLine
--- >     putStrLn $ "hello " ++ name
---
-module Acme.Dont where
-
--- | The Acme.Dont module provides a don't command, which is the
--- opposite of Haskell's built-in do.  It is used exactly like the do
--- monadic construct except that, instead of executing the block it
--- controls, it... well... doesn't.
---
--- Regardless of the contents of the block, don't returns ().
---
-don't :: (Monad m) => m a -> m ()
-don't _action = pure ()
diff --git a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/COPYRIGHT b/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/COPYRIGHT
deleted file mode 100644
index bfa1719aa5..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/COPYRIGHT
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (C) 2009 Gracjan Polak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-===============================================================================
-
-(end of COPYRIGHT)
diff --git a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs b/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs
deleted file mode 100644
index c2d38c4f4a..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
\ No newline at end of file
diff --git a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/acme-dont-copy.cabal b/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/acme-dont-copy.cabal
deleted file mode 100644
index 3e1c668a7a..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/acme-dont-copy.cabal
+++ /dev/null
@@ -1,19 +0,0 @@
-Name: acme-dont-copy
-Version: 1.1
-Stability: stable
-Exposed-modules: Acme.Dont
-Build-type: Simple
-License: BSD3
-License-File: COPYRIGHT
-Copyright: 2009, Gracjan Polak
-Author: Gracjan Polak <gracjanpolak@gmail.com>
-Maintainer: Gracjan Polak <gracjanpolak@gmail.com>
-Synopsis: A don't construct
-Description:
-    The Acme.Dont module provides a don't command, which is the
-    opposite of Haskell's built-in do.  It is used exactly like the do
-    monadic construct except that, instead of executing the block it
-    controls, it... well... doesn't.
-Category: Acme
-Build-depends: base<1000000
-Hs-source-dirs: .
diff --git a/test/integration/tests/4783-doctest-deps/files/package.yaml b/test/integration/tests/4783-doctest-deps/files/package.yaml
deleted file mode 100644
index 251fbfb148..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/package.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: foo
-version: 0
-
-dependencies:
-- base
-
-library:
-  source-dirs: src
-
-tests:
-  doctest:
-    source-dirs: test
-    main: Main.hs
-    dependencies:
-    - doctest
-    - acme-dont
diff --git a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml b/test/integration/tests/4783-doctest-deps/files/snapshot.yaml
deleted file mode 100644
index c30b6e6219..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: nightly-2022-09-05
-name: foo
-packages:
-- acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602
diff --git a/test/integration/tests/4783-doctest-deps/files/src/Foo.hs b/test/integration/tests/4783-doctest-deps/files/src/Foo.hs
deleted file mode 100644
index 936d0ccc01..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/src/Foo.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Foo where
-
--- |
---
--- >>> import Acme.Dont
--- >>> don't foo
-foo :: IO ()
-foo = error "foo"
diff --git a/test/integration/tests/4783-doctest-deps/files/stack.yaml b/test/integration/tests/4783-doctest-deps/files/stack.yaml
deleted file mode 100644
index 9ec39b7861..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: snapshot.yaml
-extra-deps:
-# Include a package with a duplicated module name
-- acme-dont-copy
diff --git a/test/integration/tests/4783-doctest-deps/files/test/Main.hs b/test/integration/tests/4783-doctest-deps/files/test/Main.hs
deleted file mode 100644
index 20e4883829..0000000000
--- a/test/integration/tests/4783-doctest-deps/files/test/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test.DocTest
-
-main :: IO ()
-main = doctest ["src/Foo.hs"]
diff --git a/test/integration/tests/4897-boot-package-pruned/Main.hs b/test/integration/tests/4897-boot-package-pruned/Main.hs
deleted file mode 100644
index 7ba05377d9..0000000000
--- a/test/integration/tests/4897-boot-package-pruned/Main.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-planFailure :: String
-planFailure =
-  "but this GHC boot package has been pruned (issue #4510);"
-
-main :: IO ()
-main = do
-  stackErrStderr ["build"] (expectMessage planFailure)
-
-expectMessage :: String -> String -> IO ()
-expectMessage msg stderr = do
-  unless (words msg `isInfixOf` words stderr)
-         (error $ "Expected an error: \n" ++ show msg)
diff --git a/test/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal b/test/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal
deleted file mode 100644
index 78abfda5cf..0000000000
--- a/test/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal
+++ /dev/null
@@ -1,8 +0,0 @@
-name:                directory
-version:             1.3.3.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/test/integration/tests/4897-boot-package-pruned/files/files.cabal b/test/integration/tests/4897-boot-package-pruned/files/files.cabal
deleted file mode 100644
index fd7c274440..0000000000
--- a/test/integration/tests/4897-boot-package-pruned/files/files.cabal
+++ /dev/null
@@ -1,8 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  build-depends:       base, directory, process
-  default-language:    Haskell2010
diff --git a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml b/test/integration/tests/4897-boot-package-pruned/files/stack.yaml
deleted file mode 100644
index d9cbfbceb4..0000000000
--- a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: nightly-2022-09-05
-packages: [.]
-extra-deps: [./directory]
diff --git a/test/integration/tests/4938-non-ascii-module-names/Main.hs b/test/integration/tests/4938-non-ascii-module-names/Main.hs
deleted file mode 100644
index 7e30af7e02..0000000000
--- a/test/integration/tests/4938-non-ascii-module-names/Main.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-import StackTest
-import Control.Monad (unless)
-
-main :: IO ()
-main = do
-  -- Disabled on Windows due to an error occurred in the integration tests 
-  -- regarding Unicode character. Tried to fix it (https://github.com/commercialhaskell/stack/pull/5162/commits/8f04ad9e4cbaa54370dc5af476e3307a16c84405)
-  -- but it didn't work
-  unless isWindows $ stack ["build"]
diff --git a/test/integration/tests/4938-non-ascii-module-names/files/.gitignore b/test/integration/tests/4938-non-ascii-module-names/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/4938-non-ascii-module-names/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/4938-non-ascii-module-names/files/Lib.hs b/test/integration/tests/4938-non-ascii-module-names/files/Lib.hs
deleted file mode 100644
index d54290bd9b..0000000000
--- a/test/integration/tests/4938-non-ascii-module-names/files/Lib.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-module Lib
-    ( foo
-    , bar
-    ) where
-
-import Täst
-
-bar :: Int
-bar = 42
diff --git "a/test/integration/tests/4938-non-ascii-module-names/files/T\303\244st.hs" "b/test/integration/tests/4938-non-ascii-module-names/files/T\303\244st.hs"
deleted file mode 100644
index 16c2b18123..0000000000
--- "a/test/integration/tests/4938-non-ascii-module-names/files/T\303\244st.hs"
+++ /dev/null
@@ -1,4 +0,0 @@
-module Täst where
-
-foo :: Int
-foo = 42
diff --git a/test/integration/tests/4938-non-ascii-module-names/files/app/Main.hs b/test/integration/tests/4938-non-ascii-module-names/files/app/Main.hs
deleted file mode 100644
index 26e9751007..0000000000
--- a/test/integration/tests/4938-non-ascii-module-names/files/app/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Main where
-
-import Täst
-
-main :: IO ()
-main = putStrLn "42"
diff --git a/test/integration/tests/4938-non-ascii-module-names/files/package.yaml b/test/integration/tests/4938-non-ascii-module-names/files/package.yaml
deleted file mode 100644
index 96a4d01977..0000000000
--- a/test/integration/tests/4938-non-ascii-module-names/files/package.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: umlaut
-dependencies: [base]
-library:
-  source-dirs: .
-executables:
-  exe:
-    main: Main.hs
-    source-dirs: app
-    dependencies:
-    - umlaut
diff --git a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/5180-ghc-rts-flags/Main.hs b/test/integration/tests/5180-ghc-rts-flags/Main.hs
deleted file mode 100644
index e13dcd9ae4..0000000000
--- a/test/integration/tests/5180-ghc-rts-flags/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stack ["clean"]
-    stack ["build"]
diff --git a/test/integration/tests/5180-ghc-rts-flags/files/files.cabal b/test/integration/tests/5180-ghc-rts-flags/files/files.cabal
deleted file mode 100644
index 8f21c6b6bd..0000000000
--- a/test/integration/tests/5180-ghc-rts-flags/files/files.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5, mtl
-  default-language:    Haskell2010
-
diff --git a/test/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs b/test/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs
deleted file mode 100644
index 7685c7c4bf..0000000000
--- a/test/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Lib where
-
-main :: IO ()
-main = putStrLn "hello world"
diff --git a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml b/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml
deleted file mode 100644
index 498294fa0b..0000000000
--- a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- .
-
-ghc-options:
-  "$locals": -j8 +RTS -s -A128M
diff --git a/test/integration/tests/5272-only-locals/Main.hs b/test/integration/tests/5272-only-locals/Main.hs
deleted file mode 100644
index 57b02a7d58..0000000000
--- a/test/integration/tests/5272-only-locals/Main.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-import StackTest
-import Control.Monad (void)
-
-main :: IO ()
-main = do
-  void $ stack' ["exec", "ghc-pkg", "unregister", "unliftio-core"]
-  stack ["clean"]
-
-  stackErr ["build", "--only-locals"]
-  stack ["build", "--only-snapshot"]
-  stack ["build", "--only-locals"]
diff --git a/test/integration/tests/5272-only-locals/files/.gitignore b/test/integration/tests/5272-only-locals/files/.gitignore
deleted file mode 100644
index 0afa51175a..0000000000
--- a/test/integration/tests/5272-only-locals/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-foo.cabal
diff --git a/test/integration/tests/5272-only-locals/files/package.yaml b/test/integration/tests/5272-only-locals/files/package.yaml
deleted file mode 100644
index d0d7ba0a96..0000000000
--- a/test/integration/tests/5272-only-locals/files/package.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: foo
-version: 0.0.0
-
-dependencies:
-- base
-- unliftio-core
-
-library:
-  source-dirs: src/
diff --git a/test/integration/tests/5272-only-locals/files/src/Foo.hs b/test/integration/tests/5272-only-locals/files/src/Foo.hs
deleted file mode 100644
index 72e1004bad..0000000000
--- a/test/integration/tests/5272-only-locals/files/src/Foo.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module Foo () where
-
-import Control.Monad.IO.Unlift ()
diff --git a/test/integration/tests/5272-only-locals/files/stack.yaml b/test/integration/tests/5272-only-locals/files/stack.yaml
deleted file mode 100644
index d4409dbe26..0000000000
--- a/test/integration/tests/5272-only-locals/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: ghc-9.2.4
-extra-deps:
-- unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082
-# Force a unique snapshot
-- acme-missiles-0.3@rev:0
diff --git a/test/integration/tests/5680-share-package-across-projects/Main.hs b/test/integration/tests/5680-share-package-across-projects/Main.hs
deleted file mode 100644
index 1a04eb87d5..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/Main.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stackEnv <- stackExe
-    withCwd "package-a" $ stack ["build"]
-    withCwd "package-b" $ stack ["build"]
-    withCwd "package-a" $ stack ["build"]
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/package.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-a/package.yaml
deleted file mode 100644
index 73f5370e6a..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-a/package.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: package-a
-version: 0.1.0.0
-dependencies:
-- base >= 4.7 && < 5
-library:
-  source-dirs: src
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/src/Lib.hs b/test/integration/tests/5680-share-package-across-projects/files/package-a/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-a/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml
deleted file mode 100644
index a76f01ac28..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- .
-- ../package-c
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/package.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-b/package.yaml
deleted file mode 100644
index b134ba60f7..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-b/package.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: package-b
-version: 0.1.0.0
-dependencies:
-- base >= 4.7 && < 5
-library:
-  source-dirs: src
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/src/Lib.hs b/test/integration/tests/5680-share-package-across-projects/files/package-b/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-b/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml
deleted file mode 100644
index a76f01ac28..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- .
-- ../package-c
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/package.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-c/package.yaml
deleted file mode 100644
index 590f48c24a..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-c/package.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: package-c
-version: 0.1.0.0
-dependencies:
-- base >= 4.7 && < 5
-library:
-  source-dirs: src
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/src/Lib.hs b/test/integration/tests/5680-share-package-across-projects/files/package-c/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-c/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml
deleted file mode 100644
index 2ecbc67e58..0000000000
--- a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- .
diff --git a/test/integration/tests/606-local-version-not-exist/Main.hs b/test/integration/tests/606-local-version-not-exist/Main.hs
deleted file mode 100644
index 30d17c8729..0000000000
--- a/test/integration/tests/606-local-version-not-exist/Main.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stackErr ["build", "files-3"]
-    stackErr ["build", "files-0.1.0.0"]
-    stack ["build", "files"]
-    stack ["build", "."]
diff --git a/test/integration/tests/606-local-version-not-exist/files/files.cabal b/test/integration/tests/606-local-version-not-exist/files/files.cabal
deleted file mode 100644
index 6ec3b1e471..0000000000
--- a/test/integration/tests/606-local-version-not-exist/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/606-local-version-not-exist/files/src/Lib.hs b/test/integration/tests/606-local-version-not-exist/files/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/606-local-version-not-exist/files/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml
deleted file mode 100644
index 0ba9c320d5..0000000000
--- a/test/integration/tests/606-local-version-not-exist/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/617-extra-dep-flag/Main.hs b/test/integration/tests/617-extra-dep-flag/Main.hs
deleted file mode 100644
index 50fcae4fa6..0000000000
--- a/test/integration/tests/617-extra-dep-flag/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stack ["build", "acme-dont-1.1"]
diff --git a/test/integration/tests/617-extra-dep-flag/files/stack.yaml b/test/integration/tests/617-extra-dep-flag/files/stack.yaml
deleted file mode 100644
index c3d7bfe6ce..0000000000
--- a/test/integration/tests/617-extra-dep-flag/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: ghc-9.2.4
-flags:
-  text:
-    integer-simple: false
-extra-deps:
-- text-1.2.0.3
-packages: []
diff --git a/test/integration/tests/617-unused-flag-cli/Main.hs b/test/integration/tests/617-unused-flag-cli/Main.hs
deleted file mode 100644
index f9a2b093ea..0000000000
--- a/test/integration/tests/617-unused-flag-cli/Main.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stack ["build"]
-    stackErr ["build", "--flag", "foo:bar"]
-    stackErr ["build", "--flag", "files:bar"]
-    stack ["build", "--flag", "*:bar"]
diff --git a/test/integration/tests/617-unused-flag-cli/files/files.cabal b/test/integration/tests/617-unused-flag-cli/files/files.cabal
deleted file mode 100644
index 6ec3b1e471..0000000000
--- a/test/integration/tests/617-unused-flag-cli/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/617-unused-flag-cli/files/src/Lib.hs b/test/integration/tests/617-unused-flag-cli/files/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/617-unused-flag-cli/files/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/617-unused-flag-cli/files/stack.yaml b/test/integration/tests/617-unused-flag-cli/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/617-unused-flag-cli/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/617-unused-flag-name-yaml/Main.hs b/test/integration/tests/617-unused-flag-name-yaml/Main.hs
deleted file mode 100644
index b16d43227b..0000000000
--- a/test/integration/tests/617-unused-flag-name-yaml/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stackErr ["build"]
diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/files.cabal b/test/integration/tests/617-unused-flag-name-yaml/files/files.cabal
deleted file mode 100644
index 6ec3b1e471..0000000000
--- a/test/integration/tests/617-unused-flag-name-yaml/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs b/test/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml
deleted file mode 100644
index 2bc239764c..0000000000
--- a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: ghc-9.2.4
-flags:
-  files:
-    does-not-exist: false
diff --git a/test/integration/tests/617-unused-flag-yaml/Main.hs b/test/integration/tests/617-unused-flag-yaml/Main.hs
deleted file mode 100644
index b16d43227b..0000000000
--- a/test/integration/tests/617-unused-flag-yaml/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stackErr ["build"]
diff --git a/test/integration/tests/617-unused-flag-yaml/files/files.cabal b/test/integration/tests/617-unused-flag-yaml/files/files.cabal
deleted file mode 100644
index 6ec3b1e471..0000000000
--- a/test/integration/tests/617-unused-flag-yaml/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/617-unused-flag-yaml/files/src/Lib.hs b/test/integration/tests/617-unused-flag-yaml/files/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/617-unused-flag-yaml/files/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-yaml/files/stack.yaml
deleted file mode 100644
index cd004c074f..0000000000
--- a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: ghc-9.2.4
-flags:
-  does-not-exist:
-    foo: false
diff --git a/test/integration/tests/620-env-command/Main.hs b/test/integration/tests/620-env-command/Main.hs
deleted file mode 100644
index 2a4e394673..0000000000
--- a/test/integration/tests/620-env-command/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import StackTest
-import System.Process
-import Control.Exception (throwIO)
-import Control.Monad (unless)
-
-main :: IO ()
-main = unless isWindows $ rawSystem "bash" ["run.sh"] >>= throwIO
diff --git a/test/integration/tests/620-env-command/files/Main.hs b/test/integration/tests/620-env-command/files/Main.hs
deleted file mode 100644
index bd555bc39d..0000000000
--- a/test/integration/tests/620-env-command/files/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import Control.Concurrent.Async ()
-
-main :: IO ()
-main = pure ()
diff --git a/test/integration/tests/620-env-command/files/run.sh b/test/integration/tests/620-env-command/files/run.sh
deleted file mode 100644
index aef9a4bc45..0000000000
--- a/test/integration/tests/620-env-command/files/run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-stack build --resolver nightly-2022-09-05 async
-eval `stack config env --resolver nightly-2022-09-05`
-ghc Main.hs
diff --git a/test/integration/tests/717-sdist-test/Main.hs b/test/integration/tests/717-sdist-test/Main.hs
deleted file mode 100644
index cce419b2a5..0000000000
--- a/test/integration/tests/717-sdist-test/Main.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  -- verify building works
-  stack ["build"]
-  -- keep old behavior
-  stack ["sdist"]
-  -- successful sdist with --test-tarball
-  stack ["sdist", "package-with-working-th", "--test-tarball"]
-  -- fails because package contains TH which depends on files which are not put into sdist tarball
-  stackErr ["sdist", "package-with-th", "--test-tarball"]
-  -- same, but inside a subdir
-  stackErr ["sdist", "subdirs/failing-in-subdir", "--test-tarball"]
-  -- depends on packagea and packagec - these would fail if they were the target of sdist,
-  -- but since they are just dependencies, the operation should succeed
-  stack ["sdist", "subdirs/dependent-on-failing-packages", "--test-tarball"]
-  -- fails because a test depends on files which are not put into sdist tarball
-  stackErr ["sdist", "package-with-failing-test", "--test-tarball"]
diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/README.md b/test/integration/tests/717-sdist-test/files/package-with-failing-test/README.md
deleted file mode 100644
index 8831e9c09c..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-failing-test/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# thtest
diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/Setup.hs b/test/integration/tests/717-sdist-test/files/package-with-failing-test/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-failing-test/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/files/file.txt b/test/integration/tests/717-sdist-test/files/package-with-failing-test/files/file.txt
deleted file mode 100644
index 72943a16fb..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-failing-test/files/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-aaa
diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/package-with-failing-test.cabal b/test/integration/tests/717-sdist-test/files/package-with-failing-test/package-with-failing-test.cabal
deleted file mode 100644
index 75e8f7ae2e..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-failing-test/package-with-failing-test.cabal
+++ /dev/null
@@ -1,27 +0,0 @@
-name:                package-with-failing-test
-version:             0.1.0.0
-synopsis:            Some package
-description:         Some package
-homepage:            https://invalid
-license:             BSD3
-license-file:        LICENSE
-author:              Author name here
-maintainer:          example@example.com
-copyright:           2000 Author name here
-category:            Web
-build-type:          Simple
-extra-source-files:  README.md
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5,
-                       template-haskell
-  default-language:    Haskell2010
-
-test-suite tests
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      test
-  main-is:             Test.hs
-  build-depends:       base >= 4.7 && < 5
diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/src/Lib.hs b/test/integration/tests/717-sdist-test/files/package-with-failing-test/src/Lib.hs
deleted file mode 100644
index 0d8704c625..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-failing-test/src/Lib.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-import Language.Haskell.TH
-
-someFunc :: IO ()
-someFunc = putStrLn "aaa"
diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/test/Test.hs b/test/integration/tests/717-sdist-test/files/package-with-failing-test/test/Test.hs
deleted file mode 100644
index 5229fe7354..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-failing-test/test/Test.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-main :: IO ()
-main = do
-  readFile "files/file.txt"
-  pure ()
diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/README.md b/test/integration/tests/717-sdist-test/files/package-with-th/README.md
deleted file mode 100644
index 8831e9c09c..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-th/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# thtest
diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/Setup.hs b/test/integration/tests/717-sdist-test/files/package-with-th/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-th/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/files/file.txt b/test/integration/tests/717-sdist-test/files/package-with-th/files/file.txt
deleted file mode 100644
index 72943a16fb..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-th/files/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-aaa
diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/package-with-th.cabal b/test/integration/tests/717-sdist-test/files/package-with-th/package-with-th.cabal
deleted file mode 100644
index 972934006d..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-th/package-with-th.cabal
+++ /dev/null
@@ -1,22 +0,0 @@
-name:                package-with-th
-version:             0.1.0.0
-synopsis:            Some package
-description:         Some package
-homepage:            https://invalid
-license:             BSD3
-license-file:        LICENSE
-author:              Author name here
-maintainer:          example@example.com
-copyright:           2000 Author name here
-category:            Web
-build-type:          Simple
-extra-source-files:  README.md
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib,
-                       TH
-  build-depends:       base >= 4.7 && < 5,
-                       template-haskell
-  default-language:    Haskell2010
diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/src/Lib.hs b/test/integration/tests/717-sdist-test/files/package-with-th/src/Lib.hs
deleted file mode 100644
index 26d2841b8f..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-th/src/Lib.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE TemplateHaskell #-}
-module Lib
-    ( someFunc
-    ) where
-
-import TH
-import Language.Haskell.TH
-
-someFunc :: IO ()
-someFunc = print $(thFunc)
diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/src/TH.hs b/test/integration/tests/717-sdist-test/files/package-with-th/src/TH.hs
deleted file mode 100644
index ba24a158bf..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-th/src/TH.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module TH (thFunc) where
-
-import Language.Haskell.TH
-
-thFunc :: Q Exp
-thFunc = runIO $ do
-  readFile "files/file.txt"
-  pure $ LitE (IntegerL 5)
diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/README.md b/test/integration/tests/717-sdist-test/files/package-with-working-th/README.md
deleted file mode 100644
index 8831e9c09c..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-working-th/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# thtest
diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/Setup.hs b/test/integration/tests/717-sdist-test/files/package-with-working-th/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-working-th/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/files/file.txt b/test/integration/tests/717-sdist-test/files/package-with-working-th/files/file.txt
deleted file mode 100644
index 72943a16fb..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-working-th/files/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-aaa
diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/package-with-working-th.cabal b/test/integration/tests/717-sdist-test/files/package-with-working-th/package-with-working-th.cabal
deleted file mode 100644
index cbeb18c3ee..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-working-th/package-with-working-th.cabal
+++ /dev/null
@@ -1,22 +0,0 @@
-name:                package-with-working-th
-version:             0.1.0.0
-synopsis:            Some package
-description:         Some package
-homepage:            https://invalid
-license:             BSD3
-license-file:        LICENSE
-author:              Author name here
-maintainer:          example@example.com
-copyright:           2000 Author name here
-category:            Web
-build-type:          Simple
-extra-source-files:  README.md
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib,
-                       TH
-  build-depends:       base >= 4.7 && < 5,
-                       template-haskell
-  default-language:    Haskell2010
diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/src/Lib.hs b/test/integration/tests/717-sdist-test/files/package-with-working-th/src/Lib.hs
deleted file mode 100644
index 26d2841b8f..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-working-th/src/Lib.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE TemplateHaskell #-}
-module Lib
-    ( someFunc
-    ) where
-
-import TH
-import Language.Haskell.TH
-
-someFunc :: IO ()
-someFunc = print $(thFunc)
diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/src/TH.hs b/test/integration/tests/717-sdist-test/files/package-with-working-th/src/TH.hs
deleted file mode 100644
index e47d6eaab9..0000000000
--- a/test/integration/tests/717-sdist-test/files/package-with-working-th/src/TH.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module TH (thFunc) where
-
-import Language.Haskell.TH
-
-thFunc :: Q Exp
-thFunc =
-  pure $ LitE (IntegerL 5)
diff --git a/test/integration/tests/717-sdist-test/files/stack.yaml b/test/integration/tests/717-sdist-test/files/stack.yaml
deleted file mode 100644
index 7d0fc54aa8..0000000000
--- a/test/integration/tests/717-sdist-test/files/stack.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- package-with-th
-- package-with-working-th
-- package-with-failing-test
-- subdirs/dependent-on-failing-packages
-- subdirs/failing-in-subdir
-extra-deps: []
-flags: {}
-extra-package-dbs: []
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md b/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md
deleted file mode 100644
index 8831e9c09c..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# thtest
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/Setup.hs b/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/dependent-on-failing-packages.cabal b/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/dependent-on-failing-packages.cabal
deleted file mode 100644
index cb1ddff94c..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/dependent-on-failing-packages.cabal
+++ /dev/null
@@ -1,23 +0,0 @@
-name:                dependent-on-failing-packages
-version:             0.1.0.0
-synopsis:            Some package
-description:         Some package
-homepage:            https://invalid
-license:             BSD3
-license-file:        LICENSE
-author:              Author name here
-maintainer:          example@example.com
-copyright:           2000 Author name here
-category:            Web
-build-type:          Simple
-extra-source-files:  README.md
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     LibD
-  build-depends:       base >= 4.7 && < 5,
-                       template-haskell,
-                       package-with-th,
-                       failing-in-subdir
-  default-language:    Haskell2010
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt b/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt
deleted file mode 100644
index 72943a16fb..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-aaa
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs b/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs
deleted file mode 100644
index a0c7ad615e..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-module LibD
-    ( someFunc
-    ) where
-
-import Lib
-import LibC
-
-someFuncD :: IO ()
-someFuncD = do
-  someFunc
-  someFuncC
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE b/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE
deleted file mode 100644
index 60aaf72cfa..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright Author name here (c) 2000
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Author name here nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md b/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md
deleted file mode 100644
index 8831e9c09c..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# thtest
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/Setup.hs b/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/failing-in-subdir.cabal b/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/failing-in-subdir.cabal
deleted file mode 100644
index 944a17a598..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/failing-in-subdir.cabal
+++ /dev/null
@@ -1,22 +0,0 @@
-name:                failing-in-subdir
-version:             0.1.0.0
-synopsis:            Some package
-description:         Some package
-homepage:            https://invalid
-license:             BSD3
-license-file:        LICENSE
-author:              Author name here
-maintainer:          example@example.com
-copyright:           2000 Author name here
-category:            Web
-build-type:          Simple
-extra-source-files:  README.md
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     LibC,
-                       THInSubdir
-  build-depends:       base >= 4.7 && < 5,
-                       template-haskell
-  default-language:    Haskell2010
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt b/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt
deleted file mode 100644
index 72943a16fb..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-aaa
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs b/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs
deleted file mode 100644
index f951ce4a28..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE TemplateHaskell #-}
-module LibC
-    ( someFuncC
-    ) where
-
-import THInSubdir
-import Language.Haskell.TH
-
-someFuncC :: IO ()
-someFuncC = print $(thFuncC)
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs b/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs
deleted file mode 100644
index d9a3820d9d..0000000000
--- a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module THInSubdir (thFuncC) where
-
-import Language.Haskell.TH
-
-thFuncC :: Q Exp
-thFuncC = runIO $ do
-  readFile "files/file.txt"
-  pure $ LitE (IntegerL 5)
diff --git a/test/integration/tests/763-buildable-false/Main.hs b/test/integration/tests/763-buildable-false/Main.hs
deleted file mode 100644
index 89d44c5eea..0000000000
--- a/test/integration/tests/763-buildable-false/Main.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stack ["build"]
-    stack ["build", "--flag", "*:force-enable"]
-    stack ["build", ":enabled"]
-    stackErr ["build", ":disabled"]
-    stack ["build", ":disabled", "--flag", "files:force-enable"]
diff --git a/test/integration/tests/763-buildable-false/files/files.cabal b/test/integration/tests/763-buildable-false/files/files.cabal
deleted file mode 100644
index a4c6069896..0000000000
--- a/test/integration/tests/763-buildable-false/files/files.cabal
+++ /dev/null
@@ -1,25 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-flag force-enable
-  default: False
-  description: foo
-
-executable enabled
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  buildable: True
-
-executable disabled
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  if flag(force-enable)
-    buildable: True
-  else
-    buildable: False
diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml
deleted file mode 100644
index 0ba9c320d5..0000000000
--- a/test/integration/tests/763-buildable-false/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/796-ghc-options/Main.hs b/test/integration/tests/796-ghc-options/Main.hs
deleted file mode 100644
index 25ee1e2869..0000000000
--- a/test/integration/tests/796-ghc-options/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stack ["build"]
-    stackErr ["build", "--ghc-options=-DBAZ"]
-    stack ["build", "--ghc-options=-DQUX"]
diff --git a/test/integration/tests/796-ghc-options/files/ghc-options.cabal b/test/integration/tests/796-ghc-options/files/ghc-options.cabal
deleted file mode 100644
index 642090489e..0000000000
--- a/test/integration/tests/796-ghc-options/files/ghc-options.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                ghc-options
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/796-ghc-options/files/src/Lib.hs b/test/integration/tests/796-ghc-options/files/src/Lib.hs
deleted file mode 100644
index cb23e74c8c..0000000000
--- a/test/integration/tests/796-ghc-options/files/src/Lib.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-{-# LANGUAGE CPP #-}
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
-
-#ifndef FOO
-#error FOO isn't defined
-#endif
-
-#ifndef BAR
-#error BAR isn't defined
-#endif
-
-#ifdef BAZ
-#error BAZ is defined
-#endif
diff --git a/test/integration/tests/796-ghc-options/files/stack.yaml b/test/integration/tests/796-ghc-options/files/stack.yaml
deleted file mode 100644
index 5deda1c0a5..0000000000
--- a/test/integration/tests/796-ghc-options/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: ghc-9.2.4
-ghc-options:
-  "*": -DFOO
-  ghc-options: -DBAR
-rebuild-ghc-options: true
diff --git a/test/integration/tests/basic-install/Main.hs b/test/integration/tests/basic-install/Main.hs
deleted file mode 100644
index c49f21b659..0000000000
--- a/test/integration/tests/basic-install/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    stack [defaultResolverArg, "install", "acme-missiles-0.3"]
-    doesNotExist "stack.yaml"
diff --git a/test/integration/tests/build-ghc/Main.hs b/test/integration/tests/build-ghc/Main.hs
deleted file mode 100644
index d2ca66bda4..0000000000
--- a/test/integration/tests/build-ghc/Main.hs
+++ /dev/null
@@ -1,28 +0,0 @@
-import StackTest
-import System.Directory (withCurrentDirectory)
-
-main :: IO ()
-main = superslow $ do
-    -- cleanup previous failing test...
-    removeDirIgnore "tmpPackage"
-
-    stack ["new", "--resolver=lts-13.11", "tmpPackage"]
-
-    -- use a commit which is known to succeed with hadrian binary-dist
-    let commitId = "be0dde8e3c27ca56477d1d1801bb77621f3618e1"
-        flavour  = "quick"
-
-    withCurrentDirectory "tmpPackage" $ do
-       appendFile "stack.yaml" $ unlines
-         [ "compiler-repository: https://gitlab.haskell.org/ghc/ghc.git"
-         , "compiler: ghc-git-" ++ commitId ++ "-" ++ flavour
-         ]
-
-       -- Setup the package
-       stack ["setup"]
-
-       -- build it with the built GHC
-       stack ["build"]
-
-    -- cleanup
-    removeDirIgnore "tmpPackage"
diff --git a/test/integration/tests/cabal-non-buildable-bug/Main.hs b/test/integration/tests/cabal-non-buildable-bug/Main.hs
deleted file mode 100644
index 6242d855ea..0000000000
--- a/test/integration/tests/cabal-non-buildable-bug/Main.hs
+++ /dev/null
@@ -1,18 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  -- Newer Cabal: dry run and building should succeed, because they'll
-  -- both ignore the do-not-build
-  writeFile "stack.yaml" "resolver: ghc-9.2.4"
-  stack ["build", "--dry-run"]
-  stack ["build"]
-
-  -- Older Cabal: both should fail, because they'll both try to
-  -- include the non-buildable component. If there's a regression, the
-  -- dry run will succeed (because Stack will use the proper logic)
-  -- and build will fail (because Cabal will be using its broken
-  -- logic).
-  writeFile "stack.yaml" "resolver: ghc-7.10.3"
-  stackErr ["build"]
-  stackErr ["build", "--dry-run"]
diff --git a/test/integration/tests/cabal-non-buildable-bug/files/.gitignore b/test/integration/tests/cabal-non-buildable-bug/files/.gitignore
deleted file mode 100644
index 0008ca1636..0000000000
--- a/test/integration/tests/cabal-non-buildable-bug/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-stack.yaml
-foo.cabal
diff --git a/test/integration/tests/cabal-non-buildable-bug/files/package.yaml b/test/integration/tests/cabal-non-buildable-bug/files/package.yaml
deleted file mode 100644
index 67f3a25c46..0000000000
--- a/test/integration/tests/cabal-non-buildable-bug/files/package.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: foo
-version: "0"
-
-dependencies:
-- base
-
-library: {}
-
-executables:
-  not-built:
-    main: Main.hs
-    dependencies:
-    - does-not-exist
-    buildable: false
diff --git a/test/integration/tests/cabal-public-sublibraries/Main.hs b/test/integration/tests/cabal-public-sublibraries/Main.hs
deleted file mode 100644
index 987ebbfe2e..0000000000
--- a/test/integration/tests/cabal-public-sublibraries/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  putStrLn "Disabled: CI doesn't have GHC 8.8.1"
-  --stack ["build"]
diff --git a/test/integration/tests/cabal-public-sublibraries/files/Setup.hs b/test/integration/tests/cabal-public-sublibraries/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/cabal-public-sublibraries/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/cabal-public-sublibraries/files/files.cabal b/test/integration/tests/cabal-public-sublibraries/files/files.cabal
deleted file mode 100644
index 5255078e44..0000000000
--- a/test/integration/tests/cabal-public-sublibraries/files/files.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
-cabal-version:       3.0
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
-
-library sub
-  visibility:          public
-  hs-source-dirs:      src
-  exposed-modules:     Sub
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/cabal-public-sublibraries/files/src/Lib.hs b/test/integration/tests/cabal-public-sublibraries/files/src/Lib.hs
deleted file mode 100644
index d999e20553..0000000000
--- a/test/integration/tests/cabal-public-sublibraries/files/src/Lib.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Lib
-  ( someFunc
-  ) where
-
-someFunc :: IO ()
-someFunc = do
-  putStrLn "hello world"
diff --git a/test/integration/tests/cabal-public-sublibraries/files/src/Sub.hs b/test/integration/tests/cabal-public-sublibraries/files/src/Sub.hs
deleted file mode 100644
index 08c047a5a1..0000000000
--- a/test/integration/tests/cabal-public-sublibraries/files/src/Sub.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Sub
-  ( someFunc
-  ) where
-
-someFunc :: IO ()
-someFunc = do
-  putStrLn "hello world"
diff --git a/test/integration/tests/cabal-public-sublibraries/files/stack.yaml b/test/integration/tests/cabal-public-sublibraries/files/stack.yaml
deleted file mode 100644
index 724dd5b170..0000000000
--- a/test/integration/tests/cabal-public-sublibraries/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: nightly-2020-01-17
-packages:
-- .
-extra-deps:
-- github: snoyberg/filelock
-  commit: 4f080496d8bf153fbe26e64d1f52cf73c7db25f6
-# - Cabal-3.0.0.0@sha256:1ba37b8d80e89213b17db7b8b9ea0108da55ca65f8c0cbb7433881a284c5cf67,26027
diff --git a/test/integration/tests/cabal-sublibrary-dependency/Main.hs b/test/integration/tests/cabal-sublibrary-dependency/Main.hs
deleted file mode 100644
index 1fa8ee7d89..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/Main.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-main :: IO ()
-main = do
-  putStrLn "Disabled: CI doesn't have GHC 8.8.1"
-  {-
-  stackErrStderr ["build"] $ \str ->
-    let msg = "SubLibrary dependency is not supported, this will almost certainly fail" in
-
-    unless (msg `isInfixOf` str) $
-    error $ "Expected a warning: \n" ++ show msg
-  -}
diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/Setup.hs b/test/integration/tests/cabal-sublibrary-dependency/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/files.cabal b/test/integration/tests/cabal-sublibrary-dependency/files/files.cabal
deleted file mode 100644
index 7d6db901c0..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/files/files.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
-cabal-version:       3.0
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-                     , subproject:{subproject, sub}
-  default-language:    Haskell2010
diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/src/Lib.hs b/test/integration/tests/cabal-sublibrary-dependency/files/src/Lib.hs
deleted file mode 100644
index 3bce6931fc..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/files/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib 
-  ( someFunc
-  ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/src/Sub/Sub.hs b/test/integration/tests/cabal-sublibrary-dependency/files/src/Sub/Sub.hs
deleted file mode 100644
index f38569b912..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/files/src/Sub/Sub.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Sub.Sub
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml b/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml
deleted file mode 100644
index 8b93dddda1..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: nightly-2020-01-17
-packages:
-- .
-- subproject
-extra-deps:
-- github: snoyberg/filelock
-  commit: 4f080496d8bf153fbe26e64d1f52cf73c7db25f6
diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Lib.hs b/test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Lib.hs
deleted file mode 100644
index d36ff2714d..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Lib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/SubLib.hs b/test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/SubLib.hs
deleted file mode 100644
index 17aca821e4..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/SubLib.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module SubLib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/subproject.cabal b/test/integration/tests/cabal-sublibrary-dependency/files/subproject/subproject.cabal
deleted file mode 100644
index 4c083cac74..0000000000
--- a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/subproject.cabal
+++ /dev/null
@@ -1,16 +0,0 @@
-name:                subproject
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
-
-library sub
-  hs-source-dirs:      src
-  exposed-modules:     SubLib
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
diff --git a/test/integration/tests/copy-bins-works/Main.hs b/test/integration/tests/copy-bins-works/Main.hs
deleted file mode 100644
index 038e3f1124..0000000000
--- a/test/integration/tests/copy-bins-works/Main.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-import StackTest
-import System.Directory
-import Control.Monad (unless)
-
-main :: IO ()
-main = do
-  let test args = do
-        removeDirIgnore "bin"
-        stackCleanFull
-        stack args
-        exists <- doesDirectoryExist "bin"
-        unless exists $ error $ "Failed with: " ++ show args
-  test ["install", "--local-bin-path", "bin"]
-  test ["build", "--copy-bins", "--local-bin-path", "bin"]
diff --git a/test/integration/tests/copy-bins-works/files/.gitignore b/test/integration/tests/copy-bins-works/files/.gitignore
deleted file mode 100644
index f1a8228e76..0000000000
--- a/test/integration/tests/copy-bins-works/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.cabal
-/bin/
diff --git a/test/integration/tests/copy-bins-works/files/package.yaml b/test/integration/tests/copy-bins-works/files/package.yaml
deleted file mode 100644
index 34d45cd594..0000000000
--- a/test/integration/tests/copy-bins-works/files/package.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: foo
-version: 0
-
-executables:
-  bar:
-    source-dirs: src
-    main: Main.hs
-    dependencies:
-    - base
diff --git a/test/integration/tests/copy-bins-works/files/stack.yaml b/test/integration/tests/copy-bins-works/files/stack.yaml
deleted file mode 100644
index 0731df979f..0000000000
--- a/test/integration/tests/copy-bins-works/files/stack.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resolver: ghc-9.2.4
-copy-bins: true
diff --git a/test/integration/tests/cyclic-test-deps/.gitignore b/test/integration/tests/cyclic-test-deps/.gitignore
deleted file mode 100644
index 027271b9b2..0000000000
--- a/test/integration/tests/cyclic-test-deps/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-files
diff --git a/test/integration/tests/cyclic-test-deps/Main.hs b/test/integration/tests/cyclic-test-deps/Main.hs
deleted file mode 100644
index 3635b01c36..0000000000
--- a/test/integration/tests/cyclic-test-deps/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    removeDirIgnore "text-2.0"
-    stack ["unpack", "text-2.0"]
-    stack ["unpack", "QuickCheck-2.14.2"]
-    removeFileIgnore "stack.yaml"
-    stack ["init", defaultResolverArg]
-    stack ["test", "--dry-run"]
diff --git a/test/integration/tests/drop-packages/Main.hs b/test/integration/tests/drop-packages/Main.hs
deleted file mode 100644
index b16d43227b..0000000000
--- a/test/integration/tests/drop-packages/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stackErr ["build"]
diff --git a/test/integration/tests/drop-packages/files/.gitignore b/test/integration/tests/drop-packages/files/.gitignore
deleted file mode 100644
index d43d807c0d..0000000000
--- a/test/integration/tests/drop-packages/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cabal
diff --git a/test/integration/tests/drop-packages/files/package.yaml b/test/integration/tests/drop-packages/files/package.yaml
deleted file mode 100644
index 1fe2825944..0000000000
--- a/test/integration/tests/drop-packages/files/package.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: unimportant
-version: 0
-dependencies:
-- base
-- unliftio-core
-library: {}
diff --git a/test/integration/tests/drop-packages/files/stack.yaml b/test/integration/tests/drop-packages/files/stack.yaml
deleted file mode 100644
index 0da4b8cb86..0000000000
--- a/test/integration/tests/drop-packages/files/stack.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: nightly-2022-09-05
-drop-packages:
-- unliftio-core
diff --git a/test/integration/tests/duplicate-package-ids/Main.hs b/test/integration/tests/duplicate-package-ids/Main.hs
deleted file mode 100644
index 88fd081bc6..0000000000
--- a/test/integration/tests/duplicate-package-ids/Main.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    readFile "stack1.yaml" >>= writeFile "stack.yaml"
-    stack ["setup"]
-    stack ["build", "auto-update"]
-    readFile "stack2.yaml" >>= writeFile "stack.yaml"
-    removeDirIgnore "auto-update-0.1.2.1"
-    stack ["unpack", "auto-update-0.1.2.1"]
-    stack ["build"]
diff --git a/test/integration/tests/duplicate-package-ids/files/.gitignore b/test/integration/tests/duplicate-package-ids/files/.gitignore
deleted file mode 100644
index f39970f250..0000000000
--- a/test/integration/tests/duplicate-package-ids/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-stack.yaml
-auto-update-0.1.2.1
diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml
deleted file mode 100644
index d047f2b2af..0000000000
--- a/test/integration/tests/duplicate-package-ids/files/stack1.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resolver: nightly-2022-09-05
-packages: []
diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml
deleted file mode 100644
index 4dc1dc52dc..0000000000
--- a/test/integration/tests/duplicate-package-ids/files/stack2.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- auto-update-0.1.2.1
diff --git a/test/integration/tests/ghc-install-hooks/Main.hs b/test/integration/tests/ghc-install-hooks/Main.hs
deleted file mode 100644
index 491eb11761..0000000000
--- a/test/integration/tests/ghc-install-hooks/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import System.Process (rawSystem)
-import Control.Exception (throwIO)
-import StackTest
-import Control.Monad (unless)
-
-main :: IO ()
-main = rawSystem "sh" ["run.sh"] >>= throwIO
diff --git a/test/integration/tests/ghc-install-hooks/files/run.sh b/test/integration/tests/ghc-install-hooks/files/run.sh
deleted file mode 100755
index de26b0eebf..0000000000
--- a/test/integration/tests/ghc-install-hooks/files/run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env sh
-
-set -exu
-
-stack_bin=$("$STACK_EXE" path --resolver ghc-9.2.4 --compiler-bin)
-
-export STACK_ROOT=$(pwd)/fake-root
-
-mkdir -p "${STACK_ROOT}"/hooks
-
-echo "echo '${stack_bin}/ghc'" > "${STACK_ROOT}"/hooks/ghc-install.sh
-chmod +x "${STACK_ROOT}"/hooks/ghc-install.sh
-
-"$STACK_EXE" --no-install-ghc --resolver ghc-9.2.4 ghc -- --info
-"$STACK_EXE" --no-install-ghc --resolver ghc-9.2.4 runghc foo.hs
diff --git a/test/integration/tests/git-submodules/Main.hs b/test/integration/tests/git-submodules/Main.hs
deleted file mode 100644
index 07be7ac679..0000000000
--- a/test/integration/tests/git-submodules/Main.hs
+++ /dev/null
@@ -1,78 +0,0 @@
-import StackTest
-import System.Directory (createDirectoryIfMissing,withCurrentDirectory, getCurrentDirectory)
-import System.Exit (exitFailure)
-import System.FilePath ((</>))
-import Data.List (filter)
-import System.IO (hPutStrLn, withFile, IOMode(..))
-import Control.Monad (when)
-
-main :: IO ()
-main = when isLinux $ do
-    let
-      gitInit = do
-         runShell "git init ."
-         runShell "git config user.name Test"
-         runShell "git config user.email test@test.com"
-         runShell "git config commit.gpgsign false"
-
-    let withEmptyDir name inner = do
-          removeDirIgnore name
-          createDirectoryIfMissing True name
-          withCurrentDirectory name inner
-
-    withEmptyDir "tmpSubSubRepo" $ do
-      gitInit
-      stack ["new", "pkg ", defaultResolverArg]
-      runShell "git add pkg"
-      runShell "git commit -m SubSubCommit"
-
-    withEmptyDir "tmpSubRepo" $ do
-      gitInit
-      runShell "git submodule add ../tmpSubSubRepo sub"
-      runShell "git commit -a -m SubCommit"
-
-    withEmptyDir "tmpRepo" $ do
-      gitInit
-      runShell "git submodule add ../tmpSubRepo sub"
-      runShell "git commit -a -m Commit"
-
-    removeDirIgnore "tmpPackage"
-    stack ["new", defaultResolverArg, "tmpPackage"]
-
-    curDir <- getCurrentDirectory
-    let tmpRepoDir = curDir </> "tmpRepo"
-    gitHead <- runWithCwd tmpRepoDir "git" ["rev-parse", "HEAD"]
-    let gitHeadCommit = stripNewline gitHead
-
-    withCurrentDirectory "tmpPackage" $ do
-      -- add git dependency on repo with recursive submodules
-      writeToStackFile (tmpRepoDir, gitHeadCommit)
-      -- Setup the package
-      stack ["setup"]
-
-    -- cleanup
-    removeDirIgnore "tmpRepo"
-    removeDirIgnore "tmpSubRepo"
-    removeDirIgnore "tmpSubSubRepo"
-    removeDirIgnore "tmpPackage"
-
-writeToStackFile :: (String, String) -> IO ()
-writeToStackFile (tmpRepoDir, gitCommit) = do
-  curDir <- getCurrentDirectory
-  let stackFile = curDir </> "stack.yaml"
-  let line1 = "extra-deps:"
-      line2 = "- git: " ++ tmpRepoDir
-      line3 = "  commit: " ++ gitCommit
-      line4 = "  subdir: sub/sub/pkg"
-  withFile stackFile AppendMode (\handle -> do
-                                   hPutStrLn handle line1
-                                   hPutStrLn handle line2
-                                   hPutStrLn handle line3
-                                   hPutStrLn handle line4
-                                )
-
-newline :: Char
-newline = '\n'
-
-stripNewline :: String -> String
-stripNewline str = filter (\x -> x /= newline) str
diff --git a/test/integration/tests/haddock-options/Main.hs b/test/integration/tests/haddock-options/Main.hs
deleted file mode 100644
index 4cc0a88578..0000000000
--- a/test/integration/tests/haddock-options/Main.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-    removeDirIgnore ".stack-work"
-
-    -- Fails to work because BAR is defined here and FOO in stack file
-    stackErr ["haddock", "--haddock-arguments", "--optghc=-DBAR"]
-    stack ["clean"]
-    -- Works just fine, test #3099 while at it.
-    stack ["haddock", "--no-haddock-hyperlink-source"]
-    stack ["clean"]
-    -- Fails to work because we have bad argument
-    stackErr ["haddock", "--haddock-arguments", "--stack_it_badhaddockargument"]
diff --git a/test/integration/tests/haddock-options/files/haddock-options.cabal b/test/integration/tests/haddock-options/files/haddock-options.cabal
deleted file mode 100644
index f47b3df0b4..0000000000
--- a/test/integration/tests/haddock-options/files/haddock-options.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                haddock-options
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:    src
-  exposed-modules:   Lib
-  build-depends:     base
-  default-language:  Haskell2010
diff --git a/test/integration/tests/haddock-options/files/src/Lib.hs b/test/integration/tests/haddock-options/files/src/Lib.hs
deleted file mode 100644
index 2ad999dff9..0000000000
--- a/test/integration/tests/haddock-options/files/src/Lib.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE CPP #-}
-module Lib
-    ( someFunc
-    ) where
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
-
-#if defined(FOO) && defined(BAR)
-#error FOO and BAR is defined
-#endif
diff --git a/test/integration/tests/haddock-options/files/stack.yaml b/test/integration/tests/haddock-options/files/stack.yaml
deleted file mode 100644
index 13974b1701..0000000000
--- a/test/integration/tests/haddock-options/files/stack.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2022-09-05
-build:
-  haddock-arguments:
-    haddock-args:
-    - --optghc=-DFOO
diff --git a/test/integration/tests/hpack-repo/Main.hs b/test/integration/tests/hpack-repo/Main.hs
deleted file mode 100644
index 9512c6cca4..0000000000
--- a/test/integration/tests/hpack-repo/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import StackTest
-import System.Directory
-
-main :: IO ()
-main = do
-    removeDirIgnore ".stack-work"
-    stack ["build"]
diff --git a/test/integration/tests/hpack-repo/files/files.cabal b/test/integration/tests/hpack-repo/files/files.cabal
deleted file mode 100644
index e167e1ff8c..0000000000
--- a/test/integration/tests/hpack-repo/files/files.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5, validity
-  default-language:    Haskell2010
diff --git a/test/integration/tests/hpack-repo/files/src/Lib.hs b/test/integration/tests/hpack-repo/files/src/Lib.hs
deleted file mode 100644
index 65c2b1b231..0000000000
--- a/test/integration/tests/hpack-repo/files/src/Lib.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Lib
-    ( someFunc
-    ) where
-
-import Data.Validity
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
diff --git a/test/integration/tests/hpack-repo/files/stack.yaml b/test/integration/tests/hpack-repo/files/stack.yaml
deleted file mode 100644
index ff8145f5c7..0000000000
--- a/test/integration/tests/hpack-repo/files/stack.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-packages:
-- .
-resolver: nightly-2022-09-05
-extra-deps:
-- git: https://github.com/NorfairKing/validity.git
-  commit: d128cc30bc886e31ea7f8161fb7708c08b162937
-  subdirs:
-  - validity
diff --git a/test/integration/tests/init-omit-packages/Main.hs b/test/integration/tests/init-omit-packages/Main.hs
deleted file mode 100644
index 071d526eda..0000000000
--- a/test/integration/tests/init-omit-packages/Main.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-import Control.Monad (unless)
-import StackTest
-import System.IO (readFile)
-
-main :: IO ()
-main = do
-  removeFileIgnore "stack.yaml"
-  stackErr ["init", "--resolver", "nightly-2022-09-05"]
-  stack ["init", "--resolver", "nightly-2022-09-05", "--omit-packages"]
-  contents <- lines <$> readFile "stack.yaml"
-  unless ("#- bad" `elem` contents) $
-    error "commented out 'bad' package was expected"
diff --git a/test/integration/tests/init-omit-packages/files/.gitignore b/test/integration/tests/init-omit-packages/files/.gitignore
deleted file mode 100644
index 684dbffa96..0000000000
--- a/test/integration/tests/init-omit-packages/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-stack.yaml
diff --git a/test/integration/tests/init-omit-packages/files/bad/bad.cabal b/test/integration/tests/init-omit-packages/files/bad/bad.cabal
deleted file mode 100644
index 789ad7d101..0000000000
--- a/test/integration/tests/init-omit-packages/files/bad/bad.cabal
+++ /dev/null
@@ -1,9 +0,0 @@
-name: bad
-version: 1.0.0
-build-type: Simple
-cabal-version: >= 1.8
-
-library
-  exposed-modules: Bad
-  build-depends: base, not-existing-package == 666.0
-  default-language: Haskell2010
\ No newline at end of file
diff --git a/test/integration/tests/init-omit-packages/files/good/good.cabal b/test/integration/tests/init-omit-packages/files/good/good.cabal
deleted file mode 100644
index 944e5795cf..0000000000
--- a/test/integration/tests/init-omit-packages/files/good/good.cabal
+++ /dev/null
@@ -1,9 +0,0 @@
-name: good
-version: 1.0.0
-build-type: Simple
-cabal-version: >= 1.8
-
-library
-  exposed-modules: Good
-  build-depends: base
-  default-language: Haskell2010
\ No newline at end of file
diff --git a/test/integration/tests/internal-libraries/Main.hs b/test/integration/tests/internal-libraries/Main.hs
deleted file mode 100644
index 0449b0a2e1..0000000000
--- a/test/integration/tests/internal-libraries/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stack ["setup"] -- See stack.yaml; using GHC 8.10.7
-  stack ["build"]
diff --git a/test/integration/tests/internal-libraries/files/Setup.hs b/test/integration/tests/internal-libraries/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/internal-libraries/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/internal-libraries/files/files.cabal b/test/integration/tests/internal-libraries/files/files.cabal
deleted file mode 100644
index 30b6c571ce..0000000000
--- a/test/integration/tests/internal-libraries/files/files.cabal
+++ /dev/null
@@ -1,31 +0,0 @@
-name:                files
-version:             0.1.0.0
-build-type:          Simple
-cabal-version:       2.0
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Files
-  build-depends:       base
-  default-language:    Haskell2010
-
-library foo
-  hs-source-dirs:      src-foo
-  exposed-modules:     Foo
-  build-depends:       base, files, stm
-  default-language:    Haskell2010
-
-executable bar
-  hs-source-dirs:      src-bar
-  main-is:             Main.hs
-  build-depends:       base, files, foo
-  default-language:    Haskell2010
-
-foreign-library baz
-  type:                native-shared
-  other-modules:       Baz
-  build-depends:       base, files, foo, mtl
-  hs-source-dirs:      src-baz
-  default-language:    Haskell2010
-  if os(Windows)
-    options:           standalone
diff --git a/test/integration/tests/internal-libraries/files/src-bar/Main.hs b/test/integration/tests/internal-libraries/files/src-bar/Main.hs
deleted file mode 100644
index cc7e42ba70..0000000000
--- a/test/integration/tests/internal-libraries/files/src-bar/Main.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-module Main where
-
-import Files
-import Foo
-
-main :: IO ()
-main = do
-  putStrLn "files:"
-  print files
-  putStrLn "foo"
-  foo >>= print
diff --git a/test/integration/tests/internal-libraries/files/src-baz/Baz.hs b/test/integration/tests/internal-libraries/files/src-baz/Baz.hs
deleted file mode 100644
index 7e4e962ff3..0000000000
--- a/test/integration/tests/internal-libraries/files/src-baz/Baz.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-module Baz where
-
-import Files
-import Foo
-import Control.Monad.Reader
-
-baz :: IO ()
-baz = flip runReaderT () $ lift $ do
-  putStrLn "files:"
-  print files
-  putStrLn "foo"
-  foo >>= print
diff --git a/test/integration/tests/internal-libraries/files/src-foo/Foo.hs b/test/integration/tests/internal-libraries/files/src-foo/Foo.hs
deleted file mode 100644
index fba29d124c..0000000000
--- a/test/integration/tests/internal-libraries/files/src-foo/Foo.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Foo where
-
-import Control.Monad.STM
-import Files
-
-foo :: IO String
-foo = atomically $ pure $ "foo using " ++ files
diff --git a/test/integration/tests/internal-libraries/files/src/Files.hs b/test/integration/tests/internal-libraries/files/src/Files.hs
deleted file mode 100644
index b9c9eeac03..0000000000
--- a/test/integration/tests/internal-libraries/files/src/Files.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Files where
-
-files :: String
-files = "files"
diff --git a/test/integration/tests/internal-libraries/files/stack.yaml b/test/integration/tests/internal-libraries/files/stack.yaml
deleted file mode 100644
index d782ee0a1b..0000000000
--- a/test/integration/tests/internal-libraries/files/stack.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# This does not work on Windows with resolver: ghc-9.0.2. It fails with:
-#
-#   Building foreign library 'baz' for files-0.1.0.0..
-#   [1 of 1] Compiling Baz [flags changed]
-#   [1 of 1] Compiling Baz [flags changed]
-#   Linking .stack-work\dist\d53b6a14\build\baz\baz.dll ...
-#   <path to programs>//ghc-9.0.2//mingw//bin/ld.exe: cannot find -lHSrts
-#   collect2.exe: error: ld returned 1 exit status
-#   `gcc.exe' failed in phase `Linker'. (Exit code: 1)
-#
-# See https://github.com/haskell/cabal/issues/7763, which includes "Cabal is
-# currently unable to build foreign libraries with GHC 9.0 or 9.2." 'Currently'
-# refers to Cabal versions before 3.8.
-resolver: ghc-8.10.7
diff --git a/test/integration/tests/lock-files/Main.hs b/test/integration/tests/lock-files/Main.hs
deleted file mode 100644
index 8f7c89700f..0000000000
--- a/test/integration/tests/lock-files/Main.hs
+++ /dev/null
@@ -1,17 +0,0 @@
-import Control.Monad (unless, when)
-import Data.List (isInfixOf)
-import StackTest
-import System.Directory
-
-main :: IO ()
-main = do
-  copyFile "stack-2-extras" "stack.yaml"
-  stack ["build"]
-  lock1 <- readFile "stack.yaml.lock"
-  unless ("acme-dont" `isInfixOf` lock1) $
-    error "Package acme-dont wasn't found in Stack lock file"
-  copyFile "stack-1-extra" "stack.yaml"
-  stack ["build"]
-  lock2 <- readFile "stack.yaml.lock"
-  when ("acme-dont" `isInfixOf` lock2) $
-    error "Package acme-dont shouldn't be in Stack lock file anymore"
diff --git a/test/integration/tests/lock-files/files/Lib.hs b/test/integration/tests/lock-files/files/Lib.hs
deleted file mode 100644
index a3b82e6e83..0000000000
--- a/test/integration/tests/lock-files/files/Lib.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-foo :: Int
-foo = 42
diff --git a/test/integration/tests/lock-files/files/package.yaml b/test/integration/tests/lock-files/files/package.yaml
deleted file mode 100644
index 36e02ec5e7..0000000000
--- a/test/integration/tests/lock-files/files/package.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: example
-library:
-  dependencies:
-  - base
diff --git a/test/integration/tests/lock-files/files/stack-1-extra b/test/integration/tests/lock-files/files/stack-1-extra
deleted file mode 100644
index 47db862be8..0000000000
--- a/test/integration/tests/lock-files/files/stack-1-extra
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: nightly-2022-09-05
-extra-deps:
-- acme-cuteboy-0.1.0.0
diff --git a/test/integration/tests/lock-files/files/stack-2-extras b/test/integration/tests/lock-files/files/stack-2-extras
deleted file mode 100644
index 3813415557..0000000000
--- a/test/integration/tests/lock-files/files/stack-2-extras
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: nightly-2022-09-05
-extra-deps:
-- acme-cuteboy-0.1.0.0
-- acme-dont-1.1
diff --git a/test/integration/tests/module-added-multiple-times/Main.hs b/test/integration/tests/module-added-multiple-times/Main.hs
deleted file mode 100644
index 8734e03fdd..0000000000
--- a/test/integration/tests/module-added-multiple-times/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import Control.Monad
-import Data.List
-import StackTest
-
-main :: IO ()
-main = repl [] $ do
-    replCommand ":main"
-    line <- replGetLine
-    when (line /= "Hello World!")
-        $ error "Main module didn't load correctly."
diff --git a/test/integration/tests/module-added-multiple-times/files/LICENSE b/test/integration/tests/module-added-multiple-times/files/LICENSE
deleted file mode 100644
index d05408d876..0000000000
--- a/test/integration/tests/module-added-multiple-times/files/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Your name here nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/test/integration/tests/module-added-multiple-times/files/Setup.hs b/test/integration/tests/module-added-multiple-times/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/module-added-multiple-times/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/module-added-multiple-times/files/exe/Main.hs b/test/integration/tests/module-added-multiple-times/files/exe/Main.hs
deleted file mode 100644
index 504eb17dda..0000000000
--- a/test/integration/tests/module-added-multiple-times/files/exe/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Main where
-
-import Lib.A
-
-main :: IO ()
-main = putStrLn messageA
diff --git a/test/integration/tests/module-added-multiple-times/files/project-a.cabal b/test/integration/tests/module-added-multiple-times/files/project-a.cabal
deleted file mode 100644
index 4e230ef90b..0000000000
--- a/test/integration/tests/module-added-multiple-times/files/project-a.cabal
+++ /dev/null
@@ -1,33 +0,0 @@
-name:          project-a
-version:       0.1.0.0
-synopsis:      Simple project template from stack
-description:   Please see README.md
-homepage:      http://github.com/githubuser/project-a#readme
-license:       MIT
-license-file:  LICENSE
-author:        Author name here
-maintainer:    example@example.com
-copyright:     2010 Author Here
-category:      Web
-build-type:    Simple
-cabal-version: >=1.10
-
-library
-  hs-source-dirs:    src
-  default-language:  Haskell2010
-
-  exposed-modules:   Lib.A
-
-  build-depends:     base
-
-
-executable project-a-exe
-  main-is:           Main.hs
-  hs-source-dirs:    exe
-  default-language:  Haskell2010
-
-  ghc-options:       -rtsopts
-
-  build-depends:     base
-
-                   , project-a
\ No newline at end of file
diff --git a/test/integration/tests/module-added-multiple-times/files/src/Lib/A.hs b/test/integration/tests/module-added-multiple-times/files/src/Lib/A.hs
deleted file mode 100644
index 788d4e22d5..0000000000
--- a/test/integration/tests/module-added-multiple-times/files/src/Lib/A.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Lib.A where
-
-messageA :: String
-messageA = "Hello World!"
diff --git a/test/integration/tests/module-added-multiple-times/files/stack.yaml b/test/integration/tests/module-added-multiple-times/files/stack.yaml
deleted file mode 100644
index fc84f1e954..0000000000
--- a/test/integration/tests/module-added-multiple-times/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: nightly-2022-09-05
-extra-deps: []
-flags: {}
-extra-package-dbs: []
diff --git a/test/integration/tests/multi-test/Main.hs b/test/integration/tests/multi-test/Main.hs
deleted file mode 100644
index dcec42e2b4..0000000000
--- a/test/integration/tests/multi-test/Main.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-import Control.Monad (unless)
-import Data.List (isInfixOf)
-import StackTest
-
-main :: IO ()
-main = do
-    stack ["build"]
-    stack ["test"]
-    -- FIXME: Make 'clean' unnecessary (see #1411)
-    stack ["clean"]
-    stackCheckStderr ["test", "--coverage"] $ \out -> do
-        unless ("The coverage report for multi-test-suite's test-suite \"multi-test-suite-test\" is available at" `isInfixOf` out) $
-            fail "Didn't get expected report for multi-test-suite-test"
-        unless ("Error: The coverage report for multi-test-suite's test-suite \"multi-test-suite-test-2\" did not consider any code." `isInfixOf` out) $
-            fail "Didn't get expected empty report for multi-test-suite-test-2"
-    -- Test then build works too.
-    stack ["clean"]
-    stack ["test"]
-    stack ["build"]
diff --git a/test/integration/tests/multi-test/files/LICENSE b/test/integration/tests/multi-test/files/LICENSE
deleted file mode 100644
index d05408d876..0000000000
--- a/test/integration/tests/multi-test/files/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Your name here nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/test/integration/tests/multi-test/files/Setup.hs b/test/integration/tests/multi-test/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/multi-test/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/multi-test/files/app/Main.hs b/test/integration/tests/multi-test/files/app/Main.hs
deleted file mode 100644
index de1c1ab35c..0000000000
--- a/test/integration/tests/multi-test/files/app/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Main where
-
-import Lib
-
-main :: IO ()
-main = someFunc
diff --git a/test/integration/tests/multi-test/files/cyclic/Cyclic.hs b/test/integration/tests/multi-test/files/cyclic/Cyclic.hs
deleted file mode 100644
index 57c0764899..0000000000
--- a/test/integration/tests/multi-test/files/cyclic/Cyclic.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Cyclic where
-
-cyclic :: String
-cyclic = "Hello from cyclic"
diff --git a/test/integration/tests/multi-test/files/cyclic/LICENSE b/test/integration/tests/multi-test/files/cyclic/LICENSE
deleted file mode 100644
index d05408d876..0000000000
--- a/test/integration/tests/multi-test/files/cyclic/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Your name here nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/test/integration/tests/multi-test/files/cyclic/Setup.hs b/test/integration/tests/multi-test/files/cyclic/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/multi-test/files/cyclic/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/multi-test/files/cyclic/Spec.hs b/test/integration/tests/multi-test/files/cyclic/Spec.hs
deleted file mode 100644
index 2a7e6b6085..0000000000
--- a/test/integration/tests/multi-test/files/cyclic/Spec.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import Lib (cyclicOutput)
-
-main :: IO ()
-main = cyclicOutput
diff --git a/test/integration/tests/multi-test/files/cyclic/cyclic.cabal b/test/integration/tests/multi-test/files/cyclic/cyclic.cabal
deleted file mode 100644
index 4faef11041..0000000000
--- a/test/integration/tests/multi-test/files/cyclic/cyclic.cabal
+++ /dev/null
@@ -1,33 +0,0 @@
--- Initial cyclic.cabal generated by cabal init.  For further
--- documentation, see http://haskell.org/cabal/users-guide/
-
-name:                cyclic
-version:             0.1.0.0
--- synopsis:
--- description:
--- license:
-license-file:        LICENSE
-author:              Michael Sloan
-maintainer:          mgsloan@gmail.com
--- copyright:
--- category:
-build-type:          Simple
--- extra-source-files:
-cabal-version:       >=1.10
-
-library
-  exposed-modules:     Cyclic
-  -- other-modules:
-  -- other-extensions:
-  build-depends:       base >=4.8 && <5.0
-  -- hs-source-dirs:
-  default-language:    Haskell2010
-
-test-suite cyclic-test-suite
-  type:                exitcode-stdio-1.0
-  main-is:             Spec.hs
-  build-depends:       base
-                     -- This is cyclic because multi-test-suite depends on this package.
-                     , multi-test-suite
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  default-language:    Haskell2010
diff --git a/test/integration/tests/multi-test/files/multi-test-suite.cabal b/test/integration/tests/multi-test/files/multi-test-suite.cabal
deleted file mode 100644
index deb33d3572..0000000000
--- a/test/integration/tests/multi-test/files/multi-test-suite.cabal
+++ /dev/null
@@ -1,58 +0,0 @@
-name:                multi-test-suite
-version:             0.1.0.0
-synopsis:            Initial project template from stack
-description:         Please see README.md
-homepage:            http://github.com/commercialhaskell/multi-test-suite#readme
-license:             BSD3
-license-file:        LICENSE
-author:              Your name here
-maintainer:          your.address@example.com
--- copyright:
-category:            Web
-build-type:          Simple
--- extra-source-files:
-cabal-version:       >=1.10
-
-library
-  hs-source-dirs:      src
-  exposed-modules:     Lib
-  build-depends:       base >= 4.7 && < 5, cyclic
-  default-language:    Haskell2010
-
-executable multi-test-suite-exe
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-                     , multi-test-suite
-  default-language:    Haskell2010
-
-test-suite multi-test-suite-test
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      test
-  main-is:             Spec.hs
-  build-depends:       base
-                     , multi-test-suite
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  default-language:    Haskell2010
-
-test-suite multi-test-suite-test-2
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      test-2
-  main-is:             Spec.hs
-  build-depends:       base
-                     , multi-test-suite
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  default-language:    Haskell2010
-
-test-suite multi-test-suite-test-3
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      test-3
-  main-is:             Spec.hs
-  build-depends:       base
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  default-language:    Haskell2010
-
-source-repository head
-  type:     git
-  location: https://github.com/commercialhaskell/multi-test-suite
diff --git a/test/integration/tests/multi-test/files/src/Lib.hs b/test/integration/tests/multi-test/files/src/Lib.hs
deleted file mode 100644
index dc9643b828..0000000000
--- a/test/integration/tests/multi-test/files/src/Lib.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-module Lib
-    ( someFunc
-    , someOtherFunc
-    , cyclicOutput
-    ) where
-
-import Cyclic
-
-someFunc :: IO ()
-someFunc = putStrLn "someFunc"
-
-someOtherFunc :: IO ()
-someOtherFunc = putStrLn "someOtherFunc"
-
-cyclicOutput :: IO ()
-cyclicOutput = putStrLn cyclic
diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml
deleted file mode 100644
index b1f943aaa0..0000000000
--- a/test/integration/tests/multi-test/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-flags: {}
-packages:
-- .
-- sub-package
-- cyclic
-extra-deps: []
-resolver: nightly-2022-09-05
diff --git a/test/integration/tests/multi-test/files/sub-package/src/Lib2.hs b/test/integration/tests/multi-test/files/sub-package/src/Lib2.hs
deleted file mode 100644
index 92ce236d56..0000000000
--- a/test/integration/tests/multi-test/files/sub-package/src/Lib2.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Lib2 where
-
-lib2 :: IO ()
-lib2 = putStrLn "lib2"
diff --git a/test/integration/tests/multi-test/files/sub-package/src/main.hs b/test/integration/tests/multi-test/files/sub-package/src/main.hs
deleted file mode 100644
index e84bf058a8..0000000000
--- a/test/integration/tests/multi-test/files/sub-package/src/main.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-import Lib2
-
-main = lib2
diff --git a/test/integration/tests/multi-test/files/sub-package/sub-package.cabal b/test/integration/tests/multi-test/files/sub-package/sub-package.cabal
deleted file mode 100644
index 0e94272961..0000000000
--- a/test/integration/tests/multi-test/files/sub-package/sub-package.cabal
+++ /dev/null
@@ -1,31 +0,0 @@
-name:                sub-package
-version:             0.1.0.0
-synopsis:            Initial project template from stack
-description:         Please see README.md
-homepage:            http://github.com/commercialhaskell/multi-test-suite#readme
-license:             BSD3
-license-file:        ../LICENSE
-author:              Your name here
-maintainer:          your.address@example.com
--- copyright:
-category:            Web
-build-type:          Simple
--- extra-source-files:
-cabal-version:       >=1.10
-
-executable sub-package-exe
-  hs-source-dirs:      src
-  main-is:             main.hs
-  other-modules:       Lib2
-  build-depends:       base >= 4.7 && < 5
-  default-language:    Haskell2010
-
-test-suite sub-package-test
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      src, test
-  main-is:             Spec.hs
-  other-modules:       Lib2
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-                     , multi-test-suite
-  default-language:    Haskell2010
diff --git a/test/integration/tests/multi-test/files/sub-package/test/Spec.hs b/test/integration/tests/multi-test/files/sub-package/test/Spec.hs
deleted file mode 100644
index 87852a7dec..0000000000
--- a/test/integration/tests/multi-test/files/sub-package/test/Spec.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import Lib
-import Lib2
-
-main :: IO ()
-main = do
-    someOtherFunc
-    lib2
diff --git a/test/integration/tests/multi-test/files/test-2/Spec.hs b/test/integration/tests/multi-test/files/test-2/Spec.hs
deleted file mode 100644
index c85feb952a..0000000000
--- a/test/integration/tests/multi-test/files/test-2/Spec.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import Lib
-
-main :: IO ()
-main = pure ()
diff --git a/test/integration/tests/multi-test/files/test/Spec.hs b/test/integration/tests/multi-test/files/test/Spec.hs
deleted file mode 100644
index 7153edaf67..0000000000
--- a/test/integration/tests/multi-test/files/test/Spec.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import Lib
-
-main :: IO ()
-main = someFunc
diff --git a/test/integration/tests/mutable-deps/Main.hs b/test/integration/tests/mutable-deps/Main.hs
deleted file mode 100644
index 7e519f06f6..0000000000
--- a/test/integration/tests/mutable-deps/Main.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-import Control.Monad (forM_, unless, when)
-import Data.List (isInfixOf, stripPrefix)
-import StackTest
-
-main :: IO ()
-main = unless isWindows $ do -- dependency issues on Windows
-    let isBuild package line =
-          case stripPrefix package line of
-            Just x -> "> build" `isInfixOf` line
-            Nothing -> False
-        expectRecompilation pkgs stderr = forM_ pkgs $ \p ->
-          unless (any (isBuild p) $ lines stderr) $
-          error $ "package " ++ show p ++ " recompilation was expected"
-        expectNoRecompilation pkgs stderr = forM_ pkgs $ \p ->
-          when (any (isBuild p) $ lines stderr) $
-          error $ "package " ++ show p ++ " recompilation was not expected"
-        mutablePackages = [ "filepath"
-                          , "directory"
-                          , "filemanip"
-                          , "files"
-                          ]
-    stackCheckStderr ["build"] $ expectRecompilation mutablePackages
-    stackCheckStderr ["build" , "--profile"] $ expectRecompilation mutablePackages
-    stackCheckStderr ["build"] $ expectNoRecompilation mutablePackages
-    stackCheckStderr ["build" , "--profile"] $ expectNoRecompilation mutablePackages
diff --git a/test/integration/tests/mutable-deps/files/app/Main.hs b/test/integration/tests/mutable-deps/files/app/Main.hs
deleted file mode 100644
index 5e18155cea..0000000000
--- a/test/integration/tests/mutable-deps/files/app/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Main where
-
-import Files
-
-main = do
-  cFiles <- allCFiles
-  putStrLn $ "C files:" ++ show cFiles
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Makefile b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Makefile
deleted file mode 100644
index f6139d3ef2..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-all: cpp gen
-
-cpp:
-	cpphs --noline -DIS_WINDOWS=False -DMODULE_NAME=Posix   -OSystem/FilePath/Posix.hs   System/FilePath/Internal.hs
-	cpphs --noline -DIS_WINDOWS=True  -DMODULE_NAME=Windows -OSystem/FilePath/Windows.hs System/FilePath/Internal.hs
-
-gen:
-	runhaskell Generate.hs
-
-.PHONY: all cpp gen
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/README.md b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/README.md
deleted file mode 100644
index 772abd2db4..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# FilePath [![Hackage version](https://img.shields.io/hackage/v/filepath.svg?label=Hackage)](https://hackage.haskell.org/package/filepath)
-
-The `filepath` package provides functionality for manipulating `FilePath` values, and is shipped with [GHC](https://www.haskell.org/ghc/).
-It provides three modules:
-
-* [`System.FilePath.Posix`](http://hackage.haskell.org/package/filepath/docs/System-FilePath-Posix.html)
-  manipulates POSIX/Linux style `FilePath` values (with `/` as the path separator).
-* [`System.FilePath.Windows`](http://hackage.haskell.org/package/filepath/docs/System-FilePath-Windows.html)
-  manipulates Windows style `FilePath` values (with either `\` or `/` as the path separator, and deals with drives).
-* [`System.FilePath`](http://hackage.haskell.org/package/filepath/docs/System-FilePath.html)
-  is an alias for the module appropriate to your platform.
-
-All three modules provide the same API, and the same documentation (calling out differences in the different variants).
-
-### What is a `FilePath`?
-
-In Haskell, the definition is `type FilePath = String` as of now. A Haskell `String` is a list of Unicode code points.
-
-On unix, filenames don't have a predefined encoding as per the
-[POSIX specification](https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_170)
-and are passed as `char[]` to syscalls.
-
-On windows (at least the API used by `Win32`) filepaths are UTF-16 strings.
-
-This means that Haskell filepaths have to be converted to C-strings on unix
-(utilizing the current filesystem encoding) and to UTF-16 strings
-on windows.
-
-Further, this is a low-level library and it makes no attempt at providing a more
-type safe variant for filepaths (e.g. by distinguishing between absolute and relative
-paths) and ensures no invariants (such as filepath validity).
-
-For such libraries, check out the following:
-
-* [hpath](https://hackage.haskell.org/package/hpath)
-* [path](https://hackage.haskell.org/package/path)
-* [paths](https://hackage.haskell.org/package/paths)
-* [strong-path](https://hackage.haskell.org/package/strong-path)
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Setup.hs b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Internal.hs b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Internal.hs
deleted file mode 100644
index 452ad46a44..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Internal.hs
+++ /dev/null
@@ -1,1048 +0,0 @@
-#if __GLASGOW_HASKELL__ >= 704
-{-# LANGUAGE Safe #-}
-#endif
-{-# LANGUAGE PatternGuards #-}
-
--- This template expects CPP definitions for:
---     MODULE_NAME = Posix | Windows
---     IS_WINDOWS  = False | True
-
--- |
--- Module      :  System.FilePath.MODULE_NAME
--- Copyright   :  (c) Neil Mitchell 2005-2014
--- License     :  BSD3
---
--- Maintainer  :  ndmitchell@gmail.com
--- Stability   :  stable
--- Portability :  portable
---
--- A library for 'FilePath' manipulations, using MODULE_NAME style paths on
--- all platforms. Importing "System.FilePath" is usually better.
---
--- Given the example 'FilePath': @\/directory\/file.ext@
---
--- We can use the following functions to extract pieces.
---
--- * 'takeFileName' gives @\"file.ext\"@
---
--- * 'takeDirectory' gives @\"\/directory\"@
---
--- * 'takeExtension' gives @\".ext\"@
---
--- * 'dropExtension' gives @\"\/directory\/file\"@
---
--- * 'takeBaseName' gives @\"file\"@
---
--- And we could have built an equivalent path with the following expressions:
---
--- * @\"\/directory\" '</>' \"file.ext\"@.
---
--- * @\"\/directory\/file" '<.>' \"ext\"@.
---
--- * @\"\/directory\/file.txt" '-<.>' \"ext\"@.
---
--- Each function in this module is documented with several examples,
--- which are also used as tests.
---
--- Here are a few examples of using the @filepath@ functions together:
---
--- /Example 1:/ Find the possible locations of a Haskell module @Test@ imported from module @Main@:
---
--- @['replaceFileName' path_to_main \"Test\" '<.>' ext | ext <- [\"hs\",\"lhs\"] ]@
---
--- /Example 2:/ Download a file from @url@ and save it to disk:
---
--- @do let file = 'makeValid' url
---   System.Directory.createDirectoryIfMissing True ('takeDirectory' file)@
---
--- /Example 3:/ Compile a Haskell file, putting the @.hi@ file under @interface@:
---
--- @'takeDirectory' file '</>' \"interface\" '</>' ('takeFileName' file '-<.>' \"hi\")@
---
--- References:
--- [1] <http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx Naming Files, Paths and Namespaces> (Microsoft MSDN)
-module System.FilePath.MODULE_NAME
-    (
-    -- * Separator predicates
-    FilePath,
-    pathSeparator, pathSeparators, isPathSeparator,
-    searchPathSeparator, isSearchPathSeparator,
-    extSeparator, isExtSeparator,
-
-    -- * @$PATH@ methods
-    splitSearchPath, getSearchPath,
-
-    -- * Extension functions
-    splitExtension,
-    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
-    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
-    stripExtension,
-
-    -- * Filename\/directory functions
-    splitFileName,
-    takeFileName, replaceFileName, dropFileName,
-    takeBaseName, replaceBaseName,
-    takeDirectory, replaceDirectory,
-    combine, (</>),
-    splitPath, joinPath, splitDirectories,
-
-    -- * Drive functions
-    splitDrive, joinDrive,
-    takeDrive, hasDrive, dropDrive, isDrive,
-
-    -- * Trailing slash functions
-    hasTrailingPathSeparator,
-    addTrailingPathSeparator,
-    dropTrailingPathSeparator,
-
-    -- * File name manipulations
-    normalise, equalFilePath,
-    makeRelative,
-    isRelative, isAbsolute,
-    isValid, makeValid
-    )
-    where
-
-import Data.Char(toLower, toUpper, isAsciiLower, isAsciiUpper)
-import Data.Maybe(isJust)
-import Data.List(stripPrefix, isSuffixOf)
-
-import System.Environment(getEnv)
-
-
-infixr 7  <.>, -<.>
-infixr 5  </>
-
-
-
-
-
----------------------------------------------------------------------
--- Platform Abstraction Methods (private)
-
--- | Is the operating system Unix or Linux like
-isPosix :: Bool
-isPosix = not isWindows
-
--- | Is the operating system Windows like
-isWindows :: Bool
-isWindows = IS_WINDOWS
-
-
----------------------------------------------------------------------
--- The basic functions
-
--- | The character that separates directories. In the case where more than
---   one character is possible, 'pathSeparator' is the \'ideal\' one.
---
--- > Windows: pathSeparator == '\\'
--- > Posix:   pathSeparator ==  '/'
--- > isPathSeparator pathSeparator
-pathSeparator :: Char
-pathSeparator = if isWindows then '\\' else '/'
-
--- | The list of all possible separators.
---
--- > Windows: pathSeparators == ['\\', '/']
--- > Posix:   pathSeparators == ['/']
--- > pathSeparator `elem` pathSeparators
-pathSeparators :: [Char]
-pathSeparators = if isWindows then "\\/" else "/"
-
--- | Rather than using @(== 'pathSeparator')@, use this. Test if something
---   is a path separator.
---
--- > isPathSeparator a == (a `elem` pathSeparators)
-isPathSeparator :: Char -> Bool
-isPathSeparator '/' = True
-isPathSeparator '\\' = isWindows
-isPathSeparator _ = False
-
-
--- | The character that is used to separate the entries in the $PATH environment variable.
---
--- > Windows: searchPathSeparator == ';'
--- > Posix:   searchPathSeparator == ':'
-searchPathSeparator :: Char
-searchPathSeparator = if isWindows then ';' else ':'
-
--- | Is the character a file separator?
---
--- > isSearchPathSeparator a == (a == searchPathSeparator)
-isSearchPathSeparator :: Char -> Bool
-isSearchPathSeparator = (== searchPathSeparator)
-
-
--- | File extension character
---
--- > extSeparator == '.'
-extSeparator :: Char
-extSeparator = '.'
-
--- | Is the character an extension character?
---
--- > isExtSeparator a == (a == extSeparator)
-isExtSeparator :: Char -> Bool
-isExtSeparator = (== extSeparator)
-
-
----------------------------------------------------------------------
--- Path methods (environment $PATH)
-
--- | Take a string, split it on the 'searchPathSeparator' character.
---   Blank items are ignored on Windows, and converted to @.@ on Posix.
---   On Windows path elements are stripped of quotes.
---
---   Follows the recommendations in
---   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>
---
--- > Posix:   splitSearchPath "File1:File2:File3"  == ["File1","File2","File3"]
--- > Posix:   splitSearchPath "File1::File2:File3" == ["File1",".","File2","File3"]
--- > Windows: splitSearchPath "File1;File2;File3"  == ["File1","File2","File3"]
--- > Windows: splitSearchPath "File1;;File2;File3" == ["File1","File2","File3"]
--- > Windows: splitSearchPath "File1;\"File2\";File3" == ["File1","File2","File3"]
-splitSearchPath :: String -> [FilePath]
-splitSearchPath = f
-    where
-    f xs = case break isSearchPathSeparator xs of
-           (pre, []    ) -> g pre
-           (pre, _:post) -> g pre ++ f post
-
-    g "" = ["." | isPosix]
-    g ('\"':x@(_:_)) | isWindows && last x == '\"' = [init x]
-    g x = [x]
-
-
--- | Get a list of 'FilePath's in the $PATH variable.
-getSearchPath :: IO [FilePath]
-getSearchPath = fmap splitSearchPath (getEnv "PATH")
-
-
----------------------------------------------------------------------
--- Extension methods
-
--- | Split on the extension. 'addExtension' is the inverse.
---
--- > splitExtension "/directory/path.ext" == ("/directory/path",".ext")
--- > uncurry (++) (splitExtension x) == x
--- > Valid x => uncurry addExtension (splitExtension x) == x
--- > splitExtension "file.txt" == ("file",".txt")
--- > splitExtension "file" == ("file","")
--- > splitExtension "file/file.txt" == ("file/file",".txt")
--- > splitExtension "file.txt/boris" == ("file.txt/boris","")
--- > splitExtension "file.txt/boris.ext" == ("file.txt/boris",".ext")
--- > splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob",".fred")
--- > splitExtension "file/path.txt/" == ("file/path.txt/","")
-splitExtension :: FilePath -> (String, String)
-splitExtension x = case nameDot of
-                       "" -> (x,"")
-                       _ -> (dir ++ init nameDot, extSeparator : ext)
-    where
-        (dir,file) = splitFileName_ x
-        (nameDot,ext) = breakEnd isExtSeparator file
-
--- | Get the extension of a file, returns @\"\"@ for no extension, @.ext@ otherwise.
---
--- > takeExtension "/directory/path.ext" == ".ext"
--- > takeExtension x == snd (splitExtension x)
--- > Valid x => takeExtension (addExtension x "ext") == ".ext"
--- > Valid x => takeExtension (replaceExtension x "ext") == ".ext"
-takeExtension :: FilePath -> String
-takeExtension = snd . splitExtension
-
--- | Remove the current extension and add another, equivalent to 'replaceExtension'.
---
--- > "/directory/path.txt" -<.> "ext" == "/directory/path.ext"
--- > "/directory/path.txt" -<.> ".ext" == "/directory/path.ext"
--- > "foo.o" -<.> "c" == "foo.c"
-(-<.>) :: FilePath -> String -> FilePath
-(-<.>) = replaceExtension
-
--- | Set the extension of a file, overwriting one if already present, equivalent to '-<.>'.
---
--- > replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext"
--- > replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext"
--- > replaceExtension "file.txt" ".bob" == "file.bob"
--- > replaceExtension "file.txt" "bob" == "file.bob"
--- > replaceExtension "file" ".bob" == "file.bob"
--- > replaceExtension "file.txt" "" == "file"
--- > replaceExtension "file.fred.bob" "txt" == "file.fred.txt"
--- > replaceExtension x y == addExtension (dropExtension x) y
-replaceExtension :: FilePath -> String -> FilePath
-replaceExtension x y = dropExtension x <.> y
-
--- | Add an extension, even if there is already one there, equivalent to 'addExtension'.
---
--- > "/directory/path" <.> "ext" == "/directory/path.ext"
--- > "/directory/path" <.> ".ext" == "/directory/path.ext"
-(<.>) :: FilePath -> String -> FilePath
-(<.>) = addExtension
-
--- | Remove last extension, and the \".\" preceding it.
---
--- > dropExtension "/directory/path.ext" == "/directory/path"
--- > dropExtension x == fst (splitExtension x)
-dropExtension :: FilePath -> FilePath
-dropExtension = fst . splitExtension
-
--- | Add an extension, even if there is already one there, equivalent to '<.>'.
---
--- > addExtension "/directory/path" "ext" == "/directory/path.ext"
--- > addExtension "file.txt" "bib" == "file.txt.bib"
--- > addExtension "file." ".bib" == "file..bib"
--- > addExtension "file" ".bib" == "file.bib"
--- > addExtension "/" "x" == "/.x"
--- > addExtension x "" == x
--- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
--- > Windows: addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
-addExtension :: FilePath -> String -> FilePath
-addExtension file "" = file
-addExtension file xs@(x:_) = joinDrive a res
-    where
-        res = if isExtSeparator x then b ++ xs
-              else b ++ [extSeparator] ++ xs
-
-        (a,b) = splitDrive file
-
--- | Does the given filename have an extension?
---
--- > hasExtension "/directory/path.ext" == True
--- > hasExtension "/directory/path" == False
--- > null (takeExtension x) == not (hasExtension x)
-hasExtension :: FilePath -> Bool
-hasExtension = any isExtSeparator . takeFileName
-
-
--- | Does the given filename have the specified extension?
---
--- > "png" `isExtensionOf` "/directory/file.png" == True
--- > ".png" `isExtensionOf` "/directory/file.png" == True
--- > ".tar.gz" `isExtensionOf` "bar/foo.tar.gz" == True
--- > "ar.gz" `isExtensionOf` "bar/foo.tar.gz" == False
--- > "png" `isExtensionOf` "/directory/file.png.jpg" == False
--- > "csv/table.csv" `isExtensionOf` "/data/csv/table.csv" == False
-isExtensionOf :: String -> FilePath -> Bool
-isExtensionOf ext@('.':_) = isSuffixOf ext . takeExtensions
-isExtensionOf ext         = isSuffixOf ('.':ext) . takeExtensions
-
--- | Drop the given extension from a FilePath, and the @\".\"@ preceding it.
---   Returns 'Nothing' if the FilePath does not have the given extension, or
---   'Just' and the part before the extension if it does.
---
---   This function can be more predictable than 'dropExtensions', especially if the filename
---   might itself contain @.@ characters.
---
--- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
--- > stripExtension "hi.o" "foo.x.hs.o" == Nothing
--- > dropExtension x == fromJust (stripExtension (takeExtension x) x)
--- > dropExtensions x == fromJust (stripExtension (takeExtensions x) x)
--- > stripExtension ".c.d" "a.b.c.d"  == Just "a.b"
--- > stripExtension ".c.d" "a.b..c.d" == Just "a.b."
--- > stripExtension "baz"  "foo.bar"  == Nothing
--- > stripExtension "bar"  "foobar"   == Nothing
--- > stripExtension ""     x          == Just x
-stripExtension :: String -> FilePath -> Maybe FilePath
-stripExtension []        path = Just path
-stripExtension ext@(x:_) path = stripSuffix dotExt path
-    where dotExt = if isExtSeparator x then ext else '.':ext
-
-
--- | Split on all extensions.
---
--- > splitExtensions "/directory/path.ext" == ("/directory/path",".ext")
--- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
--- > uncurry (++) (splitExtensions x) == x
--- > Valid x => uncurry addExtension (splitExtensions x) == x
--- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
-splitExtensions :: FilePath -> (FilePath, String)
-splitExtensions x = (a ++ c, d)
-    where
-        (a,b) = splitFileName_ x
-        (c,d) = break isExtSeparator b
-
--- | Drop all extensions.
---
--- > dropExtensions "/directory/path.ext" == "/directory/path"
--- > dropExtensions "file.tar.gz" == "file"
--- > not $ hasExtension $ dropExtensions x
--- > not $ any isExtSeparator $ takeFileName $ dropExtensions x
-dropExtensions :: FilePath -> FilePath
-dropExtensions = fst . splitExtensions
-
--- | Get all extensions.
---
--- > takeExtensions "/directory/path.ext" == ".ext"
--- > takeExtensions "file.tar.gz" == ".tar.gz"
-takeExtensions :: FilePath -> String
-takeExtensions = snd . splitExtensions
-
-
--- | Replace all extensions of a file with a new extension. Note
---   that 'replaceExtension' and 'addExtension' both work for adding
---   multiple extensions, so only required when you need to drop
---   all extensions first.
---
--- > replaceExtensions "file.fred.bob" "txt" == "file.txt"
--- > replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz"
-replaceExtensions :: FilePath -> String -> FilePath
-replaceExtensions x y = dropExtensions x <.> y
-
-
-
----------------------------------------------------------------------
--- Drive methods
-
--- | Is the given character a valid drive letter?
--- only a-z and A-Z are letters, not isAlpha which is more unicodey
-isLetter :: Char -> Bool
-isLetter x = isAsciiLower x || isAsciiUpper x
-
-
--- | Split a path into a drive and a path.
---   On Posix, \/ is a Drive.
---
--- > uncurry (++) (splitDrive x) == x
--- > Windows: splitDrive "file" == ("","file")
--- > Windows: splitDrive "c:/file" == ("c:/","file")
--- > Windows: splitDrive "c:\\file" == ("c:\\","file")
--- > Windows: splitDrive "\\\\shared\\test" == ("\\\\shared\\","test")
--- > Windows: splitDrive "\\\\shared" == ("\\\\shared","")
--- > Windows: splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\","file")
--- > Windows: splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\","UNCshared\\file")
--- > Windows: splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\","file")
--- > Windows: splitDrive "/d" == ("","/d")
--- > Posix:   splitDrive "/test" == ("/","test")
--- > Posix:   splitDrive "//test" == ("//","test")
--- > Posix:   splitDrive "test/file" == ("","test/file")
--- > Posix:   splitDrive "file" == ("","file")
-splitDrive :: FilePath -> (FilePath, FilePath)
-splitDrive x | isPosix = span (== '/') x
-splitDrive x | Just y <- readDriveLetter x = y
-splitDrive x | Just y <- readDriveUNC x = y
-splitDrive x | Just y <- readDriveShare x = y
-splitDrive x = ("",x)
-
-addSlash :: FilePath -> FilePath -> (FilePath, FilePath)
-addSlash a xs = (a++c,d)
-    where (c,d) = span isPathSeparator xs
-
--- See [1].
--- "\\?\D:\<path>" or "\\?\UNC\<server>\<share>"
-readDriveUNC :: FilePath -> Maybe (FilePath, FilePath)
-readDriveUNC (s1:s2:'?':s3:xs) | all isPathSeparator [s1,s2,s3] =
-    case map toUpper xs of
-        ('U':'N':'C':s4:_) | isPathSeparator s4 ->
-            let (a,b) = readDriveShareName (drop 4 xs)
-            in Just (s1:s2:'?':s3:take 4 xs ++ a, b)
-        _ -> case readDriveLetter xs of
-                 -- Extended-length path.
-                 Just (a,b) -> Just (s1:s2:'?':s3:a,b)
-                 Nothing -> Nothing
-readDriveUNC _ = Nothing
-
-{- c:\ -}
-readDriveLetter :: String -> Maybe (FilePath, FilePath)
-readDriveLetter (x:':':y:xs) | isLetter x && isPathSeparator y = Just $ addSlash [x,':'] (y:xs)
-readDriveLetter (x:':':xs) | isLetter x = Just ([x,':'], xs)
-readDriveLetter _ = Nothing
-
-{- \\sharename\ -}
-readDriveShare :: String -> Maybe (FilePath, FilePath)
-readDriveShare (s1:s2:xs) | isPathSeparator s1 && isPathSeparator s2 =
-        Just (s1:s2:a,b)
-    where (a,b) = readDriveShareName xs
-readDriveShare _ = Nothing
-
-{- assume you have already seen \\ -}
-{- share\bob -> "share\", "bob" -}
-readDriveShareName :: String -> (FilePath, FilePath)
-readDriveShareName name = addSlash a b
-    where (a,b) = break isPathSeparator name
-
-
-
--- | Join a drive and the rest of the path.
---
--- > Valid x => uncurry joinDrive (splitDrive x) == x
--- > Windows: joinDrive "C:" "foo" == "C:foo"
--- > Windows: joinDrive "C:\\" "bar" == "C:\\bar"
--- > Windows: joinDrive "\\\\share" "foo" == "\\\\share\\foo"
--- > Windows: joinDrive "/:" "foo" == "/:\\foo"
-joinDrive :: FilePath -> FilePath -> FilePath
-joinDrive = combineAlways
-
--- | Get the drive from a filepath.
---
--- > takeDrive x == fst (splitDrive x)
-takeDrive :: FilePath -> FilePath
-takeDrive = fst . splitDrive
-
--- | Delete the drive, if it exists.
---
--- > dropDrive x == snd (splitDrive x)
-dropDrive :: FilePath -> FilePath
-dropDrive = snd . splitDrive
-
--- | Does a path have a drive.
---
--- > not (hasDrive x) == null (takeDrive x)
--- > Posix:   hasDrive "/foo" == True
--- > Windows: hasDrive "C:\\foo" == True
--- > Windows: hasDrive "C:foo" == True
--- >          hasDrive "foo" == False
--- >          hasDrive "" == False
-hasDrive :: FilePath -> Bool
-hasDrive = not . null . takeDrive
-
-
--- | Is an element a drive
---
--- > Posix:   isDrive "/" == True
--- > Posix:   isDrive "/foo" == False
--- > Windows: isDrive "C:\\" == True
--- > Windows: isDrive "C:\\foo" == False
--- >          isDrive "" == False
-isDrive :: FilePath -> Bool
-isDrive x = not (null x) && null (dropDrive x)
-
-
----------------------------------------------------------------------
--- Operations on a filepath, as a list of directories
-
--- | Split a filename into directory and file. '</>' is the inverse.
---   The first component will often end with a trailing slash.
---
--- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
--- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
--- > Valid x => isValid (fst (splitFileName x))
--- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
--- > splitFileName "file/" == ("file/", "")
--- > splitFileName "bob" == ("./", "bob")
--- > Posix:   splitFileName "/" == ("/","")
--- > Windows: splitFileName "c:" == ("c:","")
-splitFileName :: FilePath -> (String, String)
-splitFileName x = (if null dir then "./" else dir, name)
-    where
-        (dir, name) = splitFileName_ x
-
--- version of splitFileName where, if the FilePath has no directory
--- component, the returned directory is "" rather than "./".  This
--- is used in cases where we are going to combine the returned
--- directory to make a valid FilePath, and having a "./" appear would
--- look strange and upset simple equality properties.  See
--- e.g. replaceFileName.
-splitFileName_ :: FilePath -> (String, String)
-splitFileName_ x = (drv ++ dir, file)
-    where
-        (drv,pth) = splitDrive x
-        (dir,file) = breakEnd isPathSeparator pth
-
--- | Set the filename.
---
--- > replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext"
--- > Valid x => replaceFileName x (takeFileName x) == x
-replaceFileName :: FilePath -> String -> FilePath
-replaceFileName x y = a </> y where (a,_) = splitFileName_ x
-
--- | Drop the filename. Unlike 'takeDirectory', this function will leave
---   a trailing path separator on the directory.
---
--- > dropFileName "/directory/file.ext" == "/directory/"
--- > dropFileName x == fst (splitFileName x)
-dropFileName :: FilePath -> FilePath
-dropFileName = fst . splitFileName
-
-
--- | Get the file name.
---
--- > takeFileName "/directory/file.ext" == "file.ext"
--- > takeFileName "test/" == ""
--- > takeFileName x `isSuffixOf` x
--- > takeFileName x == snd (splitFileName x)
--- > Valid x => takeFileName (replaceFileName x "fred") == "fred"
--- > Valid x => takeFileName (x </> "fred") == "fred"
--- > Valid x => isRelative (takeFileName x)
-takeFileName :: FilePath -> FilePath
-takeFileName = snd . splitFileName
-
--- | Get the base name, without an extension or path.
---
--- > takeBaseName "/directory/file.ext" == "file"
--- > takeBaseName "file/test.txt" == "test"
--- > takeBaseName "dave.ext" == "dave"
--- > takeBaseName "" == ""
--- > takeBaseName "test" == "test"
--- > takeBaseName (addTrailingPathSeparator x) == ""
--- > takeBaseName "file/file.tar.gz" == "file.tar"
-takeBaseName :: FilePath -> String
-takeBaseName = dropExtension . takeFileName
-
--- | Set the base name.
---
--- > replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext"
--- > replaceBaseName "file/test.txt" "bob" == "file/bob.txt"
--- > replaceBaseName "fred" "bill" == "bill"
--- > replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar"
--- > Valid x => replaceBaseName x (takeBaseName x) == x
-replaceBaseName :: FilePath -> String -> FilePath
-replaceBaseName pth nam = combineAlways a (nam <.> ext)
-    where
-        (a,b) = splitFileName_ pth
-        ext = takeExtension b
-
--- | Is an item either a directory or the last character a path separator?
---
--- > hasTrailingPathSeparator "test" == False
--- > hasTrailingPathSeparator "test/" == True
-hasTrailingPathSeparator :: FilePath -> Bool
-hasTrailingPathSeparator "" = False
-hasTrailingPathSeparator x = isPathSeparator (last x)
-
-
-hasLeadingPathSeparator :: FilePath -> Bool
-hasLeadingPathSeparator "" = False
-hasLeadingPathSeparator x = isPathSeparator (head x)
-
-
--- | Add a trailing file path separator if one is not already present.
---
--- > hasTrailingPathSeparator (addTrailingPathSeparator x)
--- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
--- > Posix:    addTrailingPathSeparator "test/rest" == "test/rest/"
-addTrailingPathSeparator :: FilePath -> FilePath
-addTrailingPathSeparator x = if hasTrailingPathSeparator x then x else x ++ [pathSeparator]
-
-
--- | Remove any trailing path separators
---
--- > dropTrailingPathSeparator "file/test/" == "file/test"
--- >           dropTrailingPathSeparator "/" == "/"
--- > Windows:  dropTrailingPathSeparator "\\" == "\\"
--- > Posix:    not (hasTrailingPathSeparator (dropTrailingPathSeparator x)) || isDrive x
-dropTrailingPathSeparator :: FilePath -> FilePath
-dropTrailingPathSeparator x =
-    if hasTrailingPathSeparator x && not (isDrive x)
-    then let x' = dropWhileEnd isPathSeparator x
-         in if null x' then [last x] else x'
-    else x
-
-
--- | Get the directory name, move up one level.
---
--- >           takeDirectory "/directory/other.ext" == "/directory"
--- >           takeDirectory x `isPrefixOf` x || takeDirectory x == "."
--- >           takeDirectory "foo" == "."
--- >           takeDirectory "/" == "/"
--- >           takeDirectory "/foo" == "/"
--- >           takeDirectory "/foo/bar/baz" == "/foo/bar"
--- >           takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
--- >           takeDirectory "foo/bar/baz" == "foo/bar"
--- > Windows:  takeDirectory "foo\\bar" == "foo"
--- > Windows:  takeDirectory "foo\\bar\\\\" == "foo\\bar"
--- > Windows:  takeDirectory "C:\\" == "C:\\"
-takeDirectory :: FilePath -> FilePath
-takeDirectory = dropTrailingPathSeparator . dropFileName
-
--- | Set the directory, keeping the filename the same.
---
--- > replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext"
--- > Valid x => replaceDirectory x (takeDirectory x) `equalFilePath` x
-replaceDirectory :: FilePath -> String -> FilePath
-replaceDirectory x dir = combineAlways dir (takeFileName x)
-
-
--- | An alias for '</>'.
-combine :: FilePath -> FilePath -> FilePath
-combine a b | hasLeadingPathSeparator b || hasDrive b = b
-            | otherwise = combineAlways a b
-
--- | Combine two paths, assuming rhs is NOT absolute.
-combineAlways :: FilePath -> FilePath -> FilePath
-combineAlways a b | null a = b
-                  | null b = a
-                  | hasTrailingPathSeparator a = a ++ b
-                  | otherwise = case a of
-                      [a1,':'] | isWindows && isLetter a1 -> a ++ b
-                      _ -> a ++ [pathSeparator] ++ b
-
-
--- | Combine two paths with a path separator.
---   If the second path starts with a path separator or a drive letter, then it returns the second.
---   The intention is that @readFile (dir '</>' file)@ will access the same file as
---   @setCurrentDirectory dir; readFile file@.
---
--- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
--- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
--- >          "directory" </> "/file.ext" == "/file.ext"
--- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
---
---   Combined:
---
--- > Posix:   "/" </> "test" == "/test"
--- > Posix:   "home" </> "bob" == "home/bob"
--- > Posix:   "x:" </> "foo" == "x:/foo"
--- > Windows: "C:\\foo" </> "bar" == "C:\\foo\\bar"
--- > Windows: "home" </> "bob" == "home\\bob"
---
---   Not combined:
---
--- > Posix:   "home" </> "/bob" == "/bob"
--- > Windows: "home" </> "C:\\bob" == "C:\\bob"
---
---   Not combined (tricky):
---
---   On Windows, if a filepath starts with a single slash, it is relative to the
---   root of the current drive. In [1], this is (confusingly) referred to as an
---   absolute path.
---   The current behavior of '</>' is to never combine these forms.
---
--- > Windows: "home" </> "/bob" == "/bob"
--- > Windows: "home" </> "\\bob" == "\\bob"
--- > Windows: "C:\\home" </> "\\bob" == "\\bob"
---
---   On Windows, from [1]: "If a file name begins with only a disk designator
---   but not the backslash after the colon, it is interpreted as a relative path
---   to the current directory on the drive with the specified letter."
---   The current behavior of '</>' is to never combine these forms.
---
--- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
--- > Windows: "C:\\foo" </> "C:bar" == "C:bar"
-(</>) :: FilePath -> FilePath -> FilePath
-(</>) = combine
-
-
--- | Split a path by the directory separator.
---
--- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
--- > concat (splitPath x) == x
--- > splitPath "test//item/" == ["test//","item/"]
--- > splitPath "test/item/file" == ["test/","item/","file"]
--- > splitPath "" == []
--- > Windows: splitPath "c:\\test\\path" == ["c:\\","test\\","path"]
--- > Posix:   splitPath "/file/test" == ["/","file/","test"]
-splitPath :: FilePath -> [FilePath]
-splitPath x = [drive | drive /= ""] ++ f path
-    where
-        (drive,path) = splitDrive x
-
-        f "" = []
-        f y = (a++c) : f d
-            where
-                (a,b) = break isPathSeparator y
-                (c,d) = span  isPathSeparator b
-
--- | Just as 'splitPath', but don't add the trailing slashes to each element.
---
--- >          splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
--- >          splitDirectories "test/file" == ["test","file"]
--- >          splitDirectories "/test/file" == ["/","test","file"]
--- > Windows: splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"]
--- >          Valid x => joinPath (splitDirectories x) `equalFilePath` x
--- >          splitDirectories "" == []
--- > Windows: splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"]
--- >          splitDirectories "/test///file" == ["/","test","file"]
-splitDirectories :: FilePath -> [FilePath]
-splitDirectories = map dropTrailingPathSeparator . splitPath
-
-
--- | Join path elements back together.
---
--- > joinPath a == foldr (</>) "" a
--- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
--- > Valid x => joinPath (splitPath x) == x
--- > joinPath [] == ""
--- > Posix: joinPath ["test","file","path"] == "test/file/path"
-joinPath :: [FilePath] -> FilePath
--- Note that this definition on c:\\c:\\, join then split will give c:\\.
-joinPath = foldr combine ""
-
-
-
-
-
-
----------------------------------------------------------------------
--- File name manipulators
-
--- | Equality of two 'FilePath's.
---   If you call @System.Directory.canonicalizePath@
---   first this has a much better chance of working.
---   Note that this doesn't follow symlinks or DOSNAM~1s.
---
--- Similar to 'normalise', this does not expand @".."@, because of symlinks.
---
--- >          x == y ==> equalFilePath x y
--- >          normalise x == normalise y ==> equalFilePath x y
--- >          equalFilePath "foo" "foo/"
--- >          not (equalFilePath "/a/../c" "/c")
--- >          not (equalFilePath "foo" "/foo")
--- > Posix:   not (equalFilePath "foo" "FOO")
--- > Windows: equalFilePath "foo" "FOO"
--- > Windows: not (equalFilePath "C:" "C:/")
-equalFilePath :: FilePath -> FilePath -> Bool
-equalFilePath a b = f a == f b
-    where
-        f x | isWindows = dropTrailingPathSeparator $ map toLower $ normalise x
-            | otherwise = dropTrailingPathSeparator $ normalise x
-
-
--- | Contract a filename, based on a relative path. Note that the resulting path
---   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
---   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
---   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
---
---   The corresponding @makeAbsolute@ function can be found in
---   @System.Directory@.
---
--- >          makeRelative "/directory" "/directory/file.ext" == "file.ext"
--- >          Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
--- >          makeRelative x x == "."
--- >          Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
--- > Windows: makeRelative "C:\\Home" "c:\\home\\bob" == "bob"
--- > Windows: makeRelative "C:\\Home" "c:/home/bob" == "bob"
--- > Windows: makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob"
--- > Windows: makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob"
--- > Windows: makeRelative "/Home" "/home/bob" == "bob"
--- > Windows: makeRelative "/" "//" == "//"
--- > Posix:   makeRelative "/Home" "/home/bob" == "/home/bob"
--- > Posix:   makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar"
--- > Posix:   makeRelative "/fred" "bob" == "bob"
--- > Posix:   makeRelative "/file/test" "/file/test/fred" == "fred"
--- > Posix:   makeRelative "/file/test" "/file/test/fred/" == "fred/"
--- > Posix:   makeRelative "some/path" "some/path/a/b/c" == "a/b/c"
-makeRelative :: FilePath -> FilePath -> FilePath
-makeRelative root path
- | equalFilePath root path = "."
- | takeAbs root /= takeAbs path = path
- | otherwise = f (dropAbs root) (dropAbs path)
-    where
-        f "" y = dropWhile isPathSeparator y
-        f x y = let (x1,x2) = g x
-                    (y1,y2) = g y
-                in if equalFilePath x1 y1 then f x2 y2 else path
-
-        g x = (dropWhile isPathSeparator a, dropWhile isPathSeparator b)
-            where (a,b) = break isPathSeparator $ dropWhile isPathSeparator x
-
-        -- on windows, need to drop '/' which is kind of absolute, but not a drive
-        dropAbs x | hasLeadingPathSeparator x && not (hasDrive x) = tail x
-        dropAbs x = dropDrive x
-
-        takeAbs x | hasLeadingPathSeparator x && not (hasDrive x) = [pathSeparator]
-        takeAbs x = map (\y -> if isPathSeparator y then pathSeparator else toLower y) $ takeDrive x
-
--- | Normalise a file
---
--- * \/\/ outside of the drive can be made blank
---
--- * \/ -> 'pathSeparator'
---
--- * .\/ -> \"\"
---
--- Does not remove @".."@, because of symlinks.
---
--- > Posix:   normalise "/file/\\test////" == "/file/\\test/"
--- > Posix:   normalise "/file/./test" == "/file/test"
--- > Posix:   normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/"
--- > Posix:   normalise "../bob/fred/" == "../bob/fred/"
--- > Posix:   normalise "/a/../c" == "/a/../c"
--- > Posix:   normalise "./bob/fred/" == "bob/fred/"
--- > Windows: normalise "c:\\file/bob\\" == "C:\\file\\bob\\"
--- > Windows: normalise "c:\\" == "C:\\"
--- > Windows: normalise "C:.\\" == "C:"
--- > Windows: normalise "\\\\server\\test" == "\\\\server\\test"
--- > Windows: normalise "//server/test" == "\\\\server\\test"
--- > Windows: normalise "c:/file" == "C:\\file"
--- > Windows: normalise "/file" == "\\file"
--- > Windows: normalise "\\" == "\\"
--- > Windows: normalise "/./" == "\\"
--- >          normalise "." == "."
--- > Posix:   normalise "./" == "./"
--- > Posix:   normalise "./." == "./"
--- > Posix:   normalise "/./" == "/"
--- > Posix:   normalise "/" == "/"
--- > Posix:   normalise "bob/fred/." == "bob/fred/"
--- > Posix:   normalise "//home" == "/home"
-normalise :: FilePath -> FilePath
-normalise path = result ++ [pathSeparator | addPathSeparator]
-    where
-        (drv,pth) = splitDrive path
-        result = joinDrive' (normaliseDrive drv) (f pth)
-
-        joinDrive' "" "" = "."
-        joinDrive' d p = joinDrive d p
-
-        addPathSeparator = isDirPath pth
-            && not (hasTrailingPathSeparator result)
-            && not (isRelativeDrive drv)
-
-        isDirPath xs = hasTrailingPathSeparator xs
-            || not (null xs) && last xs == '.' && hasTrailingPathSeparator (init xs)
-
-        f = joinPath . dropDots . propSep . splitDirectories
-
-        propSep (x:xs) | all isPathSeparator x = [pathSeparator] : xs
-                       | otherwise = x : xs
-        propSep [] = []
-
-        dropDots = filter ("." /=)
-
-normaliseDrive :: FilePath -> FilePath
-normaliseDrive "" = ""
-normaliseDrive _ | isPosix = [pathSeparator]
-normaliseDrive drive = if isJust $ readDriveLetter x2
-                       then map toUpper x2
-                       else x2
-    where
-        x2 = map repSlash drive
-
-        repSlash x = if isPathSeparator x then pathSeparator else x
-
--- Information for validity functions on Windows. See [1].
-isBadCharacter :: Char -> Bool
-isBadCharacter x = x >= '\0' && x <= '\31' || x `elem` ":*?><|\""
-
-badElements :: [FilePath]
-badElements =
-    ["CON","PRN","AUX","NUL","CLOCK$"
-    ,"COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9"
-    ,"LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"]
-
-
--- | Is a FilePath valid, i.e. could you create a file like it? This function checks for invalid names,
---   and invalid characters, but does not check if length limits are exceeded, as these are typically
---   filesystem dependent.
---
--- >          isValid "" == False
--- >          isValid "\0" == False
--- > Posix:   isValid "/random_ path:*" == True
--- > Posix:   isValid x == not (null x)
--- > Windows: isValid "c:\\test" == True
--- > Windows: isValid "c:\\test:of_test" == False
--- > Windows: isValid "test*" == False
--- > Windows: isValid "c:\\test\\nul" == False
--- > Windows: isValid "c:\\test\\prn.txt" == False
--- > Windows: isValid "c:\\nul\\file" == False
--- > Windows: isValid "\\\\" == False
--- > Windows: isValid "\\\\\\foo" == False
--- > Windows: isValid "\\\\?\\D:file" == False
--- > Windows: isValid "foo\tbar" == False
--- > Windows: isValid "nul .txt" == False
--- > Windows: isValid " nul.txt" == True
-isValid :: FilePath -> Bool
-isValid "" = False
-isValid x | '\0' `elem` x = False
-isValid _ | isPosix = True
-isValid path =
-        not (any isBadCharacter x2) &&
-        not (any f $ splitDirectories x2) &&
-        not (isJust (readDriveShare x1) && all isPathSeparator x1) &&
-        not (isJust (readDriveUNC x1) && not (hasTrailingPathSeparator x1))
-    where
-        (x1,x2) = splitDrive path
-        f x = map toUpper (dropWhileEnd (== ' ') $ dropExtensions x) `elem` badElements
-
-
--- | Take a FilePath and make it valid; does not change already valid FilePaths.
---
--- > isValid (makeValid x)
--- > isValid x ==> makeValid x == x
--- > makeValid "" == "_"
--- > makeValid "file\0name" == "file_name"
--- > Windows: makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
--- > Windows: makeValid "c:\\test:of_test" == "c:\\test_of_test"
--- > Windows: makeValid "test*" == "test_"
--- > Windows: makeValid "c:\\test\\nul" == "c:\\test\\nul_"
--- > Windows: makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt"
--- > Windows: makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt"
--- > Windows: makeValid "c:\\nul\\file" == "c:\\nul_\\file"
--- > Windows: makeValid "\\\\\\foo" == "\\\\drive"
--- > Windows: makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
--- > Windows: makeValid "nul .txt" == "nul _.txt"
-makeValid :: FilePath -> FilePath
-makeValid "" = "_"
-makeValid path
-        | isPosix = map (\x -> if x == '\0' then '_' else x) path
-        | isJust (readDriveShare drv) && all isPathSeparator drv = take 2 drv ++ "drive"
-        | isJust (readDriveUNC drv) && not (hasTrailingPathSeparator drv) =
-            makeValid (drv ++ [pathSeparator] ++ pth)
-        | otherwise = joinDrive drv $ validElements $ validChars pth
-    where
-        (drv,pth) = splitDrive path
-
-        validChars = map f
-        f x = if isBadCharacter x then '_' else x
-
-        validElements x = joinPath $ map g $ splitPath x
-        g x = h a ++ b
-            where (a,b) = break isPathSeparator x
-        h x = if map toUpper (dropWhileEnd (== ' ') a) `elem` badElements then a ++ "_" <.> b else x
-            where (a,b) = splitExtensions x
-
-
--- | Is a path relative, or is it fixed to the root?
---
--- > Windows: isRelative "path\\test" == True
--- > Windows: isRelative "c:\\test" == False
--- > Windows: isRelative "c:test" == True
--- > Windows: isRelative "c:\\" == False
--- > Windows: isRelative "c:/" == False
--- > Windows: isRelative "c:" == True
--- > Windows: isRelative "\\\\foo" == False
--- > Windows: isRelative "\\\\?\\foo" == False
--- > Windows: isRelative "\\\\?\\UNC\\foo" == False
--- > Windows: isRelative "/foo" == True
--- > Windows: isRelative "\\foo" == True
--- > Posix:   isRelative "test/path" == True
--- > Posix:   isRelative "/test" == False
--- > Posix:   isRelative "/" == False
---
--- According to [1]:
---
--- * "A UNC name of any format [is never relative]."
---
--- * "You cannot use the "\\?\" prefix with a relative path."
-isRelative :: FilePath -> Bool
-isRelative x = null drive || isRelativeDrive drive
-    where drive = takeDrive x
-
-
-{- c:foo -}
--- From [1]: "If a file name begins with only a disk designator but not the
--- backslash after the colon, it is interpreted as a relative path to the
--- current directory on the drive with the specified letter."
-isRelativeDrive :: String -> Bool
-isRelativeDrive x =
-    maybe False (not . hasTrailingPathSeparator . fst) (readDriveLetter x)
-
-
--- | @not . 'isRelative'@
---
--- > isAbsolute x == not (isRelative x)
-isAbsolute :: FilePath -> Bool
-isAbsolute = not . isRelative
-
-
------------------------------------------------------------------------------
--- dropWhileEnd (>2) [1,2,3,4,1,2,3,4] == [1,2,3,4,1,2])
--- Note that Data.List.dropWhileEnd is only available in base >= 4.5.
-dropWhileEnd :: (a -> Bool) -> [a] -> [a]
-dropWhileEnd p = reverse . dropWhile p . reverse
-
--- takeWhileEnd (>2) [1,2,3,4,1,2,3,4] == [3,4])
-takeWhileEnd :: (a -> Bool) -> [a] -> [a]
-takeWhileEnd p = reverse . takeWhile p . reverse
-
--- spanEnd (>2) [1,2,3,4,1,2,3,4] = ([1,2,3,4,1,2], [3,4])
-spanEnd :: (a -> Bool) -> [a] -> ([a], [a])
-spanEnd p xs = (dropWhileEnd p xs, takeWhileEnd p xs)
-
--- breakEnd (< 2) [1,2,3,4,1,2,3,4] == ([1,2,3,4,1],[2,3,4])
-breakEnd :: (a -> Bool) -> [a] -> ([a], [a])
-breakEnd p = spanEnd (not . p)
-
--- | The stripSuffix function drops the given suffix from a list. It returns
--- Nothing if the list did not end with the suffix given, or Just the list
--- before the suffix, if it does.
-stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
-stripSuffix xs ys = reverse <$> stripPrefix (reverse xs) (reverse ys)
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Posix.hs b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Posix.hs
deleted file mode 100644
index 74244d8504..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Posix.hs
+++ /dev/null
@@ -1,1048 +0,0 @@
-
-
-
-{-# LANGUAGE PatternGuards #-}
-
--- This template expects CPP definitions for:
---     MODULE_NAME = Posix | Windows
---     IS_WINDOWS  = False | True
-
--- |
--- Module      :  System.FilePath.MODULE_NAME
--- Copyright   :  (c) Neil Mitchell 2005-2014
--- License     :  BSD3
---
--- Maintainer  :  ndmitchell@gmail.com
--- Stability   :  stable
--- Portability :  portable
---
--- A library for 'FilePath' manipulations, using MODULE_NAME style paths on
--- all platforms. Importing "System.FilePath" is usually better.
---
--- Given the example 'FilePath': @\/directory\/file.ext@
---
--- We can use the following functions to extract pieces.
---
--- * 'takeFileName' gives @\"file.ext\"@
---
--- * 'takeDirectory' gives @\"\/directory\"@
---
--- * 'takeExtension' gives @\".ext\"@
---
--- * 'dropExtension' gives @\"\/directory\/file\"@
---
--- * 'takeBaseName' gives @\"file\"@
---
--- And we could have built an equivalent path with the following expressions:
---
--- * @\"\/directory\" '</>' \"file.ext\"@.
---
--- * @\"\/directory\/file" '<.>' \"ext\"@.
---
--- * @\"\/directory\/file.txt" '-<.>' \"ext\"@.
---
--- Each function in this module is documented with several examples,
--- which are also used as tests.
---
--- Here are a few examples of using the @filepath@ functions together:
---
--- /Example 1:/ Find the possible locations of a Haskell module @Test@ imported from module @Main@:
---
--- @['replaceFileName' path_to_main \"Test\" '<.>' ext | ext <- [\"hs\",\"lhs\"] ]@
---
--- /Example 2:/ Download a file from @url@ and save it to disk:
---
--- @do let file = 'makeValid' url
---   System.Directory.createDirectoryIfMissing True ('takeDirectory' file)@
---
--- /Example 3:/ Compile a Haskell file, putting the @.hi@ file under @interface@:
---
--- @'takeDirectory' file '</>' \"interface\" '</>' ('takeFileName' file '-<.>' \"hi\")@
---
--- References:
--- [1] <http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx Naming Files, Paths and Namespaces> (Microsoft MSDN)
-module System.FilePath.Posix
-    (
-    -- * Separator predicates
-    FilePath,
-    pathSeparator, pathSeparators, isPathSeparator,
-    searchPathSeparator, isSearchPathSeparator,
-    extSeparator, isExtSeparator,
-
-    -- * @$PATH@ methods
-    splitSearchPath, getSearchPath,
-
-    -- * Extension functions
-    splitExtension,
-    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
-    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
-    stripExtension,
-
-    -- * Filename\/directory functions
-    splitFileName,
-    takeFileName, replaceFileName, dropFileName,
-    takeBaseName, replaceBaseName,
-    takeDirectory, replaceDirectory,
-    combine, (</>),
-    splitPath, joinPath, splitDirectories,
-
-    -- * Drive functions
-    splitDrive, joinDrive,
-    takeDrive, hasDrive, dropDrive, isDrive,
-
-    -- * Trailing slash functions
-    hasTrailingPathSeparator,
-    addTrailingPathSeparator,
-    dropTrailingPathSeparator,
-
-    -- * File name manipulations
-    normalise, equalFilePath,
-    makeRelative,
-    isRelative, isAbsolute,
-    isValid, makeValid
-    )
-    where
-
-import Data.Char(toLower, toUpper, isAsciiLower, isAsciiUpper)
-import Data.Maybe(isJust)
-import Data.List(stripPrefix, isSuffixOf)
-
-import System.Environment(getEnv)
-
-
-infixr 7  <.>, -<.>
-infixr 5  </>
-
-
-
-
-
----------------------------------------------------------------------
--- Platform Abstraction Methods (private)
-
--- | Is the operating system Unix or Linux like
-isPosix :: Bool
-isPosix = not isWindows
-
--- | Is the operating system Windows like
-isWindows :: Bool
-isWindows = False
-
-
----------------------------------------------------------------------
--- The basic functions
-
--- | The character that separates directories. In the case where more than
---   one character is possible, 'pathSeparator' is the \'ideal\' one.
---
--- > Windows: pathSeparator == '\\'
--- > Posix:   pathSeparator ==  '/'
--- > isPathSeparator pathSeparator
-pathSeparator :: Char
-pathSeparator = if isWindows then '\\' else '/'
-
--- | The list of all possible separators.
---
--- > Windows: pathSeparators == ['\\', '/']
--- > Posix:   pathSeparators == ['/']
--- > pathSeparator `elem` pathSeparators
-pathSeparators :: [Char]
-pathSeparators = if isWindows then "\\/" else "/"
-
--- | Rather than using @(== 'pathSeparator')@, use this. Test if something
---   is a path separator.
---
--- > isPathSeparator a == (a `elem` pathSeparators)
-isPathSeparator :: Char -> Bool
-isPathSeparator '/' = True
-isPathSeparator '\\' = isWindows
-isPathSeparator _ = False
-
-
--- | The character that is used to separate the entries in the $PATH environment variable.
---
--- > Windows: searchPathSeparator == ';'
--- > Posix:   searchPathSeparator == ':'
-searchPathSeparator :: Char
-searchPathSeparator = if isWindows then ';' else ':'
-
--- | Is the character a file separator?
---
--- > isSearchPathSeparator a == (a == searchPathSeparator)
-isSearchPathSeparator :: Char -> Bool
-isSearchPathSeparator = (== searchPathSeparator)
-
-
--- | File extension character
---
--- > extSeparator == '.'
-extSeparator :: Char
-extSeparator = '.'
-
--- | Is the character an extension character?
---
--- > isExtSeparator a == (a == extSeparator)
-isExtSeparator :: Char -> Bool
-isExtSeparator = (== extSeparator)
-
-
----------------------------------------------------------------------
--- Path methods (environment $PATH)
-
--- | Take a string, split it on the 'searchPathSeparator' character.
---   Blank items are ignored on Windows, and converted to @.@ on Posix.
---   On Windows path elements are stripped of quotes.
---
---   Follows the recommendations in
---   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>
---
--- > Posix:   splitSearchPath "File1:File2:File3"  == ["File1","File2","File3"]
--- > Posix:   splitSearchPath "File1::File2:File3" == ["File1",".","File2","File3"]
--- > Windows: splitSearchPath "File1;File2;File3"  == ["File1","File2","File3"]
--- > Windows: splitSearchPath "File1;;File2;File3" == ["File1","File2","File3"]
--- > Windows: splitSearchPath "File1;\"File2\";File3" == ["File1","File2","File3"]
-splitSearchPath :: String -> [FilePath]
-splitSearchPath = f
-    where
-    f xs = case break isSearchPathSeparator xs of
-           (pre, []    ) -> g pre
-           (pre, _:post) -> g pre ++ f post
-
-    g "" = ["." | isPosix]
-    g ('\"':x@(_:_)) | isWindows && last x == '\"' = [init x]
-    g x = [x]
-
-
--- | Get a list of 'FilePath's in the $PATH variable.
-getSearchPath :: IO [FilePath]
-getSearchPath = fmap splitSearchPath (getEnv "PATH")
-
-
----------------------------------------------------------------------
--- Extension methods
-
--- | Split on the extension. 'addExtension' is the inverse.
---
--- > splitExtension "/directory/path.ext" == ("/directory/path",".ext")
--- > uncurry (++) (splitExtension x) == x
--- > Valid x => uncurry addExtension (splitExtension x) == x
--- > splitExtension "file.txt" == ("file",".txt")
--- > splitExtension "file" == ("file","")
--- > splitExtension "file/file.txt" == ("file/file",".txt")
--- > splitExtension "file.txt/boris" == ("file.txt/boris","")
--- > splitExtension "file.txt/boris.ext" == ("file.txt/boris",".ext")
--- > splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob",".fred")
--- > splitExtension "file/path.txt/" == ("file/path.txt/","")
-splitExtension :: FilePath -> (String, String)
-splitExtension x = case nameDot of
-                       "" -> (x,"")
-                       _ -> (dir ++ init nameDot, extSeparator : ext)
-    where
-        (dir,file) = splitFileName_ x
-        (nameDot,ext) = breakEnd isExtSeparator file
-
--- | Get the extension of a file, returns @\"\"@ for no extension, @.ext@ otherwise.
---
--- > takeExtension "/directory/path.ext" == ".ext"
--- > takeExtension x == snd (splitExtension x)
--- > Valid x => takeExtension (addExtension x "ext") == ".ext"
--- > Valid x => takeExtension (replaceExtension x "ext") == ".ext"
-takeExtension :: FilePath -> String
-takeExtension = snd . splitExtension
-
--- | Remove the current extension and add another, equivalent to 'replaceExtension'.
---
--- > "/directory/path.txt" -<.> "ext" == "/directory/path.ext"
--- > "/directory/path.txt" -<.> ".ext" == "/directory/path.ext"
--- > "foo.o" -<.> "c" == "foo.c"
-(-<.>) :: FilePath -> String -> FilePath
-(-<.>) = replaceExtension
-
--- | Set the extension of a file, overwriting one if already present, equivalent to '-<.>'.
---
--- > replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext"
--- > replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext"
--- > replaceExtension "file.txt" ".bob" == "file.bob"
--- > replaceExtension "file.txt" "bob" == "file.bob"
--- > replaceExtension "file" ".bob" == "file.bob"
--- > replaceExtension "file.txt" "" == "file"
--- > replaceExtension "file.fred.bob" "txt" == "file.fred.txt"
--- > replaceExtension x y == addExtension (dropExtension x) y
-replaceExtension :: FilePath -> String -> FilePath
-replaceExtension x y = dropExtension x <.> y
-
--- | Add an extension, even if there is already one there, equivalent to 'addExtension'.
---
--- > "/directory/path" <.> "ext" == "/directory/path.ext"
--- > "/directory/path" <.> ".ext" == "/directory/path.ext"
-(<.>) :: FilePath -> String -> FilePath
-(<.>) = addExtension
-
--- | Remove last extension, and the \".\" preceding it.
---
--- > dropExtension "/directory/path.ext" == "/directory/path"
--- > dropExtension x == fst (splitExtension x)
-dropExtension :: FilePath -> FilePath
-dropExtension = fst . splitExtension
-
--- | Add an extension, even if there is already one there, equivalent to '<.>'.
---
--- > addExtension "/directory/path" "ext" == "/directory/path.ext"
--- > addExtension "file.txt" "bib" == "file.txt.bib"
--- > addExtension "file." ".bib" == "file..bib"
--- > addExtension "file" ".bib" == "file.bib"
--- > addExtension "/" "x" == "/.x"
--- > addExtension x "" == x
--- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
--- > Windows: addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
-addExtension :: FilePath -> String -> FilePath
-addExtension file "" = file
-addExtension file xs@(x:_) = joinDrive a res
-    where
-        res = if isExtSeparator x then b ++ xs
-              else b ++ [extSeparator] ++ xs
-
-        (a,b) = splitDrive file
-
--- | Does the given filename have an extension?
---
--- > hasExtension "/directory/path.ext" == True
--- > hasExtension "/directory/path" == False
--- > null (takeExtension x) == not (hasExtension x)
-hasExtension :: FilePath -> Bool
-hasExtension = any isExtSeparator . takeFileName
-
-
--- | Does the given filename have the specified extension?
---
--- > "png" `isExtensionOf` "/directory/file.png" == True
--- > ".png" `isExtensionOf` "/directory/file.png" == True
--- > ".tar.gz" `isExtensionOf` "bar/foo.tar.gz" == True
--- > "ar.gz" `isExtensionOf` "bar/foo.tar.gz" == False
--- > "png" `isExtensionOf` "/directory/file.png.jpg" == False
--- > "csv/table.csv" `isExtensionOf` "/data/csv/table.csv" == False
-isExtensionOf :: String -> FilePath -> Bool
-isExtensionOf ext@('.':_) = isSuffixOf ext . takeExtensions
-isExtensionOf ext         = isSuffixOf ('.':ext) . takeExtensions
-
--- | Drop the given extension from a FilePath, and the @\".\"@ preceding it.
---   Returns 'Nothing' if the FilePath does not have the given extension, or
---   'Just' and the part before the extension if it does.
---
---   This function can be more predictable than 'dropExtensions', especially if the filename
---   might itself contain @.@ characters.
---
--- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
--- > stripExtension "hi.o" "foo.x.hs.o" == Nothing
--- > dropExtension x == fromJust (stripExtension (takeExtension x) x)
--- > dropExtensions x == fromJust (stripExtension (takeExtensions x) x)
--- > stripExtension ".c.d" "a.b.c.d"  == Just "a.b"
--- > stripExtension ".c.d" "a.b..c.d" == Just "a.b."
--- > stripExtension "baz"  "foo.bar"  == Nothing
--- > stripExtension "bar"  "foobar"   == Nothing
--- > stripExtension ""     x          == Just x
-stripExtension :: String -> FilePath -> Maybe FilePath
-stripExtension []        path = Just path
-stripExtension ext@(x:_) path = stripSuffix dotExt path
-    where dotExt = if isExtSeparator x then ext else '.':ext
-
-
--- | Split on all extensions.
---
--- > splitExtensions "/directory/path.ext" == ("/directory/path",".ext")
--- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
--- > uncurry (++) (splitExtensions x) == x
--- > Valid x => uncurry addExtension (splitExtensions x) == x
--- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
-splitExtensions :: FilePath -> (FilePath, String)
-splitExtensions x = (a ++ c, d)
-    where
-        (a,b) = splitFileName_ x
-        (c,d) = break isExtSeparator b
-
--- | Drop all extensions.
---
--- > dropExtensions "/directory/path.ext" == "/directory/path"
--- > dropExtensions "file.tar.gz" == "file"
--- > not $ hasExtension $ dropExtensions x
--- > not $ any isExtSeparator $ takeFileName $ dropExtensions x
-dropExtensions :: FilePath -> FilePath
-dropExtensions = fst . splitExtensions
-
--- | Get all extensions.
---
--- > takeExtensions "/directory/path.ext" == ".ext"
--- > takeExtensions "file.tar.gz" == ".tar.gz"
-takeExtensions :: FilePath -> String
-takeExtensions = snd . splitExtensions
-
-
--- | Replace all extensions of a file with a new extension. Note
---   that 'replaceExtension' and 'addExtension' both work for adding
---   multiple extensions, so only required when you need to drop
---   all extensions first.
---
--- > replaceExtensions "file.fred.bob" "txt" == "file.txt"
--- > replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz"
-replaceExtensions :: FilePath -> String -> FilePath
-replaceExtensions x y = dropExtensions x <.> y
-
-
-
----------------------------------------------------------------------
--- Drive methods
-
--- | Is the given character a valid drive letter?
--- only a-z and A-Z are letters, not isAlpha which is more unicodey
-isLetter :: Char -> Bool
-isLetter x = isAsciiLower x || isAsciiUpper x
-
-
--- | Split a path into a drive and a path.
---   On Posix, \/ is a Drive.
---
--- > uncurry (++) (splitDrive x) == x
--- > Windows: splitDrive "file" == ("","file")
--- > Windows: splitDrive "c:/file" == ("c:/","file")
--- > Windows: splitDrive "c:\\file" == ("c:\\","file")
--- > Windows: splitDrive "\\\\shared\\test" == ("\\\\shared\\","test")
--- > Windows: splitDrive "\\\\shared" == ("\\\\shared","")
--- > Windows: splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\","file")
--- > Windows: splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\","UNCshared\\file")
--- > Windows: splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\","file")
--- > Windows: splitDrive "/d" == ("","/d")
--- > Posix:   splitDrive "/test" == ("/","test")
--- > Posix:   splitDrive "//test" == ("//","test")
--- > Posix:   splitDrive "test/file" == ("","test/file")
--- > Posix:   splitDrive "file" == ("","file")
-splitDrive :: FilePath -> (FilePath, FilePath)
-splitDrive x | isPosix = span (== '/') x
-splitDrive x | Just y <- readDriveLetter x = y
-splitDrive x | Just y <- readDriveUNC x = y
-splitDrive x | Just y <- readDriveShare x = y
-splitDrive x = ("",x)
-
-addSlash :: FilePath -> FilePath -> (FilePath, FilePath)
-addSlash a xs = (a++c,d)
-    where (c,d) = span isPathSeparator xs
-
--- See [1].
--- "\\?\D:\<path>" or "\\?\UNC\<server>\<share>"
-readDriveUNC :: FilePath -> Maybe (FilePath, FilePath)
-readDriveUNC (s1:s2:'?':s3:xs) | all isPathSeparator [s1,s2,s3] =
-    case map toUpper xs of
-        ('U':'N':'C':s4:_) | isPathSeparator s4 ->
-            let (a,b) = readDriveShareName (drop 4 xs)
-            in Just (s1:s2:'?':s3:take 4 xs ++ a, b)
-        _ -> case readDriveLetter xs of
-                 -- Extended-length path.
-                 Just (a,b) -> Just (s1:s2:'?':s3:a,b)
-                 Nothing -> Nothing
-readDriveUNC _ = Nothing
-
-{- c:\ -}
-readDriveLetter :: String -> Maybe (FilePath, FilePath)
-readDriveLetter (x:':':y:xs) | isLetter x && isPathSeparator y = Just $ addSlash [x,':'] (y:xs)
-readDriveLetter (x:':':xs) | isLetter x = Just ([x,':'], xs)
-readDriveLetter _ = Nothing
-
-{- \\sharename\ -}
-readDriveShare :: String -> Maybe (FilePath, FilePath)
-readDriveShare (s1:s2:xs) | isPathSeparator s1 && isPathSeparator s2 =
-        Just (s1:s2:a,b)
-    where (a,b) = readDriveShareName xs
-readDriveShare _ = Nothing
-
-{- assume you have already seen \\ -}
-{- share\bob -> "share\", "bob" -}
-readDriveShareName :: String -> (FilePath, FilePath)
-readDriveShareName name = addSlash a b
-    where (a,b) = break isPathSeparator name
-
-
-
--- | Join a drive and the rest of the path.
---
--- > Valid x => uncurry joinDrive (splitDrive x) == x
--- > Windows: joinDrive "C:" "foo" == "C:foo"
--- > Windows: joinDrive "C:\\" "bar" == "C:\\bar"
--- > Windows: joinDrive "\\\\share" "foo" == "\\\\share\\foo"
--- > Windows: joinDrive "/:" "foo" == "/:\\foo"
-joinDrive :: FilePath -> FilePath -> FilePath
-joinDrive = combineAlways
-
--- | Get the drive from a filepath.
---
--- > takeDrive x == fst (splitDrive x)
-takeDrive :: FilePath -> FilePath
-takeDrive = fst . splitDrive
-
--- | Delete the drive, if it exists.
---
--- > dropDrive x == snd (splitDrive x)
-dropDrive :: FilePath -> FilePath
-dropDrive = snd . splitDrive
-
--- | Does a path have a drive.
---
--- > not (hasDrive x) == null (takeDrive x)
--- > Posix:   hasDrive "/foo" == True
--- > Windows: hasDrive "C:\\foo" == True
--- > Windows: hasDrive "C:foo" == True
--- >          hasDrive "foo" == False
--- >          hasDrive "" == False
-hasDrive :: FilePath -> Bool
-hasDrive = not . null . takeDrive
-
-
--- | Is an element a drive
---
--- > Posix:   isDrive "/" == True
--- > Posix:   isDrive "/foo" == False
--- > Windows: isDrive "C:\\" == True
--- > Windows: isDrive "C:\\foo" == False
--- >          isDrive "" == False
-isDrive :: FilePath -> Bool
-isDrive x = not (null x) && null (dropDrive x)
-
-
----------------------------------------------------------------------
--- Operations on a filepath, as a list of directories
-
--- | Split a filename into directory and file. '</>' is the inverse.
---   The first component will often end with a trailing slash.
---
--- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
--- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
--- > Valid x => isValid (fst (splitFileName x))
--- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
--- > splitFileName "file/" == ("file/", "")
--- > splitFileName "bob" == ("./", "bob")
--- > Posix:   splitFileName "/" == ("/","")
--- > Windows: splitFileName "c:" == ("c:","")
-splitFileName :: FilePath -> (String, String)
-splitFileName x = (if null dir then "./" else dir, name)
-    where
-        (dir, name) = splitFileName_ x
-
--- version of splitFileName where, if the FilePath has no directory
--- component, the returned directory is "" rather than "./".  This
--- is used in cases where we are going to combine the returned
--- directory to make a valid FilePath, and having a "./" appear would
--- look strange and upset simple equality properties.  See
--- e.g. replaceFileName.
-splitFileName_ :: FilePath -> (String, String)
-splitFileName_ x = (drv ++ dir, file)
-    where
-        (drv,pth) = splitDrive x
-        (dir,file) = breakEnd isPathSeparator pth
-
--- | Set the filename.
---
--- > replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext"
--- > Valid x => replaceFileName x (takeFileName x) == x
-replaceFileName :: FilePath -> String -> FilePath
-replaceFileName x y = a </> y where (a,_) = splitFileName_ x
-
--- | Drop the filename. Unlike 'takeDirectory', this function will leave
---   a trailing path separator on the directory.
---
--- > dropFileName "/directory/file.ext" == "/directory/"
--- > dropFileName x == fst (splitFileName x)
-dropFileName :: FilePath -> FilePath
-dropFileName = fst . splitFileName
-
-
--- | Get the file name.
---
--- > takeFileName "/directory/file.ext" == "file.ext"
--- > takeFileName "test/" == ""
--- > takeFileName x `isSuffixOf` x
--- > takeFileName x == snd (splitFileName x)
--- > Valid x => takeFileName (replaceFileName x "fred") == "fred"
--- > Valid x => takeFileName (x </> "fred") == "fred"
--- > Valid x => isRelative (takeFileName x)
-takeFileName :: FilePath -> FilePath
-takeFileName = snd . splitFileName
-
--- | Get the base name, without an extension or path.
---
--- > takeBaseName "/directory/file.ext" == "file"
--- > takeBaseName "file/test.txt" == "test"
--- > takeBaseName "dave.ext" == "dave"
--- > takeBaseName "" == ""
--- > takeBaseName "test" == "test"
--- > takeBaseName (addTrailingPathSeparator x) == ""
--- > takeBaseName "file/file.tar.gz" == "file.tar"
-takeBaseName :: FilePath -> String
-takeBaseName = dropExtension . takeFileName
-
--- | Set the base name.
---
--- > replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext"
--- > replaceBaseName "file/test.txt" "bob" == "file/bob.txt"
--- > replaceBaseName "fred" "bill" == "bill"
--- > replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar"
--- > Valid x => replaceBaseName x (takeBaseName x) == x
-replaceBaseName :: FilePath -> String -> FilePath
-replaceBaseName pth nam = combineAlways a (nam <.> ext)
-    where
-        (a,b) = splitFileName_ pth
-        ext = takeExtension b
-
--- | Is an item either a directory or the last character a path separator?
---
--- > hasTrailingPathSeparator "test" == False
--- > hasTrailingPathSeparator "test/" == True
-hasTrailingPathSeparator :: FilePath -> Bool
-hasTrailingPathSeparator "" = False
-hasTrailingPathSeparator x = isPathSeparator (last x)
-
-
-hasLeadingPathSeparator :: FilePath -> Bool
-hasLeadingPathSeparator "" = False
-hasLeadingPathSeparator x = isPathSeparator (head x)
-
-
--- | Add a trailing file path separator if one is not already present.
---
--- > hasTrailingPathSeparator (addTrailingPathSeparator x)
--- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
--- > Posix:    addTrailingPathSeparator "test/rest" == "test/rest/"
-addTrailingPathSeparator :: FilePath -> FilePath
-addTrailingPathSeparator x = if hasTrailingPathSeparator x then x else x ++ [pathSeparator]
-
-
--- | Remove any trailing path separators
---
--- > dropTrailingPathSeparator "file/test/" == "file/test"
--- >           dropTrailingPathSeparator "/" == "/"
--- > Windows:  dropTrailingPathSeparator "\\" == "\\"
--- > Posix:    not (hasTrailingPathSeparator (dropTrailingPathSeparator x)) || isDrive x
-dropTrailingPathSeparator :: FilePath -> FilePath
-dropTrailingPathSeparator x =
-    if hasTrailingPathSeparator x && not (isDrive x)
-    then let x' = dropWhileEnd isPathSeparator x
-         in if null x' then [last x] else x'
-    else x
-
-
--- | Get the directory name, move up one level.
---
--- >           takeDirectory "/directory/other.ext" == "/directory"
--- >           takeDirectory x `isPrefixOf` x || takeDirectory x == "."
--- >           takeDirectory "foo" == "."
--- >           takeDirectory "/" == "/"
--- >           takeDirectory "/foo" == "/"
--- >           takeDirectory "/foo/bar/baz" == "/foo/bar"
--- >           takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
--- >           takeDirectory "foo/bar/baz" == "foo/bar"
--- > Windows:  takeDirectory "foo\\bar" == "foo"
--- > Windows:  takeDirectory "foo\\bar\\\\" == "foo\\bar"
--- > Windows:  takeDirectory "C:\\" == "C:\\"
-takeDirectory :: FilePath -> FilePath
-takeDirectory = dropTrailingPathSeparator . dropFileName
-
--- | Set the directory, keeping the filename the same.
---
--- > replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext"
--- > Valid x => replaceDirectory x (takeDirectory x) `equalFilePath` x
-replaceDirectory :: FilePath -> String -> FilePath
-replaceDirectory x dir = combineAlways dir (takeFileName x)
-
-
--- | An alias for '</>'.
-combine :: FilePath -> FilePath -> FilePath
-combine a b | hasLeadingPathSeparator b || hasDrive b = b
-            | otherwise = combineAlways a b
-
--- | Combine two paths, assuming rhs is NOT absolute.
-combineAlways :: FilePath -> FilePath -> FilePath
-combineAlways a b | null a = b
-                  | null b = a
-                  | hasTrailingPathSeparator a = a ++ b
-                  | otherwise = case a of
-                      [a1,':'] | isWindows && isLetter a1 -> a ++ b
-                      _ -> a ++ [pathSeparator] ++ b
-
-
--- | Combine two paths with a path separator.
---   If the second path starts with a path separator or a drive letter, then it returns the second.
---   The intention is that @readFile (dir '</>' file)@ will access the same file as
---   @setCurrentDirectory dir; readFile file@.
---
--- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
--- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
--- >          "directory" </> "/file.ext" == "/file.ext"
--- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
---
---   Combined:
---
--- > Posix:   "/" </> "test" == "/test"
--- > Posix:   "home" </> "bob" == "home/bob"
--- > Posix:   "x:" </> "foo" == "x:/foo"
--- > Windows: "C:\\foo" </> "bar" == "C:\\foo\\bar"
--- > Windows: "home" </> "bob" == "home\\bob"
---
---   Not combined:
---
--- > Posix:   "home" </> "/bob" == "/bob"
--- > Windows: "home" </> "C:\\bob" == "C:\\bob"
---
---   Not combined (tricky):
---
---   On Windows, if a filepath starts with a single slash, it is relative to the
---   root of the current drive. In [1], this is (confusingly) referred to as an
---   absolute path.
---   The current behavior of '</>' is to never combine these forms.
---
--- > Windows: "home" </> "/bob" == "/bob"
--- > Windows: "home" </> "\\bob" == "\\bob"
--- > Windows: "C:\\home" </> "\\bob" == "\\bob"
---
---   On Windows, from [1]: "If a file name begins with only a disk designator
---   but not the backslash after the colon, it is interpreted as a relative path
---   to the current directory on the drive with the specified letter."
---   The current behavior of '</>' is to never combine these forms.
---
--- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
--- > Windows: "C:\\foo" </> "C:bar" == "C:bar"
-(</>) :: FilePath -> FilePath -> FilePath
-(</>) = combine
-
-
--- | Split a path by the directory separator.
---
--- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
--- > concat (splitPath x) == x
--- > splitPath "test//item/" == ["test//","item/"]
--- > splitPath "test/item/file" == ["test/","item/","file"]
--- > splitPath "" == []
--- > Windows: splitPath "c:\\test\\path" == ["c:\\","test\\","path"]
--- > Posix:   splitPath "/file/test" == ["/","file/","test"]
-splitPath :: FilePath -> [FilePath]
-splitPath x = [drive | drive /= ""] ++ f path
-    where
-        (drive,path) = splitDrive x
-
-        f "" = []
-        f y = (a++c) : f d
-            where
-                (a,b) = break isPathSeparator y
-                (c,d) = span  isPathSeparator b
-
--- | Just as 'splitPath', but don't add the trailing slashes to each element.
---
--- >          splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
--- >          splitDirectories "test/file" == ["test","file"]
--- >          splitDirectories "/test/file" == ["/","test","file"]
--- > Windows: splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"]
--- >          Valid x => joinPath (splitDirectories x) `equalFilePath` x
--- >          splitDirectories "" == []
--- > Windows: splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"]
--- >          splitDirectories "/test///file" == ["/","test","file"]
-splitDirectories :: FilePath -> [FilePath]
-splitDirectories = map dropTrailingPathSeparator . splitPath
-
-
--- | Join path elements back together.
---
--- > joinPath a == foldr (</>) "" a
--- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
--- > Valid x => joinPath (splitPath x) == x
--- > joinPath [] == ""
--- > Posix: joinPath ["test","file","path"] == "test/file/path"
-joinPath :: [FilePath] -> FilePath
--- Note that this definition on c:\\c:\\, join then split will give c:\\.
-joinPath = foldr combine ""
-
-
-
-
-
-
----------------------------------------------------------------------
--- File name manipulators
-
--- | Equality of two 'FilePath's.
---   If you call @System.Directory.canonicalizePath@
---   first this has a much better chance of working.
---   Note that this doesn't follow symlinks or DOSNAM~1s.
---
--- Similar to 'normalise', this does not expand @".."@, because of symlinks.
---
--- >          x == y ==> equalFilePath x y
--- >          normalise x == normalise y ==> equalFilePath x y
--- >          equalFilePath "foo" "foo/"
--- >          not (equalFilePath "/a/../c" "/c")
--- >          not (equalFilePath "foo" "/foo")
--- > Posix:   not (equalFilePath "foo" "FOO")
--- > Windows: equalFilePath "foo" "FOO"
--- > Windows: not (equalFilePath "C:" "C:/")
-equalFilePath :: FilePath -> FilePath -> Bool
-equalFilePath a b = f a == f b
-    where
-        f x | isWindows = dropTrailingPathSeparator $ map toLower $ normalise x
-            | otherwise = dropTrailingPathSeparator $ normalise x
-
-
--- | Contract a filename, based on a relative path. Note that the resulting path
---   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
---   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
---   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
---
---   The corresponding @makeAbsolute@ function can be found in
---   @System.Directory@.
---
--- >          makeRelative "/directory" "/directory/file.ext" == "file.ext"
--- >          Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
--- >          makeRelative x x == "."
--- >          Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
--- > Windows: makeRelative "C:\\Home" "c:\\home\\bob" == "bob"
--- > Windows: makeRelative "C:\\Home" "c:/home/bob" == "bob"
--- > Windows: makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob"
--- > Windows: makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob"
--- > Windows: makeRelative "/Home" "/home/bob" == "bob"
--- > Windows: makeRelative "/" "//" == "//"
--- > Posix:   makeRelative "/Home" "/home/bob" == "/home/bob"
--- > Posix:   makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar"
--- > Posix:   makeRelative "/fred" "bob" == "bob"
--- > Posix:   makeRelative "/file/test" "/file/test/fred" == "fred"
--- > Posix:   makeRelative "/file/test" "/file/test/fred/" == "fred/"
--- > Posix:   makeRelative "some/path" "some/path/a/b/c" == "a/b/c"
-makeRelative :: FilePath -> FilePath -> FilePath
-makeRelative root path
- | equalFilePath root path = "."
- | takeAbs root /= takeAbs path = path
- | otherwise = f (dropAbs root) (dropAbs path)
-    where
-        f "" y = dropWhile isPathSeparator y
-        f x y = let (x1,x2) = g x
-                    (y1,y2) = g y
-                in if equalFilePath x1 y1 then f x2 y2 else path
-
-        g x = (dropWhile isPathSeparator a, dropWhile isPathSeparator b)
-            where (a,b) = break isPathSeparator $ dropWhile isPathSeparator x
-
-        -- on windows, need to drop '/' which is kind of absolute, but not a drive
-        dropAbs x | hasLeadingPathSeparator x && not (hasDrive x) = tail x
-        dropAbs x = dropDrive x
-
-        takeAbs x | hasLeadingPathSeparator x && not (hasDrive x) = [pathSeparator]
-        takeAbs x = map (\y -> if isPathSeparator y then pathSeparator else toLower y) $ takeDrive x
-
--- | Normalise a file
---
--- * \/\/ outside of the drive can be made blank
---
--- * \/ -> 'pathSeparator'
---
--- * .\/ -> \"\"
---
--- Does not remove @".."@, because of symlinks.
---
--- > Posix:   normalise "/file/\\test////" == "/file/\\test/"
--- > Posix:   normalise "/file/./test" == "/file/test"
--- > Posix:   normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/"
--- > Posix:   normalise "../bob/fred/" == "../bob/fred/"
--- > Posix:   normalise "/a/../c" == "/a/../c"
--- > Posix:   normalise "./bob/fred/" == "bob/fred/"
--- > Windows: normalise "c:\\file/bob\\" == "C:\\file\\bob\\"
--- > Windows: normalise "c:\\" == "C:\\"
--- > Windows: normalise "C:.\\" == "C:"
--- > Windows: normalise "\\\\server\\test" == "\\\\server\\test"
--- > Windows: normalise "//server/test" == "\\\\server\\test"
--- > Windows: normalise "c:/file" == "C:\\file"
--- > Windows: normalise "/file" == "\\file"
--- > Windows: normalise "\\" == "\\"
--- > Windows: normalise "/./" == "\\"
--- >          normalise "." == "."
--- > Posix:   normalise "./" == "./"
--- > Posix:   normalise "./." == "./"
--- > Posix:   normalise "/./" == "/"
--- > Posix:   normalise "/" == "/"
--- > Posix:   normalise "bob/fred/." == "bob/fred/"
--- > Posix:   normalise "//home" == "/home"
-normalise :: FilePath -> FilePath
-normalise path = result ++ [pathSeparator | addPathSeparator]
-    where
-        (drv,pth) = splitDrive path
-        result = joinDrive' (normaliseDrive drv) (f pth)
-
-        joinDrive' "" "" = "."
-        joinDrive' d p = joinDrive d p
-
-        addPathSeparator = isDirPath pth
-            && not (hasTrailingPathSeparator result)
-            && not (isRelativeDrive drv)
-
-        isDirPath xs = hasTrailingPathSeparator xs
-            || not (null xs) && last xs == '.' && hasTrailingPathSeparator (init xs)
-
-        f = joinPath . dropDots . propSep . splitDirectories
-
-        propSep (x:xs) | all isPathSeparator x = [pathSeparator] : xs
-                       | otherwise = x : xs
-        propSep [] = []
-
-        dropDots = filter ("." /=)
-
-normaliseDrive :: FilePath -> FilePath
-normaliseDrive "" = ""
-normaliseDrive _ | isPosix = [pathSeparator]
-normaliseDrive drive = if isJust $ readDriveLetter x2
-                       then map toUpper x2
-                       else x2
-    where
-        x2 = map repSlash drive
-
-        repSlash x = if isPathSeparator x then pathSeparator else x
-
--- Information for validity functions on Windows. See [1].
-isBadCharacter :: Char -> Bool
-isBadCharacter x = x >= '\0' && x <= '\31' || x `elem` ":*?><|\""
-
-badElements :: [FilePath]
-badElements =
-    ["CON","PRN","AUX","NUL","CLOCK$"
-    ,"COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9"
-    ,"LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"]
-
-
--- | Is a FilePath valid, i.e. could you create a file like it? This function checks for invalid names,
---   and invalid characters, but does not check if length limits are exceeded, as these are typically
---   filesystem dependent.
---
--- >          isValid "" == False
--- >          isValid "\0" == False
--- > Posix:   isValid "/random_ path:*" == True
--- > Posix:   isValid x == not (null x)
--- > Windows: isValid "c:\\test" == True
--- > Windows: isValid "c:\\test:of_test" == False
--- > Windows: isValid "test*" == False
--- > Windows: isValid "c:\\test\\nul" == False
--- > Windows: isValid "c:\\test\\prn.txt" == False
--- > Windows: isValid "c:\\nul\\file" == False
--- > Windows: isValid "\\\\" == False
--- > Windows: isValid "\\\\\\foo" == False
--- > Windows: isValid "\\\\?\\D:file" == False
--- > Windows: isValid "foo\tbar" == False
--- > Windows: isValid "nul .txt" == False
--- > Windows: isValid " nul.txt" == True
-isValid :: FilePath -> Bool
-isValid "" = False
-isValid x | '\0' `elem` x = False
-isValid _ | isPosix = True
-isValid path =
-        not (any isBadCharacter x2) &&
-        not (any f $ splitDirectories x2) &&
-        not (isJust (readDriveShare x1) && all isPathSeparator x1) &&
-        not (isJust (readDriveUNC x1) && not (hasTrailingPathSeparator x1))
-    where
-        (x1,x2) = splitDrive path
-        f x = map toUpper (dropWhileEnd (== ' ') $ dropExtensions x) `elem` badElements
-
-
--- | Take a FilePath and make it valid; does not change already valid FilePaths.
---
--- > isValid (makeValid x)
--- > isValid x ==> makeValid x == x
--- > makeValid "" == "_"
--- > makeValid "file\0name" == "file_name"
--- > Windows: makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
--- > Windows: makeValid "c:\\test:of_test" == "c:\\test_of_test"
--- > Windows: makeValid "test*" == "test_"
--- > Windows: makeValid "c:\\test\\nul" == "c:\\test\\nul_"
--- > Windows: makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt"
--- > Windows: makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt"
--- > Windows: makeValid "c:\\nul\\file" == "c:\\nul_\\file"
--- > Windows: makeValid "\\\\\\foo" == "\\\\drive"
--- > Windows: makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
--- > Windows: makeValid "nul .txt" == "nul _.txt"
-makeValid :: FilePath -> FilePath
-makeValid "" = "_"
-makeValid path
-        | isPosix = map (\x -> if x == '\0' then '_' else x) path
-        | isJust (readDriveShare drv) && all isPathSeparator drv = take 2 drv ++ "drive"
-        | isJust (readDriveUNC drv) && not (hasTrailingPathSeparator drv) =
-            makeValid (drv ++ [pathSeparator] ++ pth)
-        | otherwise = joinDrive drv $ validElements $ validChars pth
-    where
-        (drv,pth) = splitDrive path
-
-        validChars = map f
-        f x = if isBadCharacter x then '_' else x
-
-        validElements x = joinPath $ map g $ splitPath x
-        g x = h a ++ b
-            where (a,b) = break isPathSeparator x
-        h x = if map toUpper (dropWhileEnd (== ' ') a) `elem` badElements then a ++ "_" <.> b else x
-            where (a,b) = splitExtensions x
-
-
--- | Is a path relative, or is it fixed to the root?
---
--- > Windows: isRelative "path\\test" == True
--- > Windows: isRelative "c:\\test" == False
--- > Windows: isRelative "c:test" == True
--- > Windows: isRelative "c:\\" == False
--- > Windows: isRelative "c:/" == False
--- > Windows: isRelative "c:" == True
--- > Windows: isRelative "\\\\foo" == False
--- > Windows: isRelative "\\\\?\\foo" == False
--- > Windows: isRelative "\\\\?\\UNC\\foo" == False
--- > Windows: isRelative "/foo" == True
--- > Windows: isRelative "\\foo" == True
--- > Posix:   isRelative "test/path" == True
--- > Posix:   isRelative "/test" == False
--- > Posix:   isRelative "/" == False
---
--- According to [1]:
---
--- * "A UNC name of any format [is never relative]."
---
--- * "You cannot use the "\\?\" prefix with a relative path."
-isRelative :: FilePath -> Bool
-isRelative x = null drive || isRelativeDrive drive
-    where drive = takeDrive x
-
-
-{- c:foo -}
--- From [1]: "If a file name begins with only a disk designator but not the
--- backslash after the colon, it is interpreted as a relative path to the
--- current directory on the drive with the specified letter."
-isRelativeDrive :: String -> Bool
-isRelativeDrive x =
-    maybe False (not . hasTrailingPathSeparator . fst) (readDriveLetter x)
-
-
--- | @not . 'isRelative'@
---
--- > isAbsolute x == not (isRelative x)
-isAbsolute :: FilePath -> Bool
-isAbsolute = not . isRelative
-
-
------------------------------------------------------------------------------
--- dropWhileEnd (>2) [1,2,3,4,1,2,3,4] == [1,2,3,4,1,2])
--- Note that Data.List.dropWhileEnd is only available in base >= 4.5.
-dropWhileEnd :: (a -> Bool) -> [a] -> [a]
-dropWhileEnd p = reverse . dropWhile p . reverse
-
--- takeWhileEnd (>2) [1,2,3,4,1,2,3,4] == [3,4])
-takeWhileEnd :: (a -> Bool) -> [a] -> [a]
-takeWhileEnd p = reverse . takeWhile p . reverse
-
--- spanEnd (>2) [1,2,3,4,1,2,3,4] = ([1,2,3,4,1,2], [3,4])
-spanEnd :: (a -> Bool) -> [a] -> ([a], [a])
-spanEnd p xs = (dropWhileEnd p xs, takeWhileEnd p xs)
-
--- breakEnd (< 2) [1,2,3,4,1,2,3,4] == ([1,2,3,4,1],[2,3,4])
-breakEnd :: (a -> Bool) -> [a] -> ([a], [a])
-breakEnd p = spanEnd (not . p)
-
--- | The stripSuffix function drops the given suffix from a list. It returns
--- Nothing if the list did not end with the suffix given, or Just the list
--- before the suffix, if it does.
-stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
-stripSuffix xs ys = reverse <$> stripPrefix (reverse xs) (reverse ys)
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Windows.hs b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Windows.hs
deleted file mode 100644
index 4244330511..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Windows.hs
+++ /dev/null
@@ -1,1048 +0,0 @@
-
-
-
-{-# LANGUAGE PatternGuards #-}
-
--- This template expects CPP definitions for:
---     MODULE_NAME = Posix | Windows
---     IS_WINDOWS  = False | True
-
--- |
--- Module      :  System.FilePath.MODULE_NAME
--- Copyright   :  (c) Neil Mitchell 2005-2014
--- License     :  BSD3
---
--- Maintainer  :  ndmitchell@gmail.com
--- Stability   :  stable
--- Portability :  portable
---
--- A library for 'FilePath' manipulations, using MODULE_NAME style paths on
--- all platforms. Importing "System.FilePath" is usually better.
---
--- Given the example 'FilePath': @\/directory\/file.ext@
---
--- We can use the following functions to extract pieces.
---
--- * 'takeFileName' gives @\"file.ext\"@
---
--- * 'takeDirectory' gives @\"\/directory\"@
---
--- * 'takeExtension' gives @\".ext\"@
---
--- * 'dropExtension' gives @\"\/directory\/file\"@
---
--- * 'takeBaseName' gives @\"file\"@
---
--- And we could have built an equivalent path with the following expressions:
---
--- * @\"\/directory\" '</>' \"file.ext\"@.
---
--- * @\"\/directory\/file" '<.>' \"ext\"@.
---
--- * @\"\/directory\/file.txt" '-<.>' \"ext\"@.
---
--- Each function in this module is documented with several examples,
--- which are also used as tests.
---
--- Here are a few examples of using the @filepath@ functions together:
---
--- /Example 1:/ Find the possible locations of a Haskell module @Test@ imported from module @Main@:
---
--- @['replaceFileName' path_to_main \"Test\" '<.>' ext | ext <- [\"hs\",\"lhs\"] ]@
---
--- /Example 2:/ Download a file from @url@ and save it to disk:
---
--- @do let file = 'makeValid' url
---   System.Directory.createDirectoryIfMissing True ('takeDirectory' file)@
---
--- /Example 3:/ Compile a Haskell file, putting the @.hi@ file under @interface@:
---
--- @'takeDirectory' file '</>' \"interface\" '</>' ('takeFileName' file '-<.>' \"hi\")@
---
--- References:
--- [1] <http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx Naming Files, Paths and Namespaces> (Microsoft MSDN)
-module System.FilePath.Windows
-    (
-    -- * Separator predicates
-    FilePath,
-    pathSeparator, pathSeparators, isPathSeparator,
-    searchPathSeparator, isSearchPathSeparator,
-    extSeparator, isExtSeparator,
-
-    -- * @$PATH@ methods
-    splitSearchPath, getSearchPath,
-
-    -- * Extension functions
-    splitExtension,
-    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
-    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
-    stripExtension,
-
-    -- * Filename\/directory functions
-    splitFileName,
-    takeFileName, replaceFileName, dropFileName,
-    takeBaseName, replaceBaseName,
-    takeDirectory, replaceDirectory,
-    combine, (</>),
-    splitPath, joinPath, splitDirectories,
-
-    -- * Drive functions
-    splitDrive, joinDrive,
-    takeDrive, hasDrive, dropDrive, isDrive,
-
-    -- * Trailing slash functions
-    hasTrailingPathSeparator,
-    addTrailingPathSeparator,
-    dropTrailingPathSeparator,
-
-    -- * File name manipulations
-    normalise, equalFilePath,
-    makeRelative,
-    isRelative, isAbsolute,
-    isValid, makeValid
-    )
-    where
-
-import Data.Char(toLower, toUpper, isAsciiLower, isAsciiUpper)
-import Data.Maybe(isJust)
-import Data.List(stripPrefix, isSuffixOf)
-
-import System.Environment(getEnv)
-
-
-infixr 7  <.>, -<.>
-infixr 5  </>
-
-
-
-
-
----------------------------------------------------------------------
--- Platform Abstraction Methods (private)
-
--- | Is the operating system Unix or Linux like
-isPosix :: Bool
-isPosix = not isWindows
-
--- | Is the operating system Windows like
-isWindows :: Bool
-isWindows = True
-
-
----------------------------------------------------------------------
--- The basic functions
-
--- | The character that separates directories. In the case where more than
---   one character is possible, 'pathSeparator' is the \'ideal\' one.
---
--- > Windows: pathSeparator == '\\'
--- > Posix:   pathSeparator ==  '/'
--- > isPathSeparator pathSeparator
-pathSeparator :: Char
-pathSeparator = if isWindows then '\\' else '/'
-
--- | The list of all possible separators.
---
--- > Windows: pathSeparators == ['\\', '/']
--- > Posix:   pathSeparators == ['/']
--- > pathSeparator `elem` pathSeparators
-pathSeparators :: [Char]
-pathSeparators = if isWindows then "\\/" else "/"
-
--- | Rather than using @(== 'pathSeparator')@, use this. Test if something
---   is a path separator.
---
--- > isPathSeparator a == (a `elem` pathSeparators)
-isPathSeparator :: Char -> Bool
-isPathSeparator '/' = True
-isPathSeparator '\\' = isWindows
-isPathSeparator _ = False
-
-
--- | The character that is used to separate the entries in the $PATH environment variable.
---
--- > Windows: searchPathSeparator == ';'
--- > Posix:   searchPathSeparator == ':'
-searchPathSeparator :: Char
-searchPathSeparator = if isWindows then ';' else ':'
-
--- | Is the character a file separator?
---
--- > isSearchPathSeparator a == (a == searchPathSeparator)
-isSearchPathSeparator :: Char -> Bool
-isSearchPathSeparator = (== searchPathSeparator)
-
-
--- | File extension character
---
--- > extSeparator == '.'
-extSeparator :: Char
-extSeparator = '.'
-
--- | Is the character an extension character?
---
--- > isExtSeparator a == (a == extSeparator)
-isExtSeparator :: Char -> Bool
-isExtSeparator = (== extSeparator)
-
-
----------------------------------------------------------------------
--- Path methods (environment $PATH)
-
--- | Take a string, split it on the 'searchPathSeparator' character.
---   Blank items are ignored on Windows, and converted to @.@ on Posix.
---   On Windows path elements are stripped of quotes.
---
---   Follows the recommendations in
---   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>
---
--- > Posix:   splitSearchPath "File1:File2:File3"  == ["File1","File2","File3"]
--- > Posix:   splitSearchPath "File1::File2:File3" == ["File1",".","File2","File3"]
--- > Windows: splitSearchPath "File1;File2;File3"  == ["File1","File2","File3"]
--- > Windows: splitSearchPath "File1;;File2;File3" == ["File1","File2","File3"]
--- > Windows: splitSearchPath "File1;\"File2\";File3" == ["File1","File2","File3"]
-splitSearchPath :: String -> [FilePath]
-splitSearchPath = f
-    where
-    f xs = case break isSearchPathSeparator xs of
-           (pre, []    ) -> g pre
-           (pre, _:post) -> g pre ++ f post
-
-    g "" = ["." | isPosix]
-    g ('\"':x@(_:_)) | isWindows && last x == '\"' = [init x]
-    g x = [x]
-
-
--- | Get a list of 'FilePath's in the $PATH variable.
-getSearchPath :: IO [FilePath]
-getSearchPath = fmap splitSearchPath (getEnv "PATH")
-
-
----------------------------------------------------------------------
--- Extension methods
-
--- | Split on the extension. 'addExtension' is the inverse.
---
--- > splitExtension "/directory/path.ext" == ("/directory/path",".ext")
--- > uncurry (++) (splitExtension x) == x
--- > Valid x => uncurry addExtension (splitExtension x) == x
--- > splitExtension "file.txt" == ("file",".txt")
--- > splitExtension "file" == ("file","")
--- > splitExtension "file/file.txt" == ("file/file",".txt")
--- > splitExtension "file.txt/boris" == ("file.txt/boris","")
--- > splitExtension "file.txt/boris.ext" == ("file.txt/boris",".ext")
--- > splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob",".fred")
--- > splitExtension "file/path.txt/" == ("file/path.txt/","")
-splitExtension :: FilePath -> (String, String)
-splitExtension x = case nameDot of
-                       "" -> (x,"")
-                       _ -> (dir ++ init nameDot, extSeparator : ext)
-    where
-        (dir,file) = splitFileName_ x
-        (nameDot,ext) = breakEnd isExtSeparator file
-
--- | Get the extension of a file, returns @\"\"@ for no extension, @.ext@ otherwise.
---
--- > takeExtension "/directory/path.ext" == ".ext"
--- > takeExtension x == snd (splitExtension x)
--- > Valid x => takeExtension (addExtension x "ext") == ".ext"
--- > Valid x => takeExtension (replaceExtension x "ext") == ".ext"
-takeExtension :: FilePath -> String
-takeExtension = snd . splitExtension
-
--- | Remove the current extension and add another, equivalent to 'replaceExtension'.
---
--- > "/directory/path.txt" -<.> "ext" == "/directory/path.ext"
--- > "/directory/path.txt" -<.> ".ext" == "/directory/path.ext"
--- > "foo.o" -<.> "c" == "foo.c"
-(-<.>) :: FilePath -> String -> FilePath
-(-<.>) = replaceExtension
-
--- | Set the extension of a file, overwriting one if already present, equivalent to '-<.>'.
---
--- > replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext"
--- > replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext"
--- > replaceExtension "file.txt" ".bob" == "file.bob"
--- > replaceExtension "file.txt" "bob" == "file.bob"
--- > replaceExtension "file" ".bob" == "file.bob"
--- > replaceExtension "file.txt" "" == "file"
--- > replaceExtension "file.fred.bob" "txt" == "file.fred.txt"
--- > replaceExtension x y == addExtension (dropExtension x) y
-replaceExtension :: FilePath -> String -> FilePath
-replaceExtension x y = dropExtension x <.> y
-
--- | Add an extension, even if there is already one there, equivalent to 'addExtension'.
---
--- > "/directory/path" <.> "ext" == "/directory/path.ext"
--- > "/directory/path" <.> ".ext" == "/directory/path.ext"
-(<.>) :: FilePath -> String -> FilePath
-(<.>) = addExtension
-
--- | Remove last extension, and the \".\" preceding it.
---
--- > dropExtension "/directory/path.ext" == "/directory/path"
--- > dropExtension x == fst (splitExtension x)
-dropExtension :: FilePath -> FilePath
-dropExtension = fst . splitExtension
-
--- | Add an extension, even if there is already one there, equivalent to '<.>'.
---
--- > addExtension "/directory/path" "ext" == "/directory/path.ext"
--- > addExtension "file.txt" "bib" == "file.txt.bib"
--- > addExtension "file." ".bib" == "file..bib"
--- > addExtension "file" ".bib" == "file.bib"
--- > addExtension "/" "x" == "/.x"
--- > addExtension x "" == x
--- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
--- > Windows: addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
-addExtension :: FilePath -> String -> FilePath
-addExtension file "" = file
-addExtension file xs@(x:_) = joinDrive a res
-    where
-        res = if isExtSeparator x then b ++ xs
-              else b ++ [extSeparator] ++ xs
-
-        (a,b) = splitDrive file
-
--- | Does the given filename have an extension?
---
--- > hasExtension "/directory/path.ext" == True
--- > hasExtension "/directory/path" == False
--- > null (takeExtension x) == not (hasExtension x)
-hasExtension :: FilePath -> Bool
-hasExtension = any isExtSeparator . takeFileName
-
-
--- | Does the given filename have the specified extension?
---
--- > "png" `isExtensionOf` "/directory/file.png" == True
--- > ".png" `isExtensionOf` "/directory/file.png" == True
--- > ".tar.gz" `isExtensionOf` "bar/foo.tar.gz" == True
--- > "ar.gz" `isExtensionOf` "bar/foo.tar.gz" == False
--- > "png" `isExtensionOf` "/directory/file.png.jpg" == False
--- > "csv/table.csv" `isExtensionOf` "/data/csv/table.csv" == False
-isExtensionOf :: String -> FilePath -> Bool
-isExtensionOf ext@('.':_) = isSuffixOf ext . takeExtensions
-isExtensionOf ext         = isSuffixOf ('.':ext) . takeExtensions
-
--- | Drop the given extension from a FilePath, and the @\".\"@ preceding it.
---   Returns 'Nothing' if the FilePath does not have the given extension, or
---   'Just' and the part before the extension if it does.
---
---   This function can be more predictable than 'dropExtensions', especially if the filename
---   might itself contain @.@ characters.
---
--- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
--- > stripExtension "hi.o" "foo.x.hs.o" == Nothing
--- > dropExtension x == fromJust (stripExtension (takeExtension x) x)
--- > dropExtensions x == fromJust (stripExtension (takeExtensions x) x)
--- > stripExtension ".c.d" "a.b.c.d"  == Just "a.b"
--- > stripExtension ".c.d" "a.b..c.d" == Just "a.b."
--- > stripExtension "baz"  "foo.bar"  == Nothing
--- > stripExtension "bar"  "foobar"   == Nothing
--- > stripExtension ""     x          == Just x
-stripExtension :: String -> FilePath -> Maybe FilePath
-stripExtension []        path = Just path
-stripExtension ext@(x:_) path = stripSuffix dotExt path
-    where dotExt = if isExtSeparator x then ext else '.':ext
-
-
--- | Split on all extensions.
---
--- > splitExtensions "/directory/path.ext" == ("/directory/path",".ext")
--- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
--- > uncurry (++) (splitExtensions x) == x
--- > Valid x => uncurry addExtension (splitExtensions x) == x
--- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
-splitExtensions :: FilePath -> (FilePath, String)
-splitExtensions x = (a ++ c, d)
-    where
-        (a,b) = splitFileName_ x
-        (c,d) = break isExtSeparator b
-
--- | Drop all extensions.
---
--- > dropExtensions "/directory/path.ext" == "/directory/path"
--- > dropExtensions "file.tar.gz" == "file"
--- > not $ hasExtension $ dropExtensions x
--- > not $ any isExtSeparator $ takeFileName $ dropExtensions x
-dropExtensions :: FilePath -> FilePath
-dropExtensions = fst . splitExtensions
-
--- | Get all extensions.
---
--- > takeExtensions "/directory/path.ext" == ".ext"
--- > takeExtensions "file.tar.gz" == ".tar.gz"
-takeExtensions :: FilePath -> String
-takeExtensions = snd . splitExtensions
-
-
--- | Replace all extensions of a file with a new extension. Note
---   that 'replaceExtension' and 'addExtension' both work for adding
---   multiple extensions, so only required when you need to drop
---   all extensions first.
---
--- > replaceExtensions "file.fred.bob" "txt" == "file.txt"
--- > replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz"
-replaceExtensions :: FilePath -> String -> FilePath
-replaceExtensions x y = dropExtensions x <.> y
-
-
-
----------------------------------------------------------------------
--- Drive methods
-
--- | Is the given character a valid drive letter?
--- only a-z and A-Z are letters, not isAlpha which is more unicodey
-isLetter :: Char -> Bool
-isLetter x = isAsciiLower x || isAsciiUpper x
-
-
--- | Split a path into a drive and a path.
---   On Posix, \/ is a Drive.
---
--- > uncurry (++) (splitDrive x) == x
--- > Windows: splitDrive "file" == ("","file")
--- > Windows: splitDrive "c:/file" == ("c:/","file")
--- > Windows: splitDrive "c:\\file" == ("c:\\","file")
--- > Windows: splitDrive "\\\\shared\\test" == ("\\\\shared\\","test")
--- > Windows: splitDrive "\\\\shared" == ("\\\\shared","")
--- > Windows: splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\","file")
--- > Windows: splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\","UNCshared\\file")
--- > Windows: splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\","file")
--- > Windows: splitDrive "/d" == ("","/d")
--- > Posix:   splitDrive "/test" == ("/","test")
--- > Posix:   splitDrive "//test" == ("//","test")
--- > Posix:   splitDrive "test/file" == ("","test/file")
--- > Posix:   splitDrive "file" == ("","file")
-splitDrive :: FilePath -> (FilePath, FilePath)
-splitDrive x | isPosix = span (== '/') x
-splitDrive x | Just y <- readDriveLetter x = y
-splitDrive x | Just y <- readDriveUNC x = y
-splitDrive x | Just y <- readDriveShare x = y
-splitDrive x = ("",x)
-
-addSlash :: FilePath -> FilePath -> (FilePath, FilePath)
-addSlash a xs = (a++c,d)
-    where (c,d) = span isPathSeparator xs
-
--- See [1].
--- "\\?\D:\<path>" or "\\?\UNC\<server>\<share>"
-readDriveUNC :: FilePath -> Maybe (FilePath, FilePath)
-readDriveUNC (s1:s2:'?':s3:xs) | all isPathSeparator [s1,s2,s3] =
-    case map toUpper xs of
-        ('U':'N':'C':s4:_) | isPathSeparator s4 ->
-            let (a,b) = readDriveShareName (drop 4 xs)
-            in Just (s1:s2:'?':s3:take 4 xs ++ a, b)
-        _ -> case readDriveLetter xs of
-                 -- Extended-length path.
-                 Just (a,b) -> Just (s1:s2:'?':s3:a,b)
-                 Nothing -> Nothing
-readDriveUNC _ = Nothing
-
-{- c:\ -}
-readDriveLetter :: String -> Maybe (FilePath, FilePath)
-readDriveLetter (x:':':y:xs) | isLetter x && isPathSeparator y = Just $ addSlash [x,':'] (y:xs)
-readDriveLetter (x:':':xs) | isLetter x = Just ([x,':'], xs)
-readDriveLetter _ = Nothing
-
-{- \\sharename\ -}
-readDriveShare :: String -> Maybe (FilePath, FilePath)
-readDriveShare (s1:s2:xs) | isPathSeparator s1 && isPathSeparator s2 =
-        Just (s1:s2:a,b)
-    where (a,b) = readDriveShareName xs
-readDriveShare _ = Nothing
-
-{- assume you have already seen \\ -}
-{- share\bob -> "share\", "bob" -}
-readDriveShareName :: String -> (FilePath, FilePath)
-readDriveShareName name = addSlash a b
-    where (a,b) = break isPathSeparator name
-
-
-
--- | Join a drive and the rest of the path.
---
--- > Valid x => uncurry joinDrive (splitDrive x) == x
--- > Windows: joinDrive "C:" "foo" == "C:foo"
--- > Windows: joinDrive "C:\\" "bar" == "C:\\bar"
--- > Windows: joinDrive "\\\\share" "foo" == "\\\\share\\foo"
--- > Windows: joinDrive "/:" "foo" == "/:\\foo"
-joinDrive :: FilePath -> FilePath -> FilePath
-joinDrive = combineAlways
-
--- | Get the drive from a filepath.
---
--- > takeDrive x == fst (splitDrive x)
-takeDrive :: FilePath -> FilePath
-takeDrive = fst . splitDrive
-
--- | Delete the drive, if it exists.
---
--- > dropDrive x == snd (splitDrive x)
-dropDrive :: FilePath -> FilePath
-dropDrive = snd . splitDrive
-
--- | Does a path have a drive.
---
--- > not (hasDrive x) == null (takeDrive x)
--- > Posix:   hasDrive "/foo" == True
--- > Windows: hasDrive "C:\\foo" == True
--- > Windows: hasDrive "C:foo" == True
--- >          hasDrive "foo" == False
--- >          hasDrive "" == False
-hasDrive :: FilePath -> Bool
-hasDrive = not . null . takeDrive
-
-
--- | Is an element a drive
---
--- > Posix:   isDrive "/" == True
--- > Posix:   isDrive "/foo" == False
--- > Windows: isDrive "C:\\" == True
--- > Windows: isDrive "C:\\foo" == False
--- >          isDrive "" == False
-isDrive :: FilePath -> Bool
-isDrive x = not (null x) && null (dropDrive x)
-
-
----------------------------------------------------------------------
--- Operations on a filepath, as a list of directories
-
--- | Split a filename into directory and file. '</>' is the inverse.
---   The first component will often end with a trailing slash.
---
--- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
--- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
--- > Valid x => isValid (fst (splitFileName x))
--- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
--- > splitFileName "file/" == ("file/", "")
--- > splitFileName "bob" == ("./", "bob")
--- > Posix:   splitFileName "/" == ("/","")
--- > Windows: splitFileName "c:" == ("c:","")
-splitFileName :: FilePath -> (String, String)
-splitFileName x = (if null dir then "./" else dir, name)
-    where
-        (dir, name) = splitFileName_ x
-
--- version of splitFileName where, if the FilePath has no directory
--- component, the returned directory is "" rather than "./".  This
--- is used in cases where we are going to combine the returned
--- directory to make a valid FilePath, and having a "./" appear would
--- look strange and upset simple equality properties.  See
--- e.g. replaceFileName.
-splitFileName_ :: FilePath -> (String, String)
-splitFileName_ x = (drv ++ dir, file)
-    where
-        (drv,pth) = splitDrive x
-        (dir,file) = breakEnd isPathSeparator pth
-
--- | Set the filename.
---
--- > replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext"
--- > Valid x => replaceFileName x (takeFileName x) == x
-replaceFileName :: FilePath -> String -> FilePath
-replaceFileName x y = a </> y where (a,_) = splitFileName_ x
-
--- | Drop the filename. Unlike 'takeDirectory', this function will leave
---   a trailing path separator on the directory.
---
--- > dropFileName "/directory/file.ext" == "/directory/"
--- > dropFileName x == fst (splitFileName x)
-dropFileName :: FilePath -> FilePath
-dropFileName = fst . splitFileName
-
-
--- | Get the file name.
---
--- > takeFileName "/directory/file.ext" == "file.ext"
--- > takeFileName "test/" == ""
--- > takeFileName x `isSuffixOf` x
--- > takeFileName x == snd (splitFileName x)
--- > Valid x => takeFileName (replaceFileName x "fred") == "fred"
--- > Valid x => takeFileName (x </> "fred") == "fred"
--- > Valid x => isRelative (takeFileName x)
-takeFileName :: FilePath -> FilePath
-takeFileName = snd . splitFileName
-
--- | Get the base name, without an extension or path.
---
--- > takeBaseName "/directory/file.ext" == "file"
--- > takeBaseName "file/test.txt" == "test"
--- > takeBaseName "dave.ext" == "dave"
--- > takeBaseName "" == ""
--- > takeBaseName "test" == "test"
--- > takeBaseName (addTrailingPathSeparator x) == ""
--- > takeBaseName "file/file.tar.gz" == "file.tar"
-takeBaseName :: FilePath -> String
-takeBaseName = dropExtension . takeFileName
-
--- | Set the base name.
---
--- > replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext"
--- > replaceBaseName "file/test.txt" "bob" == "file/bob.txt"
--- > replaceBaseName "fred" "bill" == "bill"
--- > replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar"
--- > Valid x => replaceBaseName x (takeBaseName x) == x
-replaceBaseName :: FilePath -> String -> FilePath
-replaceBaseName pth nam = combineAlways a (nam <.> ext)
-    where
-        (a,b) = splitFileName_ pth
-        ext = takeExtension b
-
--- | Is an item either a directory or the last character a path separator?
---
--- > hasTrailingPathSeparator "test" == False
--- > hasTrailingPathSeparator "test/" == True
-hasTrailingPathSeparator :: FilePath -> Bool
-hasTrailingPathSeparator "" = False
-hasTrailingPathSeparator x = isPathSeparator (last x)
-
-
-hasLeadingPathSeparator :: FilePath -> Bool
-hasLeadingPathSeparator "" = False
-hasLeadingPathSeparator x = isPathSeparator (head x)
-
-
--- | Add a trailing file path separator if one is not already present.
---
--- > hasTrailingPathSeparator (addTrailingPathSeparator x)
--- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
--- > Posix:    addTrailingPathSeparator "test/rest" == "test/rest/"
-addTrailingPathSeparator :: FilePath -> FilePath
-addTrailingPathSeparator x = if hasTrailingPathSeparator x then x else x ++ [pathSeparator]
-
-
--- | Remove any trailing path separators
---
--- > dropTrailingPathSeparator "file/test/" == "file/test"
--- >           dropTrailingPathSeparator "/" == "/"
--- > Windows:  dropTrailingPathSeparator "\\" == "\\"
--- > Posix:    not (hasTrailingPathSeparator (dropTrailingPathSeparator x)) || isDrive x
-dropTrailingPathSeparator :: FilePath -> FilePath
-dropTrailingPathSeparator x =
-    if hasTrailingPathSeparator x && not (isDrive x)
-    then let x' = dropWhileEnd isPathSeparator x
-         in if null x' then [last x] else x'
-    else x
-
-
--- | Get the directory name, move up one level.
---
--- >           takeDirectory "/directory/other.ext" == "/directory"
--- >           takeDirectory x `isPrefixOf` x || takeDirectory x == "."
--- >           takeDirectory "foo" == "."
--- >           takeDirectory "/" == "/"
--- >           takeDirectory "/foo" == "/"
--- >           takeDirectory "/foo/bar/baz" == "/foo/bar"
--- >           takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
--- >           takeDirectory "foo/bar/baz" == "foo/bar"
--- > Windows:  takeDirectory "foo\\bar" == "foo"
--- > Windows:  takeDirectory "foo\\bar\\\\" == "foo\\bar"
--- > Windows:  takeDirectory "C:\\" == "C:\\"
-takeDirectory :: FilePath -> FilePath
-takeDirectory = dropTrailingPathSeparator . dropFileName
-
--- | Set the directory, keeping the filename the same.
---
--- > replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext"
--- > Valid x => replaceDirectory x (takeDirectory x) `equalFilePath` x
-replaceDirectory :: FilePath -> String -> FilePath
-replaceDirectory x dir = combineAlways dir (takeFileName x)
-
-
--- | An alias for '</>'.
-combine :: FilePath -> FilePath -> FilePath
-combine a b | hasLeadingPathSeparator b || hasDrive b = b
-            | otherwise = combineAlways a b
-
--- | Combine two paths, assuming rhs is NOT absolute.
-combineAlways :: FilePath -> FilePath -> FilePath
-combineAlways a b | null a = b
-                  | null b = a
-                  | hasTrailingPathSeparator a = a ++ b
-                  | otherwise = case a of
-                      [a1,':'] | isWindows && isLetter a1 -> a ++ b
-                      _ -> a ++ [pathSeparator] ++ b
-
-
--- | Combine two paths with a path separator.
---   If the second path starts with a path separator or a drive letter, then it returns the second.
---   The intention is that @readFile (dir '</>' file)@ will access the same file as
---   @setCurrentDirectory dir; readFile file@.
---
--- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
--- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
--- >          "directory" </> "/file.ext" == "/file.ext"
--- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
---
---   Combined:
---
--- > Posix:   "/" </> "test" == "/test"
--- > Posix:   "home" </> "bob" == "home/bob"
--- > Posix:   "x:" </> "foo" == "x:/foo"
--- > Windows: "C:\\foo" </> "bar" == "C:\\foo\\bar"
--- > Windows: "home" </> "bob" == "home\\bob"
---
---   Not combined:
---
--- > Posix:   "home" </> "/bob" == "/bob"
--- > Windows: "home" </> "C:\\bob" == "C:\\bob"
---
---   Not combined (tricky):
---
---   On Windows, if a filepath starts with a single slash, it is relative to the
---   root of the current drive. In [1], this is (confusingly) referred to as an
---   absolute path.
---   The current behavior of '</>' is to never combine these forms.
---
--- > Windows: "home" </> "/bob" == "/bob"
--- > Windows: "home" </> "\\bob" == "\\bob"
--- > Windows: "C:\\home" </> "\\bob" == "\\bob"
---
---   On Windows, from [1]: "If a file name begins with only a disk designator
---   but not the backslash after the colon, it is interpreted as a relative path
---   to the current directory on the drive with the specified letter."
---   The current behavior of '</>' is to never combine these forms.
---
--- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
--- > Windows: "C:\\foo" </> "C:bar" == "C:bar"
-(</>) :: FilePath -> FilePath -> FilePath
-(</>) = combine
-
-
--- | Split a path by the directory separator.
---
--- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
--- > concat (splitPath x) == x
--- > splitPath "test//item/" == ["test//","item/"]
--- > splitPath "test/item/file" == ["test/","item/","file"]
--- > splitPath "" == []
--- > Windows: splitPath "c:\\test\\path" == ["c:\\","test\\","path"]
--- > Posix:   splitPath "/file/test" == ["/","file/","test"]
-splitPath :: FilePath -> [FilePath]
-splitPath x = [drive | drive /= ""] ++ f path
-    where
-        (drive,path) = splitDrive x
-
-        f "" = []
-        f y = (a++c) : f d
-            where
-                (a,b) = break isPathSeparator y
-                (c,d) = span  isPathSeparator b
-
--- | Just as 'splitPath', but don't add the trailing slashes to each element.
---
--- >          splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
--- >          splitDirectories "test/file" == ["test","file"]
--- >          splitDirectories "/test/file" == ["/","test","file"]
--- > Windows: splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"]
--- >          Valid x => joinPath (splitDirectories x) `equalFilePath` x
--- >          splitDirectories "" == []
--- > Windows: splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"]
--- >          splitDirectories "/test///file" == ["/","test","file"]
-splitDirectories :: FilePath -> [FilePath]
-splitDirectories = map dropTrailingPathSeparator . splitPath
-
-
--- | Join path elements back together.
---
--- > joinPath a == foldr (</>) "" a
--- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
--- > Valid x => joinPath (splitPath x) == x
--- > joinPath [] == ""
--- > Posix: joinPath ["test","file","path"] == "test/file/path"
-joinPath :: [FilePath] -> FilePath
--- Note that this definition on c:\\c:\\, join then split will give c:\\.
-joinPath = foldr combine ""
-
-
-
-
-
-
----------------------------------------------------------------------
--- File name manipulators
-
--- | Equality of two 'FilePath's.
---   If you call @System.Directory.canonicalizePath@
---   first this has a much better chance of working.
---   Note that this doesn't follow symlinks or DOSNAM~1s.
---
--- Similar to 'normalise', this does not expand @".."@, because of symlinks.
---
--- >          x == y ==> equalFilePath x y
--- >          normalise x == normalise y ==> equalFilePath x y
--- >          equalFilePath "foo" "foo/"
--- >          not (equalFilePath "/a/../c" "/c")
--- >          not (equalFilePath "foo" "/foo")
--- > Posix:   not (equalFilePath "foo" "FOO")
--- > Windows: equalFilePath "foo" "FOO"
--- > Windows: not (equalFilePath "C:" "C:/")
-equalFilePath :: FilePath -> FilePath -> Bool
-equalFilePath a b = f a == f b
-    where
-        f x | isWindows = dropTrailingPathSeparator $ map toLower $ normalise x
-            | otherwise = dropTrailingPathSeparator $ normalise x
-
-
--- | Contract a filename, based on a relative path. Note that the resulting path
---   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
---   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
---   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
---
---   The corresponding @makeAbsolute@ function can be found in
---   @System.Directory@.
---
--- >          makeRelative "/directory" "/directory/file.ext" == "file.ext"
--- >          Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
--- >          makeRelative x x == "."
--- >          Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
--- > Windows: makeRelative "C:\\Home" "c:\\home\\bob" == "bob"
--- > Windows: makeRelative "C:\\Home" "c:/home/bob" == "bob"
--- > Windows: makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob"
--- > Windows: makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob"
--- > Windows: makeRelative "/Home" "/home/bob" == "bob"
--- > Windows: makeRelative "/" "//" == "//"
--- > Posix:   makeRelative "/Home" "/home/bob" == "/home/bob"
--- > Posix:   makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar"
--- > Posix:   makeRelative "/fred" "bob" == "bob"
--- > Posix:   makeRelative "/file/test" "/file/test/fred" == "fred"
--- > Posix:   makeRelative "/file/test" "/file/test/fred/" == "fred/"
--- > Posix:   makeRelative "some/path" "some/path/a/b/c" == "a/b/c"
-makeRelative :: FilePath -> FilePath -> FilePath
-makeRelative root path
- | equalFilePath root path = "."
- | takeAbs root /= takeAbs path = path
- | otherwise = f (dropAbs root) (dropAbs path)
-    where
-        f "" y = dropWhile isPathSeparator y
-        f x y = let (x1,x2) = g x
-                    (y1,y2) = g y
-                in if equalFilePath x1 y1 then f x2 y2 else path
-
-        g x = (dropWhile isPathSeparator a, dropWhile isPathSeparator b)
-            where (a,b) = break isPathSeparator $ dropWhile isPathSeparator x
-
-        -- on windows, need to drop '/' which is kind of absolute, but not a drive
-        dropAbs x | hasLeadingPathSeparator x && not (hasDrive x) = tail x
-        dropAbs x = dropDrive x
-
-        takeAbs x | hasLeadingPathSeparator x && not (hasDrive x) = [pathSeparator]
-        takeAbs x = map (\y -> if isPathSeparator y then pathSeparator else toLower y) $ takeDrive x
-
--- | Normalise a file
---
--- * \/\/ outside of the drive can be made blank
---
--- * \/ -> 'pathSeparator'
---
--- * .\/ -> \"\"
---
--- Does not remove @".."@, because of symlinks.
---
--- > Posix:   normalise "/file/\\test////" == "/file/\\test/"
--- > Posix:   normalise "/file/./test" == "/file/test"
--- > Posix:   normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/"
--- > Posix:   normalise "../bob/fred/" == "../bob/fred/"
--- > Posix:   normalise "/a/../c" == "/a/../c"
--- > Posix:   normalise "./bob/fred/" == "bob/fred/"
--- > Windows: normalise "c:\\file/bob\\" == "C:\\file\\bob\\"
--- > Windows: normalise "c:\\" == "C:\\"
--- > Windows: normalise "C:.\\" == "C:"
--- > Windows: normalise "\\\\server\\test" == "\\\\server\\test"
--- > Windows: normalise "//server/test" == "\\\\server\\test"
--- > Windows: normalise "c:/file" == "C:\\file"
--- > Windows: normalise "/file" == "\\file"
--- > Windows: normalise "\\" == "\\"
--- > Windows: normalise "/./" == "\\"
--- >          normalise "." == "."
--- > Posix:   normalise "./" == "./"
--- > Posix:   normalise "./." == "./"
--- > Posix:   normalise "/./" == "/"
--- > Posix:   normalise "/" == "/"
--- > Posix:   normalise "bob/fred/." == "bob/fred/"
--- > Posix:   normalise "//home" == "/home"
-normalise :: FilePath -> FilePath
-normalise path = result ++ [pathSeparator | addPathSeparator]
-    where
-        (drv,pth) = splitDrive path
-        result = joinDrive' (normaliseDrive drv) (f pth)
-
-        joinDrive' "" "" = "."
-        joinDrive' d p = joinDrive d p
-
-        addPathSeparator = isDirPath pth
-            && not (hasTrailingPathSeparator result)
-            && not (isRelativeDrive drv)
-
-        isDirPath xs = hasTrailingPathSeparator xs
-            || not (null xs) && last xs == '.' && hasTrailingPathSeparator (init xs)
-
-        f = joinPath . dropDots . propSep . splitDirectories
-
-        propSep (x:xs) | all isPathSeparator x = [pathSeparator] : xs
-                       | otherwise = x : xs
-        propSep [] = []
-
-        dropDots = filter ("." /=)
-
-normaliseDrive :: FilePath -> FilePath
-normaliseDrive "" = ""
-normaliseDrive _ | isPosix = [pathSeparator]
-normaliseDrive drive = if isJust $ readDriveLetter x2
-                       then map toUpper x2
-                       else x2
-    where
-        x2 = map repSlash drive
-
-        repSlash x = if isPathSeparator x then pathSeparator else x
-
--- Information for validity functions on Windows. See [1].
-isBadCharacter :: Char -> Bool
-isBadCharacter x = x >= '\0' && x <= '\31' || x `elem` ":*?><|\""
-
-badElements :: [FilePath]
-badElements =
-    ["CON","PRN","AUX","NUL","CLOCK$"
-    ,"COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9"
-    ,"LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"]
-
-
--- | Is a FilePath valid, i.e. could you create a file like it? This function checks for invalid names,
---   and invalid characters, but does not check if length limits are exceeded, as these are typically
---   filesystem dependent.
---
--- >          isValid "" == False
--- >          isValid "\0" == False
--- > Posix:   isValid "/random_ path:*" == True
--- > Posix:   isValid x == not (null x)
--- > Windows: isValid "c:\\test" == True
--- > Windows: isValid "c:\\test:of_test" == False
--- > Windows: isValid "test*" == False
--- > Windows: isValid "c:\\test\\nul" == False
--- > Windows: isValid "c:\\test\\prn.txt" == False
--- > Windows: isValid "c:\\nul\\file" == False
--- > Windows: isValid "\\\\" == False
--- > Windows: isValid "\\\\\\foo" == False
--- > Windows: isValid "\\\\?\\D:file" == False
--- > Windows: isValid "foo\tbar" == False
--- > Windows: isValid "nul .txt" == False
--- > Windows: isValid " nul.txt" == True
-isValid :: FilePath -> Bool
-isValid "" = False
-isValid x | '\0' `elem` x = False
-isValid _ | isPosix = True
-isValid path =
-        not (any isBadCharacter x2) &&
-        not (any f $ splitDirectories x2) &&
-        not (isJust (readDriveShare x1) && all isPathSeparator x1) &&
-        not (isJust (readDriveUNC x1) && not (hasTrailingPathSeparator x1))
-    where
-        (x1,x2) = splitDrive path
-        f x = map toUpper (dropWhileEnd (== ' ') $ dropExtensions x) `elem` badElements
-
-
--- | Take a FilePath and make it valid; does not change already valid FilePaths.
---
--- > isValid (makeValid x)
--- > isValid x ==> makeValid x == x
--- > makeValid "" == "_"
--- > makeValid "file\0name" == "file_name"
--- > Windows: makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
--- > Windows: makeValid "c:\\test:of_test" == "c:\\test_of_test"
--- > Windows: makeValid "test*" == "test_"
--- > Windows: makeValid "c:\\test\\nul" == "c:\\test\\nul_"
--- > Windows: makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt"
--- > Windows: makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt"
--- > Windows: makeValid "c:\\nul\\file" == "c:\\nul_\\file"
--- > Windows: makeValid "\\\\\\foo" == "\\\\drive"
--- > Windows: makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
--- > Windows: makeValid "nul .txt" == "nul _.txt"
-makeValid :: FilePath -> FilePath
-makeValid "" = "_"
-makeValid path
-        | isPosix = map (\x -> if x == '\0' then '_' else x) path
-        | isJust (readDriveShare drv) && all isPathSeparator drv = take 2 drv ++ "drive"
-        | isJust (readDriveUNC drv) && not (hasTrailingPathSeparator drv) =
-            makeValid (drv ++ [pathSeparator] ++ pth)
-        | otherwise = joinDrive drv $ validElements $ validChars pth
-    where
-        (drv,pth) = splitDrive path
-
-        validChars = map f
-        f x = if isBadCharacter x then '_' else x
-
-        validElements x = joinPath $ map g $ splitPath x
-        g x = h a ++ b
-            where (a,b) = break isPathSeparator x
-        h x = if map toUpper (dropWhileEnd (== ' ') a) `elem` badElements then a ++ "_" <.> b else x
-            where (a,b) = splitExtensions x
-
-
--- | Is a path relative, or is it fixed to the root?
---
--- > Windows: isRelative "path\\test" == True
--- > Windows: isRelative "c:\\test" == False
--- > Windows: isRelative "c:test" == True
--- > Windows: isRelative "c:\\" == False
--- > Windows: isRelative "c:/" == False
--- > Windows: isRelative "c:" == True
--- > Windows: isRelative "\\\\foo" == False
--- > Windows: isRelative "\\\\?\\foo" == False
--- > Windows: isRelative "\\\\?\\UNC\\foo" == False
--- > Windows: isRelative "/foo" == True
--- > Windows: isRelative "\\foo" == True
--- > Posix:   isRelative "test/path" == True
--- > Posix:   isRelative "/test" == False
--- > Posix:   isRelative "/" == False
---
--- According to [1]:
---
--- * "A UNC name of any format [is never relative]."
---
--- * "You cannot use the "\\?\" prefix with a relative path."
-isRelative :: FilePath -> Bool
-isRelative x = null drive || isRelativeDrive drive
-    where drive = takeDrive x
-
-
-{- c:foo -}
--- From [1]: "If a file name begins with only a disk designator but not the
--- backslash after the colon, it is interpreted as a relative path to the
--- current directory on the drive with the specified letter."
-isRelativeDrive :: String -> Bool
-isRelativeDrive x =
-    maybe False (not . hasTrailingPathSeparator . fst) (readDriveLetter x)
-
-
--- | @not . 'isRelative'@
---
--- > isAbsolute x == not (isRelative x)
-isAbsolute :: FilePath -> Bool
-isAbsolute = not . isRelative
-
-
------------------------------------------------------------------------------
--- dropWhileEnd (>2) [1,2,3,4,1,2,3,4] == [1,2,3,4,1,2])
--- Note that Data.List.dropWhileEnd is only available in base >= 4.5.
-dropWhileEnd :: (a -> Bool) -> [a] -> [a]
-dropWhileEnd p = reverse . dropWhile p . reverse
-
--- takeWhileEnd (>2) [1,2,3,4,1,2,3,4] == [3,4])
-takeWhileEnd :: (a -> Bool) -> [a] -> [a]
-takeWhileEnd p = reverse . takeWhile p . reverse
-
--- spanEnd (>2) [1,2,3,4,1,2,3,4] = ([1,2,3,4,1,2], [3,4])
-spanEnd :: (a -> Bool) -> [a] -> ([a], [a])
-spanEnd p xs = (dropWhileEnd p xs, takeWhileEnd p xs)
-
--- breakEnd (< 2) [1,2,3,4,1,2,3,4] == ([1,2,3,4,1],[2,3,4])
-breakEnd :: (a -> Bool) -> [a] -> ([a], [a])
-breakEnd p = spanEnd (not . p)
-
--- | The stripSuffix function drops the given suffix from a list. It returns
--- Nothing if the list did not end with the suffix given, or Just the list
--- before the suffix, if it does.
-stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
-stripSuffix xs ys = reverse <$> stripPrefix (reverse xs) (reverse ys)
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/changelog.md b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/changelog.md
deleted file mode 100644
index f5c477e7eb..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/changelog.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Changelog for [`filepath` package](http://hackage.haskell.org/package/filepath)
-
-_Note: below all `FilePath` values are unquoted, so `\\` really means two backslashes._
-
-## 1.4.2.2 *Dec 2021*
-
-This release is purely a documentation release, fixing the broken haddock links.
-
-### Affected users
-
-This release affects users who apply downstream patches to `System.FilePath.Internal`,
-since `System.FilePath.Posix` and `System.FilePath.Windows` are now generated via `make cpp`
-during development.
-
-To make your patch apply, either apply it to `System.FilePath.Posix` and `System.FilePath.Windows`
-instead or run `make cpp` after applying your patch.
-
-### Changes
-
-* Document relation between `joinPath` and `(</>)` wrt [#82](https://github.com/haskell/filepath/issues/82), [#82](https://github.com/haskell/filepath/issues/86)
-* Clarify that `normalise` does not remove `..` wrt [#86](https://github.com/haskell/filepath/issues/86)
-* Make clear that `equalFilePath` does not expand `..` wrt [#87](https://github.com/haskell/filepath/issues/87)
-* Fix haddock source links by manually cpping wrt [#81](https://github.com/haskell/filepath/issues/81)
-* Make export list in `System.FilePath` explicit to get haddocks on the landing module
-
-
-## 1.4.2.1 *Jul 2018*
-
- * Bundled with GHC 8.6.1
-
-## 1.4.2 *Jan 2018*
-
- * Bundled with GHC 8.4.1
-
- * Add `isExtensionOf` function.
-
-## 1.4.1.2  *Feb 2017*
-
- * Bundled with GHC 8.2.1
-
-## 1.4.1.1  *Nov 2016*
-
- * Bundled with GHC 8.0.2
-
- * Documentation improvements
-
-## 1.4.1.0  *Dec 2015*
-
- * Bundled with GHC 8.0.1
-
- * Add `replaceExtensions` and `stripExtension` functions.
-
- * Make `isValid` detect more invalid Windows paths, e.g. `nul .txt` and `foo\nbar`.
-
- * Improve the documentation.
-
- * Bug fix: `isValid "\0"` now returns `False`, instead of `True`
-
-## 1.4.0.0  *Mar 2015*
-
-  * Bundled with GHC 7.10.1
-
-  * New function: Add `-<.>` as an alias for `replaceExtension`.
-
-  * Semantic change: `joinDrive /foo bar` now returns `/foo/bar`, instead of `/foobar`
-
-  * Semantic change: on Windows, `splitSearchPath File1;\"File 2\"` now returns `[File1,File2]` instead of `[File1,\"File2\"]`
-
-  * Bug fix: on Posix systems, `normalise //home` now returns `/home`, instead of `//home`
-
-  * Bug fix: `normalise /./` now returns `/` on Posix and `\` on Windows, instead of `//` and `\\`
-
-  * Bug fix: `isDrive ""` now returns `False`, instead of `True`
-
-  * Bug fix: on Windows, `dropTrailingPathSeparator /` now returns `/` unchanged, instead of the normalised `\`
-
-  * Bug fix: on Windows, `equalFilePath C:\ C:` now returns `False`, instead of `True`
-
-  * Bug fix: on Windows, `isValid \\\foo` now returns `False`, instead of `True`
-
-  * Bug fix: on Windows, `isValid \\?\D:file` now returns `False`, instead of `True`
-
-  * Bug fix: on Windows, `normalise \` now returns `\` unchanged, instead of `\\`
-
-  * Bug fix: on Windows, `normalise C:.\` now returns `C:`, instead of `C:\\`
-
-  * Bug fix: on Windows, `normalise //server/test` now returns `\\server\test`, instead of `//server/test` unchanged
-
-  * Bug fix: on Windows, `makeRelative / //` now returns `//`, instead of `""`
-
-## 1.3.0.2  *Mar 2014*
-
-  * Bundled with GHC 7.8.1
-
-  * Update to Cabal 1.10 format
-
-  * Minor Haddock cleanups
-
-## 1.3.0.1  *Sep 2012*
-
-  * Bundled with GHC 7.6.1
-
-  * No changes
-
-## 1.3.0.0  *Feb 2012*
-
-  * Bundled with GHC 7.4.1
-
-  * Add support for SafeHaskell
-
-  * Bug fix: `normalise /` now returns `/`, instead of `/.`
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal
deleted file mode 100644
index 9a834873ea..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal
+++ /dev/null
@@ -1,68 +0,0 @@
-cabal-version:  1.18
-name:           filepath
-version:        1.4.2.2
--- NOTE: Don't forget to update ./changelog.md
-license:        BSD3
-license-file:   LICENSE
-author:         Neil Mitchell <ndmitchell@gmail.com>
-maintainer:     Julian Ospald <hasufell@posteo.de>
-copyright:      Neil Mitchell 2005-2020
-bug-reports:    https://github.com/haskell/filepath/issues
-homepage:       https://github.com/haskell/filepath#readme
-category:       System
-build-type:     Simple
-synopsis:       Library for manipulating FilePaths in a cross platform way.
-tested-with:    GHC==9.2.1, GHC==9.0.1, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2
-description:
-    This package provides functionality for manipulating @FilePath@ values, and is shipped with both <https://www.haskell.org/ghc/ GHC> and the <https://www.haskell.org/platform/ Haskell Platform>. It provides three modules:
-    .
-    * "System.FilePath.Posix" manipulates POSIX\/Linux style @FilePath@ values (with @\/@ as the path separator).
-    .
-    * "System.FilePath.Windows" manipulates Windows style @FilePath@ values (with either @\\@ or @\/@ as the path separator, and deals with drives).
-    .
-    * "System.FilePath" is an alias for the module appropriate to your platform.
-    .
-    All three modules provide the same API, and the same documentation (calling out differences in the different variants).
-
-extra-source-files:
-    System/FilePath/Internal.hs
-    Makefile
-extra-doc-files:
-    README.md
-    HACKING.md
-    changelog.md
-
-source-repository head
-    type:     git
-    location: https://github.com/haskell/filepath.git
-
-library
-    default-language: Haskell2010
-    other-extensions:
-        CPP
-        PatternGuards
-    if impl(GHC >= 7.2)
-        other-extensions: Safe
-
-    exposed-modules:
-        System.FilePath
-        System.FilePath.Posix
-        System.FilePath.Windows
-
-    build-depends:
-        base >= 4.9 && < 4.17
-
-    ghc-options: -Wall
-
-test-suite filepath-tests
-    type: exitcode-stdio-1.0
-    default-language: Haskell2010
-    main-is: Test.hs
-    hs-source-dirs: tests
-    other-modules:
-        TestGen
-        TestUtil
-    build-depends:
-        filepath,
-        base,
-        QuickCheck >= 2.7 && < 2.15
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/Test.hs b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/Test.hs
deleted file mode 100644
index 6c307e81c7..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/Test.hs
+++ /dev/null
@@ -1,30 +0,0 @@
-
-module Main where
-
-import System.Environment
-import TestGen
-import Control.Monad
-import Data.Maybe
-import Test.QuickCheck
-
-
-main :: IO ()
-main = do
-    args <- getArgs
-    let count = case args of i:_ -> read i; _ -> 10000
-    putStrLn $ "Testing with " ++ show count ++ " repetitions"
-    let total = length tests
-    let showOutput x = show x{output=""} ++ "\n" ++ output x
-    bad <- fmap catMaybes $ forM (zip [1..] tests) $ \(i,(msg,prop)) -> do
-        putStrLn $ "Test " ++ show i ++ " of " ++ show total ++ ": " ++ msg
-        res <- quickCheckWithResult stdArgs{chatty=False, maxSuccess=count} prop
-        case res of
-            Success{} -> pure Nothing
-            bad -> do putStrLn $ showOutput bad; putStrLn "TEST FAILURE!"; pure $ Just (msg,bad)
-    if null bad then
-        putStrLn $ "Success, " ++ show total ++ " tests passed"
-     else do
-        putStrLn $ show (length bad) ++ " FAILURES\n"
-        forM_ (zip [1..] bad) $ \(i,(a,b)) ->
-            putStrLn $ "FAILURE " ++ show i ++ ": " ++ a ++ "\n" ++ showOutput b ++ "\n"
-        fail $ "FAILURE, failed " ++ show (length bad) ++ " of " ++ show total ++ " tests"
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestGen.hs b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestGen.hs
deleted file mode 100644
index 62eb18f4b8..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestGen.hs
+++ /dev/null
@@ -1,466 +0,0 @@
--- GENERATED CODE: See ../Generate.hs
-module TestGen(tests) where
-import TestUtil
-import qualified System.FilePath.Windows as W
-import qualified System.FilePath.Posix as P
-{-# ANN module "HLint: ignore" #-}
-tests :: [(String, Property)]
-tests =
-    [("W.pathSeparator == '\\\\'", property $ W.pathSeparator == '\\')
-    ,("P.pathSeparator == '/'", property $ P.pathSeparator == '/')
-    ,("P.isPathSeparator P.pathSeparator", property $ P.isPathSeparator P.pathSeparator)
-    ,("W.isPathSeparator W.pathSeparator", property $ W.isPathSeparator W.pathSeparator)
-    ,("W.pathSeparators == ['\\\\', '/']", property $ W.pathSeparators == ['\\', '/'])
-    ,("P.pathSeparators == ['/']", property $ P.pathSeparators == ['/'])
-    ,("P.pathSeparator `elem` P.pathSeparators", property $ P.pathSeparator `elem` P.pathSeparators)
-    ,("W.pathSeparator `elem` W.pathSeparators", property $ W.pathSeparator `elem` W.pathSeparators)
-    ,("P.isPathSeparator a == (a `elem` P.pathSeparators)", property $ \a -> P.isPathSeparator a == (a `elem` P.pathSeparators))
-    ,("W.isPathSeparator a == (a `elem` W.pathSeparators)", property $ \a -> W.isPathSeparator a == (a `elem` W.pathSeparators))
-    ,("W.searchPathSeparator == ';'", property $ W.searchPathSeparator == ';')
-    ,("P.searchPathSeparator == ':'", property $ P.searchPathSeparator == ':')
-    ,("P.isSearchPathSeparator a == (a == P.searchPathSeparator)", property $ \a -> P.isSearchPathSeparator a == (a == P.searchPathSeparator))
-    ,("W.isSearchPathSeparator a == (a == W.searchPathSeparator)", property $ \a -> W.isSearchPathSeparator a == (a == W.searchPathSeparator))
-    ,("P.extSeparator == '.'", property $ P.extSeparator == '.')
-    ,("W.extSeparator == '.'", property $ W.extSeparator == '.')
-    ,("P.isExtSeparator a == (a == P.extSeparator)", property $ \a -> P.isExtSeparator a == (a == P.extSeparator))
-    ,("W.isExtSeparator a == (a == W.extSeparator)", property $ \a -> W.isExtSeparator a == (a == W.extSeparator))
-    ,("P.splitSearchPath \"File1:File2:File3\" == [\"File1\", \"File2\", \"File3\"]", property $ P.splitSearchPath "File1:File2:File3" == ["File1", "File2", "File3"])
-    ,("P.splitSearchPath \"File1::File2:File3\" == [\"File1\", \".\", \"File2\", \"File3\"]", property $ P.splitSearchPath "File1::File2:File3" == ["File1", ".", "File2", "File3"])
-    ,("W.splitSearchPath \"File1;File2;File3\" == [\"File1\", \"File2\", \"File3\"]", property $ W.splitSearchPath "File1;File2;File3" == ["File1", "File2", "File3"])
-    ,("W.splitSearchPath \"File1;;File2;File3\" == [\"File1\", \"File2\", \"File3\"]", property $ W.splitSearchPath "File1;;File2;File3" == ["File1", "File2", "File3"])
-    ,("W.splitSearchPath \"File1;\\\"File2\\\";File3\" == [\"File1\", \"File2\", \"File3\"]", property $ W.splitSearchPath "File1;\"File2\";File3" == ["File1", "File2", "File3"])
-    ,("P.splitExtension \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", property $ P.splitExtension "/directory/path.ext" == ("/directory/path", ".ext"))
-    ,("W.splitExtension \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", property $ W.splitExtension "/directory/path.ext" == ("/directory/path", ".ext"))
-    ,("uncurry (++) (P.splitExtension x) == x", property $ \(QFilePath x) -> uncurry (++) (P.splitExtension x) == x)
-    ,("uncurry (++) (W.splitExtension x) == x", property $ \(QFilePath x) -> uncurry (++) (W.splitExtension x) == x)
-    ,("uncurry P.addExtension (P.splitExtension x) == x", property $ \(QFilePathValidP x) -> uncurry P.addExtension (P.splitExtension x) == x)
-    ,("uncurry W.addExtension (W.splitExtension x) == x", property $ \(QFilePathValidW x) -> uncurry W.addExtension (W.splitExtension x) == x)
-    ,("P.splitExtension \"file.txt\" == (\"file\", \".txt\")", property $ P.splitExtension "file.txt" == ("file", ".txt"))
-    ,("W.splitExtension \"file.txt\" == (\"file\", \".txt\")", property $ W.splitExtension "file.txt" == ("file", ".txt"))
-    ,("P.splitExtension \"file\" == (\"file\", \"\")", property $ P.splitExtension "file" == ("file", ""))
-    ,("W.splitExtension \"file\" == (\"file\", \"\")", property $ W.splitExtension "file" == ("file", ""))
-    ,("P.splitExtension \"file/file.txt\" == (\"file/file\", \".txt\")", property $ P.splitExtension "file/file.txt" == ("file/file", ".txt"))
-    ,("W.splitExtension \"file/file.txt\" == (\"file/file\", \".txt\")", property $ W.splitExtension "file/file.txt" == ("file/file", ".txt"))
-    ,("P.splitExtension \"file.txt/boris\" == (\"file.txt/boris\", \"\")", property $ P.splitExtension "file.txt/boris" == ("file.txt/boris", ""))
-    ,("W.splitExtension \"file.txt/boris\" == (\"file.txt/boris\", \"\")", property $ W.splitExtension "file.txt/boris" == ("file.txt/boris", ""))
-    ,("P.splitExtension \"file.txt/boris.ext\" == (\"file.txt/boris\", \".ext\")", property $ P.splitExtension "file.txt/boris.ext" == ("file.txt/boris", ".ext"))
-    ,("W.splitExtension \"file.txt/boris.ext\" == (\"file.txt/boris\", \".ext\")", property $ W.splitExtension "file.txt/boris.ext" == ("file.txt/boris", ".ext"))
-    ,("P.splitExtension \"file/path.txt.bob.fred\" == (\"file/path.txt.bob\", \".fred\")", property $ P.splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob", ".fred"))
-    ,("W.splitExtension \"file/path.txt.bob.fred\" == (\"file/path.txt.bob\", \".fred\")", property $ W.splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob", ".fred"))
-    ,("P.splitExtension \"file/path.txt/\" == (\"file/path.txt/\", \"\")", property $ P.splitExtension "file/path.txt/" == ("file/path.txt/", ""))
-    ,("W.splitExtension \"file/path.txt/\" == (\"file/path.txt/\", \"\")", property $ W.splitExtension "file/path.txt/" == ("file/path.txt/", ""))
-    ,("P.takeExtension \"/directory/path.ext\" == \".ext\"", property $ P.takeExtension "/directory/path.ext" == ".ext")
-    ,("W.takeExtension \"/directory/path.ext\" == \".ext\"", property $ W.takeExtension "/directory/path.ext" == ".ext")
-    ,("P.takeExtension x == snd (P.splitExtension x)", property $ \(QFilePath x) -> P.takeExtension x == snd (P.splitExtension x))
-    ,("W.takeExtension x == snd (W.splitExtension x)", property $ \(QFilePath x) -> W.takeExtension x == snd (W.splitExtension x))
-    ,("P.takeExtension (P.addExtension x \"ext\") == \".ext\"", property $ \(QFilePathValidP x) -> P.takeExtension (P.addExtension x "ext") == ".ext")
-    ,("W.takeExtension (W.addExtension x \"ext\") == \".ext\"", property $ \(QFilePathValidW x) -> W.takeExtension (W.addExtension x "ext") == ".ext")
-    ,("P.takeExtension (P.replaceExtension x \"ext\") == \".ext\"", property $ \(QFilePathValidP x) -> P.takeExtension (P.replaceExtension x "ext") == ".ext")
-    ,("W.takeExtension (W.replaceExtension x \"ext\") == \".ext\"", property $ \(QFilePathValidW x) -> W.takeExtension (W.replaceExtension x "ext") == ".ext")
-    ,("\"/directory/path.txt\" P.-<.> \"ext\" == \"/directory/path.ext\"", property $ "/directory/path.txt" P.-<.> "ext" == "/directory/path.ext")
-    ,("\"/directory/path.txt\" W.-<.> \"ext\" == \"/directory/path.ext\"", property $ "/directory/path.txt" W.-<.> "ext" == "/directory/path.ext")
-    ,("\"/directory/path.txt\" P.-<.> \".ext\" == \"/directory/path.ext\"", property $ "/directory/path.txt" P.-<.> ".ext" == "/directory/path.ext")
-    ,("\"/directory/path.txt\" W.-<.> \".ext\" == \"/directory/path.ext\"", property $ "/directory/path.txt" W.-<.> ".ext" == "/directory/path.ext")
-    ,("\"foo.o\" P.-<.> \"c\" == \"foo.c\"", property $ "foo.o" P.-<.> "c" == "foo.c")
-    ,("\"foo.o\" W.-<.> \"c\" == \"foo.c\"", property $ "foo.o" W.-<.> "c" == "foo.c")
-    ,("P.replaceExtension \"/directory/path.txt\" \"ext\" == \"/directory/path.ext\"", property $ P.replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext")
-    ,("W.replaceExtension \"/directory/path.txt\" \"ext\" == \"/directory/path.ext\"", property $ W.replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext")
-    ,("P.replaceExtension \"/directory/path.txt\" \".ext\" == \"/directory/path.ext\"", property $ P.replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext")
-    ,("W.replaceExtension \"/directory/path.txt\" \".ext\" == \"/directory/path.ext\"", property $ W.replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext")
-    ,("P.replaceExtension \"file.txt\" \".bob\" == \"file.bob\"", property $ P.replaceExtension "file.txt" ".bob" == "file.bob")
-    ,("W.replaceExtension \"file.txt\" \".bob\" == \"file.bob\"", property $ W.replaceExtension "file.txt" ".bob" == "file.bob")
-    ,("P.replaceExtension \"file.txt\" \"bob\" == \"file.bob\"", property $ P.replaceExtension "file.txt" "bob" == "file.bob")
-    ,("W.replaceExtension \"file.txt\" \"bob\" == \"file.bob\"", property $ W.replaceExtension "file.txt" "bob" == "file.bob")
-    ,("P.replaceExtension \"file\" \".bob\" == \"file.bob\"", property $ P.replaceExtension "file" ".bob" == "file.bob")
-    ,("W.replaceExtension \"file\" \".bob\" == \"file.bob\"", property $ W.replaceExtension "file" ".bob" == "file.bob")
-    ,("P.replaceExtension \"file.txt\" \"\" == \"file\"", property $ P.replaceExtension "file.txt" "" == "file")
-    ,("W.replaceExtension \"file.txt\" \"\" == \"file\"", property $ W.replaceExtension "file.txt" "" == "file")
-    ,("P.replaceExtension \"file.fred.bob\" \"txt\" == \"file.fred.txt\"", property $ P.replaceExtension "file.fred.bob" "txt" == "file.fred.txt")
-    ,("W.replaceExtension \"file.fred.bob\" \"txt\" == \"file.fred.txt\"", property $ W.replaceExtension "file.fred.bob" "txt" == "file.fred.txt")
-    ,("P.replaceExtension x y == P.addExtension (P.dropExtension x) y", property $ \(QFilePath x) (QFilePath y) -> P.replaceExtension x y == P.addExtension (P.dropExtension x) y)
-    ,("W.replaceExtension x y == W.addExtension (W.dropExtension x) y", property $ \(QFilePath x) (QFilePath y) -> W.replaceExtension x y == W.addExtension (W.dropExtension x) y)
-    ,("\"/directory/path\" P.<.> \"ext\" == \"/directory/path.ext\"", property $ "/directory/path" P.<.> "ext" == "/directory/path.ext")
-    ,("\"/directory/path\" W.<.> \"ext\" == \"/directory/path.ext\"", property $ "/directory/path" W.<.> "ext" == "/directory/path.ext")
-    ,("\"/directory/path\" P.<.> \".ext\" == \"/directory/path.ext\"", property $ "/directory/path" P.<.> ".ext" == "/directory/path.ext")
-    ,("\"/directory/path\" W.<.> \".ext\" == \"/directory/path.ext\"", property $ "/directory/path" W.<.> ".ext" == "/directory/path.ext")
-    ,("P.dropExtension \"/directory/path.ext\" == \"/directory/path\"", property $ P.dropExtension "/directory/path.ext" == "/directory/path")
-    ,("W.dropExtension \"/directory/path.ext\" == \"/directory/path\"", property $ W.dropExtension "/directory/path.ext" == "/directory/path")
-    ,("P.dropExtension x == fst (P.splitExtension x)", property $ \(QFilePath x) -> P.dropExtension x == fst (P.splitExtension x))
-    ,("W.dropExtension x == fst (W.splitExtension x)", property $ \(QFilePath x) -> W.dropExtension x == fst (W.splitExtension x))
-    ,("P.addExtension \"/directory/path\" \"ext\" == \"/directory/path.ext\"", property $ P.addExtension "/directory/path" "ext" == "/directory/path.ext")
-    ,("W.addExtension \"/directory/path\" \"ext\" == \"/directory/path.ext\"", property $ W.addExtension "/directory/path" "ext" == "/directory/path.ext")
-    ,("P.addExtension \"file.txt\" \"bib\" == \"file.txt.bib\"", property $ P.addExtension "file.txt" "bib" == "file.txt.bib")
-    ,("W.addExtension \"file.txt\" \"bib\" == \"file.txt.bib\"", property $ W.addExtension "file.txt" "bib" == "file.txt.bib")
-    ,("P.addExtension \"file.\" \".bib\" == \"file..bib\"", property $ P.addExtension "file." ".bib" == "file..bib")
-    ,("W.addExtension \"file.\" \".bib\" == \"file..bib\"", property $ W.addExtension "file." ".bib" == "file..bib")
-    ,("P.addExtension \"file\" \".bib\" == \"file.bib\"", property $ P.addExtension "file" ".bib" == "file.bib")
-    ,("W.addExtension \"file\" \".bib\" == \"file.bib\"", property $ W.addExtension "file" ".bib" == "file.bib")
-    ,("P.addExtension \"/\" \"x\" == \"/.x\"", property $ P.addExtension "/" "x" == "/.x")
-    ,("W.addExtension \"/\" \"x\" == \"/.x\"", property $ W.addExtension "/" "x" == "/.x")
-    ,("P.addExtension x \"\" == x", property $ \(QFilePath x) -> P.addExtension x "" == x)
-    ,("W.addExtension x \"\" == x", property $ \(QFilePath x) -> W.addExtension x "" == x)
-    ,("P.takeFileName (P.addExtension (P.addTrailingPathSeparator x) \"ext\") == \".ext\"", property $ \(QFilePathValidP x) -> P.takeFileName (P.addExtension (P.addTrailingPathSeparator x) "ext") == ".ext")
-    ,("W.takeFileName (W.addExtension (W.addTrailingPathSeparator x) \"ext\") == \".ext\"", property $ \(QFilePathValidW x) -> W.takeFileName (W.addExtension (W.addTrailingPathSeparator x) "ext") == ".ext")
-    ,("W.addExtension \"\\\\\\\\share\" \".txt\" == \"\\\\\\\\share\\\\.txt\"", property $ W.addExtension "\\\\share" ".txt" == "\\\\share\\.txt")
-    ,("P.hasExtension \"/directory/path.ext\" == True", property $ P.hasExtension "/directory/path.ext" == True)
-    ,("W.hasExtension \"/directory/path.ext\" == True", property $ W.hasExtension "/directory/path.ext" == True)
-    ,("P.hasExtension \"/directory/path\" == False", property $ P.hasExtension "/directory/path" == False)
-    ,("W.hasExtension \"/directory/path\" == False", property $ W.hasExtension "/directory/path" == False)
-    ,("null (P.takeExtension x) == not (P.hasExtension x)", property $ \(QFilePath x) -> null (P.takeExtension x) == not (P.hasExtension x))
-    ,("null (W.takeExtension x) == not (W.hasExtension x)", property $ \(QFilePath x) -> null (W.takeExtension x) == not (W.hasExtension x))
-    ,("\"png\" `P.isExtensionOf` \"/directory/file.png\" == True", property $ "png" `P.isExtensionOf` "/directory/file.png" == True)
-    ,("\"png\" `W.isExtensionOf` \"/directory/file.png\" == True", property $ "png" `W.isExtensionOf` "/directory/file.png" == True)
-    ,("\".png\" `P.isExtensionOf` \"/directory/file.png\" == True", property $ ".png" `P.isExtensionOf` "/directory/file.png" == True)
-    ,("\".png\" `W.isExtensionOf` \"/directory/file.png\" == True", property $ ".png" `W.isExtensionOf` "/directory/file.png" == True)
-    ,("\".tar.gz\" `P.isExtensionOf` \"bar/foo.tar.gz\" == True", property $ ".tar.gz" `P.isExtensionOf` "bar/foo.tar.gz" == True)
-    ,("\".tar.gz\" `W.isExtensionOf` \"bar/foo.tar.gz\" == True", property $ ".tar.gz" `W.isExtensionOf` "bar/foo.tar.gz" == True)
-    ,("\"ar.gz\" `P.isExtensionOf` \"bar/foo.tar.gz\" == False", property $ "ar.gz" `P.isExtensionOf` "bar/foo.tar.gz" == False)
-    ,("\"ar.gz\" `W.isExtensionOf` \"bar/foo.tar.gz\" == False", property $ "ar.gz" `W.isExtensionOf` "bar/foo.tar.gz" == False)
-    ,("\"png\" `P.isExtensionOf` \"/directory/file.png.jpg\" == False", property $ "png" `P.isExtensionOf` "/directory/file.png.jpg" == False)
-    ,("\"png\" `W.isExtensionOf` \"/directory/file.png.jpg\" == False", property $ "png" `W.isExtensionOf` "/directory/file.png.jpg" == False)
-    ,("\"csv/table.csv\" `P.isExtensionOf` \"/data/csv/table.csv\" == False", property $ "csv/table.csv" `P.isExtensionOf` "/data/csv/table.csv" == False)
-    ,("\"csv/table.csv\" `W.isExtensionOf` \"/data/csv/table.csv\" == False", property $ "csv/table.csv" `W.isExtensionOf` "/data/csv/table.csv" == False)
-    ,("P.stripExtension \"hs.o\" \"foo.x.hs.o\" == Just \"foo.x\"", property $ P.stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x")
-    ,("W.stripExtension \"hs.o\" \"foo.x.hs.o\" == Just \"foo.x\"", property $ W.stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x")
-    ,("P.stripExtension \"hi.o\" \"foo.x.hs.o\" == Nothing", property $ P.stripExtension "hi.o" "foo.x.hs.o" == Nothing)
-    ,("W.stripExtension \"hi.o\" \"foo.x.hs.o\" == Nothing", property $ W.stripExtension "hi.o" "foo.x.hs.o" == Nothing)
-    ,("P.dropExtension x == fromJust (P.stripExtension (P.takeExtension x) x)", property $ \(QFilePath x) -> P.dropExtension x == fromJust (P.stripExtension (P.takeExtension x) x))
-    ,("W.dropExtension x == fromJust (W.stripExtension (W.takeExtension x) x)", property $ \(QFilePath x) -> W.dropExtension x == fromJust (W.stripExtension (W.takeExtension x) x))
-    ,("P.dropExtensions x == fromJust (P.stripExtension (P.takeExtensions x) x)", property $ \(QFilePath x) -> P.dropExtensions x == fromJust (P.stripExtension (P.takeExtensions x) x))
-    ,("W.dropExtensions x == fromJust (W.stripExtension (W.takeExtensions x) x)", property $ \(QFilePath x) -> W.dropExtensions x == fromJust (W.stripExtension (W.takeExtensions x) x))
-    ,("P.stripExtension \".c.d\" \"a.b.c.d\" == Just \"a.b\"", property $ P.stripExtension ".c.d" "a.b.c.d" == Just "a.b")
-    ,("W.stripExtension \".c.d\" \"a.b.c.d\" == Just \"a.b\"", property $ W.stripExtension ".c.d" "a.b.c.d" == Just "a.b")
-    ,("P.stripExtension \".c.d\" \"a.b..c.d\" == Just \"a.b.\"", property $ P.stripExtension ".c.d" "a.b..c.d" == Just "a.b.")
-    ,("W.stripExtension \".c.d\" \"a.b..c.d\" == Just \"a.b.\"", property $ W.stripExtension ".c.d" "a.b..c.d" == Just "a.b.")
-    ,("P.stripExtension \"baz\" \"foo.bar\" == Nothing", property $ P.stripExtension "baz" "foo.bar" == Nothing)
-    ,("W.stripExtension \"baz\" \"foo.bar\" == Nothing", property $ W.stripExtension "baz" "foo.bar" == Nothing)
-    ,("P.stripExtension \"bar\" \"foobar\" == Nothing", property $ P.stripExtension "bar" "foobar" == Nothing)
-    ,("W.stripExtension \"bar\" \"foobar\" == Nothing", property $ W.stripExtension "bar" "foobar" == Nothing)
-    ,("P.stripExtension \"\" x == Just x", property $ \(QFilePath x) -> P.stripExtension "" x == Just x)
-    ,("W.stripExtension \"\" x == Just x", property $ \(QFilePath x) -> W.stripExtension "" x == Just x)
-    ,("P.splitExtensions \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", property $ P.splitExtensions "/directory/path.ext" == ("/directory/path", ".ext"))
-    ,("W.splitExtensions \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", property $ W.splitExtensions "/directory/path.ext" == ("/directory/path", ".ext"))
-    ,("P.splitExtensions \"file.tar.gz\" == (\"file\", \".tar.gz\")", property $ P.splitExtensions "file.tar.gz" == ("file", ".tar.gz"))
-    ,("W.splitExtensions \"file.tar.gz\" == (\"file\", \".tar.gz\")", property $ W.splitExtensions "file.tar.gz" == ("file", ".tar.gz"))
-    ,("uncurry (++) (P.splitExtensions x) == x", property $ \(QFilePath x) -> uncurry (++) (P.splitExtensions x) == x)
-    ,("uncurry (++) (W.splitExtensions x) == x", property $ \(QFilePath x) -> uncurry (++) (W.splitExtensions x) == x)
-    ,("uncurry P.addExtension (P.splitExtensions x) == x", property $ \(QFilePathValidP x) -> uncurry P.addExtension (P.splitExtensions x) == x)
-    ,("uncurry W.addExtension (W.splitExtensions x) == x", property $ \(QFilePathValidW x) -> uncurry W.addExtension (W.splitExtensions x) == x)
-    ,("P.splitExtensions \"file.tar.gz\" == (\"file\", \".tar.gz\")", property $ P.splitExtensions "file.tar.gz" == ("file", ".tar.gz"))
-    ,("W.splitExtensions \"file.tar.gz\" == (\"file\", \".tar.gz\")", property $ W.splitExtensions "file.tar.gz" == ("file", ".tar.gz"))
-    ,("P.dropExtensions \"/directory/path.ext\" == \"/directory/path\"", property $ P.dropExtensions "/directory/path.ext" == "/directory/path")
-    ,("W.dropExtensions \"/directory/path.ext\" == \"/directory/path\"", property $ W.dropExtensions "/directory/path.ext" == "/directory/path")
-    ,("P.dropExtensions \"file.tar.gz\" == \"file\"", property $ P.dropExtensions "file.tar.gz" == "file")
-    ,("W.dropExtensions \"file.tar.gz\" == \"file\"", property $ W.dropExtensions "file.tar.gz" == "file")
-    ,("not $ P.hasExtension $ P.dropExtensions x", property $ \(QFilePath x) -> not $ P.hasExtension $ P.dropExtensions x)
-    ,("not $ W.hasExtension $ W.dropExtensions x", property $ \(QFilePath x) -> not $ W.hasExtension $ W.dropExtensions x)
-    ,("not $ any P.isExtSeparator $ P.takeFileName $ P.dropExtensions x", property $ \(QFilePath x) -> not $ any P.isExtSeparator $ P.takeFileName $ P.dropExtensions x)
-    ,("not $ any W.isExtSeparator $ W.takeFileName $ W.dropExtensions x", property $ \(QFilePath x) -> not $ any W.isExtSeparator $ W.takeFileName $ W.dropExtensions x)
-    ,("P.takeExtensions \"/directory/path.ext\" == \".ext\"", property $ P.takeExtensions "/directory/path.ext" == ".ext")
-    ,("W.takeExtensions \"/directory/path.ext\" == \".ext\"", property $ W.takeExtensions "/directory/path.ext" == ".ext")
-    ,("P.takeExtensions \"file.tar.gz\" == \".tar.gz\"", property $ P.takeExtensions "file.tar.gz" == ".tar.gz")
-    ,("W.takeExtensions \"file.tar.gz\" == \".tar.gz\"", property $ W.takeExtensions "file.tar.gz" == ".tar.gz")
-    ,("P.replaceExtensions \"file.fred.bob\" \"txt\" == \"file.txt\"", property $ P.replaceExtensions "file.fred.bob" "txt" == "file.txt")
-    ,("W.replaceExtensions \"file.fred.bob\" \"txt\" == \"file.txt\"", property $ W.replaceExtensions "file.fred.bob" "txt" == "file.txt")
-    ,("P.replaceExtensions \"file.fred.bob\" \"tar.gz\" == \"file.tar.gz\"", property $ P.replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz")
-    ,("W.replaceExtensions \"file.fred.bob\" \"tar.gz\" == \"file.tar.gz\"", property $ W.replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz")
-    ,("uncurry (++) (P.splitDrive x) == x", property $ \(QFilePath x) -> uncurry (++) (P.splitDrive x) == x)
-    ,("uncurry (++) (W.splitDrive x) == x", property $ \(QFilePath x) -> uncurry (++) (W.splitDrive x) == x)
-    ,("W.splitDrive \"file\" == (\"\", \"file\")", property $ W.splitDrive "file" == ("", "file"))
-    ,("W.splitDrive \"c:/file\" == (\"c:/\", \"file\")", property $ W.splitDrive "c:/file" == ("c:/", "file"))
-    ,("W.splitDrive \"c:\\\\file\" == (\"c:\\\\\", \"file\")", property $ W.splitDrive "c:\\file" == ("c:\\", "file"))
-    ,("W.splitDrive \"\\\\\\\\shared\\\\test\" == (\"\\\\\\\\shared\\\\\", \"test\")", property $ W.splitDrive "\\\\shared\\test" == ("\\\\shared\\", "test"))
-    ,("W.splitDrive \"\\\\\\\\shared\" == (\"\\\\\\\\shared\", \"\")", property $ W.splitDrive "\\\\shared" == ("\\\\shared", ""))
-    ,("W.splitDrive \"\\\\\\\\?\\\\UNC\\\\shared\\\\file\" == (\"\\\\\\\\?\\\\UNC\\\\shared\\\\\", \"file\")", property $ W.splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\", "file"))
-    ,("W.splitDrive \"\\\\\\\\?\\\\UNCshared\\\\file\" == (\"\\\\\\\\?\\\\\", \"UNCshared\\\\file\")", property $ W.splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\", "UNCshared\\file"))
-    ,("W.splitDrive \"\\\\\\\\?\\\\d:\\\\file\" == (\"\\\\\\\\?\\\\d:\\\\\", \"file\")", property $ W.splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\", "file"))
-    ,("W.splitDrive \"/d\" == (\"\", \"/d\")", property $ W.splitDrive "/d" == ("", "/d"))
-    ,("P.splitDrive \"/test\" == (\"/\", \"test\")", property $ P.splitDrive "/test" == ("/", "test"))
-    ,("P.splitDrive \"//test\" == (\"//\", \"test\")", property $ P.splitDrive "//test" == ("//", "test"))
-    ,("P.splitDrive \"test/file\" == (\"\", \"test/file\")", property $ P.splitDrive "test/file" == ("", "test/file"))
-    ,("P.splitDrive \"file\" == (\"\", \"file\")", property $ P.splitDrive "file" == ("", "file"))
-    ,("uncurry P.joinDrive (P.splitDrive x) == x", property $ \(QFilePathValidP x) -> uncurry P.joinDrive (P.splitDrive x) == x)
-    ,("uncurry W.joinDrive (W.splitDrive x) == x", property $ \(QFilePathValidW x) -> uncurry W.joinDrive (W.splitDrive x) == x)
-    ,("W.joinDrive \"C:\" \"foo\" == \"C:foo\"", property $ W.joinDrive "C:" "foo" == "C:foo")
-    ,("W.joinDrive \"C:\\\\\" \"bar\" == \"C:\\\\bar\"", property $ W.joinDrive "C:\\" "bar" == "C:\\bar")
-    ,("W.joinDrive \"\\\\\\\\share\" \"foo\" == \"\\\\\\\\share\\\\foo\"", property $ W.joinDrive "\\\\share" "foo" == "\\\\share\\foo")
-    ,("W.joinDrive \"/:\" \"foo\" == \"/:\\\\foo\"", property $ W.joinDrive "/:" "foo" == "/:\\foo")
-    ,("P.takeDrive x == fst (P.splitDrive x)", property $ \(QFilePath x) -> P.takeDrive x == fst (P.splitDrive x))
-    ,("W.takeDrive x == fst (W.splitDrive x)", property $ \(QFilePath x) -> W.takeDrive x == fst (W.splitDrive x))
-    ,("P.dropDrive x == snd (P.splitDrive x)", property $ \(QFilePath x) -> P.dropDrive x == snd (P.splitDrive x))
-    ,("W.dropDrive x == snd (W.splitDrive x)", property $ \(QFilePath x) -> W.dropDrive x == snd (W.splitDrive x))
-    ,("not (P.hasDrive x) == null (P.takeDrive x)", property $ \(QFilePath x) -> not (P.hasDrive x) == null (P.takeDrive x))
-    ,("not (W.hasDrive x) == null (W.takeDrive x)", property $ \(QFilePath x) -> not (W.hasDrive x) == null (W.takeDrive x))
-    ,("P.hasDrive \"/foo\" == True", property $ P.hasDrive "/foo" == True)
-    ,("W.hasDrive \"C:\\\\foo\" == True", property $ W.hasDrive "C:\\foo" == True)
-    ,("W.hasDrive \"C:foo\" == True", property $ W.hasDrive "C:foo" == True)
-    ,("P.hasDrive \"foo\" == False", property $ P.hasDrive "foo" == False)
-    ,("W.hasDrive \"foo\" == False", property $ W.hasDrive "foo" == False)
-    ,("P.hasDrive \"\" == False", property $ P.hasDrive "" == False)
-    ,("W.hasDrive \"\" == False", property $ W.hasDrive "" == False)
-    ,("P.isDrive \"/\" == True", property $ P.isDrive "/" == True)
-    ,("P.isDrive \"/foo\" == False", property $ P.isDrive "/foo" == False)
-    ,("W.isDrive \"C:\\\\\" == True", property $ W.isDrive "C:\\" == True)
-    ,("W.isDrive \"C:\\\\foo\" == False", property $ W.isDrive "C:\\foo" == False)
-    ,("P.isDrive \"\" == False", property $ P.isDrive "" == False)
-    ,("W.isDrive \"\" == False", property $ W.isDrive "" == False)
-    ,("P.splitFileName \"/directory/file.ext\" == (\"/directory/\", \"file.ext\")", property $ P.splitFileName "/directory/file.ext" == ("/directory/", "file.ext"))
-    ,("W.splitFileName \"/directory/file.ext\" == (\"/directory/\", \"file.ext\")", property $ W.splitFileName "/directory/file.ext" == ("/directory/", "file.ext"))
-    ,("uncurry (P.</>) (P.splitFileName x) == x || fst (P.splitFileName x) == \"./\"", property $ \(QFilePathValidP x) -> uncurry (P.</>) (P.splitFileName x) == x || fst (P.splitFileName x) == "./")
-    ,("uncurry (W.</>) (W.splitFileName x) == x || fst (W.splitFileName x) == \"./\"", property $ \(QFilePathValidW x) -> uncurry (W.</>) (W.splitFileName x) == x || fst (W.splitFileName x) == "./")
-    ,("P.isValid (fst (P.splitFileName x))", property $ \(QFilePathValidP x) -> P.isValid (fst (P.splitFileName x)))
-    ,("W.isValid (fst (W.splitFileName x))", property $ \(QFilePathValidW x) -> W.isValid (fst (W.splitFileName x)))
-    ,("P.splitFileName \"file/bob.txt\" == (\"file/\", \"bob.txt\")", property $ P.splitFileName "file/bob.txt" == ("file/", "bob.txt"))
-    ,("W.splitFileName \"file/bob.txt\" == (\"file/\", \"bob.txt\")", property $ W.splitFileName "file/bob.txt" == ("file/", "bob.txt"))
-    ,("P.splitFileName \"file/\" == (\"file/\", \"\")", property $ P.splitFileName "file/" == ("file/", ""))
-    ,("W.splitFileName \"file/\" == (\"file/\", \"\")", property $ W.splitFileName "file/" == ("file/", ""))
-    ,("P.splitFileName \"bob\" == (\"./\", \"bob\")", property $ P.splitFileName "bob" == ("./", "bob"))
-    ,("W.splitFileName \"bob\" == (\"./\", \"bob\")", property $ W.splitFileName "bob" == ("./", "bob"))
-    ,("P.splitFileName \"/\" == (\"/\", \"\")", property $ P.splitFileName "/" == ("/", ""))
-    ,("W.splitFileName \"c:\" == (\"c:\", \"\")", property $ W.splitFileName "c:" == ("c:", ""))
-    ,("P.replaceFileName \"/directory/other.txt\" \"file.ext\" == \"/directory/file.ext\"", property $ P.replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext")
-    ,("W.replaceFileName \"/directory/other.txt\" \"file.ext\" == \"/directory/file.ext\"", property $ W.replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext")
-    ,("P.replaceFileName x (P.takeFileName x) == x", property $ \(QFilePathValidP x) -> P.replaceFileName x (P.takeFileName x) == x)
-    ,("W.replaceFileName x (W.takeFileName x) == x", property $ \(QFilePathValidW x) -> W.replaceFileName x (W.takeFileName x) == x)
-    ,("P.dropFileName \"/directory/file.ext\" == \"/directory/\"", property $ P.dropFileName "/directory/file.ext" == "/directory/")
-    ,("W.dropFileName \"/directory/file.ext\" == \"/directory/\"", property $ W.dropFileName "/directory/file.ext" == "/directory/")
-    ,("P.dropFileName x == fst (P.splitFileName x)", property $ \(QFilePath x) -> P.dropFileName x == fst (P.splitFileName x))
-    ,("W.dropFileName x == fst (W.splitFileName x)", property $ \(QFilePath x) -> W.dropFileName x == fst (W.splitFileName x))
-    ,("P.takeFileName \"/directory/file.ext\" == \"file.ext\"", property $ P.takeFileName "/directory/file.ext" == "file.ext")
-    ,("W.takeFileName \"/directory/file.ext\" == \"file.ext\"", property $ W.takeFileName "/directory/file.ext" == "file.ext")
-    ,("P.takeFileName \"test/\" == \"\"", property $ P.takeFileName "test/" == "")
-    ,("W.takeFileName \"test/\" == \"\"", property $ W.takeFileName "test/" == "")
-    ,("P.takeFileName x `isSuffixOf` x", property $ \(QFilePath x) -> P.takeFileName x `isSuffixOf` x)
-    ,("W.takeFileName x `isSuffixOf` x", property $ \(QFilePath x) -> W.takeFileName x `isSuffixOf` x)
-    ,("P.takeFileName x == snd (P.splitFileName x)", property $ \(QFilePath x) -> P.takeFileName x == snd (P.splitFileName x))
-    ,("W.takeFileName x == snd (W.splitFileName x)", property $ \(QFilePath x) -> W.takeFileName x == snd (W.splitFileName x))
-    ,("P.takeFileName (P.replaceFileName x \"fred\") == \"fred\"", property $ \(QFilePathValidP x) -> P.takeFileName (P.replaceFileName x "fred") == "fred")
-    ,("W.takeFileName (W.replaceFileName x \"fred\") == \"fred\"", property $ \(QFilePathValidW x) -> W.takeFileName (W.replaceFileName x "fred") == "fred")
-    ,("P.takeFileName (x P.</> \"fred\") == \"fred\"", property $ \(QFilePathValidP x) -> P.takeFileName (x P.</> "fred") == "fred")
-    ,("W.takeFileName (x W.</> \"fred\") == \"fred\"", property $ \(QFilePathValidW x) -> W.takeFileName (x W.</> "fred") == "fred")
-    ,("P.isRelative (P.takeFileName x)", property $ \(QFilePathValidP x) -> P.isRelative (P.takeFileName x))
-    ,("W.isRelative (W.takeFileName x)", property $ \(QFilePathValidW x) -> W.isRelative (W.takeFileName x))
-    ,("P.takeBaseName \"/directory/file.ext\" == \"file\"", property $ P.takeBaseName "/directory/file.ext" == "file")
-    ,("W.takeBaseName \"/directory/file.ext\" == \"file\"", property $ W.takeBaseName "/directory/file.ext" == "file")
-    ,("P.takeBaseName \"file/test.txt\" == \"test\"", property $ P.takeBaseName "file/test.txt" == "test")
-    ,("W.takeBaseName \"file/test.txt\" == \"test\"", property $ W.takeBaseName "file/test.txt" == "test")
-    ,("P.takeBaseName \"dave.ext\" == \"dave\"", property $ P.takeBaseName "dave.ext" == "dave")
-    ,("W.takeBaseName \"dave.ext\" == \"dave\"", property $ W.takeBaseName "dave.ext" == "dave")
-    ,("P.takeBaseName \"\" == \"\"", property $ P.takeBaseName "" == "")
-    ,("W.takeBaseName \"\" == \"\"", property $ W.takeBaseName "" == "")
-    ,("P.takeBaseName \"test\" == \"test\"", property $ P.takeBaseName "test" == "test")
-    ,("W.takeBaseName \"test\" == \"test\"", property $ W.takeBaseName "test" == "test")
-    ,("P.takeBaseName (P.addTrailingPathSeparator x) == \"\"", property $ \(QFilePath x) -> P.takeBaseName (P.addTrailingPathSeparator x) == "")
-    ,("W.takeBaseName (W.addTrailingPathSeparator x) == \"\"", property $ \(QFilePath x) -> W.takeBaseName (W.addTrailingPathSeparator x) == "")
-    ,("P.takeBaseName \"file/file.tar.gz\" == \"file.tar\"", property $ P.takeBaseName "file/file.tar.gz" == "file.tar")
-    ,("W.takeBaseName \"file/file.tar.gz\" == \"file.tar\"", property $ W.takeBaseName "file/file.tar.gz" == "file.tar")
-    ,("P.replaceBaseName \"/directory/other.ext\" \"file\" == \"/directory/file.ext\"", property $ P.replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext")
-    ,("W.replaceBaseName \"/directory/other.ext\" \"file\" == \"/directory/file.ext\"", property $ W.replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext")
-    ,("P.replaceBaseName \"file/test.txt\" \"bob\" == \"file/bob.txt\"", property $ P.replaceBaseName "file/test.txt" "bob" == "file/bob.txt")
-    ,("W.replaceBaseName \"file/test.txt\" \"bob\" == \"file/bob.txt\"", property $ W.replaceBaseName "file/test.txt" "bob" == "file/bob.txt")
-    ,("P.replaceBaseName \"fred\" \"bill\" == \"bill\"", property $ P.replaceBaseName "fred" "bill" == "bill")
-    ,("W.replaceBaseName \"fred\" \"bill\" == \"bill\"", property $ W.replaceBaseName "fred" "bill" == "bill")
-    ,("P.replaceBaseName \"/dave/fred/bob.gz.tar\" \"new\" == \"/dave/fred/new.tar\"", property $ P.replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar")
-    ,("W.replaceBaseName \"/dave/fred/bob.gz.tar\" \"new\" == \"/dave/fred/new.tar\"", property $ W.replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar")
-    ,("P.replaceBaseName x (P.takeBaseName x) == x", property $ \(QFilePathValidP x) -> P.replaceBaseName x (P.takeBaseName x) == x)
-    ,("W.replaceBaseName x (W.takeBaseName x) == x", property $ \(QFilePathValidW x) -> W.replaceBaseName x (W.takeBaseName x) == x)
-    ,("P.hasTrailingPathSeparator \"test\" == False", property $ P.hasTrailingPathSeparator "test" == False)
-    ,("W.hasTrailingPathSeparator \"test\" == False", property $ W.hasTrailingPathSeparator "test" == False)
-    ,("P.hasTrailingPathSeparator \"test/\" == True", property $ P.hasTrailingPathSeparator "test/" == True)
-    ,("W.hasTrailingPathSeparator \"test/\" == True", property $ W.hasTrailingPathSeparator "test/" == True)
-    ,("P.hasTrailingPathSeparator (P.addTrailingPathSeparator x)", property $ \(QFilePath x) -> P.hasTrailingPathSeparator (P.addTrailingPathSeparator x))
-    ,("W.hasTrailingPathSeparator (W.addTrailingPathSeparator x)", property $ \(QFilePath x) -> W.hasTrailingPathSeparator (W.addTrailingPathSeparator x))
-    ,("P.hasTrailingPathSeparator x ==> P.addTrailingPathSeparator x == x", property $ \(QFilePath x) -> P.hasTrailingPathSeparator x ==> P.addTrailingPathSeparator x == x)
-    ,("W.hasTrailingPathSeparator x ==> W.addTrailingPathSeparator x == x", property $ \(QFilePath x) -> W.hasTrailingPathSeparator x ==> W.addTrailingPathSeparator x == x)
-    ,("P.addTrailingPathSeparator \"test/rest\" == \"test/rest/\"", property $ P.addTrailingPathSeparator "test/rest" == "test/rest/")
-    ,("P.dropTrailingPathSeparator \"file/test/\" == \"file/test\"", property $ P.dropTrailingPathSeparator "file/test/" == "file/test")
-    ,("W.dropTrailingPathSeparator \"file/test/\" == \"file/test\"", property $ W.dropTrailingPathSeparator "file/test/" == "file/test")
-    ,("P.dropTrailingPathSeparator \"/\" == \"/\"", property $ P.dropTrailingPathSeparator "/" == "/")
-    ,("W.dropTrailingPathSeparator \"/\" == \"/\"", property $ W.dropTrailingPathSeparator "/" == "/")
-    ,("W.dropTrailingPathSeparator \"\\\\\" == \"\\\\\"", property $ W.dropTrailingPathSeparator "\\" == "\\")
-    ,("not (P.hasTrailingPathSeparator (P.dropTrailingPathSeparator x)) || P.isDrive x", property $ \(QFilePath x) -> not (P.hasTrailingPathSeparator (P.dropTrailingPathSeparator x)) || P.isDrive x)
-    ,("P.takeDirectory \"/directory/other.ext\" == \"/directory\"", property $ P.takeDirectory "/directory/other.ext" == "/directory")
-    ,("W.takeDirectory \"/directory/other.ext\" == \"/directory\"", property $ W.takeDirectory "/directory/other.ext" == "/directory")
-    ,("P.takeDirectory x `isPrefixOf` x || P.takeDirectory x == \".\"", property $ \(QFilePath x) -> P.takeDirectory x `isPrefixOf` x || P.takeDirectory x == ".")
-    ,("W.takeDirectory x `isPrefixOf` x || W.takeDirectory x == \".\"", property $ \(QFilePath x) -> W.takeDirectory x `isPrefixOf` x || W.takeDirectory x == ".")
-    ,("P.takeDirectory \"foo\" == \".\"", property $ P.takeDirectory "foo" == ".")
-    ,("W.takeDirectory \"foo\" == \".\"", property $ W.takeDirectory "foo" == ".")
-    ,("P.takeDirectory \"/\" == \"/\"", property $ P.takeDirectory "/" == "/")
-    ,("W.takeDirectory \"/\" == \"/\"", property $ W.takeDirectory "/" == "/")
-    ,("P.takeDirectory \"/foo\" == \"/\"", property $ P.takeDirectory "/foo" == "/")
-    ,("W.takeDirectory \"/foo\" == \"/\"", property $ W.takeDirectory "/foo" == "/")
-    ,("P.takeDirectory \"/foo/bar/baz\" == \"/foo/bar\"", property $ P.takeDirectory "/foo/bar/baz" == "/foo/bar")
-    ,("W.takeDirectory \"/foo/bar/baz\" == \"/foo/bar\"", property $ W.takeDirectory "/foo/bar/baz" == "/foo/bar")
-    ,("P.takeDirectory \"/foo/bar/baz/\" == \"/foo/bar/baz\"", property $ P.takeDirectory "/foo/bar/baz/" == "/foo/bar/baz")
-    ,("W.takeDirectory \"/foo/bar/baz/\" == \"/foo/bar/baz\"", property $ W.takeDirectory "/foo/bar/baz/" == "/foo/bar/baz")
-    ,("P.takeDirectory \"foo/bar/baz\" == \"foo/bar\"", property $ P.takeDirectory "foo/bar/baz" == "foo/bar")
-    ,("W.takeDirectory \"foo/bar/baz\" == \"foo/bar\"", property $ W.takeDirectory "foo/bar/baz" == "foo/bar")
-    ,("W.takeDirectory \"foo\\\\bar\" == \"foo\"", property $ W.takeDirectory "foo\\bar" == "foo")
-    ,("W.takeDirectory \"foo\\\\bar\\\\\\\\\" == \"foo\\\\bar\"", property $ W.takeDirectory "foo\\bar\\\\" == "foo\\bar")
-    ,("W.takeDirectory \"C:\\\\\" == \"C:\\\\\"", property $ W.takeDirectory "C:\\" == "C:\\")
-    ,("P.replaceDirectory \"root/file.ext\" \"/directory/\" == \"/directory/file.ext\"", property $ P.replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext")
-    ,("W.replaceDirectory \"root/file.ext\" \"/directory/\" == \"/directory/file.ext\"", property $ W.replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext")
-    ,("P.replaceDirectory x (P.takeDirectory x) `P.equalFilePath` x", property $ \(QFilePathValidP x) -> P.replaceDirectory x (P.takeDirectory x) `P.equalFilePath` x)
-    ,("W.replaceDirectory x (W.takeDirectory x) `W.equalFilePath` x", property $ \(QFilePathValidW x) -> W.replaceDirectory x (W.takeDirectory x) `W.equalFilePath` x)
-    ,("\"/directory\" P.</> \"file.ext\" == \"/directory/file.ext\"", property $ "/directory" P.</> "file.ext" == "/directory/file.ext")
-    ,("\"/directory\" W.</> \"file.ext\" == \"/directory\\\\file.ext\"", property $ "/directory" W.</> "file.ext" == "/directory\\file.ext")
-    ,("\"directory\" P.</> \"/file.ext\" == \"/file.ext\"", property $ "directory" P.</> "/file.ext" == "/file.ext")
-    ,("\"directory\" W.</> \"/file.ext\" == \"/file.ext\"", property $ "directory" W.</> "/file.ext" == "/file.ext")
-    ,("(P.takeDirectory x P.</> P.takeFileName x) `P.equalFilePath` x", property $ \(QFilePathValidP x) -> (P.takeDirectory x P.</> P.takeFileName x) `P.equalFilePath` x)
-    ,("(W.takeDirectory x W.</> W.takeFileName x) `W.equalFilePath` x", property $ \(QFilePathValidW x) -> (W.takeDirectory x W.</> W.takeFileName x) `W.equalFilePath` x)
-    ,("\"/\" P.</> \"test\" == \"/test\"", property $ "/" P.</> "test" == "/test")
-    ,("\"home\" P.</> \"bob\" == \"home/bob\"", property $ "home" P.</> "bob" == "home/bob")
-    ,("\"x:\" P.</> \"foo\" == \"x:/foo\"", property $ "x:" P.</> "foo" == "x:/foo")
-    ,("\"C:\\\\foo\" W.</> \"bar\" == \"C:\\\\foo\\\\bar\"", property $ "C:\\foo" W.</> "bar" == "C:\\foo\\bar")
-    ,("\"home\" W.</> \"bob\" == \"home\\\\bob\"", property $ "home" W.</> "bob" == "home\\bob")
-    ,("\"home\" P.</> \"/bob\" == \"/bob\"", property $ "home" P.</> "/bob" == "/bob")
-    ,("\"home\" W.</> \"C:\\\\bob\" == \"C:\\\\bob\"", property $ "home" W.</> "C:\\bob" == "C:\\bob")
-    ,("\"home\" W.</> \"/bob\" == \"/bob\"", property $ "home" W.</> "/bob" == "/bob")
-    ,("\"home\" W.</> \"\\\\bob\" == \"\\\\bob\"", property $ "home" W.</> "\\bob" == "\\bob")
-    ,("\"C:\\\\home\" W.</> \"\\\\bob\" == \"\\\\bob\"", property $ "C:\\home" W.</> "\\bob" == "\\bob")
-    ,("\"D:\\\\foo\" W.</> \"C:bar\" == \"C:bar\"", property $ "D:\\foo" W.</> "C:bar" == "C:bar")
-    ,("\"C:\\\\foo\" W.</> \"C:bar\" == \"C:bar\"", property $ "C:\\foo" W.</> "C:bar" == "C:bar")
-    ,("P.splitPath \"/directory/file.ext\" == [\"/\", \"directory/\", \"file.ext\"]", property $ P.splitPath "/directory/file.ext" == ["/", "directory/", "file.ext"])
-    ,("W.splitPath \"/directory/file.ext\" == [\"/\", \"directory/\", \"file.ext\"]", property $ W.splitPath "/directory/file.ext" == ["/", "directory/", "file.ext"])
-    ,("concat (P.splitPath x) == x", property $ \(QFilePath x) -> concat (P.splitPath x) == x)
-    ,("concat (W.splitPath x) == x", property $ \(QFilePath x) -> concat (W.splitPath x) == x)
-    ,("P.splitPath \"test//item/\" == [\"test//\", \"item/\"]", property $ P.splitPath "test//item/" == ["test//", "item/"])
-    ,("W.splitPath \"test//item/\" == [\"test//\", \"item/\"]", property $ W.splitPath "test//item/" == ["test//", "item/"])
-    ,("P.splitPath \"test/item/file\" == [\"test/\", \"item/\", \"file\"]", property $ P.splitPath "test/item/file" == ["test/", "item/", "file"])
-    ,("W.splitPath \"test/item/file\" == [\"test/\", \"item/\", \"file\"]", property $ W.splitPath "test/item/file" == ["test/", "item/", "file"])
-    ,("P.splitPath \"\" == []", property $ P.splitPath "" == [])
-    ,("W.splitPath \"\" == []", property $ W.splitPath "" == [])
-    ,("W.splitPath \"c:\\\\test\\\\path\" == [\"c:\\\\\", \"test\\\\\", \"path\"]", property $ W.splitPath "c:\\test\\path" == ["c:\\", "test\\", "path"])
-    ,("P.splitPath \"/file/test\" == [\"/\", \"file/\", \"test\"]", property $ P.splitPath "/file/test" == ["/", "file/", "test"])
-    ,("P.splitDirectories \"/directory/file.ext\" == [\"/\", \"directory\", \"file.ext\"]", property $ P.splitDirectories "/directory/file.ext" == ["/", "directory", "file.ext"])
-    ,("W.splitDirectories \"/directory/file.ext\" == [\"/\", \"directory\", \"file.ext\"]", property $ W.splitDirectories "/directory/file.ext" == ["/", "directory", "file.ext"])
-    ,("P.splitDirectories \"test/file\" == [\"test\", \"file\"]", property $ P.splitDirectories "test/file" == ["test", "file"])
-    ,("W.splitDirectories \"test/file\" == [\"test\", \"file\"]", property $ W.splitDirectories "test/file" == ["test", "file"])
-    ,("P.splitDirectories \"/test/file\" == [\"/\", \"test\", \"file\"]", property $ P.splitDirectories "/test/file" == ["/", "test", "file"])
-    ,("W.splitDirectories \"/test/file\" == [\"/\", \"test\", \"file\"]", property $ W.splitDirectories "/test/file" == ["/", "test", "file"])
-    ,("W.splitDirectories \"C:\\\\test\\\\file\" == [\"C:\\\\\", \"test\", \"file\"]", property $ W.splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"])
-    ,("P.joinPath (P.splitDirectories x) `P.equalFilePath` x", property $ \(QFilePathValidP x) -> P.joinPath (P.splitDirectories x) `P.equalFilePath` x)
-    ,("W.joinPath (W.splitDirectories x) `W.equalFilePath` x", property $ \(QFilePathValidW x) -> W.joinPath (W.splitDirectories x) `W.equalFilePath` x)
-    ,("P.splitDirectories \"\" == []", property $ P.splitDirectories "" == [])
-    ,("W.splitDirectories \"\" == []", property $ W.splitDirectories "" == [])
-    ,("W.splitDirectories \"C:\\\\test\\\\\\\\\\\\file\" == [\"C:\\\\\", \"test\", \"file\"]", property $ W.splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"])
-    ,("P.splitDirectories \"/test///file\" == [\"/\", \"test\", \"file\"]", property $ P.splitDirectories "/test///file" == ["/", "test", "file"])
-    ,("W.splitDirectories \"/test///file\" == [\"/\", \"test\", \"file\"]", property $ W.splitDirectories "/test///file" == ["/", "test", "file"])
-    ,("P.joinPath a == foldr (P.</>) \"\" a", property $ \a -> P.joinPath a == foldr (P.</>) "" a)
-    ,("W.joinPath a == foldr (W.</>) \"\" a", property $ \a -> W.joinPath a == foldr (W.</>) "" a)
-    ,("P.joinPath [\"/\", \"directory/\", \"file.ext\"] == \"/directory/file.ext\"", property $ P.joinPath ["/", "directory/", "file.ext"] == "/directory/file.ext")
-    ,("W.joinPath [\"/\", \"directory/\", \"file.ext\"] == \"/directory/file.ext\"", property $ W.joinPath ["/", "directory/", "file.ext"] == "/directory/file.ext")
-    ,("P.joinPath (P.splitPath x) == x", property $ \(QFilePathValidP x) -> P.joinPath (P.splitPath x) == x)
-    ,("W.joinPath (W.splitPath x) == x", property $ \(QFilePathValidW x) -> W.joinPath (W.splitPath x) == x)
-    ,("P.joinPath [] == \"\"", property $ P.joinPath [] == "")
-    ,("W.joinPath [] == \"\"", property $ W.joinPath [] == "")
-    ,("P.joinPath [\"test\", \"file\", \"path\"] == \"test/file/path\"", property $ P.joinPath ["test", "file", "path"] == "test/file/path")
-    ,("x == y ==> P.equalFilePath x y", property $ \(QFilePath x) (QFilePath y) -> x == y ==> P.equalFilePath x y)
-    ,("x == y ==> W.equalFilePath x y", property $ \(QFilePath x) (QFilePath y) -> x == y ==> W.equalFilePath x y)
-    ,("P.normalise x == P.normalise y ==> P.equalFilePath x y", property $ \(QFilePath x) (QFilePath y) -> P.normalise x == P.normalise y ==> P.equalFilePath x y)
-    ,("W.normalise x == W.normalise y ==> W.equalFilePath x y", property $ \(QFilePath x) (QFilePath y) -> W.normalise x == W.normalise y ==> W.equalFilePath x y)
-    ,("P.equalFilePath \"foo\" \"foo/\"", property $ P.equalFilePath "foo" "foo/")
-    ,("W.equalFilePath \"foo\" \"foo/\"", property $ W.equalFilePath "foo" "foo/")
-    ,("not (P.equalFilePath \"/a/../c\" \"/c\")", property $ not (P.equalFilePath "/a/../c" "/c"))
-    ,("not (W.equalFilePath \"/a/../c\" \"/c\")", property $ not (W.equalFilePath "/a/../c" "/c"))
-    ,("not (P.equalFilePath \"foo\" \"/foo\")", property $ not (P.equalFilePath "foo" "/foo"))
-    ,("not (W.equalFilePath \"foo\" \"/foo\")", property $ not (W.equalFilePath "foo" "/foo"))
-    ,("not (P.equalFilePath \"foo\" \"FOO\")", property $ not (P.equalFilePath "foo" "FOO"))
-    ,("W.equalFilePath \"foo\" \"FOO\"", property $ W.equalFilePath "foo" "FOO")
-    ,("not (W.equalFilePath \"C:\" \"C:/\")", property $ not (W.equalFilePath "C:" "C:/"))
-    ,("P.makeRelative \"/directory\" \"/directory/file.ext\" == \"file.ext\"", property $ P.makeRelative "/directory" "/directory/file.ext" == "file.ext")
-    ,("W.makeRelative \"/directory\" \"/directory/file.ext\" == \"file.ext\"", property $ W.makeRelative "/directory" "/directory/file.ext" == "file.ext")
-    ,("P.makeRelative (P.takeDirectory x) x `P.equalFilePath` P.takeFileName x", property $ \(QFilePathValidP x) -> P.makeRelative (P.takeDirectory x) x `P.equalFilePath` P.takeFileName x)
-    ,("W.makeRelative (W.takeDirectory x) x `W.equalFilePath` W.takeFileName x", property $ \(QFilePathValidW x) -> W.makeRelative (W.takeDirectory x) x `W.equalFilePath` W.takeFileName x)
-    ,("P.makeRelative x x == \".\"", property $ \(QFilePath x) -> P.makeRelative x x == ".")
-    ,("W.makeRelative x x == \".\"", property $ \(QFilePath x) -> W.makeRelative x x == ".")
-    ,("P.equalFilePath x y || (P.isRelative x && P.makeRelative y x == x) || P.equalFilePath (y P.</> P.makeRelative y x) x", property $ \(QFilePathValidP x) (QFilePathValidP y) -> P.equalFilePath x y || (P.isRelative x && P.makeRelative y x == x) || P.equalFilePath (y P.</> P.makeRelative y x) x)
-    ,("W.equalFilePath x y || (W.isRelative x && W.makeRelative y x == x) || W.equalFilePath (y W.</> W.makeRelative y x) x", property $ \(QFilePathValidW x) (QFilePathValidW y) -> W.equalFilePath x y || (W.isRelative x && W.makeRelative y x == x) || W.equalFilePath (y W.</> W.makeRelative y x) x)
-    ,("W.makeRelative \"C:\\\\Home\" \"c:\\\\home\\\\bob\" == \"bob\"", property $ W.makeRelative "C:\\Home" "c:\\home\\bob" == "bob")
-    ,("W.makeRelative \"C:\\\\Home\" \"c:/home/bob\" == \"bob\"", property $ W.makeRelative "C:\\Home" "c:/home/bob" == "bob")
-    ,("W.makeRelative \"C:\\\\Home\" \"D:\\\\Home\\\\Bob\" == \"D:\\\\Home\\\\Bob\"", property $ W.makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob")
-    ,("W.makeRelative \"C:\\\\Home\" \"C:Home\\\\Bob\" == \"C:Home\\\\Bob\"", property $ W.makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob")
-    ,("W.makeRelative \"/Home\" \"/home/bob\" == \"bob\"", property $ W.makeRelative "/Home" "/home/bob" == "bob")
-    ,("W.makeRelative \"/\" \"//\" == \"//\"", property $ W.makeRelative "/" "//" == "//")
-    ,("P.makeRelative \"/Home\" \"/home/bob\" == \"/home/bob\"", property $ P.makeRelative "/Home" "/home/bob" == "/home/bob")
-    ,("P.makeRelative \"/home/\" \"/home/bob/foo/bar\" == \"bob/foo/bar\"", property $ P.makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar")
-    ,("P.makeRelative \"/fred\" \"bob\" == \"bob\"", property $ P.makeRelative "/fred" "bob" == "bob")
-    ,("P.makeRelative \"/file/test\" \"/file/test/fred\" == \"fred\"", property $ P.makeRelative "/file/test" "/file/test/fred" == "fred")
-    ,("P.makeRelative \"/file/test\" \"/file/test/fred/\" == \"fred/\"", property $ P.makeRelative "/file/test" "/file/test/fred/" == "fred/")
-    ,("P.makeRelative \"some/path\" \"some/path/a/b/c\" == \"a/b/c\"", property $ P.makeRelative "some/path" "some/path/a/b/c" == "a/b/c")
-    ,("P.normalise \"/file/\\\\test////\" == \"/file/\\\\test/\"", property $ P.normalise "/file/\\test////" == "/file/\\test/")
-    ,("P.normalise \"/file/./test\" == \"/file/test\"", property $ P.normalise "/file/./test" == "/file/test")
-    ,("P.normalise \"/test/file/../bob/fred/\" == \"/test/file/../bob/fred/\"", property $ P.normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/")
-    ,("P.normalise \"../bob/fred/\" == \"../bob/fred/\"", property $ P.normalise "../bob/fred/" == "../bob/fred/")
-    ,("P.normalise \"/a/../c\" == \"/a/../c\"", property $ P.normalise "/a/../c" == "/a/../c")
-    ,("P.normalise \"./bob/fred/\" == \"bob/fred/\"", property $ P.normalise "./bob/fred/" == "bob/fred/")
-    ,("W.normalise \"c:\\\\file/bob\\\\\" == \"C:\\\\file\\\\bob\\\\\"", property $ W.normalise "c:\\file/bob\\" == "C:\\file\\bob\\")
-    ,("W.normalise \"c:\\\\\" == \"C:\\\\\"", property $ W.normalise "c:\\" == "C:\\")
-    ,("W.normalise \"C:.\\\\\" == \"C:\"", property $ W.normalise "C:.\\" == "C:")
-    ,("W.normalise \"\\\\\\\\server\\\\test\" == \"\\\\\\\\server\\\\test\"", property $ W.normalise "\\\\server\\test" == "\\\\server\\test")
-    ,("W.normalise \"//server/test\" == \"\\\\\\\\server\\\\test\"", property $ W.normalise "//server/test" == "\\\\server\\test")
-    ,("W.normalise \"c:/file\" == \"C:\\\\file\"", property $ W.normalise "c:/file" == "C:\\file")
-    ,("W.normalise \"/file\" == \"\\\\file\"", property $ W.normalise "/file" == "\\file")
-    ,("W.normalise \"\\\\\" == \"\\\\\"", property $ W.normalise "\\" == "\\")
-    ,("W.normalise \"/./\" == \"\\\\\"", property $ W.normalise "/./" == "\\")
-    ,("P.normalise \".\" == \".\"", property $ P.normalise "." == ".")
-    ,("W.normalise \".\" == \".\"", property $ W.normalise "." == ".")
-    ,("P.normalise \"./\" == \"./\"", property $ P.normalise "./" == "./")
-    ,("P.normalise \"./.\" == \"./\"", property $ P.normalise "./." == "./")
-    ,("P.normalise \"/./\" == \"/\"", property $ P.normalise "/./" == "/")
-    ,("P.normalise \"/\" == \"/\"", property $ P.normalise "/" == "/")
-    ,("P.normalise \"bob/fred/.\" == \"bob/fred/\"", property $ P.normalise "bob/fred/." == "bob/fred/")
-    ,("P.normalise \"//home\" == \"/home\"", property $ P.normalise "//home" == "/home")
-    ,("P.isValid \"\" == False", property $ P.isValid "" == False)
-    ,("W.isValid \"\" == False", property $ W.isValid "" == False)
-    ,("P.isValid \"\\0\" == False", property $ P.isValid "\0" == False)
-    ,("W.isValid \"\\0\" == False", property $ W.isValid "\0" == False)
-    ,("P.isValid \"/random_ path:*\" == True", property $ P.isValid "/random_ path:*" == True)
-    ,("P.isValid x == not (null x)", property $ \(QFilePath x) -> P.isValid x == not (null x))
-    ,("W.isValid \"c:\\\\test\" == True", property $ W.isValid "c:\\test" == True)
-    ,("W.isValid \"c:\\\\test:of_test\" == False", property $ W.isValid "c:\\test:of_test" == False)
-    ,("W.isValid \"test*\" == False", property $ W.isValid "test*" == False)
-    ,("W.isValid \"c:\\\\test\\\\nul\" == False", property $ W.isValid "c:\\test\\nul" == False)
-    ,("W.isValid \"c:\\\\test\\\\prn.txt\" == False", property $ W.isValid "c:\\test\\prn.txt" == False)
-    ,("W.isValid \"c:\\\\nul\\\\file\" == False", property $ W.isValid "c:\\nul\\file" == False)
-    ,("W.isValid \"\\\\\\\\\" == False", property $ W.isValid "\\\\" == False)
-    ,("W.isValid \"\\\\\\\\\\\\foo\" == False", property $ W.isValid "\\\\\\foo" == False)
-    ,("W.isValid \"\\\\\\\\?\\\\D:file\" == False", property $ W.isValid "\\\\?\\D:file" == False)
-    ,("W.isValid \"foo\\tbar\" == False", property $ W.isValid "foo\tbar" == False)
-    ,("W.isValid \"nul .txt\" == False", property $ W.isValid "nul .txt" == False)
-    ,("W.isValid \" nul.txt\" == True", property $ W.isValid " nul.txt" == True)
-    ,("P.isValid (P.makeValid x)", property $ \(QFilePath x) -> P.isValid (P.makeValid x))
-    ,("W.isValid (W.makeValid x)", property $ \(QFilePath x) -> W.isValid (W.makeValid x))
-    ,("P.isValid x ==> P.makeValid x == x", property $ \(QFilePath x) -> P.isValid x ==> P.makeValid x == x)
-    ,("W.isValid x ==> W.makeValid x == x", property $ \(QFilePath x) -> W.isValid x ==> W.makeValid x == x)
-    ,("P.makeValid \"\" == \"_\"", property $ P.makeValid "" == "_")
-    ,("W.makeValid \"\" == \"_\"", property $ W.makeValid "" == "_")
-    ,("P.makeValid \"file\\0name\" == \"file_name\"", property $ P.makeValid "file\0name" == "file_name")
-    ,("W.makeValid \"file\\0name\" == \"file_name\"", property $ W.makeValid "file\0name" == "file_name")
-    ,("W.makeValid \"c:\\\\already\\\\/valid\" == \"c:\\\\already\\\\/valid\"", property $ W.makeValid "c:\\already\\/valid" == "c:\\already\\/valid")
-    ,("W.makeValid \"c:\\\\test:of_test\" == \"c:\\\\test_of_test\"", property $ W.makeValid "c:\\test:of_test" == "c:\\test_of_test")
-    ,("W.makeValid \"test*\" == \"test_\"", property $ W.makeValid "test*" == "test_")
-    ,("W.makeValid \"c:\\\\test\\\\nul\" == \"c:\\\\test\\\\nul_\"", property $ W.makeValid "c:\\test\\nul" == "c:\\test\\nul_")
-    ,("W.makeValid \"c:\\\\test\\\\prn.txt\" == \"c:\\\\test\\\\prn_.txt\"", property $ W.makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt")
-    ,("W.makeValid \"c:\\\\test/prn.txt\" == \"c:\\\\test/prn_.txt\"", property $ W.makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt")
-    ,("W.makeValid \"c:\\\\nul\\\\file\" == \"c:\\\\nul_\\\\file\"", property $ W.makeValid "c:\\nul\\file" == "c:\\nul_\\file")
-    ,("W.makeValid \"\\\\\\\\\\\\foo\" == \"\\\\\\\\drive\"", property $ W.makeValid "\\\\\\foo" == "\\\\drive")
-    ,("W.makeValid \"\\\\\\\\?\\\\D:file\" == \"\\\\\\\\?\\\\D:\\\\file\"", property $ W.makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file")
-    ,("W.makeValid \"nul .txt\" == \"nul _.txt\"", property $ W.makeValid "nul .txt" == "nul _.txt")
-    ,("W.isRelative \"path\\\\test\" == True", property $ W.isRelative "path\\test" == True)
-    ,("W.isRelative \"c:\\\\test\" == False", property $ W.isRelative "c:\\test" == False)
-    ,("W.isRelative \"c:test\" == True", property $ W.isRelative "c:test" == True)
-    ,("W.isRelative \"c:\\\\\" == False", property $ W.isRelative "c:\\" == False)
-    ,("W.isRelative \"c:/\" == False", property $ W.isRelative "c:/" == False)
-    ,("W.isRelative \"c:\" == True", property $ W.isRelative "c:" == True)
-    ,("W.isRelative \"\\\\\\\\foo\" == False", property $ W.isRelative "\\\\foo" == False)
-    ,("W.isRelative \"\\\\\\\\?\\\\foo\" == False", property $ W.isRelative "\\\\?\\foo" == False)
-    ,("W.isRelative \"\\\\\\\\?\\\\UNC\\\\foo\" == False", property $ W.isRelative "\\\\?\\UNC\\foo" == False)
-    ,("W.isRelative \"/foo\" == True", property $ W.isRelative "/foo" == True)
-    ,("W.isRelative \"\\\\foo\" == True", property $ W.isRelative "\\foo" == True)
-    ,("P.isRelative \"test/path\" == True", property $ P.isRelative "test/path" == True)
-    ,("P.isRelative \"/test\" == False", property $ P.isRelative "/test" == False)
-    ,("P.isRelative \"/\" == False", property $ P.isRelative "/" == False)
-    ,("P.isAbsolute x == not (P.isRelative x)", property $ \(QFilePath x) -> P.isAbsolute x == not (P.isRelative x))
-    ,("W.isAbsolute x == not (W.isRelative x)", property $ \(QFilePath x) -> W.isAbsolute x == not (W.isRelative x))
-    ]
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs
deleted file mode 100644
index b237acd99e..0000000000
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs
+++ /dev/null
@@ -1,52 +0,0 @@
-
-module TestUtil(
-    (==>), QFilePath(..), QFilePathValidW(..), QFilePathValidP(..),
-    module Test.QuickCheck,
-    module Data.List,
-    module Data.Maybe
-    ) where
-
-import Test.QuickCheck hiding ((==>))
-import Data.List
-import Data.Maybe
-import Control.Monad
-import qualified System.FilePath.Windows as W
-import qualified System.FilePath.Posix as P
-
-infixr 0 ==>
-a ==> b = not a || b
-
-
-newtype QFilePathValidW = QFilePathValidW FilePath deriving Show
-
-instance Arbitrary QFilePathValidW where
-    arbitrary = fmap (QFilePathValidW . W.makeValid) arbitraryFilePath
-    shrink (QFilePathValidW x) = shrinkValid QFilePathValidW W.makeValid x
-
-newtype QFilePathValidP = QFilePathValidP FilePath deriving Show
-
-instance Arbitrary QFilePathValidP where
-    arbitrary = fmap (QFilePathValidP . P.makeValid) arbitraryFilePath
-    shrink (QFilePathValidP x) = shrinkValid QFilePathValidP P.makeValid x
-
-newtype QFilePath = QFilePath FilePath deriving Show
-
-instance Arbitrary QFilePath where
-    arbitrary = fmap QFilePath arbitraryFilePath
-    shrink (QFilePath x) = shrinkValid QFilePath id x
-
-
--- | Generate an arbitrary FilePath use a few special (interesting) characters.
-arbitraryFilePath :: Gen FilePath
-arbitraryFilePath = sized $ \n -> do
-    k <- choose (0,n)
-    replicateM k $ elements "?./:\\a ;_"
-
--- | Shrink, but also apply a validity function. Try and make shorter, or use more
---   @a@ (since @a@ is pretty dull), but make sure you terminate even after valid.
-shrinkValid :: (FilePath -> a) -> (FilePath -> FilePath) -> FilePath -> [a]
-shrinkValid wrap valid o =
-    [ wrap y
-    | y <- map valid $ shrinkList (\x -> ['a' | x /= 'a']) o
-    , length y < length o || (length y == length o && countA y > countA o)]
-    where countA = length . filter (== 'a')
diff --git a/test/integration/tests/mutable-deps/files/files.cabal b/test/integration/tests/mutable-deps/files/files.cabal
deleted file mode 100644
index cdd7a98a9a..0000000000
--- a/test/integration/tests/mutable-deps/files/files.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
-name: files
-version: 1.0.0
-build-type: Simple
-cabal-version: >= 1.10
-
-library
-  hs-source-dirs: src
-  exposed-modules:  Files
-  build-depends:    base
-                  , filemanip
-  default-language: Haskell2010
-
-executable test-exe
-  hs-source-dirs: app
-  main-is: Main.hs
-  build-depends: base, files
-  default-language: Haskell2010
\ No newline at end of file
diff --git a/test/integration/tests/mutable-deps/files/src/Files.hs b/test/integration/tests/mutable-deps/files/src/Files.hs
deleted file mode 100644
index 5e3452f0b5..0000000000
--- a/test/integration/tests/mutable-deps/files/src/Files.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Files where
-
-import System.FilePath.Glob
-
-allCFiles :: IO [FilePath]
-allCFiles = namesMatching "*.c"
diff --git a/test/integration/tests/mutable-deps/files/stack.yaml b/test/integration/tests/mutable-deps/files/stack.yaml
deleted file mode 100644
index 8ae8c684de..0000000000
--- a/test/integration/tests/mutable-deps/files/stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- .
-extra-deps:
-- ./filepath-1.4.2.2
-- directory-1.3.6.2
diff --git a/test/integration/tests/nice-resolver-names/Main.hs b/test/integration/tests/nice-resolver-names/Main.hs
deleted file mode 100644
index 737909f755..0000000000
--- a/test/integration/tests/nice-resolver-names/Main.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-import StackTest
-import Control.Exception (throwIO)
-import Data.Maybe (mapMaybe)
-import Data.Foldable (for_)
-import Data.List (stripPrefix)
-
-main :: IO ()
-main = do
-  for_ ["nightly-2022-09-05", "nightly-2018-01-01"] $ \snapshot -> do
-    stack ["init", "--force", "--resolver", snapshot]
-    str <- readFile "stack.yaml"
-    case mapMaybe (stripPrefix "resolver: ") $ lines str of
-      [x] ->
-        if filter (/= '\r') x == snapshot
-          then pure ()
-          else error $ "Mismatch: " ++ show (snapshot, x)
-      _ -> error $ "Wrong number of resolvers: " ++ show str
diff --git a/test/integration/tests/nice-resolver-names/files/.gitignore b/test/integration/tests/nice-resolver-names/files/.gitignore
deleted file mode 100644
index 66f418505d..0000000000
--- a/test/integration/tests/nice-resolver-names/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-stack.yaml
-unimportant.cabal
diff --git a/test/integration/tests/nice-resolver-names/files/package.yaml b/test/integration/tests/nice-resolver-names/files/package.yaml
deleted file mode 100644
index 4b60802c43..0000000000
--- a/test/integration/tests/nice-resolver-names/files/package.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-name: unimportant
-version: 0
-library: {}
diff --git a/test/integration/tests/no-rerun-tests/Main.hs b/test/integration/tests/no-rerun-tests/Main.hs
deleted file mode 100644
index 39d125ad1a..0000000000
--- a/test/integration/tests/no-rerun-tests/Main.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-import StackTest
-import System.Directory
-import Control.Monad
-
-main :: IO ()
-main = do
-  stack ["test"]
-  exists1 <- doesFileExist "foo"
-  unless exists1 $ error "exists1 should be True"
-  removeFile "foo"
-  stack ["test", "--no-rerun-tests"]
-  exists2 <- doesFileExist "foo"
-  when exists2 $ error "exists2 should be False"
diff --git a/test/integration/tests/no-rerun-tests/files/.gitignore b/test/integration/tests/no-rerun-tests/files/.gitignore
deleted file mode 100644
index 04c6af385a..0000000000
--- a/test/integration/tests/no-rerun-tests/files/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.stack-work/
-files.cabal
-*~
-foo
diff --git a/test/integration/tests/no-rerun-tests/files/package.yaml b/test/integration/tests/no-rerun-tests/files/package.yaml
deleted file mode 100644
index dcebf6d755..0000000000
--- a/test/integration/tests/no-rerun-tests/files/package.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: files
-
-dependencies:
-- base >= 4.7 && < 5
-
-library:
-  source-dirs: src
-
-tests:
-  test:
-    main: Spec.hs
-    source-dirs: test
diff --git a/test/integration/tests/no-rerun-tests/files/stack.yaml b/test/integration/tests/no-rerun-tests/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/no-rerun-tests/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/no-rerun-tests/files/test/Spec.hs b/test/integration/tests/no-rerun-tests/files/test/Spec.hs
deleted file mode 100644
index d030d26e0c..0000000000
--- a/test/integration/tests/no-rerun-tests/files/test/Spec.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-main :: IO ()
-main = writeFile "foo" ""
diff --git a/test/integration/tests/override-compiler/Main.hs b/test/integration/tests/override-compiler/Main.hs
deleted file mode 100644
index 9fb6485ecf..0000000000
--- a/test/integration/tests/override-compiler/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import StackTest
-import Control.Monad (unless)
-
-main :: IO ()
-main = stackCheckStdout ["exec", "--", "ghc", "--numeric-version"] $ \ver ->
-  -- get rid of the newline character
-  unless (concat (lines ver) == "9.2.4") $ error $ "Invalid version: " ++ show ver
diff --git a/test/integration/tests/override-compiler/files/stack.yaml b/test/integration/tests/override-compiler/files/stack.yaml
deleted file mode 100644
index c40a5a2435..0000000000
--- a/test/integration/tests/override-compiler/files/stack.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resolver: lts-13.10
-compiler: ghc-9.2.4
-packages: []
diff --git a/test/integration/tests/proper-rebuilds/Main.hs b/test/integration/tests/proper-rebuilds/Main.hs
deleted file mode 100644
index 643f575e9a..0000000000
--- a/test/integration/tests/proper-rebuilds/Main.hs
+++ /dev/null
@@ -1,21 +0,0 @@
-import Control.Monad (unless, when)
-import Data.List (isInfixOf)
-import StackTest
-import System.Directory
-
-main :: IO ()
-main = do
-    let expectRecompilation stderr =
-          unless ("> build" `isInfixOf` stderr) $
-          error "package recompilation was expected"
-        expectNoRecompilation stderr =
-          when ("> build" `isInfixOf` stderr) $
-          error "package recompilation was not expected"
-    copyFile "src/Lib.hs.v1" "src/Lib.hs"
-    stackCheckStderr ["build"] expectRecompilation
-    stackCheckStderr ["build" , "--profile"] expectRecompilation
-    stackCheckStderr ["build" , "--profile"] expectNoRecompilation
-    -- changing source file to trigger recompilation
-    copyFile "src/Lib.hs.v2" "src/Lib.hs"
-    stackCheckStderr ["build" , "--profile"] expectRecompilation
-    stackCheckStderr ["build"] expectRecompilation
diff --git a/test/integration/tests/proper-rebuilds/files/.gitignore b/test/integration/tests/proper-rebuilds/files/.gitignore
deleted file mode 100644
index 25dffca60e..0000000000
--- a/test/integration/tests/proper-rebuilds/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/Lib.hs
diff --git a/test/integration/tests/proper-rebuilds/files/app/Main.hs b/test/integration/tests/proper-rebuilds/files/app/Main.hs
deleted file mode 100644
index a2fa21e3ac..0000000000
--- a/test/integration/tests/proper-rebuilds/files/app/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Main where
-
-import Lib
-
-main = do
-  putStrLn $ "Sample strings: " ++ show someStrings
diff --git a/test/integration/tests/proper-rebuilds/files/files.cabal b/test/integration/tests/proper-rebuilds/files/files.cabal
deleted file mode 100644
index b04858a5fd..0000000000
--- a/test/integration/tests/proper-rebuilds/files/files.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
-name: files
-version: 1.0.0
-build-type: Simple
-cabal-version: >= 1.10
-
-library
-  hs-source-dirs: src
-  exposed-modules:  Lib
-  build-depends:    base
-  default-language: Haskell2010
-
-executable test-exe
-  hs-source-dirs: app
-  main-is: Main.hs
-  ghc-options: -rtsopts
-  build-depends: base, files
-  default-language: Haskell2010
\ No newline at end of file
diff --git a/test/integration/tests/proper-rebuilds/files/src/Lib.hs.v1 b/test/integration/tests/proper-rebuilds/files/src/Lib.hs.v1
deleted file mode 100644
index fc0ad60719..0000000000
--- a/test/integration/tests/proper-rebuilds/files/src/Lib.hs.v1
+++ /dev/null
@@ -1,4 +0,0 @@
-module Lib where
-
-someStrings :: [String]
-someStrings = ["Hello", "world!"]
diff --git a/test/integration/tests/proper-rebuilds/files/src/Lib.hs.v2 b/test/integration/tests/proper-rebuilds/files/src/Lib.hs.v2
deleted file mode 100644
index 59c5f8c548..0000000000
--- a/test/integration/tests/proper-rebuilds/files/src/Lib.hs.v2
+++ /dev/null
@@ -1,4 +0,0 @@
-module Lib where
-
-someStrings :: [String]
-someStrings = ["Hello", "other", "world!"]
diff --git a/test/integration/tests/proper-rebuilds/files/stack.yaml b/test/integration/tests/proper-rebuilds/files/stack.yaml
deleted file mode 100644
index e2c40391ad..0000000000
--- a/test/integration/tests/proper-rebuilds/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: ghc-9.2.4
diff --git a/test/integration/tests/relative-script-snapshots/Main.hs b/test/integration/tests/relative-script-snapshots/Main.hs
deleted file mode 100644
index 0a4044c6af..0000000000
--- a/test/integration/tests/relative-script-snapshots/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stack ["subdir/script.hs"]
diff --git a/test/integration/tests/relative-script-snapshots/files/subdir/script.hs b/test/integration/tests/relative-script-snapshots/files/subdir/script.hs
deleted file mode 100644
index 2858fcedcf..0000000000
--- a/test/integration/tests/relative-script-snapshots/files/subdir/script.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env stack
--- stack --resolver snapshot.yaml script
-import Acme.Missiles
-
-main :: IO ()
-main = launchMissiles
diff --git a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml b/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml
deleted file mode 100644
index 9fee04803e..0000000000
--- a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: ghc-9.2.4
-name: snapshot
-packages:
-- acme-missiles-0.3@rev:0
-- stm-2.5.0.0@rev:0
diff --git a/test/integration/tests/sanity/Main.hs b/test/integration/tests/sanity/Main.hs
deleted file mode 100644
index 4315b3d938..0000000000
--- a/test/integration/tests/sanity/Main.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-import StackTest
-import Control.Monad (unless)
-import System.Directory (doesFileExist)
-
-main :: IO ()
-main = do
-    stack ["--version"]
-    stack ["--help"]
-    removeDirIgnore "acme-missiles-0.2"
-    removeDirIgnore "acme-missiles-0.3"
-    stack ["unpack", "acme-missiles-0.2"]
-    stack ["unpack", "acme-missiles"]
-    stackErr ["command-does-not-exist"]
-    stackErr ["unpack", "invalid-package-name-"]
-
-    -- When running outside of IntegrationSpec.hs, this will use the
-    -- stack.yaml from Stack itself
-    exists <- doesFileExist "../../../../../stack.yaml"
-    unless exists $ stackErr ["build"]
-
-    doesNotExist "stack.yaml"
-
-    if isWindows
-        then stack [defaultResolverArg, "exec", "./foo.bat"]
-        else stack [defaultResolverArg, "exec", "./foo.sh"]
diff --git a/test/integration/tests/script-extra-dep/Main.hs b/test/integration/tests/script-extra-dep/Main.hs
deleted file mode 100644
index c2e9c88b99..0000000000
--- a/test/integration/tests/script-extra-dep/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = stack ["script.hs"]
diff --git a/test/integration/tests/script-extra-dep/files/script.hs b/test/integration/tests/script-extra-dep/files/script.hs
deleted file mode 100644
index a43f496a27..0000000000
--- a/test/integration/tests/script-extra-dep/files/script.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env stack
--- stack --resolver ghc-9.2.4 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.0.2@rev:0
-import Acme.Missiles
-
-main :: IO ()
-main = launchMissiles
diff --git a/test/integration/tests/skip-unreachable-dirs/Main.hs b/test/integration/tests/skip-unreachable-dirs/Main.hs
deleted file mode 100644
index a2d77fd8bb..0000000000
--- a/test/integration/tests/skip-unreachable-dirs/Main.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-{-# LANGUAGE ScopedTypeVariables #-}
-
-import StackTest
-import System.Directory
-import Control.Exception (catch, IOException)
-
-main :: IO ()
-main = do
-    removeFileIgnore "stack.yaml"
-    createDirectory "unreachabledir" `catch` \(e :: IOException) -> pure ()
-    setPermissions  "unreachabledir" emptyPermissions
-    stack ["init"]
diff --git a/test/integration/tests/skip-unreachable-dirs/files/.gitignore b/test/integration/tests/skip-unreachable-dirs/files/.gitignore
deleted file mode 100644
index 684dbffa96..0000000000
--- a/test/integration/tests/skip-unreachable-dirs/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-stack.yaml
diff --git a/test/integration/tests/skip-unreachable-dirs/files/foo.cabal b/test/integration/tests/skip-unreachable-dirs/files/foo.cabal
deleted file mode 100644
index 625239b18d..0000000000
--- a/test/integration/tests/skip-unreachable-dirs/files/foo.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
-name:                foo
-version:             0.0.0
-synopsis:            foo
-build-type:          Simple
-cabal-version:       >=1.10
-
-library
-  exposed-modules:   Foo
-  build-depends:     base
-  default-language:  Haskell2010
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs
deleted file mode 100644
index d4efcc403c..0000000000
--- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-import StackTest
-
-main :: IO ()
-main = do
-  stackErr ["build", "--stack-yaml", "as-extra-dep.yaml", "--dry-run"]
-  stack ["build", "--stack-yaml", "as-snapshot.yaml", "--dry-run"]
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore
deleted file mode 100644
index 6a9f1098c7..0000000000
--- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/unimportant.cabal
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/README.md b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/README.md
deleted file mode 100644
index e2fb7d4f6b..0000000000
--- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-The test case here is weird enough to warrant an explanation. What we
-_really_ want to test is whether building the lts-3.12 snapshot's
-semigroupoids package with rev-1 works. See
-https://github.com/commercialhaskell/stackage/issues/3185. However, that test
-requires that we use an older GHC, and as Manny commented:
-
-> Having integration tests with old resolvers will cause them to fail
-> on Linux distributions with GCC with PIE enabled by default (which
-> is the latest versions of most distributions now), since older GHC
-> versions don't support it. I'm not sure what we should do about
-> this, since it obviously does make sense to be able to test against
-> old snapshots sometimes.
-
-So I'm instead testing a totally different case here which repros the
-same issue. If we use a custom snapshot with incompatible `stm` and
-`async` versions, we want Stack to trust the build plan and allow a
-`--dry-run` to succeed. But if we do this via `extra-deps`, we want it
-to fail.
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml
deleted file mode 100644
index 9a7a97fdaa..0000000000
--- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: ghc-9.2.4
-extra-deps:
-- async-2.1.1.1
-- stm-2.1.2.2
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-snapshot.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-snapshot.yaml
deleted file mode 100644
index 6de0480e0e..0000000000
--- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-snapshot.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: snapshot.yaml
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml
deleted file mode 100644
index f403f2761f..0000000000
--- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: unimportant
-
-dependencies:
-- base
-- async
-
-library: {}
diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml
deleted file mode 100644
index 4c8a832c0d..0000000000
--- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: ghc-9.2.4
-name: hackage-revisions-are-annoying
-packages:
-- async-2.1.1.1
-- stm-2.1.2.2
diff --git a/test/integration/tests/upload/Main.hs b/test/integration/tests/upload/Main.hs
deleted file mode 100644
index 2f1d67c276..0000000000
--- a/test/integration/tests/upload/Main.hs
+++ /dev/null
@@ -1,34 +0,0 @@
-import           Control.Concurrent
-
-import           StackTest
-
-import           System.Directory   (createDirectoryIfMissing,
-                                     getCurrentDirectory)
-import           System.Environment (getEnv, setEnv)
-import           System.FilePath    ((</>))
-import           System.Process
-
-main :: IO ()
-main =
-    withFakeHackage $ do
-        stackRoot <- getEnv "STACK_ROOT"
-        -- Ensure there are credentials available for uploading
-        createDirectoryIfMissing True (stackRoot </> "upload")
-        writeFile
-            (stackRoot </> "upload" </> "credentials.json")
-            "{\"username\":\"fake\",\"password\":\"fake\"}"
-        stack ["upload", "."]
-
--- | Start a fake Hackage server to test the upload
-withFakeHackage :: IO a -> IO a
-withFakeHackage act = do
-    stackEnv <- stackExe
-    -- Build the dependencies for the fake server
-    stack $ withNetworkArgs ++ ["FakeHackageStart.hs"]
-    -- Start the fake server
-    withCreateProcess (proc stackEnv $ withNetworkArgs ++ ["FakeHackage.hs"]) $ \_ _ _ _ -> do
-        -- Wait for the fake server to start accepting requests
-        threadDelay 2000000
-        act
-  where
-    withNetworkArgs = ["runghc", "--package", "network"]
diff --git a/test/integration/tests/upload/files/FakeHackage.hs b/test/integration/tests/upload/files/FakeHackage.hs
deleted file mode 100644
index eef4b9349b..0000000000
--- a/test/integration/tests/upload/files/FakeHackage.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-import Control.Concurrent
-import Control.Monad
-import Network.Socket hiding (recv)
-import Network.Socket.ByteString (recv, sendAll)
-import System.Exit
-import System.IO
-
--- | Fake server that always responds with HTTP OK
-main =
-    withSocketsDo $ do
-        _ <- forkIO serve
-        -- Exit after a delay to ensure the process doesn't linger around
-        threadDelay 10000000
-        exitSuccess
-
-serve :: IO ()
-serve = do
-    let hints = defaultHints {addrFlags = [AI_PASSIVE], addrSocketType = Stream}
-    (addr:_) <- getAddrInfo (Just hints) Nothing (Just "12415")
-    sock <- socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr)
-    setSocketOption sock ReuseAddr 1
-    bind sock (addrAddress addr)
-    listen sock 10
-    forever $ do
-        (conn, _) <- accept sock
-        _ <- recv conn 1024
-        sendAll
-            conn
-            "HTTP/1.1 200 OK\r\nContent-Length: 1\r\nContent-Type: text/plain\r\n\r\na"
-        shutdown conn ShutdownSend
diff --git a/test/integration/tests/upload/files/Foo.hs b/test/integration/tests/upload/files/Foo.hs
deleted file mode 100644
index efbf93bbde..0000000000
--- a/test/integration/tests/upload/files/Foo.hs
+++ /dev/null
@@ -1 +0,0 @@
-module Foo where
diff --git a/test/integration/tests/upload/files/stack.yaml b/test/integration/tests/upload/files/stack.yaml
deleted file mode 100644
index f7afd5064d..0000000000
--- a/test/integration/tests/upload/files/stack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resolver: nightly-2022-09-05
-packages:
-- .
-hackage-base-url: http://localhost:12415/
diff --git a/test/integration/tests/upload/files/uploadtest.cabal b/test/integration/tests/upload/files/uploadtest.cabal
deleted file mode 100644
index fbf051d525..0000000000
--- a/test/integration/tests/upload/files/uploadtest.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
-build-type: Simple
-name: uploadtest
-version: 0.0.0
-category: test
-maintainer: uploadtest@example.com
-cabal-version: 1.20
-synopsis: Upload test
-description: Upload test description
-license: BSD3
-library
-  build-depends: base >= 4.7 && < 5
-  exposed-modules: Foo
-  default-language: Haskell2010
diff --git a/test/integration/tests/variables-in-template-file-names/Main.hs b/test/integration/tests/variables-in-template-file-names/Main.hs
deleted file mode 100644
index e2572ef0e0..0000000000
--- a/test/integration/tests/variables-in-template-file-names/Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import StackTest
-import System.Directory
-import Control.Monad (unless)
-
-main :: IO ()
-main = do
-  removeDirIgnore "somename"
-  stack ["new", "somename", "./template.hsfiles"]
-  exists <- doesFileExist "somename/somename.cabal"
-  unless exists $ error "does not exist"
diff --git a/test/integration/tests/variables-in-template-file-names/files/.gitignore b/test/integration/tests/variables-in-template-file-names/files/.gitignore
deleted file mode 100644
index 6d57d66dd6..0000000000
--- a/test/integration/tests/variables-in-template-file-names/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/somename/
diff --git a/test/integration/tests/watched-files/Main.hs b/test/integration/tests/watched-files/Main.hs
deleted file mode 100644
index d683c93a0b..0000000000
--- a/test/integration/tests/watched-files/Main.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-import StackTest
-import Data.Foldable (for_)
-import Control.Monad (unless)
-
-main :: IO ()
-main = for_ (words "foo bar baz bin") $ \x -> do
-  writeFile "some-text-file.txt" x
-  stackCheckStdout ["run"] $ \y ->
-    unless (x == y) $ error $ concat
-      [ "Expected: "
-      , show x
-      , "\nActual:  "
-      , show y
-      ]
diff --git a/test/integration/tests/watched-files/files/.gitignore b/test/integration/tests/watched-files/files/.gitignore
deleted file mode 100644
index d09ee0af48..0000000000
--- a/test/integration/tests/watched-files/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-some-text-file.txt
-*.cabal
diff --git a/test/integration/tests/watched-files/files/Main.hs b/test/integration/tests/watched-files/files/Main.hs
deleted file mode 100644
index a462eafd73..0000000000
--- a/test/integration/tests/watched-files/files/Main.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-{-# LANGUAGE TemplateHaskell #-}
-module Main where
-
-import Data.FileEmbed
-import qualified Data.ByteString as B
-import System.IO (stdout)
-
-main :: IO ()
-main = B.hPut stdout $(embedFile "some-text-file.txt")
diff --git a/test/integration/tests/watched-files/files/package.yaml b/test/integration/tests/watched-files/files/package.yaml
deleted file mode 100644
index 6611f13029..0000000000
--- a/test/integration/tests/watched-files/files/package.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: watched-files
-dependencies:
-- base
-- bytestring
-- file-embed
-
-executables:
-  watched:
-    main: Main.hs
diff --git a/test/integration/tests/watched-files/files/stack.yaml b/test/integration/tests/watched-files/files/stack.yaml
deleted file mode 100644
index dc50f0e522..0000000000
--- a/test/integration/tests/watched-files/files/stack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-resolver: nightly-2022-09-05
diff --git a/test/integration/.gitignore b/tests/integration/.gitignore
similarity index 100%
rename from test/integration/.gitignore
rename to tests/integration/.gitignore
diff --git a/tests/integration/IntegrationSpec.hs b/tests/integration/IntegrationSpec.hs
new file mode 100644
index 0000000000..54a190baa3
--- /dev/null
+++ b/tests/integration/IntegrationSpec.hs
@@ -0,0 +1,288 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+import           Conduit
+                   ( (.|), connect, filterC, filterMC, foldMapC, mapM_C
+                   , runConduit, runConduitRes, runResourceT, sourceDirectory
+                   , sourceDirectoryDeep, stderrC, withSourceFile
+                   )
+import           Data.List ( stripPrefix )
+import           Options.Generic
+                   ( ParseField, ParseRecord (..), defaultModifiers
+                   , fieldNameModifier, firstLetter, getRecord
+                   , parseRecordWithModifiers, shortNameModifier
+                   )
+import           RIO
+import           RIO.Char ( toLower )
+import           RIO.Directory
+                   ( canonicalizePath, copyFile, createDirectoryIfMissing
+                   , doesFileExist, getAppUserDataDirectory
+                   )
+import           RIO.FilePath
+                   ( (</>), (<.>), isPathSeparator, takeDirectory
+                   , takeExtensions, takeFileName
+                   )
+import           RIO.List ( isInfixOf, partition )
+import qualified RIO.Map as Map
+import           RIO.Process
+                   ( HasProcessContext (..), closed, findExecutable, proc
+                   , runProcess, runProcess_, setStderr, setStdin, setStdout
+                   , useHandleOpen, withModifyEnvVars, withWorkingDir
+                   )
+import qualified RIO.Set as Set
+import qualified RIO.Text as T
+import           RIO.Time ( defaultTimeLocale, diffUTCTime, formatTime, getCurrentTime )
+import           System.Environment ( getExecutablePath, lookupEnv )
+import           System.Info ( os )
+import           System.PosixCompat.Files ( createSymbolicLink )
+
+-- This code does not use a test framework so that we get direct
+-- control of how the output is displayed.
+
+main :: IO ()
+main = runSimpleApp $ do
+  logInfo "Initiating Stack integration test running"
+
+  options <- getRecord "Stack integration tests"
+  startTime <- getCurrentTime
+  results <- runApp options $ do
+    logInfo "Running with the following environment"
+    proc "env" [] runProcess_
+    tests <- asks appTestDirs
+    let count = Set.size tests
+        loop !idx rest !accum =
+          case rest of
+            [] -> pure accum
+            next:rest' -> do
+              logInfo $ "Running integration test "
+                     <> display idx
+                     <> "/"
+                     <> display count
+                     <> ": "
+                     <> fromString (takeFileName next)
+              res <- test next
+              loop (idx + 1) rest' (res <> accum)
+
+    loop (1 :: Int) (Set.toList tests) mempty
+  finalTime <- getCurrentTime
+  let (successes, failures) = partition ((== ExitSuccess) . snd)
+                            $ Map.toList results
+  let timeDiff = diffUTCTime finalTime startTime
+  let timeDiffStr = formatTime defaultTimeLocale "%H:%M:%S - total %s seconds" timeDiff
+  logInfo $ "Integration tests ran in : " <> fromString timeDiffStr
+  unless (null successes) $ do
+    logInfo "Successful tests:"
+    for_ successes $ \(x, _) -> logInfo $ "- " <> display x
+    logInfo ""
+
+  if null failures
+    then logInfo "No failures!"
+    else do
+      logInfo "Failed tests:"
+      for_ failures $ \(x, ec) -> logInfo $ "- " <> display x <> " - " <> displayShow ec
+      exitFailure
+
+
+data Options = Options
+  { optSpeed :: Maybe Speed
+  , optMatch :: Maybe String
+  , optNot :: [String]
+  }
+  deriving Generic
+
+instance ParseRecord Options where
+  parseRecord = parseRecordWithModifiers modifiers
+    where
+      optName = map toLower . drop 3
+      modifiers = defaultModifiers { fieldNameModifier = optName
+                                   , shortNameModifier = firstLetter . optName
+                                   }
+
+data Speed = Fast | Normal | Superslow
+  deriving (Read, Generic)
+
+instance ParseField Speed
+
+exeExt :: String
+exeExt = if isWindows then ".exe" else ""
+
+isWindows :: Bool
+isWindows = os == "mingw32"
+
+isLinux :: Bool
+isLinux = os == "linux"
+
+runApp :: Options -> RIO App a -> RIO SimpleApp a
+runApp options inner = do
+  let speed = fromMaybe Normal $ optSpeed options
+  simpleApp <- ask
+  runghc <- findExecutable "runghc" >>= either throwIO pure
+  srcDir <- canonicalizePath ""
+  testsRoot <- canonicalizePath $ srcDir </> "tests/integration"
+  libdir <- canonicalizePath $ testsRoot </> "lib"
+  myPath <- liftIO getExecutablePath
+
+  stack <- canonicalizePath $ takeDirectory myPath </> "stack" ++ exeExt
+  logInfo $ "Using Stack located at " <> fromString stack
+  proc stack ["--version"] runProcess_
+  logInfo $ "Using runghc located at " <> fromString runghc
+  proc runghc ["--version"] runProcess_
+
+  let matchTest = case (optMatch options, optNot options) of
+        (Just str, _) -> (str `isInfixOf`)
+        (_, []) -> const True
+        (_, nl) -> \a -> all (\b -> not $ b `isInfixOf` a) nl
+  testDirs
+    <- runConduitRes
+     $ sourceDirectory (testsRoot </> "tests")
+    .| filterMC (liftIO . hasTest)
+    .| filterC matchTest
+    .| foldMapC Set.singleton
+
+  let modifyEnvCommon
+        = Map.insert "SRC_DIR" (fromString srcDir)
+        . Map.insert "STACK_EXE" (fromString stack)
+        . Map.delete "GHC_PACKAGE_PATH"
+        . Map.insert "STACK_TEST_SPEED"
+            (case speed of
+              Superslow -> "SUPERSLOW"
+              _ -> "NORMAL")
+        . Map.fromList
+        . map (first T.toUpper)
+        . Map.toList
+
+  case speed of
+    Fast -> do
+      let app = App
+            { appSimpleApp = simpleApp
+            , appRunghc = runghc
+            , appLibDir = libdir
+            , appSetupHome = id
+            , appTestDirs = testDirs
+            }
+      runRIO app $ withModifyEnvVars modifyEnvCommon inner
+    _ -> do
+      origStackRoot <- liftIO (lookupEnv "STACK_ROOT") >>= \case
+        Nothing -> getAppUserDataDirectory "stack"
+        Just x -> pure x
+
+      logInfo "Initializing/updating the original Pantry store"
+      proc stack ["update"] runProcess_
+
+      pantryRoot <- canonicalizePath $ origStackRoot </> "pantry"
+      let modifyEnv
+               = Map.insert "PANTRY_ROOT" (fromString pantryRoot)
+               . modifyEnvCommon
+
+          app = App
+            { appSimpleApp = simpleApp
+            , appRunghc = runghc
+            , appLibDir = libdir
+            , appSetupHome = \inner' -> withSystemTempDirectory "home" $ \newHome -> do
+                let newStackRoot = newHome </> ".stack"
+                createDirectoryIfMissing True newStackRoot
+                let modifyEnv'
+                      = Map.insert "HOME" (fromString newHome)
+                      . Map.insert "APPDATA" (fromString newHome)
+                      . Map.insert "STACK_ROOT" (fromString newStackRoot)
+                writeFileBinary (newStackRoot </> "config.yaml") "system-ghc: true\ninstall-ghc: false\n"
+                withModifyEnvVars modifyEnv' inner'
+            , appTestDirs = testDirs
+            }
+
+      runRIO app $ withModifyEnvVars modifyEnv inner
+
+
+hasTest :: FilePath -> IO Bool
+hasTest dir = doesFileExist $ dir </> "Main.hs"
+
+data App = App
+  { appRunghc :: !FilePath
+  , appLibDir :: !FilePath
+  , appSetupHome :: !(forall a. RIO App a -> RIO App a)
+  , appSimpleApp :: !SimpleApp
+  , appTestDirs :: !(Set FilePath)
+  }
+simpleAppL :: Lens' App SimpleApp
+simpleAppL = lens appSimpleApp (\x y -> x { appSimpleApp = y })
+instance HasLogFunc App where
+  logFuncL = simpleAppL.logFuncL
+instance HasProcessContext App where
+  processContextL = simpleAppL.processContextL
+
+-- | Call 'appSetupHome' on the inner action
+withHome :: RIO App a -> RIO App a
+withHome inner = do
+  app <- ask
+  appSetupHome app inner
+
+test :: FilePath -- ^ test dir
+     -> RIO App (Map Text ExitCode)
+test testDir = withDir $ \dir -> withHome $ do
+    runghc <- asks appRunghc
+    libDir <- asks appLibDir
+    let mainFile = testDir </> "Main.hs"
+
+    copyTree (testDir </> "files") dir
+
+    withSystemTempFile (name <.> "log") $ \logfp logh -> do
+      let args =
+            [ "-clear-package-db"
+            , "-global-package-db"
+            , "-i" ++ libDir
+            , mainFile
+            ]
+          args' = if isLinux
+            then
+              -- We seek to use lld as the linker on Linux, as it is much faster
+              -- than the default linker. The executable assumes lld is on the
+              -- PATH.
+              "--" : "-optl-fuse-ld=lld" : args
+            else
+              args
+      ec <- withWorkingDir dir $
+              withModifyEnvVars (Map.insert "TEST_DIR" $ fromString testDir) $
+                proc runghc args' $
+                    runProcess
+                  . setStdin closed
+                  . setStdout (useHandleOpen logh)
+                  . setStderr (useHandleOpen logh)
+      hClose logh
+
+      case ec of
+        ExitSuccess -> logInfo "Success!"
+        _ -> do
+          logError "Failure, dumping log\n\n"
+          withSourceFile logfp $ \src ->
+            runConduit $ src .| stderrC
+          logError $ "\n\nEnd of log for " <> fromString name
+      pure $ Map.singleton (fromString name) ec
+  where
+    name = takeFileName testDir
+    withDir = withSystemTempDirectory ("stack-integration-" ++ name)
+
+copyTree :: MonadIO m => FilePath -> FilePath -> m ()
+copyTree src dst =
+    liftIO $
+    runResourceT (sourceDirectoryDeep False src `connect` mapM_C go)
+        `catch` \(_ :: IOException) -> pure ()
+  where
+    go srcfp = liftIO $ do
+        Just suffix <- pure $ stripPrefix src srcfp
+        let dstfp = dst </> stripHeadSeparator suffix
+        createDirectoryIfMissing True $ takeDirectory dstfp
+        -- copying yaml files so lock files won't get created in
+        -- the source directory
+        if takeFileName srcfp /= "package.yaml" &&
+           (takeExtensions srcfp == ".yaml" || takeExtensions srcfp == ".yml")
+          then
+            copyFile srcfp dstfp
+          else
+            createSymbolicLink srcfp dstfp `catch` \(_ :: IOException) ->
+                copyFile srcfp dstfp -- for Windows
+
+    stripHeadSeparator :: FilePath -> FilePath
+    stripHeadSeparator [] = []
+    stripHeadSeparator fp@(x:xs) = if isPathSeparator x
+                                   then xs
+                                   else fp
diff --git a/tests/integration/README.md b/tests/integration/README.md
new file mode 100644
index 0000000000..e95ef6e0fe
--- /dev/null
+++ b/tests/integration/README.md
@@ -0,0 +1,122 @@
+# Stack Integration Tests
+
+This directory, `tests/integration`, contains integration tests for Stack. Each
+directory inside its `tests` subdirectory represents a single test. Each of
+those directories has:
+
+* a `Main.hs` file, which provides the script to be run; and
+* a `files `directory, providing the working directory the script will be run
+  from. (If you have a test that does not require any specific working
+  directory, there may be no `files` directory.)
+
+The easiest way to create a new integration test is to use existing examples as
+a foundation.
+
+## Form
+
+Most integration tests have a similar form, as follows.
+
+An initial comment in the `Main.hs` file explains what the integration test is
+testing. If the test is prompted by a GitHub issue, the commment includes a URL
+to that issue. Tests prompted by a GitHub issue are usually named after that
+issue.
+
+Packages in tests are usually described by `package.yaml` files. The associated
+Cabal file is usually not checked in. Consequently, a `.gitignore` file lists
+the Cabal file that is to be ignored.
+
+The most complicated 'generic' test package has the description below. The
+`spec-version: 0.36.0` avoids Hpack's legacy syntax and the package version is
+`0.0.0` by default.
+
+A main (unnamed) library module is usually named `Lib.hs` in directory `src`. A
+private named sublibrary (an internal library) is usually named `Internal.hs` in
+directory `int`.
+
+~~~yaml
+# package.yaml
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackage:internal
+
+internal-libraries:
+  internal:
+    source-dirs: int
+  sublib:
+    visibility: public
+    source-dirs: sub
+    dependencies:
+    - myPackage:internal
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - myPackage
+    - myPackage:{internal, sublib}
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - myPackage
+    - myPackage:{internal, sublib}
+
+benchmarks:
+  bench:
+    source-dirs: bench
+    main: Main.hs
+    dependencies:
+    - myPackage
+    - myPackage:{internal, sublib}
+~~~
+
+Usually, a test package does not need a `Setup.hs` file.
+
+Many tests require only a compiler version snapshot.
+
+If an extra-dep is required, `ansi-missiles-0.3` is often used.
+
+## Running
+
+One simple way to run a single test is:
+
+* Change into the `files` directory
+* Run the command `stack runghc -- -i"../../../lib" ../Main.hs`
+
+A more thorough way to run the tests is with command:
+
+~~~text
+stack build --flag stack:integration-tests stack --exec stack-integration-test
+~~~
+
+Note that this command can take a _long_ time. It is also more thorough
+than the quick command given above, as it will run each test with a
+clean `STACK_ROOT`.
+
+On Linux, the `stack-integration-test` executable uses the `lld` linker and
+expects it to be on the PATH. The integration tests complete significantly
+quicker with `lld` than with the `ld.bfd` linker.
+
+## Helper scripts
+
+There are two helper scripts in this directory. Note that these may
+not always work as anticipated, since some of the tests expect a clean
+`STACK_ROOT`, and these scripts do not set that up.
+
+* `run-sort-tests.sh` will run all of the tests in the `tests`
+  directory, and move the successful ones into `tests-success`, and
+  the failing ones into `tests-fail`. It will keep the logs of failing
+  tests in `logs`.
+* `run-single-test.sh` takes a single argument (the name of a test),
+  and runs just that test.
diff --git a/tests/integration/lib/StackTest.hs b/tests/integration/lib/StackTest.hs
new file mode 100644
index 0000000000..b3cb474250
--- /dev/null
+++ b/tests/integration/lib/StackTest.hs
@@ -0,0 +1,324 @@
+module StackTest
+  ( run'
+  , run
+  , runShell
+  , runWithCwd
+  , stackExe
+  , stackSrc
+  , testDir
+  , stack'
+  , stack
+  , stackCleanFull
+  , stackIgnoreException
+  , stackErr
+  , stackStderr
+  , stackCheckStderr
+  , stackErrStderr
+  , runEx
+  , runEx'
+  , stackCheckStdout
+  , doesNotExist
+  , doesExist
+  , doesFileOrDirExist
+  , copy
+  , fileContentsMatch
+  , logInfo
+  , showProcessArgDebug
+  , exeExt
+  , isWindows
+  , isLinux
+  , getIsAlpine
+  , isARM
+  , isAarch64
+  , isMacOSX
+  , defaultSnapshotArg
+  , removeFileIgnore
+  , removeDirIgnore
+  , withCwd
+  , withSourceDirectory
+  , superslow
+  ) where
+
+import           Control.Monad ( unless, void, when )
+import           Control.Exception
+                   ( Exception (..), IOException, bracket_, catch
+                   , throwIO
+                   )
+import           GHC.Stack ( HasCallStack )
+import           System.Environment ( getEnv, lookupEnv )
+import           System.Directory
+                   ( copyFile, doesDirectoryExist, doesFileExist
+                   , getCurrentDirectory, removeDirectoryRecursive, removeFile
+                   , setCurrentDirectory
+                   )
+import           System.IO
+                   ( hPutStr, hPutStrLn, stderr
+                   )
+import           System.IO.Error
+                   ( isDoesNotExistError )
+import           System.Process
+                   ( CreateProcess (..), createProcess, proc
+                   , readCreateProcessWithExitCode, readProcessWithExitCode
+                   , shell, waitForProcess
+                   )
+import           System.Exit ( ExitCode (..) )
+import           System.Info ( arch, os )
+
+run' :: HasCallStack => FilePath -> [String] -> IO ExitCode
+run' cmd args = do
+  logInfo $ "Running: " ++ cmd ++ " " ++ unwords (map showProcessArgDebug args)
+  (Nothing, Nothing, Nothing, ph) <- createProcess (proc cmd args)
+  waitForProcess ph
+
+run :: HasCallStack => FilePath -> [String] -> IO ()
+run cmd args = do
+  ec <- run' cmd args
+  unless (ec == ExitSuccess) $
+    error $ "Exited with exit code: " ++ displayException ec
+
+runShell :: HasCallStack => String -> IO ()
+runShell cmd = do
+  logInfo $ "Running: " ++ cmd
+  (Nothing, Nothing, Nothing, ph) <- createProcess (shell cmd)
+  ec <- waitForProcess ph
+  unless (ec == ExitSuccess) $
+    error $ "Exited with exit code: " ++ displayException ec
+
+runWithCwd :: HasCallStack => FilePath -> String -> [String] -> IO String
+runWithCwd cwdPath cmd args = do
+  logInfo $ "Running: " ++ cmd
+  let cp = proc cmd args
+  (ec, stdoutStr, _) <- readCreateProcessWithExitCode (cp { cwd = Just cwdPath }) ""
+  unless (ec == ExitSuccess) $
+    error $ "Exited with exit code: " ++ displayException ec
+  pure stdoutStr
+
+stackExe :: IO String
+stackExe = getEnv "STACK_EXE"
+
+stackSrc :: IO String
+stackSrc = getEnv "SRC_DIR"
+
+testDir :: IO String
+testDir = getEnv "TEST_DIR"
+
+stack' :: HasCallStack => [String] -> IO ExitCode
+stack' args = do
+  stackEnv <- stackExe
+  run' stackEnv args
+
+stack :: HasCallStack => [String] -> IO ()
+stack args = do
+  ec <- stack' args
+  unless (ec == ExitSuccess) $
+    error $ "Exited with exit code: " ++ displayException ec
+
+-- Temporary workaround for Windows to ignore exceptions arising out of Windows
+-- when we do stack clean. More info here:
+-- https://github.com/commercialhaskell/stack/issues/4936
+stackCleanFull :: HasCallStack => IO ()
+stackCleanFull = stackIgnoreException ["clean", "--full"]
+
+-- Temporary workaround for Windows to ignore exceptions arising out of Windows
+-- when we do stack clean. More info here:
+-- https://github.com/commercialhaskell/stack/issues/4936
+stackIgnoreException :: HasCallStack => [String] -> IO ()
+stackIgnoreException args =
+  if isWindows
+    then void (stack' args) `catch` (\(_e :: IOException) -> pure ())
+    else stack args
+
+stackErr :: HasCallStack => [String] -> IO ()
+stackErr args = do
+  ec <- stack' args
+  when (ec == ExitSuccess) $ error "stack was supposed to fail, but didn't"
+
+stackStderr :: HasCallStack => [String] -> IO (ExitCode, String)
+stackStderr args = do
+  stackExe' <- stackExe
+  logInfo $
+       "Running: "
+    ++ stackExe'
+    ++ " "
+    ++ unwords (map showProcessArgDebug args)
+  (ec, _, err) <- readProcessWithExitCode stackExe' args ""
+  hPutStr stderr err
+  pure (ec, err)
+
+-- | Run stack with arguments and apply a check to the resulting stderr output
+-- if the process succeeded.
+stackCheckStderr :: HasCallStack => [String] -> (String -> IO ()) -> IO ()
+stackCheckStderr args check = do
+  (ec, err) <- stackStderr args
+  if ec /= ExitSuccess
+    then error $ "Exited with exit code: " ++ displayException ec
+    else check err
+
+-- | Same as 'stackCheckStderr', but ensures that the Stack process
+-- fails.
+stackErrStderr :: HasCallStack => [String] -> (String -> IO ()) -> IO ()
+stackErrStderr args check = do
+  (ec, err) <- stackStderr args
+  if ec == ExitSuccess
+    then error "Stack process succeeded, but it shouldn't"
+    else check err
+
+runEx :: HasCallStack => FilePath -> String -> IO (ExitCode, String, String)
+runEx cmd args = runEx' cmd $ words args
+
+runEx' :: HasCallStack => FilePath -> [String] -> IO (ExitCode, String, String)
+runEx' cmd args = do
+  logInfo $ "Running: " ++ cmd ++ " " ++ unwords (map showProcessArgDebug args)
+  (ec, out, err) <- readProcessWithExitCode cmd args ""
+  putStr out
+  hPutStr stderr err
+  pure (ec, out, err)
+
+-- | Run stack with arguments and apply a check to the resulting stdout output
+-- if the process succeeded.
+--
+-- Take care with newlines; if the output includes a newline character that
+-- should not be there, use 'Data.List.Extra.trimEnd' to remove it.
+stackCheckStdout :: HasCallStack => [String] -> (String -> IO ()) -> IO ()
+stackCheckStdout args check = do
+  stackExe' <- stackExe
+  (ec, out, _) <- runEx' stackExe' args
+  if ec /= ExitSuccess
+    then error $ "Exited with exit code: " ++ displayException ec
+    else check out
+
+doesNotExist :: HasCallStack => FilePath -> IO ()
+doesNotExist fp = do
+  logInfo $ "doesNotExist " ++ fp
+  exists <- doesFileOrDirExist fp
+  case exists of
+    (Right msg) -> error msg
+    (Left _) -> pure ()
+
+doesExist :: HasCallStack => FilePath -> IO ()
+doesExist fp = do
+  logInfo $ "doesExist " ++ fp
+  exists <- doesFileOrDirExist fp
+  case exists of
+    (Right _) -> pure ()
+    (Left _) -> error "No file or directory exists"
+
+doesFileOrDirExist :: HasCallStack => FilePath -> IO (Either () String)
+doesFileOrDirExist fp = do
+  isFile <- doesFileExist fp
+  if isFile
+    then pure (Right ("File exists: " ++ fp))
+    else do
+      isDir <- doesDirectoryExist fp
+      if isDir
+        then pure (Right ("Directory exists: " ++ fp))
+        else pure (Left ())
+
+copy :: HasCallStack => FilePath -> FilePath -> IO ()
+copy src dest = do
+  logInfo ("Copy " ++ show src ++ " to " ++ show dest)
+  System.Directory.copyFile src dest
+
+fileContentsMatch :: HasCallStack => FilePath -> FilePath -> IO ()
+fileContentsMatch f1 f2 = do
+  doesExist f1
+  doesExist f2
+  f1Contents <- readFile f1
+  f2Contents <- readFile f2
+  unless (f1Contents == f2Contents) $
+    error ("contents do not match for " ++ show f1 ++ " " ++ show f2)
+
+logInfo :: String -> IO ()
+logInfo = hPutStrLn stderr
+
+-- TODO: use Stack's process running utilities?  (better logging)
+-- for now just copy+modifying this one from System.Process.Log
+
+-- | Show a process arg including speechmarks when necessary. Just for
+-- debugging purposes, not functionally important.
+showProcessArgDebug :: String -> String
+showProcessArgDebug x
+  | any special x = show x
+  | otherwise = x
+ where
+  special '"' = True
+  special ' ' = True
+  special _ = False
+
+-- | Extension of executables
+exeExt :: String
+exeExt = if isWindows then ".exe" else ""
+
+-- | Is the OS Windows?
+isWindows :: Bool
+isWindows = os == "mingw32"
+
+isLinux :: Bool
+isLinux = os == "linux"
+
+-- | Is the OS Alpine Linux?
+getIsAlpine :: IO Bool
+getIsAlpine = doesFileExist "/etc/alpine-release"
+
+-- | Is the architecture ARM?
+isARM :: Bool
+isARM = arch == "arm"
+
+-- | Is the architecture Aarch64?
+isAarch64 :: Bool
+isAarch64 = arch == "aarch64"
+
+-- | Is the OS Mac OS X?
+isMacOSX :: Bool
+isMacOSX = os == "darwin"
+
+-- | To avoid problems with GHC version mismatch when a new LTS major
+-- version is released, pass this argument to @stack@ when running in
+-- a global context. The LTS major version here should match that of
+-- the main @stack.yaml@.
+--
+defaultSnapshotArg :: String
+defaultSnapshotArg = "--snapshot=lts-24.55"
+
+-- | Remove a file and ignore any warnings about missing files.
+removeFileIgnore :: HasCallStack => FilePath -> IO ()
+removeFileIgnore fp = removeFile fp `catch` \e ->
+  if isDoesNotExistError e
+    then pure ()
+    else throwIO e
+
+-- | Remove a directory and ignore any warnings about missing files.
+removeDirIgnore :: HasCallStack => FilePath -> IO ()
+removeDirIgnore fp = removeDirectoryRecursive fp `catch` \e ->
+  if isDoesNotExistError e
+    then pure ()
+    else throwIO e
+
+-- | Changes to the specified working directory.
+withCwd :: HasCallStack => FilePath -> IO () -> IO ()
+withCwd dir action = do
+  currentDirectory <- getCurrentDirectory
+  let enterDir = setCurrentDirectory dir
+      exitDir = setCurrentDirectory currentDirectory
+  bracket_ enterDir exitDir action
+
+-- | Changes working directory to Stack source directory.
+withSourceDirectory :: HasCallStack => IO () -> IO ()
+withSourceDirectory action = do
+  dir <- stackSrc
+  withCwd dir action
+
+-- | Mark a test as superslow, only to be run when explicitly requested.
+superslow :: HasCallStack => IO () -> IO ()
+superslow inner = do
+  mres <- lookupEnv "STACK_TEST_SPEED"
+  case mres of
+    Just "NORMAL" -> logInfo "Skipping superslow test"
+    Just "SUPERSLOW" -> do
+      logInfo "Running superslow test, hold on to your butts"
+      inner
+    Nothing -> do
+      logInfo "No STACK_TEST_SPEED specified. Executing superslow test, hold \
+              \on to your butts"
+      inner
+    Just x -> error $ "Invalid value for STACK_TEST_SPEED env var: " ++ show x
diff --git a/tests/integration/lib/StackTest/Repl.hs b/tests/integration/lib/StackTest/Repl.hs
new file mode 100644
index 0000000000..f08bdfceb5
--- /dev/null
+++ b/tests/integration/lib/StackTest/Repl.hs
@@ -0,0 +1,135 @@
+{- |
+Integration-test helpers & fixtures for testing `stack repl`
+-}
+module StackTest.Repl
+    ( Repl
+    , ReplConnection (..)
+    , nextPrompt
+    , replCommand
+    , replGetChar
+    , replGetLine
+    , stackRepl
+    -- * Reexport
+    , module StackTest
+    ) where
+
+import Control.Exception (SomeException, catch, displayException, finally)
+import Control.Monad ((>=>), unless, when)
+import Control.Monad.IO.Class (liftIO)
+import Control.Monad.Trans (lift)
+import Control.Monad.Trans.Reader
+import Control.Monad.Trans.State qualified as State
+import Data.Maybe (fromMaybe)
+import Data.Foldable (toList)
+import Data.Sequence as Seq (Seq(Empty), (|>), fromList)
+import GHC.Stack (HasCallStack)
+import System.Directory (removeFile)
+import System.Environment (lookupEnv)
+import System.Exit (ExitCode (..), exitFailure)
+import System.IO
+    ( BufferMode (NoBuffering, LineBuffering), Handle, IOMode (ReadMode)
+    , hClose, hGetChar, hGetContents', hGetLine, hPutStrLn, hSetBuffering
+    , openTempFile
+    , withFile
+    )
+import System.Process
+    ( CreateProcess (std_err, std_in, std_out)
+    , StdStream (CreatePipe, UseHandle)
+    , createProcess, proc, waitForProcess
+    )
+
+import StackTest
+
+type Repl = ReaderT ReplConnection IO
+
+data ReplConnection = ReplConnection
+  { replStdin  :: Handle
+  , replStdout :: Handle
+  }
+
+replCommand :: String -> Repl ()
+replCommand cmd = do
+  (ReplConnection replStdinHandle _) <- ask
+  -- echo what we send to the test's stdout
+  liftIO . putStrLn $ "____> " <> cmd
+  liftIO $ hPutStrLn replStdinHandle cmd
+
+replGetChar :: Repl Char
+replGetChar = asks replStdout >>= liftIO . hGetChar
+
+replGetLine :: Repl String
+replGetLine = ask >>= liftIO . hGetLine . replStdout
+
+nextPrompt :: Repl ()
+nextPrompt = State.evalStateT poll Seq.Empty where
+  poll = do
+    c <- lift (asks replStdout) >>= liftIO . hGetChar
+    State.modify (|> c)
+    when (c == '\n') $ do
+      State.get >>= liftIO . putStr . ("ghci> " ++) . toList
+      State.put Seq.Empty
+    buf <- State.get
+    unless (buf == Seq.fromList "ghci> ")
+      poll
+
+runRepl
+  :: HasCallStack
+  => FilePath
+  -> [String]
+  -> Repl ()
+  -> IO ExitCode
+runRepl cmd args actions = do
+  (stderrBufPath, stderrBufHandle) <- openTempStderrBufferFile
+  hSetBuffering stderrBufHandle NoBuffering
+
+  logInfo $ "Running: " ++ cmd ++ " " ++ unwords (map showProcessArgDebug args) ++ "\n\
+            \         with stderr in " ++ stderrBufPath
+
+  -- launch the GHCi subprocess, grab its FD handles and process handle
+  (Just rStdin, Just rStdout, Nothing, ph) <-
+    createProcess (proc cmd args)
+      { std_in = CreatePipe
+      , std_out = CreatePipe
+      , std_err = UseHandle stderrBufHandle
+      }
+  hSetBuffering rStdin LineBuffering
+  hSetBuffering rStdout NoBuffering
+
+  -- run the test script which is to talk to the GHCi subprocess.
+  runReaderT actions (ReplConnection rStdin rStdout)
+    -- the nested actions script may fail in arbitrary ways; handle that here,
+    -- attaching the subprocess stderr as relevant context
+    `catch` \(e :: SomeException) -> do
+      putStrLn "=============================="
+      putStrLn "EXCEPTION in test: "
+      putStrLn . quote $ displayException e
+      putStrLn "------[ stderr of repl ]------"
+      withFile stderrBufPath ReadMode $ hGetContents' >=> putStr . quote
+      putStrLn "=============================="
+    `finally` do
+      hClose stderrBufHandle
+      removeFile stderrBufPath
+
+  -- once done with the test, signal EOF on stdin for clean termination of ghci
+  hClose rStdin
+  -- read out the exit-code
+  waitForProcess ph
+
+-- | Roll a bicycle, rather than just `import Path.IO (getTempDir, openTempFile)`,
+-- because it's a hassle to use anything beyond base & boot libs here.
+openTempStderrBufferFile :: IO (FilePath, Handle)
+openTempStderrBufferFile = getTempDir >>= (`openTempFile` "err.log") where
+  getTempDir | isWindows = fromMaybe "" <$> lookupEnv "TEMP"
+             | otherwise = pure "/tmp"
+
+-- | Testing helper to exercise `stack repl`.
+stackRepl :: HasCallStack => [String] -> Repl () -> IO ()
+stackRepl args action = do
+  stackExe' <- stackExe
+  ec <- runRepl stackExe' ("repl" : "--ghci-options=-ignore-dot-ghci" : args) action
+  unless (ec == ExitSuccess) $ do
+    putStrLn $ "repl exited with " <> show ec
+    exitFailure
+
+quote :: String -> String
+quote = unlines . map ("> " <>) . lines
diff --git a/test/integration/run-single-test.sh b/tests/integration/run-single-test.sh
similarity index 100%
rename from test/integration/run-single-test.sh
rename to tests/integration/run-single-test.sh
diff --git a/test/integration/run-sort-tests.sh b/tests/integration/run-sort-tests.sh
similarity index 100%
rename from test/integration/run-sort-tests.sh
rename to tests/integration/run-sort-tests.sh
diff --git a/tests/integration/tests/111-custom-snapshot/Main.hs b/tests/integration/tests/111-custom-snapshot/Main.hs
new file mode 100644
index 0000000000..b6498ef21a
--- /dev/null
+++ b/tests/integration/tests/111-custom-snapshot/Main.hs
@@ -0,0 +1,9 @@
+-- Stack should build a package when a custom snapshot is specified in the
+-- project-level configuration file.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/111
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/111-custom-snapshot/files/.gitignore b/tests/integration/tests/111-custom-snapshot/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/111-custom-snapshot/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml b/tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml
new file mode 100644
index 0000000000..9f6da9150c
--- /dev/null
+++ b/tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml
@@ -0,0 +1,5 @@
+name: my-snapshot
+
+compiler: ghc-9.10.3
+packages:
+- acme-missiles-0.3
diff --git a/tests/integration/tests/111-custom-snapshot/files/package.yaml b/tests/integration/tests/111-custom-snapshot/files/package.yaml
new file mode 100644
index 0000000000..c80a013e52
--- /dev/null
+++ b/tests/integration/tests/111-custom-snapshot/files/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- acme-missiles
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/111-custom-snapshot/files/src/Lib.hs b/tests/integration/tests/111-custom-snapshot/files/src/Lib.hs
new file mode 100644
index 0000000000..3635ec4a52
--- /dev/null
+++ b/tests/integration/tests/111-custom-snapshot/files/src/Lib.hs
@@ -0,0 +1,5 @@
+module Lib
+  ( launchMissiles
+  ) where
+
+import Acme.Missiles ( launchMissiles )
diff --git a/tests/integration/tests/111-custom-snapshot/files/stack.yaml b/tests/integration/tests/111-custom-snapshot/files/stack.yaml
new file mode 100644
index 0000000000..c00072833e
--- /dev/null
+++ b/tests/integration/tests/111-custom-snapshot/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: my-snapshot.yaml
diff --git a/tests/integration/tests/1198-multiple-exes-with-same-name/Main.hs b/tests/integration/tests/1198-multiple-exes-with-same-name/Main.hs
new file mode 100644
index 0000000000..1dcedba320
--- /dev/null
+++ b/tests/integration/tests/1198-multiple-exes-with-same-name/Main.hs
@@ -0,0 +1,28 @@
+-- Stack warns when more than one project package has an executable component of
+-- the same name.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/1198
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr
+    ["build", "myPackageA", "myPackageB"]
+    (expectMessage buildMessage1)
+  stackCheckStderr
+    ["build", "myPackageC"]
+    (expectMessage buildMessage2)
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr =
+  unless (msg `isInfixOf` stderr)
+  (error $ "Expected a warning: \n" ++ show msg)
+
+-- Use short message fragment because prettyWarn formatting and colour
+buildMessage1 = "Building several executables with the same name:"
+
+-- Use short message fragment because prettyWarn formatting and colour
+buildMessage2 = "Other executables with the same name"
diff --git a/tests/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore b/tests/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore
new file mode 100644
index 0000000000..c4ea0f5ab0
--- /dev/null
+++ b/tests/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore
@@ -0,0 +1,3 @@
+myPackageA.cabal
+myPackageB.cabal
+myPackageC.cabal
diff --git a/test/integration/tests/1659-skip-component/files/app/Main.hs b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageA/app/Main.hs
similarity index 100%
rename from test/integration/tests/1659-skip-component/files/app/Main.hs
rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageA/app/Main.hs
diff --git a/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageA/package.yaml b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..7a3a634c04
--- /dev/null
+++ b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageA/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/test/integration/tests/763-buildable-false/files/app/Main.hs b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageB/app/Main.hs
similarity index 100%
rename from test/integration/tests/763-buildable-false/files/app/Main.hs
rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageB/app/Main.hs
diff --git a/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageB/package.yaml b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..9ef40bf495
--- /dev/null
+++ b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageB/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/test/integration/tests/1659-skip-component/files/app/MainFail.hs b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageC/app/Main.hs
similarity index 100%
rename from test/integration/tests/1659-skip-component/files/app/MainFail.hs
rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageC/app/Main.hs
diff --git a/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageC/package.yaml b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageC/package.yaml
new file mode 100644
index 0000000000..add5c45908
--- /dev/null
+++ b/tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageC/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageC
+
+dependencies:
+- base
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/tests/integration/tests/1198-multiple-exes-with-same-name/files/stack.yaml b/tests/integration/tests/1198-multiple-exes-with-same-name/files/stack.yaml
new file mode 100644
index 0000000000..14a33de5df
--- /dev/null
+++ b/tests/integration/tests/1198-multiple-exes-with-same-name/files/stack.yaml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
+- myPackageC
diff --git a/tests/integration/tests/1265-extensible-snapshots/Main.hs b/tests/integration/tests/1265-extensible-snapshots/Main.hs
new file mode 100644
index 0000000000..a44bcc205b
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/Main.hs
@@ -0,0 +1,28 @@
+-- Stack supports extensible snapshots.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/1198
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build", "myPackageA", "--dry-run"]
+  -- Should fail because myPackageB depends on acme-box, which has been dropped:
+  stackErrStderr ["build", "myPackageB", "--dry-run"] (expectMessage acmeBoxNeeded)
+  stack ["build", "--stack-yaml", "stack-modify-lts.yaml", "myPackageA", "--dry-run"]
+  stack ["build", "--stack-yaml", "stack-local-snapshot.yaml", "myPackageC", "--dry-run"]
+  stack ["build", "--stack-yaml", "stack-remote-snapshot.yaml", "myPackageA", "--dry-run"]
+  -- Should fail because myPackageD depends on zlib, which has been dropped:
+  stackErrStderr
+    ["build", "--stack-yaml", "stack-modify-lts.yaml", "myPackageD", "--dry-run"]
+    (expectMessage zlibNeeded)
+ where
+  acmeBoxNeeded = "acme-box needed, but no version"
+  zlibNeeded = "zlib needed, but no version"
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr)
+         (error $ "Expected a warning: \n" ++ show msg)
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/.gitignore b/tests/integration/tests/1265-extensible-snapshots/files/.gitignore
new file mode 100644
index 0000000000..5087095541
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/.gitignore
@@ -0,0 +1,4 @@
+myPackageA.cabal
+myPackageB.cabal
+myPackageC.cabal
+myPackageD.cabal
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/myPackageA/package.yaml b/tests/integration/tests/1265-extensible-snapshots/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..ec081f26c0
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/myPackageA/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+- acme-missiles
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/myPackageA/src/Lib.hs b/tests/integration/tests/1265-extensible-snapshots/files/myPackageA/src/Lib.hs
new file mode 100644
index 0000000000..889210c825
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/myPackageA/src/Lib.hs
@@ -0,0 +1,5 @@
+module Lib
+  ( launchMissiles
+  ) where
+
+import           Acme.Missiles ( launchMissiles )
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/myPackageB/package.yaml b/tests/integration/tests/1265-extensible-snapshots/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..0ef22e6550
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/myPackageB/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+- acme-box
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/myPackageB/src/Lib.hs b/tests/integration/tests/1265-extensible-snapshots/files/myPackageB/src/Lib.hs
new file mode 100644
index 0000000000..af8de0c696
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/myPackageB/src/Lib.hs
@@ -0,0 +1,5 @@
+module Lib
+  ( box
+  ) where
+
+import           Acme.Box ( box )
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/myPackageC/package.yaml b/tests/integration/tests/1265-extensible-snapshots/files/myPackageC/package.yaml
new file mode 100644
index 0000000000..17a516d2c4
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/myPackageC/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackageC
+
+dependencies:
+- base
+- myPackage
+
+library:
+  source-dirs: src
diff --git a/test/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs b/tests/integration/tests/1265-extensible-snapshots/files/myPackageC/src/Lib.hs
similarity index 100%
rename from test/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs
rename to tests/integration/tests/1265-extensible-snapshots/files/myPackageC/src/Lib.hs
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/myPackageD/package.yaml b/tests/integration/tests/1265-extensible-snapshots/files/myPackageD/package.yaml
new file mode 100644
index 0000000000..766e1dd84a
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/myPackageD/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackageD
+
+dependencies:
+- base
+- zlib
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/myPackageD/src/Lib.hs b/tests/integration/tests/1265-extensible-snapshots/files/myPackageD/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/myPackageD/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml
new file mode 100644
index 0000000000..67a1547355
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml
@@ -0,0 +1,7 @@
+name: test-snapshot-2
+
+snapshot: ghc-9.10.3
+
+packages:
+- acme-missiles-0.3
+- acme-box-0.0.0.0
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml
new file mode 100644
index 0000000000..df0fa96fd4
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml
@@ -0,0 +1,9 @@
+name: snapshot-modify-lts
+
+snapshot: lts-24.55
+
+packages:
+- acme-missiles-0.3
+
+drop-packages:
+- zlib
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot.yaml
new file mode 100644
index 0000000000..bd797eccb9
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshot.yaml
@@ -0,0 +1,6 @@
+name: test-snapshot
+
+snapshot: snapshot-2.yaml
+
+drop-packages:
+- acme-box
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml
new file mode 100644
index 0000000000..feb04c6e76
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml
@@ -0,0 +1,6 @@
+name: local-snapshot
+
+snapshot: ghc-9.10.3
+
+packages:
+- archive: myPackage-0.1.0.0.tar.gz
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/myPackage-0.1.0.0.tar.gz b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/myPackage-0.1.0.0.tar.gz
new file mode 100644
index 0000000000..ce1a9e2a00
Binary files /dev/null and b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/myPackage-0.1.0.0.tar.gz differ
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml
new file mode 100644
index 0000000000..4ee61d3dfd
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml
@@ -0,0 +1,4 @@
+name: remote-snapshot
+snapshot: ghc-9.10.3
+packages:
+- archive: https://hackage.haskell.org/package/acme-missiles-0.3/acme-missiles-0.3.tar.gz
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml
new file mode 100644
index 0000000000..85d9a380b5
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml
@@ -0,0 +1,4 @@
+snapshot: snapshots/local-snapshot.yaml
+
+packages:
+- myPackageC
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml b/tests/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml
new file mode 100644
index 0000000000..cc8cca4759
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml
@@ -0,0 +1,5 @@
+snapshot: snapshot-modify-lts.yaml
+
+packages:
+- myPackageA
+- myPackageD
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml
new file mode 100644
index 0000000000..faa16c1912
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml
@@ -0,0 +1,4 @@
+snapshot: snapshots/remote-snapshot.yaml
+
+packages:
+- myPackageA
diff --git a/tests/integration/tests/1265-extensible-snapshots/files/stack.yaml b/tests/integration/tests/1265-extensible-snapshots/files/stack.yaml
new file mode 100644
index 0000000000..105c1ae1d7
--- /dev/null
+++ b/tests/integration/tests/1265-extensible-snapshots/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: snapshot.yaml
+
+packages:
+- myPackageA
+- myPackageB
diff --git a/tests/integration/tests/1336-1337-new-package-names/.gitignore b/tests/integration/tests/1336-1337-new-package-names/.gitignore
new file mode 100644
index 0000000000..ed73754e8e
--- /dev/null
+++ b/tests/integration/tests/1336-1337-new-package-names/.gitignore
@@ -0,0 +1,7 @@
+1b3d-a2c4/
+1234-abcd/
+abcd-1234/
+1234-ば日本-4本/
+ば日本-4本/
+אבהץש/
+ΔΘΩϬ/
diff --git a/tests/integration/tests/1336-1337-new-package-names/Main.hs b/tests/integration/tests/1336-1337-new-package-names/Main.hs
new file mode 100644
index 0000000000..83d15d9d0d
--- /dev/null
+++ b/tests/integration/tests/1336-1337-new-package-names/Main.hs
@@ -0,0 +1,32 @@
+-- Stack's new command accepts project names that are valid Cabal package names
+-- and rejects those that are not without creating a project directory.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/1336
+--      https://github.com/commercialhaskell/stack/issues/1337
+
+import           Control.Monad ( unless, when )
+import           StackTest
+import           System.Directory
+                   ( doesDirectoryExist, removeDirectoryRecursive )
+
+main :: IO ()
+main = do
+  safeNew "1b3d-a2c4"
+  doesExist "./1b3d-a2c4/stack.yaml"
+  doesExist "./1b3d-a2c4/1b3d-a2c4.cabal"
+  stackErr ["new", "1234-abcd"]
+  doesNotExist "./1234-abcd"
+  stackErr ["new", "abcd-1234"]
+  -- The GitHub windows-latest (Microsoft Windows Server 2025) environment
+  -- appears to be unable to handle these Unicode code points.
+  unless isWindows $ do
+    stackErr ["new", "1234-ば日本-4本"]
+    safeNew "ば日本-4本"
+    safeNew "אבהץש"
+    safeNew "ΔΘΩϬ"
+
+safeNew :: String -> IO ()
+safeNew name = do
+  exists <- doesDirectoryExist name
+  when exists $ removeDirectoryRecursive name
+  stack ["new", name]
diff --git a/tests/integration/tests/1337-unicode-everywhere/Main.hs b/tests/integration/tests/1337-unicode-everywhere/Main.hs
new file mode 100644
index 0000000000..4083a0c34f
--- /dev/null
+++ b/tests/integration/tests/1337-unicode-everywhere/Main.hs
@@ -0,0 +1,14 @@
+-- Stack accepts Unicode code points outside of the Basic Latin Unicode block
+-- (ASCII).
+--
+-- See: https://github.com/commercialhaskell/stack/issues/1337
+
+import           Control.Monad ( unless )
+import           StackTest
+
+main :: IO ()
+-- The GitHub windows-latest (Microsoft Windows Server 2025) environment appears
+-- to be unable to handle these Unicode code points.
+main = unless isWindows $ do
+  stack ["build"]
+  stack ["exec", "以-exe"]
diff --git a/tests/integration/tests/1337-unicode-everywhere/files/.gitignore b/tests/integration/tests/1337-unicode-everywhere/files/.gitignore
new file mode 100644
index 0000000000..207edb0d40
--- /dev/null
+++ b/tests/integration/tests/1337-unicode-everywhere/files/.gitignore
@@ -0,0 +1 @@
+以.cabal
diff --git a/tests/integration/tests/1337-unicode-everywhere/files/app/Main.hs b/tests/integration/tests/1337-unicode-everywhere/files/app/Main.hs
new file mode 100644
index 0000000000..c33747aa40
--- /dev/null
+++ b/tests/integration/tests/1337-unicode-everywhere/files/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import           Пσε ( θυπε )
+
+main :: IO ()
+main = putStrLn θυπε
diff --git a/tests/integration/tests/1337-unicode-everywhere/files/package.yaml b/tests/integration/tests/1337-unicode-everywhere/files/package.yaml
new file mode 100644
index 0000000000..3211b0f2e7
--- /dev/null
+++ b/tests/integration/tests/1337-unicode-everywhere/files/package.yaml
@@ -0,0 +1,79 @@
+spec-version: 0.36.0
+
+name: 以
+synopsis: سقوط المدن من ذات.
+description: |
+    以呂波耳本部止
+    千利奴流乎和加
+    餘多連曽津祢那
+    良牟有為能於久
+    耶万計不己衣天
+    阿佐伎喩女美之
+    恵比毛勢須
+
+    いろはにほへと
+    ちりぬるを
+    わかよたれそ
+    つねならむ
+    うゐのおくやま
+    けふこえて
+    あさきゆめみし
+    ゑひもせす
+
+    永
+
+    The quick brown fox jumps over the lazy dog
+
+    Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich
+
+    Δάματρα μέλπω Κόραν τε Κλυμένοι᾽ ἄλοχον
+    μελιβόαν ὕμνον ἀναγνέων
+    Αἰολίδ᾽ ἂμ βαρύβρομον ἁρμονίαν
+
+    Ед эож алььтэрюм витюпэраторебуз, фалля пожйдонёюм нэ квуй. Зюаз атоморюм эю
+    вэл, экз агам магна жкряпшэрит нам. Примич вокынт дэлььякатезшимя эа мэль,
+    ыам факэтэ пытынтёюм волуптатум ку. Квуым квюаэчтио йн пэр, дольор
+    форынчйбюж ут еюж. Эжт нонюмэш янвыняры эю.
+
+    Υθ φιμ λιβερ δισερετ κυαεστιο. Νε δυο σονγυε φιθυπερατοριβυς, θε φις αθκυι
+    σενσεριτ δεφινιεβας, μολλις θαμκυαμ ηας εα. Ιν φιμ εραντ μυσιυς, αλιι δισαντ
+    σομμοδο νο συμ. Πρι αμετ πορρω σονσεκυυντυρ ατ. Ιδ σεα ηομερω αδιπισι,
+    ομνεσκυε επισυρει ετ μελ, σεα αφφερθ σωνσεκυαθ θε.
+
+    नीचे खरिदे समस्याओ व्रुद्धि सुना शीघ्र व्याख्या निरपेक्ष शुरुआत असरकारक अविरोधता खरिदे मेमत उसीएक्
+    असरकारक आंतरकार्यक्षमता केवल करता। असक्षम सामूहिक विवरण हीकम सुनत सदस्य खरिदने उदेशीत
+
+    引全堀記物質行上初野年謝止質警細物競。委目態政業諸好岡積米真香冒班分団時大一夏。
+    帝同手怠問来視旧記次禁身妨性直権員。州駅都稿頂風著報計個勢意時言進整。
+    作敗約秘都並断旬検面事真区。則局世紙文般百校車社金名室権金練危。
+    水夫動間始旅円典中所場針仁暮中。書稿準提選別推五玲常能船岡味。
+    詩聞誌寧真身性業遠国無軽春臨個鳥相契断者。
+
+    紙ウ主転ね加必キト聴4水そない岩者づど会前ラシ総過権ぜ聞快にクげそ庫辺はぴず意掲ひに真価トしざが。体ろ名録ふいに公問築ムミ数基ー原多ぞぎすど済進ハレ見況ヤラエロ館刊キイ構読増禎ヨモメ提信最フ済席ワモキル弘28思弾5健はーろ提館ぱっるけ社除左てがひ。全てれ理時渉ン勝境チ測試ヌエマラ年9億ち込全クテヒカ土止びぎこぐ署進アカモヌ同賞誕傾吹敏こ。
+
+    سقوط المدن من ذات. ٠٨٠٤ تعديل إبّان عن هذه, لمّ في هامش الدمج. فرنسية الجنوب ولكسمبورغ حتى أم, مع بحث لكون الشمل استطاعوا, فعل بلاده انتهت تم. كما مع واحدة الخاسر, أخذ وإعلان الشمال رجوعهم أن. تعد تم بشكل مشارف الشرقي, هو مئات مهمّات أخذ.
+
+    בקר את הארץ מיתולוגיה. ובמתן העזרה דת מלא, שמו זקוק לחיבור אגרונומיה על. אל זכר התוכן מונחונים ארכיאולוגיה, ויש קצרמרים פסיכולוגיה אל. כתב אם בארגז אחרונים וכמקובל. ספינות ומדעים האטמוספירה ויש מה, צ'ט משחקים הקהילה ארכיאולוגיה על. אל כימיה המדינה סדר, זכר של שמות להפוך, ייִדיש לעריכת דת ויש.
+
+    😀😁😂😃😄😅😆😇😈😉😊😋😌😍😎😏
+    ➀➁➂➃➄➅➆➇➈➉
+    ♀♁♂♃♄♅♆♇♈♉♊♋♌♍♎♏
+    💩
+homepage: http://invalid/以#readme
+author: Fake 💩💩💩💩💩 Name
+maintainer: 以呂波耳本部止@invalid
+license-file: いろは-LICENSE
+category: Δσαντ
+
+dependencies:
+- base
+
+library:
+  source-dirs: ארץ
+
+executables:
+  以-exe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - 以
diff --git a/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml b/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git "a/tests/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs" "b/tests/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs"
new file mode 100644
index 0000000000..197831ba8e
--- /dev/null
+++ "b/tests/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs"
@@ -0,0 +1,6 @@
+module Пσε
+  ( θυπε
+  ) where
+
+θυπε :: String
+θυπε = "以呂波耳本部止"
diff --git "a/tests/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE" "b/tests/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE"
new file mode 100644
index 0000000000..3d8104feae
--- /dev/null
+++ "b/tests/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE"
@@ -0,0 +1,30 @@
+Copyright فلان الفلاني (c) 2026
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Author name here nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/integration/tests/1438-configure-options/Main.hs b/tests/integration/tests/1438-configure-options/Main.hs
new file mode 100644
index 0000000000..200dd344b2
--- /dev/null
+++ b/tests/integration/tests/1438-configure-options/Main.hs
@@ -0,0 +1,27 @@
+-- Stack allows Cabal configuration options to be set.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/1337
+
+import           Control.Monad ( unless )
+import           Data.Foldable ( for_ )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCleanFull
+  let stackYamlFiles =
+        [ "stack-locals.yaml"
+        , "stack-everything.yaml"
+        , "stack-targets.yaml"
+        , "stack-myPackage.yaml"
+        ]
+  for_ stackYamlFiles $ \stackYaml ->
+    stackErrStderr ["build", "--stack-yaml", stackYaml] $ \str ->
+      unless ("invalid option" `isInfixOf` str) $
+      error "Configure option is not present"
+
+  stack ["build", "--stack-yaml", "stack-locals.yaml", "acme-dont"]
+  stack ["build", "--stack-yaml", "stack-targets.yaml", "acme-dont"]
+  stackErr ["build", "--stack-yaml", "stack-name.yaml", "acme-dont"]
+  stackErr ["build", "--stack-yaml", "stack-everything.yaml", "acme-dont"]
diff --git a/tests/integration/tests/1438-configure-options/files/.gitignore b/tests/integration/tests/1438-configure-options/files/.gitignore
new file mode 100644
index 0000000000..eae186286f
--- /dev/null
+++ b/tests/integration/tests/1438-configure-options/files/.gitignore
@@ -0,0 +1,2 @@
+myPackage.cabal
+*.yaml.lock
diff --git a/tests/integration/tests/1438-configure-options/files/package.yaml b/tests/integration/tests/1438-configure-options/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/1438-configure-options/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/1438-configure-options/files/src/Lib.hs b/tests/integration/tests/1438-configure-options/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/1438-configure-options/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/test/integration/tests/1438-configure-options/files/stack-everything.yaml b/tests/integration/tests/1438-configure-options/files/stack-everything.yaml
similarity index 82%
rename from test/integration/tests/1438-configure-options/files/stack-everything.yaml
rename to tests/integration/tests/1438-configure-options/files/stack-everything.yaml
index b06e2c56b6..5346941606 100644
--- a/test/integration/tests/1438-configure-options/files/stack-everything.yaml
+++ b/tests/integration/tests/1438-configure-options/files/stack-everything.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.4
+snapshot: ghc-9.10.3
 
 extra-deps:
 - acme-dont-1.1@rev:0
diff --git a/test/integration/tests/1438-configure-options/files/stack-locals.yaml b/tests/integration/tests/1438-configure-options/files/stack-locals.yaml
similarity index 82%
rename from test/integration/tests/1438-configure-options/files/stack-locals.yaml
rename to tests/integration/tests/1438-configure-options/files/stack-locals.yaml
index 34f0bb893f..cf64377233 100644
--- a/test/integration/tests/1438-configure-options/files/stack-locals.yaml
+++ b/tests/integration/tests/1438-configure-options/files/stack-locals.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.4
+snapshot: ghc-9.10.3
 
 extra-deps:
 - acme-dont-1.1@rev:0
diff --git a/tests/integration/tests/1438-configure-options/files/stack-myPackage.yaml b/tests/integration/tests/1438-configure-options/files/stack-myPackage.yaml
new file mode 100644
index 0000000000..2e66b8b9ab
--- /dev/null
+++ b/tests/integration/tests/1438-configure-options/files/stack-myPackage.yaml
@@ -0,0 +1,10 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+- acme-dont-1.1@rev:0
+
+configure-options:
+  myPackage:
+  - this is an invalid option
+  acme-dont:
+  - this is an invalid option
diff --git a/test/integration/tests/1438-configure-options/files/stack-targets.yaml b/tests/integration/tests/1438-configure-options/files/stack-targets.yaml
similarity index 82%
rename from test/integration/tests/1438-configure-options/files/stack-targets.yaml
rename to tests/integration/tests/1438-configure-options/files/stack-targets.yaml
index 3858a6f039..65bd272f28 100644
--- a/test/integration/tests/1438-configure-options/files/stack-targets.yaml
+++ b/tests/integration/tests/1438-configure-options/files/stack-targets.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.2.4
+snapshot: ghc-9.10.3
 
 extra-deps:
 - acme-dont-1.1@rev:0
diff --git a/tests/integration/tests/1659-skip-component/Main.hs b/tests/integration/tests/1659-skip-component/Main.hs
new file mode 100644
index 0000000000..f5282d88d8
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/Main.hs
@@ -0,0 +1,10 @@
+-- Stack can be commanded to skip the building of specific package components.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/1659
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build", "--test", "--bench", "--skip", "test-failing", "--skip", "bench-failing", "--skip", "myExe-failing"]
+  stack ["build", ":test-failing", ":bench-failing", ":myExe", ":myExe-failing", "--skip", "test-failing", "--skip", "bench-failing", "--skip", "myExe-failing"]
diff --git a/tests/integration/tests/1659-skip-component/files/.gitignore b/tests/integration/tests/1659-skip-component/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/1659-skip-component/files/app-failing/Main.hs b/tests/integration/tests/1659-skip-component/files/app-failing/Main.hs
new file mode 100644
index 0000000000..fed6cef32a
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/files/app-failing/Main.hs
@@ -0,0 +1,13 @@
+{-# LANGUAGE CPP #-}
+
+module Main where
+
+main :: IO ()
+main = pure ()
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#error Not going to compile, sorry
+
+#endif
diff --git a/tests/integration/tests/1659-skip-component/files/app/Main.hs b/tests/integration/tests/1659-skip-component/files/app/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/files/app/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/1659-skip-component/files/bench/Main.hs b/tests/integration/tests/1659-skip-component/files/bench/Main.hs
new file mode 100644
index 0000000000..55ef017a49
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/files/bench/Main.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE CPP #-}
+
+main :: IO ()
+main = pure ()
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#error Not going to compile, sorry
+
+#endif
diff --git a/tests/integration/tests/1659-skip-component/files/package.yaml b/tests/integration/tests/1659-skip-component/files/package.yaml
new file mode 100644
index 0000000000..0b15e2fbce
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/files/package.yaml
@@ -0,0 +1,27 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+  myExe-failing:
+    source-dirs: app-failing
+    main: Main.hs
+
+tests:
+  test-failing:
+    source-dirs: test
+    main: Main.hs
+
+benchmarks:
+  bench-failing:
+    source-dirs: bench
+    main: Main.hs
diff --git a/tests/integration/tests/1659-skip-component/files/src/Lib.hs b/tests/integration/tests/1659-skip-component/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/1659-skip-component/files/stack.yaml b/tests/integration/tests/1659-skip-component/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/1659-skip-component/files/test/Main.hs b/tests/integration/tests/1659-skip-component/files/test/Main.hs
new file mode 100644
index 0000000000..55ef017a49
--- /dev/null
+++ b/tests/integration/tests/1659-skip-component/files/test/Main.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE CPP #-}
+
+main :: IO ()
+main = pure ()
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#error Not going to compile, sorry
+
+#endif
diff --git a/tests/integration/tests/1884-url-to-tarball/Main.hs b/tests/integration/tests/1884-url-to-tarball/Main.hs
new file mode 100644
index 0000000000..62e48d315c
--- /dev/null
+++ b/tests/integration/tests/1884-url-to-tarball/Main.hs
@@ -0,0 +1,8 @@
+-- Stack allows an extra-dep to be specified as a URL for an archive file.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/1884
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build", "--dry-run"]
diff --git a/tests/integration/tests/1884-url-to-tarball/files/.gitignore b/tests/integration/tests/1884-url-to-tarball/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/1884-url-to-tarball/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/1884-url-to-tarball/files/package.yaml b/tests/integration/tests/1884-url-to-tarball/files/package.yaml
new file mode 100644
index 0000000000..a410102517
--- /dev/null
+++ b/tests/integration/tests/1884-url-to-tarball/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- acme-missiles
+
+library: {}
diff --git a/tests/integration/tests/1884-url-to-tarball/files/stack.yaml b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml
new file mode 100644
index 0000000000..515a3914f1
--- /dev/null
+++ b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+- location: https://hackage.haskell.org/package/acme-missiles-0.3/acme-missiles-0.3.tar.gz
+  sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b
+  size: 1442
diff --git a/tests/integration/tests/2195-depend-on-exe/Main.hs b/tests/integration/tests/2195-depend-on-exe/Main.hs
new file mode 100644
index 0000000000..19fd17a3f0
--- /dev/null
+++ b/tests/integration/tests/2195-depend-on-exe/Main.hs
@@ -0,0 +1,18 @@
+-- Stack reports an error if a package component depends on a package that has
+-- no library component.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/2195
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = stackErrStderr
+  ["build", "myPackageB"]
+  (expectMessage "package provides no library")
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr =
+  unless (msg `isInfixOf` stderr)
+    (error $ "Expected a warning: \n" ++ show msg)
diff --git a/tests/integration/tests/2195-depend-on-exe/files/.gitignore b/tests/integration/tests/2195-depend-on-exe/files/.gitignore
new file mode 100644
index 0000000000..f9a6e152d2
--- /dev/null
+++ b/tests/integration/tests/2195-depend-on-exe/files/.gitignore
@@ -0,0 +1,2 @@
+myPackageA.cabal
+myPackageB.cabal
diff --git a/tests/integration/tests/2195-depend-on-exe/files/myPackageA/app/Main.hs b/tests/integration/tests/2195-depend-on-exe/files/myPackageA/app/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/2195-depend-on-exe/files/myPackageA/app/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/2195-depend-on-exe/files/myPackageA/package.yaml b/tests/integration/tests/2195-depend-on-exe/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..dc117d34c9
--- /dev/null
+++ b/tests/integration/tests/2195-depend-on-exe/files/myPackageA/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+executables:
+  myExeA:
+    source-dirs: app
+    main: Main.hs
diff --git a/tests/integration/tests/2195-depend-on-exe/files/myPackageB/package.yaml b/tests/integration/tests/2195-depend-on-exe/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..e5f489eebf
--- /dev/null
+++ b/tests/integration/tests/2195-depend-on-exe/files/myPackageB/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+- myPackageA
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/2195-depend-on-exe/files/myPackageB/src/Lib.hs b/tests/integration/tests/2195-depend-on-exe/files/myPackageB/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/2195-depend-on-exe/files/myPackageB/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/2195-depend-on-exe/files/stack.yaml b/tests/integration/tests/2195-depend-on-exe/files/stack.yaml
new file mode 100644
index 0000000000..68891a8d7c
--- /dev/null
+++ b/tests/integration/tests/2195-depend-on-exe/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
diff --git a/tests/integration/tests/2433-ghc-by-version/Main.hs b/tests/integration/tests/2433-ghc-by-version/Main.hs
new file mode 100644
index 0000000000..edec7684ea
--- /dev/null
+++ b/tests/integration/tests/2433-ghc-by-version/Main.hs
@@ -0,0 +1,13 @@
+-- If using a 'system' GHC, Stack uses the specified version of GHC on the PATH
+-- and not 'ghc' (without a version) on the PATH.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/2433
+
+import           Control.Exception ( throwIO )
+import           Control.Monad ( unless )
+import           StackTest
+import           System.Process ( rawSystem )
+
+main :: IO ()
+main = unless isWindows $
+  rawSystem "bash" ["run.sh"] >>= throwIO
diff --git a/test/integration/tests/2433-ghc-by-version/files/.gitignore b/tests/integration/tests/2433-ghc-by-version/files/.gitignore
similarity index 100%
rename from test/integration/tests/2433-ghc-by-version/files/.gitignore
rename to tests/integration/tests/2433-ghc-by-version/files/.gitignore
diff --git a/test/integration/tests/2433-ghc-by-version/files/fake-path/ghc b/tests/integration/tests/2433-ghc-by-version/files/fake-path/ghc
old mode 100755
new mode 100644
similarity index 100%
rename from test/integration/tests/2433-ghc-by-version/files/fake-path/ghc
rename to tests/integration/tests/2433-ghc-by-version/files/fake-path/ghc
diff --git a/test/integration/tests/2433-ghc-by-version/files/fake-path/ghc-pkg b/tests/integration/tests/2433-ghc-by-version/files/fake-path/ghc-pkg
old mode 100755
new mode 100644
similarity index 100%
rename from test/integration/tests/2433-ghc-by-version/files/fake-path/ghc-pkg
rename to tests/integration/tests/2433-ghc-by-version/files/fake-path/ghc-pkg
diff --git a/tests/integration/tests/2433-ghc-by-version/files/run.sh b/tests/integration/tests/2433-ghc-by-version/files/run.sh
new file mode 100644
index 0000000000..a7d103d1d3
--- /dev/null
+++ b/tests/integration/tests/2433-ghc-by-version/files/run.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -exuo pipefail
+
+export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --snapshot ghc-9.10.3 --compiler-bin):$PATH
+export STACK_ROOT=$(pwd)/fake-root
+
+which ghc
+
+"$STACK_EXE" --system-ghc --no-install-ghc --snapshot ghc-9.10.3 ghc -- --info
+"$STACK_EXE" --system-ghc --no-install-ghc --snapshot ghc-9.10.3 runghc test.hs
diff --git a/test/integration/tests/2433-ghc-by-version/files/foo.hs b/tests/integration/tests/2433-ghc-by-version/files/test.hs
similarity index 100%
rename from test/integration/tests/2433-ghc-by-version/files/foo.hs
rename to tests/integration/tests/2433-ghc-by-version/files/test.hs
diff --git a/tests/integration/tests/2465-init-no-packages/Main.hs b/tests/integration/tests/2465-init-no-packages/Main.hs
new file mode 100644
index 0000000000..3000a9dbc7
--- /dev/null
+++ b/tests/integration/tests/2465-init-no-packages/Main.hs
@@ -0,0 +1,13 @@
+-- Stack can initialise a project directory that contains no project packages.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/2465
+
+import           Control.Monad ( unless )
+import           StackTest
+import           System.Directory ( doesFileExist )
+
+main :: IO ()
+main = do
+  stack ["--snapshot", "ghc-9.10.3", "init"]
+  exists <- doesFileExist "stack.yaml"
+  unless exists $ error "stack.yaml not created!"
diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore b/tests/integration/tests/2465-init-no-packages/files/.gitignore
similarity index 100%
rename from test/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore
rename to tests/integration/tests/2465-init-no-packages/files/.gitignore
diff --git a/tests/integration/tests/2643-copy-compiler-tool/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/Main.hs
new file mode 100644
index 0000000000..d4e5d631ed
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/Main.hs
@@ -0,0 +1,50 @@
+-- Stack can install targets that are executables as compiler tools.
+
+-- See: https://github.com/commercialhaskell/stack/issues/2643
+
+import           Control.Monad ( unless )
+import           StackTest
+import           System.Directory ()
+
+main :: IO ()
+main = do
+  -- Install myExeA executable normally:
+  stack ["install",
+         "--local-bin-path", "./bin",
+         "--flag", "myPackage:build-myExeA"
+        ]
+
+  -- Install myExeB and myExeC executables as compiler tools, in alternative
+  -- ways (build or install):
+  stack ["build",
+         "--local-bin-path", "./bin",
+         "--copy-compiler-tool",
+         "--flag", "myPackage:build-myExeB"
+        ]
+  stack ["install",
+         "--local-bin-path", "./bin",
+         "--copy-compiler-tool",
+         "--flag", "myPackage:build-myExeC"
+        ]
+
+  -- Remove .stack-work/, so we can test if the installed ones exist:
+  stackCleanFull
+
+  -- myExeB and myExeC were installed as compiler tools and should work:
+  stack ["exec", "--", "myExeB" <> exeExt]
+  stack ["exec", "--", "myExeC" <> exeExt]
+
+  -- myExeA was installed in .bin/, which is not on the PATH, and should not
+  -- work.
+
+  -- The Windows condition is because `stackCleanFull` may have failed (see
+  -- issue #4936):
+  unless isWindows $ stackErr ["exec", "--", "myExeA" <> exeExt]
+
+  -- Check existences make sense:
+  doesExist $ "./bin/myExeA" <> exeExt
+  doesNotExist $ "./bin/myExeB" <> exeExt
+  doesNotExist $ "./bin/myExeC" <> exeExt
+
+  -- Check that this exists
+  stack ["path", "--compiler-tools-bin"]
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/.gitignore b/tests/integration/tests/2643-copy-compiler-tool/files/.gitignore
new file mode 100644
index 0000000000..f3f0a84c6f
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/.gitignore
@@ -0,0 +1,3 @@
+.stack-work/
+bin/
+myPackage.cabal
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/appA/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/files/appA/Main.hs
new file mode 100644
index 0000000000..a31c5a029d
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/appA/Main.hs
@@ -0,0 +1,4 @@
+module Main (main) where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/appB/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/files/appB/Main.hs
new file mode 100644
index 0000000000..a31c5a029d
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/appB/Main.hs
@@ -0,0 +1,4 @@
+module Main (main) where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/appC/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/files/appC/Main.hs
new file mode 100644
index 0000000000..a31c5a029d
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/appC/Main.hs
@@ -0,0 +1,4 @@
+module Main (main) where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/package.yaml b/tests/integration/tests/2643-copy-compiler-tool/files/package.yaml
new file mode 100644
index 0000000000..8759081629
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/package.yaml
@@ -0,0 +1,40 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+flags:
+  build-myExeA:
+    description: Build myExeA
+    default: false
+    manual: true
+  build-myExeB:
+    description: Build myExeB
+    default: false
+    manual: true
+  build-myExeC:
+    description: Build myExeC
+    default: false
+    manual: true
+
+dependencies:
+- base
+
+executables:
+  myExeA:
+    source-dirs: appA
+    main: Main.hs
+    when:
+    - condition: "!flag(build-myExeA)"
+      buildable: false
+  myExeB:
+    source-dirs: appB
+    main: Main.hs
+    when:
+    - condition: "!flag(build-myExeB)"
+      buildable: false
+  myExeC:
+    source-dirs: appC
+    main: Main.hs
+    when:
+    - condition: "!flag(build-myExeC)"
+      buildable: false
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/stack.yaml b/tests/integration/tests/2643-copy-compiler-tool/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/2781-shadow-bug/Main.hs b/tests/integration/tests/2781-shadow-bug/Main.hs
new file mode 100644
index 0000000000..7f9e65e4ba
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/Main.hs
@@ -0,0 +1,13 @@
+-- Stack rebuilds a benchmark when an indirect dependency changes.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/2781
+
+import           StackTest
+import           System.Directory ( createDirectoryIfMissing )
+
+main :: IO ()
+main = do
+  copy "myPackageB/v1/MyPackageB-v1.hs" "myPackageB/src/MyPackageB.hs"
+  stack ["bench"]
+  copy "myPackageB/v2/MyPackageB-v2.hs" "myPackageB/src/MyPackageB.hs"
+  stack ["bench"]
diff --git a/tests/integration/tests/2781-shadow-bug/files/.gitignore b/tests/integration/tests/2781-shadow-bug/files/.gitignore
new file mode 100644
index 0000000000..f9a6e152d2
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/files/.gitignore
@@ -0,0 +1,2 @@
+myPackageA.cabal
+myPackageB.cabal
diff --git a/test/integration/tests/2781-shadow-bug/files/bar/bench/bench.hs b/tests/integration/tests/2781-shadow-bug/files/myPackageA/bench/bench.hs
similarity index 100%
rename from test/integration/tests/2781-shadow-bug/files/bar/bench/bench.hs
rename to tests/integration/tests/2781-shadow-bug/files/myPackageA/bench/bench.hs
diff --git a/tests/integration/tests/2781-shadow-bug/files/myPackageA/package.yaml b/tests/integration/tests/2781-shadow-bug/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..eeb7c4fcc3
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/files/myPackageA/package.yaml
@@ -0,0 +1,18 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackageB
+
+benchmarks:
+  bench:
+    source-dirs: bench
+    main: bench.hs
+    dependencies:
+    - myPackageA
diff --git a/tests/integration/tests/2781-shadow-bug/files/myPackageA/src/MyPackageA.hs b/tests/integration/tests/2781-shadow-bug/files/myPackageA/src/MyPackageA.hs
new file mode 100644
index 0000000000..16b38c3d34
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/files/myPackageA/src/MyPackageA.hs
@@ -0,0 +1,8 @@
+module MyPackageA
+    ( funcA
+    ) where
+
+import MyPackageB ( funcB )
+
+funcA :: IO ()
+funcA = funcB
diff --git a/tests/integration/tests/2781-shadow-bug/files/myPackageB/package.yaml b/tests/integration/tests/2781-shadow-bug/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..03b4ec87d3
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/files/myPackageB/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/2781-shadow-bug/files/myPackageB/src/MyPackageB.hs b/tests/integration/tests/2781-shadow-bug/files/myPackageB/src/MyPackageB.hs
new file mode 100644
index 0000000000..e50e86ed07
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/files/myPackageB/src/MyPackageB.hs
@@ -0,0 +1 @@
+To be replaced.
diff --git a/tests/integration/tests/2781-shadow-bug/files/myPackageB/v1/MyPackageB-v1.hs b/tests/integration/tests/2781-shadow-bug/files/myPackageB/v1/MyPackageB-v1.hs
new file mode 100644
index 0000000000..38ae9f9985
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/files/myPackageB/v1/MyPackageB-v1.hs
@@ -0,0 +1,6 @@
+module MyPackageB
+  ( funcB
+  ) where
+
+funcB :: IO ()
+funcB = putStrLn "version 1"
diff --git a/tests/integration/tests/2781-shadow-bug/files/myPackageB/v2/MyPackageB-v2.hs b/tests/integration/tests/2781-shadow-bug/files/myPackageB/v2/MyPackageB-v2.hs
new file mode 100644
index 0000000000..a4584de18e
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/files/myPackageB/v2/MyPackageB-v2.hs
@@ -0,0 +1,6 @@
+module MyPackageB
+  ( funcB
+  ) where
+
+funcB :: IO ()
+funcB = putStrLn "version 2"
diff --git a/tests/integration/tests/2781-shadow-bug/files/stack.yaml b/tests/integration/tests/2781-shadow-bug/files/stack.yaml
new file mode 100644
index 0000000000..68891a8d7c
--- /dev/null
+++ b/tests/integration/tests/2781-shadow-bug/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
diff --git a/tests/integration/tests/2997-ensure-warnings-output/Main.hs b/tests/integration/tests/2997-ensure-warnings-output/Main.hs
new file mode 100644
index 0000000000..3b0b049dca
--- /dev/null
+++ b/tests/integration/tests/2997-ensure-warnings-output/Main.hs
@@ -0,0 +1,14 @@
+-- Stack dumps logs with GHC warnings for multi-package projects and
+-- non-interleaved output.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/2997
+
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr ["build", "--no-interleaved-output"] $ \str ->
+    if "no type signature" `isInfixOf` str
+      then pure ()
+      else error "Warnings are not being shown"
diff --git a/tests/integration/tests/2997-ensure-warnings-output/files/.gitignore b/tests/integration/tests/2997-ensure-warnings-output/files/.gitignore
new file mode 100644
index 0000000000..f9a6e152d2
--- /dev/null
+++ b/tests/integration/tests/2997-ensure-warnings-output/files/.gitignore
@@ -0,0 +1,2 @@
+myPackageA.cabal
+myPackageB.cabal
diff --git a/tests/integration/tests/2997-ensure-warnings-output/files/myPackageA/package.yaml b/tests/integration/tests/2997-ensure-warnings-output/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..5cb84d72e6
--- /dev/null
+++ b/tests/integration/tests/2997-ensure-warnings-output/files/myPackageA/package.yaml
@@ -0,0 +1,12 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+ghc-options:
+- -Wall
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/2997-ensure-warnings-output/files/myPackageA/src/Lib.hs b/tests/integration/tests/2997-ensure-warnings-output/files/myPackageA/src/Lib.hs
new file mode 100644
index 0000000000..2bcd1d55c1
--- /dev/null
+++ b/tests/integration/tests/2997-ensure-warnings-output/files/myPackageA/src/Lib.hs
@@ -0,0 +1,3 @@
+module Lib where
+
+func = ()
diff --git a/tests/integration/tests/2997-ensure-warnings-output/files/myPackageB/package.yaml b/tests/integration/tests/2997-ensure-warnings-output/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..77d87303d7
--- /dev/null
+++ b/tests/integration/tests/2997-ensure-warnings-output/files/myPackageB/package.yaml
@@ -0,0 +1,12 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+ghc-options:
+- -Wall
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/2997-ensure-warnings-output/files/myPackageB/src/Lib.hs b/tests/integration/tests/2997-ensure-warnings-output/files/myPackageB/src/Lib.hs
new file mode 100644
index 0000000000..2bcd1d55c1
--- /dev/null
+++ b/tests/integration/tests/2997-ensure-warnings-output/files/myPackageB/src/Lib.hs
@@ -0,0 +1,3 @@
+module Lib where
+
+func = ()
diff --git a/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml b/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml
new file mode 100644
index 0000000000..46f3e0977c
--- /dev/null
+++ b/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
+
+dump-logs: warning
diff --git a/tests/integration/tests/32-unlisted-module/Main.hs b/tests/integration/tests/32-unlisted-module/Main.hs
new file mode 100644
index 0000000000..bc0feae92f
--- /dev/null
+++ b/tests/integration/tests/32-unlisted-module/Main.hs
@@ -0,0 +1,30 @@
+-- Stack should rebuild a package when files required for building are dirty,
+-- even if the files are not listed in the package's Cabal file.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/32
+
+import           Control.Concurrent ( threadDelay )
+import           StackTest
+
+main :: IO ()
+main = do
+  copy "app/Unlisted_OK.hs" "app/Unlisted.hs"
+  copy "embed_OK.txt" "embed.txt"
+  stack ["build"]
+  pause
+  copy "app/Unlisted_FAIL.hs" "app/Unlisted.hs"
+  stackErr ["build"]
+  pause
+  copy "app/Unlisted_OK.hs" "app/Unlisted.hs"
+  stack ["build"]
+  stack ["exec", "fail-if-fail"]
+  pause
+  copy "embed_FAIL.txt" "embed.txt"
+  stack ["build"]
+  stackErr ["exec", "fail-if-fail"]
+  pause
+  copy "embed_OK.txt" "embed.txt"
+  stack ["build"]
+  stack ["exec", "fail-if-fail"]
+ where
+  pause = threadDelay 1000000
diff --git a/tests/integration/tests/32-unlisted-module/files/.gitignore b/tests/integration/tests/32-unlisted-module/files/.gitignore
new file mode 100644
index 0000000000..5983ce17cb
--- /dev/null
+++ b/tests/integration/tests/32-unlisted-module/files/.gitignore
@@ -0,0 +1,3 @@
+embed.txt
+app/Unlisted.hs
+myPackage.cabal
diff --git a/tests/integration/tests/32-unlisted-module/files/app/Main.hs b/tests/integration/tests/32-unlisted-module/files/app/Main.hs
new file mode 100644
index 0000000000..6328508c11
--- /dev/null
+++ b/tests/integration/tests/32-unlisted-module/files/app/Main.hs
@@ -0,0 +1,16 @@
+{-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Main where
+
+import           Control.Monad ( when )
+import qualified Data.ByteString.Char8 as C8
+import           Data.FileEmbed ( embedFile )
+import           Unlisted ( unlistedFunc )
+
+main :: IO ()
+main = do
+  unlistedFunc
+  when ("FAIL" `C8.isPrefixOf` embedded) $ error "embedded contains FAIL"
+
+embedded = $(embedFile "embed.txt")
diff --git a/tests/integration/tests/32-unlisted-module/files/app/Unlisted_FAIL.hs b/tests/integration/tests/32-unlisted-module/files/app/Unlisted_FAIL.hs
new file mode 100644
index 0000000000..35b46d7b50
--- /dev/null
+++ b/tests/integration/tests/32-unlisted-module/files/app/Unlisted_FAIL.hs
@@ -0,0 +1,3 @@
+-- | Version of Unlisted with a different export that causes Main to fail to
+-- compile.
+module Unlisted where
diff --git a/tests/integration/tests/32-unlisted-module/files/app/Unlisted_OK.hs b/tests/integration/tests/32-unlisted-module/files/app/Unlisted_OK.hs
new file mode 100644
index 0000000000..000f75684c
--- /dev/null
+++ b/tests/integration/tests/32-unlisted-module/files/app/Unlisted_OK.hs
@@ -0,0 +1,5 @@
+-- | Version of Unlisted that does not cause Main to fail to compile.
+module Unlisted where
+
+unlistedFunc :: IO ()
+unlistedFunc = pure ()
diff --git a/test/integration/tests/32-unlisted-module/files/embed_FAIL.txt b/tests/integration/tests/32-unlisted-module/files/embed_FAIL.txt
similarity index 100%
rename from test/integration/tests/32-unlisted-module/files/embed_FAIL.txt
rename to tests/integration/tests/32-unlisted-module/files/embed_FAIL.txt
diff --git a/test/integration/tests/32-unlisted-module/files/embed_OK.txt b/tests/integration/tests/32-unlisted-module/files/embed_OK.txt
similarity index 100%
rename from test/integration/tests/32-unlisted-module/files/embed_OK.txt
rename to tests/integration/tests/32-unlisted-module/files/embed_OK.txt
diff --git a/tests/integration/tests/32-unlisted-module/files/package.yaml b/tests/integration/tests/32-unlisted-module/files/package.yaml
new file mode 100644
index 0000000000..bf5bf390a9
--- /dev/null
+++ b/tests/integration/tests/32-unlisted-module/files/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- bytestring
+- file-embed
+
+executables:
+  fail-if-fail:
+    source-dirs: app
+    main: Main.hs
+    other-modules: []
diff --git a/tests/integration/tests/32-unlisted-module/files/stack.yaml b/tests/integration/tests/32-unlisted-module/files/stack.yaml
new file mode 100644
index 0000000000..a57c6e7a52
--- /dev/null
+++ b/tests/integration/tests/32-unlisted-module/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: lts-24.55
diff --git a/tests/integration/tests/3315-multi-ghc-options/Main.hs b/tests/integration/tests/3315-multi-ghc-options/Main.hs
new file mode 100644
index 0000000000..bf93687b96
--- /dev/null
+++ b/tests/integration/tests/3315-multi-ghc-options/Main.hs
@@ -0,0 +1,10 @@
+-- Stack allows one or more GHC options to be specified on the command line.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3315
+
+import           StackTest.Repl
+
+main :: IO ()
+main = do
+  stack ["build", "--ghc-options=-ddump-simpl -ddump-asm -DVARIABLE_A -DVARIABLE_B"]
+  stackRepl ["--ghc-options=-ddump-simpl -ddump-asm"] (pure ())
diff --git a/tests/integration/tests/3315-multi-ghc-options/files/.gitignore b/tests/integration/tests/3315-multi-ghc-options/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3315-multi-ghc-options/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3315-multi-ghc-options/files/package.yaml b/tests/integration/tests/3315-multi-ghc-options/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/3315-multi-ghc-options/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/3315-multi-ghc-options/files/src/Lib.hs b/tests/integration/tests/3315-multi-ghc-options/files/src/Lib.hs
new file mode 100644
index 0000000000..71ccd7f83b
--- /dev/null
+++ b/tests/integration/tests/3315-multi-ghc-options/files/src/Lib.hs
@@ -0,0 +1,16 @@
+{-# LANGUAGE CPP #-}
+
+module Lib where
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#ifndef VARIABLE_A
+#error VARIABLE_A isn't defined
+#endif
+
+#ifndef VARIABLE_B
+#error VARIABLE_B isn't defined
+#endif
+
+#endif
diff --git a/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml b/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/335-multi-package-flags/Main.hs b/tests/integration/tests/335-multi-package-flags/Main.hs
new file mode 100644
index 0000000000..4e6aa05311
--- /dev/null
+++ b/tests/integration/tests/335-multi-package-flags/Main.hs
@@ -0,0 +1,13 @@
+-- Stack should be able to specify Cabal flags for all packages that have a
+-- Cabal flag of the same name.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/335
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stackErr ["build"]
+  stack ["build", "--flag", "myPackage:necessary"]
+  stackErr ["build"]
+  stack ["build", "--flag", "*:necessary"]
diff --git a/tests/integration/tests/335-multi-package-flags/files/.gitignore b/tests/integration/tests/335-multi-package-flags/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/335-multi-package-flags/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/335-multi-package-flags/files/package.yaml b/tests/integration/tests/335-multi-package-flags/files/package.yaml
new file mode 100644
index 0000000000..973e01a4f6
--- /dev/null
+++ b/tests/integration/tests/335-multi-package-flags/files/package.yaml
@@ -0,0 +1,18 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+flags:
+  necessary:
+    description: The package will not build unless this flag is true.
+    manual: true
+    default: false
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  when:
+  - condition: flag(necessary)
+    cpp-options: -DWORK
diff --git a/tests/integration/tests/335-multi-package-flags/files/src/Lib.hs b/tests/integration/tests/335-multi-package-flags/files/src/Lib.hs
new file mode 100644
index 0000000000..eccdf60245
--- /dev/null
+++ b/tests/integration/tests/335-multi-package-flags/files/src/Lib.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE CPP #-}
+
+module Lib where
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#if !WORK
+#error Not going to work, sorry
+#endif
+
+#endif
diff --git a/tests/integration/tests/335-multi-package-flags/files/stack.yaml b/tests/integration/tests/335-multi-package-flags/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/335-multi-package-flags/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3390-unbuildable-test/Main.hs b/tests/integration/tests/3390-unbuildable-test/Main.hs
new file mode 100644
index 0000000000..d6e021b8b4
--- /dev/null
+++ b/tests/integration/tests/3390-unbuildable-test/Main.hs
@@ -0,0 +1,8 @@
+-- Stack ignores test suites that are not buildable.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3390
+
+import           StackTest
+
+main :: IO ()
+main = stack ["test"]
diff --git a/tests/integration/tests/3390-unbuildable-test/files/.gitignore b/tests/integration/tests/3390-unbuildable-test/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3390-unbuildable-test/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3390-unbuildable-test/files/package.yaml b/tests/integration/tests/3390-unbuildable-test/files/package.yaml
new file mode 100644
index 0000000000..da5df8ac33
--- /dev/null
+++ b/tests/integration/tests/3390-unbuildable-test/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+tests:
+  myTest:
+    source-dirs: test
+    main: Main.hs
+    buildable: false
diff --git a/tests/integration/tests/3390-unbuildable-test/files/stack.yaml b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/test/integration/tests/3390-unbuildable-test/files/test/Spec.hs b/tests/integration/tests/3390-unbuildable-test/files/test/Main.hs
similarity index 100%
rename from test/integration/tests/3390-unbuildable-test/files/test/Spec.hs
rename to tests/integration/tests/3390-unbuildable-test/files/test/Main.hs
diff --git a/tests/integration/tests/3431-precompiled-works/Main.hs b/tests/integration/tests/3431-precompiled-works/Main.hs
new file mode 100644
index 0000000000..33d2ef971a
--- /dev/null
+++ b/tests/integration/tests/3431-precompiled-works/Main.hs
@@ -0,0 +1,14 @@
+-- Stack uses pre-compiled immutable packages where it can.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3431
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build", "random-1.1", "--stack-yaml", "custom1/stack.yaml"]
+  stackCheckStderr ["build", "random-1.1", "--stack-yaml", "custom2/stack.yaml"] $ \out -> do
+    print out
+    unless ("precompiled" `isInfixOf` out) $ error "Didn't use precompiled!"
diff --git a/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml b/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml
new file mode 100644
index 0000000000..5223c8b3e3
--- /dev/null
+++ b/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml
@@ -0,0 +1,4 @@
+name: custom1
+snapshot: ghc-9.10.3
+packages:
+- acme-missiles-0.3
diff --git a/tests/integration/tests/3431-precompiled-works/files/custom1/stack.yaml b/tests/integration/tests/3431-precompiled-works/files/custom1/stack.yaml
new file mode 100644
index 0000000000..601e57ecbc
--- /dev/null
+++ b/tests/integration/tests/3431-precompiled-works/files/custom1/stack.yaml
@@ -0,0 +1,2 @@
+snapshot: custom1.yaml
+packages: []
diff --git a/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml
new file mode 100644
index 0000000000..566739fa3e
--- /dev/null
+++ b/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml
@@ -0,0 +1,4 @@
+name: custom2
+snapshot: ghc-9.10.3
+packages:
+- acme-missiles-0.2
diff --git a/tests/integration/tests/3431-precompiled-works/files/custom2/stack.yaml b/tests/integration/tests/3431-precompiled-works/files/custom2/stack.yaml
new file mode 100644
index 0000000000..c43f268e81
--- /dev/null
+++ b/tests/integration/tests/3431-precompiled-works/files/custom2/stack.yaml
@@ -0,0 +1,2 @@
+snapshot: custom2.yaml
+packages: []
diff --git a/tests/integration/tests/345-override-bytestring/Main.hs b/tests/integration/tests/345-override-bytestring/Main.hs
new file mode 100644
index 0000000000..1e1d847024
--- /dev/null
+++ b/tests/integration/tests/345-override-bytestring/Main.hs
@@ -0,0 +1,9 @@
+-- An extra-dep in a project-level configuration file should be able to shadow a
+-- GHC boot package such as bytestring.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/345
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/345-override-bytestring/files/.gitignore b/tests/integration/tests/345-override-bytestring/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/345-override-bytestring/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/345-override-bytestring/files/package.yaml b/tests/integration/tests/345-override-bytestring/files/package.yaml
new file mode 100644
index 0000000000..4259e06ace
--- /dev/null
+++ b/tests/integration/tests/345-override-bytestring/files/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- bytestring
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/345-override-bytestring/files/src/Lib.hs b/tests/integration/tests/345-override-bytestring/files/src/Lib.hs
new file mode 100644
index 0000000000..c06ea6cd1f
--- /dev/null
+++ b/tests/integration/tests/345-override-bytestring/files/src/Lib.hs
@@ -0,0 +1,3 @@
+module Lib where
+
+import           Data.ByteString ()
diff --git a/tests/integration/tests/345-override-bytestring/files/stack.yaml b/tests/integration/tests/345-override-bytestring/files/stack.yaml
new file mode 100644
index 0000000000..8d391e6d16
--- /dev/null
+++ b/tests/integration/tests/345-override-bytestring/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+# GHC 9.10.3 comes with bytestring-0.12.2.0
+- bytestring-0.12.1.0
diff --git a/tests/integration/tests/3574-extra-dep-local/Main.hs b/tests/integration/tests/3574-extra-dep-local/Main.hs
new file mode 100644
index 0000000000..e9b1b0286b
--- /dev/null
+++ b/tests/integration/tests/3574-extra-dep-local/Main.hs
@@ -0,0 +1,9 @@
+-- Stack can target a local extra-dep and distinguishes local extra-deps from
+-- local packages, when applying GHC options to local packages.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3574
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build", "myPackage"]
diff --git a/tests/integration/tests/3574-extra-dep-local/files/.gitignore b/tests/integration/tests/3574-extra-dep-local/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3574-extra-dep-local/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3574-extra-dep-local/files/myPackage/package.yaml b/tests/integration/tests/3574-extra-dep-local/files/myPackage/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/3574-extra-dep-local/files/myPackage/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/3574-extra-dep-local/files/myPackage/src/Lib.hs b/tests/integration/tests/3574-extra-dep-local/files/myPackage/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/3574-extra-dep-local/files/myPackage/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/3574-extra-dep-local/files/stack.yaml b/tests/integration/tests/3574-extra-dep-local/files/stack.yaml
new file mode 100644
index 0000000000..991c6d6ede
--- /dev/null
+++ b/tests/integration/tests/3574-extra-dep-local/files/stack.yaml
@@ -0,0 +1,9 @@
+snapshot: ghc-9.10.3
+
+packages: []
+
+extra-deps:
+- myPackage
+
+ghc-options:
+  $locals: -dummy
diff --git a/tests/integration/tests/3591-cabal-warnings-once/Main.hs b/tests/integration/tests/3591-cabal-warnings-once/Main.hs
new file mode 100644
index 0000000000..c094b33158
--- /dev/null
+++ b/tests/integration/tests/3591-cabal-warnings-once/Main.hs
@@ -0,0 +1,14 @@
+-- Stack warns about unknown fields in Cabal files, but only once.
+--
+-- https://github.com/commercialhaskell/stack/issues/3591
+
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr ["build", "--dry-run"] $ \str ->
+    case filter ("unknown-cabal-field-name" `isInfixOf`) (lines str) of
+      [] -> error "unknown-Cabal-field-name didn't appear once"
+      [_] -> pure ()
+      _:_:_ -> error "unknown-Cabal-field-name appeared multiple times"
diff --git a/tests/integration/tests/3591-cabal-warnings-once/files/.gitignore b/tests/integration/tests/3591-cabal-warnings-once/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3591-cabal-warnings-once/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3591-cabal-warnings-once/files/package.yaml b/tests/integration/tests/3591-cabal-warnings-once/files/package.yaml
new file mode 100644
index 0000000000..a3a9b0e627
--- /dev/null
+++ b/tests/integration/tests/3591-cabal-warnings-once/files/package.yaml
@@ -0,0 +1,12 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+verbatim:
+  unknown-Cabal-field-name: makes a warning!
diff --git a/tests/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs b/tests/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3631-build-http2/Main.hs b/tests/integration/tests/3631-build-http2/Main.hs
new file mode 100644
index 0000000000..86e1a37637
--- /dev/null
+++ b/tests/integration/tests/3631-build-http2/Main.hs
@@ -0,0 +1,10 @@
+-- Stack can build the http2 package.
+--
+-- https://github.com/commercialhaskell/stack/issues/3631
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build", defaultSnapshotArg, "--dry-run", "http2"]
+  stack ["build", defaultSnapshotArg, "http2"]
diff --git a/tests/integration/tests/365-invalid-success/Main.hs b/tests/integration/tests/365-invalid-success/Main.hs
new file mode 100644
index 0000000000..64a1e640a0
--- /dev/null
+++ b/tests/integration/tests/365-invalid-success/Main.hs
@@ -0,0 +1,17 @@
+-- If Stack fails to build a package once, it should fail to build it
+-- (unchanged) a second time.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/365
+
+import           StackTest
+
+main :: IO ()
+main = do
+  copy "src/Lib_FAIL.hs" "src/Lib.hs"
+  stackErr ["build"]
+  stackErr ["build"]
+  copy "src/Lib_OK.hs" "src/Lib.hs"
+  stack ["build"]
+  copy "src/Lib_FAIL.hs" "src/Lib.hs"
+  stackErr ["build"]
+  stackErr ["build"]
diff --git a/tests/integration/tests/365-invalid-success/files/.gitignore b/tests/integration/tests/365-invalid-success/files/.gitignore
new file mode 100644
index 0000000000..bf0c94dd4e
--- /dev/null
+++ b/tests/integration/tests/365-invalid-success/files/.gitignore
@@ -0,0 +1,2 @@
+src/Lib.hs
+myPackage.cabal
diff --git a/tests/integration/tests/365-invalid-success/files/package.yaml b/tests/integration/tests/365-invalid-success/files/package.yaml
new file mode 100644
index 0000000000..bb02298ab5
--- /dev/null
+++ b/tests/integration/tests/365-invalid-success/files/package.yaml
@@ -0,0 +1,12 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  exposed-modules:
+  - Lib
+  other-modules: []
diff --git a/tests/integration/tests/365-invalid-success/files/src/Lib_FAIL.hs b/tests/integration/tests/365-invalid-success/files/src/Lib_FAIL.hs
new file mode 100644
index 0000000000..764550ce44
--- /dev/null
+++ b/tests/integration/tests/365-invalid-success/files/src/Lib_FAIL.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE CPP #-}
+
+-- | Version of Lib that does not compile.
+module Lib where
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#error Not going to compile, sorry
+
+#endif
diff --git a/tests/integration/tests/365-invalid-success/files/src/Lib_OK.hs b/tests/integration/tests/365-invalid-success/files/src/Lib_OK.hs
new file mode 100644
index 0000000000..8745d54bd6
--- /dev/null
+++ b/tests/integration/tests/365-invalid-success/files/src/Lib_OK.hs
@@ -0,0 +1,2 @@
+-- | Version of Lib that does compile.
+module Lib where
diff --git a/tests/integration/tests/365-invalid-success/files/stack.yaml b/tests/integration/tests/365-invalid-success/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/365-invalid-success/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/366-non-root-dir/Main.hs b/tests/integration/tests/366-non-root-dir/Main.hs
new file mode 100644
index 0000000000..1a7697a78a
--- /dev/null
+++ b/tests/integration/tests/366-non-root-dir/Main.hs
@@ -0,0 +1,12 @@
+-- Stack builds when commanded from a subdirectory of the project directory.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/366
+
+import           StackTest
+import           System.Directory ( setCurrentDirectory )
+
+main :: IO ()
+main = do
+  setCurrentDirectory "app"
+  stack ["build"]
+  stack ["exec", "myExe"]
diff --git a/tests/integration/tests/366-non-root-dir/files/.gitignore b/tests/integration/tests/366-non-root-dir/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/366-non-root-dir/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/366-non-root-dir/files/app/Main.hs b/tests/integration/tests/366-non-root-dir/files/app/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/366-non-root-dir/files/app/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/366-non-root-dir/files/package.yaml b/tests/integration/tests/366-non-root-dir/files/package.yaml
new file mode 100644
index 0000000000..ee1f9f8afa
--- /dev/null
+++ b/tests/integration/tests/366-non-root-dir/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/tests/integration/tests/366-non-root-dir/files/stack.yaml b/tests/integration/tests/366-non-root-dir/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/366-non-root-dir/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3685-config-yaml-for-allow-newer/Main.hs b/tests/integration/tests/3685-config-yaml-for-allow-newer/Main.hs
new file mode 100644
index 0000000000..09d8c46d6e
--- /dev/null
+++ b/tests/integration/tests/3685-config-yaml-for-allow-newer/Main.hs
@@ -0,0 +1,21 @@
+-- Stack advises the use of allow-newer in a configuration file if the package
+-- versions needed are not the version in the snapshot.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3685
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+planRecommendation :: String
+planRecommendation = "To ignore all version constraints"
+
+main :: IO ()
+main =
+  -- intero-0.1.23 chosen because it depends on ghc >=7.8 && <8.2.2.
+  stackErrStderr ["install", "intero-0.1.23"] (expectMessage planRecommendation)
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected a recommendation: \n" ++ show msg
diff --git a/tests/integration/tests/3685-config-yaml-for-allow-newer/files/stack.yaml b/tests/integration/tests/3685-config-yaml-for-allow-newer/files/stack.yaml
new file mode 100644
index 0000000000..6a6f9b1438
--- /dev/null
+++ b/tests/integration/tests/3685-config-yaml-for-allow-newer/files/stack.yaml
@@ -0,0 +1,3 @@
+snapshot: lts-24.55
+
+packages: []
diff --git a/tests/integration/tests/370-invalid-setup-hs/Main.hs b/tests/integration/tests/370-invalid-setup-hs/Main.hs
new file mode 100644
index 0000000000..08d1440472
--- /dev/null
+++ b/tests/integration/tests/370-invalid-setup-hs/Main.hs
@@ -0,0 +1,8 @@
+-- Stack ignores a package's Setup.hs file when the Cabal build type is Simple.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/370
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/370-invalid-setup-hs/files/.gitignore b/tests/integration/tests/370-invalid-setup-hs/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/370-invalid-setup-hs/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/370-invalid-setup-hs/files/Setup.hs b/tests/integration/tests/370-invalid-setup-hs/files/Setup.hs
new file mode 100644
index 0000000000..58838f89a6
--- /dev/null
+++ b/tests/integration/tests/370-invalid-setup-hs/files/Setup.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE CPP #-}
+
+-- A bogus Setup.hs file that does not compile
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#error Not going to compile, sorry
+
+#endif
diff --git a/tests/integration/tests/370-invalid-setup-hs/files/package.yaml b/tests/integration/tests/370-invalid-setup-hs/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/370-invalid-setup-hs/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/370-invalid-setup-hs/files/src/Lib.hs b/tests/integration/tests/370-invalid-setup-hs/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/370-invalid-setup-hs/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml b/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3770-no-rerun-tests/Main.hs b/tests/integration/tests/3770-no-rerun-tests/Main.hs
new file mode 100644
index 0000000000..a4c98951aa
--- /dev/null
+++ b/tests/integration/tests/3770-no-rerun-tests/Main.hs
@@ -0,0 +1,25 @@
+-- | Stack can avoid re-running successful test suites.
+--
+-- See: https://github.com/commercialhaskell/stack/pull/3770
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr ["test"] (expectMessage testSuitePassed)
+  stackCheckStderr
+    ["test", "--no-rerun-tests"]
+    (expectMessage skippedAlreadyPassedTest)
+
+testSuitePassed :: String
+testSuitePassed = "Test suite test passed"
+
+skippedAlreadyPassedTest :: String
+skippedAlreadyPassedTest = "skipping already passed test"
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected output: \n" ++ show msg
diff --git a/tests/integration/tests/3770-no-rerun-tests/files/.gitignore b/tests/integration/tests/3770-no-rerun-tests/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3770-no-rerun-tests/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3770-no-rerun-tests/files/package.yaml b/tests/integration/tests/3770-no-rerun-tests/files/package.yaml
new file mode 100644
index 0000000000..9a50489941
--- /dev/null
+++ b/tests/integration/tests/3770-no-rerun-tests/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
diff --git a/tests/integration/tests/3770-no-rerun-tests/files/stack.yaml b/tests/integration/tests/3770-no-rerun-tests/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3770-no-rerun-tests/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/test/integration/tests/366-non-root-dir/files/app/Main.hs b/tests/integration/tests/3770-no-rerun-tests/files/test/Main.hs
similarity index 100%
rename from test/integration/tests/366-non-root-dir/files/app/Main.hs
rename to tests/integration/tests/3770-no-rerun-tests/files/test/Main.hs
diff --git a/tests/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs b/tests/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs
new file mode 100644
index 0000000000..415d810f0a
--- /dev/null
+++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs
@@ -0,0 +1,9 @@
+-- Stack builds a package with a private named sublibrary (an internal library)
+-- but no main library.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3787
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/.gitignore b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/app/Main.hs b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/app/Main.hs
new file mode 100644
index 0000000000..a392820cc0
--- /dev/null
+++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib ( someFunc )
+
+main :: IO ()
+main = someFunc
diff --git a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/int/Lib.hs b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/int/Lib.hs
new file mode 100644
index 0000000000..35dc3b3347
--- /dev/null
+++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/int/Lib.hs
@@ -0,0 +1,6 @@
+module Lib
+  ( someFunc
+  ) where
+
+someFunc :: IO ()
+someFunc = pure ()
diff --git a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/package.yaml b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/package.yaml
new file mode 100644
index 0000000000..c3b0d2aaf8
--- /dev/null
+++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/package.yaml
@@ -0,0 +1,17 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+internal-libraries:
+  internal:
+    source-dirs: int
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - internal
diff --git a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/384-local-deps/Main.hs b/tests/integration/tests/384-local-deps/Main.hs
new file mode 100644
index 0000000000..ae4c43fa95
--- /dev/null
+++ b/tests/integration/tests/384-local-deps/Main.hs
@@ -0,0 +1,11 @@
+-- Stack can initialise a multi-project package where one project package
+-- depends on another project package.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/384
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["init"]
+  stack ["build"]
diff --git a/tests/integration/tests/384-local-deps/files/.gitignore b/tests/integration/tests/384-local-deps/files/.gitignore
new file mode 100644
index 0000000000..11a5409872
--- /dev/null
+++ b/tests/integration/tests/384-local-deps/files/.gitignore
@@ -0,0 +1,3 @@
+stack.yaml
+myPackageA.cabal
+myPackageB.cabal
diff --git a/tests/integration/tests/384-local-deps/files/myPackageA/package.yaml b/tests/integration/tests/384-local-deps/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..d26b472ded
--- /dev/null
+++ b/tests/integration/tests/384-local-deps/files/myPackageA/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/384-local-deps/files/myPackageA/src/Lib.hs b/tests/integration/tests/384-local-deps/files/myPackageA/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/384-local-deps/files/myPackageA/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/384-local-deps/files/myPackageB/package.yaml b/tests/integration/tests/384-local-deps/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..e5f489eebf
--- /dev/null
+++ b/tests/integration/tests/384-local-deps/files/myPackageB/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+- myPackageA
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/384-local-deps/files/myPackageB/src/Lib.hs b/tests/integration/tests/384-local-deps/files/myPackageB/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/384-local-deps/files/myPackageB/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/3850-cached-templates-network-errors/Main.hs b/tests/integration/tests/3850-cached-templates-network-errors/Main.hs
new file mode 100644
index 0000000000..80c1c706ad
--- /dev/null
+++ b/tests/integration/tests/3850-cached-templates-network-errors/Main.hs
@@ -0,0 +1,40 @@
+-- Stack can used cached Stack project templates.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3850
+
+import           Control.Exception ( bracket )
+import           Control.Monad ( unless, when )
+import           Data.List ( isInfixOf )
+import           Data.Maybe ( fromMaybe )
+import           StackTest
+import           System.Directory ( removeDirectoryRecursive )
+import           System.Environment ( lookupEnv, setEnv )
+
+main :: IO ()
+main = when isLinux $ do
+  performCachingTest "myProjectA" "myProjectB" templateUrl
+  performCachingTest "myProjectC" "myProjectD" githubTemplate
+ where
+  performCachingTest :: String -> String -> String -> IO ()
+  performCachingTest projectName1 projectName2 template = do
+    let arguments = ["new", projectName1, template]
+    bracket
+      ( lookupEnv "HTTPS_PROXY" )
+      ( (setEnv "HTTPS_PROXY") . (fromMaybe "") )
+      ( const $ do
+          stack ["new", projectName1, template]
+          setEnv "HTTPS_PROXY" "http://sdsgsfgslfgsjflgkjs" -- make https requests fail
+          stackCheckStderr ["new", projectName2, template] $ \stderr ->
+            unless ("Using cached local version." `isInfixOf` stderr) $
+              error "stack didn't load the cached template"
+      )
+
+  -- This template has a `stack.yaml` file so `stack new` does not have to
+  -- `stack init` and therefore the test runs faster
+  templateUrl :: String
+  templateUrl =
+    "https://raw.githubusercontent.com/commercialhaskell/stack-templates/refs/heads/master/tasty-discover.hsfiles"
+
+  -- The same template, cached differently
+  githubTemplate :: String
+  githubTemplate = "github:commercialhaskell/tasty-discover.hsfiles"
diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs b/tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs
new file mode 100644
index 0000000000..5786914f26
--- /dev/null
+++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs
@@ -0,0 +1,11 @@
+-- Stack trusts package versions in a snapshot over Cabal file dependency
+-- information.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3861
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stackErr ["build", "--stack-yaml", "stack-bad.yaml"]
+  stack ["build", "--stack-yaml", "stack-good.yaml"]
diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/bad-bounds.tar b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/bad-bounds.tar
similarity index 100%
rename from test/integration/tests/3861-ignore-bounds-in-snapshots/files/bad-bounds.tar
rename to tests/integration/tests/3861-ignore-bounds-in-snapshots/files/bad-bounds.tar
diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml
new file mode 100644
index 0000000000..ab04bf7f95
--- /dev/null
+++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- bad-bounds
+
+library: {}
diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml
new file mode 100644
index 0000000000..17c7ae14e7
--- /dev/null
+++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml
@@ -0,0 +1,8 @@
+snapshot: ghc-9.10.3
+packages:
+- ./bad-bounds.tar
+
+# Include a flag to get a different snapshot hash
+flags:
+  bad-bounds:
+    unimportant: false
diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml
new file mode 100644
index 0000000000..3980df2b36
--- /dev/null
+++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml
@@ -0,0 +1,8 @@
+snapshot: ghc-9.10.3
+extra-deps:
+- ./bad-bounds.tar
+
+# Include a flag to get a different snapshot hash
+flags:
+  bad-bounds:
+    unimportant: true
diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml
new file mode 100644
index 0000000000..1c2b12b0f1
--- /dev/null
+++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml
@@ -0,0 +1 @@
+snapshot: snapshot.yaml
diff --git a/tests/integration/tests/3863-purge-command/Main.hs b/tests/integration/tests/3863-purge-command/Main.hs
new file mode 100644
index 0000000000..140de74b76
--- /dev/null
+++ b/tests/integration/tests/3863-purge-command/Main.hs
@@ -0,0 +1,51 @@
+{-# LANGUAGE ViewPatterns #-}
+
+-- Stack can purge all Stack work directories.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3863
+
+import           Control.Monad ( unless )
+import           Data.Char ( isSpace )
+import           Data.List ( dropWhileEnd )
+import           Data.Maybe ( fromMaybe, listToMaybe )
+import           StackTest
+import           System.FilePath ( splitDirectories )
+
+trimEnd :: String -> String
+trimEnd = dropWhileEnd isSpace
+
+main :: IO ()
+main =
+  -- For these commands, we'll need to know the `dist` directory.
+  -- This is usually `.stack-work/dist/$compiler-variant/Cabal-xxxx`
+  stackCheckStdout ["path", "--dist-dir"] $ \(trimEnd -> distDir) -> do
+    stackCheckStdout ["path", "--local-install-root"] $ \(trimEnd -> localInstallRoot) -> do
+      -- Usually `.stack-work`
+      let stackWork = fromMaybe (error "There must be a Stack working directory.") $
+            listToMaybe (splitDirectories distDir)
+
+      -- First, clean the .stack-work directory.
+      -- This is only necessary when running individual tests.
+      stackIgnoreException ["purge"]
+      -- See #4936 for details regarding the windows condition
+      unless isWindows $ doesNotExist stackWork
+
+      -- The dist directory should exist after a build
+      stack ["build"]
+      doesExist distDir
+      doesExist localInstallRoot
+      doesExist stackWork
+
+      -- The dist directory should not exist after a clean, whereas the
+      -- .stack-work directory should
+      stackIgnoreException ["clean"]
+      -- See #4936 for details regarding the windows condition
+      unless isWindows $ do
+        doesNotExist distDir
+        doesExist localInstallRoot
+        doesExist stackWork
+
+      -- The .stack-work directory should not exist after a purge
+      stackIgnoreException ["purge"]
+      -- See #4936 for details regarding the windows condition
+      unless isWindows $ doesNotExist stackWork
diff --git a/tests/integration/tests/3863-purge-command/files/.gitignore b/tests/integration/tests/3863-purge-command/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3863-purge-command/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3863-purge-command/files/package.yaml b/tests/integration/tests/3863-purge-command/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/3863-purge-command/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/3863-purge-command/files/src/Lib.hs b/tests/integration/tests/3863-purge-command/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/3863-purge-command/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/3863-purge-command/files/stack.yaml b/tests/integration/tests/3863-purge-command/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3863-purge-command/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3899-dont-rebuild-sublibraries/Main.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/Main.hs
new file mode 100644
index 0000000000..8f76c8d683
--- /dev/null
+++ b/tests/integration/tests/3899-dont-rebuild-sublibraries/Main.hs
@@ -0,0 +1,18 @@
+-- Stack does not recompile a package with a private named sublibrary (an
+-- internal library) on a second build.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3899
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build"]
+  res <- compilingModulesLines . snd <$> stackStderr ["build"]
+  unless (null res) $ fail "Stack recompiled code"
+
+-- Returns the lines where a module is compiled
+compilingModulesLines :: String -> [String]
+compilingModulesLines = filter (isInfixOf " Compiling ") . lines
diff --git a/tests/integration/tests/3899-dont-rebuild-sublibraries/files/.gitignore b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3899-dont-rebuild-sublibraries/files/app/Main.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/app/Main.hs
new file mode 100644
index 0000000000..ac9093c87d
--- /dev/null
+++ b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib
+
+main :: IO ()
+main = pure ()
diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/src-internal/Internal.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/int/Internal.hs
similarity index 100%
rename from test/integration/tests/3899-dont-rebuild-sublibraries/files/src-internal/Internal.hs
rename to tests/integration/tests/3899-dont-rebuild-sublibraries/files/int/Internal.hs
diff --git a/tests/integration/tests/3899-dont-rebuild-sublibraries/files/package.yaml b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/package.yaml
new file mode 100644
index 0000000000..d3ca861409
--- /dev/null
+++ b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/package.yaml
@@ -0,0 +1,22 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - internal
+
+internal-libraries:
+  internal:
+    source-dirs: int
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/src/Lib.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/src/Lib.hs
similarity index 100%
rename from test/integration/tests/3899-dont-rebuild-sublibraries/files/src/Lib.hs
rename to tests/integration/tests/3899-dont-rebuild-sublibraries/files/src/Lib.hs
diff --git a/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/Main.hs b/tests/integration/tests/3926-ghci-with-sublibraries/Main.hs
new file mode 100644
index 0000000000..838ab61a93
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/Main.hs
@@ -0,0 +1,42 @@
+-- Stack does not recompile a package with a private named sublibrary (an
+-- internal library) on a second build.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3926
+
+import           Control.Monad ( unless, when )
+import           Control.Monad.IO.Class ( liftIO )
+import           Data.List ( isInfixOf, isSuffixOf )
+import           StackTest.Repl
+
+main :: IO ()
+main = do
+  copy "src/Lib.v1" "src/Lib.hs"
+  copy "int/Internal.v1" "int/Internal.hs"
+  stack ["build"] -- need a build before ghci at the moment, see #4148
+  stackRepl [] $ do
+    nextPrompt
+    replCommand ":main"
+    line <- replGetLine
+    let expected = "Successful!"
+    when (line /= expected) $
+      error $
+          "Main module didn't load correctly.\n"
+        <> "Expected: " <> expected <> "\n"
+        <> "Actual  : " <> line <> "\n"
+    liftIO $ copy "int/Internal.v2" "int/Internal.hs"
+    reloadAndTest "checkInternal" "\"OK\"" "Internal library didn't reload."
+    liftIO $ copy "src/Lib.v2" "src/Lib.hs"
+    reloadAndTest "checkLib" "\"OK\"" "Main library didn't reload."
+
+reloadAndTest :: String -> String -> String -> Repl ()
+reloadAndTest cmd exp err = do
+  reload
+  replCommand cmd
+  line <- replGetLine
+  liftIO . putStrLn $ line
+  unless (exp `isSuffixOf` line) $ error err
+
+reload :: Repl ()
+reload = replCommand ":reload" >> loop
+ where
+  loop = replGetLine >>= \line -> unless ("Ok" `isInfixOf` line) loop
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/.gitignore b/tests/integration/tests/3926-ghci-with-sublibraries/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/app/Main.hs b/tests/integration/tests/3926-ghci-with-sublibraries/files/app/Main.hs
new file mode 100644
index 0000000000..7eaf6f21c1
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib
+
+main :: IO ()
+main = putStrLn "Successful!"
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v1 b/tests/integration/tests/3926-ghci-with-sublibraries/files/int/Internal.hs
similarity index 100%
rename from test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v1
rename to tests/integration/tests/3926-ghci-with-sublibraries/files/int/Internal.hs
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/int/Internal.v1 b/tests/integration/tests/3926-ghci-with-sublibraries/files/int/Internal.v1
new file mode 100644
index 0000000000..d066bb085e
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/int/Internal.v1
@@ -0,0 +1 @@
+module Internal where
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/int/Internal.v2 b/tests/integration/tests/3926-ghci-with-sublibraries/files/int/Internal.v2
new file mode 100644
index 0000000000..771c9f2365
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/int/Internal.v2
@@ -0,0 +1,6 @@
+module Internal
+  ( checkInternal
+  ) where
+
+checkInternal :: String
+checkInternal = "OK"
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/package.yaml b/tests/integration/tests/3926-ghci-with-sublibraries/files/package.yaml
new file mode 100644
index 0000000000..d3ca861409
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/package.yaml
@@ -0,0 +1,22 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - internal
+
+internal-libraries:
+  internal:
+    source-dirs: int
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1 b/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.hs
similarity index 100%
rename from test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1
rename to tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.hs
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1 b/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1
new file mode 100644
index 0000000000..1369151610
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1
@@ -0,0 +1,3 @@
+module Lib where
+
+import Internal
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2 b/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2
new file mode 100644
index 0000000000..ef8bb078c5
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2
@@ -0,0 +1,8 @@
+module Lib
+  ( checkLib
+  ) where
+
+import Internal
+
+checkLib :: String
+checkLib = "OK"
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml b/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3940-base-upgrade-warning/Main.hs b/tests/integration/tests/3940-base-upgrade-warning/Main.hs
new file mode 100644
index 0000000000..1dff182949
--- /dev/null
+++ b/tests/integration/tests/3940-base-upgrade-warning/Main.hs
@@ -0,0 +1,29 @@
+-- Stack provides appropriate advice if the version of base required is not that
+-- specified by the snapshot. Stack warns that base is a wired-in package before
+-- GHC 9.12.1.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3940
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+-- Use short message fragment because prettyWarn formatting and colour
+unattainableBaseWarning :: String
+unattainableBaseWarning =
+  "Build requires unattainable version of"
+
+-- Use short message fragment because prettyWarn formatting and colour
+noBaseUpgradeWarning :: String
+noBaseUpgradeWarning =
+  "Before GHC 9.12.1, the base package is"
+
+main :: IO ()
+main = do
+  stackErrStderr ["build", "--stack-yaml", "unattainable-base.yaml"] (expectMessage unattainableBaseWarning)
+  stackErrStderr ["build", "--stack-yaml", "no-base-upgrade.yaml"] (expectMessage noBaseUpgradeWarning)
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr =
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected a warning: \n" ++ show msg
diff --git a/tests/integration/tests/3940-base-upgrade-warning/files/.gitignore b/tests/integration/tests/3940-base-upgrade-warning/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3940-base-upgrade-warning/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml b/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml
new file mode 100644
index 0000000000..22e1252a91
--- /dev/null
+++ b/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml
@@ -0,0 +1,3 @@
+snapshot: ghc-9.10.3
+extra-deps:
+- base-4.10.1.0
diff --git a/tests/integration/tests/3940-base-upgrade-warning/files/package.yaml b/tests/integration/tests/3940-base-upgrade-warning/files/package.yaml
new file mode 100644
index 0000000000..d734612453
--- /dev/null
+++ b/tests/integration/tests/3940-base-upgrade-warning/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base < 4.20
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/3940-base-upgrade-warning/files/src/Lib.hs b/tests/integration/tests/3940-base-upgrade-warning/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/3940-base-upgrade-warning/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml b/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3942-solver-error-output/Main.hs b/tests/integration/tests/3942-solver-error-output/Main.hs
new file mode 100644
index 0000000000..e8369562ab
--- /dev/null
+++ b/tests/integration/tests/3942-solver-error-output/Main.hs
@@ -0,0 +1,21 @@
+-- Stack build fails if a dependency is not available.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3942
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+-- | Stack's error code for failing to construct a build plan.
+planFailure :: String
+planFailure =
+  "[S-4804]"
+
+main :: IO ()
+main = do
+  stackErrStderr ["./script.hs"] (expectMessage planFailure)
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected a warning: \n" ++ show msg
diff --git a/tests/integration/tests/3942-solver-error-output/files/.gitignore b/tests/integration/tests/3942-solver-error-output/files/.gitignore
new file mode 100644
index 0000000000..191b37bd49
--- /dev/null
+++ b/tests/integration/tests/3942-solver-error-output/files/.gitignore
@@ -0,0 +1,2 @@
+no-deps.cabal
+one-deps.cabal
diff --git a/tests/integration/tests/3942-solver-error-output/files/no-deps/package.yaml b/tests/integration/tests/3942-solver-error-output/files/no-deps/package.yaml
new file mode 100644
index 0000000000..48ede3554f
--- /dev/null
+++ b/tests/integration/tests/3942-solver-error-output/files/no-deps/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: no-deps
+synopsis: A package with no dependencies, other than base
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/3942-solver-error-output/files/one-deps/package.yaml b/tests/integration/tests/3942-solver-error-output/files/one-deps/package.yaml
new file mode 100644
index 0000000000..0cabd80dac
--- /dev/null
+++ b/tests/integration/tests/3942-solver-error-output/files/one-deps/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: one-deps
+synopsis: A package with one dependency (no-deps) other than base
+
+dependencies:
+- base
+- no-deps
+
+library: {}
diff --git a/tests/integration/tests/3942-solver-error-output/files/script.hs b/tests/integration/tests/3942-solver-error-output/files/script.hs
new file mode 100644
index 0000000000..fde3259536
--- /dev/null
+++ b/tests/integration/tests/3942-solver-error-output/files/script.hs
@@ -0,0 +1,5 @@
+#!/usr/bin/env stack
+-- stack runhaskell --stack-yaml test-stack.yml --package one-deps
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/3942-solver-error-output/files/test-stack.yml b/tests/integration/tests/3942-solver-error-output/files/test-stack.yml
new file mode 100644
index 0000000000..c2035ec9bc
--- /dev/null
+++ b/tests/integration/tests/3942-solver-error-output/files/test-stack.yml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+packages: []
+
+extra-deps:
+- ./one-deps
diff --git a/tests/integration/tests/3959-order-of-flags/Main.hs b/tests/integration/tests/3959-order-of-flags/Main.hs
new file mode 100644
index 0000000000..479eae7be6
--- /dev/null
+++ b/tests/integration/tests/3959-order-of-flags/Main.hs
@@ -0,0 +1,28 @@
+-- Stack allows build flags or options to be specified before or after the build
+-- command.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3959
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  checkFlagsBeforeCommand
+  checkFlagsAfterCommand
+
+checkFlagsBeforeCommand :: IO ()
+checkFlagsBeforeCommand =
+  stackCheckStderr ["--test", "--no-run-tests", "build"] checker
+
+checkFlagsAfterCommand :: IO ()
+checkFlagsAfterCommand =
+  stackCheckStderr ["build", "--test", "--no-run-tests"] checker
+
+checker :: String -> IO ()
+checker output = do
+  let testsAreDisabled =
+        any (\ln -> "All test running disabled by" `isInfixOf` ln) (lines output)
+  unless testsAreDisabled $
+    fail "Tests should not be run"
diff --git a/tests/integration/tests/3959-order-of-flags/files/.gitignore b/tests/integration/tests/3959-order-of-flags/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3959-order-of-flags/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3959-order-of-flags/files/package.yaml b/tests/integration/tests/3959-order-of-flags/files/package.yaml
new file mode 100644
index 0000000000..ee1a6463a8
--- /dev/null
+++ b/tests/integration/tests/3959-order-of-flags/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+tests:
+  test:
+    main: Main.hs
+    source-dirs: test
diff --git a/tests/integration/tests/3959-order-of-flags/files/stack.yaml b/tests/integration/tests/3959-order-of-flags/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3959-order-of-flags/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/test/integration/tests/3959-order-of-flags/files/test/Spec.hs b/tests/integration/tests/3959-order-of-flags/files/test/Main.hs
similarity index 100%
rename from test/integration/tests/3959-order-of-flags/files/test/Spec.hs
rename to tests/integration/tests/3959-order-of-flags/files/test/Main.hs
diff --git a/tests/integration/tests/397-case-insensitive-flags/Main.hs b/tests/integration/tests/397-case-insensitive-flags/Main.hs
new file mode 100644
index 0000000000..e499de5c9d
--- /dev/null
+++ b/tests/integration/tests/397-case-insensitive-flags/Main.hs
@@ -0,0 +1,11 @@
+-- Cabal flags are case-insensitive and Stack treats them as such.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/397
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stackErr ["build"]
+  stack ["build", "--flag", "myPackage:nEcEssAry"]
+  stack ["build", "--flag", "*:nEcEssAry"]
diff --git a/tests/integration/tests/397-case-insensitive-flags/files/.gitignore b/tests/integration/tests/397-case-insensitive-flags/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/397-case-insensitive-flags/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/397-case-insensitive-flags/files/package.yaml b/tests/integration/tests/397-case-insensitive-flags/files/package.yaml
new file mode 100644
index 0000000000..973e01a4f6
--- /dev/null
+++ b/tests/integration/tests/397-case-insensitive-flags/files/package.yaml
@@ -0,0 +1,18 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+flags:
+  necessary:
+    description: The package will not build unless this flag is true.
+    manual: true
+    default: false
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  when:
+  - condition: flag(necessary)
+    cpp-options: -DWORK
diff --git a/tests/integration/tests/397-case-insensitive-flags/files/src/Lib.hs b/tests/integration/tests/397-case-insensitive-flags/files/src/Lib.hs
new file mode 100644
index 0000000000..eccdf60245
--- /dev/null
+++ b/tests/integration/tests/397-case-insensitive-flags/files/src/Lib.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE CPP #-}
+
+module Lib where
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#if !WORK
+#error Not going to work, sorry
+#endif
+
+#endif
diff --git a/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml b/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3996-sublib-not-depended-upon/.gitignore b/tests/integration/tests/3996-sublib-not-depended-upon/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3996-sublib-not-depended-upon/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3996-sublib-not-depended-upon/Main.hs b/tests/integration/tests/3996-sublib-not-depended-upon/Main.hs
new file mode 100644
index 0000000000..0ba51d1aea
--- /dev/null
+++ b/tests/integration/tests/3996-sublib-not-depended-upon/Main.hs
@@ -0,0 +1,10 @@
+-- Stack should build a package with a main library and an internal library (a
+-- private named sublibrary) even if the main library does not depend on the
+-- sublibrary.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3996
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/3996-sublib-not-depended-upon/files/int/Internal.hs b/tests/integration/tests/3996-sublib-not-depended-upon/files/int/Internal.hs
new file mode 100644
index 0000000000..d066bb085e
--- /dev/null
+++ b/tests/integration/tests/3996-sublib-not-depended-upon/files/int/Internal.hs
@@ -0,0 +1 @@
+module Internal where
diff --git a/tests/integration/tests/3996-sublib-not-depended-upon/files/package.yaml b/tests/integration/tests/3996-sublib-not-depended-upon/files/package.yaml
new file mode 100644
index 0000000000..ef6e5935e5
--- /dev/null
+++ b/tests/integration/tests/3996-sublib-not-depended-upon/files/package.yaml
@@ -0,0 +1,13 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+internal-libraries:
+  internal:
+    source-dirs: int
diff --git a/tests/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs b/tests/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml b/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/3997-coverage-with-cabal-3/Main.hs b/tests/integration/tests/3997-coverage-with-cabal-3/Main.hs
new file mode 100644
index 0000000000..c6f049f66f
--- /dev/null
+++ b/tests/integration/tests/3997-coverage-with-cabal-3/Main.hs
@@ -0,0 +1,13 @@
+-- Stack can create a coverage report for a test suite.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3997
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr ["test", "--coverage"] $ \out -> do
+    unless ("The coverage report for myPackage's test-suite test is available at" `isInfixOf` out) $
+      fail "Coverage report didn't build"
diff --git a/tests/integration/tests/3997-coverage-with-cabal-3/files/.gitignore b/tests/integration/tests/3997-coverage-with-cabal-3/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/3997-coverage-with-cabal-3/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/3997-coverage-with-cabal-3/files/package.yaml b/tests/integration/tests/3997-coverage-with-cabal-3/files/package.yaml
new file mode 100644
index 0000000000..3ba4c450a6
--- /dev/null
+++ b/tests/integration/tests/3997-coverage-with-cabal-3/files/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs b/tests/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs
similarity index 100%
rename from test/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs
rename to tests/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs
diff --git a/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml b/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs b/tests/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs
similarity index 100%
rename from test/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs
rename to tests/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs
diff --git a/tests/integration/tests/4001-excess-recompilation/Main.hs b/tests/integration/tests/4001-excess-recompilation/Main.hs
new file mode 100644
index 0000000000..03a19bcd10
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/Main.hs
@@ -0,0 +1,24 @@
+-- Stack does not recompile a package when a test suite or benchmark is dirty
+-- but the test suite or benchmark is not a build target.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4001
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  copy "test/Main.v1" "test/Main.hs"
+  copy "bench/Main.v1" "bench/Main.hs"
+  stack ["build"]
+
+  copy "test/Main.v2" "test/Main.hs"
+  copy "bench/Main.v2" "bench/Main.hs"
+  res <- unregisteringLines . snd <$> stackStderr ["build"]
+  unless (null res) $
+    fail "Stack recompiled when a test or benchmark file was changed, but only \
+         \the library was targeted."
+
+unregisteringLines :: String -> [String]
+unregisteringLines = filter (isInfixOf " unregistering ") . lines
diff --git a/tests/integration/tests/4001-excess-recompilation/files/.gitignore b/tests/integration/tests/4001-excess-recompilation/files/.gitignore
new file mode 100644
index 0000000000..f54a4084b1
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/.gitignore
@@ -0,0 +1 @@
+myPackage.Cabal
diff --git a/tests/integration/tests/4001-excess-recompilation/files/bench/Main.hs b/tests/integration/tests/4001-excess-recompilation/files/bench/Main.hs
new file mode 100644
index 0000000000..6fca540825
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/bench/Main.hs
@@ -0,0 +1,4 @@
+import  Lib
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/4001-excess-recompilation/files/bench/Main.v1 b/tests/integration/tests/4001-excess-recompilation/files/bench/Main.v1
new file mode 100644
index 0000000000..a0e060b7ca
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/bench/Main.v1
@@ -0,0 +1,4 @@
+import  Lib
+
+main :: IO ()
+main = putStrLn "Version 1"
diff --git a/tests/integration/tests/4001-excess-recompilation/files/bench/Main.v2 b/tests/integration/tests/4001-excess-recompilation/files/bench/Main.v2
new file mode 100644
index 0000000000..d1741bc55f
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/bench/Main.v2
@@ -0,0 +1,4 @@
+import  Lib
+
+main :: IO ()
+main = putStrLn "Version 2"
diff --git a/tests/integration/tests/4001-excess-recompilation/files/package.yaml b/tests/integration/tests/4001-excess-recompilation/files/package.yaml
new file mode 100644
index 0000000000..5817077e48
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/package.yaml
@@ -0,0 +1,23 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - myPackage
+
+benchmarks:
+  bench:
+    source-dirs: bench
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/test/integration/tests/4001-excess-recompilation/files/src/Lib.hs b/tests/integration/tests/4001-excess-recompilation/files/src/Lib.hs
similarity index 100%
rename from test/integration/tests/4001-excess-recompilation/files/src/Lib.hs
rename to tests/integration/tests/4001-excess-recompilation/files/src/Lib.hs
diff --git a/tests/integration/tests/4001-excess-recompilation/files/stack.yaml b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4001-excess-recompilation/files/test/Main.hs b/tests/integration/tests/4001-excess-recompilation/files/test/Main.hs
new file mode 100644
index 0000000000..6fca540825
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/test/Main.hs
@@ -0,0 +1,4 @@
+import  Lib
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/4001-excess-recompilation/files/test/Main.v1 b/tests/integration/tests/4001-excess-recompilation/files/test/Main.v1
new file mode 100644
index 0000000000..a0e060b7ca
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/test/Main.v1
@@ -0,0 +1,4 @@
+import  Lib
+
+main :: IO ()
+main = putStrLn "Version 1"
diff --git a/tests/integration/tests/4001-excess-recompilation/files/test/Main.v2 b/tests/integration/tests/4001-excess-recompilation/files/test/Main.v2
new file mode 100644
index 0000000000..d1741bc55f
--- /dev/null
+++ b/tests/integration/tests/4001-excess-recompilation/files/test/Main.v2
@@ -0,0 +1,4 @@
+import  Lib
+
+main :: IO ()
+main = putStrLn "Version 2"
diff --git a/tests/integration/tests/4044-no-run-tests-config/Main.hs b/tests/integration/tests/4044-no-run-tests-config/Main.hs
new file mode 100644
index 0000000000..afd68b4d03
--- /dev/null
+++ b/tests/integration/tests/4044-no-run-tests-config/Main.hs
@@ -0,0 +1,10 @@
+-- Stack can be configured not to run test suites.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4044
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["test"]
+  stack ["build", "myPackage:test:test"]
diff --git a/tests/integration/tests/4044-no-run-tests-config/files/.gitignore b/tests/integration/tests/4044-no-run-tests-config/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4044-no-run-tests-config/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4044-no-run-tests-config/files/package.yaml b/tests/integration/tests/4044-no-run-tests-config/files/package.yaml
new file mode 100644
index 0000000000..28ed00191b
--- /dev/null
+++ b/tests/integration/tests/4044-no-run-tests-config/files/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: myPackage
+version: 0.1.0.0
+
+dependencies:
+- base
+
+library: {}
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
diff --git a/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml b/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml
new file mode 100644
index 0000000000..a2a5183fa0
--- /dev/null
+++ b/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+build:
+  test-arguments:
+    no-run-tests: true
diff --git a/tests/integration/tests/4044-no-run-tests-config/files/test/Main.hs b/tests/integration/tests/4044-no-run-tests-config/files/test/Main.hs
new file mode 100644
index 0000000000..40565d378d
--- /dev/null
+++ b/tests/integration/tests/4044-no-run-tests-config/files/test/Main.hs
@@ -0,0 +1,2 @@
+main :: IO ()
+main = error "This test will fail if run."
diff --git a/test/integration/tests/4085-insufficient-error-message/Dockerfile b/tests/integration/tests/4085-insufficient-error-message/Dockerfile
similarity index 100%
rename from test/integration/tests/4085-insufficient-error-message/Dockerfile
rename to tests/integration/tests/4085-insufficient-error-message/Dockerfile
diff --git a/tests/integration/tests/4085-insufficient-error-message/Main.hs b/tests/integration/tests/4085-insufficient-error-message/Main.hs
new file mode 100644
index 0000000000..6ec7afb6c5
--- /dev/null
+++ b/tests/integration/tests/4085-insufficient-error-message/Main.hs
@@ -0,0 +1,100 @@
+-- See: https://github.com/commercialhaskell/stack/issues/4044
+
+{-# LANGUAGE OverloadedStrings #-}
+
+{--
+
+import StackTest
+import System.Environment (getEnv)
+import System.Directory
+import System.FilePath
+import System.Process
+import System.Exit
+import Control.Exception.Base (bracket, bracket_)
+import Control.Monad (guard, when, unless, msum)
+import Control.Concurrent (threadDelay)
+import Data.List (isInfixOf, delete, repeat)
+
+createDockerVolume :: Int -> IO String
+createDockerVolume sizeInMB = do
+  (ec, stdout, stderr) <- runEx "docker" $ "volume create"
+    ++ " --driver local"
+    ++ " --opt type=tmpfs"
+    ++ " --opt device=tmpfs"
+    ++ " --opt o=size=" ++ show sizeInMB ++ "m"
+  unless (ec == ExitSuccess) $ error $ "Exited with exit code: " ++ show ec
+  pure $ delete '\n' stdout
+
+removeDockerVolume :: Int -> String -> IO ()
+removeDockerVolume attempts name | attempts <= 0 =
+  error $ "Can't remove docker volume " ++ name
+removeDockerVolume attempts name = do
+  (ec, _, stderr) <- runEx "docker" $ "volume rm --force " ++ name
+  let wasRemoved = (ec == ExitSuccess) || isInfixOf "No such volume" stderr
+  unless wasRemoved $
+    threadDelay 3000000 >> -- sometimes docker releases a volume slowly
+    removeDockerVolume (attempts - 1) name
+
+withDockerVolume :: Int -> (String -> IO a) -> IO a
+withDockerVolume sizeInMB =
+  bracket (createDockerVolume sizeInMB) (removeDockerVolume 5)
+
+buildDockerImageWithStackSourceInside :: String -> IO ()
+buildDockerImageWithStackSourceInside tag = withSourceDirectory $ do
+  dir <- testDir
+  runShell ("docker build"
+            ++ " --file " ++ (dir </> "Dockerfile")
+            ++ " --tag " ++ tag
+            ++ " --memory-swap -1"
+            ++ " .")
+  removeDanglingImages
+
+removeDanglingImages :: IO ()
+removeDanglingImages =
+  runShell "docker rmi -f $(docker images --quiet --filter 'dangling=true')"
+
+runDockerContainerWithVolume
+  :: String
+  -> String
+  -> String
+  -> String
+  -> IO (ExitCode, String, String)
+runDockerContainerWithVolume imageTag volumeName volumeLocation cmd =
+  runEx "docker" $ "run"
+    ++ " --rm"
+    ++ " --workdir " ++ volumeLocation
+    ++ " --mount type=volume,dst=" ++ volumeLocation ++ ",src=" ++ volumeName
+    ++ " " ++ imageTag
+    ++ " " ++ cmd
+
+validateSrderr :: String -> Bool
+validateSrderr = isInfixOf "No space left on device"
+
+imageTag :: String
+imageTag = "4085-fix"
+
+spaceInMBJustEnoughToFailInTheExactMoment :: Int
+spaceInMBJustEnoughToFailInTheExactMoment = 2000
+
+main :: IO ()
+main = do
+  buildDockerImageWithStackSourceInside imageTag
+  (ec, _, stderr) <- withDockerVolume
+    spaceInMBJustEnoughToFailInTheExactMoment
+    (\volumeName ->
+        runDockerContainerWithVolume imageTag volumeName "/app" $
+          "stack"
+          ++ " --stack-root " ++ "/app"
+          ++ " --snapshot nightly-2018-06-05"
+          ++ " --no-terminal"
+          ++ " --install-ghc"
+          ++ " test")
+  unless (ec /= ExitSuccess) $
+    error "stack process succeeded, but it shouldn't"
+  unless (validateSrderr stderr) $
+    error "stderr validation failed"
+
+// --}
+
+main :: IO ()
+main = putStrLn "This test is disabled (see https://github.com/commercialhaskell/stack/issues/4427)."
diff --git a/tests/integration/tests/4095-utf8-pure-nix/Main.hs b/tests/integration/tests/4095-utf8-pure-nix/Main.hs
new file mode 100644
index 0000000000..7387f20675
--- /dev/null
+++ b/tests/integration/tests/4095-utf8-pure-nix/Main.hs
@@ -0,0 +1,31 @@
+-- Stack supports Unicode code points in a Nix environment.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4095
+-- See: https://github.com/commercialhaskell/stack/pull/6945
+
+import           Control.Monad ( unless )
+import           Data.Maybe ( isJust )
+import           StackTest
+import           System.Environment ( lookupEnv )
+
+-- This test requires that Nix is installed and that the NIX_PATH has been set
+-- so as to allow the path <nixpkgs> to be used.
+main :: IO ()
+main
+  | isWindows =
+      logInfo "Disabled on Windows as Nix is not currently supported on \
+              \Windows."
+  | isMacOSX =
+      logInfo "Disabled on macOS as it takes too long to run, since it tries \
+              \to build GHC."
+  | otherwise = do
+      isInContainer <- getInContainer
+      unless isInContainer $ do
+         -- Building causes GHC to emit Unicode:
+         stack ["build", "--nix-pure"]
+         -- Running causes the executable to output Unicode:
+         stack ["exec", "--nix-pure", "myExe"]
+
+-- | 'True' if we are currently running inside a Docker container.
+getInContainer :: IO Bool
+getInContainer = isJust <$> lookupEnv "STACK_IN_CONTAINER"
diff --git a/tests/integration/tests/4095-utf8-pure-nix/files/.gitignore b/tests/integration/tests/4095-utf8-pure-nix/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4095-utf8-pure-nix/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4095-utf8-pure-nix/files/app/Main.hs b/tests/integration/tests/4095-utf8-pure-nix/files/app/Main.hs
new file mode 100644
index 0000000000..8ee99c7f8f
--- /dev/null
+++ b/tests/integration/tests/4095-utf8-pure-nix/files/app/Main.hs
@@ -0,0 +1,4 @@
+import           Lib ( unicode )
+
+main :: IO ()
+main = unicode
diff --git a/tests/integration/tests/4095-utf8-pure-nix/files/package.yaml b/tests/integration/tests/4095-utf8-pure-nix/files/package.yaml
new file mode 100644
index 0000000000..bea19d444e
--- /dev/null
+++ b/tests/integration/tests/4095-utf8-pure-nix/files/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/tests/integration/tests/4095-utf8-pure-nix/files/src/Lib.hs b/tests/integration/tests/4095-utf8-pure-nix/files/src/Lib.hs
new file mode 100644
index 0000000000..ee5f943c29
--- /dev/null
+++ b/tests/integration/tests/4095-utf8-pure-nix/files/src/Lib.hs
@@ -0,0 +1,7 @@
+module Lib
+  ( unicode
+  ) where
+
+{-# WARNING unicode "Warning itself emits unicode: 😊" #-}
+unicode :: IO ()
+unicode = putStrLn "Function outputs unicode: 😊"
diff --git a/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml b/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml
new file mode 100644
index 0000000000..71e4c2b032
--- /dev/null
+++ b/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml
@@ -0,0 +1,10 @@
+# As of 2026-07-07, with channel nixos-26.05, avaiable Nix packages
+# haskell.compiler.ghc*, based on:
+#
+# $ nix-instantiate --eval -E "with import <nixpkgs> {}; lib.attrNames haskell.compiler"
+#
+# are:
+#
+# 948 (GHC 9.4.8), 967 (GHC 9.6.7), 984 (GHC 9.8.4), 9103 (GHC 9.10.3),
+# 9123 (GHC 9.12.3), 9124 (GHC 9.12.4), 9141 (GHC 9.14.1).
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4101-dependency-tree/Main.hs b/tests/integration/tests/4101-dependency-tree/Main.hs
new file mode 100644
index 0000000000..913b2db802
--- /dev/null
+++ b/tests/integration/tests/4101-dependency-tree/Main.hs
@@ -0,0 +1,55 @@
+-- Stack can report the dependency tree of project packages.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4101
+
+import           Control.Monad ( unless, when )
+import           Data.List ( isPrefixOf )
+import           StackTest
+import           System.Directory ( getCurrentDirectory )
+
+main :: IO ()
+main = unless isWindows $ do
+  stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do
+    let expected = unlines [ "Packages"
+                           , "├─┬ myPackageA 0.0.0"
+                           , "│ ├─┬ base 4.20.2.0"
+                           ]
+    unless (expected `isPrefixOf` stdOut) $
+      error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
+
+  stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do
+    let expected = unlines [ "Packages"
+                           , "├─┬ myPackageA 0.0.0"
+                           , "│ ├── base 4.20.2.0"
+                           , "│ ├── filelock 0.1.1.2"
+                           , "│ ├── mtl 2.3.1"
+                           , "│ └── myPackageB 0.0.0"
+                           , "└─┬ myPackageB 0.0.0"
+                           , "  └── base 4.20.2.0"
+                           ]
+    when (stdOut /= expected) $
+      error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
+
+  stackCheckStdout ["ls", "dependencies", "tree", "myPackageB"] $ \stdOut -> do
+    let expected = unlines [ "Packages"
+                           , "└─┬ myPackageB 0.0.0"
+                           , "  └─┬ base 4.20.2.0"
+                           , "    ├─┬ ghc-internal 9.1003.0"
+                           , "    │ ├─┬ ghc-bignum 1.3"
+                           , "    │ │ └─┬ ghc-prim 0.12.0"
+                           , "    │ │   └── rts 1.0.2"
+                           , "    │ ├─┬ ghc-prim 0.12.0"
+                           , "    │ │ └── rts 1.0.2"
+                           , "    │ └── rts 1.0.2"
+                           , "    └─┬ ghc-prim 0.12.0"
+                           , "      └── rts 1.0.2"
+                           ]
+    when (stdOut /= expected) $
+      error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
+
+  stackCheckStdout ["ls", "dependencies", "json"] $ \stdOut -> do
+    currdir <- getCurrentDirectory
+    let expected =
+          "[{\"dependencies\":[\"base\",\"bytestring\",\"filepath\",\"os-string\",\"time\"]"
+    unless (expected `isPrefixOf` stdOut) $
+      error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
diff --git a/tests/integration/tests/4101-dependency-tree/files/.gitignore b/tests/integration/tests/4101-dependency-tree/files/.gitignore
new file mode 100644
index 0000000000..f9a6e152d2
--- /dev/null
+++ b/tests/integration/tests/4101-dependency-tree/files/.gitignore
@@ -0,0 +1,2 @@
+myPackageA.cabal
+myPackageB.cabal
diff --git a/tests/integration/tests/4101-dependency-tree/files/myPackageB/package.yaml b/tests/integration/tests/4101-dependency-tree/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..f94636c710
--- /dev/null
+++ b/tests/integration/tests/4101-dependency-tree/files/myPackageB/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4101-dependency-tree/files/myPackageB/src/Lib.hs b/tests/integration/tests/4101-dependency-tree/files/myPackageB/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/4101-dependency-tree/files/myPackageB/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/4101-dependency-tree/files/package.yaml b/tests/integration/tests/4101-dependency-tree/files/package.yaml
new file mode 100644
index 0000000000..682e620e4c
--- /dev/null
+++ b/tests/integration/tests/4101-dependency-tree/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+- filelock
+- mtl
+- myPackageB
+
+library: {}
diff --git a/tests/integration/tests/4101-dependency-tree/files/src/Lib.hs b/tests/integration/tests/4101-dependency-tree/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/4101-dependency-tree/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/4101-dependency-tree/files/stack.yaml b/tests/integration/tests/4101-dependency-tree/files/stack.yaml
new file mode 100644
index 0000000000..40339ada61
--- /dev/null
+++ b/tests/integration/tests/4101-dependency-tree/files/stack.yaml
@@ -0,0 +1,9 @@
+snapshot: lts-24.55
+
+packages:
+- .
+- myPackageB
+
+extra-deps:
+- github: snoyberg/filelock
+  commit: 4f080496d8bf153fbe26e64d1f52cf73c7db25f6
diff --git a/tests/integration/tests/4105-test-coverage-of-internal-lib/Main.hs b/tests/integration/tests/4105-test-coverage-of-internal-lib/Main.hs
new file mode 100644
index 0000000000..3d8d2dc4f7
--- /dev/null
+++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/Main.hs
@@ -0,0 +1,25 @@
+-- Stack generates coverage reports for main libraries and private named
+-- libraries (internal libraries).
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4105
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf, isPrefixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["clean"]
+  stackCheckStdout ["test", "--coverage", "--color", "never"] check
+
+check :: String -> IO ()
+check output = case getCoverageLines output of
+  _:exprs:_ -> unless ("2/2" `isInfixOf` exprs) testFail
+  _ -> testFail
+ where
+  testFail = fail "Stack didn't generate coverage from both libraries"
+
+getCoverageLines :: String -> [String]
+getCoverageLines = dropWhile (not . isCoverageHeader) . lines
+ where
+  isCoverageHeader = isPrefixOf "Summary coverage report for "
diff --git a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/.gitignore b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/int/Internal.hs b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/int/Internal.hs
new file mode 100644
index 0000000000..cd713ec4e2
--- /dev/null
+++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/int/Internal.hs
@@ -0,0 +1,7 @@
+module Internal
+  ( funcInternal
+  ) where
+
+-- | A function of the internal library
+funcInternal :: Int -> Int
+funcInternal = pred
diff --git a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/package.yaml b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/package.yaml
new file mode 100644
index 0000000000..18ae9cc898
--- /dev/null
+++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/package.yaml
@@ -0,0 +1,21 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+internal-libraries:
+  internal:
+    source-dirs: int
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - internal
+    - myPackage
diff --git a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/src/Lib.hs b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/src/Lib.hs
new file mode 100644
index 0000000000..034418635a
--- /dev/null
+++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/src/Lib.hs
@@ -0,0 +1,7 @@
+module Lib
+  ( funcLib
+  ) where
+
+-- | A function of the main library
+funcLib :: Int -> Int
+funcLib = succ
diff --git a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml
new file mode 100644
index 0000000000..a57c6e7a52
--- /dev/null
+++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: lts-24.55
diff --git a/tests/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs
new file mode 100644
index 0000000000..967f9031e2
--- /dev/null
+++ b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs
@@ -0,0 +1,6 @@
+import           Control.Monad ( when )
+
+import Lib ( funcLib )
+import Internal ( funcInternal )
+
+main = when (funcLib 41 /= funcInternal 43) $ error "test failed"
diff --git a/tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs b/tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs
new file mode 100644
index 0000000000..cc0f41d298
--- /dev/null
+++ b/tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs
@@ -0,0 +1,13 @@
+-- Stack's clean command should not require the presence of the specified
+-- version of GHC.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4181
+
+import           StackTest
+
+main :: IO ()
+main = do
+  -- `stack clean` should succeed even though there is no ghc available.
+  -- See the stack.yaml file for how this works.
+  stackIgnoreException ["clean"]
+  stackCleanFull
diff --git a/tests/integration/tests/4181-clean-wo-dl-ghc/files/.gitignore b/tests/integration/tests/4181-clean-wo-dl-ghc/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4181-clean-wo-dl-ghc/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4181-clean-wo-dl-ghc/files/package.yaml b/tests/integration/tests/4181-clean-wo-dl-ghc/files/package.yaml
new file mode 100644
index 0000000000..4b373ba746
--- /dev/null
+++ b/tests/integration/tests/4181-clean-wo-dl-ghc/files/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml b/tests/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml
new file mode 100644
index 0000000000..7a64fd4244
--- /dev/null
+++ b/tests/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml
@@ -0,0 +1,6 @@
+# Update the resolver as necessary
+snapshot: ghc-8.22
+# Do not use the system ghc, as ghc must not be available
+system-ghc: false
+# Do not install any other ghc, as ghc must not be available
+install-ghc: false
diff --git a/tests/integration/tests/4215-missing-unregister/Main.hs b/tests/integration/tests/4215-missing-unregister/Main.hs
new file mode 100644
index 0000000000..4542b9dbaf
--- /dev/null
+++ b/tests/integration/tests/4215-missing-unregister/Main.hs
@@ -0,0 +1,12 @@
+-- Even if the project directory is unchanged and the project package name and
+-- version is the same, Stack recognises when a project package is different to
+-- a project package that has been built previously.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4215
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["--stack-yaml", "stack1.yaml", "build"]
+  stack ["--stack-yaml", "stack2.yaml", "build"]
diff --git a/tests/integration/tests/4215-missing-unregister/files/.gitignore b/tests/integration/tests/4215-missing-unregister/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4215-missing-unregister/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4215-missing-unregister/files/stack1.yaml b/tests/integration/tests/4215-missing-unregister/files/stack1.yaml
new file mode 100644
index 0000000000..365c421b18
--- /dev/null
+++ b/tests/integration/tests/4215-missing-unregister/files/stack1.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+packages:
+- v1
diff --git a/tests/integration/tests/4215-missing-unregister/files/stack2.yaml b/tests/integration/tests/4215-missing-unregister/files/stack2.yaml
new file mode 100644
index 0000000000..02a50554ec
--- /dev/null
+++ b/tests/integration/tests/4215-missing-unregister/files/stack2.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+packages:
+- v2
diff --git a/tests/integration/tests/4215-missing-unregister/files/v1/package.yaml b/tests/integration/tests/4215-missing-unregister/files/v1/package.yaml
new file mode 100644
index 0000000000..4b373ba746
--- /dev/null
+++ b/tests/integration/tests/4215-missing-unregister/files/v1/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4215-missing-unregister/files/v2/package.yaml b/tests/integration/tests/4215-missing-unregister/files/v2/package.yaml
new file mode 100644
index 0000000000..4b373ba746
--- /dev/null
+++ b/tests/integration/tests/4215-missing-unregister/files/v2/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4270-files-order/Main.hs b/tests/integration/tests/4270-files-order/Main.hs
new file mode 100644
index 0000000000..e51067ba08
--- /dev/null
+++ b/tests/integration/tests/4270-files-order/Main.hs
@@ -0,0 +1,22 @@
+-- Stack's ghci command can load a project with c-sources, if the package
+-- description lists the C source files in dependency order.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4270
+
+import           Control.Monad ( when )
+import           StackTest
+import           StackTest.Repl
+
+main :: IO ()
+main = do
+  stack ["build"]
+  stackRepl [] $ do
+    nextPrompt
+    replCommand "putStrLn greeting"
+    line <- replGetLine
+    let expected = "Hello, world!"
+    when (line /= expected) $
+      error $
+           "Didn't load correctly.\n"
+        <> "Expected: " <> expected <> "\n"
+        <> "Actual  : " <> line <> "\n"
diff --git a/tests/integration/tests/4270-files-order/files/.gitignore b/tests/integration/tests/4270-files-order/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4270-files-order/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/test/integration/tests/4270-files-order/files/cbits/a_dependent.c b/tests/integration/tests/4270-files-order/files/cbits/a_dependent.c
similarity index 100%
rename from test/integration/tests/4270-files-order/files/cbits/a_dependent.c
rename to tests/integration/tests/4270-files-order/files/cbits/a_dependent.c
diff --git a/test/integration/tests/4270-files-order/files/cbits/a_dependent.h b/tests/integration/tests/4270-files-order/files/cbits/a_dependent.h
similarity index 100%
rename from test/integration/tests/4270-files-order/files/cbits/a_dependent.h
rename to tests/integration/tests/4270-files-order/files/cbits/a_dependent.h
diff --git a/test/integration/tests/4270-files-order/files/cbits/the_dependency.c b/tests/integration/tests/4270-files-order/files/cbits/the_dependency.c
similarity index 100%
rename from test/integration/tests/4270-files-order/files/cbits/the_dependency.c
rename to tests/integration/tests/4270-files-order/files/cbits/the_dependency.c
diff --git a/tests/integration/tests/4270-files-order/files/package.yaml b/tests/integration/tests/4270-files-order/files/package.yaml
new file mode 100644
index 0000000000..70fc7a38c9
--- /dev/null
+++ b/tests/integration/tests/4270-files-order/files/package.yaml
@@ -0,0 +1,13 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  include-dirs: cbits
+  c-sources:
+  - cbits/the_dependency.c
+  - cbits/a_dependent.c
diff --git a/tests/integration/tests/4270-files-order/files/src/Lib.hs b/tests/integration/tests/4270-files-order/files/src/Lib.hs
new file mode 100644
index 0000000000..a1d89f1b4f
--- /dev/null
+++ b/tests/integration/tests/4270-files-order/files/src/Lib.hs
@@ -0,0 +1,11 @@
+module Lib where
+
+import Foreign.C.String ( CString, peekCString )
+import System.IO.Unsafe ( unsafePerformIO)
+
+foreign import ccall unsafe "a_dependent.h greeting"
+  c_greeting :: CString
+
+{-# NOINLINE greeting #-}
+greeting :: String
+greeting = unsafePerformIO $ peekCString c_greeting
diff --git a/tests/integration/tests/4270-files-order/files/stack.yaml b/tests/integration/tests/4270-files-order/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4270-files-order/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4324-dot-includes-boot-packages/Main.hs b/tests/integration/tests/4324-dot-includes-boot-packages/Main.hs
new file mode 100644
index 0000000000..20c4bff744
--- /dev/null
+++ b/tests/integration/tests/4324-dot-includes-boot-packages/Main.hs
@@ -0,0 +1,13 @@
+-- Stack's dot command includes the dependencies of GHC's boot packages.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4324
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStdout ["dot", "--external"] $ \str ->
+    unless ("\n\"process\" ->" `isInfixOf` str) $
+      error "Not showing dependencies of process"
diff --git a/tests/integration/tests/4324-dot-includes-boot-packages/files/.gitignore b/tests/integration/tests/4324-dot-includes-boot-packages/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4324-dot-includes-boot-packages/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4324-dot-includes-boot-packages/files/package.yaml b/tests/integration/tests/4324-dot-includes-boot-packages/files/package.yaml
new file mode 100644
index 0000000000..ff5d3bfd91
--- /dev/null
+++ b/tests/integration/tests/4324-dot-includes-boot-packages/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- process
+
+library: {}
diff --git a/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml b/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4390-dot-no-ghc/Main.hs b/tests/integration/tests/4390-dot-no-ghc/Main.hs
new file mode 100644
index 0000000000..9463c22f72
--- /dev/null
+++ b/tests/integration/tests/4390-dot-no-ghc/Main.hs
@@ -0,0 +1,10 @@
+-- Stack's dot command does not require the presence of the specified GHC.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4390
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["ls", "dependencies", "--global-hints"]
+  stack ["dot", "--global-hints"]
diff --git a/tests/integration/tests/4390-dot-no-ghc/files/.gitignore b/tests/integration/tests/4390-dot-no-ghc/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4390-dot-no-ghc/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4390-dot-no-ghc/files/package.yaml b/tests/integration/tests/4390-dot-no-ghc/files/package.yaml
new file mode 100644
index 0000000000..4b373ba746
--- /dev/null
+++ b/tests/integration/tests/4390-dot-no-ghc/files/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml b/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4408-init-internal-libs/Main.hs b/tests/integration/tests/4408-init-internal-libs/Main.hs
new file mode 100644
index 0000000000..5973d2da18
--- /dev/null
+++ b/tests/integration/tests/4408-init-internal-libs/Main.hs
@@ -0,0 +1,9 @@
+-- Stack can initialise a project where a project package includes a private
+-- named library (an internal library).
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4408
+
+import          StackTest
+
+main :: IO ()
+main = stack ["init"]
diff --git a/tests/integration/tests/4408-init-internal-libs/files/.gitignore b/tests/integration/tests/4408-init-internal-libs/files/.gitignore
new file mode 100644
index 0000000000..82bb5452c4
--- /dev/null
+++ b/tests/integration/tests/4408-init-internal-libs/files/.gitignore
@@ -0,0 +1,2 @@
+myPackage.cabal
+stack.yaml
diff --git a/tests/integration/tests/4408-init-internal-libs/files/int/Internal.hs b/tests/integration/tests/4408-init-internal-libs/files/int/Internal.hs
new file mode 100644
index 0000000000..d066bb085e
--- /dev/null
+++ b/tests/integration/tests/4408-init-internal-libs/files/int/Internal.hs
@@ -0,0 +1 @@
+module Internal where
diff --git a/tests/integration/tests/4408-init-internal-libs/files/package.yaml b/tests/integration/tests/4408-init-internal-libs/files/package.yaml
new file mode 100644
index 0000000000..ab1ff55ee9
--- /dev/null
+++ b/tests/integration/tests/4408-init-internal-libs/files/package.yaml
@@ -0,0 +1,15 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - internal
+
+internal-libraries:
+  internal:
+    source-dirs: int
diff --git a/tests/integration/tests/4408-init-internal-libs/files/src/Lib.hs b/tests/integration/tests/4408-init-internal-libs/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/4408-init-internal-libs/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/443-specify-path/Main.hs b/tests/integration/tests/443-specify-path/Main.hs
new file mode 100644
index 0000000000..56e5e074fa
--- /dev/null
+++ b/tests/integration/tests/443-specify-path/Main.hs
@@ -0,0 +1,30 @@
+-- Stack can specify the directory to which built executable binary files are
+-- copied.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/443
+
+import StackTest
+import System.Directory ( createDirectory, getCurrentDirectory )
+import System.FilePath ( (</>) )
+
+main :: IO ()
+main = do
+  -- Default install
+  -- A manual test of the default stack install is required
+
+  -- Install in current dir
+  stack [ "--local-bin-path", ".", "install" ]
+  doesExist myExe
+
+  -- Install in relative path
+  createDirectory "bin"
+  stack [ "--local-bin-path", "./bin", "install" ]
+  doesExist ("./bin/" <> myExe)
+
+  -- Install in absolute path
+  tmpDirectory <- fmap (</> "bin-absolute") getCurrentDirectory
+  createDirectory tmpDirectory
+  stack [ "--local-bin-path", tmpDirectory, "install" ]
+  doesExist (tmpDirectory </> myExe)
+ where
+  myExe = "myExe" <> exeExt
diff --git a/tests/integration/tests/443-specify-path/files/.gitignore b/tests/integration/tests/443-specify-path/files/.gitignore
new file mode 100644
index 0000000000..e28030a9e4
--- /dev/null
+++ b/tests/integration/tests/443-specify-path/files/.gitignore
@@ -0,0 +1,5 @@
+bin/
+bin-absolute/
+myPackage.cabal
+myPackage.exe
+myPackage
diff --git a/tests/integration/tests/443-specify-path/files/app/Main.hs b/tests/integration/tests/443-specify-path/files/app/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/443-specify-path/files/app/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/443-specify-path/files/package.yaml b/tests/integration/tests/443-specify-path/files/package.yaml
new file mode 100644
index 0000000000..ee1f9f8afa
--- /dev/null
+++ b/tests/integration/tests/443-specify-path/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/tests/integration/tests/443-specify-path/files/stack.yaml b/tests/integration/tests/443-specify-path/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/443-specify-path/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/444-package-option/Main.hs b/tests/integration/tests/444-package-option/Main.hs
new file mode 100644
index 0000000000..cf0f314fc4
--- /dev/null
+++ b/tests/integration/tests/444-package-option/Main.hs
@@ -0,0 +1,9 @@
+-- Stack's runghc command allows packages to be identified for use with scripts.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/444
+
+import           StackTest
+
+main :: IO ()
+main = stack
+  ["--snapshot", "mySnapshot.yaml", "runghc", "--package", "acme-missiles", "Script.hs"]
diff --git a/tests/integration/tests/444-package-option/files/Script.hs b/tests/integration/tests/444-package-option/files/Script.hs
new file mode 100644
index 0000000000..97f6a45c8d
--- /dev/null
+++ b/tests/integration/tests/444-package-option/files/Script.hs
@@ -0,0 +1,4 @@
+import           Acme.Missiles ( launchMissiles )
+
+main :: IO ()
+main = launchMissiles
diff --git a/tests/integration/tests/444-package-option/files/mySnapshot.yaml b/tests/integration/tests/444-package-option/files/mySnapshot.yaml
new file mode 100644
index 0000000000..09bb7df5ab
--- /dev/null
+++ b/tests/integration/tests/444-package-option/files/mySnapshot.yaml
@@ -0,0 +1,6 @@
+name: mySnapshot
+
+snapshot: ghc-9.10.3
+
+packages:
+- acme-missiles-0.3
diff --git a/tests/integration/tests/4453-detailed/Main.hs b/tests/integration/tests/4453-detailed/Main.hs
new file mode 100644
index 0000000000..fe56218f86
--- /dev/null
+++ b/tests/integration/tests/4453-detailed/Main.hs
@@ -0,0 +1,8 @@
+-- Stack supports tests of type detailed-0.9.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4453
+
+import           StackTest
+
+main :: IO ()
+main = stack ["test"]
diff --git a/tests/integration/tests/4453-detailed/files/.gitignore b/tests/integration/tests/4453-detailed/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4453-detailed/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4453-detailed/files/package.yaml b/tests/integration/tests/4453-detailed/files/package.yaml
new file mode 100644
index 0000000000..8ecf25e975
--- /dev/null
+++ b/tests/integration/tests/4453-detailed/files/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+tests:
+  test:
+    verbatim:
+      type: detailed-0.9
+      test-module: Test
+    source-dirs: test
+    other-modules: []
+    dependencies:
+    - Cabal >= 1.20
diff --git a/tests/integration/tests/4453-detailed/files/stack.yaml b/tests/integration/tests/4453-detailed/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4453-detailed/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4453-detailed/files/test/Test.hs b/tests/integration/tests/4453-detailed/files/test/Test.hs
new file mode 100644
index 0000000000..c0e8be21d2
--- /dev/null
+++ b/tests/integration/tests/4453-detailed/files/test/Test.hs
@@ -0,0 +1,20 @@
+module Test
+  ( tests
+  ) where
+
+import           Distribution.TestSuite
+                   ( Progress (..), Result (..), Test (..), TestInstance (..) )
+
+tests :: IO [Test]
+tests = pure [ test "test" Pass ]
+
+test :: String -> Result -> Test
+test name r = Test testInstance
+ where
+  testInstance = TestInstance
+    { run = pure (Finished r)
+    , name = name
+    , tags = []
+    , options = []
+    , setOption = \_ _ -> Right testInstance
+    }
diff --git a/tests/integration/tests/4488-newer-cabal-version/Main.hs b/tests/integration/tests/4488-newer-cabal-version/Main.hs
new file mode 100644
index 0000000000..c246a1ee4f
--- /dev/null
+++ b/tests/integration/tests/4488-newer-cabal-version/Main.hs
@@ -0,0 +1,11 @@
+-- Stack can build with a version of Cabal (the library) other than that which
+-- is a boot package of the specified GHC version.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4488
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stackErr ["--stack-yaml", "stack-bad.yaml", "build", "--dry-run"]
+  stack ["--stack-yaml", "stack-good.yaml", "build", "--dry-run"]
diff --git a/tests/integration/tests/4488-newer-cabal-version/files/.gitignore b/tests/integration/tests/4488-newer-cabal-version/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4488-newer-cabal-version/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4488-newer-cabal-version/files/package.yaml b/tests/integration/tests/4488-newer-cabal-version/files/package.yaml
new file mode 100644
index 0000000000..f695f01228
--- /dev/null
+++ b/tests/integration/tests/4488-newer-cabal-version/files/package.yaml
@@ -0,0 +1,12 @@
+spec-version: 0.36.0
+
+name: myPackage
+custom-setup:
+  dependencies:
+  - base
+  - Cabal == 3.16.1.0
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml b/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml b/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml
new file mode 100644
index 0000000000..578b1f2a09
--- /dev/null
+++ b/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+- Cabal-3.16.1.0
+- Cabal-syntax-3.16.1.0
+- alex-3.5.4.2
diff --git a/tests/integration/tests/4706-ignore-ghc-env-files/Main.hs b/tests/integration/tests/4706-ignore-ghc-env-files/Main.hs
new file mode 100644
index 0000000000..e7e1666c54
--- /dev/null
+++ b/tests/integration/tests/4706-ignore-ghc-env-files/Main.hs
@@ -0,0 +1,30 @@
+-- Stack ignores GHC_ENVIRONMENT.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4706
+
+import           Control.Exception ( bracket_ )
+import           StackTest
+import           System.Directory ( canonicalizePath, removeFile )
+import           System.Environment ( setEnv )
+import           System.Info (arch, os)
+
+main :: IO ()
+main = do
+  let ghcVer = "9.10.3"
+      fp = concat
+        [ ".ghc.environment."
+        , arch
+        , "-"
+        , os
+        , "-"
+        , ghcVer
+        ]
+  bracket_
+    (writeFile fp "This is an invalid GHC environment file")
+    (removeFile fp)
+    ( do
+        envFile <- canonicalizePath fp
+        setEnv "GHC_ENVIRONMENT" envFile
+        stack ["build"]
+        stack ["runghc", "Main.hs"]
+    )
diff --git a/tests/integration/tests/4706-ignore-ghc-env-files/files/.gitignore b/tests/integration/tests/4706-ignore-ghc-env-files/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4706-ignore-ghc-env-files/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/test/integration/tests/4706-ignore-ghc-env-files/files/Main.hs b/tests/integration/tests/4706-ignore-ghc-env-files/files/Main.hs
similarity index 100%
rename from test/integration/tests/4706-ignore-ghc-env-files/files/Main.hs
rename to tests/integration/tests/4706-ignore-ghc-env-files/files/Main.hs
diff --git a/tests/integration/tests/4706-ignore-ghc-env-files/files/package.yaml b/tests/integration/tests/4706-ignore-ghc-env-files/files/package.yaml
new file mode 100644
index 0000000000..4b373ba746
--- /dev/null
+++ b/tests/integration/tests/4706-ignore-ghc-env-files/files/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4706-ignore-ghc-env-files/files/stack.yaml b/tests/integration/tests/4706-ignore-ghc-env-files/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4706-ignore-ghc-env-files/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4754-rebuild-haddocks/Main.hs b/tests/integration/tests/4754-rebuild-haddocks/Main.hs
new file mode 100644
index 0000000000..3d5e0c499e
--- /dev/null
+++ b/tests/integration/tests/4754-rebuild-haddocks/Main.hs
@@ -0,0 +1,13 @@
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4754
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCleanFull
+  stackErr ["haddock"]
+  stackCleanFull
+  stackErr ["haddock", "--no-haddock-deps"]
+  stack ["build"]
+  stackErr ["haddock", "--no-haddock-deps"]
diff --git a/tests/integration/tests/4754-rebuild-haddocks/files/.gitignore b/tests/integration/tests/4754-rebuild-haddocks/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4754-rebuild-haddocks/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4754-rebuild-haddocks/files/package.yaml b/tests/integration/tests/4754-rebuild-haddocks/files/package.yaml
new file mode 100644
index 0000000000..3c2901b603
--- /dev/null
+++ b/tests/integration/tests/4754-rebuild-haddocks/files/package.yaml
@@ -0,0 +1,12 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  ghc-options:
+  - -Werror
+  - -Winvalid-haddock
diff --git a/tests/integration/tests/4754-rebuild-haddocks/files/src/Lib.hs b/tests/integration/tests/4754-rebuild-haddocks/files/src/Lib.hs
new file mode 100644
index 0000000000..4aa20bc752
--- /dev/null
+++ b/tests/integration/tests/4754-rebuild-haddocks/files/src/Lib.hs
@@ -0,0 +1,5 @@
+module Lib where
+
+-- | The function below intentionally contains invalid Haddock
+func :: ()
+func = () -- ^ this should fail!!!
diff --git a/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml b/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/4783-doctest-deps/Main.hs b/tests/integration/tests/4783-doctest-deps/Main.hs
new file mode 100644
index 0000000000..ccdbd4732b
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/Main.hs
@@ -0,0 +1,9 @@
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4783
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build", "myPackageB"]
+  stack ["test"]
diff --git a/tests/integration/tests/4783-doctest-deps/files/.gitignore b/tests/integration/tests/4783-doctest-deps/files/.gitignore
new file mode 100644
index 0000000000..f9a6e152d2
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/files/.gitignore
@@ -0,0 +1,2 @@
+myPackageA.cabal
+myPackageB.cabal
diff --git a/tests/integration/tests/4783-doctest-deps/files/myPackageB/Acme/Dont.hs b/tests/integration/tests/4783-doctest-deps/files/myPackageB/Acme/Dont.hs
new file mode 100644
index 0000000000..dd6e565c6f
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/files/myPackageB/Acme/Dont.hs
@@ -0,0 +1,4 @@
+module Acme.Dont where
+
+don't :: (Monad m) => m a -> m ()
+don't _action = return ()
diff --git a/tests/integration/tests/4783-doctest-deps/files/myPackageB/package.yaml b/tests/integration/tests/4783-doctest-deps/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..f94636c710
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/files/myPackageB/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4783-doctest-deps/files/package.yaml b/tests/integration/tests/4783-doctest-deps/files/package.yaml
new file mode 100644
index 0000000000..142bbea6b6
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/files/package.yaml
@@ -0,0 +1,17 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+tests:
+  doctest:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - doctest
+    - acme-dont
diff --git a/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml
new file mode 100644
index 0000000000..b24da14542
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml
@@ -0,0 +1,6 @@
+name: mySnapshot
+
+snapshot: lts-24.55
+
+packages:
+- acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602
diff --git a/tests/integration/tests/4783-doctest-deps/files/src/Lib.hs b/tests/integration/tests/4783-doctest-deps/files/src/Lib.hs
new file mode 100644
index 0000000000..c625fb3d19
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/files/src/Lib.hs
@@ -0,0 +1,8 @@
+module Lib where
+
+-- |
+--
+-- >>> import Acme.Dont
+-- >>> don't func
+func :: IO ()
+func = error "func"
diff --git a/tests/integration/tests/4783-doctest-deps/files/stack.yaml b/tests/integration/tests/4783-doctest-deps/files/stack.yaml
new file mode 100644
index 0000000000..9cfd6e6102
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: snapshot.yaml
+
+extra-deps:
+# Include a package with a duplicated module name
+- myPackageB
diff --git a/tests/integration/tests/4783-doctest-deps/files/test/Main.hs b/tests/integration/tests/4783-doctest-deps/files/test/Main.hs
new file mode 100644
index 0000000000..241b37352a
--- /dev/null
+++ b/tests/integration/tests/4783-doctest-deps/files/test/Main.hs
@@ -0,0 +1,4 @@
+import           Test.DocTest
+
+main :: IO ()
+main = doctest ["src/Lib.hs"]
diff --git a/tests/integration/tests/4897-boot-package-pruned/Main.hs b/tests/integration/tests/4897-boot-package-pruned/Main.hs
new file mode 100644
index 0000000000..8e9c457127
--- /dev/null
+++ b/tests/integration/tests/4897-boot-package-pruned/Main.hs
@@ -0,0 +1,19 @@
+-- Stack warns when a required GHC boot package has been pruned.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4897
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+planFailure :: String
+planFailure = "but this GHC boot package has been pruned"
+
+main :: IO ()
+main = do
+  stackErrStderr ["build"] (expectMessage planFailure)
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected an error: \n" ++ show msg
diff --git a/tests/integration/tests/4897-boot-package-pruned/files/.gitignore b/tests/integration/tests/4897-boot-package-pruned/files/.gitignore
new file mode 100644
index 0000000000..59d924c932
--- /dev/null
+++ b/tests/integration/tests/4897-boot-package-pruned/files/.gitignore
@@ -0,0 +1,2 @@
+directory.cabal
+myPackage.cabal
diff --git a/tests/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal b/tests/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal
new file mode 100644
index 0000000000..003b0b4583
--- /dev/null
+++ b/tests/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal
@@ -0,0 +1,14 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.39.1.
+--
+-- see: https://github.com/sol/hpack
+
+name:           directory
+version:        0.0.0
+build-type:     Simple
+
+library
+  build-depends:
+      base
+  default-language: Haskell2010
diff --git a/tests/integration/tests/4897-boot-package-pruned/files/directory/package.yaml b/tests/integration/tests/4897-boot-package-pruned/files/directory/package.yaml
new file mode 100644
index 0000000000..f93449661a
--- /dev/null
+++ b/tests/integration/tests/4897-boot-package-pruned/files/directory/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: directory
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/4897-boot-package-pruned/files/package.yaml b/tests/integration/tests/4897-boot-package-pruned/files/package.yaml
new file mode 100644
index 0000000000..2a46ba72d4
--- /dev/null
+++ b/tests/integration/tests/4897-boot-package-pruned/files/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- directory
+- process
+
+library: {}
diff --git a/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml b/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml
new file mode 100644
index 0000000000..8a84491306
--- /dev/null
+++ b/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+- ./directory
diff --git a/tests/integration/tests/4938-non-ascii-module-names/Main.hs b/tests/integration/tests/4938-non-ascii-module-names/Main.hs
new file mode 100644
index 0000000000..5fe95a532b
--- /dev/null
+++ b/tests/integration/tests/4938-non-ascii-module-names/Main.hs
@@ -0,0 +1,15 @@
+-- Stack accepts module names that include Unicode code points outside of the
+-- Basic Latin Unicode block (ASCII).
+--
+-- See: https://github.com/commercialhaskell/stack/issues/4938
+
+import           Control.Monad ( unless )
+import           StackTest
+
+main :: IO ()
+main = do
+  -- Disabled on Windows due to an error occurred in the integration tests
+  -- regarding Unicode character. Tried to fix it (https://github.com/commercialhaskell/stack/pull/5162/commits/8f04ad9e4cbaa54370dc5af476e3307a16c84405)
+  -- but it didn't work
+  unless isWindows $
+    stack ["build"]
diff --git a/tests/integration/tests/4938-non-ascii-module-names/files/.gitignore b/tests/integration/tests/4938-non-ascii-module-names/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/4938-non-ascii-module-names/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/4938-non-ascii-module-names/files/package.yaml b/tests/integration/tests/4938-non-ascii-module-names/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/4938-non-ascii-module-names/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git "a/tests/integration/tests/4938-non-ascii-module-names/files/src/\316\224\316\277\316\272\316\271\316\274\316\256.hs" "b/tests/integration/tests/4938-non-ascii-module-names/files/src/\316\224\316\277\316\272\316\271\316\274\316\256.hs"
new file mode 100644
index 0000000000..9e2709d52d
--- /dev/null
+++ "b/tests/integration/tests/4938-non-ascii-module-names/files/src/\316\224\316\277\316\272\316\271\316\274\316\256.hs"
@@ -0,0 +1,6 @@
+module Δοκιμή
+  ( func
+  ) where
+
+func :: IO ()
+func = pure ()
diff --git a/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/5180-ghc-rts-flags/Main.hs b/tests/integration/tests/5180-ghc-rts-flags/Main.hs
new file mode 100644
index 0000000000..abdca100ad
--- /dev/null
+++ b/tests/integration/tests/5180-ghc-rts-flags/Main.hs
@@ -0,0 +1,8 @@
+-- Stack supports GHC RTS options.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/5180
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/5180-ghc-rts-flags/files/.gitignore b/tests/integration/tests/5180-ghc-rts-flags/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/5180-ghc-rts-flags/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/5180-ghc-rts-flags/files/package.yaml b/tests/integration/tests/5180-ghc-rts-flags/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/5180-ghc-rts-flags/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs b/tests/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml b/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml
new file mode 100644
index 0000000000..6f95611bd9
--- /dev/null
+++ b/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+ghc-options:
+  "$locals": -j8 +RTS -s -A128M
diff --git a/tests/integration/tests/5272-only-locals/Main.hs b/tests/integration/tests/5272-only-locals/Main.hs
new file mode 100644
index 0000000000..0b2d4ebc3a
--- /dev/null
+++ b/tests/integration/tests/5272-only-locals/Main.hs
@@ -0,0 +1,14 @@
+-- Stack supports a build target limited to locals.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/5272
+
+import           Control.Monad ( void )
+import           StackTest
+
+main :: IO ()
+main = do
+  -- Ensure that the acme-missiles package is not in a package database
+  void $ stack' ["exec", "ghc-pkg", "unregister", "acme-missiles"]
+  stackErr ["build", "--only-locals"]
+  stack ["build", "--only-snapshot"]
+  stack ["build", "--only-locals"]
diff --git a/tests/integration/tests/5272-only-locals/files/.gitignore b/tests/integration/tests/5272-only-locals/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/5272-only-locals/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/5272-only-locals/files/package.yaml b/tests/integration/tests/5272-only-locals/files/package.yaml
new file mode 100644
index 0000000000..c80a013e52
--- /dev/null
+++ b/tests/integration/tests/5272-only-locals/files/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- acme-missiles
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/5272-only-locals/files/src/Lib.hs b/tests/integration/tests/5272-only-locals/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/5272-only-locals/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/5272-only-locals/files/stack.yaml b/tests/integration/tests/5272-only-locals/files/stack.yaml
new file mode 100644
index 0000000000..bb37b901bc
--- /dev/null
+++ b/tests/integration/tests/5272-only-locals/files/stack.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+- acme-missiles-0.3@rev:0
diff --git a/tests/integration/tests/5680-share-package-across-projects/Main.hs b/tests/integration/tests/5680-share-package-across-projects/Main.hs
new file mode 100644
index 0000000000..b5797bdfb8
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/Main.hs
@@ -0,0 +1,11 @@
+-- Stack supports project packages located outside of the project directory.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/5680
+
+import           StackTest
+
+main :: IO ()
+main = do
+  withCwd "myPackageA" $ stack ["build"]
+  withCwd "myPackageB" $ stack ["build"]
+  withCwd "myPackageA" $ stack ["build"]
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/.gitignore b/tests/integration/tests/5680-share-package-across-projects/files/.gitignore
new file mode 100644
index 0000000000..c4ea0f5ab0
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/.gitignore
@@ -0,0 +1,3 @@
+myPackageA.cabal
+myPackageB.cabal
+myPackageC.cabal
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/package.yaml b/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..d26b472ded
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/src/Lib.hs b/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/stack.yaml
new file mode 100644
index 0000000000..227a659a66
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/myPackageA/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- .
+- ../myPackageC
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/package.yaml b/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..03b4ec87d3
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/src/Lib.hs b/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/stack.yaml
new file mode 100644
index 0000000000..227a659a66
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/myPackageB/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- .
+- ../myPackageC
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/myPackageC/package.yaml b/tests/integration/tests/5680-share-package-across-projects/files/myPackageC/package.yaml
new file mode 100644
index 0000000000..4ab5200b73
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/myPackageC/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackageC
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/test/integration/tests/1659-skip-component/files/src/Lib.hs b/tests/integration/tests/5680-share-package-across-projects/files/myPackageC/src/Lib.hs
similarity index 100%
rename from test/integration/tests/1659-skip-component/files/src/Lib.hs
rename to tests/integration/tests/5680-share-package-across-projects/files/myPackageC/src/Lib.hs
diff --git a/tests/integration/tests/5680-share-package-across-projects/files/myPackageC/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/myPackageC/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/5680-share-package-across-projects/files/myPackageC/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/6046-missing-sublib-unregister/Main.hs b/tests/integration/tests/6046-missing-sublib-unregister/Main.hs
new file mode 100644
index 0000000000..c43d98a66d
--- /dev/null
+++ b/tests/integration/tests/6046-missing-sublib-unregister/Main.hs
@@ -0,0 +1,16 @@
+-- Stack builds a package where the main library depends on a private named
+-- lirary (an internal library).
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6046
+
+import StackTest
+
+-- This tests building a package with a library and an internal sub library,
+-- where the library depends on the sub library, first version 0.1.0.0 and then
+-- version 0.2.0.0.
+main :: IO ()
+main = do
+  copy "package1.yaml" "package.yaml"
+  stack ["build"]
+  copy "package2.yaml" "package.yaml"
+  stack ["build"]
diff --git a/tests/integration/tests/6046-missing-sublib-unregister/files/int/Internal.hs b/tests/integration/tests/6046-missing-sublib-unregister/files/int/Internal.hs
new file mode 100644
index 0000000000..d066bb085e
--- /dev/null
+++ b/tests/integration/tests/6046-missing-sublib-unregister/files/int/Internal.hs
@@ -0,0 +1 @@
+module Internal where
diff --git a/tests/integration/tests/6046-missing-sublib-unregister/files/package1.yaml b/tests/integration/tests/6046-missing-sublib-unregister/files/package1.yaml
new file mode 100644
index 0000000000..62c65aee09
--- /dev/null
+++ b/tests/integration/tests/6046-missing-sublib-unregister/files/package1.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackage
+version: 0.1.0.0
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - internal
+
+internal-libraries:
+  internal:
+    source-dirs: int
diff --git a/tests/integration/tests/6046-missing-sublib-unregister/files/package2.yaml b/tests/integration/tests/6046-missing-sublib-unregister/files/package2.yaml
new file mode 100644
index 0000000000..176e733308
--- /dev/null
+++ b/tests/integration/tests/6046-missing-sublib-unregister/files/package2.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackage
+version: 0.2.0.0
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - internal
+
+internal-libraries:
+  internal:
+    source-dirs: int
diff --git a/tests/integration/tests/6046-missing-sublib-unregister/files/src/Lib.hs b/tests/integration/tests/6046-missing-sublib-unregister/files/src/Lib.hs
new file mode 100644
index 0000000000..1369151610
--- /dev/null
+++ b/tests/integration/tests/6046-missing-sublib-unregister/files/src/Lib.hs
@@ -0,0 +1,3 @@
+module Lib where
+
+import Internal
diff --git a/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml b/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/606-local-version-not-exist/Main.hs b/tests/integration/tests/606-local-version-not-exist/Main.hs
new file mode 100644
index 0000000000..cfd6a18a03
--- /dev/null
+++ b/tests/integration/tests/606-local-version-not-exist/Main.hs
@@ -0,0 +1,12 @@
+-- Stack reports an error when the target is a project package version,
+-- whether the version is correct or not.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/606
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stackErr ["build", "myPackage-1"]
+  stackErr ["build", "myPackage-0.1.0.0"]
+  stack ["build", "myPackage"]
diff --git a/tests/integration/tests/606-local-version-not-exist/files/.gitignore b/tests/integration/tests/606-local-version-not-exist/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/606-local-version-not-exist/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/606-local-version-not-exist/files/package.yaml b/tests/integration/tests/606-local-version-not-exist/files/package.yaml
new file mode 100644
index 0000000000..b20cb3407d
--- /dev/null
+++ b/tests/integration/tests/606-local-version-not-exist/files/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+version: 0.1.0.0
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/606-local-version-not-exist/files/src/Lib.hs b/tests/integration/tests/606-local-version-not-exist/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/606-local-version-not-exist/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/606-local-version-not-exist/files/stack.yaml b/tests/integration/tests/606-local-version-not-exist/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/606-local-version-not-exist/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/617-extra-dep-flag/Main.hs b/tests/integration/tests/617-extra-dep-flag/Main.hs
new file mode 100644
index 0000000000..b4b45ef978
--- /dev/null
+++ b/tests/integration/tests/617-extra-dep-flag/Main.hs
@@ -0,0 +1,8 @@
+-- Stack can specify a Cabal flag for an extra-dep.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/617
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build", "acme-missiles-0.3"]
diff --git a/tests/integration/tests/617-extra-dep-flag/files/stack.yaml b/tests/integration/tests/617-extra-dep-flag/files/stack.yaml
new file mode 100644
index 0000000000..ae1b6d1fd9
--- /dev/null
+++ b/tests/integration/tests/617-extra-dep-flag/files/stack.yaml
@@ -0,0 +1,10 @@
+snapshot: ghc-9.10.3
+
+packages: []
+
+extra-deps:
+- text-1.2.0.3
+
+flags:
+  text:
+    integer-simple: false
diff --git a/tests/integration/tests/617-unused-flag-cli/Main.hs b/tests/integration/tests/617-unused-flag-cli/Main.hs
new file mode 100644
index 0000000000..f1123b1794
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-cli/Main.hs
@@ -0,0 +1,13 @@
+-- Stack reports an error when a Cabal flag is specified on the command line for
+-- a specific non-existent package or a non-existent Cabal flag is specified for
+-- a specific project package.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/617
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stackErr ["build", "--flag", "noSuchPackage:my-flag"]
+  stackErr ["build", "--flag", "myPackage:no-such-flag"]
+  stack ["build", "--flag", "*:no-such-flag"]
diff --git a/tests/integration/tests/617-unused-flag-cli/files/.gitignore b/tests/integration/tests/617-unused-flag-cli/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-cli/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/617-unused-flag-cli/files/package.yaml b/tests/integration/tests/617-unused-flag-cli/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-cli/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/617-unused-flag-cli/files/src/Lib.hs b/tests/integration/tests/617-unused-flag-cli/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-cli/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/617-unused-flag-cli/files/stack.yaml b/tests/integration/tests/617-unused-flag-cli/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-cli/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/617-unused-flag-name-yaml/Main.hs b/tests/integration/tests/617-unused-flag-name-yaml/Main.hs
new file mode 100644
index 0000000000..576cea322d
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-name-yaml/Main.hs
@@ -0,0 +1,9 @@
+-- Stack reports an error when a non-existent Cabal flag is specified for
+-- a project package.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/617
+
+import           StackTest
+
+main :: IO ()
+main = stackErr ["build"]
diff --git a/tests/integration/tests/617-unused-flag-name-yaml/files/.gitignore b/tests/integration/tests/617-unused-flag-name-yaml/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-name-yaml/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/617-unused-flag-name-yaml/files/package.yaml b/tests/integration/tests/617-unused-flag-name-yaml/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-name-yaml/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs b/tests/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml b/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml
new file mode 100644
index 0000000000..d7173d4dd8
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+flags:
+  myPackage:
+    no-such-flag: false
diff --git a/tests/integration/tests/617-unused-flag-yaml/Main.hs b/tests/integration/tests/617-unused-flag-yaml/Main.hs
new file mode 100644
index 0000000000..0d928514db
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-yaml/Main.hs
@@ -0,0 +1,9 @@
+-- Stack reports an error when a Cabal flag is specified for a specific
+-- non-existent package.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/617
+
+import           StackTest
+
+main :: IO ()
+main = stackErr ["build"]
diff --git a/tests/integration/tests/617-unused-flag-yaml/files/.gitignore b/tests/integration/tests/617-unused-flag-yaml/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-yaml/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/617-unused-flag-yaml/files/package.yaml b/tests/integration/tests/617-unused-flag-yaml/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-yaml/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/test/integration/tests/3397-ghc-solver/files/src/Lib.hs b/tests/integration/tests/617-unused-flag-yaml/files/src/Lib.hs
similarity index 100%
rename from test/integration/tests/3397-ghc-solver/files/src/Lib.hs
rename to tests/integration/tests/617-unused-flag-yaml/files/src/Lib.hs
diff --git a/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml b/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml
new file mode 100644
index 0000000000..ba4e5e5804
--- /dev/null
+++ b/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+flags:
+  no-such-package:
+    my-flag: false
diff --git a/tests/integration/tests/620-env-command/Main.hs b/tests/integration/tests/620-env-command/Main.hs
new file mode 100644
index 0000000000..94b2c35a5b
--- /dev/null
+++ b/tests/integration/tests/620-env-command/Main.hs
@@ -0,0 +1,12 @@
+-- Stack's config env command produces output that can be evaluated by bash's
+-- built-in eval command.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/617
+
+import           Control.Exception ( throwIO )
+import           Control.Monad ( unless )
+import           StackTest
+import           System.Process ( rawSystem )
+
+main :: IO ()
+main = unless isWindows $ rawSystem "bash" ["run.sh"] >>= throwIO
diff --git a/test/integration/tests/620-env-command/files/.gitignore b/tests/integration/tests/620-env-command/files/.gitignore
similarity index 100%
rename from test/integration/tests/620-env-command/files/.gitignore
rename to tests/integration/tests/620-env-command/files/.gitignore
diff --git a/test/integration/tests/copy-bins-works/files/src/Main.hs b/tests/integration/tests/620-env-command/files/Main.hs
similarity index 100%
rename from test/integration/tests/copy-bins-works/files/src/Main.hs
rename to tests/integration/tests/620-env-command/files/Main.hs
diff --git a/tests/integration/tests/620-env-command/files/run.sh b/tests/integration/tests/620-env-command/files/run.sh
new file mode 100644
index 0000000000..fd9bf2829f
--- /dev/null
+++ b/tests/integration/tests/620-env-command/files/run.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+eval `stack --snapshot lts-24.55 config env`
+ghc Main.hs
diff --git a/tests/integration/tests/6342-say-ghc-version-in-build/.gitignore b/tests/integration/tests/6342-say-ghc-version-in-build/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/6342-say-ghc-version-in-build/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/6342-say-ghc-version-in-build/Main.hs b/tests/integration/tests/6342-say-ghc-version-in-build/Main.hs
new file mode 100644
index 0000000000..51385a13ab
--- /dev/null
+++ b/tests/integration/tests/6342-say-ghc-version-in-build/Main.hs
@@ -0,0 +1,25 @@
+-- Stack outputs the GHC version that it is using during a build.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6342
+
+import           Control.Monad ( unless )
+import           Data.Char ( isSpace )
+import           Data.List ( dropWhileEnd, isInfixOf )
+import           StackTest
+
+main :: IO ()
+main =
+  -- Query the actual compiler
+  stackCheckStdout ["query", "compiler", "actual"] $ \compiler -> do
+    stackCheckStderr ["build"] (expectMessage $ buildWith (trimEnd compiler))
+
+buildWith :: String -> String
+buildWith compiler = "build (lib) with " <> compiler
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr)
+         (error $ "Expected message: \n" ++ show msg)
+
+trimEnd :: String -> String
+trimEnd = dropWhileEnd isSpace
diff --git a/tests/integration/tests/6342-say-ghc-version-in-build/files/package.yaml b/tests/integration/tests/6342-say-ghc-version-in-build/files/package.yaml
new file mode 100644
index 0000000000..2e4f2c0854
--- /dev/null
+++ b/tests/integration/tests/6342-say-ghc-version-in-build/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base < 5
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/6342-say-ghc-version-in-build/files/src/Lib.hs b/tests/integration/tests/6342-say-ghc-version-in-build/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/6342-say-ghc-version-in-build/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/6342-say-ghc-version-in-build/files/stack.yaml b/tests/integration/tests/6342-say-ghc-version-in-build/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/6342-say-ghc-version-in-build/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/6372-sdist-unicode-test/.gitignore b/tests/integration/tests/6372-sdist-unicode-test/.gitignore
new file mode 100644
index 0000000000..a92d9c3b13
--- /dev/null
+++ b/tests/integration/tests/6372-sdist-unicode-test/.gitignore
@@ -0,0 +1 @@
+test١٢٣.cabal
diff --git a/tests/integration/tests/6372-sdist-unicode-test/Main.hs b/tests/integration/tests/6372-sdist-unicode-test/Main.hs
new file mode 100644
index 0000000000..0b33987b95
--- /dev/null
+++ b/tests/integration/tests/6372-sdist-unicode-test/Main.hs
@@ -0,0 +1,23 @@
+-- Stack sdist handles Unicode code points.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6372
+
+import           Control.Monad ( unless )
+import           StackTest
+
+-- | The test fails at runtime on the Windows Server 2022 GitHub-hosted runner
+-- only, at the point of outputting a Unicode character, with:
+--
+-- <stderr>: commitAndReleaseBuffer: invalid argument (cannot encode character '\1633')
+--
+-- That appears to be similar to
+-- https://gitlab.haskell.org/ghc/ghc/-/issues/8118, however: (1) the locale is
+-- set to C.UTF-8 and the active code page is 65001; and
+-- (2) `GHC.IO.Encoding.setLocaleEncoding utf8` has no effect.
+--
+-- Until the origin of the problem is identified, we disable the test on
+-- Windows.
+
+main :: IO ()
+main = unless isWindows $
+  stack ["sdist", "."]
diff --git a/tests/integration/tests/6372-sdist-unicode-test/files/package.yaml b/tests/integration/tests/6372-sdist-unicode-test/files/package.yaml
new file mode 100644
index 0000000000..42e9845b9c
--- /dev/null
+++ b/tests/integration/tests/6372-sdist-unicode-test/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: test١٢٣
+description: Test of non-ASCII Unicode code points in file names
+license: BSD-3-Clause
+
+dependencies:
+- base < 5
+
+library:
+  source-dirs: src
diff --git "a/tests/integration/tests/6372-sdist-unicode-test/files/src/Lib\316\261\316\262\316\263.hs" "b/tests/integration/tests/6372-sdist-unicode-test/files/src/Lib\316\261\316\262\316\263.hs"
new file mode 100644
index 0000000000..5fbed3015d
--- /dev/null
+++ "b/tests/integration/tests/6372-sdist-unicode-test/files/src/Lib\316\261\316\262\316\263.hs"
@@ -0,0 +1 @@
+module Libαβγ where
diff --git a/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml b/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/6372-sdist-unicode-test/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/6451-exe-targets/Main.hs b/tests/integration/tests/6451-exe-targets/Main.hs
new file mode 100644
index 0000000000..09b0f66c7e
--- /dev/null
+++ b/tests/integration/tests/6451-exe-targets/Main.hs
@@ -0,0 +1,24 @@
+-- | Stack should build only those executables requested by the program
+-- arguments.
+--
+-- Issue: https://github.com/commercialhaskell/stack/issues/3229 is no longer
+-- applicable.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6451
+
+module Main where
+
+import           Control.Monad ( when )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr
+    ["build", ":myExeA"]
+    (rejectMessage "Installing executable myExeB in")
+
+rejectMessage :: String -> String -> IO ()
+rejectMessage msg stderr =
+  when (msg `isInfixOf` stderr) $
+    error $ "Did not expect message here: \n" ++ show msg
diff --git a/tests/integration/tests/6451-exe-targets/files/.gitignore b/tests/integration/tests/6451-exe-targets/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/6451-exe-targets/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/6451-exe-targets/files/appA/Main.hs b/tests/integration/tests/6451-exe-targets/files/appA/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/6451-exe-targets/files/appA/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/6451-exe-targets/files/appB/Main.hs b/tests/integration/tests/6451-exe-targets/files/appB/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/6451-exe-targets/files/appB/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/6451-exe-targets/files/package.yaml b/tests/integration/tests/6451-exe-targets/files/package.yaml
new file mode 100644
index 0000000000..6338785a63
--- /dev/null
+++ b/tests/integration/tests/6451-exe-targets/files/package.yaml
@@ -0,0 +1,21 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+executables:
+  myExeA:
+    source-dirs: appA
+    main: Main.hs
+    dependencies:
+    - myPackage
+  myExeB:
+    source-dirs: appB
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/tests/integration/tests/6451-exe-targets/files/src/Lib.hs b/tests/integration/tests/6451-exe-targets/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/6451-exe-targets/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/6451-exe-targets/files/stack.yaml b/tests/integration/tests/6451-exe-targets/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/6451-exe-targets/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/6465-msys-environment/Main.hs b/tests/integration/tests/6465-msys-environment/Main.hs
new file mode 100644
index 0000000000..8c64777059
--- /dev/null
+++ b/tests/integration/tests/6465-msys-environment/Main.hs
@@ -0,0 +1,12 @@
+-- | On Windows, Stack supports different MSYS2 environments.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6465
+
+import           Control.Monad ( when )
+import           StackTest
+
+main :: IO ()
+main = when isWindows $ do
+  stack ["exec", "--", "pacman", "-S", "--noconfirm", "mingw-w64-ucrt-x86_64-gsl"]
+  stack ["build"]
+  stack ["exec", "--", "myExe"]
diff --git a/tests/integration/tests/6465-msys-environment/files/.gitignore b/tests/integration/tests/6465-msys-environment/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/6465-msys-environment/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/6465-msys-environment/files/app/Main.hs b/tests/integration/tests/6465-msys-environment/files/app/Main.hs
new file mode 100644
index 0000000000..76919d9ea3
--- /dev/null
+++ b/tests/integration/tests/6465-msys-environment/files/app/Main.hs
@@ -0,0 +1,12 @@
+module Main (main) where
+
+import Foreign.C.Types
+
+foreign import ccall "gsl/gsl_sf_bessel.h gsl_sf_bessel_J0"
+  gsl_sf_bessel_J0 :: CDouble -> CDouble
+
+main :: IO ()
+main = do
+  let x = CDouble 5.0
+      result = gsl_sf_bessel_J0 x
+  putStrLn $ "J0(" ++ show x ++ ") = " ++ show result
diff --git a/tests/integration/tests/6465-msys-environment/files/package.yaml b/tests/integration/tests/6465-msys-environment/files/package.yaml
new file mode 100644
index 0000000000..d385615dc8
--- /dev/null
+++ b/tests/integration/tests/6465-msys-environment/files/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+extra-libraries:
+- gsl
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/tests/integration/tests/6465-msys-environment/files/stack.yaml b/tests/integration/tests/6465-msys-environment/files/stack.yaml
new file mode 100644
index 0000000000..36d650b698
--- /dev/null
+++ b/tests/integration/tests/6465-msys-environment/files/stack.yaml
@@ -0,0 +1,3 @@
+snapshot: ghc-9.10.3
+
+msys-environment: UCRT64
diff --git a/tests/integration/tests/6867-timeout-grace/Main.hs b/tests/integration/tests/6867-timeout-grace/Main.hs
new file mode 100644
index 0000000000..e5a6d6868a
--- /dev/null
+++ b/tests/integration/tests/6867-timeout-grace/Main.hs
@@ -0,0 +1,42 @@
+-- | Stack supports a grace period timeout for test suites.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6867
+
+import           Control.Monad ( unless )
+import           Data.Char ( toLower )
+import           Data.IORef ( newIORef, readIORef, writeIORef )
+import           Data.List ( isInfixOf )
+import           Data.Time.Clock ( diffUTCTime, getCurrentTime)
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["test", "--no-run-tests"] -- pre-build to avoid counting build time in the test
+
+  start <- getCurrentTime
+  errRef <- newIORef ""
+  stackErrStderr
+    [ "test"
+    , "--test-suite-timeout", "1"
+    , "--test-suite-timeout-grace", "1"
+    ]
+    (writeIORef errRef)
+  end <- getCurrentTime
+  err <- readIORef errRef
+
+  let errLower = map toLower err
+      elapsedSecs :: Double
+      elapsedSecs = realToFrac (diffUTCTime end start)
+
+  logInfo $ "Elapsed time: " ++ show elapsedSecs ++ "s"
+
+  unless ("timed out" `isInfixOf` errLower) $
+    error "Expected test-suite timeout message in stderr output."
+
+  if isWindows
+    then unless (elapsedSecs < 5.0) $
+      error $ "Expected timeout+grace run to finish quickly on Windows, took "
+        ++ show elapsedSecs ++ "s"
+    else unless (elapsedSecs > 1.5 && elapsedSecs < 5.0) $
+      error $ "Expected timeout+grace run to take about timeout+grace on Unix, took "
+        ++ show elapsedSecs ++ "s"
diff --git a/tests/integration/tests/6867-timeout-grace/files/.gitignore b/tests/integration/tests/6867-timeout-grace/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/6867-timeout-grace/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/6867-timeout-grace/files/package.yaml b/tests/integration/tests/6867-timeout-grace/files/package.yaml
new file mode 100644
index 0000000000..c5ca426401
--- /dev/null
+++ b/tests/integration/tests/6867-timeout-grace/files/package.yaml
@@ -0,0 +1,15 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+tests:
+  test:
+    main: Main.hs
+    source-dirs: test
+    when:
+    - condition: '!os(windows)'
+      dependencies:
+      - unix
diff --git a/tests/integration/tests/6867-timeout-grace/files/stack.yaml b/tests/integration/tests/6867-timeout-grace/files/stack.yaml
new file mode 100644
index 0000000000..86cd254c5e
--- /dev/null
+++ b/tests/integration/tests/6867-timeout-grace/files/stack.yaml
@@ -0,0 +1,3 @@
+snapshot: lts-24.55
+packages:
+- .
diff --git a/tests/integration/tests/6867-timeout-grace/files/test/Main.hs b/tests/integration/tests/6867-timeout-grace/files/test/Main.hs
new file mode 100644
index 0000000000..cc4bfd8036
--- /dev/null
+++ b/tests/integration/tests/6867-timeout-grace/files/test/Main.hs
@@ -0,0 +1,19 @@
+{-# LANGUAGE CPP #-}
+
+module Main
+  ( main
+  ) where
+
+import           Control.Concurrent ( threadDelay )
+
+#ifndef mingw32_HOST_OS
+import           System.Posix.Signals
+                   ( Handler (Ignore), installHandler, sigTERM )
+#endif
+
+main :: IO ()
+main = do
+#ifndef mingw32_HOST_OS
+  _ <- installHandler sigTERM Ignore Nothing
+#endif
+  threadDelay 6000000
diff --git a/tests/integration/tests/6879-stack-yaml-includes/Main.hs b/tests/integration/tests/6879-stack-yaml-includes/Main.hs
new file mode 100644
index 0000000000..60e70406ad
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/Main.hs
@@ -0,0 +1,59 @@
+-- | Stack supports an !include directive in YAML configuration files.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6879
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+import           System.Directory ( getCurrentDirectory )
+import           System.Environment ( setEnv )
+import           System.FilePath ( (</>) )
+
+main :: IO ()
+main = do
+  let
+    checkFor expected actual =
+      unless (expected == actual) $
+        error ("expected " <> show expected <> "but got: " <> show actual)
+
+  -- Check that includes in stack.yaml files are included
+  stackCheckStdout
+    ["--stack-yaml", "stack-including-flags.yaml", "run"]
+    (checkFor "TEST_FLAG was set\n")
+
+  stackCheckStdout
+    ["--stack-yaml", "stack-including-flags-with-newline.yaml", "run"]
+    (checkFor "TEST_FLAG was set\n")
+
+  stackCheckStdout
+    ["--stack-yaml", "stack-not-including-flags.yaml", "run"]
+    (checkFor "TEST_FLAG was not set\n")
+
+  -- Check that includes in config.yaml files are included
+  currentDir <- getCurrentDirectory
+  setEnv "STACK_CONFIG" (currentDir </> "config-including-flags.yaml")
+  stackCheckStdout
+    ["--stack-yaml", "stack-not-including-flags.yaml", "run"]
+    (checkFor "TEST_FLAG was set\n")
+
+  -- Check that 'config set' succeeds when the key already exists in a
+  -- stack.yaml file that uses !include directives
+  stackCheckStderr
+    ["--stack-yaml", "stack-including-flags.yaml", "config", "set", "snapshot", "ghc-9.10.3"]
+    (expectMessage "already")
+  -- Check that 'config set' succeeds when the key already exists in a
+  -- stack.yaml file that uses !include directives (with newline variant)
+  stackCheckStderr
+    ["--stack-yaml", "stack-including-flags-with-newline.yaml", "config", "set", "snapshot", "ghc-9.10.3"]
+    (expectMessage "already")
+
+  -- Check that 'config set' raises an error when the key does not exist in a
+  -- stack.yaml file that uses !include directives
+  stackErrStderr
+    ["--stack-yaml", "stack-including-file-with-install-ghc.yaml", "config", "set", "install-ghc", "true"]
+    (expectMessage "!include")
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr' = do
+  unless (msg `isInfixOf` stderr') $
+    error $ "Expected stderr to contain " ++ show msg ++ " but got:\n" ++ stderr'
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/.gitignore b/tests/integration/tests/6879-stack-yaml-includes/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/app/Main.hs b/tests/integration/tests/6879-stack-yaml-includes/files/app/Main.hs
new file mode 100644
index 0000000000..d412740785
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/app/Main.hs
@@ -0,0 +1,13 @@
+{-# LANGUAGE CPP #-}
+
+module Main
+  ( main
+  ) where
+
+main :: IO ()
+main =
+#if TEST_FLAG
+  putStrLn "TEST_FLAG was set"
+#else
+  putStrLn "TEST_FLAG was not set"
+#endif
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/config-flags.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/config-flags.yaml
new file mode 100644
index 0000000000..222ce796b8
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/config-flags.yaml
@@ -0,0 +1,2 @@
+ghc-options:
+  "$everything": -DTEST_FLAG
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/config-including-flags.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/config-including-flags.yaml
new file mode 100644
index 0000000000..290a0eee8a
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/config-including-flags.yaml
@@ -0,0 +1 @@
+<<: !include config-flags.yaml
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/install-ghc.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/install-ghc.yaml
new file mode 100644
index 0000000000..fd3953b239
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/install-ghc.yaml
@@ -0,0 +1 @@
+install-ghc: true
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/package.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/package.yaml
new file mode 100644
index 0000000000..a211bd8344
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/package.yaml
@@ -0,0 +1,20 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+flags:
+  test-flag:
+    description: Generate a compiler error for test purposes
+    default: false
+    manual: true
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    when:
+    - condition: flag(test-flag)
+      cpp-options: -DTEST_FLAG
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/stack-flags.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/stack-flags.yaml
new file mode 100644
index 0000000000..81f0ef1634
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/stack-flags.yaml
@@ -0,0 +1,3 @@
+flags:
+  myPackage:
+    test-flag: true
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-file-with-install-ghc.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-file-with-install-ghc.yaml
new file mode 100644
index 0000000000..e58b5115e2
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-file-with-install-ghc.yaml
@@ -0,0 +1,2 @@
+snapshot: ghc-9.10.3
+<<: !include install-ghc.yaml
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-flags-with-newline.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-flags-with-newline.yaml
new file mode 100644
index 0000000000..4b7216c7c8
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-flags-with-newline.yaml
@@ -0,0 +1,3 @@
+snapshot: ghc-9.10.3
+<<:
+  !include stack-flags.yaml
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-flags.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-flags.yaml
new file mode 100644
index 0000000000..6f6a0cd5f3
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/stack-including-flags.yaml
@@ -0,0 +1,2 @@
+snapshot: ghc-9.10.3
+<<: !include stack-flags.yaml
diff --git a/tests/integration/tests/6879-stack-yaml-includes/files/stack-not-including-flags.yaml b/tests/integration/tests/6879-stack-yaml-includes/files/stack-not-including-flags.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/6879-stack-yaml-includes/files/stack-not-including-flags.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/6896-custom-setup/Main.hs b/tests/integration/tests/6896-custom-setup/Main.hs
new file mode 100644
index 0000000000..18cdffa792
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/Main.hs
@@ -0,0 +1,36 @@
+-- | Stack can build:
+--
+-- * a project package with a custom @Setup.hs@ (see @myPackageA@);
+--
+-- * a project package with a custom @Setup.hs@ that depends on the main library
+--   of another project package (see @myPackageB@ and @myPackageD@); and
+--
+-- * a project package with a custom @Setup.hs@ that depends on the public
+--   sublibrary of another project package that does not have a main library
+--   (see @myPackageC@ amd @myPackageE@).
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6896
+
+import           Control.Monad ( unless)
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr ["build", "myPackageA"] (expectMessage usingCustomA)
+  stackCheckStderr ["build", "myPackageB"] (expectMessage usingCustomB)
+  stackCheckStderr ["build", "myPackageC"] (expectMessage usingCustomC)
+
+usingCustomA :: String
+usingCustomA = "Using my custom Setup.hs for myPackageA"
+
+usingCustomB :: String
+usingCustomB = "messageD: Using my custom Setup.hs for myPackageB"
+
+usingCustomC :: String
+usingCustomC = "messageE: Using my custom Setup.hs for myPackageC"
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected output: \n" ++ show msg
diff --git a/tests/integration/tests/6896-custom-setup/files/.gitignore b/tests/integration/tests/6896-custom-setup/files/.gitignore
new file mode 100644
index 0000000000..ec90d3285d
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/.gitignore
@@ -0,0 +1,5 @@
+myPackageA.cabal
+myPackageB.cabal
+myPackageC.cabal
+myPackageD.cabal
+myPackageE.cabal
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageA/Setup.hs b/tests/integration/tests/6896-custom-setup/files/myPackageA/Setup.hs
new file mode 100644
index 0000000000..dcc59c17b5
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageA/Setup.hs
@@ -0,0 +1,4 @@
+import Distribution.Simple
+main = do
+  putStrLn "Using my custom Setup.hs for myPackageA"
+  defaultMain
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageA/package.yaml b/tests/integration/tests/6896-custom-setup/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..4cdfea8748
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageA/package.yaml
@@ -0,0 +1,13 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+custom-setup:
+  dependencies:
+  - base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageA/src/LibA.hs b/tests/integration/tests/6896-custom-setup/files/myPackageA/src/LibA.hs
new file mode 100644
index 0000000000..a02dbb2486
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageA/src/LibA.hs
@@ -0,0 +1 @@
+module LibA where
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageB/Setup.hs b/tests/integration/tests/6896-custom-setup/files/myPackageB/Setup.hs
new file mode 100644
index 0000000000..d1b4ae8498
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageB/Setup.hs
@@ -0,0 +1,6 @@
+import           Distribution.Simple
+import           LibD ( messageD )
+
+main = do
+  putStrLn messageD
+  defaultMain
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageB/package.yaml b/tests/integration/tests/6896-custom-setup/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..06acaf9aac
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageB/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+custom-setup:
+  dependencies:
+  - base
+  - myPackageD
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageB/src/LibB.hs b/tests/integration/tests/6896-custom-setup/files/myPackageB/src/LibB.hs
new file mode 100644
index 0000000000..913d829c0a
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageB/src/LibB.hs
@@ -0,0 +1 @@
+module LibB where
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageC/Setup.hs b/tests/integration/tests/6896-custom-setup/files/myPackageC/Setup.hs
new file mode 100644
index 0000000000..282159a3b8
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageC/Setup.hs
@@ -0,0 +1,6 @@
+import           Distribution.Simple
+import           SublibE ( messageE )
+
+main = do
+  putStrLn messageE
+  defaultMain
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageC/package.yaml b/tests/integration/tests/6896-custom-setup/files/myPackageC/package.yaml
new file mode 100644
index 0000000000..0f504d627a
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageC/package.yaml
@@ -0,0 +1,17 @@
+spec-version: 0.36.0
+
+verbatim:
+  cabal-version: 3.4
+
+name: myPackageC
+
+dependencies:
+- base
+
+custom-setup:
+  dependencies:
+  - base
+  - myPackageE:myPackageE-sub
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageC/src/LibC.hs b/tests/integration/tests/6896-custom-setup/files/myPackageC/src/LibC.hs
new file mode 100644
index 0000000000..48da7c9108
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageC/src/LibC.hs
@@ -0,0 +1 @@
+module LibC where
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageD/package.yaml b/tests/integration/tests/6896-custom-setup/files/myPackageD/package.yaml
new file mode 100644
index 0000000000..3d51f11ae8
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageD/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackageD
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageD/src/LibD.hs b/tests/integration/tests/6896-custom-setup/files/myPackageD/src/LibD.hs
new file mode 100644
index 0000000000..19c7c8dead
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageD/src/LibD.hs
@@ -0,0 +1,6 @@
+module LibD
+  ( messageD
+  ) where
+
+messageD :: String
+messageD = "messageD: Using my custom Setup.hs for myPackageB"
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageE/package.yaml b/tests/integration/tests/6896-custom-setup/files/myPackageE/package.yaml
new file mode 100644
index 0000000000..1edcb2d54d
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageE/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageE
+
+dependencies:
+- base
+
+internal-libraries:
+  myPackageE-sub:
+    visibility: public
+    source-dirs: sub
diff --git a/tests/integration/tests/6896-custom-setup/files/myPackageE/sub/SublibE.hs b/tests/integration/tests/6896-custom-setup/files/myPackageE/sub/SublibE.hs
new file mode 100644
index 0000000000..34f4adc5ec
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/myPackageE/sub/SublibE.hs
@@ -0,0 +1,6 @@
+module SublibE
+  ( messageE
+  ) where
+
+messageE :: String
+messageE = "messageE: Using my custom Setup.hs for myPackageC"
diff --git a/tests/integration/tests/6896-custom-setup/files/stack.yaml b/tests/integration/tests/6896-custom-setup/files/stack.yaml
new file mode 100644
index 0000000000..f5e344c0bf
--- /dev/null
+++ b/tests/integration/tests/6896-custom-setup/files/stack.yaml
@@ -0,0 +1,8 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
+- myPackageC
+- myPackageD
+- myPackageE
diff --git a/tests/integration/tests/6896-dep-with-no-main-lib/Main.hs b/tests/integration/tests/6896-dep-with-no-main-lib/Main.hs
new file mode 100644
index 0000000000..36b1ff3ab4
--- /dev/null
+++ b/tests/integration/tests/6896-dep-with-no-main-lib/Main.hs
@@ -0,0 +1,7 @@
+-- | Stack can support a dependency package that has one or more public
+-- sublibraries but no unnamed main library.
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/6896-dep-with-no-main-lib/files/.gitignore b/tests/integration/tests/6896-dep-with-no-main-lib/files/.gitignore
new file mode 100644
index 0000000000..f9a6e152d2
--- /dev/null
+++ b/tests/integration/tests/6896-dep-with-no-main-lib/files/.gitignore
@@ -0,0 +1,2 @@
+myPackageA.cabal
+myPackageB.cabal
diff --git a/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageA/package.yaml b/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..89c90db88c
--- /dev/null
+++ b/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageA/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackageB:myPackageB-sub
diff --git a/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageA/src/Lib.hs b/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageA/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageA/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageB/package.yaml b/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..05fd49c434
--- /dev/null
+++ b/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageB/package.yaml
@@ -0,0 +1,13 @@
+# This package has no unnamed main library.
+
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+internal-libraries:
+  myPackageB-sub:
+    visibility: public
+    source-dirs: sub
diff --git a/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageB/sub/Sublib.hs b/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageB/sub/Sublib.hs
new file mode 100644
index 0000000000..c41d4cbf16
--- /dev/null
+++ b/tests/integration/tests/6896-dep-with-no-main-lib/files/myPackageB/sub/Sublib.hs
@@ -0,0 +1 @@
+module Sublib where
diff --git a/tests/integration/tests/6896-dep-with-no-main-lib/files/stack.yaml b/tests/integration/tests/6896-dep-with-no-main-lib/files/stack.yaml
new file mode 100644
index 0000000000..68891a8d7c
--- /dev/null
+++ b/tests/integration/tests/6896-dep-with-no-main-lib/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
diff --git a/tests/integration/tests/6905-cyclic-plan/Main.hs b/tests/integration/tests/6905-cyclic-plan/Main.hs
new file mode 100644
index 0000000000..75120e5d06
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/Main.hs
@@ -0,0 +1,27 @@
+-- | The test's project has project packages A and B.
+--
+-- In terms of main libraries, the dependencies are (->- is 'depends on'):
+--
+--     A ->- B
+--
+-- In terms of executables (a test suite):
+--
+--     B ->- A
+--
+-- As, overall, A ->- B and B ->- A, packages A and B cannot be built
+-- 'all-in-one'.
+--
+-- This integration test tests:
+--
+-- * when A is named myPackageA and B is named myPackageB; and
+--
+-- * when A is named myPackageD and B is named myPackageC.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6905
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["--stack-yaml", "stack1.yaml", "test"]
+  stack ["--stack-yaml", "stack2.yaml", "test"]
diff --git a/tests/integration/tests/6905-cyclic-plan/files/.gitignore b/tests/integration/tests/6905-cyclic-plan/files/.gitignore
new file mode 100644
index 0000000000..5087095541
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/.gitignore
@@ -0,0 +1,4 @@
+myPackageA.cabal
+myPackageB.cabal
+myPackageC.cabal
+myPackageD.cabal
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageA/package.yaml b/tests/integration/tests/6905-cyclic-plan/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..bb7167768b
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageA/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackageB
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageA/src/LibA.hs b/tests/integration/tests/6905-cyclic-plan/files/myPackageA/src/LibA.hs
new file mode 100644
index 0000000000..743d4bf8d0
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageA/src/LibA.hs
@@ -0,0 +1,5 @@
+module LibA
+  ( funcB
+  ) where
+
+import LibB ( funcB )
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageB/package.yaml b/tests/integration/tests/6905-cyclic-plan/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..c5d19b86c3
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageB/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - myPackageA
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageB/src/LibB.hs b/tests/integration/tests/6905-cyclic-plan/files/myPackageB/src/LibB.hs
new file mode 100644
index 0000000000..e714f965fe
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageB/src/LibB.hs
@@ -0,0 +1,6 @@
+module LibB
+ ( funcB
+ ) where
+
+funcB :: IO ()
+funcB = pure ()
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageB/test/Main.hs b/tests/integration/tests/6905-cyclic-plan/files/myPackageB/test/Main.hs
new file mode 100644
index 0000000000..e7c27dd1be
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageB/test/Main.hs
@@ -0,0 +1,4 @@
+import LibA ( funcB )
+
+main :: IO ()
+main = funcB
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageC/package.yaml b/tests/integration/tests/6905-cyclic-plan/files/myPackageC/package.yaml
new file mode 100644
index 0000000000..89dfd7f40b
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageC/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackageC
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - myPackageD
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageC/src/LibC.hs b/tests/integration/tests/6905-cyclic-plan/files/myPackageC/src/LibC.hs
new file mode 100644
index 0000000000..28474cddd5
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageC/src/LibC.hs
@@ -0,0 +1,6 @@
+module LibC
+ ( funcC
+ ) where
+
+funcC :: IO ()
+funcC = pure ()
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageC/test/Main.hs b/tests/integration/tests/6905-cyclic-plan/files/myPackageC/test/Main.hs
new file mode 100644
index 0000000000..c438615556
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageC/test/Main.hs
@@ -0,0 +1,4 @@
+import LibD ( funcC )
+
+main :: IO ()
+main = funcC
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageD/package.yaml b/tests/integration/tests/6905-cyclic-plan/files/myPackageD/package.yaml
new file mode 100644
index 0000000000..1d913ac5ef
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageD/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageD
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackageC
diff --git a/tests/integration/tests/6905-cyclic-plan/files/myPackageD/src/LibD.hs b/tests/integration/tests/6905-cyclic-plan/files/myPackageD/src/LibD.hs
new file mode 100644
index 0000000000..481d4e7f69
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/myPackageD/src/LibD.hs
@@ -0,0 +1,5 @@
+module LibD
+  ( funcC
+  ) where
+
+import LibC ( funcC )
diff --git a/tests/integration/tests/6905-cyclic-plan/files/stack1.yaml b/tests/integration/tests/6905-cyclic-plan/files/stack1.yaml
new file mode 100644
index 0000000000..68891a8d7c
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/stack1.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
diff --git a/tests/integration/tests/6905-cyclic-plan/files/stack2.yaml b/tests/integration/tests/6905-cyclic-plan/files/stack2.yaml
new file mode 100644
index 0000000000..740f730a48
--- /dev/null
+++ b/tests/integration/tests/6905-cyclic-plan/files/stack2.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageC
+- myPackageD
diff --git a/tests/integration/tests/6905-invalid-cycle/Main.hs b/tests/integration/tests/6905-invalid-cycle/Main.hs
new file mode 100644
index 0000000000..34e3959973
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/Main.hs
@@ -0,0 +1,35 @@
+-- | The test's project has project packages A, B, C and D.
+--
+-- In terms of main libraries, the dependencies are (->- is 'depends on'):
+--
+--     A ->- B and C ->- D, D ->- C (a cycle)
+--
+-- In terms of executables (a test suite):
+--
+--     B ->- A, B ->- C
+--
+-- As, overall, A ->- B and B ->- A, packages A and B cannot be built
+-- 'all-in-one'. However, if the test suite of B is not being built, A and B can
+-- be built.
+
+-- The test suite of B cannot be built, because C ->- D and D ->- C.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6905
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build", "myPackageA", "myPackageB"]
+  stackErrStderr ["test", "myPackageB"] (expectMessage dependencyCycleDetected)
+
+dependencyCycleDetected :: String
+dependencyCycleDetected =
+  "myPackageC dependency cycle detected: myPackageC, myPackageD, myPackageC"
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr =
+  unless (words msg `isInfixOf` words stderr)
+    (error $ "Expected a warning: \n" ++ show msg)
diff --git a/tests/integration/tests/6905-invalid-cycle/files/.gitignore b/tests/integration/tests/6905-invalid-cycle/files/.gitignore
new file mode 100644
index 0000000000..5087095541
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/.gitignore
@@ -0,0 +1,4 @@
+myPackageA.cabal
+myPackageB.cabal
+myPackageC.cabal
+myPackageD.cabal
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageA/package.yaml b/tests/integration/tests/6905-invalid-cycle/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..bb7167768b
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageA/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackageB
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageA/src/LibA.hs b/tests/integration/tests/6905-invalid-cycle/files/myPackageA/src/LibA.hs
new file mode 100644
index 0000000000..743d4bf8d0
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageA/src/LibA.hs
@@ -0,0 +1,5 @@
+module LibA
+  ( funcB
+  ) where
+
+import LibB ( funcB )
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageB/package.yaml b/tests/integration/tests/6905-invalid-cycle/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..dbdaaca9ee
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageB/package.yaml
@@ -0,0 +1,17 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - myPackageA
+    - myPackageC
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageB/src/LibB.hs b/tests/integration/tests/6905-invalid-cycle/files/myPackageB/src/LibB.hs
new file mode 100644
index 0000000000..e714f965fe
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageB/src/LibB.hs
@@ -0,0 +1,6 @@
+module LibB
+ ( funcB
+ ) where
+
+funcB :: IO ()
+funcB = pure ()
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageB/test/Main.hs b/tests/integration/tests/6905-invalid-cycle/files/myPackageB/test/Main.hs
new file mode 100644
index 0000000000..4443983c52
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageB/test/Main.hs
@@ -0,0 +1,7 @@
+import LibA ( funcB )
+import LibC ( funcC )
+
+main :: IO ()
+main = do
+  funcB
+  funcC
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageC/package.yaml b/tests/integration/tests/6905-invalid-cycle/files/myPackageC/package.yaml
new file mode 100644
index 0000000000..d657e99064
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageC/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageC
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackageD
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageC/src/LibC.hs b/tests/integration/tests/6905-invalid-cycle/files/myPackageC/src/LibC.hs
new file mode 100644
index 0000000000..b692cc5dc4
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageC/src/LibC.hs
@@ -0,0 +1,8 @@
+module LibC
+ ( funcC
+ ) where
+
+import LibD ( funcD )
+
+funcC :: IO ()
+funcC = funcD
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageD/package.yaml b/tests/integration/tests/6905-invalid-cycle/files/myPackageD/package.yaml
new file mode 100644
index 0000000000..1d913ac5ef
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageD/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackageD
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackageC
diff --git a/tests/integration/tests/6905-invalid-cycle/files/myPackageD/src/LibD.hs b/tests/integration/tests/6905-invalid-cycle/files/myPackageD/src/LibD.hs
new file mode 100644
index 0000000000..33b5940491
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/myPackageD/src/LibD.hs
@@ -0,0 +1,8 @@
+module LibD
+  ( funcD
+  ) where
+
+import LibC ( funcC )
+
+funcD :: IO ()
+funcD = funcC
diff --git a/tests/integration/tests/6905-invalid-cycle/files/stack.yaml b/tests/integration/tests/6905-invalid-cycle/files/stack.yaml
new file mode 100644
index 0000000000..240f775bdc
--- /dev/null
+++ b/tests/integration/tests/6905-invalid-cycle/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
+- myPackageC
+- myPackageD
diff --git a/tests/integration/tests/6905-multi-test/Main.hs b/tests/integration/tests/6905-multi-test/Main.hs
new file mode 100644
index 0000000000..2e21e47b41
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/Main.hs
@@ -0,0 +1,28 @@
+-- | The test's project has project packages A, B and C (which has no library).
+--
+-- In terms of main libraries, the dependencies are (->- is 'depends on'):
+--
+--     A ->- B
+--
+-- In terms of executables (including test suites):
+--
+--     B ->- A and C ->- A
+--
+-- As, overall, A ->- B and B ->- A, packages A and B cannot be built
+-- 'all-in-one'.
+--
+-- A, B and C are named myPackageA, myPackageB and myPackageC respectively.
+--
+-- See:  https://github.com/commercialhaskell/stack/issues/6905
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr ["test", "--coverage"] $ \out -> do
+    unless ("The coverage report for myPackageA's test-suite test1 is available at" `isInfixOf` out) $
+      fail "Didn't get expected report for test1"
+    unless ("[S-6829]" `isInfixOf` out) $
+      fail "Didn't get expected empty report for test2"
diff --git a/tests/integration/tests/6905-multi-test/files/.gitignore b/tests/integration/tests/6905-multi-test/files/.gitignore
new file mode 100644
index 0000000000..03e2c6587b
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/.gitignore
@@ -0,0 +1,6 @@
+myPackageA.cabal
+myPackageB.cabal
+myPackageC.cabal
+myPackageD.cabal
+myPackageE.cabal
+myPackageF.cabal
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageA/app/Main.hs b/tests/integration/tests/6905-multi-test/files/myPackageA/app/Main.hs
new file mode 100644
index 0000000000..df716cf71e
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageA/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import LibA ( funcA )
+
+main :: IO ()
+main = funcA
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageA/package.yaml b/tests/integration/tests/6905-multi-test/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..d246bd23b8
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageA/package.yaml
@@ -0,0 +1,33 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - myPackageB
+
+executables:
+  myExeA:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - myPackageA
+
+tests:
+  test1:
+    source-dirs: test1
+    main: Main.hs
+    dependencies:
+    - myPackageA
+  test2:
+    source-dirs: test2
+    main: Main.hs
+    dependencies:
+    - myPackageA
+  test3:
+    source-dirs: test3
+    main: Main.hs
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageA/src/LibA.hs b/tests/integration/tests/6905-multi-test/files/myPackageA/src/LibA.hs
new file mode 100644
index 0000000000..a7981b6f2c
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageA/src/LibA.hs
@@ -0,0 +1,9 @@
+module LibA
+  ( funcA
+  , funcB
+  ) where
+
+import LibB ( funcB )
+
+funcA :: IO ()
+funcA = pure ()
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageA/test1/Main.hs b/tests/integration/tests/6905-multi-test/files/myPackageA/test1/Main.hs
new file mode 100644
index 0000000000..71c96e8fce
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageA/test1/Main.hs
@@ -0,0 +1,4 @@
+import LibA ( funcA )
+
+main :: IO ()
+main = funcA
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageA/test2/Main.hs b/tests/integration/tests/6905-multi-test/files/myPackageA/test2/Main.hs
new file mode 100644
index 0000000000..3ca9d54762
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageA/test2/Main.hs
@@ -0,0 +1,4 @@
+import LibA
+
+main :: IO ()
+main = pure ()
diff --git a/test/integration/tests/multi-test/files/test-3/Spec.hs b/tests/integration/tests/6905-multi-test/files/myPackageA/test3/Main.hs
similarity index 100%
rename from test/integration/tests/multi-test/files/test-3/Spec.hs
rename to tests/integration/tests/6905-multi-test/files/myPackageA/test3/Main.hs
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageB/package.yaml b/tests/integration/tests/6905-multi-test/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..c5d19b86c3
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageB/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+tests:
+  test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+    - myPackageA
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageB/src/LibB.hs b/tests/integration/tests/6905-multi-test/files/myPackageB/src/LibB.hs
new file mode 100644
index 0000000000..e714f965fe
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageB/src/LibB.hs
@@ -0,0 +1,6 @@
+module LibB
+ ( funcB
+ ) where
+
+funcB :: IO ()
+funcB = pure ()
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageB/test/Main.hs b/tests/integration/tests/6905-multi-test/files/myPackageB/test/Main.hs
new file mode 100644
index 0000000000..e7c27dd1be
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageB/test/Main.hs
@@ -0,0 +1,4 @@
+import LibA ( funcB )
+
+main :: IO ()
+main = funcB
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageC/app/Main.hs b/tests/integration/tests/6905-multi-test/files/myPackageC/app/Main.hs
new file mode 100644
index 0000000000..ca55d965a4
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageC/app/Main.hs
@@ -0,0 +1,4 @@
+import LibC ( funcC )
+
+main :: IO ()
+main = funcC
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageC/package.yaml b/tests/integration/tests/6905-multi-test/files/myPackageC/package.yaml
new file mode 100644
index 0000000000..629f8cba45
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageC/package.yaml
@@ -0,0 +1,22 @@
+spec-version: 0.36.0
+
+name: myPackageC
+
+dependencies:
+- base
+
+executables:
+  myExeC:
+    source-dirs:
+    - app
+    - src
+    main: Main.hs
+
+tests:
+  test:
+    source-dirs:
+    - src
+    - test
+    main: Main.hs
+    dependencies:
+    - myPackageA
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageC/src/LibC.hs b/tests/integration/tests/6905-multi-test/files/myPackageC/src/LibC.hs
new file mode 100644
index 0000000000..6289d8843d
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageC/src/LibC.hs
@@ -0,0 +1,6 @@
+module LibC
+  ( funcC
+  ) where
+
+funcC :: IO ()
+funcC = pure ()
diff --git a/tests/integration/tests/6905-multi-test/files/myPackageC/test/Main.hs b/tests/integration/tests/6905-multi-test/files/myPackageC/test/Main.hs
new file mode 100644
index 0000000000..0535c37e44
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/myPackageC/test/Main.hs
@@ -0,0 +1,7 @@
+import LibA ( funcA )
+import LibC ( funcC )
+
+main :: IO ()
+main = do
+  funcA
+  funcC
diff --git a/tests/integration/tests/6905-multi-test/files/stack.yaml b/tests/integration/tests/6905-multi-test/files/stack.yaml
new file mode 100644
index 0000000000..14a33de5df
--- /dev/null
+++ b/tests/integration/tests/6905-multi-test/files/stack.yaml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
+- myPackageC
diff --git a/tests/integration/tests/6915-config-set-inside-project/Main.hs b/tests/integration/tests/6915-config-set-inside-project/Main.hs
new file mode 100644
index 0000000000..81e7e76e57
--- /dev/null
+++ b/tests/integration/tests/6915-config-set-inside-project/Main.hs
@@ -0,0 +1,103 @@
+-- Stack's config set commands should work as expected.
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stackCheckStderr
+    ["config", "set", "snapshot", "ghc-9.10.2"]
+    (expectMessage hasBeenUpdated)
+  stackCheckStderr
+    ["config", "set", "snapshot", "ghc-9.10.2"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["--stack-yaml", "stack-alt.yaml", "config", "set", "snapshot", "ghc-9.10.3"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "system-ghc", "false"]
+    (expectMessage hasBeenExtended)
+  stackCheckStderr
+    ["config", "set", "system-ghc", "false"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "system-ghc", "true"]
+    (expectMessage hasBeenUpdated)
+  stackCheckStderr
+    ["config", "set", "system-ghc", "true"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["--stack-yaml", "stack-alt.yaml", "config", "set", "system-ghc", "true"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "install-ghc", "true"]
+    (expectMessage hasBeenExtended)
+  stackCheckStderr
+    ["config", "set", "install-ghc", "true"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "install-ghc", "false"]
+    (expectMessage hasBeenUpdated)
+  stackCheckStderr
+    ["config", "set", "install-ghc", "false"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["--stack-yaml", "stack-alt.yaml", "config", "set", "install-ghc", "false"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "install-msys", "true"]
+    (expectMessage hasBeenExtended)
+  stackCheckStderr
+    ["config", "set", "install-msys", "true"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "install-msys", "false"]
+    (expectMessage hasBeenUpdated)
+  stackCheckStderr
+    ["config", "set", "install-msys", "false"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["--stack-yaml", "stack-alt.yaml", "config", "set", "install-msys", "false"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "recommend-stack-upgrade", "--project", "true"]
+    (expectMessage hasBeenExtended)
+  stackCheckStderr
+    ["config", "set", "recommend-stack-upgrade", "--project", "true"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "recommend-stack-upgrade", "--project", "false"]
+    (expectMessage hasBeenUpdated)
+  stackCheckStderr
+    ["config", "set", "recommend-stack-upgrade", "--project", "false"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["--stack-yaml", "stack-alt.yaml", "config", "set", "recommend-stack-upgrade", "--project", "false"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["config", "set", "package-index", "download-prefix", "https://hackage.haskell.org/"]
+    (expectMessage hasBeenExtended)
+  stackCheckStderr
+    ["config", "set", "package-index", "download-prefix", "https://hackage.haskell.org/"]
+    (expectMessage alreadyContained)
+  stackCheckStderr
+    ["--stack-yaml", "stack-alt.yaml", "config", "set", "package-index", "download-prefix", "https://hackage.haskell.org/"]
+    (expectMessage alreadyContained)
+
+hasBeenUpdated :: String
+hasBeenUpdated =
+  "has been updated."
+
+alreadyContained :: String
+alreadyContained =
+  "already contained the intended configuration and remains unchanged."
+
+hasBeenExtended :: String
+hasBeenExtended =
+  "has been extended."
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected output: \n" ++ show msg
diff --git a/test/integration/tests/multi-test/files/test/OtherModule.hs b/tests/integration/tests/6915-config-set-inside-project/files/.gitignore
similarity index 100%
rename from test/integration/tests/multi-test/files/test/OtherModule.hs
rename to tests/integration/tests/6915-config-set-inside-project/files/.gitignore
diff --git a/tests/integration/tests/6915-config-set-inside-project/files/myPackage.cabal b/tests/integration/tests/6915-config-set-inside-project/files/myPackage.cabal
new file mode 100644
index 0000000000..e4596c30a3
--- /dev/null
+++ b/tests/integration/tests/6915-config-set-inside-project/files/myPackage.cabal
@@ -0,0 +1,9 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.39.5.
+--
+-- see: https://github.com/sol/hpack
+
+name:           myPackage
+version:        0.0.0
+build-type:     Simple
diff --git a/tests/integration/tests/6915-config-set-inside-project/files/package.yaml b/tests/integration/tests/6915-config-set-inside-project/files/package.yaml
new file mode 100644
index 0000000000..0a64c2a06a
--- /dev/null
+++ b/tests/integration/tests/6915-config-set-inside-project/files/package.yaml
@@ -0,0 +1,3 @@
+spec-version: 0.36.0
+
+name: myPackage
diff --git a/tests/integration/tests/6915-config-set-inside-project/files/stack-alt.yaml b/tests/integration/tests/6915-config-set-inside-project/files/stack-alt.yaml
new file mode 100644
index 0000000000..5157d72ac5
--- /dev/null
+++ b/tests/integration/tests/6915-config-set-inside-project/files/stack-alt.yaml
@@ -0,0 +1,21 @@
+snapshot: ghc-9.10.3
+
+system-ghc: true
+
+install-ghc: false
+
+install-msys: false
+
+recommend-stack-upgrade: false
+
+package-index:
+  download-prefix: https://hackage.haskell.org/
+  hackage-security:
+    keyids:
+    - 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d
+    - 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42
+    - 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921
+    - c7de58fc6a224b92b5b513f26fbb8b370f2d97c7cfe0075a951314a55734be93
+    - fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0
+    key-threshold: 3
+    ignore-expiry: true
diff --git a/tests/integration/tests/6915-config-set-inside-project/files/stack.yaml b/tests/integration/tests/6915-config-set-inside-project/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/6915-config-set-inside-project/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/6915-config-set-outside-project/Main.hs b/tests/integration/tests/6915-config-set-outside-project/Main.hs
new file mode 100644
index 0000000000..f391e15e58
--- /dev/null
+++ b/tests/integration/tests/6915-config-set-outside-project/Main.hs
@@ -0,0 +1,25 @@
+-- Stack's config set commands should recreate the global-project directory, if
+-- Stack needs to consult its project-level configuration file and there is no
+-- file.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6915
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  -- In a clean Stack root, there is no global-projects directory.
+  stackCheckStderr
+    ["config", "set", "install-ghc", "false"]
+    (expectMessage writingConfigFile)
+
+writingConfigFile :: String
+writingConfigFile =
+  "Writing the configuration file for the implicit global project to:"
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected output: \n" ++ show msg
diff --git a/tests/integration/tests/6920-dep-name-clash/files/.gitignore b/tests/integration/tests/6920-dep-name-clash/files/.gitignore
new file mode 100644
index 0000000000..f9a6e152d2
--- /dev/null
+++ b/tests/integration/tests/6920-dep-name-clash/files/.gitignore
@@ -0,0 +1,2 @@
+myPackageA.cabal
+myPackageB.cabal
diff --git a/tests/integration/tests/6920-dep-name-clash/files/Main.hs b/tests/integration/tests/6920-dep-name-clash/files/Main.hs
new file mode 100644
index 0000000000..e9a59d0346
--- /dev/null
+++ b/tests/integration/tests/6920-dep-name-clash/files/Main.hs
@@ -0,0 +1,11 @@
+-- | Stack builds a package which depends directly on a package with the same
+-- name as a sublibrary or foreign library of that package.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6920
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build", "myPackageA"]
+  stack ["build", "myPackageB"]
diff --git a/tests/integration/tests/6920-dep-name-clash/files/myPackageA/int/Internal.hs b/tests/integration/tests/6920-dep-name-clash/files/myPackageA/int/Internal.hs
new file mode 100644
index 0000000000..9f7c4a2680
--- /dev/null
+++ b/tests/integration/tests/6920-dep-name-clash/files/myPackageA/int/Internal.hs
@@ -0,0 +1,5 @@
+module Internal
+  ( launchMissiles
+  ) where
+
+import           Acme.Missiles ( launchMissiles )
diff --git a/tests/integration/tests/6920-dep-name-clash/files/myPackageA/package.yaml b/tests/integration/tests/6920-dep-name-clash/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..8680aff1a6
--- /dev/null
+++ b/tests/integration/tests/6920-dep-name-clash/files/myPackageA/package.yaml
@@ -0,0 +1,17 @@
+spec-version: 0.36.0
+
+# Required, otherwise Hpack picks cabal-version: 3.0 and the dependency on
+# acme-missiles is assumed to refer to the name of the internal-library.
+verbatim:
+  cabal-version: 3.4
+
+name: myPackageA
+
+dependencies:
+- base
+
+internal-libraries:
+  acme-missiles:
+    source-dirs: int
+    dependencies:
+    - acme-missiles
diff --git a/tests/integration/tests/6920-dep-name-clash/files/myPackageB/package.yaml b/tests/integration/tests/6920-dep-name-clash/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..7cda1d93a6
--- /dev/null
+++ b/tests/integration/tests/6920-dep-name-clash/files/myPackageB/package.yaml
@@ -0,0 +1,20 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+verbatim: |
+  foreign-library acme-missiles
+    type: native-shared
+    other-modules:
+        Foreign
+    build-depends:
+        base
+      , acme-missiles
+    hs-source-dirs:
+        src-foreign
+    default-language: Haskell2010
+    if os(Windows)
+      options: standalone
diff --git a/tests/integration/tests/6920-dep-name-clash/files/myPackageB/src-foreign/Foreign.hs b/tests/integration/tests/6920-dep-name-clash/files/myPackageB/src-foreign/Foreign.hs
new file mode 100644
index 0000000000..449a04a061
--- /dev/null
+++ b/tests/integration/tests/6920-dep-name-clash/files/myPackageB/src-foreign/Foreign.hs
@@ -0,0 +1,5 @@
+module Foreign
+  ( launchMissiles
+  ) where
+
+import           Acme.Missiles ( launchMissiles )
diff --git a/tests/integration/tests/6920-dep-name-clash/files/stack.yaml b/tests/integration/tests/6920-dep-name-clash/files/stack.yaml
new file mode 100644
index 0000000000..8933f7a96d
--- /dev/null
+++ b/tests/integration/tests/6920-dep-name-clash/files/stack.yaml
@@ -0,0 +1,8 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
+
+extra-deps:
+- acme-missiles-0.3
diff --git a/tests/integration/tests/6927-cyclic-snapshots/Main.hs b/tests/integration/tests/6927-cyclic-snapshots/Main.hs
new file mode 100644
index 0000000000..1088cac986
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/Main.hs
@@ -0,0 +1,32 @@
+-- | Stack detects when snapshot locations form a cycle and reports an error.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6927
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  -- `stack build` makes use of pantry's loadAndCompleteSnapshotRaw':
+  stackErrStderr
+    ["--stack-yaml", "stack1.yaml", "build"]
+    (expectMessage cycleDetected)
+  stackErrStderr
+    ["--stack-yaml", "stack2.yaml", "build"]
+    (expectMessage cycleDetected)
+  -- `stack --snapshot <snapshot> list` makes use of pantry's loadSnapshot:
+  stackErrStderr
+    ["--snapshot", "my-snapshot.yaml", "list", "base"]
+    (expectMessage cycleDetected)
+  stackErrStderr
+    ["--snapshot", "my-snapshot1.yaml", "list", "base"]
+    (expectMessage cycleDetected)
+
+cycleDetected :: String
+cycleDetected = "Cycle detected while reading snapshot."
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr =
+ unless (words msg `isInfixOf` words stderr) $
+   error $ "Expected:\n\n" <> msg <> "\n\nin stderr, got:\n\n" <> stderr
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/.gitignore b/tests/integration/tests/6927-cyclic-snapshots/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot.yaml b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot.yaml
new file mode 100644
index 0000000000..1202baffc0
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot.yaml
@@ -0,0 +1,4 @@
+name: my-snapshot
+
+# In error, refers to itself:
+snapshot: my-snapshot.yaml
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot1.yaml b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot1.yaml
new file mode 100644
index 0000000000..d44681d28e
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot1.yaml
@@ -0,0 +1,3 @@
+name: my-snapshot1
+
+snapshot: my-snapshot2.yaml
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot2.yaml b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot2.yaml
new file mode 100644
index 0000000000..50193579bb
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot2.yaml
@@ -0,0 +1,3 @@
+name: my-snapshot2
+
+snapshot: my-snapshot3.yaml
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot3.yaml b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot3.yaml
new file mode 100644
index 0000000000..a480d21ade
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot3.yaml
@@ -0,0 +1,4 @@
+name: my-snapshot3
+
+# In error, refers to my-snapshot1, creating a cycle:
+snapshot: my-snapshot4.yaml
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot4.yaml b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot4.yaml
new file mode 100644
index 0000000000..7953ee956c
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/my-snapshot4.yaml
@@ -0,0 +1,4 @@
+name: my-snapshot4
+
+# In error, refers to my-snapshot2, creating a cycle:
+snapshot: my-snapshot2.yaml
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/package.yaml b/tests/integration/tests/6927-cyclic-snapshots/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/src/Lib.hs b/tests/integration/tests/6927-cyclic-snapshots/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/stack1.yaml b/tests/integration/tests/6927-cyclic-snapshots/files/stack1.yaml
new file mode 100644
index 0000000000..c00072833e
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/stack1.yaml
@@ -0,0 +1 @@
+snapshot: my-snapshot.yaml
diff --git a/tests/integration/tests/6927-cyclic-snapshots/files/stack2.yaml b/tests/integration/tests/6927-cyclic-snapshots/files/stack2.yaml
new file mode 100644
index 0000000000..ed197c46ec
--- /dev/null
+++ b/tests/integration/tests/6927-cyclic-snapshots/files/stack2.yaml
@@ -0,0 +1 @@
+snapshot: my-snapshot1.yaml
diff --git a/tests/integration/tests/717-sdist-test/Main.hs b/tests/integration/tests/717-sdist-test/Main.hs
new file mode 100644
index 0000000000..fdd3691cee
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/Main.hs
@@ -0,0 +1,26 @@
+-- Stack's test of an archive file produced by sdist should fail if the package
+-- description did not list all files used by the package itself.
+--
+-- https://github.com/commercialhaskell/stack/issues/717
+
+import           StackTest
+
+main :: IO ()
+main = do
+  -- Verify building works:
+  stack ["build"]
+  -- Keep old behavior:
+  stack ["sdist"]
+  -- Successful sdist with --test-tarball:
+  stack ["sdist", "working-package-with-th", "--test-tarball"]
+  -- Fails because package contains TH which depends on files which are not put
+  -- into sdist tarball:
+  stackErr ["sdist", "failing-package-with-th", "--test-tarball"]
+  -- Same, but inside a subdir:
+  stackErr ["sdist", "subdirs/failing-in-subdir", "--test-tarball"]
+  -- Depends on failing-package-with-th and failing-in-subdir - these would fail
+  -- if they were the target of sdist, but since they are just dependencies, the
+  -- operation should succeed:
+  stack ["sdist", "subdirs/dependent-on-failing-packages", "--test-tarball"]
+  -- Fails because a test depends on files which are not put into sdist tarball:
+  stackErr ["sdist", "failing-package-with-test", "--test-tarball"]
diff --git a/tests/integration/tests/717-sdist-test/files/.gitignore b/tests/integration/tests/717-sdist-test/files/.gitignore
new file mode 100644
index 0000000000..1b68608ab5
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/.gitignore
@@ -0,0 +1,5 @@
+dependent-on-failing-packages.cabal
+failing-in-subdir.cabal
+failing-package-with-th.cabal
+failing-package-with-test.cabal
+working-package-with-th.cabal
diff --git a/test/integration/tests/1659-skip-component/files/LICENSE b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/LICENSE
similarity index 100%
rename from test/integration/tests/1659-skip-component/files/LICENSE
rename to tests/integration/tests/717-sdist-test/files/failing-package-with-test/LICENSE
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-test/README.md b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/README.md
new file mode 100644
index 0000000000..d432cbeb7e
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/README.md
@@ -0,0 +1 @@
+# failing-package-with-test
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-test/files/file.txt b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/files/file.txt
new file mode 100644
index 0000000000..d95f3ad14d
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/files/file.txt
@@ -0,0 +1 @@
+content
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-test/package.yaml b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/package.yaml
new file mode 100644
index 0000000000..e9e6a1b866
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/package.yaml
@@ -0,0 +1,12 @@
+spec-version: 0.36.0
+
+name: failing-package-with-test
+description: A package with a test suite that is incomplete if sdist.
+
+dependencies:
+- base < 5
+
+tests:
+  my-test:
+    source-dirs: test
+    main: Test.hs
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-test/test/Test.hs b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/test/Test.hs
new file mode 100644
index 0000000000..7372c2c72c
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/test/Test.hs
@@ -0,0 +1,4 @@
+import Data.Functor ( void )
+
+main :: IO ()
+main = void $ readFile "files/file.txt"
diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/LICENSE b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/LICENSE
similarity index 100%
rename from test/integration/tests/717-sdist-test/files/package-with-failing-test/LICENSE
rename to tests/integration/tests/717-sdist-test/files/failing-package-with-th/LICENSE
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-th/README.md b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/README.md
new file mode 100644
index 0000000000..6c7f4896ea
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/README.md
@@ -0,0 +1 @@
+# failing-package-with-th
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-th/files/file.txt b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/files/file.txt
new file mode 100644
index 0000000000..d95f3ad14d
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/files/file.txt
@@ -0,0 +1 @@
+content
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-th/package.yaml b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/package.yaml
new file mode 100644
index 0000000000..0cc7c6c00f
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: failing-package-with-th
+description: A package with Template Haskell that is incomplete if sdist.
+
+extra-source-files:
+- README.md
+
+dependencies:
+- base < 5
+- template-haskell
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-th/src/Lib.hs b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/src/Lib.hs
new file mode 100644
index 0000000000..0e37b70732
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/src/Lib.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE TemplateHaskell #-}
+module Lib
+    ( someFunc
+    ) where
+
+import           TH ( thFunc )
+import           Language.Haskell.TH ()
+
+someFunc :: IO ()
+someFunc = print $(thFunc)
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-th/src/TH.hs b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/src/TH.hs
new file mode 100644
index 0000000000..a83a2014e7
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/src/TH.hs
@@ -0,0 +1,10 @@
+module TH
+  ( thFunc
+  ) where
+
+import           Language.Haskell.TH ( Exp (..), Lit (..), Q, runIO )
+
+thFunc :: Q Exp
+thFunc = runIO $ do
+  readFile "files/file.txt"
+  pure $ LitE (IntegerL 5)
diff --git a/tests/integration/tests/717-sdist-test/files/stack.yaml b/tests/integration/tests/717-sdist-test/files/stack.yaml
new file mode 100644
index 0000000000..196e557d7b
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/stack.yaml
@@ -0,0 +1,8 @@
+snapshot: ghc-9.10.3
+
+packages:
+- failing-package-with-test
+- failing-package-with-th
+- subdirs/dependent-on-failing-packages
+- subdirs/failing-in-subdir
+- working-package-with-th
diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/LICENSE b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/LICENSE
similarity index 100%
rename from test/integration/tests/717-sdist-test/files/package-with-th/LICENSE
rename to tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/LICENSE
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md
new file mode 100644
index 0000000000..387b7303cf
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md
@@ -0,0 +1 @@
+# dependent-on-failing-packages
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt
new file mode 100644
index 0000000000..d95f3ad14d
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt
@@ -0,0 +1 @@
+content
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/package.yaml b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/package.yaml
new file mode 100644
index 0000000000..32ba13e69e
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: dependent-on-failing-packages
+description: A package that can be sdist that depends on packages that cannot
+
+extra-source-files:
+- README.md
+
+dependencies:
+- base < 5
+- template-haskell
+- failing-package-with-th
+- failing-in-subdir
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs
new file mode 100644
index 0000000000..5967ffc1dc
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs
@@ -0,0 +1,11 @@
+module LibD
+  ( someFuncD
+  ) where
+
+import           Lib ( someFunc )
+import           LibC ( someFuncC )
+
+someFuncD :: IO ()
+someFuncD = do
+  someFunc
+  someFuncC
diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/LICENSE b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE
similarity index 100%
rename from test/integration/tests/717-sdist-test/files/package-with-working-th/LICENSE
rename to tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md
new file mode 100644
index 0000000000..0533304f7f
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md
@@ -0,0 +1 @@
+# failing-in-subdir
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt
new file mode 100644
index 0000000000..d95f3ad14d
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt
@@ -0,0 +1 @@
+content
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/package.yaml b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/package.yaml
new file mode 100644
index 0000000000..265fa029cd
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: failing-in-subdir
+description: A package with Template Haskell that is incomplete if sdist.
+
+extra-source-files:
+- README.md
+
+dependencies:
+- base < 5
+- template-haskell
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs
new file mode 100644
index 0000000000..bce50b4df4
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE TemplateHaskell #-}
+
+module LibC
+    ( someFuncC
+    ) where
+
+import           THInSubdir ( thFuncC )
+
+someFuncC :: IO ()
+someFuncC = print $(thFuncC)
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs
new file mode 100644
index 0000000000..803150f5ca
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs
@@ -0,0 +1,10 @@
+module THInSubdir
+  ( thFuncC
+  ) where
+
+import           Language.Haskell.TH ( Exp (..), Lit (..), Q, runIO )
+
+thFuncC :: Q Exp
+thFuncC = runIO $ do
+  readFile "files/file.txt"
+  pure $ LitE (IntegerL 5)
diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/LICENSE b/tests/integration/tests/717-sdist-test/files/working-package-with-th/LICENSE
similarity index 100%
rename from test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/LICENSE
rename to tests/integration/tests/717-sdist-test/files/working-package-with-th/LICENSE
diff --git a/tests/integration/tests/717-sdist-test/files/working-package-with-th/README.md b/tests/integration/tests/717-sdist-test/files/working-package-with-th/README.md
new file mode 100644
index 0000000000..c98b2279e2
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/working-package-with-th/README.md
@@ -0,0 +1 @@
+# working-package-with-th
diff --git a/tests/integration/tests/717-sdist-test/files/working-package-with-th/package.yaml b/tests/integration/tests/717-sdist-test/files/working-package-with-th/package.yaml
new file mode 100644
index 0000000000..660aa8f803
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/working-package-with-th/package.yaml
@@ -0,0 +1,15 @@
+spec-version: 0.36.0
+
+name: working-package-with-th
+version: 0.1.0.0
+description: A package with Template Haskell that can be sdist.
+
+extra-source-files:
+- README.md
+
+dependencies:
+- base < 5
+- template-haskell
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/717-sdist-test/files/working-package-with-th/src/Lib.hs b/tests/integration/tests/717-sdist-test/files/working-package-with-th/src/Lib.hs
new file mode 100644
index 0000000000..dfdbfc9d08
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/working-package-with-th/src/Lib.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE TemplateHaskell #-}
+
+module Lib
+  ( someFunc
+  ) where
+
+import           TH ( thFunc )
+
+someFunc :: IO ()
+someFunc = print $(thFunc)
diff --git a/tests/integration/tests/717-sdist-test/files/working-package-with-th/src/TH.hs b/tests/integration/tests/717-sdist-test/files/working-package-with-th/src/TH.hs
new file mode 100644
index 0000000000..06925fbf18
--- /dev/null
+++ b/tests/integration/tests/717-sdist-test/files/working-package-with-th/src/TH.hs
@@ -0,0 +1,8 @@
+module TH
+  ( thFunc
+  ) where
+
+import           Language.Haskell.TH ( Exp (..), Lit (..), Q )
+
+thFunc :: Q Exp
+thFunc = pure $ LitE (IntegerL 5)
diff --git a/tests/integration/tests/763-buildable-false/Main.hs b/tests/integration/tests/763-buildable-false/Main.hs
new file mode 100644
index 0000000000..4e0cb8c2ac
--- /dev/null
+++ b/tests/integration/tests/763-buildable-false/Main.hs
@@ -0,0 +1,12 @@
+-- Stack reports an error if commanded to build a specific component of a
+-- package that is not buildable.
+--
+-- https://github.com/commercialhaskell/stack/issues/763
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build"]
+  stack ["build", ":myPackage", "--flag", "myPackage:buildable"]
+  stackErr ["build", ":myPackage"]
diff --git a/tests/integration/tests/763-buildable-false/files/.gitignore b/tests/integration/tests/763-buildable-false/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/763-buildable-false/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/763-buildable-false/files/app/Main.hs b/tests/integration/tests/763-buildable-false/files/app/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/763-buildable-false/files/app/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/763-buildable-false/files/package.yaml b/tests/integration/tests/763-buildable-false/files/package.yaml
new file mode 100644
index 0000000000..1d512e9811
--- /dev/null
+++ b/tests/integration/tests/763-buildable-false/files/package.yaml
@@ -0,0 +1,23 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+flags:
+  buildable:
+    description: Make component buildable.
+    default: false
+    manual: true
+
+dependencies:
+- base
+
+executables:
+  myPackage:
+    source-dirs: app
+    main: Main.hs
+    when:
+    - condition: flag(buildable)
+      then:
+        buildable: true
+      else:
+        buildable: false
diff --git a/tests/integration/tests/763-buildable-false/files/stack.yaml b/tests/integration/tests/763-buildable-false/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/763-buildable-false/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/796-ghc-options/Main.hs b/tests/integration/tests/796-ghc-options/Main.hs
new file mode 100644
index 0000000000..4842cdc38b
--- /dev/null
+++ b/tests/integration/tests/796-ghc-options/Main.hs
@@ -0,0 +1,12 @@
+-- Stack can set environment variables in a project-level configuration file or
+-- at the command line and cause the package to be rebuilt.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/796
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build"]
+  stackErr ["build", "--ghc-options=-DVARIABLE_C"]
+  stack ["build", "--ghc-options=-DVARIABLE_D"]
diff --git a/tests/integration/tests/796-ghc-options/files/.gitignore b/tests/integration/tests/796-ghc-options/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/796-ghc-options/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/796-ghc-options/files/package.yaml b/tests/integration/tests/796-ghc-options/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/796-ghc-options/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/796-ghc-options/files/src/Lib.hs b/tests/integration/tests/796-ghc-options/files/src/Lib.hs
new file mode 100644
index 0000000000..5a5e96c7f0
--- /dev/null
+++ b/tests/integration/tests/796-ghc-options/files/src/Lib.hs
@@ -0,0 +1,20 @@
+{-# LANGUAGE CPP #-}
+
+module Lib where
+
+-- Avoid problems with CPP and HLint
+#ifndef __HLINT__
+
+#ifndef VARIABLE_A
+#error VARIABLE_A isn't defined
+#endif
+
+#ifndef VARIABLE_B
+#error VARIABLE_B isn't defined
+#endif
+
+#ifdef VARIABLE_C
+#error VARIABLE_C is defined
+#endif
+
+#endif
diff --git a/tests/integration/tests/796-ghc-options/files/stack.yaml b/tests/integration/tests/796-ghc-options/files/stack.yaml
new file mode 100644
index 0000000000..3c2c041e3d
--- /dev/null
+++ b/tests/integration/tests/796-ghc-options/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+ghc-options:
+  "*": -DVARIABLE_A
+  myPackage: -DVARIABLE_B
+
+rebuild-ghc-options: true
diff --git a/tests/integration/tests/allow-newer-specific-packages/Main.hs b/tests/integration/tests/allow-newer-specific-packages/Main.hs
new file mode 100644
index 0000000000..af0d7407fe
--- /dev/null
+++ b/tests/integration/tests/allow-newer-specific-packages/Main.hs
@@ -0,0 +1,7 @@
+-- | Stack allows allow-newer to be applied to the dependencies of specified
+-- packages.
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/allow-newer-specific-packages/files/.gitignore b/tests/integration/tests/allow-newer-specific-packages/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/allow-newer-specific-packages/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/allow-newer-specific-packages/files/package.yaml b/tests/integration/tests/allow-newer-specific-packages/files/package.yaml
new file mode 100644
index 0000000000..9104b9bf64
--- /dev/null
+++ b/tests/integration/tests/allow-newer-specific-packages/files/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- acme-missiles < 0.3
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/allow-newer-specific-packages/files/src/Lib.hs b/tests/integration/tests/allow-newer-specific-packages/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/allow-newer-specific-packages/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml b/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml
new file mode 100644
index 0000000000..ebf6dd48f5
--- /dev/null
+++ b/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml
@@ -0,0 +1,9 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+- acme-missiles-0.3
+
+allow-newer: true
+
+allow-newer-deps:
+- myPackage
diff --git a/tests/integration/tests/backpack-doc-sublibs/Main.hs b/tests/integration/tests/backpack-doc-sublibs/Main.hs
new file mode 100644
index 0000000000..b4ed6f4b88
--- /dev/null
+++ b/tests/integration/tests/backpack-doc-sublibs/Main.hs
@@ -0,0 +1,29 @@
+-- Regression test for the sub-libraries example in doc/topics/backpack.md.
+-- The package shape is verbatim from the doc:
+--   library str-sig    -- indefinite, signatures: Str
+--   library str-text   -- concrete, exposed-modules: Str (backed by text)
+--   library            -- main, depends on both with mixins
+-- This exercises:
+--   1. multi-library package routing (Hybrid: legacy non-split path)
+--   2. signature instantiation within a single package
+--   3. that the doc's str-sig stanza correctly includes build-depends: base
+--      (without it, GHC can't load Prelude to compile the .hsig)
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import StackTest
+
+main :: IO ()
+main = do
+  stack ["build"]
+
+  -- Confirm the build output mentions the signature and main library compiled.
+  -- If the str-sig stanza loses its build-depends: base, the .hsig would fail
+  -- with "Could not load module 'Prelude'" before any of these lines appear.
+  stackCheckStderr ["clean"] $ const (pure ())
+  stackCheckStderr ["build"] $ \err -> do
+    let expect tag =
+          unless (tag `isInfixOf` err) $
+            error $ "Expected " ++ show tag ++ " in build output:\n" ++ err
+    expect "Compiling Str[sig]"
+    expect "Compiling MyModule"
diff --git a/tests/integration/tests/backpack-doc-sublibs/files/.gitignore b/tests/integration/tests/backpack-doc-sublibs/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/backpack-doc-sublibs/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/backpack-doc-sublibs/files/package.yaml b/tests/integration/tests/backpack-doc-sublibs/files/package.yaml
new file mode 100644
index 0000000000..f6dc269e27
--- /dev/null
+++ b/tests/integration/tests/backpack-doc-sublibs/files/package.yaml
@@ -0,0 +1,24 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src/main
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
+  - str-text
+
+internal-libraries:
+  str-sig:
+    source-dirs: src/sig
+    signatures:
+    - Str
+  str-text:
+    source-dirs: src/text
+    dependencies:
+    - text
diff --git a/tests/integration/tests/backpack-doc-sublibs/files/src/main/MyModule.hs b/tests/integration/tests/backpack-doc-sublibs/files/src/main/MyModule.hs
new file mode 100644
index 0000000000..ea3ec5bda5
--- /dev/null
+++ b/tests/integration/tests/backpack-doc-sublibs/files/src/main/MyModule.hs
@@ -0,0 +1,6 @@
+module MyModule (greeting) where
+
+import Str (Str, empty, append)
+
+greeting :: Str
+greeting = empty `append` empty
diff --git a/tests/integration/tests/backpack-doc-sublibs/files/src/sig/Str.hsig b/tests/integration/tests/backpack-doc-sublibs/files/src/sig/Str.hsig
new file mode 100644
index 0000000000..a3a1542b49
--- /dev/null
+++ b/tests/integration/tests/backpack-doc-sublibs/files/src/sig/Str.hsig
@@ -0,0 +1,5 @@
+signature Str where
+
+data Str
+empty  :: Str
+append :: Str -> Str -> Str
diff --git a/tests/integration/tests/backpack-doc-sublibs/files/src/text/Str.hs b/tests/integration/tests/backpack-doc-sublibs/files/src/text/Str.hs
new file mode 100644
index 0000000000..b6be966124
--- /dev/null
+++ b/tests/integration/tests/backpack-doc-sublibs/files/src/text/Str.hs
@@ -0,0 +1,12 @@
+module Str (Str, empty, append) where
+
+import Data.Text (Text)
+import qualified Data.Text as T
+
+type Str = Text
+
+empty :: Str
+empty = T.empty
+
+append :: Str -> Str -> Str
+append = T.append
diff --git a/tests/integration/tests/backpack-doc-sublibs/files/stack.yaml b/tests/integration/tests/backpack-doc-sublibs/files/stack.yaml
new file mode 100644
index 0000000000..b54fd809bf
--- /dev/null
+++ b/tests/integration/tests/backpack-doc-sublibs/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: lts-24.24
diff --git a/tests/integration/tests/backpack-private/Main.hs b/tests/integration/tests/backpack-private/Main.hs
new file mode 100644
index 0000000000..bf56554a4f
--- /dev/null
+++ b/tests/integration/tests/backpack-private/Main.hs
@@ -0,0 +1,12 @@
+-- Test that a package using Backpack internally (private Backpack) builds.
+-- lib:str-sig defines a Str signature (.hsig), lib:str-impl provides
+-- a concrete Str module, and the main library depends on both so that
+-- mix-in linking fills the signature.
+
+import StackTest
+
+main :: IO ()
+main = do
+  stack ["build"]
+  -- Verify the built executable actually runs (Backpack instantiation worked)
+  stack ["exec", "private-backpack-demo"]
diff --git a/tests/integration/tests/backpack-private/files/.gitignore b/tests/integration/tests/backpack-private/files/.gitignore
new file mode 100644
index 0000000000..7f61c1ea28
--- /dev/null
+++ b/tests/integration/tests/backpack-private/files/.gitignore
@@ -0,0 +1 @@
+private-backpack.cabal
diff --git a/tests/integration/tests/backpack-private/files/package.yaml b/tests/integration/tests/backpack-private/files/package.yaml
new file mode 100644
index 0000000000..0df814fe95
--- /dev/null
+++ b/tests/integration/tests/backpack-private/files/package.yaml
@@ -0,0 +1,37 @@
+# A package using Backpack internally (private Backpack). Sub-library "str-sig"
+# defines an abstract Str signature. Sub-library "str-impl" provides a concrete
+# Str module that fills the sig. Main library uses str-sig (indefinite) and
+# str-impl fills the hole. The public API has no unfilled signatures.
+
+spec-version: 0.36.0
+
+# Hpack 0.39.5 defaults to an unintended cabal-version.
+# See: https://github.com/sol/hpack/issues/649
+verbatim:
+  cabal-version: 3.4
+
+name: private-backpack
+
+dependencies:
+- base
+
+library:
+  source-dirs: src/main
+  dependencies:
+  - private-backpack:str-sig
+  - private-backpack:str-impl
+
+internal-libraries:
+  str-sig:
+    source-dirs: src/sig
+    signatures:
+    - Str
+  str-impl:
+    source-dirs: src/impl
+
+executables:
+  private-backpack-demo:
+    source-dirs: src/exe
+    main: Main.hs
+    dependencies:
+    - private-backpack
diff --git a/tests/integration/tests/backpack-private/files/src/exe/Main.hs b/tests/integration/tests/backpack-private/files/src/exe/Main.hs
new file mode 100644
index 0000000000..23c84ad3f1
--- /dev/null
+++ b/tests/integration/tests/backpack-private/files/src/exe/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import PrivateBackpack (greetString)
+
+main :: IO ()
+main = putStrLn (greetString "world")
diff --git a/tests/integration/tests/backpack-private/files/src/impl/Str.hs b/tests/integration/tests/backpack-private/files/src/impl/Str.hs
new file mode 100644
index 0000000000..6c308bdf04
--- /dev/null
+++ b/tests/integration/tests/backpack-private/files/src/impl/Str.hs
@@ -0,0 +1,16 @@
+module Str (Str, empty, append, toString, fromString) where
+
+-- Concrete implementation of the Str signature using plain String.
+type Str = String
+
+empty :: Str
+empty = ""
+
+append :: Str -> Str -> Str
+append = (++)
+
+toString :: Str -> String
+toString = id
+
+fromString :: String -> Str
+fromString = id
diff --git a/tests/integration/tests/backpack-private/files/src/main/PrivateBackpack.hs b/tests/integration/tests/backpack-private/files/src/main/PrivateBackpack.hs
new file mode 100644
index 0000000000..c3faa73392
--- /dev/null
+++ b/tests/integration/tests/backpack-private/files/src/main/PrivateBackpack.hs
@@ -0,0 +1,8 @@
+module PrivateBackpack (greetString) where
+
+import Str (Str, fromString, append, toString)
+
+-- Public API: no Backpack types leak. Str is resolved internally
+-- by mix-in linking str-sig's requirement with str-impl's provision.
+greetString :: String -> String
+greetString name = toString (fromString "Hello, " `append` fromString name `append` fromString "!")
diff --git a/tests/integration/tests/backpack-private/files/src/sig/Str.hsig b/tests/integration/tests/backpack-private/files/src/sig/Str.hsig
new file mode 100644
index 0000000000..6115bc93a1
--- /dev/null
+++ b/tests/integration/tests/backpack-private/files/src/sig/Str.hsig
@@ -0,0 +1,7 @@
+signature Str where
+
+data Str
+empty :: Str
+append :: Str -> Str -> Str
+toString :: Str -> String
+fromString :: String -> Str
diff --git a/tests/integration/tests/backpack-private/files/stack.yaml b/tests/integration/tests/backpack-private/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/backpack-private/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/Main.hs b/tests/integration/tests/backpack-stale-cinst-consumer-change/Main.hs
new file mode 100644
index 0000000000..e7d0e89554
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/Main.hs
@@ -0,0 +1,63 @@
+-- Regression test for stale Backpack instantiation state when the final
+-- Backpack consumer changes. consumer-pkg is dirty, but both indefinite
+-- signature packages are clean and already installed.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import System.Directory ( removeFile )
+import StackTest
+
+main :: IO ()
+main = do
+  -- Build all four packages. This exercises:
+  -- 1. str-sig CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str + Logger)
+  -- 3. str-sig CInst (instantiation with impl-pkg's Str)
+  -- 4. logger-sig CLib (indefinite, typecheck-only, inherits Str hole)
+  -- 5. logger-sig CInst (fills BOTH Logger and Str holes)
+  -- 6. consumer-pkg CLib + CExe
+  stack ["build"]
+
+  -- Verify the consumer executable calls through the transitive chain
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' in output, got: "
+            ++ show out
+
+  replaceFile "consumer-pkg/src/Consumer.hs" $ unlines
+    [ "module Consumer where"
+    , ""
+    , "import LogHelper (greetWithLog)"
+    , ""
+    , "hello :: String"
+    , "hello = greetWithLog ++ \" after consumer edit\""
+    ]
+
+  -- Rebuild should succeed because only the final consumer changed.
+  stackCheckStderr ["build"] $ \err ->
+    expectBuildLine "consumer-pkg" "Compiling Consumer" err
+
+  -- Verify output still correct after rebuild
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain after consumer edit" `isInfixOf` out) $
+      error $
+           "Expected edited consumer-pkg output after rebuild, got: "
+        ++ show out
+
+replaceFile :: FilePath -> String -> IO ()
+replaceFile file contents = do
+  removeFile file
+  writeFile file contents
+
+expectBuildLine :: String -> String -> String -> IO ()
+expectBuildLine package marker err =
+  unless (any matches $ lines err) $
+    error $
+         "Expected build output line containing "
+      ++ show package
+      ++ " and "
+      ++ show marker
+      ++ ", got stderr: "
+      ++ show err
+ where
+  matches line = package `isInfixOf` line && marker `isInfixOf` line
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/.gitignore b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/.gitignore
new file mode 100644
index 0000000000..1c91379fd4
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/.gitignore
@@ -0,0 +1,4 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+logger-sig.cabal
+str-sig.cabal
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..ba65db2645
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/package.yaml
@@ -0,0 +1,24 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
+  - name: logger-sig
+    mixin:
+    - requires (Logger as Logger)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..e46c8658a6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import LogHelper (greetWithLog)
+
+hello :: String
+hello = greetWithLog
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/src/Logger.hs b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/src/Logger.hs
new file mode 100644
index 0000000000..ddc7981a34
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/src/Logger.hs
@@ -0,0 +1,4 @@
+module Logger where
+
+logMessage :: String -> String
+logMessage msg = "[LOG] " ++ msg
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..3b6d306620
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from transitive chain"
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/package.yaml
new file mode 100644
index 0000000000..b9db28324f
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: logger-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Logger
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/src/LogHelper.hs b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/src/LogHelper.hs
new file mode 100644
index 0000000000..2eecba92d6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/src/LogHelper.hs
@@ -0,0 +1,7 @@
+module LogHelper where
+
+import Str (greeting)
+import Logger (logMessage)
+
+greetWithLog :: String
+greetWithLog = logMessage greeting
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/src/Logger.hsig b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/logger-sig/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/stack.yaml b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/stack.yaml
new file mode 100644
index 0000000000..f74ff881c8
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- logger-sig
+- str-sig
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/str-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/str-sig/package.yaml
new file mode 100644
index 0000000000..a6b1796ff1
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/str-sig/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: str-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-stale-cinst-consumer-change/files/str-sig/src/Str.hsig b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/str-sig/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-consumer-change/files/str-sig/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/Main.hs b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/Main.hs
new file mode 100644
index 0000000000..fcbf648a77
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/Main.hs
@@ -0,0 +1,72 @@
+-- Regression test for stale Backpack instantiation state when the deepest
+-- indefinite signature package is dirty. str-sig must rebuild its indefinite
+-- CLib, and the str-sig CInst must use that rebuilt unit.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import System.Directory ( removeFile )
+import StackTest
+
+main :: IO ()
+main = do
+  -- Build all four packages. This exercises:
+  -- 1. str-sig CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str + Logger)
+  -- 3. str-sig CInst (instantiation with impl-pkg's Str)
+  -- 4. logger-sig CLib (indefinite, typecheck-only, inherits Str hole)
+  -- 5. logger-sig CInst (fills BOTH Logger and Str holes)
+  -- 6. consumer-pkg CLib + CExe
+  stack ["build"]
+
+  -- Verify the consumer executable calls through the transitive chain
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' in output, got: "
+            ++ show out
+
+  replaceFile "str-sig/package.yaml" $ unlines
+    [ "spec-version: 0.36.0"
+    , ""
+    , "name: str-sig"
+    , ""
+    , "dependencies:"
+    , "- base"
+    , ""
+    , "library:"
+    , "  source-dirs: src"
+    , "  ghc-options:"
+    , "  - -Wall"
+    , "  signatures:"
+    , "  - Str"
+    ]
+
+  -- Rebuild should succeed because the CInst waits for the rebuilt indefinite
+  -- str-sig CLib instead of trying to use the stale installed one.
+  stackCheckStderr ["build"] $ \err -> do
+    expectBuildLine "str-sig" "Compiling Str[sig]" err
+    expectBuildLine "str-sig" "Str = impl-pkg" err
+
+  -- Verify output still correct after rebuilding str-sig and its CInst.
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $
+           "Expected original output after rebuilding str-sig, got: "
+        ++ show out
+
+replaceFile :: FilePath -> String -> IO ()
+replaceFile file contents = do
+  removeFile file
+  writeFile file contents
+
+expectBuildLine :: String -> String -> String -> IO ()
+expectBuildLine package marker err =
+  unless (any matches $ lines err) $
+    error $
+         "Expected build output line containing "
+      ++ show package
+      ++ " and "
+      ++ show marker
+      ++ ", got stderr: "
+      ++ show err
+ where
+  matches line = package `isInfixOf` line && marker `isInfixOf` line
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/.gitignore b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/.gitignore
new file mode 100644
index 0000000000..1c91379fd4
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/.gitignore
@@ -0,0 +1,4 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+logger-sig.cabal
+str-sig.cabal
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..ba65db2645
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/package.yaml
@@ -0,0 +1,24 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
+  - name: logger-sig
+    mixin:
+    - requires (Logger as Logger)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..e46c8658a6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import LogHelper (greetWithLog)
+
+hello :: String
+hello = greetWithLog
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/src/Logger.hs b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/src/Logger.hs
new file mode 100644
index 0000000000..ddc7981a34
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/src/Logger.hs
@@ -0,0 +1,4 @@
+module Logger where
+
+logMessage :: String -> String
+logMessage msg = "[LOG] " ++ msg
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..3b6d306620
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from transitive chain"
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/package.yaml
new file mode 100644
index 0000000000..b9db28324f
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: logger-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Logger
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/src/LogHelper.hs b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/src/LogHelper.hs
new file mode 100644
index 0000000000..2eecba92d6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/src/LogHelper.hs
@@ -0,0 +1,7 @@
+module LogHelper where
+
+import Str (greeting)
+import Logger (logMessage)
+
+greetWithLog :: String
+greetWithLog = logMessage greeting
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/src/Logger.hsig b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/logger-sig/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/stack.yaml b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/stack.yaml
new file mode 100644
index 0000000000..f74ff881c8
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- logger-sig
+- str-sig
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/str-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/str-sig/package.yaml
new file mode 100644
index 0000000000..a6b1796ff1
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/str-sig/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: str-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/str-sig/src/Str.hsig b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/str-sig/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-dirty-str-sig/files/str-sig/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/Main.hs b/tests/integration/tests/backpack-stale-cinst-hsig-change/Main.hs
new file mode 100644
index 0000000000..ca4258469c
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/Main.hs
@@ -0,0 +1,72 @@
+-- Regression test for stale Backpack instantiation state when an intermediate
+-- indefinite package's signature changes. The source touch keeps this focused
+-- on stale CInst planning even before .hsig file tracking is fixed:
+-- logger-sig is dirty, but its indefinite dependency str-sig is still clean
+-- and already installed.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import System.Directory ( removeFile )
+import StackTest
+
+main :: IO ()
+main = do
+  -- Build all four packages. This exercises:
+  -- 1. str-sig CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str + Logger)
+  -- 3. str-sig CInst (instantiation with impl-pkg's Str)
+  -- 4. logger-sig CLib (indefinite, typecheck-only, inherits Str hole)
+  -- 5. logger-sig CInst (fills BOTH Logger and Str holes)
+  -- 6. consumer-pkg CLib + CExe
+  stack ["build"]
+
+  -- Verify the consumer executable calls through the transitive chain
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' in output, got: "
+            ++ show out
+
+  replaceFile "logger-sig/src/Logger.hsig" $ unlines
+    [ "signature Logger where"
+    , ""
+    , "logMessage :: String -> String"
+    , "loggerName :: String"
+    ]
+  replaceFile "logger-sig/src/LogHelper.hs" $ unlines
+    [ "module LogHelper where"
+    , ""
+    , "import Str (greeting)"
+    , "import Logger (logMessage)"
+    , ""
+    , "-- Force logger-sig dirty independently of .hsig tracking."
+    , "greetWithLog :: String"
+    , "greetWithLog = logMessage greeting"
+    ]
+
+  -- Rebuild should succeed because impl-pkg already exports loggerName.
+  stackCheckStderr ["build"] $ \err ->
+    expectBuildLine "logger-sig" "Compiling Logger[sig]" err
+
+  -- Verify output still correct after rebuild
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' after rebuild, got: "
+            ++ show out
+
+replaceFile :: FilePath -> String -> IO ()
+replaceFile file contents = do
+  removeFile file
+  writeFile file contents
+
+expectBuildLine :: String -> String -> String -> IO ()
+expectBuildLine package marker err =
+  unless (any matches $ lines err) $
+    error $
+         "Expected build output line containing "
+      ++ show package
+      ++ " and "
+      ++ show marker
+      ++ ", got stderr: "
+      ++ show err
+ where
+  matches line = package `isInfixOf` line && marker `isInfixOf` line
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/.gitignore b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/.gitignore
new file mode 100644
index 0000000000..1c91379fd4
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/.gitignore
@@ -0,0 +1,4 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+logger-sig.cabal
+str-sig.cabal
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..ba65db2645
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/package.yaml
@@ -0,0 +1,24 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
+  - name: logger-sig
+    mixin:
+    - requires (Logger as Logger)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..e46c8658a6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import LogHelper (greetWithLog)
+
+hello :: String
+hello = greetWithLog
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/src/Logger.hs b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/src/Logger.hs
new file mode 100644
index 0000000000..62c1318517
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/src/Logger.hs
@@ -0,0 +1,7 @@
+module Logger where
+
+logMessage :: String -> String
+logMessage msg = "[LOG] " ++ msg
+
+loggerName :: String
+loggerName = "transitive logger"
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..3b6d306620
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from transitive chain"
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/package.yaml
new file mode 100644
index 0000000000..b9db28324f
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: logger-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Logger
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/src/LogHelper.hs b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/src/LogHelper.hs
new file mode 100644
index 0000000000..2eecba92d6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/src/LogHelper.hs
@@ -0,0 +1,7 @@
+module LogHelper where
+
+import Str (greeting)
+import Logger (logMessage)
+
+greetWithLog :: String
+greetWithLog = logMessage greeting
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/src/Logger.hsig b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/logger-sig/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/stack.yaml b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/stack.yaml
new file mode 100644
index 0000000000..f74ff881c8
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- logger-sig
+- str-sig
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/str-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/str-sig/package.yaml
new file mode 100644
index 0000000000..a6b1796ff1
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/str-sig/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: str-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-stale-cinst-hsig-change/files/str-sig/src/Str.hsig b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/str-sig/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-hsig-change/files/str-sig/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/Main.hs b/tests/integration/tests/backpack-stale-cinst-impl-change/Main.hs
new file mode 100644
index 0000000000..634f84606f
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/Main.hs
@@ -0,0 +1,61 @@
+-- Regression test for stale Backpack instantiation state when the concrete
+-- implementation package changes. The signature packages are clean, but their
+-- concrete instantiations depend on impl-pkg's modules.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import System.Directory ( removeFile )
+import StackTest
+
+main :: IO ()
+main = do
+  -- Build all four packages. This exercises:
+  -- 1. str-sig CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str + Logger)
+  -- 3. str-sig CInst (instantiation with impl-pkg's Str)
+  -- 4. logger-sig CLib (indefinite, typecheck-only, inherits Str hole)
+  -- 5. logger-sig CInst (fills BOTH Logger and Str holes)
+  -- 6. consumer-pkg CLib + CExe
+  stack ["build"]
+
+  -- Verify the consumer executable calls through the transitive chain
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' in output, got: "
+            ++ show out
+
+  replaceFile "impl-pkg/src/Str.hs" $ unlines
+    [ "module Str where"
+    , ""
+    , "greeting :: String"
+    , "greeting = \"Hello from changed implementation\""
+    ]
+
+  -- Rebuild should succeed because only the concrete implementation changed.
+  stackCheckStderr ["build"] $ \err ->
+    expectBuildLine "impl-pkg" "Compiling Str" err
+
+  -- Verify output reflects the changed implementation after rebuild
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from changed implementation" `isInfixOf` out) $
+      error $
+           "Expected changed impl-pkg output after rebuild, got: "
+        ++ show out
+
+replaceFile :: FilePath -> String -> IO ()
+replaceFile file contents = do
+  removeFile file
+  writeFile file contents
+
+expectBuildLine :: String -> String -> String -> IO ()
+expectBuildLine package marker err =
+  unless (any matches $ lines err) $
+    error $
+         "Expected build output line containing "
+      ++ show package
+      ++ " and "
+      ++ show marker
+      ++ ", got stderr: "
+      ++ show err
+ where
+  matches line = package `isInfixOf` line && marker `isInfixOf` line
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/.gitignore b/tests/integration/tests/backpack-stale-cinst-impl-change/files/.gitignore
new file mode 100644
index 0000000000..1c91379fd4
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/.gitignore
@@ -0,0 +1,4 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+logger-sig.cabal
+str-sig.cabal
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..ba65db2645
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/package.yaml
@@ -0,0 +1,24 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
+  - name: logger-sig
+    mixin:
+    - requires (Logger as Logger)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..e46c8658a6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import LogHelper (greetWithLog)
+
+hello :: String
+hello = greetWithLog
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/src/Logger.hs b/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/src/Logger.hs
new file mode 100644
index 0000000000..ddc7981a34
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/src/Logger.hs
@@ -0,0 +1,4 @@
+module Logger where
+
+logMessage :: String -> String
+logMessage msg = "[LOG] " ++ msg
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..3b6d306620
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from transitive chain"
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/package.yaml
new file mode 100644
index 0000000000..b9db28324f
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: logger-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Logger
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/src/LogHelper.hs b/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/src/LogHelper.hs
new file mode 100644
index 0000000000..2eecba92d6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/src/LogHelper.hs
@@ -0,0 +1,7 @@
+module LogHelper where
+
+import Str (greeting)
+import Logger (logMessage)
+
+greetWithLog :: String
+greetWithLog = logMessage greeting
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/src/Logger.hsig b/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/logger-sig/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/stack.yaml b/tests/integration/tests/backpack-stale-cinst-impl-change/files/stack.yaml
new file mode 100644
index 0000000000..f74ff881c8
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- logger-sig
+- str-sig
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/str-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-impl-change/files/str-sig/package.yaml
new file mode 100644
index 0000000000..a6b1796ff1
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/str-sig/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: str-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-stale-cinst-impl-change/files/str-sig/src/Str.hsig b/tests/integration/tests/backpack-stale-cinst-impl-change/files/str-sig/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-impl-change/files/str-sig/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/Main.hs b/tests/integration/tests/backpack-stale-cinst-inherited-hole/Main.hs
new file mode 100644
index 0000000000..366b7e21ea
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/Main.hs
@@ -0,0 +1,66 @@
+-- Regression test for stale Backpack instantiation state when the final
+-- Backpack consumer changes and one required hole is inherited. consumer-pkg
+-- mixes in only logger-sig; logger-sig depends on str-sig, so Stack must load
+-- both clean installed signature packages to instantiate logger-sig with
+-- Logger and Str.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import System.Directory ( removeFile )
+import StackTest
+
+main :: IO ()
+main = do
+  -- Build all four packages. This exercises:
+  -- 1. str-sig CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str + Logger)
+  -- 3. logger-sig CLib (indefinite, typecheck-only, inherits Str hole)
+  -- 4. logger-sig CInst (fills BOTH Logger and Str holes)
+  -- 5. consumer-pkg CLib + CExe
+  stack ["build"]
+
+  -- Verify the consumer executable calls through the transitive chain
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' in output, got: "
+            ++ show out
+
+  replaceFile "consumer-pkg/src/Consumer.hs" $ unlines
+    [ "module Consumer where"
+    , ""
+    , "import LogHelper (greetWithLog)"
+    , ""
+    , "hello :: String"
+    , "hello = greetWithLog ++ \" after consumer edit\""
+    ]
+
+  -- Rebuild should succeed because Stack loads logger-sig and its transitive
+  -- indefinite dependency str-sig as templates for the CInst task.
+  stackCheckStderr ["build"] $ \err -> do
+    expectBuildLine "logger-sig" "Str = impl-pkg" err
+    expectBuildLine "consumer-pkg" "Compiling Consumer" err
+
+  -- Verify output still correct after rebuild
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain after consumer edit" `isInfixOf` out) $
+      error $
+           "Expected edited consumer-pkg output after rebuild, got: "
+        ++ show out
+
+replaceFile :: FilePath -> String -> IO ()
+replaceFile file contents = do
+  removeFile file
+  writeFile file contents
+
+expectBuildLine :: String -> String -> String -> IO ()
+expectBuildLine package marker err =
+  unless (any matches $ lines err) $
+    error $
+         "Expected build output line containing "
+      ++ show package
+      ++ " and "
+      ++ show marker
+      ++ ", got stderr: "
+      ++ show err
+ where
+  matches line = package `isInfixOf` line && marker `isInfixOf` line
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/.gitignore b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/.gitignore
new file mode 100644
index 0000000000..1c91379fd4
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/.gitignore
@@ -0,0 +1,4 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+logger-sig.cabal
+str-sig.cabal
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..c556c7e413
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/package.yaml
@@ -0,0 +1,21 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: logger-sig
+    mixin:
+    - requires (Logger as Logger)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..e46c8658a6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import LogHelper (greetWithLog)
+
+hello :: String
+hello = greetWithLog
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/src/Logger.hs b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/src/Logger.hs
new file mode 100644
index 0000000000..ddc7981a34
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/src/Logger.hs
@@ -0,0 +1,4 @@
+module Logger where
+
+logMessage :: String -> String
+logMessage msg = "[LOG] " ++ msg
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..3b6d306620
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from transitive chain"
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/package.yaml
new file mode 100644
index 0000000000..b9db28324f
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: logger-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Logger
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/src/LogHelper.hs b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/src/LogHelper.hs
new file mode 100644
index 0000000000..2eecba92d6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/src/LogHelper.hs
@@ -0,0 +1,7 @@
+module LogHelper where
+
+import Str (greeting)
+import Logger (logMessage)
+
+greetWithLog :: String
+greetWithLog = logMessage greeting
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/src/Logger.hsig b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/logger-sig/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/stack.yaml b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/stack.yaml
new file mode 100644
index 0000000000..f74ff881c8
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- logger-sig
+- str-sig
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/str-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/str-sig/package.yaml
new file mode 100644
index 0000000000..a6b1796ff1
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/str-sig/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: str-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/str-sig/src/Str.hsig b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/str-sig/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-inherited-hole/files/str-sig/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/Main.hs b/tests/integration/tests/backpack-stale-cinst-sig-source-change/Main.hs
new file mode 100644
index 0000000000..d678f167f4
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/Main.hs
@@ -0,0 +1,64 @@
+-- Regression test for stale Backpack instantiation state when an intermediate
+-- indefinite package's normal source changes. logger-sig is dirty, but its
+-- indefinite dependency str-sig is still clean and already installed.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import System.Directory ( removeFile )
+import StackTest
+
+main :: IO ()
+main = do
+  -- Build all four packages. This exercises:
+  -- 1. str-sig CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str + Logger)
+  -- 3. str-sig CInst (instantiation with impl-pkg's Str)
+  -- 4. logger-sig CLib (indefinite, typecheck-only, inherits Str hole)
+  -- 5. logger-sig CInst (fills BOTH Logger and Str holes)
+  -- 6. consumer-pkg CLib + CExe
+  stack ["build"]
+
+  -- Verify the consumer executable calls through the transitive chain
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' in output, got: "
+            ++ show out
+
+  replaceFile "logger-sig/src/LogHelper.hs" $ unlines
+    [ "module LogHelper where"
+    , ""
+    , "import Str (greeting)"
+    , "import Logger (logMessage)"
+    , ""
+    , "greetWithLog :: String"
+    , "greetWithLog = logMessage (greeting ++ \" after source edit\")"
+    ]
+
+  -- Rebuild should succeed because only logger-sig's own source changed.
+  stackCheckStderr ["build"] $ \err ->
+    expectBuildLine "logger-sig" "Compiling LogHelper" err
+
+  -- Verify output still correct after rebuild
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain after source edit" `isInfixOf` out) $
+      error $
+           "Expected edited logger-sig output after rebuild, got: "
+        ++ show out
+
+replaceFile :: FilePath -> String -> IO ()
+replaceFile file contents = do
+  removeFile file
+  writeFile file contents
+
+expectBuildLine :: String -> String -> String -> IO ()
+expectBuildLine package marker err =
+  unless (any matches $ lines err) $
+    error $
+         "Expected build output line containing "
+      ++ show package
+      ++ " and "
+      ++ show marker
+      ++ ", got stderr: "
+      ++ show err
+ where
+  matches line = package `isInfixOf` line && marker `isInfixOf` line
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/.gitignore b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/.gitignore
new file mode 100644
index 0000000000..1c91379fd4
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/.gitignore
@@ -0,0 +1,4 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+logger-sig.cabal
+str-sig.cabal
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..ba65db2645
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/package.yaml
@@ -0,0 +1,24 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
+  - name: logger-sig
+    mixin:
+    - requires (Logger as Logger)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..e46c8658a6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import LogHelper (greetWithLog)
+
+hello :: String
+hello = greetWithLog
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/src/Logger.hs b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/src/Logger.hs
new file mode 100644
index 0000000000..ddc7981a34
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/src/Logger.hs
@@ -0,0 +1,4 @@
+module Logger where
+
+logMessage :: String -> String
+logMessage msg = "[LOG] " ++ msg
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..3b6d306620
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from transitive chain"
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/package.yaml
new file mode 100644
index 0000000000..b9db28324f
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: logger-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Logger
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/src/LogHelper.hs b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/src/LogHelper.hs
new file mode 100644
index 0000000000..2eecba92d6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/src/LogHelper.hs
@@ -0,0 +1,7 @@
+module LogHelper where
+
+import Str (greeting)
+import Logger (logMessage)
+
+greetWithLog :: String
+greetWithLog = logMessage greeting
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/src/Logger.hsig b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/logger-sig/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/stack.yaml b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/stack.yaml
new file mode 100644
index 0000000000..f74ff881c8
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- logger-sig
+- str-sig
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/str-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/str-sig/package.yaml
new file mode 100644
index 0000000000..a6b1796ff1
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/str-sig/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: str-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/str-sig/src/Str.hsig b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/str-sig/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-sig-source-change/files/str-sig/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/Main.hs b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/Main.hs
new file mode 100644
index 0000000000..71919a71ba
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/Main.hs
@@ -0,0 +1,75 @@
+-- Regression test for stale Backpack instantiation state when the final
+-- Backpack consumer changes and one required hole is inherited from a snapshot
+-- package. consumer-pkg mixes in only logger-sig; logger-sig depends on
+-- str-sig, which is installed from a local snapshot archive. Stack must use the
+-- source map, not just CombinedMap, to load str-sig's signature metadata.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import System.Directory ( createDirectoryIfMissing, removeFile )
+import StackTest
+
+main :: IO ()
+main = do
+  createDirectoryIfMissing True "snapshots"
+  stack
+    [ "--stack-yaml", "stack-bootstrap.yaml"
+    , "sdist", "str-sig"
+    , "--ignore-check"
+    , "--tar-dir", "snapshots"
+    ]
+
+  -- Build all four packages. This exercises:
+  -- 1. str-sig CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str + Logger)
+  -- 3. logger-sig CLib (indefinite, typecheck-only, inherits Str hole)
+  -- 4. logger-sig CInst (fills BOTH Logger and Str holes)
+  -- 5. consumer-pkg CLib + CExe
+  stack ["build"]
+
+  -- Verify the consumer executable calls through the transitive chain
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' in output, got: "
+            ++ show out
+
+  replaceFile "consumer-pkg/src/Consumer.hs" $ unlines
+    [ "module Consumer where"
+    , ""
+    , "import LogHelper (greetWithLog)"
+    , ""
+    , "hello :: String"
+    , "hello = greetWithLog ++ \" after consumer edit\""
+    ]
+
+  -- Rebuild should succeed because Stack loads logger-sig and its transitive
+  -- snapshot-installed indefinite dependency str-sig as templates for the
+  -- CInst task.
+  stackCheckStderr ["build"] $ \err -> do
+    expectBuildLine "logger-sig" "Str = impl-pkg" err
+    expectBuildLine "consumer-pkg" "Compiling Consumer" err
+
+  -- Verify output still correct after rebuild
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain after consumer edit" `isInfixOf` out) $
+      error $
+           "Expected edited consumer-pkg output after rebuild, got: "
+        ++ show out
+
+replaceFile :: FilePath -> String -> IO ()
+replaceFile file contents = do
+  removeFile file
+  writeFile file contents
+
+expectBuildLine :: String -> String -> String -> IO ()
+expectBuildLine package marker err =
+  unless (any matches $ lines err) $
+    error $
+         "Expected build output line containing "
+      ++ show package
+      ++ " and "
+      ++ show marker
+      ++ ", got stderr: "
+      ++ show err
+ where
+  matches line = package `isInfixOf` line && marker `isInfixOf` line
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/.gitignore b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/.gitignore
new file mode 100644
index 0000000000..83939e06e4
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/.gitignore
@@ -0,0 +1,7 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+logger-sig.cabal
+str-sig.cabal
+snapshots/*.tar.gz
+stack.yaml.lock
+snapshot.yaml.lock
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..c556c7e413
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/package.yaml
@@ -0,0 +1,21 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: logger-sig
+    mixin:
+    - requires (Logger as Logger)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..e46c8658a6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import LogHelper (greetWithLog)
+
+hello :: String
+hello = greetWithLog
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/src/Logger.hs b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/src/Logger.hs
new file mode 100644
index 0000000000..ddc7981a34
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/src/Logger.hs
@@ -0,0 +1,4 @@
+module Logger where
+
+logMessage :: String -> String
+logMessage msg = "[LOG] " ++ msg
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..3b6d306620
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from transitive chain"
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/package.yaml
new file mode 100644
index 0000000000..b9db28324f
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: logger-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Logger
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/src/LogHelper.hs b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/src/LogHelper.hs
new file mode 100644
index 0000000000..2eecba92d6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/src/LogHelper.hs
@@ -0,0 +1,7 @@
+module LogHelper where
+
+import Str (greeting)
+import Logger (logMessage)
+
+greetWithLog :: String
+greetWithLog = logMessage greeting
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/src/Logger.hsig b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/logger-sig/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/snapshot.yaml b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/snapshot.yaml
new file mode 100644
index 0000000000..54532d2e55
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/snapshot.yaml
@@ -0,0 +1,6 @@
+name: backpack-stale-cinst-snapshot
+
+snapshot: ghc-9.10.3
+
+packages:
+- archive: snapshots/str-sig-0.0.0.tar.gz
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/stack-bootstrap.yaml b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/stack-bootstrap.yaml
new file mode 100644
index 0000000000..7fb56effb0
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/stack-bootstrap.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+packages:
+- str-sig
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/stack.yaml b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/stack.yaml
new file mode 100644
index 0000000000..6d3992aabe
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/stack.yaml
@@ -0,0 +1,6 @@
+snapshot: snapshot.yaml
+
+packages:
+- consumer-pkg
+- impl-pkg
+- logger-sig
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/str-sig/package.yaml b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/str-sig/package.yaml
new file mode 100644
index 0000000000..a6b1796ff1
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/str-sig/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: str-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/str-sig/src/Str.hsig b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/str-sig/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-stale-cinst-snapshot-inherited-hole/files/str-sig/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-sublib-deps/Main.hs b/tests/integration/tests/backpack-sublib-deps/Main.hs
new file mode 100644
index 0000000000..02fa98eeec
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib-deps/Main.hs
@@ -0,0 +1,8 @@
+-- Test that a package with chained sub-library dependencies builds correctly.
+-- lib:core -> lib:extended -> lib (main) -> exe:sublib-deps-demo
+-- This already works in Stack; this test prevents regressions.
+
+import StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/backpack-sublib-deps/files/.gitignore b/tests/integration/tests/backpack-sublib-deps/files/.gitignore
new file mode 100644
index 0000000000..4e07d1e04c
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib-deps/files/.gitignore
@@ -0,0 +1 @@
+sublib-deps.cabal
diff --git a/tests/integration/tests/backpack-sublib-deps/files/package.yaml b/tests/integration/tests/backpack-sublib-deps/files/package.yaml
new file mode 100644
index 0000000000..e4d57589f1
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib-deps/files/package.yaml
@@ -0,0 +1,39 @@
+# A package with sub-libraries that depend on each other.
+#
+# Sub-library "core" is standalone.
+# Sub-library "extended" depends on "core".
+# Main library depends on "extended".
+#
+# This tests intra-package component ordering.
+
+spec-version: 0.36.0
+
+# Hpack 0.39.5 defaults to an unintended cabal-version.
+# See: https://github.com/sol/hpack/issues/649
+verbatim:
+  cabal-version: 3.4
+
+name: sublib-deps
+
+dependencies:
+- base
+
+library:
+  source-dirs: src/main
+  dependencies:
+  - sublib-deps:extended
+
+internal-libraries:
+  core:
+    source-dirs: src/core
+  extended:
+    source-dirs: src/extended
+    dependencies:
+    - sublib-deps:core
+
+executables:
+  sublib-deps-demo:
+    source-dirs: src/exe
+    main: Main.hs
+    dependencies:
+    - sublib-deps
diff --git a/tests/integration/tests/backpack-sublib-deps/files/src/core/SublibDeps/Core.hs b/tests/integration/tests/backpack-sublib-deps/files/src/core/SublibDeps/Core.hs
new file mode 100644
index 0000000000..08ae3f1958
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib-deps/files/src/core/SublibDeps/Core.hs
@@ -0,0 +1,4 @@
+module SublibDeps.Core (greet) where
+
+greet :: String -> String
+greet name = "Hello, " ++ name ++ "!"
diff --git a/tests/integration/tests/backpack-sublib-deps/files/src/exe/Main.hs b/tests/integration/tests/backpack-sublib-deps/files/src/exe/Main.hs
new file mode 100644
index 0000000000..142d54f503
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib-deps/files/src/exe/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import SublibDeps (greetLoud)
+
+main :: IO ()
+main = putStrLn (greetLoud "world")
diff --git a/tests/integration/tests/backpack-sublib-deps/files/src/extended/SublibDeps/Extended.hs b/tests/integration/tests/backpack-sublib-deps/files/src/extended/SublibDeps/Extended.hs
new file mode 100644
index 0000000000..f8c5f06e95
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib-deps/files/src/extended/SublibDeps/Extended.hs
@@ -0,0 +1,10 @@
+module SublibDeps.Extended (greetLoud) where
+
+import SublibDeps.Core (greet)
+
+greetLoud :: String -> String
+greetLoud name = map toUpper (greet name)
+  where
+    toUpper c
+      | c >= 'a' && c <= 'z' = toEnum (fromEnum c - 32)
+      | otherwise = c
diff --git a/tests/integration/tests/backpack-sublib-deps/files/src/main/SublibDeps.hs b/tests/integration/tests/backpack-sublib-deps/files/src/main/SublibDeps.hs
new file mode 100644
index 0000000000..5fa190f1d8
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib-deps/files/src/main/SublibDeps.hs
@@ -0,0 +1,3 @@
+module SublibDeps (greetLoud) where
+
+import SublibDeps.Extended (greetLoud)
diff --git a/tests/integration/tests/backpack-sublib-deps/files/stack.yaml b/tests/integration/tests/backpack-sublib-deps/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib-deps/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/backpack-sublib/Main.hs b/tests/integration/tests/backpack-sublib/Main.hs
new file mode 100644
index 0000000000..cf6656edc5
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/Main.hs
@@ -0,0 +1,8 @@
+-- Test that a package can depend on another package's public sub-library.
+-- consumer depends on provider:utils (not provider's main library).
+-- This already works in Stack; this test prevents regressions.
+
+import StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/backpack-sublib/files/.gitignore b/tests/integration/tests/backpack-sublib/files/.gitignore
new file mode 100644
index 0000000000..09fa7663da
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/files/.gitignore
@@ -0,0 +1,2 @@
+consumer.cabal
+provider.cabal
diff --git a/tests/integration/tests/backpack-sublib/files/consumer/package.yaml b/tests/integration/tests/backpack-sublib/files/consumer/package.yaml
new file mode 100644
index 0000000000..0361f2549a
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/files/consumer/package.yaml
@@ -0,0 +1,27 @@
+# A package that depends on provider's sub-library "utils" directly, NOT on
+# provider's main library. This tests cross-package sub-library dependency
+# resolution.
+
+spec-version: 0.36.0
+
+# Hpack 0.39.5 defaults to an unintended cabal-version.
+# See: https://github.com/sol/hpack/issues/649
+verbatim:
+  cabal-version: 3.4
+
+name: consumer
+
+dependencies:
+- base
+
+library:
+  source-dirs: src/main
+  dependencies:
+  - provider:utils
+
+executables:
+  consumer-demo:
+    source-dirs: src/exe
+    main: Main.hs
+    dependencies:
+    - consumer
diff --git a/tests/integration/tests/backpack-sublib/files/consumer/src/exe/Main.hs b/tests/integration/tests/backpack-sublib/files/consumer/src/exe/Main.hs
new file mode 100644
index 0000000000..e1f66a0061
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/files/consumer/src/exe/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (shout)
+
+main :: IO ()
+main = putStrLn (shout "hello world")
diff --git a/tests/integration/tests/backpack-sublib/files/consumer/src/main/Consumer.hs b/tests/integration/tests/backpack-sublib/files/consumer/src/main/Consumer.hs
new file mode 100644
index 0000000000..24f96db198
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/files/consumer/src/main/Consumer.hs
@@ -0,0 +1,10 @@
+module Consumer (shout) where
+
+import Provider.Utils (capitalize)
+
+shout :: String -> String
+shout = map toUpper . capitalize
+  where
+    toUpper c
+      | c >= 'a' && c <= 'z' = toEnum (fromEnum c - 32)
+      | otherwise = c
diff --git a/tests/integration/tests/backpack-sublib/files/provider/package.yaml b/tests/integration/tests/backpack-sublib/files/provider/package.yaml
new file mode 100644
index 0000000000..722dbab43e
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/files/provider/package.yaml
@@ -0,0 +1,24 @@
+# A package that exposes a sub-library "utils" alongside its main library. The
+# consumer package depends on the sub-library specifically.
+
+spec-version: 0.36.0
+
+# Hpack 0.39.5 defaults to an unintended cabal-version.
+# See: https://github.com/sol/hpack/issues/649
+verbatim:
+  cabal-version: 3.4
+
+name: provider
+
+dependencies:
+- base
+
+library:
+  source-dirs: src/main
+  dependencies:
+  - provider:utils
+
+internal-libraries:
+  utils:
+    source-dirs: src/utils
+    visibility: public
diff --git a/tests/integration/tests/backpack-sublib/files/provider/src/main/Provider.hs b/tests/integration/tests/backpack-sublib/files/provider/src/main/Provider.hs
new file mode 100644
index 0000000000..429344c0b6
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/files/provider/src/main/Provider.hs
@@ -0,0 +1,6 @@
+module Provider (capitalGreet) where
+
+import Provider.Utils (capitalize)
+
+capitalGreet :: String -> String
+capitalGreet name = capitalize ("hello, " ++ name ++ "!")
diff --git a/tests/integration/tests/backpack-sublib/files/provider/src/utils/Provider/Utils.hs b/tests/integration/tests/backpack-sublib/files/provider/src/utils/Provider/Utils.hs
new file mode 100644
index 0000000000..6a35d58a6c
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/files/provider/src/utils/Provider/Utils.hs
@@ -0,0 +1,7 @@
+module Provider.Utils (capitalize) where
+
+capitalize :: String -> String
+capitalize [] = []
+capitalize (c:cs)
+  | c >= 'a' && c <= 'z' = toEnum (fromEnum c - 32) : cs
+  | otherwise = c : cs
diff --git a/tests/integration/tests/backpack-sublib/files/stack.yaml b/tests/integration/tests/backpack-sublib/files/stack.yaml
new file mode 100644
index 0000000000..1292402fd1
--- /dev/null
+++ b/tests/integration/tests/backpack-sublib/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer
+- provider
diff --git a/tests/integration/tests/backpack-undeclared-signature-warning/Main.hs b/tests/integration/tests/backpack-undeclared-signature-warning/Main.hs
new file mode 100644
index 0000000000..e6a8a19d5c
--- /dev/null
+++ b/tests/integration/tests/backpack-undeclared-signature-warning/Main.hs
@@ -0,0 +1,25 @@
+-- | Stack explains likely Backpack signature mistakes with a useful warning,
+-- and not an inappropriate warning about custom preprocessors.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6937
+
+import           Control.Monad ( unless, when )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main =
+  stackErrStderr ["build"] $ \err -> do
+    expectMessage "Found Backpack signature file for Cabal entry" err
+    expectMessage "Logger" err
+    expectMessage "not listed in the component's" err
+    expectMessage "signatures" err
+    when ("custom-preprocessor-extensions" `isInfixOf` err) $
+      error $
+           "Expected no custom-preprocessor warning for Logger.hsig, got:\n\n"
+        ++ err
+
+expectMessage :: String -> String -> IO ()
+expectMessage msg stderr = do
+  unless (words msg `isInfixOf` words stderr) $
+    error $ "Expected " ++ show msg ++ " in stderr, got:\n\n" ++ stderr
diff --git a/tests/integration/tests/backpack-undeclared-signature-warning/files/.gitignore b/tests/integration/tests/backpack-undeclared-signature-warning/files/.gitignore
new file mode 100644
index 0000000000..442e2852b2
--- /dev/null
+++ b/tests/integration/tests/backpack-undeclared-signature-warning/files/.gitignore
@@ -0,0 +1 @@
+hsig-warning.cabal
diff --git a/tests/integration/tests/backpack-undeclared-signature-warning/files/package.yaml b/tests/integration/tests/backpack-undeclared-signature-warning/files/package.yaml
new file mode 100644
index 0000000000..1c30d0e5fc
--- /dev/null
+++ b/tests/integration/tests/backpack-undeclared-signature-warning/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: hsig-warning
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  # In error, Logger is listed under other-modules rather than signatures:
+  other-modules: Logger
diff --git a/tests/integration/tests/backpack-undeclared-signature-warning/files/src/Lib.hs b/tests/integration/tests/backpack-undeclared-signature-warning/files/src/Lib.hs
new file mode 100644
index 0000000000..f9d8b32e79
--- /dev/null
+++ b/tests/integration/tests/backpack-undeclared-signature-warning/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/backpack-undeclared-signature-warning/files/src/Logger.hsig b/tests/integration/tests/backpack-undeclared-signature-warning/files/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-undeclared-signature-warning/files/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-undeclared-signature-warning/files/stack.yaml b/tests/integration/tests/backpack-undeclared-signature-warning/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/backpack-undeclared-signature-warning/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/Main.hs b/tests/integration/tests/backpack-x-pkg-multi-inst/Main.hs
new file mode 100644
index 0000000000..0a283a7f56
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/Main.hs
@@ -0,0 +1,26 @@
+-- Test Stack's support for cross-package Backpack with multiple instantiations:
+-- two consumers fill the same sig-pkg with different implementations. Each
+-- consumer should get its own CInst task.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import StackTest
+
+main :: IO ()
+main = do
+  stack ["build"]
+
+  stackCheckStdout ["exec", "multi-inst-demo"] $ \out -> do
+    unless ("A says: Hello from impl-a" `isInfixOf` out) $
+      error $ "Expected 'A says: Hello from impl-a' in output, got: " ++ show out
+    unless ("B says: Hello from impl-b" `isInfixOf` out) $
+      error $ "Expected 'B says: Hello from impl-b' in output, got: " ++ show out
+
+  -- Rebuild should succeed
+  stack ["build"]
+
+  stackCheckStdout ["exec", "multi-inst-demo"] $ \out -> do
+    unless ("A says: Hello from impl-a" `isInfixOf` out) $
+      error $ "Expected 'A says: Hello from impl-a' after rebuild, got: " ++ show out
+    unless ("B says: Hello from impl-b" `isInfixOf` out) $
+      error $ "Expected 'B says: Hello from impl-b' after rebuild, got: " ++ show out
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/.gitignore b/tests/integration/tests/backpack-x-pkg-multi-inst/files/.gitignore
new file mode 100644
index 0000000000..901f6e72f2
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/.gitignore
@@ -0,0 +1,6 @@
+app.cabal
+consumer-a.cabal
+consumer-b.cabal
+impl-a.cabal
+impl-b.cabal
+sig-pkg.cabal
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/app/app/Main.hs b/tests/integration/tests/backpack-x-pkg-multi-inst/files/app/app/Main.hs
new file mode 100644
index 0000000000..8ac221522a
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/app/app/Main.hs
@@ -0,0 +1,9 @@
+module Main where
+
+import ConsumerA (helloA)
+import ConsumerB (helloB)
+
+main :: IO ()
+main = do
+  putStrLn helloA
+  putStrLn helloB
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/app/package.yaml b/tests/integration/tests/backpack-x-pkg-multi-inst/files/app/package.yaml
new file mode 100644
index 0000000000..8efbebdc4d
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/app/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: app
+
+dependencies:
+- base
+
+executables:
+  multi-inst-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-a
+    - consumer-b
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-a/package.yaml b/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-a/package.yaml
new file mode 100644
index 0000000000..943d47fe78
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-a/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: consumer-a
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: sig-pkg
+    mixin:
+    - requires (Str as Str)
+  - impl-a
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-a/src/ConsumerA.hs b/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-a/src/ConsumerA.hs
new file mode 100644
index 0000000000..0c0e9ca6c4
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-a/src/ConsumerA.hs
@@ -0,0 +1,6 @@
+module ConsumerA where
+
+import Str (greeting)
+
+helloA :: String
+helloA = "A says: " ++ greeting
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-b/package.yaml b/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-b/package.yaml
new file mode 100644
index 0000000000..84904ce3d6
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-b/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: consumer-b
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: sig-pkg
+    mixin:
+    - requires (Str as Str)
+  - impl-b
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-b/src/ConsumerB.hs b/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-b/src/ConsumerB.hs
new file mode 100644
index 0000000000..0ca5225c98
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/consumer-b/src/ConsumerB.hs
@@ -0,0 +1,6 @@
+module ConsumerB where
+
+import Str (greeting)
+
+helloB :: String
+helloB = "B says: " ++ greeting
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-a/package.yaml b/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-a/package.yaml
new file mode 100644
index 0000000000..d72ed37bc9
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-a/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-a
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-a/src/Str.hs b/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-a/src/Str.hs
new file mode 100644
index 0000000000..274c2be1c9
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-a/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from impl-a"
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-b/package.yaml b/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-b/package.yaml
new file mode 100644
index 0000000000..d03f74976e
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-b/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-b
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-b/src/Str.hs b/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-b/src/Str.hs
new file mode 100644
index 0000000000..addddbb467
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/impl-b/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from impl-b"
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/sig-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-multi-inst/files/sig-pkg/package.yaml
new file mode 100644
index 0000000000..f05f7b0ce3
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/sig-pkg/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: sig-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Str
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/sig-pkg/src/Str.hsig b/tests/integration/tests/backpack-x-pkg-multi-inst/files/sig-pkg/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/sig-pkg/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-x-pkg-multi-inst/files/stack.yaml b/tests/integration/tests/backpack-x-pkg-multi-inst/files/stack.yaml
new file mode 100644
index 0000000000..37092915af
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-multi-inst/files/stack.yaml
@@ -0,0 +1,9 @@
+snapshot: ghc-9.10.3
+
+packages:
+- app
+- consumer-a
+- consumer-b
+- impl-a
+- impl-b
+- sig-pkg
diff --git a/tests/integration/tests/backpack-x-pkg-rename/Main.hs b/tests/integration/tests/backpack-x-pkg-rename/Main.hs
new file mode 100644
index 0000000000..e1b1d422b2
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/Main.hs
@@ -0,0 +1,15 @@
+-- Test cross-package Backpack with module renaming: sig-pkg has a "Sig"
+-- signature, impl-pkg exposes "Impl", and consumer-pkg uses
+-- mixins: sig-pkg requires (Sig as Impl) to wire them together.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import StackTest
+
+main :: IO ()
+main = do
+  stack ["build"]
+
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("Renamed module works" `isInfixOf` out) $
+      error $ "Expected 'Renamed module works' in output, got: " ++ show out
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/.gitignore b/tests/integration/tests/backpack-x-pkg-rename/files/.gitignore
new file mode 100644
index 0000000000..2f16c30564
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/.gitignore
@@ -0,0 +1,3 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+sig-pkg.cabal
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..f8ce106281
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/package.yaml
@@ -0,0 +1,21 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: sig-pkg
+    mixin:
+    - requires (Sig as Impl)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..b0b870dafc
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import Impl (message)
+
+hello :: String
+hello = message
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-rename/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/impl-pkg/src/Impl.hs b/tests/integration/tests/backpack-x-pkg-rename/files/impl-pkg/src/Impl.hs
new file mode 100644
index 0000000000..cf8ca1d3e2
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/impl-pkg/src/Impl.hs
@@ -0,0 +1,4 @@
+module Impl where
+
+message :: String
+message = "Renamed module works"
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/sig-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-rename/files/sig-pkg/package.yaml
new file mode 100644
index 0000000000..6f09146bf5
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/sig-pkg/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: sig-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Sig
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/sig-pkg/src/Sig.hsig b/tests/integration/tests/backpack-x-pkg-rename/files/sig-pkg/src/Sig.hsig
new file mode 100644
index 0000000000..42f438e05c
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/sig-pkg/src/Sig.hsig
@@ -0,0 +1,3 @@
+signature Sig where
+
+message :: String
diff --git a/tests/integration/tests/backpack-x-pkg-rename/files/stack.yaml b/tests/integration/tests/backpack-x-pkg-rename/files/stack.yaml
new file mode 100644
index 0000000000..e7ab4c1649
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-rename/files/stack.yaml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- sig-pkg
diff --git a/tests/integration/tests/backpack-x-pkg-sig/Main.hs b/tests/integration/tests/backpack-x-pkg-sig/Main.hs
new file mode 100644
index 0000000000..79516bb819
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/Main.hs
@@ -0,0 +1,28 @@
+-- Test cross-package Backpack: sig-pkg (indefinite, has Str signature) is
+-- instantiated with impl-pkg's Str module via consumer-pkg's mixin declaration.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import StackTest
+
+main :: IO ()
+main = do
+  -- Build all three packages. This exercises:
+  -- 1. sig-pkg CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str implementation)
+  -- 3. sig-pkg CInst (instantiation with impl-pkg's Str)
+  -- 4. consumer-pkg CLib + CExe
+  stack ["build"]
+
+  -- Verify the consumer executable calls through the instantiated signature
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("Hello from impl-pkg" `isInfixOf` out) $
+      error $ "Expected 'Hello from impl-pkg' in output, got: " ++ show out
+
+  -- Rebuild should succeed (no stale CInst state or dist-dir conflicts)
+  stack ["build"]
+
+  -- Verify output still correct after rebuild
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("Hello from impl-pkg" `isInfixOf` out) $
+      error $ "Expected 'Hello from impl-pkg' after rebuild, got: " ++ show out
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/.gitignore b/tests/integration/tests/backpack-x-pkg-sig/files/.gitignore
new file mode 100644
index 0000000000..2f16c30564
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/.gitignore
@@ -0,0 +1,3 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+sig-pkg.cabal
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..42a24e14d2
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/package.yaml
@@ -0,0 +1,21 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: sig-pkg
+    mixin:
+    - requires (Str as Str)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..4c44a58a8a
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import Str (greeting)
+
+hello :: String
+hello = greeting
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-sig/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-x-pkg-sig/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..7d546cc5a1
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from impl-pkg"
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/sig-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-sig/files/sig-pkg/package.yaml
new file mode 100644
index 0000000000..65f7f0f986
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/sig-pkg/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: sig-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/sig-pkg/src/Str.hsig b/tests/integration/tests/backpack-x-pkg-sig/files/sig-pkg/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/sig-pkg/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/backpack-x-pkg-sig/files/stack.yaml b/tests/integration/tests/backpack-x-pkg-sig/files/stack.yaml
new file mode 100644
index 0000000000..e7ab4c1649
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-sig/files/stack.yaml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- sig-pkg
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/Main.hs b/tests/integration/tests/backpack-x-pkg-transitive/Main.hs
new file mode 100644
index 0000000000..8b8915dcc7
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/Main.hs
@@ -0,0 +1,58 @@
+-- Test transitive cross-package Backpack chains: logger-sig (indefinite,
+-- sig: Logger) depends on str-sig (indefinite, sig: Str). When consumer mixes
+-- in logger-sig, both Logger and Str holes must be filled transitively.
+
+import Control.Monad ( unless, when )
+import Data.List ( isInfixOf )
+import System.Directory ( removeFile )
+import StackTest
+
+main :: IO ()
+main = do
+  -- Build all four packages. This exercises:
+  -- 1. str-sig CLib (indefinite, typecheck-only)
+  -- 2. impl-pkg CLib (concrete Str + Logger)
+  -- 3. str-sig CInst (instantiation with impl-pkg's Str)
+  -- 4. logger-sig CLib (indefinite, typecheck-only, inherits Str hole)
+  -- 5. logger-sig CInst (fills BOTH Logger and Str holes)
+  -- 6. consumer-pkg CLib + CExe
+  stackCheckStderr ["build"] expectNoCandidateWarning
+
+  -- Verify the consumer executable calls through the transitive chain
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' in output, got: "
+            ++ show out
+
+  replaceFile "logger-sig/src/Logger.hsig" $ unlines
+    [ "signature Logger where"
+    , ""
+    , "logMessage :: String -> String"
+    , "loggerName :: String"
+    ]
+
+  -- Rebuild should succeed (no stale CInst state)
+  stackCheckStderr ["build"] $ \err -> do
+    expectNoCandidateWarning err
+    unless (any (`isInfixOf` err) ["logger-sig", "Compiling Logger"]) $
+      error $
+           "Expected Logger.hsig change to rebuild logger-sig, got stderr: "
+        ++ show err
+
+  -- Verify output still correct after rebuild
+  stackCheckStdout ["exec", "consumer-demo"] $ \out ->
+    unless ("[LOG] Hello from transitive chain" `isInfixOf` out) $
+      error $ "Expected '[LOG] Hello from transitive chain' after rebuild, got: "
+            ++ show out
+
+expectNoCandidateWarning :: String -> IO ()
+expectNoCandidateWarning err =
+  when ("Unable to find a known candidate for the Cabal entry" `isInfixOf` err) $
+    error $ "Unexpected known candidate warning in stderr: " ++ show err
+
+replaceFile :: FilePath -> String -> IO ()
+replaceFile file contents = do
+  -- The integration harness may symlink fixture files on Unix, so remove the
+  -- temporary path before writing to avoid mutating the source fixture.
+  removeFile file
+  writeFile file contents
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/.gitignore b/tests/integration/tests/backpack-x-pkg-transitive/files/.gitignore
new file mode 100644
index 0000000000..1c91379fd4
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/.gitignore
@@ -0,0 +1,4 @@
+consumer-pkg.cabal
+impl-pkg.cabal
+logger-sig.cabal
+str-sig.cabal
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/app/Main.hs b/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/app/Main.hs
new file mode 100644
index 0000000000..4c26592390
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Consumer (hello)
+
+main :: IO ()
+main = putStrLn hello
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/package.yaml
new file mode 100644
index 0000000000..ba65db2645
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/package.yaml
@@ -0,0 +1,24 @@
+spec-version: 0.36.0
+
+name: consumer-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
+  - name: logger-sig
+    mixin:
+    - requires (Logger as Logger)
+  - impl-pkg
+
+executables:
+  consumer-demo:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - consumer-pkg
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/src/Consumer.hs b/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/src/Consumer.hs
new file mode 100644
index 0000000000..e46c8658a6
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/consumer-pkg/src/Consumer.hs
@@ -0,0 +1,6 @@
+module Consumer where
+
+import LogHelper (greetWithLog)
+
+hello :: String
+hello = greetWithLog
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/package.yaml b/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/package.yaml
new file mode 100644
index 0000000000..bd4497b3d7
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: impl-pkg
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/src/Logger.hs b/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/src/Logger.hs
new file mode 100644
index 0000000000..62c1318517
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/src/Logger.hs
@@ -0,0 +1,7 @@
+module Logger where
+
+logMessage :: String -> String
+logMessage msg = "[LOG] " ++ msg
+
+loggerName :: String
+loggerName = "transitive logger"
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/src/Str.hs b/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/src/Str.hs
new file mode 100644
index 0000000000..3b6d306620
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/impl-pkg/src/Str.hs
@@ -0,0 +1,4 @@
+module Str where
+
+greeting :: String
+greeting = "Hello from transitive chain"
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/package.yaml b/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/package.yaml
new file mode 100644
index 0000000000..b9db28324f
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/package.yaml
@@ -0,0 +1,14 @@
+spec-version: 0.36.0
+
+name: logger-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures: Logger
+  dependencies:
+  - name: str-sig
+    mixin:
+    - requires (Str as Str)
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/src/LogHelper.hs b/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/src/LogHelper.hs
new file mode 100644
index 0000000000..2eecba92d6
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/src/LogHelper.hs
@@ -0,0 +1,7 @@
+module LogHelper where
+
+import Str (greeting)
+import Logger (logMessage)
+
+greetWithLog :: String
+greetWithLog = logMessage greeting
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/src/Logger.hsig b/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/src/Logger.hsig
new file mode 100644
index 0000000000..446efe6fe6
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/logger-sig/src/Logger.hsig
@@ -0,0 +1,3 @@
+signature Logger where
+
+logMessage :: String -> String
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/stack.yaml b/tests/integration/tests/backpack-x-pkg-transitive/files/stack.yaml
new file mode 100644
index 0000000000..f74ff881c8
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/stack.yaml
@@ -0,0 +1,7 @@
+snapshot: ghc-9.10.3
+
+packages:
+- consumer-pkg
+- impl-pkg
+- logger-sig
+- str-sig
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/str-sig/package.yaml b/tests/integration/tests/backpack-x-pkg-transitive/files/str-sig/package.yaml
new file mode 100644
index 0000000000..a6b1796ff1
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/str-sig/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: str-sig
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  signatures:
+  - Str
diff --git a/tests/integration/tests/backpack-x-pkg-transitive/files/str-sig/src/Str.hsig b/tests/integration/tests/backpack-x-pkg-transitive/files/str-sig/src/Str.hsig
new file mode 100644
index 0000000000..edb56a4a7d
--- /dev/null
+++ b/tests/integration/tests/backpack-x-pkg-transitive/files/str-sig/src/Str.hsig
@@ -0,0 +1,3 @@
+signature Str where
+
+greeting :: String
diff --git a/tests/integration/tests/basic-install/Main.hs b/tests/integration/tests/basic-install/Main.hs
new file mode 100644
index 0000000000..659cccdb75
--- /dev/null
+++ b/tests/integration/tests/basic-install/Main.hs
@@ -0,0 +1,8 @@
+-- | Stack will build packages in the package index in the absence of a Stack
+-- project-level configuration file (by referring to the configuration file in
+-- the global-project directory in the Stack root).
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build", "acme-missiles-0.3"]
diff --git a/tests/integration/tests/build-ghc/Main.hs b/tests/integration/tests/build-ghc/Main.hs
new file mode 100644
index 0000000000..3a389a2b7d
--- /dev/null
+++ b/tests/integration/tests/build-ghc/Main.hs
@@ -0,0 +1,28 @@
+import           StackTest
+import           System.Directory ( withCurrentDirectory )
+
+main :: IO ()
+main = superslow $ do
+    -- cleanup previous failing test...
+    removeDirIgnore "tmpPackage"
+
+    stack ["new", "--snapshot=lts-13.11", "tmpPackage"]
+
+    -- use a commit which is known to succeed with hadrian binary-dist
+    let commitId = "be0dde8e3c27ca56477d1d1801bb77621f3618e1"
+        flavour  = "quick"
+
+    withCurrentDirectory "tmpPackage" $ do
+       appendFile "stack.yaml" $ unlines
+         [ "compiler-repository: https://gitlab.haskell.org/ghc/ghc.git"
+         , "compiler: ghc-git-" ++ commitId ++ "-" ++ flavour
+         ]
+
+       -- Setup the package
+       stack ["setup"]
+
+       -- build it with the built GHC
+       stack ["build"]
+
+    -- cleanup
+    removeDirIgnore "tmpPackage"
diff --git a/tests/integration/tests/cabal-non-buildable-bug/Main.hs b/tests/integration/tests/cabal-non-buildable-bug/Main.hs
new file mode 100644
index 0000000000..ceaa053290
--- /dev/null
+++ b/tests/integration/tests/cabal-non-buildable-bug/Main.hs
@@ -0,0 +1,9 @@
+-- | When building, Stack ignores the components of packages that are
+-- not-buildable.
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["build", "--dry-run"]
+  stack ["build"]
diff --git a/tests/integration/tests/cabal-non-buildable-bug/files/.gitignore b/tests/integration/tests/cabal-non-buildable-bug/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/cabal-non-buildable-bug/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/cabal-non-buildable-bug/files/package.yaml b/tests/integration/tests/cabal-non-buildable-bug/files/package.yaml
new file mode 100644
index 0000000000..47630ba295
--- /dev/null
+++ b/tests/integration/tests/cabal-non-buildable-bug/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+executables:
+  myExe:
+    main: Main.hs # Does not exist
+    buildable: false
diff --git a/tests/integration/tests/cabal-non-buildable-bug/files/stack.yaml b/tests/integration/tests/cabal-non-buildable-bug/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/cabal-non-buildable-bug/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/cabal-sublibrary-dependency/Main.hs b/tests/integration/tests/cabal-sublibrary-dependency/Main.hs
new file mode 100644
index 0000000000..4f9ba45ac1
--- /dev/null
+++ b/tests/integration/tests/cabal-sublibrary-dependency/Main.hs
@@ -0,0 +1,10 @@
+-- | Stack can build a project package that depends on the public named library
+-- (a sublibrary) of another project package. However, the latter package must
+-- also have a main library (which may be a Stack bug).
+--
+-- See: https://github.com/commercialhaskell/stack/issues/6896
+
+import          StackTest
+
+main :: IO ()
+main = stack ["build", ":myExe"]
diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/.gitignore b/tests/integration/tests/cabal-sublibrary-dependency/files/.gitignore
new file mode 100644
index 0000000000..f9a6e152d2
--- /dev/null
+++ b/tests/integration/tests/cabal-sublibrary-dependency/files/.gitignore
@@ -0,0 +1,2 @@
+myPackageA.cabal
+myPackageB.cabal
diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageA/app/Main.hs b/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageA/app/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageA/app/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageA/package.yaml b/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageA/package.yaml
new file mode 100644
index 0000000000..c7b310119d
--- /dev/null
+++ b/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageA/package.yaml
@@ -0,0 +1,12 @@
+spec-version: 0.36.0
+
+name: myPackageA
+
+dependencies:
+- base
+- myPackageB:myPackageB-sub
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageB/package.yaml b/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageB/package.yaml
new file mode 100644
index 0000000000..9591417520
--- /dev/null
+++ b/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageB/package.yaml
@@ -0,0 +1,13 @@
+spec-version: 0.36.0
+
+name: myPackageB
+
+dependencies:
+- base
+
+library: {}
+
+internal-libraries:
+  myPackageB-sub:
+    visibility: public
+    source-dirs: src
diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageB/src/Lib.hs b/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageB/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/cabal-sublibrary-dependency/files/myPackageB/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml
new file mode 100644
index 0000000000..68891a8d7c
--- /dev/null
+++ b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+packages:
+- myPackageA
+- myPackageB
diff --git a/tests/integration/tests/copy-bins-works/Main.hs b/tests/integration/tests/copy-bins-works/Main.hs
new file mode 100644
index 0000000000..feafc1ba33
--- /dev/null
+++ b/tests/integration/tests/copy-bins-works/Main.hs
@@ -0,0 +1,15 @@
+-- | Stack's build command supports the copy-bins flag.
+
+import           StackTest
+import           System.Directory ( createDirectoryIfMissing )
+
+main :: IO ()
+main = do
+  createDirectoryIfMissing True "bin1"
+  stack ["build", "--copy-bins", "--local-bin-path", "bin1"]
+  doesExist ("bin1/" <> myPackageExe)
+  createDirectoryIfMissing True "bin2"
+  stack ["--stack-yaml", "stack-copy-bins.yaml", "build", "--local-bin-path", "bin2"]
+  doesExist ("bin2/" <> myPackageExe)
+ where
+  myPackageExe = "myExe" <> exeExt
diff --git a/tests/integration/tests/copy-bins-works/files/.gitignore b/tests/integration/tests/copy-bins-works/files/.gitignore
new file mode 100644
index 0000000000..fc53374c2f
--- /dev/null
+++ b/tests/integration/tests/copy-bins-works/files/.gitignore
@@ -0,0 +1,3 @@
+myPackage.cabal
+bin1/
+bin2/
diff --git a/tests/integration/tests/copy-bins-works/files/app/Main.hs b/tests/integration/tests/copy-bins-works/files/app/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/copy-bins-works/files/app/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/copy-bins-works/files/package.yaml b/tests/integration/tests/copy-bins-works/files/package.yaml
new file mode 100644
index 0000000000..ee1f9f8afa
--- /dev/null
+++ b/tests/integration/tests/copy-bins-works/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/tests/integration/tests/copy-bins-works/files/stack-copy-bins.yaml b/tests/integration/tests/copy-bins-works/files/stack-copy-bins.yaml
new file mode 100644
index 0000000000..4ca93380fd
--- /dev/null
+++ b/tests/integration/tests/copy-bins-works/files/stack-copy-bins.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+build:
+  copy-bins: true
diff --git a/tests/integration/tests/copy-bins-works/files/stack.yaml b/tests/integration/tests/copy-bins-works/files/stack.yaml
new file mode 100644
index 0000000000..abe6c1f573
--- /dev/null
+++ b/tests/integration/tests/copy-bins-works/files/stack.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+build:
+  copy-bins: false
diff --git a/tests/integration/tests/custom-preprocessor-extension-warning/Main.hs b/tests/integration/tests/custom-preprocessor-extension-warning/Main.hs
new file mode 100644
index 0000000000..365d99b36d
--- /dev/null
+++ b/tests/integration/tests/custom-preprocessor-extension-warning/Main.hs
@@ -0,0 +1,19 @@
+-- Stack should still suggest custom-preprocessor-extensions for unknown
+-- non-Haskell module file extensions.
+
+import Control.Monad ( unless )
+import Data.List ( isInfixOf )
+import StackTest
+
+main :: IO ()
+main =
+  stackErrStderr ["build"] $ \err -> do
+    expect err "Unable to find a known candidate for the Cabal entry"
+    expect err "Generated"
+    expect err "Generated.foo"
+    expect err "custom-preprocessor-extensions"
+
+expect :: String -> String -> IO ()
+expect err msg =
+  unless (msg `isInfixOf` err) $
+    error $ "Expected " ++ show msg ++ " in stderr, got: " ++ show err
diff --git a/tests/integration/tests/custom-preprocessor-extension-warning/files/.gitignore b/tests/integration/tests/custom-preprocessor-extension-warning/files/.gitignore
new file mode 100644
index 0000000000..bc0216f5f8
--- /dev/null
+++ b/tests/integration/tests/custom-preprocessor-extension-warning/files/.gitignore
@@ -0,0 +1 @@
+custom-preprocessor-warning.cabal
diff --git a/tests/integration/tests/custom-preprocessor-extension-warning/files/package.yaml b/tests/integration/tests/custom-preprocessor-extension-warning/files/package.yaml
new file mode 100644
index 0000000000..f48288c3c2
--- /dev/null
+++ b/tests/integration/tests/custom-preprocessor-extension-warning/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: custom-preprocessor-warning
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  exposed-modules: Lib
+  other-modules: Generated
diff --git a/tests/integration/tests/custom-preprocessor-extension-warning/files/src/Generated.foo b/tests/integration/tests/custom-preprocessor-extension-warning/files/src/Generated.foo
new file mode 100644
index 0000000000..4667320bc2
--- /dev/null
+++ b/tests/integration/tests/custom-preprocessor-extension-warning/files/src/Generated.foo
@@ -0,0 +1,4 @@
+module Generated where
+
+generated :: String
+generated = "generated"
diff --git a/tests/integration/tests/custom-preprocessor-extension-warning/files/src/Lib.hs b/tests/integration/tests/custom-preprocessor-extension-warning/files/src/Lib.hs
new file mode 100644
index 0000000000..f9d8b32e79
--- /dev/null
+++ b/tests/integration/tests/custom-preprocessor-extension-warning/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/custom-preprocessor-extension-warning/files/stack.yaml b/tests/integration/tests/custom-preprocessor-extension-warning/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/custom-preprocessor-extension-warning/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/custom-setup-bench/Main.hs b/tests/integration/tests/custom-setup-bench/Main.hs
new file mode 100644
index 0000000000..2e24425ae9
--- /dev/null
+++ b/tests/integration/tests/custom-setup-bench/Main.hs
@@ -0,0 +1,12 @@
+import StackTest
+
+-- Regression test for PR #6865. A package with `build-type: Custom` and a
+-- benchmark should have its benchmark component built when `stack bench`
+-- (or `stack build --bench`) is commanded. Same root cause as the test-suite
+-- bug: the non-split final key collapses with the primary build's CLib key.
+main :: IO ()
+main = do
+  -- `stack bench` both builds and runs the benchmark; if the non-split final
+  -- action drops the bench target (the PR bug), Stack reports
+  -- BenchmarkExeMissing instead of finding a freshly built exe.
+  stack ["bench"]
diff --git a/tests/integration/tests/custom-setup-bench/files/Setup.hs b/tests/integration/tests/custom-setup-bench/files/Setup.hs
new file mode 100644
index 0000000000..b55cb16953
--- /dev/null
+++ b/tests/integration/tests/custom-setup-bench/files/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+main :: IO ()
+main = defaultMain
diff --git a/tests/integration/tests/custom-setup-bench/files/bench/Bench.hs b/tests/integration/tests/custom-setup-bench/files/bench/Bench.hs
new file mode 100644
index 0000000000..6cc1a10f4a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-bench/files/bench/Bench.hs
@@ -0,0 +1,6 @@
+module Main (main) where
+
+import Lib (answer)
+
+main :: IO ()
+main = print answer
diff --git a/tests/integration/tests/custom-setup-bench/files/custom-setup-bench.cabal b/tests/integration/tests/custom-setup-bench/files/custom-setup-bench.cabal
new file mode 100644
index 0000000000..5f4e397bbe
--- /dev/null
+++ b/tests/integration/tests/custom-setup-bench/files/custom-setup-bench.cabal
@@ -0,0 +1,22 @@
+cabal-version: 3.4
+name:          custom-setup-bench
+version:       0.1.0.0
+build-type:    Custom
+
+custom-setup
+  setup-depends: base >=4.14,
+                 Cabal >=3.4
+
+library
+  exposed-modules:  Lib
+  build-depends:    base >=4.14
+  hs-source-dirs:   src
+  default-language: Haskell2010
+
+benchmark custom-setup-bench-suite
+  type:             exitcode-stdio-1.0
+  main-is:          Bench.hs
+  build-depends:    base >=4.14,
+                    custom-setup-bench
+  hs-source-dirs:   bench
+  default-language: Haskell2010
diff --git a/tests/integration/tests/custom-setup-bench/files/src/Lib.hs b/tests/integration/tests/custom-setup-bench/files/src/Lib.hs
new file mode 100644
index 0000000000..f1bf0e3e27
--- /dev/null
+++ b/tests/integration/tests/custom-setup-bench/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib (answer) where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/custom-setup-bench/files/stack.yaml b/tests/integration/tests/custom-setup-bench/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-bench/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/custom-setup-build-then-test/Main.hs b/tests/integration/tests/custom-setup-build-then-test/Main.hs
new file mode 100644
index 0000000000..84265846e0
--- /dev/null
+++ b/tests/integration/tests/custom-setup-build-then-test/Main.hs
@@ -0,0 +1,12 @@
+import StackTest
+
+-- Regression test for the build-then-test workflow on Custom-setup packages.
+-- `stack build` configures without --enable-tests; a subsequent `stack test`
+-- must then reconfigure with --enable-tests and still build the test suite
+-- correctly. Before PR #6865's TestSuiteExeMissing fix, the second step
+-- failed with `TestSuiteExeMissing` because the final task shared a
+-- ComponentKey with the primary and was dropped.
+main :: IO ()
+main = do
+  stack ["build"]
+  stack ["test"]
diff --git a/tests/integration/tests/custom-setup-build-then-test/files/Setup.hs b/tests/integration/tests/custom-setup-build-then-test/files/Setup.hs
new file mode 100644
index 0000000000..b55cb16953
--- /dev/null
+++ b/tests/integration/tests/custom-setup-build-then-test/files/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+main :: IO ()
+main = defaultMain
diff --git a/tests/integration/tests/custom-setup-build-then-test/files/custom-setup-build-then-test.cabal b/tests/integration/tests/custom-setup-build-then-test/files/custom-setup-build-then-test.cabal
new file mode 100644
index 0000000000..7ab4a4876d
--- /dev/null
+++ b/tests/integration/tests/custom-setup-build-then-test/files/custom-setup-build-then-test.cabal
@@ -0,0 +1,22 @@
+cabal-version: 3.4
+name:          custom-setup-build-then-test
+version:       0.1.0.0
+build-type:    Custom
+
+custom-setup
+  setup-depends: base >=4.14,
+                 Cabal >=3.4
+
+library
+  exposed-modules:  Lib
+  build-depends:    base >=4.14
+  hs-source-dirs:   src
+  default-language: Haskell2010
+
+test-suite custom-setup-build-then-test-suite
+  type:             exitcode-stdio-1.0
+  main-is:          Spec.hs
+  build-depends:    base >=4.14,
+                    custom-setup-build-then-test
+  hs-source-dirs:   test
+  default-language: Haskell2010
diff --git a/tests/integration/tests/custom-setup-build-then-test/files/src/Lib.hs b/tests/integration/tests/custom-setup-build-then-test/files/src/Lib.hs
new file mode 100644
index 0000000000..f1bf0e3e27
--- /dev/null
+++ b/tests/integration/tests/custom-setup-build-then-test/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib (answer) where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/custom-setup-build-then-test/files/stack.yaml b/tests/integration/tests/custom-setup-build-then-test/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-build-then-test/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/custom-setup-build-then-test/files/test/Spec.hs b/tests/integration/tests/custom-setup-build-then-test/files/test/Spec.hs
new file mode 100644
index 0000000000..cc9ffbbe39
--- /dev/null
+++ b/tests/integration/tests/custom-setup-build-then-test/files/test/Spec.hs
@@ -0,0 +1,9 @@
+module Main (main) where
+
+import Lib (answer)
+import System.Exit (exitFailure, exitSuccess)
+
+main :: IO ()
+main
+  | answer == 42 = exitSuccess
+  | otherwise    = exitFailure
diff --git a/tests/integration/tests/custom-setup-lib-only/Main.hs b/tests/integration/tests/custom-setup-lib-only/Main.hs
new file mode 100644
index 0000000000..0aff56ec62
--- /dev/null
+++ b/tests/integration/tests/custom-setup-lib-only/Main.hs
@@ -0,0 +1,20 @@
+import Control.Monad (when)
+import Data.List (isInfixOf)
+import StackTest
+
+-- Regression guard for the no-finals path of PR #6865's fix. A Custom-setup
+-- package with only a library (no test suites, no benchmarks) should take
+-- the plain non-split primary-only path: configure+build+copy+register,
+-- exactly as before the fix. Second `stack build` must be a no-op.
+main :: IO ()
+main = do
+  stack ["build"]
+  stackCheckStderr ["build"] $ \err ->
+    let signals =
+          [ "] Compiling"
+          , "Installing library"
+          , "Registering library"
+          ]
+    in  when (any (`isInfixOf` err) signals) $
+          error $
+            "Second `stack build` was not a no-op. Stderr:\n" ++ err
diff --git a/tests/integration/tests/custom-setup-lib-only/files/Setup.hs b/tests/integration/tests/custom-setup-lib-only/files/Setup.hs
new file mode 100644
index 0000000000..b55cb16953
--- /dev/null
+++ b/tests/integration/tests/custom-setup-lib-only/files/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+main :: IO ()
+main = defaultMain
diff --git a/tests/integration/tests/custom-setup-lib-only/files/custom-setup-lib-only.cabal b/tests/integration/tests/custom-setup-lib-only/files/custom-setup-lib-only.cabal
new file mode 100644
index 0000000000..80e99e6f45
--- /dev/null
+++ b/tests/integration/tests/custom-setup-lib-only/files/custom-setup-lib-only.cabal
@@ -0,0 +1,14 @@
+cabal-version: 3.4
+name:          custom-setup-lib-only
+version:       0.1.0.0
+build-type:    Custom
+
+custom-setup
+  setup-depends: base >=4.14,
+                 Cabal >=3.4
+
+library
+  exposed-modules:  Lib
+  build-depends:    base >=4.14
+  hs-source-dirs:   src
+  default-language: Haskell2010
diff --git a/tests/integration/tests/custom-setup-lib-only/files/src/Lib.hs b/tests/integration/tests/custom-setup-lib-only/files/src/Lib.hs
new file mode 100644
index 0000000000..f1bf0e3e27
--- /dev/null
+++ b/tests/integration/tests/custom-setup-lib-only/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib (answer) where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/custom-setup-lib-only/files/stack.yaml b/tests/integration/tests/custom-setup-lib-only/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-lib-only/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/custom-setup-test-and-bench/Main.hs b/tests/integration/tests/custom-setup-test-and-bench/Main.hs
new file mode 100644
index 0000000000..2bca9bd49a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-and-bench/Main.hs
@@ -0,0 +1,12 @@
+import StackTest
+
+-- Regression test for PR #6865. A Custom-setup package with both a test
+-- suite and a benchmark must have both components built when
+-- `stack build --test --bench` is commanded.
+main :: IO ()
+main = do
+  -- Drop the no-run flags: with the bug, the run step surfaces the missing
+  -- test/bench exes. Without the no-run flags, Stack will build the lib,
+  -- skip the test/bench builds (bug), and then fail when it tries to run
+  -- non-existent exes.
+  stack ["build", "--test", "--bench"]
diff --git a/tests/integration/tests/custom-setup-test-and-bench/files/Setup.hs b/tests/integration/tests/custom-setup-test-and-bench/files/Setup.hs
new file mode 100644
index 0000000000..b55cb16953
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-and-bench/files/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+main :: IO ()
+main = defaultMain
diff --git a/tests/integration/tests/custom-setup-test-and-bench/files/bench/Bench.hs b/tests/integration/tests/custom-setup-test-and-bench/files/bench/Bench.hs
new file mode 100644
index 0000000000..6cc1a10f4a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-and-bench/files/bench/Bench.hs
@@ -0,0 +1,6 @@
+module Main (main) where
+
+import Lib (answer)
+
+main :: IO ()
+main = print answer
diff --git a/tests/integration/tests/custom-setup-test-and-bench/files/custom-setup-test-and-bench.cabal b/tests/integration/tests/custom-setup-test-and-bench/files/custom-setup-test-and-bench.cabal
new file mode 100644
index 0000000000..6b8f448891
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-and-bench/files/custom-setup-test-and-bench.cabal
@@ -0,0 +1,30 @@
+cabal-version: 3.4
+name:          custom-setup-test-and-bench
+version:       0.1.0.0
+build-type:    Custom
+
+custom-setup
+  setup-depends: base >=4.14,
+                 Cabal >=3.4
+
+library
+  exposed-modules:  Lib
+  build-depends:    base >=4.14
+  hs-source-dirs:   src
+  default-language: Haskell2010
+
+test-suite custom-setup-test-and-bench-tests
+  type:             exitcode-stdio-1.0
+  main-is:          Spec.hs
+  build-depends:    base >=4.14,
+                    custom-setup-test-and-bench
+  hs-source-dirs:   test
+  default-language: Haskell2010
+
+benchmark custom-setup-test-and-bench-bench
+  type:             exitcode-stdio-1.0
+  main-is:          Bench.hs
+  build-depends:    base >=4.14,
+                    custom-setup-test-and-bench
+  hs-source-dirs:   bench
+  default-language: Haskell2010
diff --git a/tests/integration/tests/custom-setup-test-and-bench/files/src/Lib.hs b/tests/integration/tests/custom-setup-test-and-bench/files/src/Lib.hs
new file mode 100644
index 0000000000..f1bf0e3e27
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-and-bench/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib (answer) where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/custom-setup-test-and-bench/files/stack.yaml b/tests/integration/tests/custom-setup-test-and-bench/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-and-bench/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/custom-setup-test-and-bench/files/test/Spec.hs b/tests/integration/tests/custom-setup-test-and-bench/files/test/Spec.hs
new file mode 100644
index 0000000000..cc9ffbbe39
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-and-bench/files/test/Spec.hs
@@ -0,0 +1,9 @@
+module Main (main) where
+
+import Lib (answer)
+import System.Exit (exitFailure, exitSuccess)
+
+main :: IO ()
+main
+  | answer == 42 = exitSuccess
+  | otherwise    = exitFailure
diff --git a/tests/integration/tests/custom-setup-test-exe/Main.hs b/tests/integration/tests/custom-setup-test-exe/Main.hs
new file mode 100644
index 0000000000..e02c6697a1
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-exe/Main.hs
@@ -0,0 +1,8 @@
+import StackTest
+
+-- Regression test for PR #6865. Mirrors the `stack new` default project
+-- layout (library + executable + test) with a `custom-setup` stanza added.
+-- `stack test` must build and run the test suite.
+main :: IO ()
+main = do
+  stack ["test"]
diff --git a/tests/integration/tests/custom-setup-test-exe/files/Setup.hs b/tests/integration/tests/custom-setup-test-exe/files/Setup.hs
new file mode 100644
index 0000000000..b55cb16953
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-exe/files/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+main :: IO ()
+main = defaultMain
diff --git a/tests/integration/tests/custom-setup-test-exe/files/app/Main.hs b/tests/integration/tests/custom-setup-test-exe/files/app/Main.hs
new file mode 100644
index 0000000000..6cc1a10f4a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-exe/files/app/Main.hs
@@ -0,0 +1,6 @@
+module Main (main) where
+
+import Lib (answer)
+
+main :: IO ()
+main = print answer
diff --git a/tests/integration/tests/custom-setup-test-exe/files/custom-setup-test-exe.cabal b/tests/integration/tests/custom-setup-test-exe/files/custom-setup-test-exe.cabal
new file mode 100644
index 0000000000..01f8c31b3c
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-exe/files/custom-setup-test-exe.cabal
@@ -0,0 +1,29 @@
+cabal-version: 3.4
+name:          custom-setup-test-exe
+version:       0.1.0.0
+build-type:    Custom
+
+custom-setup
+  setup-depends: base >=4.14,
+                 Cabal >=3.4
+
+library
+  exposed-modules:  Lib
+  build-depends:    base >=4.14
+  hs-source-dirs:   src
+  default-language: Haskell2010
+
+executable custom-setup-test-exe-bin
+  main-is:          Main.hs
+  build-depends:    base >=4.14,
+                    custom-setup-test-exe
+  hs-source-dirs:   app
+  default-language: Haskell2010
+
+test-suite custom-setup-test-exe-tests
+  type:             exitcode-stdio-1.0
+  main-is:          Spec.hs
+  build-depends:    base >=4.14,
+                    custom-setup-test-exe
+  hs-source-dirs:   test
+  default-language: Haskell2010
diff --git a/tests/integration/tests/custom-setup-test-exe/files/src/Lib.hs b/tests/integration/tests/custom-setup-test-exe/files/src/Lib.hs
new file mode 100644
index 0000000000..f1bf0e3e27
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-exe/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib (answer) where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/custom-setup-test-exe/files/stack.yaml b/tests/integration/tests/custom-setup-test-exe/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-exe/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/custom-setup-test-exe/files/test/Spec.hs b/tests/integration/tests/custom-setup-test-exe/files/test/Spec.hs
new file mode 100644
index 0000000000..cc9ffbbe39
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-exe/files/test/Spec.hs
@@ -0,0 +1,9 @@
+module Main (main) where
+
+import Lib (answer)
+import System.Exit (exitFailure, exitSuccess)
+
+main :: IO ()
+main
+  | answer == 42 = exitSuccess
+  | otherwise    = exitFailure
diff --git a/tests/integration/tests/custom-setup-test-idempotent/Main.hs b/tests/integration/tests/custom-setup-test-idempotent/Main.hs
new file mode 100644
index 0000000000..31dedbe1c7
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-idempotent/Main.hs
@@ -0,0 +1,26 @@
+import Control.Monad (when)
+import Data.List (isInfixOf)
+import StackTest
+
+-- Regression test for PR #6865's third-run observation: after a successful
+-- `stack test`, a repeat `stack test` with no source changes should be a
+-- no-op (no re-compilation). The reporter observed Stack rebuilding the
+-- library on every other run because the enable-tests configure flag
+-- flip-flops between primary and final tasks keyed at the same CLib.
+main :: IO ()
+main = do
+  stack ["test"]
+  -- Second run must not redo actual work. We don't assert on
+  -- "Preprocessing"/"Building library" — Cabal prints those even when
+  -- GHC skips compilation — but we do assert no real compilation
+  -- (`[N of M] Compiling`) and no reinstall (`Installing library`,
+  -- `Registering library`).
+  stackCheckStderr ["test"] $ \err ->
+    let signals =
+          [ "] Compiling"
+          , "Installing library"
+          , "Registering library"
+          ]
+    in  when (any (`isInfixOf` err) signals) $
+          error $
+            "Second `stack test` was not a no-op. Stderr:\n" ++ err
diff --git a/tests/integration/tests/custom-setup-test-idempotent/files/Setup.hs b/tests/integration/tests/custom-setup-test-idempotent/files/Setup.hs
new file mode 100644
index 0000000000..b55cb16953
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-idempotent/files/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+main :: IO ()
+main = defaultMain
diff --git a/tests/integration/tests/custom-setup-test-idempotent/files/custom-setup-test-idempotent.cabal b/tests/integration/tests/custom-setup-test-idempotent/files/custom-setup-test-idempotent.cabal
new file mode 100644
index 0000000000..46afdf925d
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-idempotent/files/custom-setup-test-idempotent.cabal
@@ -0,0 +1,22 @@
+cabal-version: 3.4
+name:          custom-setup-test-idempotent
+version:       0.1.0.0
+build-type:    Custom
+
+custom-setup
+  setup-depends: base >=4.14,
+                 Cabal >=3.4
+
+library
+  exposed-modules:  Lib
+  build-depends:    base >=4.14
+  hs-source-dirs:   src
+  default-language: Haskell2010
+
+test-suite custom-setup-test-idempotent-suite
+  type:             exitcode-stdio-1.0
+  main-is:          Spec.hs
+  build-depends:    base >=4.14,
+                    custom-setup-test-idempotent
+  hs-source-dirs:   test
+  default-language: Haskell2010
diff --git a/tests/integration/tests/custom-setup-test-idempotent/files/src/Lib.hs b/tests/integration/tests/custom-setup-test-idempotent/files/src/Lib.hs
new file mode 100644
index 0000000000..f1bf0e3e27
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-idempotent/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib (answer) where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/custom-setup-test-idempotent/files/stack.yaml b/tests/integration/tests/custom-setup-test-idempotent/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-idempotent/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/custom-setup-test-idempotent/files/test/Spec.hs b/tests/integration/tests/custom-setup-test-idempotent/files/test/Spec.hs
new file mode 100644
index 0000000000..cc9ffbbe39
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test-idempotent/files/test/Spec.hs
@@ -0,0 +1,9 @@
+module Main (main) where
+
+import Lib (answer)
+import System.Exit (exitFailure, exitSuccess)
+
+main :: IO ()
+main
+  | answer == 42 = exitSuccess
+  | otherwise    = exitFailure
diff --git a/tests/integration/tests/custom-setup-test/Main.hs b/tests/integration/tests/custom-setup-test/Main.hs
new file mode 100644
index 0000000000..8690395824
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test/Main.hs
@@ -0,0 +1,9 @@
+import StackTest
+
+-- Regression test for PR #6865. A package with `build-type: Custom`
+-- (triggered by a `custom-setup` stanza) and a test suite should build the
+-- test suite when `stack test` is commanded. The bug: the test suite is
+-- never built, and `stack test` fails with TestSuiteExeMissing.
+main :: IO ()
+main = do
+  stack ["test"]
diff --git a/tests/integration/tests/custom-setup-test/files/Setup.hs b/tests/integration/tests/custom-setup-test/files/Setup.hs
new file mode 100644
index 0000000000..b55cb16953
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test/files/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+main :: IO ()
+main = defaultMain
diff --git a/tests/integration/tests/custom-setup-test/files/custom-setup-test.cabal b/tests/integration/tests/custom-setup-test/files/custom-setup-test.cabal
new file mode 100644
index 0000000000..c16f02ec69
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test/files/custom-setup-test.cabal
@@ -0,0 +1,22 @@
+cabal-version: 3.4
+name:          custom-setup-test
+version:       0.1.0.0
+build-type:    Custom
+
+custom-setup
+  setup-depends: base >=4.14,
+                 Cabal >=3.4
+
+library
+  exposed-modules:  Lib
+  build-depends:    base >=4.14
+  hs-source-dirs:   src
+  default-language: Haskell2010
+
+test-suite custom-setup-test-suite
+  type:             exitcode-stdio-1.0
+  main-is:          Spec.hs
+  build-depends:    base >=4.14,
+                    custom-setup-test
+  hs-source-dirs:   test
+  default-language: Haskell2010
diff --git a/tests/integration/tests/custom-setup-test/files/src/Lib.hs b/tests/integration/tests/custom-setup-test/files/src/Lib.hs
new file mode 100644
index 0000000000..f1bf0e3e27
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib (answer) where
+
+answer :: Int
+answer = 42
diff --git a/tests/integration/tests/custom-setup-test/files/stack.yaml b/tests/integration/tests/custom-setup-test/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/custom-setup-test/files/test/Spec.hs b/tests/integration/tests/custom-setup-test/files/test/Spec.hs
new file mode 100644
index 0000000000..cc9ffbbe39
--- /dev/null
+++ b/tests/integration/tests/custom-setup-test/files/test/Spec.hs
@@ -0,0 +1,9 @@
+module Main (main) where
+
+import Lib (answer)
+import System.Exit (exitFailure, exitSuccess)
+
+main :: IO ()
+main
+  | answer == 42 = exitSuccess
+  | otherwise    = exitFailure
diff --git a/test/integration/tests/1336-1337-new-package-names/.gitignore b/tests/integration/tests/cyclic-test-deps/.gitignore
similarity index 100%
rename from test/integration/tests/1336-1337-new-package-names/.gitignore
rename to tests/integration/tests/cyclic-test-deps/.gitignore
diff --git a/tests/integration/tests/cyclic-test-deps/Main.hs b/tests/integration/tests/cyclic-test-deps/Main.hs
new file mode 100644
index 0000000000..afc53ad304
--- /dev/null
+++ b/tests/integration/tests/cyclic-test-deps/Main.hs
@@ -0,0 +1,10 @@
+import           StackTest
+
+main :: IO ()
+main = do
+    removeDirIgnore "text-2.1.2"
+    stack ["unpack", "text-2.1.2"]
+    stack ["unpack", "QuickCheck-2.15.0.1"]
+    removeFileIgnore "stack.yaml"
+    stack ["init", defaultSnapshotArg]
+    stack ["test", "--dry-run"]
diff --git a/tests/integration/tests/drop-packages/Main.hs b/tests/integration/tests/drop-packages/Main.hs
new file mode 100644
index 0000000000..69700c9823
--- /dev/null
+++ b/tests/integration/tests/drop-packages/Main.hs
@@ -0,0 +1,6 @@
+-- | Stack can drop packages from a snapshot.
+
+import           StackTest
+
+main :: IO ()
+main = stackErr ["build"]
diff --git a/tests/integration/tests/drop-packages/files/.gitignore b/tests/integration/tests/drop-packages/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/drop-packages/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/drop-packages/files/package.yaml b/tests/integration/tests/drop-packages/files/package.yaml
new file mode 100644
index 0000000000..e4d2cd7656
--- /dev/null
+++ b/tests/integration/tests/drop-packages/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- unliftio-core
+
+library: {}
diff --git a/tests/integration/tests/drop-packages/files/stack.yaml b/tests/integration/tests/drop-packages/files/stack.yaml
new file mode 100644
index 0000000000..b3de94c11e
--- /dev/null
+++ b/tests/integration/tests/drop-packages/files/stack.yaml
@@ -0,0 +1,4 @@
+snapshot: lts-24.55
+
+drop-packages:
+- unliftio-core
diff --git a/tests/integration/tests/duplicate-package-ids/Main.hs b/tests/integration/tests/duplicate-package-ids/Main.hs
new file mode 100644
index 0000000000..38ca390b7f
--- /dev/null
+++ b/tests/integration/tests/duplicate-package-ids/Main.hs
@@ -0,0 +1,10 @@
+-- | Stack distinguises between a package in the package index and a project
+-- package, even if they have the same name and version.
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["--stack-yaml", "stack1.yaml", "build", "acme-missiles"]
+  stack ["unpack", "acme-missiles-0.3"]
+  stack ["--stack-yaml", "stack2.yaml", "build"]
diff --git a/tests/integration/tests/duplicate-package-ids/files/.gitignore b/tests/integration/tests/duplicate-package-ids/files/.gitignore
new file mode 100644
index 0000000000..2707bad1cb
--- /dev/null
+++ b/tests/integration/tests/duplicate-package-ids/files/.gitignore
@@ -0,0 +1 @@
+acme-missiles-0.3/
diff --git a/tests/integration/tests/duplicate-package-ids/files/mySnapshot.yaml b/tests/integration/tests/duplicate-package-ids/files/mySnapshot.yaml
new file mode 100644
index 0000000000..09bb7df5ab
--- /dev/null
+++ b/tests/integration/tests/duplicate-package-ids/files/mySnapshot.yaml
@@ -0,0 +1,6 @@
+name: mySnapshot
+
+snapshot: ghc-9.10.3
+
+packages:
+- acme-missiles-0.3
diff --git a/tests/integration/tests/duplicate-package-ids/files/stack1.yaml b/tests/integration/tests/duplicate-package-ids/files/stack1.yaml
new file mode 100644
index 0000000000..1412b971c3
--- /dev/null
+++ b/tests/integration/tests/duplicate-package-ids/files/stack1.yaml
@@ -0,0 +1,3 @@
+snapshot: mySnapshot.yaml
+
+packages: []
diff --git a/tests/integration/tests/duplicate-package-ids/files/stack2.yaml b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml
new file mode 100644
index 0000000000..1b7948f75a
--- /dev/null
+++ b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml
@@ -0,0 +1,4 @@
+snapshot: mySnapshot.yaml
+
+packages:
+- acme-missiles-0.3
diff --git a/tests/integration/tests/ghc-install-hooks/Main.hs b/tests/integration/tests/ghc-install-hooks/Main.hs
new file mode 100644
index 0000000000..f4013f1eb3
--- /dev/null
+++ b/tests/integration/tests/ghc-install-hooks/Main.hs
@@ -0,0 +1,8 @@
+-- | Stack supports GHC installation customisation shell scripts.
+
+import           Control.Exception ( throwIO )
+import           StackTest
+import           System.Process ( rawSystem )
+
+main :: IO ()
+main = rawSystem "sh" ["run.sh"] >>= throwIO
diff --git a/test/integration/tests/ghc-install-hooks/files/.gitignore b/tests/integration/tests/ghc-install-hooks/files/.gitignore
similarity index 100%
rename from test/integration/tests/ghc-install-hooks/files/.gitignore
rename to tests/integration/tests/ghc-install-hooks/files/.gitignore
diff --git a/test/integration/tests/ghc-install-hooks/files/foo.hs b/tests/integration/tests/ghc-install-hooks/files/Test.hs
similarity index 100%
rename from test/integration/tests/ghc-install-hooks/files/foo.hs
rename to tests/integration/tests/ghc-install-hooks/files/Test.hs
diff --git a/tests/integration/tests/ghc-install-hooks/files/run.sh b/tests/integration/tests/ghc-install-hooks/files/run.sh
new file mode 100644
index 0000000000..beaf269b9e
--- /dev/null
+++ b/tests/integration/tests/ghc-install-hooks/files/run.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+set -exu
+
+stack_bin=$("$STACK_EXE" path --snapshot ghc-9.10.3 --compiler-bin)
+
+export STACK_ROOT=$(pwd)/fake-root
+
+mkdir -p "${STACK_ROOT}"/hooks
+
+echo "echo '${stack_bin}/ghc'" > "${STACK_ROOT}"/hooks/ghc-install.sh
+chmod +x "${STACK_ROOT}"/hooks/ghc-install.sh
+
+"$STACK_EXE" --no-install-ghc --snapshot ghc-9.10.3 ghc -- --info
+"$STACK_EXE" --no-install-ghc --snapshot ghc-9.10.3 runghc Test.hs
diff --git a/tests/integration/tests/git-submodules/Main.hs b/tests/integration/tests/git-submodules/Main.hs
new file mode 100644
index 0000000000..196abe7e72
--- /dev/null
+++ b/tests/integration/tests/git-submodules/Main.hs
@@ -0,0 +1,83 @@
+import           Control.Monad ( when )
+import           Data.List ( filter )
+import           StackTest
+import           System.Directory
+                   ( createDirectoryIfMissing, getCurrentDirectory
+                   , withCurrentDirectory
+                   )
+import           System.Exit ( exitFailure )
+import           System.FilePath ( (</>) )
+import           System.IO ( IOMode (..), hPutStrLn, withFile )
+
+main :: IO ()
+main = when isLinux $ do
+    runShell "git config --global protocol.file.allow always"
+
+    let
+      gitInit = do
+         runShell "git init ."
+         runShell "git config user.name Test"
+         runShell "git config user.email test@test.com"
+         runShell "git config commit.gpgsign false"
+
+    let withEmptyDir name inner = do
+          removeDirIgnore name
+          createDirectoryIfMissing True name
+          withCurrentDirectory name inner
+
+    withEmptyDir "tmpSubSubRepo" $ do
+      gitInit
+      stack ["new", "pkg ", defaultSnapshotArg]
+      runShell "git add pkg"
+      runShell "git commit -m SubSubCommit"
+
+    withEmptyDir "tmpSubRepo" $ do
+      gitInit
+      runShell "git submodule add ../tmpSubSubRepo sub"
+      runShell "git commit -a -m SubCommit"
+
+    withEmptyDir "tmpRepo" $ do
+      gitInit
+      runShell "git submodule add ../tmpSubRepo sub"
+      runShell "git commit -a -m Commit"
+
+    removeDirIgnore "tmpPackage"
+    stack ["new", defaultSnapshotArg, "tmpPackage"]
+
+    curDir <- getCurrentDirectory
+    let tmpRepoDir = curDir </> "tmpRepo"
+    gitHead <- runWithCwd tmpRepoDir "git" ["rev-parse", "HEAD"]
+    let gitHeadCommit = stripNewline gitHead
+
+    withCurrentDirectory "tmpPackage" $ do
+      -- add git dependency on repo with recursive submodules
+      writeToStackFile (tmpRepoDir, gitHeadCommit)
+      -- Setup the package
+      stack ["setup"]
+
+    -- cleanup
+    removeDirIgnore "tmpRepo"
+    removeDirIgnore "tmpSubRepo"
+    removeDirIgnore "tmpSubSubRepo"
+    removeDirIgnore "tmpPackage"
+
+writeToStackFile :: (String, String) -> IO ()
+writeToStackFile (tmpRepoDir, gitCommit) = do
+  curDir <- getCurrentDirectory
+  let stackFile = curDir </> "stack.yaml"
+  let line1 = "extra-deps:"
+      line2 = "- git: " ++ tmpRepoDir
+      line3 = "  commit: " ++ gitCommit
+      line4 = "  subdir: sub/sub/pkg"
+  withFile stackFile AppendMode (\handle -> do
+                                   hPutStrLn handle line1
+                                   hPutStrLn handle line2
+                                   hPutStrLn handle line3
+                                   hPutStrLn handle line4
+                                )
+
+newline :: Char
+newline = '\n'
+
+stripNewline :: String -> String
+stripNewline = filter (/= newline)
diff --git a/test/integration/tests/git-submodules/files/.gitignore b/tests/integration/tests/git-submodules/files/.gitignore
similarity index 100%
rename from test/integration/tests/git-submodules/files/.gitignore
rename to tests/integration/tests/git-submodules/files/.gitignore
diff --git a/tests/integration/tests/haddock-options/Main.hs b/tests/integration/tests/haddock-options/Main.hs
new file mode 100644
index 0000000000..5cf2f7f412
--- /dev/null
+++ b/tests/integration/tests/haddock-options/Main.hs
@@ -0,0 +1,22 @@
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  -- VARIABLE_B is defined here and VARIABLE_A in stack.yaml file
+  stackCheckStderr ["haddock", "--haddock-arguments", "--optghc=-DVARIABLE_B"] $ \s ->
+    unless (errorMsg `isInfixOf` s) $
+      error "VARIABLE_A and VARIABLE_B not both defined"
+  stack ["clean"]
+  -- Works just fine, test #3099 while at it.
+  stack ["haddock", "--no-haddock-hyperlink-source"]
+  stack ["clean"]
+  -- Fails to work because we have bad argument
+  stackErr ["haddock", "--haddock-arguments", "--stack_it_badhaddockargument"]
+
+-- The error message differs by operating system
+errorMsg :: String
+errorMsg = if isLinux
+  then "error: #error VARIABLE_A and VARIABLE_B is defined"
+  else "error: VARIABLE_A and VARIABLE_B is defined"
diff --git a/tests/integration/tests/haddock-options/files/.gitignore b/tests/integration/tests/haddock-options/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/haddock-options/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/haddock-options/files/package.yaml b/tests/integration/tests/haddock-options/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/haddock-options/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/haddock-options/files/src/Lib.hs b/tests/integration/tests/haddock-options/files/src/Lib.hs
new file mode 100644
index 0000000000..4683fbf37e
--- /dev/null
+++ b/tests/integration/tests/haddock-options/files/src/Lib.hs
@@ -0,0 +1,14 @@
+{-# LANGUAGE CPP #-}
+
+module Lib
+  ( someFunc
+  ) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"
+
+#if defined(VARIABLE_A) && defined(VARIABLE_B)
+
+#error VARIABLE_A and VARIABLE_B is defined
+
+#endif
diff --git a/tests/integration/tests/haddock-options/files/stack.yaml b/tests/integration/tests/haddock-options/files/stack.yaml
new file mode 100644
index 0000000000..69b8c2eeb2
--- /dev/null
+++ b/tests/integration/tests/haddock-options/files/stack.yaml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+build:
+  haddock-arguments:
+    haddock-args:
+    - --optghc=-DVARIABLE_A
diff --git a/tests/integration/tests/hpack-repo/Main.hs b/tests/integration/tests/hpack-repo/Main.hs
new file mode 100644
index 0000000000..58ef93df19
--- /dev/null
+++ b/tests/integration/tests/hpack-repo/Main.hs
@@ -0,0 +1,9 @@
+-- Stack supports immutable dependency packages that are described only by a
+-- package.yaml file. However, this work flow is deprecated.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/5210
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/hpack-repo/files/.gitignore b/tests/integration/tests/hpack-repo/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/hpack-repo/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/hpack-repo/files/package.yaml b/tests/integration/tests/hpack-repo/files/package.yaml
new file mode 100644
index 0000000000..498b32af5d
--- /dev/null
+++ b/tests/integration/tests/hpack-repo/files/package.yaml
@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- validity
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/hpack-repo/files/src/Lib.hs b/tests/integration/tests/hpack-repo/files/src/Lib.hs
new file mode 100644
index 0000000000..0512f4633e
--- /dev/null
+++ b/tests/integration/tests/hpack-repo/files/src/Lib.hs
@@ -0,0 +1,3 @@
+module Lib where
+
+import Data.Validity
diff --git a/tests/integration/tests/hpack-repo/files/stack.yaml b/tests/integration/tests/hpack-repo/files/stack.yaml
new file mode 100644
index 0000000000..2e3fa9a074
--- /dev/null
+++ b/tests/integration/tests/hpack-repo/files/stack.yaml
@@ -0,0 +1,8 @@
+snapshot: lts-24.55
+
+# At this commit, the validity package is described only by a package.yaml file
+extra-deps:
+- git: https://github.com/NorfairKing/validity.git
+  commit: d128cc30bc886e31ea7f8161fb7708c08b162937
+  subdirs:
+  - validity
diff --git a/tests/integration/tests/init-omit-packages/Main.hs b/tests/integration/tests/init-omit-packages/Main.hs
new file mode 100644
index 0000000000..6b5fa87b62
--- /dev/null
+++ b/tests/integration/tests/init-omit-packages/Main.hs
@@ -0,0 +1,14 @@
+-- | Stack's init command provides an --omit-packages flag to avoid the problem
+-- of bad project packages.
+
+import           Control.Monad ( unless )
+import           StackTest
+import           System.IO ( readFile )
+
+main :: IO ()
+main = do
+  stackErr ["init", "--snapshot", "lts-24.55"]
+  stack ["init", "--snapshot", "lts-24.55", "--omit-packages"]
+  contents <- lines <$> readFile "stack.yaml"
+  unless ("#- bad" `elem` contents) $
+    error "commented out 'bad' package was expected"
diff --git a/tests/integration/tests/init-omit-packages/files/.gitignore b/tests/integration/tests/init-omit-packages/files/.gitignore
new file mode 100644
index 0000000000..74744b2dd6
--- /dev/null
+++ b/tests/integration/tests/init-omit-packages/files/.gitignore
@@ -0,0 +1,3 @@
+stack.yaml
+good.cabal
+bad.cabal
diff --git a/test/integration/tests/init-omit-packages/files/bad/Bad.hs b/tests/integration/tests/init-omit-packages/files/bad/Bad.hs
similarity index 100%
rename from test/integration/tests/init-omit-packages/files/bad/Bad.hs
rename to tests/integration/tests/init-omit-packages/files/bad/Bad.hs
diff --git a/tests/integration/tests/init-omit-packages/files/bad/package.yaml b/tests/integration/tests/init-omit-packages/files/bad/package.yaml
new file mode 100644
index 0000000000..0875dcdae1
--- /dev/null
+++ b/tests/integration/tests/init-omit-packages/files/bad/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: bad
+
+dependencies:
+- base
+- non-existent-package == 666.0
+
+library: {}
diff --git a/test/integration/tests/init-omit-packages/files/good/Good.hs b/tests/integration/tests/init-omit-packages/files/good/Good.hs
similarity index 100%
rename from test/integration/tests/init-omit-packages/files/good/Good.hs
rename to tests/integration/tests/init-omit-packages/files/good/Good.hs
diff --git a/tests/integration/tests/init-omit-packages/files/good/package.yaml b/tests/integration/tests/init-omit-packages/files/good/package.yaml
new file mode 100644
index 0000000000..9b93276a13
--- /dev/null
+++ b/tests/integration/tests/init-omit-packages/files/good/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: good
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/internal-libraries/Main.hs b/tests/integration/tests/internal-libraries/Main.hs
new file mode 100644
index 0000000000..c8b3b9c6be
--- /dev/null
+++ b/tests/integration/tests/internal-libraries/Main.hs
@@ -0,0 +1,7 @@
+-- | Stack supports private named libraries (internal libraries) and foreign
+-- libraries.
+
+import           StackTest
+
+main :: IO ()
+main = stack ["build"]
diff --git a/tests/integration/tests/internal-libraries/files/.gitignore b/tests/integration/tests/internal-libraries/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/internal-libraries/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/internal-libraries/files/app/Main.hs b/tests/integration/tests/internal-libraries/files/app/Main.hs
new file mode 100644
index 0000000000..89ad4b3e08
--- /dev/null
+++ b/tests/integration/tests/internal-libraries/files/app/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/internal-libraries/files/int/Internal.hs b/tests/integration/tests/internal-libraries/files/int/Internal.hs
new file mode 100644
index 0000000000..d066bb085e
--- /dev/null
+++ b/tests/integration/tests/internal-libraries/files/int/Internal.hs
@@ -0,0 +1 @@
+module Internal where
diff --git a/tests/integration/tests/internal-libraries/files/package.yaml b/tests/integration/tests/internal-libraries/files/package.yaml
new file mode 100644
index 0000000000..f991171fd9
--- /dev/null
+++ b/tests/integration/tests/internal-libraries/files/package.yaml
@@ -0,0 +1,40 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+internal-libraries:
+  internal:
+    source-dirs: int
+    dependencies:
+    - myPackage
+    - stm
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - internal
+    - myPackage
+
+verbatim: |
+  foreign-library foreign
+    type: native-shared
+    other-modules:
+        Foreign
+    build-depends:
+        base
+      , myPackage
+      , internal
+      , mtl
+    hs-source-dirs:
+        src-foreign
+    default-language: Haskell2010
+    if os(Windows)
+      options: standalone
diff --git a/tests/integration/tests/internal-libraries/files/src-foreign/Foreign.hs b/tests/integration/tests/internal-libraries/files/src-foreign/Foreign.hs
new file mode 100644
index 0000000000..8c00a37599
--- /dev/null
+++ b/tests/integration/tests/internal-libraries/files/src-foreign/Foreign.hs
@@ -0,0 +1 @@
+module Foreign where
diff --git a/tests/integration/tests/internal-libraries/files/src/Lib.hs b/tests/integration/tests/internal-libraries/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/internal-libraries/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/internal-libraries/files/stack.yaml b/tests/integration/tests/internal-libraries/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/internal-libraries/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/lock-files/Main.hs b/tests/integration/tests/lock-files/Main.hs
new file mode 100644
index 0000000000..84131e34f0
--- /dev/null
+++ b/tests/integration/tests/lock-files/Main.hs
@@ -0,0 +1,16 @@
+-- | Stack creates lock files.
+
+import           Control.Monad ( unless, when )
+import           Data.List ( isInfixOf )
+import           StackTest
+
+main :: IO ()
+main = do
+  stack ["--stack-yaml", "stack1.yaml", "build"]
+  lock1 <- readFile "stack1.yaml.lock"
+  unless ("acme-box" `isInfixOf` lock1) $
+    error "Package acme-box wasn't found in Stack lock file"
+  stack ["--stack-yaml", "stack2.yaml", "build"]
+  lock2 <- readFile "stack2.yaml.lock"
+  when ("acme-box" `isInfixOf` lock2) $
+    error "Package acme-box shouldn't be in Stack lock file anymore"
diff --git a/tests/integration/tests/lock-files/files/.gitignore b/tests/integration/tests/lock-files/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/lock-files/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/lock-files/files/package.yaml b/tests/integration/tests/lock-files/files/package.yaml
new file mode 100644
index 0000000000..a7305a77cf
--- /dev/null
+++ b/tests/integration/tests/lock-files/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/lock-files/files/src/Lib.hs b/tests/integration/tests/lock-files/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/lock-files/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/lock-files/files/stack1.yaml b/tests/integration/tests/lock-files/files/stack1.yaml
new file mode 100644
index 0000000000..e317b1aefe
--- /dev/null
+++ b/tests/integration/tests/lock-files/files/stack1.yaml
@@ -0,0 +1,5 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+- acme-missiles-0.3
+- acme-box-0.0.0.0
diff --git a/tests/integration/tests/lock-files/files/stack2.yaml b/tests/integration/tests/lock-files/files/stack2.yaml
new file mode 100644
index 0000000000..37425098dd
--- /dev/null
+++ b/tests/integration/tests/lock-files/files/stack2.yaml
@@ -0,0 +1,4 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+- acme-missiles-0.3
diff --git a/tests/integration/tests/module-added-multiple-times/Main.hs b/tests/integration/tests/module-added-multiple-times/Main.hs
new file mode 100644
index 0000000000..095b1af3fb
--- /dev/null
+++ b/tests/integration/tests/module-added-multiple-times/Main.hs
@@ -0,0 +1,16 @@
+-- | Stack can load a package into GHC's repl.
+
+import           Control.Monad ( when )
+import           StackTest.Repl
+
+main :: IO ()
+main = stackRepl [] $ do
+  nextPrompt
+  replCommand ":main"
+  line <- replGetLine
+  let expected = "OK"
+  when (line /= expected) $
+    error $
+         "Main module didn't load correctly.\n"
+      <> "Expected: " <> expected <> "\n"
+      <> "Actual  : " <> line <> "\n"
diff --git a/tests/integration/tests/module-added-multiple-times/files/.gitignore b/tests/integration/tests/module-added-multiple-times/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/module-added-multiple-times/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/module-added-multiple-times/files/app/Main.hs b/tests/integration/tests/module-added-multiple-times/files/app/Main.hs
new file mode 100644
index 0000000000..d09b7c23cd
--- /dev/null
+++ b/tests/integration/tests/module-added-multiple-times/files/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib.Lib ( func )
+
+main :: IO ()
+main = putStrLn func
diff --git a/tests/integration/tests/module-added-multiple-times/files/package.yaml b/tests/integration/tests/module-added-multiple-times/files/package.yaml
new file mode 100644
index 0000000000..bea19d444e
--- /dev/null
+++ b/tests/integration/tests/module-added-multiple-times/files/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/tests/integration/tests/module-added-multiple-times/files/src/Lib/Lib.hs b/tests/integration/tests/module-added-multiple-times/files/src/Lib/Lib.hs
new file mode 100644
index 0000000000..3c09853b27
--- /dev/null
+++ b/tests/integration/tests/module-added-multiple-times/files/src/Lib/Lib.hs
@@ -0,0 +1,6 @@
+module Lib.Lib
+  ( func
+  ) where
+
+func :: String
+func = "OK"
diff --git a/tests/integration/tests/module-added-multiple-times/files/stack.yaml b/tests/integration/tests/module-added-multiple-times/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/module-added-multiple-times/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/mutable-deps/Main.hs b/tests/integration/tests/mutable-deps/Main.hs
new file mode 100644
index 0000000000..2106578801
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/Main.hs
@@ -0,0 +1,33 @@
+import         Control.Monad ( forM_, unless, when )
+import         Data.List ( isInfixOf, stripPrefix )
+import         StackTest
+
+-- The package 'files' depends directly on filemanip, which depends directly on
+-- packages directory, filepath and unix-compat. Package directory also depends
+-- directly on filepath. Package unix-compat depends directly on directory,
+-- filepath, time, unix and Win32.
+-- The stack.yaml file, however, identifies filepath-1.4.100.4 as a local
+-- package. Consequently, filepath is a mutable package and the packages
+-- that depend on it should also be treated as mutable packages.
+
+main :: IO ()
+main = unless isWindows $ do -- dependency issues on Windows
+  let isBuild package line =
+        case stripPrefix package line of
+          Just x -> "> build" `isInfixOf` line
+          Nothing -> False
+      expectRecompilation pkgs stderr = forM_ pkgs $ \p ->
+        unless (any (isBuild p) $ lines stderr) $
+        error $ "package " ++ show p ++ " recompilation was expected"
+      expectNoRecompilation pkgs stderr = forM_ pkgs $ \p ->
+        when (any (isBuild p) $ lines stderr) $
+        error $ "package " ++ show p ++ " recompilation was not expected"
+      mutablePackages = [ "filepath"
+                        , "directory"
+                        , "filemanip"
+                        , "myPackage"
+                        ]
+  stackCheckStderr ["build"] $ expectRecompilation mutablePackages
+  stackCheckStderr ["build" , "--profile"] $ expectRecompilation mutablePackages
+  stackCheckStderr ["build"] $ expectNoRecompilation mutablePackages
+  stackCheckStderr ["build" , "--profile"] $ expectNoRecompilation mutablePackages
diff --git a/tests/integration/tests/mutable-deps/files/.gitignore b/tests/integration/tests/mutable-deps/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/mutable-deps/files/app/Main.hs b/tests/integration/tests/mutable-deps/files/app/Main.hs
new file mode 100644
index 0000000000..ecf5062557
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/app/Main.hs
@@ -0,0 +1,7 @@
+module Main where
+
+import Lib
+
+main = do
+  cFiles <- allCFiles
+  putStrLn $ "C files:" ++ show cFiles
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/Generate.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/Generate.hs
new file mode 100644
index 0000000000..6b132101ab
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/Generate.hs
@@ -0,0 +1,205 @@
+{-# LANGUAGE CPP, RecordWildCards, ViewPatterns #-}
+
+module Generate(main) where
+
+import Control.Exception
+import Control.Monad
+import Data.Semigroup
+import Data.Char
+import Data.List
+import System.Directory
+import System.IO
+
+
+main :: IO ()
+main = do
+    src <- readFile "System/FilePath/Internal.hs"
+    let tests = map renderTest $ concatMap parseTest $ lines src
+    writeFileBinaryChanged "tests/filepath-tests/TestGen.hs" $ unlines $
+        ["-- GENERATED CODE: See ../Generate.hs"
+#ifndef GHC_MAKE
+        , "{-# LANGUAGE OverloadedStrings #-}"
+        , "{-# LANGUAGE ViewPatterns #-}"
+#endif
+        , "{-# LANGUAGE CPP #-}"
+        , "{-# OPTIONS_GHC -Wno-name-shadowing #-}"
+        , "{-# OPTIONS_GHC -Wno-orphans #-}"
+        ,"module TestGen(tests) where"
+        ,"import TestUtil"
+        ,"#if !MIN_VERSION_base(4,11,0)"
+        ,"import Data.Semigroup"
+        ,"#endif"
+        ,"import Prelude as P"
+        ,"import Data.String"
+        ,"import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )"
+        ,"import GHC.IO.Encoding.UTF16 ( mkUTF16le )"
+        ,"import GHC.IO.Encoding.UTF8 ( mkUTF8 )"
+        ,"import System.OsString.Internal.Types"
+        ,"import System.OsString.Encoding.Internal"
+        ,"import qualified Data.Char as C"
+        ,"import qualified System.OsString.Data.ByteString.Short as SBS"
+        ,"import qualified System.OsString.Data.ByteString.Short.Word16 as SBS16"
+        ,"import qualified System.FilePath.Windows as W"
+        ,"import qualified System.FilePath.Posix as P"
+#ifdef GHC_MAKE
+        ,"import qualified System.OsPath.Windows.Internal as AFP_W"
+        ,"import qualified System.OsPath.Posix.Internal as AFP_P"
+#else
+        ,"import qualified System.OsPath.Windows as AFP_W"
+        ,"import qualified System.OsPath.Posix as AFP_P"
+#endif
+        ,"instance IsString WindowsString where fromString = WS . either (error . show) id . encodeWithTE (mkUTF16le TransliterateCodingFailure)"
+        ,"instance IsString PosixString where fromString = PS . either (error . show) id . encodeWithTE (mkUTF8 TransliterateCodingFailure)"
+        ,"#if defined(mingw32_HOST_OS) || defined(__MINGW32__)"
+        ,"instance IsString OsString where fromString = OsString . WS . either (error . show) id . encodeWithTE (mkUTF16le TransliterateCodingFailure)"
+        ,"#else"
+        ,"instance IsString OsString where fromString = OsString . PS . either (error . show) id . encodeWithTE (mkUTF8 TransliterateCodingFailure)"
+        ,"#endif"
+        ,"tests :: [(String, Property)]"
+        ,"tests ="] ++
+        ["    " ++ c ++ "(" ++ show t1 ++ ", " ++ t2 ++ ")" | (c,(t1,t2)) <- zip ("[":repeat ",") tests] ++
+        ["    ]"]
+
+
+
+data PW = P      -- legacy posix
+        | W      -- legacy windows
+        | AFP_P  -- abstract-filepath posix
+        | AFP_W  -- abstract-filepath windows
+  deriving Show
+
+data Test = Test
+    {testPlatform :: PW
+    ,testVars :: [(String,String)]   -- generator constructor, variable
+    ,testBody :: [String]
+    }
+
+
+parseTest :: String -> [Test]
+parseTest (stripPrefix "-- > " -> Just x) = platform $ toLexemes x
+    where
+        platform ("Windows":":":x) = [valid W x, valid AFP_W x]
+        platform ("Posix"  :":":x) = [valid P x, valid AFP_P x]
+        platform x                 = [valid P x, valid W x, valid AFP_P x, valid AFP_W x]
+
+        valid p ("Valid":x) = free p a $ drop 1 b
+            where (a,b) = break (== "=>") x
+        valid p x = free p [] x
+
+        free p val x = Test p [(ctor v, v) | v <- vars] x
+            where vars = nub $ sort [v | v@[c] <- x, isAlpha c]
+                  ctor v | v < "x"  = ""
+                         | v `elem` val = "QFilePathValid" ++ show p
+                         | otherwise = case p of
+                                         AFP_P -> if v == "z" then "QFilePathsAFP_P" else "QFilePathAFP_P"
+                                         AFP_W -> if v == "z" then "QFilePathsAFP_W" else "QFilePathAFP_W"
+                                         _ -> if v == "z" then "" else "QFilePath"
+parseTest _ = []
+
+
+toLexemes :: String -> [String]
+toLexemes x = case lex x of
+    [("","")] -> []
+    [(x,y)] -> x : toLexemes y
+    y -> error $ "Generate.toLexemes, " ++ show x ++ " -> " ++ show y
+
+
+fromLexemes :: [String] -> String
+fromLexemes = unwords . f
+    where
+        f ("`":x:"`":xs) = ("`" ++ x ++ "`") : f xs
+        f (x:y:xs) | x `elem` ["[","("] || y `elem` [",",")","]"] = f $ (x ++ y) : xs
+        f (x:xs) = x : f xs
+        f [] = []
+
+
+renderTest :: Test -> (String, String)
+renderTest Test{..} = (body, code)
+    where
+        code = "property $ " ++ if null testVars then body else "\\" ++ unwords vars ++ " -> " ++ body
+        vars = [if null ctor then v else "(" ++ ctor ++ " " ++ v ++ ")" | (ctor,v) <- testVars]
+
+        body = fromLexemes $ map (qualify testPlatform) testBody
+
+
+
+qualify :: PW -> String -> String
+qualify pw str
+    | str `elem` fpops || (all isAlpha str && length str > 1 && str `notElem` prelude)
+      = if str `elem` bs then qualifyBS str  else show pw ++ "." ++ str
+    | otherwise = encode str
+    where
+        bs = ["null", "concat", "isPrefixOf", "isSuffixOf", "any"]
+        prelude = ["elem","uncurry","snd","fst","not","if","then","else"
+                  ,"True","False","Just","Nothing","fromJust","foldr"]
+        fpops = ["</>","<.>","-<.>"]
+#ifdef GHC_MAKE
+        encode v
+          | isString' v = case pw of
+                            AFP_P -> "(encodeUtf8 " <> v <> ")"
+                            AFP_W -> "(encodeUtf16LE " <> v <> ")"
+                            _ -> v
+          | isChar' v = case pw of
+                            AFP_P -> "(fromIntegral . C.ord $ " <> v <> ")"
+                            AFP_W -> "(fromIntegral . C.ord $ " <> v <> ")"
+                            _ -> v
+          | otherwise = v
+        isString' xs@('"':_:_) = last xs == '"'
+        isString' _ = False
+        isChar' xs@('\'':_:_) = last xs == '\''
+        isChar' _ = False
+        qualifyBS v = case pw of
+                        AFP_P -> "SBS." <> v
+                        AFP_W -> "SBS16." <> v
+                        _ -> v
+#else
+        encode v
+          | isString' v = case pw of
+                            AFP_P -> "(" <> v <> ")"
+                            AFP_W -> "(" <> v <> ")"
+                            _ -> v
+          | isChar' v = case pw of
+                            AFP_P -> "(PW . fromIntegral . C.ord $ " <> v <> ")"
+                            AFP_W -> "(WW . fromIntegral . C.ord $ " <> v <> ")"
+                            _ -> v
+          | otherwise = v
+        isString' xs@('"':_:_) = last xs == '"'
+        isString' _ = False
+        isChar' xs@('\'':_:_) = last xs == '\''
+        isChar' _ = False
+        qualifyBS v = case pw of
+                        AFP_P
+                          | v == "concat" -> "(PS . SBS." <> v <> " . fmap getPosixString)"
+                          | v == "any" -> "(\\f (getPosixString -> x) -> SBS." <> v <> " (f . PW) x)"
+                          | v == "isPrefixOf" -> "(\\(getPosixString -> x) (getPosixString -> y) -> SBS." <> v <> " x y)"
+                          | v == "isSuffixOf" -> "(\\(getPosixString -> x) (getPosixString -> y) -> SBS." <> v <> " x y)"
+                          | otherwise -> "(SBS." <> v <> " . getPosixString)"
+                        AFP_W
+                          | v == "concat" -> "(WS . SBS16." <> v <> " . fmap getWindowsString)"
+                          | v == "any" -> "(\\f (getWindowsString -> x) -> SBS16." <> v <> " (f . WW) x)"
+                          | v == "isPrefixOf" -> "(\\(getWindowsString -> x) (getWindowsString -> y) -> SBS16." <> v <> " x y)"
+                          | v == "isSuffixOf" -> "(\\(getWindowsString -> x) (getWindowsString -> y) -> SBS16." <> v <> " x y)"
+                          | otherwise -> "(SBS16." <> v <> " . getWindowsString)"
+                        _ -> v
+#endif
+
+
+
+---------------------------------------------------------------------
+-- UTILITIES
+
+writeFileBinary :: FilePath -> String -> IO ()
+writeFileBinary file x = withBinaryFile file WriteMode $ \h -> hPutStr h x
+
+readFileBinary' :: FilePath -> IO String
+readFileBinary' file = withBinaryFile file ReadMode $ \h -> do
+    s <- hGetContents h
+    evaluate $ length s
+    pure s
+
+writeFileBinaryChanged :: FilePath -> String -> IO ()
+writeFileBinaryChanged file x = do
+    b <- doesFileExist file
+    old <- if b then fmap Just $ readFileBinary' file else pure Nothing
+    when (Just x /= old) $
+        writeFileBinary file x
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/HACKING.md b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/HACKING.md
similarity index 78%
rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/HACKING.md
rename to tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/HACKING.md
index 80887a05dc..45a6837c13 100644
--- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/HACKING.md
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/HACKING.md
@@ -1,7 +1,7 @@
 # Hacking
 
 Most of the code is in `System/FilePath/Internal.hs` which is `cpphs`'d into both `System/FilePath/Posix.hs`
-and `System/FilePath/Windows.hs` via `make cpp` and committed to the repo. This Internal module is a bit weird
+and `System/FilePath/Windows.hs` via `make cpp` and commited to the repo. This Internal module is a bit weird
 in that it isn't really a Haskell module, but is more an include file.
 
 The library has extensive doc tests. Anything starting with `-- >` is transformed into a doc test as a predicate
@@ -13,9 +13,7 @@ that must evaluate to `True`. These tests follow a few rules:
 * If `Valid x =>` appears at the start of a doc test, that means the property
   will only be tested with `x` passing the `isValid` predicate.
 
-The tests can be generated by `make gen` in the root of the repo, and will be placed in `tests/TestGen.hs`.
+The tests can be generated by `make gen` in the root of the repo, and will be placed in `tests/filepath-tests/TestGen.hs`.
 The `TestGen.hs` file is checked into the repo, and the CI scripts check that `TestGen.hs` is in sync with
 what would be generated a fresh - if you don't regenerate `TestGen.hs` the CI will fail.
 
-The `.ghci` file is set up to allow you to type `ghci` to open the library, then `:go` will regenerate the
-tests and run them.
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/LICENSE b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/LICENSE
similarity index 100%
rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/LICENSE
rename to tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/LICENSE
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/Makefile b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/Makefile
new file mode 100644
index 0000000000..a18a9155d1
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/Makefile
@@ -0,0 +1,7 @@
+all: gen
+
+gen:
+	runhaskell Generate.hs
+
+
+.PHONY: all gen
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/README.md b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/README.md
new file mode 100644
index 0000000000..5ec5e51f5c
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/README.md
@@ -0,0 +1,47 @@
+# FilePath [![Hackage version](https://img.shields.io/hackage/v/filepath.svg?label=Hackage)](https://hackage.haskell.org/package/filepath)
+
+The `filepath` package provides functionality for manipulating `FilePath` values, and is shipped with [GHC](https://www.haskell.org/ghc/).
+It provides two variants for filepaths:
+
+1. legacy filepaths: `type FilePath = String`
+2. operating system abstracted filepaths (`OsPath`): internally unpinned `ShortByteString` (platform-dependent encoding)
+
+It is recommended to use `OsPath` when possible, because it is more correct.
+
+For each variant there are three main modules:
+
+* `System.FilePath.Posix` / `System.OsPath.Posix` manipulates POSIX\/Linux style `FilePath` values (with `/` as the path separator).
+* `System.FilePath.Windows` / `System.OsPath.Windows` manipulates Windows style `FilePath` values (with either `\` or `/` as the path separator, and deals with drives).
+* `System.FilePath` / `System.OsPath` for dealing with current platform-specific filepaths
+
+All three modules provide the same API, and the same documentation (calling out differences in the different variants).
+
+`System.OsString` is like `System.OsPath`, but more general purpose. Refer to the documentation of
+those modules for more information.
+
+### What is a `FilePath`?
+
+In Haskell, the legacy definition (used in `base` and Prelude) is `type FilePath = String`,
+where a Haskell `String` is a list of Unicode code points.
+
+The new definition is (simplified) `newtype OsPath = AFP ShortByteString`, where
+`ShortByteString` is an unpinned byte array and follows syscall conventions, preserving the encoding.
+
+On unix, filenames don't have a predefined encoding as per the
+[POSIX specification](https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_170)
+and are passed as `char[]` to syscalls.
+
+On windows (at least the API used by `Win32`) filepaths are UTF-16LE strings.
+
+You are encouraged to use `OsPath` whenever possible, because it is more correct.
+
+Also note that this is a low-level library and it makes no attempt at providing a more
+type safe variant for filepaths (e.g. by distinguishing between absolute and relative
+paths) and ensures no invariants (such as filepath validity).
+
+For such libraries, check out the following:
+
+* [hpath](https://hackage.haskell.org/package/hpath)
+* [path](https://hackage.haskell.org/package/path)
+* [paths](https://hackage.haskell.org/package/paths)
+* [strong-path](https://hackage.haskell.org/package/strong-path)
diff --git a/test/integration/tests/1337-unicode-everywhere/files/Setup.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/Setup.hs
similarity index 100%
rename from test/integration/tests/1337-unicode-everywhere/files/Setup.hs
rename to tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/Setup.hs
diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath.hs
similarity index 100%
rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath.hs
rename to tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath.hs
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Internal.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Internal.hs
new file mode 100644
index 0000000000..0c92b3e0af
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Internal.hs
@@ -0,0 +1,1350 @@
+{-# LANGUAGE PatternGuards #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE MultiWayIf #-}
+
+-- This template expects CPP definitions for:
+--     MODULE_NAME = Posix | Windows
+--     IS_WINDOWS  = False | True
+
+-- |
+-- Module      :  System.FilePath.MODULE_NAME
+-- Copyright   :  (c) Neil Mitchell 2005-2014
+-- License     :  BSD3
+--
+-- Maintainer  :  ndmitchell@gmail.com
+-- Stability   :  stable
+-- Portability :  portable
+--
+-- A library for 'FilePath' manipulations, using MODULE_NAME style paths on
+-- all platforms. Importing "System.FilePath" is usually better.
+--
+-- Given the example 'FilePath': @\/directory\/file.ext@
+--
+-- We can use the following functions to extract pieces.
+--
+-- * 'takeFileName' gives @\"file.ext\"@
+--
+-- * 'takeDirectory' gives @\"\/directory\"@
+--
+-- * 'takeExtension' gives @\".ext\"@
+--
+-- * 'dropExtension' gives @\"\/directory\/file\"@
+--
+-- * 'takeBaseName' gives @\"file\"@
+--
+-- And we could have built an equivalent path with the following expressions:
+--
+-- * @\"\/directory\" '</>' \"file.ext\"@.
+--
+-- * @\"\/directory\/file" '<.>' \"ext\"@.
+--
+-- * @\"\/directory\/file.txt" '-<.>' \"ext\"@.
+--
+-- Each function in this module is documented with several examples,
+-- which are also used as tests.
+--
+-- Here are a few examples of using the @filepath@ functions together:
+--
+-- /Example 1:/ Find the possible locations of a Haskell module @Test@ imported from module @Main@:
+--
+-- @['replaceFileName' path_to_main \"Test\" '<.>' ext | ext <- [\"hs\",\"lhs\"] ]@
+--
+-- /Example 2:/ Download a file from @url@ and save it to disk:
+--
+-- @do let file = 'makeValid' url
+--   System.Directory.createDirectoryIfMissing True ('takeDirectory' file)@
+--
+-- /Example 3:/ Compile a Haskell file, putting the @.hi@ file under @interface@:
+--
+-- @'takeDirectory' file '</>' \"interface\" '</>' ('takeFileName' file '-<.>' \"hi\")@
+--
+-- References:
+-- [1] <http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx Naming Files, Paths and Namespaces> (Microsoft MSDN)
+#ifndef OS_PATH
+module System.FilePath.MODULE_NAME
+#else
+module System.OsPath.MODULE_NAME.Internal
+#endif
+    (
+    -- * Separator predicates
+#ifndef OS_PATH
+    FilePath,
+#endif
+    pathSeparator, pathSeparators, isPathSeparator,
+    searchPathSeparator, isSearchPathSeparator,
+    extSeparator, isExtSeparator,
+
+    -- * @$PATH@ methods
+    splitSearchPath,
+#ifndef OS_PATH
+    getSearchPath,
+#endif
+
+    -- * Extension functions
+    splitExtension,
+    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
+    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
+    stripExtension,
+
+    -- * Filename\/directory functions
+    splitFileName,
+    takeFileName, replaceFileName, dropFileName,
+    takeBaseName, replaceBaseName,
+    takeDirectory, replaceDirectory,
+    combine, (</>),
+    splitPath, joinPath, splitDirectories,
+
+    -- * Drive functions
+    splitDrive, joinDrive,
+    takeDrive, hasDrive, dropDrive, isDrive,
+
+    -- * Trailing slash functions
+    hasTrailingPathSeparator,
+    addTrailingPathSeparator,
+    dropTrailingPathSeparator,
+
+    -- * File name manipulations
+    normalise, equalFilePath,
+    makeRelative,
+    isRelative, isAbsolute,
+    isValid, makeValid
+    )
+    where
+
+{- HLINT ignore "Use fewer imports" -}
+import Prelude (Char, Bool(..), Maybe(..), (.), (&&), (<=), not, fst, maybe, (||), (==), ($), otherwise, fmap, mempty, (>=), (/=), (++), snd)
+import Data.Bifunctor (first)
+import Data.Semigroup ((<>))
+import qualified Prelude as P
+import Data.Maybe(fromMaybe, isJust)
+import qualified Data.List as L
+
+#ifndef OS_PATH
+import Data.String (fromString)
+import System.Environment(getEnv)
+import Prelude (String, map, FilePath, Eq, IO, id, last, init, reverse, dropWhile, null, break, take, all, elem, any, span)
+import Data.Char(toLower, toUpper, isAsciiLower, isAsciiUpper)
+import Data.List(stripPrefix, isSuffixOf, uncons, dropWhileEnd)
+#define CHAR Char
+#define STRING String
+#define FILEPATH FilePath
+#else
+import Prelude (fromIntegral, return, IO, Either(..))
+import Control.Exception ( catch, displayException, evaluate, fromException, toException, throwIO, Exception, SomeAsyncException(..), SomeException )
+import Control.DeepSeq (force)
+import GHC.IO (unsafePerformIO)
+import qualified Data.Char as C
+#ifdef WINDOWS
+import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
+import GHC.IO.Encoding.UTF16 ( mkUTF16le )
+import qualified GHC.Foreign as GHC
+import Data.Word ( Word16 )
+import System.OsString.Data.ByteString.Short.Word16
+import System.OsString.Data.ByteString.Short ( packCStringLen )
+#define CHAR Word16
+#define STRING ShortByteString
+#define FILEPATH ShortByteString
+#else
+import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
+import qualified GHC.Foreign as GHC
+import GHC.IO.Encoding.UTF8 ( mkUTF8 )
+import Data.Word ( Word8 )
+import System.OsString.Data.ByteString.Short
+#define CHAR Word8
+#define STRING ShortByteString
+#define FILEPATH ShortByteString
+#endif
+#endif 
+
+
+infixr 7  <.>, -<.>
+infixr 5  </>
+
+
+
+
+
+---------------------------------------------------------------------
+-- Platform Abstraction Methods (private)
+
+-- | Is the operating system Unix or Linux like
+isPosix :: Bool
+isPosix = not isWindows
+
+-- | Is the operating system Windows like
+isWindows :: Bool
+isWindows = IS_WINDOWS
+
+
+---------------------------------------------------------------------
+-- The basic functions
+
+-- | The character that separates directories. In the case where more than
+--   one character is possible, 'pathSeparator' is the \'ideal\' one.
+--
+-- > Windows: pathSeparator == '\\'
+-- > Posix:   pathSeparator ==  '/'
+-- > isPathSeparator pathSeparator
+pathSeparator :: CHAR
+pathSeparator = if isWindows then _backslash else _slash
+
+-- | The list of all possible separators.
+--
+-- > Windows: pathSeparators == ['\\', '/']
+-- > Posix:   pathSeparators == ['/']
+-- > pathSeparator `elem` pathSeparators
+pathSeparators :: [CHAR]
+pathSeparators = if isWindows then [_backslash, _slash] else [_slash]
+
+-- | Rather than using @(== 'pathSeparator')@, use this. Test if something
+--   is a path separator.
+--
+-- > isPathSeparator a == (a `elem` pathSeparators)
+isPathSeparator :: CHAR -> Bool
+isPathSeparator c
+  | c == _slash = True
+  | c == _backslash = isWindows
+  | otherwise = False
+
+
+-- | The character that is used to separate the entries in the $PATH environment variable.
+--
+-- > Windows: searchPathSeparator == ';'
+-- > Posix:   searchPathSeparator == ':'
+searchPathSeparator :: CHAR
+searchPathSeparator = if isWindows then _semicolon else _colon
+
+-- | Is the character a file separator?
+--
+-- > isSearchPathSeparator a == (a == searchPathSeparator)
+isSearchPathSeparator :: CHAR -> Bool
+isSearchPathSeparator = (== searchPathSeparator)
+
+
+-- | File extension character
+--
+-- > extSeparator == '.'
+extSeparator :: CHAR
+extSeparator = _period
+
+-- | Is the character an extension character?
+--
+-- > isExtSeparator a == (a == extSeparator)
+isExtSeparator :: CHAR -> Bool
+isExtSeparator = (== extSeparator)
+
+
+---------------------------------------------------------------------
+-- Path methods (environment $PATH)
+
+-- | Take a string, split it on the 'searchPathSeparator' character.
+--   Blank items are ignored on Windows, and converted to @.@ on Posix.
+--   On Windows path elements are stripped of quotes.
+--
+--   Follows the recommendations in
+--   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>
+--
+-- > Posix:   splitSearchPath "File1:File2:File3"  == ["File1","File2","File3"]
+-- > Posix:   splitSearchPath "File1::File2:File3" == ["File1",".","File2","File3"]
+-- > Windows: splitSearchPath "File1;File2;File3"  == ["File1","File2","File3"]
+-- > Windows: splitSearchPath "File1;;File2;File3" == ["File1","File2","File3"]
+-- > Windows: splitSearchPath "File1;\"File2\";File3" == ["File1","File2","File3"]
+splitSearchPath :: STRING -> [FILEPATH]
+splitSearchPath = f
+    where
+    f xs = let (pre, post) = break isSearchPathSeparator xs
+           in case uncons post of
+             Nothing     -> g pre
+             Just (_, t) -> g pre ++ f t
+
+    g x = case uncons x of
+      Nothing -> [singleton _period | isPosix]
+      Just (h, t)
+        | h == _quotedbl
+        , (Just _) <- uncons t -- >= 2
+        , isWindows
+        , (Just (i, l)) <- unsnoc t
+        , l == _quotedbl -> [i]
+        | otherwise -> [x]
+
+
+-- TODO for AFPP
+#ifndef OS_PATH
+-- | Get a list of 'FILEPATH's in the $PATH variable.
+getSearchPath :: IO [FILEPATH]
+getSearchPath = fmap splitSearchPath (getEnv "PATH")
+#endif
+
+
+---------------------------------------------------------------------
+-- Extension methods
+
+-- | Split on the extension. 'addExtension' is the inverse.
+--
+-- > splitExtension "/directory/path.ext" == ("/directory/path",".ext")
+-- > uncurry (<>) (splitExtension x) == x
+-- > Valid x => uncurry addExtension (splitExtension x) == x
+-- > splitExtension "file.txt" == ("file",".txt")
+-- > splitExtension "file" == ("file","")
+-- > splitExtension "file/file.txt" == ("file/file",".txt")
+-- > splitExtension "file.txt/boris" == ("file.txt/boris","")
+-- > splitExtension "file.txt/boris.ext" == ("file.txt/boris",".ext")
+-- > splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob",".fred")
+-- > splitExtension "file/path.txt/" == ("file/path.txt/","")
+
+-- A naive implementation would be to use @splitFileName_@ first,
+-- then break filename into basename and extension, then recombine dir and basename.
+-- This is way too expensive, see @splitFileName_@ comment for discussion.
+--
+-- Instead we speculatively split on the extension separator first, then check
+-- whether results are well-formed.
+splitExtension :: FILEPATH -> (STRING, STRING)
+splitExtension x
+  -- Imagine x = "no-dots", then nameDot = ""
+  | null nameDot = (x, mempty)
+  -- Imagine x = "\\shared.with.dots\no-dots"
+  | isWindows && null (dropDrive nameDot) = (x, mempty)
+  -- Imagine x = "dir.with.dots/no-dots"
+  | any isPathSeparator ext = (x, mempty)
+  | otherwise = (init nameDot, extSeparator `cons` ext)
+  where
+    (nameDot, ext) = breakEnd isExtSeparator x
+
+-- | Get the extension of a file, returns @\"\"@ for no extension, @.ext@ otherwise.
+--
+-- > takeExtension "/directory/path.ext" == ".ext"
+-- > takeExtension x == snd (splitExtension x)
+-- > Valid x => takeExtension (addExtension x "ext") == ".ext"
+-- > Valid x => takeExtension (replaceExtension x "ext") == ".ext"
+takeExtension :: FILEPATH -> STRING
+takeExtension = snd . splitExtension
+
+-- | Remove the current extension and add another, equivalent to 'replaceExtension'.
+--
+-- > "/directory/path.txt" -<.> "ext" == "/directory/path.ext"
+-- > "/directory/path.txt" -<.> ".ext" == "/directory/path.ext"
+-- > "foo.o" -<.> "c" == "foo.c"
+(-<.>) :: FILEPATH -> STRING -> FILEPATH
+(-<.>) = replaceExtension
+
+-- | Set the extension of a file, overwriting one if already present, equivalent to '-<.>'.
+--
+-- > replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext"
+-- > replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext"
+-- > replaceExtension "file.txt" ".bob" == "file.bob"
+-- > replaceExtension "file.txt" "bob" == "file.bob"
+-- > replaceExtension "file" ".bob" == "file.bob"
+-- > replaceExtension "file.txt" "" == "file"
+-- > replaceExtension "file.fred.bob" "txt" == "file.fred.txt"
+-- > replaceExtension x y == addExtension (dropExtension x) y
+replaceExtension :: FILEPATH -> STRING -> FILEPATH
+replaceExtension x y = dropExtension x <.> y
+
+-- | Add an extension, even if there is already one there, equivalent to 'addExtension'.
+--
+-- > "/directory/path" <.> "ext" == "/directory/path.ext"
+-- > "/directory/path" <.> ".ext" == "/directory/path.ext"
+(<.>) :: FILEPATH -> STRING -> FILEPATH
+(<.>) = addExtension
+
+-- | Remove last extension, and the \".\" preceding it.
+--
+-- > dropExtension "/directory/path.ext" == "/directory/path"
+-- > dropExtension x == fst (splitExtension x)
+dropExtension :: FILEPATH -> FILEPATH
+dropExtension = fst . splitExtension
+
+-- | Add an extension, even if there is already one there, equivalent to '<.>'.
+--
+-- > addExtension "/directory/path" "ext" == "/directory/path.ext"
+-- > addExtension "file.txt" "bib" == "file.txt.bib"
+-- > addExtension "file." ".bib" == "file..bib"
+-- > addExtension "file" ".bib" == "file.bib"
+-- > addExtension "/" "x" == "/.x"
+-- > addExtension x "" == x
+-- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
+-- > Windows: addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
+addExtension :: FILEPATH -> STRING -> FILEPATH
+addExtension file xs = case uncons xs of
+  Nothing -> file
+  Just (x, _) -> joinDrive a res
+    where
+        res = if isExtSeparator x then b <> xs
+              else b <> (extSeparator `cons` xs)
+
+        (a,b) = splitDrive file
+
+-- | Does the given filename have an extension?
+--
+-- > hasExtension "/directory/path.ext" == True
+-- > hasExtension "/directory/path" == False
+-- > null (takeExtension x) == not (hasExtension x)
+hasExtension :: FILEPATH -> Bool
+hasExtension = any isExtSeparator . takeFileName
+
+
+-- | Does the given filename have the specified extension?
+--
+-- > "png" `isExtensionOf` "/directory/file.png" == True
+-- > ".png" `isExtensionOf` "/directory/file.png" == True
+-- > ".tar.gz" `isExtensionOf` "bar/foo.tar.gz" == True
+-- > "ar.gz" `isExtensionOf` "bar/foo.tar.gz" == False
+-- > "png" `isExtensionOf` "/directory/file.png.jpg" == False
+-- > "csv/table.csv" `isExtensionOf` "/data/csv/table.csv" == False
+isExtensionOf :: STRING -> FILEPATH -> Bool
+isExtensionOf ext = \fp -> case uncons ext of
+  Just (x, _)
+    | x == _period -> isSuffixOf ext . takeExtensions $ fp
+  _ -> isSuffixOf (_period `cons` ext) . takeExtensions $ fp
+
+-- | Drop the given extension from a FILEPATH, and the @\".\"@ preceding it.
+--   Returns 'Nothing' if the FILEPATH does not have the given extension, or
+--   'Just' and the part before the extension if it does.
+--
+--   This function can be more predictable than 'dropExtensions', especially if the filename
+--   might itself contain @.@ characters.
+--
+-- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
+-- > stripExtension "hi.o" "foo.x.hs.o" == Nothing
+-- > dropExtension x == fromJust (stripExtension (takeExtension x) x)
+-- > dropExtensions x == fromJust (stripExtension (takeExtensions x) x)
+-- > stripExtension ".c.d" "a.b.c.d"  == Just "a.b"
+-- > stripExtension ".c.d" "a.b..c.d" == Just "a.b."
+-- > stripExtension "baz"  "foo.bar"  == Nothing
+-- > stripExtension "bar"  "foobar"   == Nothing
+-- > stripExtension ""     x          == Just x
+stripExtension :: STRING -> FILEPATH -> Maybe FILEPATH
+stripExtension ext path = case uncons ext of
+  Just (x, _) -> let dotExt = if isExtSeparator x then ext else _period `cons` ext
+                 in stripSuffix dotExt path
+  Nothing -> Just path
+
+
+-- | Split on all extensions.
+--
+-- > splitExtensions "/directory/path.ext" == ("/directory/path",".ext")
+-- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
+-- > uncurry (<>) (splitExtensions x) == x
+-- > Valid x => uncurry addExtension (splitExtensions x) == x
+splitExtensions :: FILEPATH -> (FILEPATH, STRING)
+splitExtensions x = (a <> c, d)
+    where
+        (a,b) = splitFileName_ x
+        (c,d) = break isExtSeparator b
+
+-- | Drop all extensions.
+--
+-- > dropExtensions "/directory/path.ext" == "/directory/path"
+-- > dropExtensions "file.tar.gz" == "file"
+-- > not $ hasExtension $ dropExtensions x
+-- > not $ any isExtSeparator $ takeFileName $ dropExtensions x
+dropExtensions :: FILEPATH -> FILEPATH
+dropExtensions = fst . splitExtensions
+
+-- | Get all extensions.
+--
+-- > takeExtensions "/directory/path.ext" == ".ext"
+-- > takeExtensions "file.tar.gz" == ".tar.gz"
+takeExtensions :: FILEPATH -> STRING
+takeExtensions = snd . splitExtensions
+
+
+-- | Replace all extensions of a file with a new extension. Note
+--   that 'replaceExtension' and 'addExtension' both work for adding
+--   multiple extensions, so only required when you need to drop
+--   all extensions first.
+--
+-- > replaceExtensions "file.fred.bob" "txt" == "file.txt"
+-- > replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz"
+replaceExtensions :: FILEPATH -> STRING -> FILEPATH
+replaceExtensions x y = dropExtensions x <.> y
+
+
+
+---------------------------------------------------------------------
+-- Drive methods
+
+-- | Is the given character a valid drive letter?
+-- only a-z and A-Z are letters, not isAlpha which is more unicodey
+isLetter :: CHAR -> Bool
+isLetter x = isAsciiLower x || isAsciiUpper x
+
+
+-- | Split a path into a drive and a path.
+--   On Posix, \/ is a Drive.
+--
+-- > uncurry (<>) (splitDrive x) == x
+-- > Windows: splitDrive "file" == ("","file")
+-- > Windows: splitDrive "c:/file" == ("c:/","file")
+-- > Windows: splitDrive "c:\\file" == ("c:\\","file")
+-- > Windows: splitDrive "\\\\shared\\test" == ("\\\\shared\\","test")
+-- > Windows: splitDrive "\\\\shared" == ("\\\\shared","")
+-- > Windows: splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\","file")
+-- > Windows: splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\","UNCshared\\file")
+-- > Windows: splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\","file")
+-- > Windows: splitDrive "/d" == ("","/d")
+-- > Posix:   splitDrive "/test" == ("/","test")
+-- > Posix:   splitDrive "//test" == ("//","test")
+-- > Posix:   splitDrive "test/file" == ("","test/file")
+-- > Posix:   splitDrive "file" == ("","file")
+splitDrive :: FILEPATH -> (FILEPATH, FILEPATH)
+splitDrive x | isPosix = span (== _slash) x
+splitDrive x | Just y <- readDriveLetter x = y
+splitDrive x | Just y <- readDriveUNC x = y
+splitDrive x | Just y <- readDriveShare x = y
+splitDrive x = (mempty, x)
+
+addSlash :: FILEPATH -> FILEPATH -> (FILEPATH, FILEPATH)
+addSlash a xs = (a <> c, d)
+    where (c, d) = span isPathSeparator xs
+
+-- See [1].
+-- "\\?\D:\<path>" or "\\?\UNC\<server>\<share>"
+readDriveUNC :: FILEPATH -> Maybe (FILEPATH, FILEPATH)
+readDriveUNC bs = case unpack bs of
+  (s1:s2:q:s3:xs)
+    | q == _question && L.all isPathSeparator [s1,s2,s3] ->
+      case L.map toUpper xs of
+          (u:n:c:s4:_)
+            | u == _U && n == _N && c == _C && isPathSeparator s4 ->
+              let (a,b) = readDriveShareName (pack (L.drop 4 xs))
+              in Just (pack (s1:s2:_question:s3:L.take 4 xs) <> a, b)
+          _ -> case readDriveLetter (pack xs) of
+                   -- Extended-length path.
+                   Just (a,b) -> Just (pack [s1,s2,_question,s3] <> a, b)
+                   Nothing -> Nothing
+  _ -> Nothing
+
+{- c:\ -}
+readDriveLetter :: STRING -> Maybe (FILEPATH, FILEPATH)
+readDriveLetter bs = case uncons2 bs of
+  Nothing -> Nothing
+  Just (x, c, ys)
+    | isLetter x, c == _colon -> Just $ case uncons ys of
+      Just (y, _)
+        | isPathSeparator y -> addSlash (pack [x,_colon]) ys
+      _ -> (pack [x,_colon], ys)
+    | otherwise -> Nothing
+
+{- \\sharename\ -}
+readDriveShare :: STRING -> Maybe (FILEPATH, FILEPATH)
+readDriveShare bs = case unpack bs of
+  (s1:s2:xs) | isPathSeparator s1 && isPathSeparator s2 -> 
+    let (a, b) = readDriveShareName (pack xs)
+    in Just (s1 `cons` (s2 `cons` a), b)
+  _ -> Nothing
+
+{- assume you have already seen \\ -}
+{- share\bob -> "share\", "bob" -}
+readDriveShareName :: STRING -> (FILEPATH, FILEPATH)
+readDriveShareName name = addSlash a b
+    where (a,b) = break isPathSeparator name
+
+
+
+-- | Join a drive and the rest of the path.
+--
+-- > Valid x => uncurry joinDrive (splitDrive x) == x
+-- > Windows: joinDrive "C:" "foo" == "C:foo"
+-- > Windows: joinDrive "C:\\" "bar" == "C:\\bar"
+-- > Windows: joinDrive "\\\\share" "foo" == "\\\\share\\foo"
+-- > Windows: joinDrive "/:" "foo" == "/:\\foo"
+joinDrive :: FILEPATH -> FILEPATH -> FILEPATH
+joinDrive = combineAlways
+
+-- | Get the drive from a filepath.
+--
+-- > takeDrive x == fst (splitDrive x)
+takeDrive :: FILEPATH -> FILEPATH
+takeDrive = fst . splitDrive
+
+-- | Delete the drive, if it exists.
+--
+-- > dropDrive x == snd (splitDrive x)
+dropDrive :: FILEPATH -> FILEPATH
+dropDrive = snd . splitDrive
+
+-- | Does a path have a drive.
+--
+-- > not (hasDrive x) == null (takeDrive x)
+-- > Posix:   hasDrive "/foo" == True
+-- > Windows: hasDrive "C:\\foo" == True
+-- > Windows: hasDrive "C:foo" == True
+-- >          hasDrive "foo" == False
+-- >          hasDrive "" == False
+hasDrive :: FILEPATH -> Bool
+hasDrive = not . null . takeDrive
+
+
+-- | Is an element a drive
+--
+-- > Posix:   isDrive "/" == True
+-- > Posix:   isDrive "/foo" == False
+-- > Windows: isDrive "C:\\" == True
+-- > Windows: isDrive "C:\\foo" == False
+-- >          isDrive "" == False
+isDrive :: FILEPATH -> Bool
+isDrive x = not (null x) && null (dropDrive x)
+
+
+---------------------------------------------------------------------
+-- Operations on a filepath, as a list of directories
+
+-- | Split a filename into directory and file. '</>' is the inverse.
+--   The first component will often end with a trailing slash.
+--
+-- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
+-- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
+-- > Valid x => isValid (fst (splitFileName x))
+-- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
+-- > splitFileName "file/" == ("file/", "")
+-- > splitFileName "bob" == ("./", "bob")
+-- > Posix:   splitFileName "/" == ("/","")
+-- > Windows: splitFileName "c:" == ("c:","")
+-- > Windows: splitFileName "\\\\?\\A:\\fred" == ("\\\\?\\A:\\","fred")
+-- > Windows: splitFileName "\\\\?\\A:" == ("\\\\?\\A:","")
+splitFileName :: FILEPATH -> (STRING, STRING)
+splitFileName x = if null path
+    then (dotSlash, file)
+    else (path, file)
+  where
+    (path, file) = splitFileName_ x
+    dotSlash = _period `cons` singleton _slash
+
+-- version of splitFileName where, if the FILEPATH has no directory
+-- component, the returned directory is "" rather than "./".  This
+-- is used in cases where we are going to combine the returned
+-- directory to make a valid FILEPATH, and having a "./" appear would
+-- look strange and upset simple equality properties.  See
+-- e.g. replaceFileName.
+--
+-- A naive implementation is
+--
+-- splitFileName_ fp = (drv <> dir, file)
+--   where
+--     (drv, pth) = splitDrive fp
+--     (dir, file) = breakEnd isPathSeparator pth
+--
+-- but it is undesirable for two reasons:
+-- * splitDrive is very slow on Windows,
+-- * we unconditionally allocate 5 FilePath objects where only 2 would normally suffice.
+--
+-- In the implementation below we first speculatively split the input by the last path
+-- separator. In the vast majority of cases this is already the answer, except
+-- two exceptional cases explained below.
+--
+splitFileName_ :: FILEPATH -> (STRING, STRING)
+splitFileName_ fp
+  -- If dirSlash is empty, @fp@ is either a genuine filename without any dir,
+  -- or just a Windows drive name without slash like "c:".
+  -- Run readDriveLetter to figure out.
+  | isWindows
+  , null dirSlash
+  = fromMaybe (mempty, fp) (readDriveLetter fp)
+  -- Another Windows quirk is that @fp@ could have been a shared drive "\\share"
+  -- or UNC location "\\?\UNC\foo", where path separator is a part of the drive name.
+  -- We can test this by trying dropDrive and falling back to splitDrive.
+  | isWindows
+  = case uncons2 dirSlash of
+    Just (s1, s2, bs')
+      | isPathSeparator s1
+      -- If bs' is empty, then s2 as the last character of dirSlash must be a path separator,
+      -- so we are in the middle of shared drive.
+      -- Otherwise, since s1 is a path separator, we might be in the middle of UNC path.
+      , null bs' || maybe False isIncompleteUNC (readDriveUNC dirSlash)
+      -> (fp, mempty)
+      -- This handles inputs like "//?/A:" and "//?/A:foo"
+      | isPathSeparator s1
+      , isPathSeparator s2
+      , Just (s3, s4, bs'') <- uncons2 bs'
+      , s3 == _question
+      , isPathSeparator s4
+      , null bs''
+      , Just (drive, rest) <- readDriveLetter file
+      -> (dirSlash <> drive, rest)
+    _ -> (dirSlash, file)
+  | otherwise
+    = (dirSlash, file)
+  where
+    (dirSlash, file) = breakEnd isPathSeparator fp
+    dropExcessTrailingPathSeparators x
+      | hasTrailingPathSeparator x
+      , let x' = dropWhileEnd isPathSeparator x
+      , otherwise = if | null x' -> singleton (last x)
+                       | otherwise -> addTrailingPathSeparator x'
+      | otherwise = x
+
+    -- an "incomplete" UNC is one without a path (but potentially a drive)
+    isIncompleteUNC (pref, suff) = null suff && not (hasPenultimateColon pref)
+
+    -- e.g. @//?/a:/@ or @//?/a://@, but not @//?/a:@
+    hasPenultimateColon pref
+      | hasTrailingPathSeparator pref
+      = maybe False (maybe False ((== _colon) . snd) . unsnoc . fst) . unsnoc . dropExcessTrailingPathSeparators $ pref
+      | otherwise = False
+
+-- | Set the filename.
+--
+-- > replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext"
+-- > Valid x => replaceFileName x (takeFileName x) == x
+replaceFileName :: FILEPATH -> STRING -> FILEPATH
+replaceFileName x y = a </> y where (a,_) = splitFileName_ x
+
+-- | Drop the filename. Unlike 'takeDirectory', this function will leave
+--   a trailing path separator on the directory.
+--
+-- > dropFileName "/directory/file.ext" == "/directory/"
+-- > dropFileName x == fst (splitFileName x)
+-- > isPrefixOf (takeDrive x) (dropFileName x)
+dropFileName :: FILEPATH -> FILEPATH
+dropFileName = fst . splitFileName
+
+
+-- | Get the file name.
+--
+-- > takeFileName "/directory/file.ext" == "file.ext"
+-- > takeFileName "test/" == ""
+-- > isSuffixOf (takeFileName x) x
+-- > takeFileName x == snd (splitFileName x)
+-- > Valid x => takeFileName (replaceFileName x "fred") == "fred"
+-- > Valid x => takeFileName (x </> "fred") == "fred"
+-- > Valid x => isRelative (takeFileName x)
+takeFileName :: FILEPATH -> FILEPATH
+takeFileName = snd . splitFileName
+
+-- | Get the base name, without an extension or path.
+--
+-- > takeBaseName "/directory/file.ext" == "file"
+-- > takeBaseName "file/test.txt" == "test"
+-- > takeBaseName "dave.ext" == "dave"
+-- > takeBaseName "" == ""
+-- > takeBaseName "test" == "test"
+-- > takeBaseName (addTrailingPathSeparator x) == ""
+-- > takeBaseName "file/file.tar.gz" == "file.tar"
+takeBaseName :: FILEPATH -> STRING
+takeBaseName = dropExtension . takeFileName
+
+-- | Set the base name.
+--
+-- > replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext"
+-- > replaceBaseName "file/test.txt" "bob" == "file/bob.txt"
+-- > replaceBaseName "fred" "bill" == "bill"
+-- > replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar"
+-- > Valid x => replaceBaseName x (takeBaseName x) == x
+replaceBaseName :: FILEPATH -> STRING -> FILEPATH
+replaceBaseName pth nam = combineAlways a (nam <.> ext)
+    where
+        (a,b) = splitFileName_ pth
+        ext = takeExtension b
+
+-- | Is an item either a directory or the last character a path separator?
+--
+-- > hasTrailingPathSeparator "test" == False
+-- > hasTrailingPathSeparator "test/" == True
+hasTrailingPathSeparator :: FILEPATH -> Bool
+hasTrailingPathSeparator x
+  | null x = False
+  | otherwise = isPathSeparator $ last x
+
+
+hasLeadingPathSeparator :: FILEPATH -> Bool
+hasLeadingPathSeparator = maybe False (isPathSeparator . fst) . uncons
+
+
+-- | Add a trailing file path separator if one is not already present.
+--
+-- > hasTrailingPathSeparator (addTrailingPathSeparator x)
+-- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
+-- > Posix:    addTrailingPathSeparator "test/rest" == "test/rest/"
+addTrailingPathSeparator :: FILEPATH -> FILEPATH
+addTrailingPathSeparator x = if hasTrailingPathSeparator x then x else x <> singleton pathSeparator
+
+
+-- | Remove any trailing path separators
+--
+-- > dropTrailingPathSeparator "file/test/" == "file/test"
+-- >           dropTrailingPathSeparator "/" == "/"
+-- > Windows:  dropTrailingPathSeparator "\\" == "\\"
+-- > Posix:    not (hasTrailingPathSeparator (dropTrailingPathSeparator x)) || isDrive x
+dropTrailingPathSeparator :: FILEPATH -> FILEPATH
+dropTrailingPathSeparator x =
+    if hasTrailingPathSeparator x && not (isDrive x)
+    then let x' = dropWhileEnd isPathSeparator x
+         in if null x' then singleton (last x) else x'
+    else x
+
+
+-- | Get the directory name, move up one level.
+--
+-- >           takeDirectory "/directory/other.ext" == "/directory"
+-- >           isPrefixOf (takeDirectory x) x || takeDirectory x == "."
+-- >           takeDirectory "foo" == "."
+-- >           takeDirectory "/" == "/"
+-- >           takeDirectory "/foo" == "/"
+-- >           takeDirectory "/foo/bar/baz" == "/foo/bar"
+-- >           takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
+-- >           takeDirectory "foo/bar/baz" == "foo/bar"
+-- > Windows:  takeDirectory "foo\\bar" == "foo"
+-- > Windows:  takeDirectory "foo\\bar\\\\" == "foo\\bar"
+-- > Windows:  takeDirectory "C:\\" == "C:\\"
+takeDirectory :: FILEPATH -> FILEPATH
+takeDirectory = dropTrailingPathSeparator . dropFileName
+
+-- | Set the directory, keeping the filename the same.
+--
+-- > replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext"
+-- > Valid x => replaceDirectory x (takeDirectory x) `equalFilePath` x
+replaceDirectory :: FILEPATH -> STRING -> FILEPATH
+replaceDirectory x dir = combineAlways dir (takeFileName x)
+
+
+-- | An alias for '</>'.
+combine :: FILEPATH -> FILEPATH -> FILEPATH
+combine a b | hasLeadingPathSeparator b || hasDrive b = b
+            | otherwise = combineAlways a b
+
+-- | Combine two paths, assuming rhs is NOT absolute.
+combineAlways :: FILEPATH -> FILEPATH -> FILEPATH
+combineAlways a b | null a = b
+                  | null b = a
+                  | hasTrailingPathSeparator a = a <> b
+                  | otherwise = case unpack a of
+                      [a1, a2] | isWindows
+                               , isLetter a1
+                               , a2 == _colon -> a <> b
+                      _ -> a <> (pathSeparator `cons` b)
+
+
+-- | Combine two paths with a path separator.
+--   If the second path starts with a path separator or a drive letter, then it returns the second.
+--   The intention is that @readFile (dir '</>' file)@ will access the same file as
+--   @setCurrentDirectory dir; readFile file@.
+--
+-- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
+-- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
+-- >          "directory" </> "/file.ext" == "/file.ext"
+-- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
+--
+--   Combined:
+--
+-- > Posix:   "/" </> "test" == "/test"
+-- > Posix:   "home" </> "bob" == "home/bob"
+-- > Posix:   "x:" </> "foo" == "x:/foo"
+-- > Windows: "C:\\foo" </> "bar" == "C:\\foo\\bar"
+-- > Windows: "home" </> "bob" == "home\\bob"
+--
+--   Not combined:
+--
+-- > Posix:   "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "C:\\bob" == "C:\\bob"
+--
+--   Not combined (tricky):
+--
+--   On Windows, if a filepath starts with a single slash, it is relative to the
+--   root of the current drive. In [1], this is (confusingly) referred to as an
+--   absolute path.
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > Windows: "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "\\bob" == "\\bob"
+-- > Windows: "C:\\home" </> "\\bob" == "\\bob"
+--
+--   On Windows, from [1]: "If a file name begins with only a disk designator
+--   but not the backslash after the colon, it is interpreted as a relative path
+--   to the current directory on the drive with the specified letter."
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
+-- > Windows: "C:\\foo" </> "C:bar" == "C:bar"
+(</>) :: FILEPATH -> FILEPATH -> FILEPATH
+(</>) = combine
+
+
+-- | Split a path by the directory separator.
+--
+-- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
+-- > concat (splitPath x) == x
+-- > splitPath "test//item/" == ["test//","item/"]
+-- > splitPath "test/item/file" == ["test/","item/","file"]
+-- > splitPath "" == []
+-- > Windows: splitPath "c:\\test\\path" == ["c:\\","test\\","path"]
+-- > Posix:   splitPath "/file/test" == ["/","file/","test"]
+splitPath :: FILEPATH -> [FILEPATH]
+splitPath x = [drive | not (null drive)] ++ f path
+    where
+        (drive, path) = splitDrive x
+
+        f y
+          | null y = []
+          | otherwise = (a <> c) : f d
+            where
+                (a,b) = break isPathSeparator y
+                (c,d) = span  isPathSeparator b
+
+-- | Just as 'splitPath', but don't add the trailing slashes to each element.
+--
+-- >          splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
+-- >          splitDirectories "test/file" == ["test","file"]
+-- >          splitDirectories "/test/file" == ["/","test","file"]
+-- > Windows: splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"]
+-- >          Valid x => joinPath (splitDirectories x) `equalFilePath` x
+-- >          splitDirectories "" == []
+-- > Windows: splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"]
+-- >          splitDirectories "/test///file" == ["/","test","file"]
+splitDirectories :: FILEPATH -> [FILEPATH]
+splitDirectories = L.map dropTrailingPathSeparator . splitPath
+
+
+-- | Join path elements back together.
+--
+-- > joinPath z == foldr (</>) "" z
+-- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
+-- > Valid x => joinPath (splitPath x) == x
+-- > joinPath [] == ""
+-- > Posix: joinPath ["test","file","path"] == "test/file/path"
+joinPath :: [FILEPATH] -> FILEPATH
+-- Note that this definition on c:\\c:\\, join then split will give c:\\.
+joinPath = P.foldr combine mempty
+
+
+
+
+
+
+---------------------------------------------------------------------
+-- File name manipulators
+
+-- | Equality of two 'FILEPATH's.
+--   If you call @System.Directory.canonicalizePath@
+--   first this has a much better chance of working.
+--   Note that this doesn't follow symlinks or DOSNAM~1s.
+--
+-- Similar to 'normalise', this does not expand @".."@, because of symlinks.
+--
+-- >          x == y ==> equalFilePath x y
+-- >          normalise x == normalise y ==> equalFilePath x y
+-- >          equalFilePath "foo" "foo/"
+-- >          not (equalFilePath "/a/../c" "/c")
+-- >          not (equalFilePath "foo" "/foo")
+-- > Posix:   not (equalFilePath "foo" "FOO")
+-- > Windows: equalFilePath "foo" "FOO"
+-- > Windows: not (equalFilePath "C:" "C:/")
+equalFilePath :: FILEPATH -> FILEPATH -> Bool
+equalFilePath a b = f a == f b
+    where
+        f x | isWindows = dropTrailingPathSeparator $ map toLower $ normalise x
+            | otherwise = dropTrailingPathSeparator $ normalise x
+
+
+-- | Contract a filename, based on a relative path. Note that the resulting path
+--   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
+--   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
+--   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
+--
+--   The corresponding @makeAbsolute@ function can be found in
+--   @System.Directory@.
+--
+-- >          makeRelative "/directory" "/directory/file.ext" == "file.ext"
+-- >          Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
+-- >          makeRelative x x == "."
+-- >          Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
+-- > Windows: makeRelative "C:\\Home" "c:\\home\\bob" == "bob"
+-- > Windows: makeRelative "C:\\Home" "c:/home/bob" == "bob"
+-- > Windows: makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob"
+-- > Windows: makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob"
+-- > Windows: makeRelative "/Home" "/home/bob" == "bob"
+-- > Windows: makeRelative "/" "//" == "//"
+-- > Posix:   makeRelative "/Home" "/home/bob" == "/home/bob"
+-- > Posix:   makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar"
+-- > Posix:   makeRelative "/fred" "bob" == "bob"
+-- > Posix:   makeRelative "/file/test" "/file/test/fred" == "fred"
+-- > Posix:   makeRelative "/file/test" "/file/test/fred/" == "fred/"
+-- > Posix:   makeRelative "some/path" "some/path/a/b/c" == "a/b/c"
+makeRelative :: FILEPATH -> FILEPATH -> FILEPATH
+makeRelative root path
+  | equalFilePath root path = singleton _period
+  | takeAbs root /= takeAbs path = path
+  | otherwise = f (dropAbs root) (dropAbs path)
+  where
+    f x y
+      | null x = dropWhile isPathSeparator y
+      | otherwise = let (x1,x2) = g x
+                        (y1,y2) = g y
+                    in if equalFilePath x1 y1 then f x2 y2 else path
+    g x = (dropWhile isPathSeparator a, dropWhile isPathSeparator b)
+      where (a, b) = break isPathSeparator $ dropWhile isPathSeparator x
+
+    -- on windows, need to drop '/' which is kind of absolute, but not a drive
+    dropAbs x
+      | Just (hd, tl) <- uncons x
+      , isPathSeparator hd
+      , not (hasDrive x)
+      = tl
+      | otherwise
+      = dropDrive x
+
+    takeAbs x
+      | Just (hd, _) <- uncons x
+      , isPathSeparator hd
+      , not (hasDrive x)
+      = singleton pathSeparator
+      | otherwise
+      = map (\y -> if isPathSeparator y then pathSeparator else toLower y) $ takeDrive x
+
+-- | Normalise a file
+--
+-- * \/\/ outside of the drive can be made blank
+--
+-- * \/ -> 'pathSeparator'
+--
+-- * .\/ -> \"\"
+--
+-- Does not remove @".."@, because of symlinks.
+--
+-- > Posix:   normalise "/file/\\test////" == "/file/\\test/"
+-- > Posix:   normalise "/file/./test" == "/file/test"
+-- > Posix:   normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/"
+-- > Posix:   normalise "../bob/fred/" == "../bob/fred/"
+-- > Posix:   normalise "/a/../c" == "/a/../c"
+-- > Posix:   normalise "./bob/fred/" == "bob/fred/"
+-- > Windows: normalise "c:\\file/bob\\" == "C:\\file\\bob\\"
+-- > Windows: normalise "c:\\" == "C:\\"
+-- > Windows: normalise "c:\\\\\\\\" == "C:\\"
+-- > Windows: normalise "C:.\\" == "C:"
+-- > Windows: normalise "\\\\server\\test" == "\\\\server\\test"
+-- > Windows: normalise "//server/test" == "\\\\server\\test"
+-- > Windows: normalise "c:/file" == "C:\\file"
+-- > Windows: normalise "/file" == "\\file"
+-- > Windows: normalise "\\" == "\\"
+-- > Windows: normalise "/./" == "\\"
+-- >          normalise "." == "."
+-- > Posix:   normalise "./" == "./"
+-- > Posix:   normalise "./." == "./"
+-- > Posix:   normalise "/./" == "/"
+-- > Posix:   normalise "/" == "/"
+-- > Posix:   normalise "bob/fred/." == "bob/fred/"
+-- > Posix:   normalise "//home" == "/home"
+normalise :: FILEPATH -> FILEPATH
+normalise filepath =
+  result <>
+  (if addPathSeparator
+       then singleton pathSeparator
+       else mempty)
+  where
+    (drv,pth) = splitDrive filepath
+
+    result = joinDrive' (normaliseDrive drv) (f pth)
+
+    joinDrive' d p
+      = if null d && null p
+           then singleton _period
+           else joinDrive d p
+
+    addPathSeparator = isDirPath pth
+      && not (hasTrailingPathSeparator result)
+      && not (isRelativeDrive drv)
+
+    isDirPath xs = hasTrailingPathSeparator xs
+        || not (null xs) && last xs == _period
+           && hasTrailingPathSeparator (init xs)
+
+    f = joinPath . dropDots . propSep . splitDirectories
+
+    propSep (x:xs)
+      | all isPathSeparator x = singleton pathSeparator : xs
+      | otherwise                   = x : xs
+    propSep [] = []
+
+    dropDots = L.filter (singleton _period /=)
+
+normaliseDrive :: FILEPATH -> FILEPATH
+normaliseDrive bs
+  | null bs = mempty
+  | isPosix = pack [pathSeparator]
+  | Just (drv, _) <- readDriveLetter x2
+                  = case unpack drv of
+                      (x:_:[]) -> pack [toUpper x, _colon]
+                      (x:_) -> pack [toUpper x, _colon, pathSeparator]
+                      _ -> P.error "impossible"
+  | otherwise = x2
+    where
+        x2 = map repSlash bs
+        repSlash x = if isPathSeparator x then pathSeparator else x
+
+-- Information for validity functions on Windows. See [1].
+isBadCHARacter :: CHAR -> Bool
+isBadCHARacter x = x >= _nul && x <= _US
+  || x `L.elem`
+      [ _less
+      , _greater
+      , _colon
+      , _quotedbl
+      , _bar
+      , _question
+      , _asterisk
+      ]
+
+badElements :: [FILEPATH]
+badElements = fmap fromString
+    ["CON","PRN","AUX","NUL","CLOCK$"
+    ,"COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9"
+    ,"LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"]
+
+
+-- | Is a FILEPATH valid, i.e. could you create a file like it? This function checks for invalid names,
+--   and invalid characters, but does not check if length limits are exceeded, as these are typically
+--   filesystem dependent.
+--
+-- >          isValid "" == False
+-- >          isValid "\0" == False
+-- > Posix:   isValid "/random_ path:*" == True
+-- > Posix:   isValid x == not (null x)
+-- > Windows: isValid "c:\\test" == True
+-- > Windows: isValid "c:\\test:of_test" == False
+-- > Windows: isValid "test*" == False
+-- > Windows: isValid "c:\\test\\nul" == False
+-- > Windows: isValid "c:\\test\\prn.txt" == False
+-- > Windows: isValid "c:\\nul\\file" == False
+-- > Windows: isValid "\\\\" == False
+-- > Windows: isValid "\\\\\\foo" == False
+-- > Windows: isValid "\\\\?\\D:file" == False
+-- > Windows: isValid "foo\tbar" == False
+-- > Windows: isValid "nul .txt" == False
+-- > Windows: isValid " nul.txt" == True
+isValid :: FILEPATH -> Bool
+isValid path
+  | null path = False
+  | _nul `elem` path = False
+  | isPosix = True
+  | otherwise =
+      not (any isBadCHARacter x2) &&
+      not (L.any f $ splitDirectories x2) &&
+      not (isJust (readDriveShare x1) && all isPathSeparator x1) &&
+      not (isJust (readDriveUNC x1) && not (hasTrailingPathSeparator x1))
+    where
+      (x1,x2) = splitDrive path
+      f x = map toUpper (dropWhileEnd (== _space) $ dropExtensions x) `L.elem` badElements
+
+
+-- | Take a FILEPATH and make it valid; does not change already valid FILEPATHs.
+--
+-- > isValid (makeValid x)
+-- > isValid x ==> makeValid x == x
+-- > makeValid "" == "_"
+-- > makeValid "file\0name" == "file_name"
+-- > Windows: makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
+-- > Windows: makeValid "c:\\test:of_test" == "c:\\test_of_test"
+-- > Windows: makeValid "test*" == "test_"
+-- > Windows: makeValid "c:\\test\\nul" == "c:\\test\\nul_"
+-- > Windows: makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt"
+-- > Windows: makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt"
+-- > Windows: makeValid "c:\\nul\\file" == "c:\\nul_\\file"
+-- > Windows: makeValid "\\\\\\foo" == "\\\\drive"
+-- > Windows: makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
+-- > Windows: makeValid "nul .txt" == "nul _.txt"
+makeValid :: FILEPATH -> FILEPATH
+makeValid path
+  | null path = singleton _underscore
+  | isPosix = map (\x -> if x == _nul then _underscore else x) path
+  | isJust (readDriveShare drv) && all isPathSeparator drv = take 2 drv <> fromString "drive"
+  | isJust (readDriveUNC drv) && not (hasTrailingPathSeparator drv) =
+      makeValid (drv <> (pathSeparator `cons` pth))
+  | otherwise = joinDrive drv $ validElements $ validCHARs pth
+
+  where
+    (drv,pth) = splitDrive path
+
+    validCHARs = map f
+    f x = if isBadCHARacter x then _underscore else x
+
+    validElements = joinPath . fmap g . splitPath
+    g x = h a <> b
+        where (a,b) = break isPathSeparator x
+    h x = if map toUpper (dropWhileEnd (== _space) a) `L.elem` badElements then snoc a _underscore  <.> b else x
+        where (a,b) = splitExtensions x
+
+
+-- | Is a path relative, or is it fixed to the root?
+--
+-- > Windows: isRelative "path\\test" == True
+-- > Windows: isRelative "c:\\test" == False
+-- > Windows: isRelative "c:test" == True
+-- > Windows: isRelative "c:\\" == False
+-- > Windows: isRelative "c:/" == False
+-- > Windows: isRelative "c:" == True
+-- > Windows: isRelative "\\\\foo" == False
+-- > Windows: isRelative "\\\\?\\foo" == False
+-- > Windows: isRelative "\\\\?\\UNC\\foo" == False
+-- > Windows: isRelative "/foo" == True
+-- > Windows: isRelative "\\foo" == True
+-- > Posix:   isRelative "test/path" == True
+-- > Posix:   isRelative "/test" == False
+-- > Posix:   isRelative "/" == False
+--
+-- According to [1]:
+--
+-- * "A UNC name of any format [is never relative]."
+--
+-- * "You cannot use the "\\?\" prefix with a relative path."
+isRelative :: FILEPATH -> Bool
+isRelative x = null drive || isRelativeDrive drive
+    where drive = takeDrive x
+
+
+{- c:foo -}
+-- From [1]: "If a file name begins with only a disk designator but not the
+-- backslash after the colon, it is interpreted as a relative path to the
+-- current directory on the drive with the specified letter."
+isRelativeDrive :: STRING -> Bool
+isRelativeDrive x =
+    maybe False (not . hasTrailingPathSeparator . fst) (readDriveLetter x)
+
+
+-- | @not . 'isRelative'@
+--
+-- > isAbsolute x == not (isRelative x)
+isAbsolute :: FILEPATH -> Bool
+isAbsolute = not . isRelative
+
+#ifndef OS_PATH
+
+-----------------------------------------------------------------------------
+-- spanEnd (>2) [1,2,3,4,1,2,3,4] = ([1,2,3,4,1,2], [3,4])
+spanEnd :: (a -> Bool) -> [a] -> ([a], [a])
+spanEnd p = L.foldr (\x (pref, suff) -> if null pref && p x then (pref, x : suff) else (x : pref, suff)) ([], [])
+
+-- breakEnd (< 2) [1,2,3,4,1,2,3,4] == ([1,2,3,4,1],[2,3,4])
+breakEnd :: (a -> Bool) -> [a] -> ([a], [a])
+breakEnd p = spanEnd (not . p)
+
+-- | The stripSuffix function drops the given suffix from a list. It returns
+-- Nothing if the list did not end with the suffix given, or Just the list
+-- before the suffix, if it does.
+stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
+stripSuffix xs ys = reverse P.<$> stripPrefix (reverse xs) (reverse ys)
+
+cons :: a -> [a] -> [a]
+cons = (:)
+
+unsnoc :: [a] -> Maybe ([a], a)
+unsnoc = L.foldr (\x -> Just . maybe ([], x) (first (x :))) Nothing
+
+uncons2 :: [a] -> Maybe (a, a, [a])
+uncons2 [] = Nothing
+uncons2 [_] = Nothing
+uncons2 (x : y : zs) = Just (x, y, zs)
+
+_period, _quotedbl, _backslash, _slash, _question, _U, _N, _C, _colon, _semicolon, _US, _less, _greater, _bar, _asterisk, _nul, _space, _underscore :: Char
+_period = '.'
+_quotedbl = '"'
+_slash = '/'
+_backslash = '\\'
+_question = '?'
+_colon = ':'
+_semicolon = ';'
+_U = 'U'
+_N = 'N'
+_C = 'C'
+_US = '\US'
+_less = '<'
+_greater = '>'
+_bar = '|'
+_asterisk = '*'
+_nul = '\NUL'
+_space = ' '
+_underscore = '_'
+
+singleton :: Char -> String
+singleton c = [c]
+
+pack :: String -> String
+pack = id
+
+
+unpack :: String -> String
+unpack = id
+
+
+snoc :: String -> Char -> String
+{- HLINT ignore "Redundant lambda" -}
+snoc str = \c -> str <> [c]
+
+#else
+-- | Like 'try', but rethrows async exceptions.
+trySafe :: Exception e => IO a -> IO (Either e a)
+trySafe ioA = catch action eHandler
+ where
+  action = do
+    v <- ioA
+    return (Right v)
+  eHandler e
+    | isAsyncException e = throwIO e
+    | otherwise = return (Left e)
+
+isAsyncException :: Exception e => e -> Bool
+isAsyncException e =
+    case fromException (toException e) of
+        Just (SomeAsyncException _) -> True
+        Nothing -> False
+#ifdef WINDOWS
+fromString :: P.String -> STRING
+fromString str = P.either (P.error . P.show) P.id $ unsafePerformIO $ do
+  r <- trySafe @SomeException $ GHC.withCStringLen (mkUTF16le ErrorOnCodingFailure) str $ \cstr -> packCStringLen cstr
+  evaluate $ force $ first displayException r
+#else
+fromString :: P.String -> STRING
+fromString str = P.either (P.error . P.show) P.id $ unsafePerformIO $ do
+  r <- trySafe @SomeException $ GHC.withCStringLen (mkUTF8 ErrorOnCodingFailure) str $ \cstr -> packCStringLen cstr
+  evaluate $ force $ first displayException r
+#endif
+
+_a, _z, _A, _Z, _period, _quotedbl, _backslash, _slash, _question, _U, _N, _C, _colon, _semicolon, _US, _less, _greater, _bar, _asterisk, _nul, _space, _underscore :: CHAR
+_a = 0x61
+_z = 0x7a
+_A = 0x41
+_Z = 0x5a
+_period = 0x2e
+_quotedbl = 0x22
+_slash = 0x2f
+_backslash = 0x5c
+_question = 0x3f
+_colon = 0x3a
+_semicolon = 0x3b
+_U = 0x55
+_N = 0x4e
+_C = 0x43
+_US = 0x1f
+_less = 0x3c
+_greater = 0x3e
+_bar = 0x7c
+_asterisk = 0x2a
+_nul = 0x00
+_space = 0x20
+_underscore = 0x5f
+
+isAsciiUpper :: CHAR -> Bool
+isAsciiUpper w = _A <= w && w <= _Z
+
+isAsciiLower :: CHAR -> Bool
+isAsciiLower w = _a <= w && w <= _z
+
+----------------------------------------------------------------
+
+toUpper :: CHAR -> CHAR
+-- charToWord16 should be safe here, since C.toUpper doesn't go beyond Word16 maxbound
+toUpper = charToWord . C.toUpper . wordToChar
+
+toLower :: CHAR -> CHAR
+-- charToWord16 should be safe here, since C.toLower doesn't go beyond Word16 maxbound
+toLower = charToWord . C.toLower . wordToChar
+
+
+-- | Total conversion to char.
+wordToChar :: CHAR -> Char
+wordToChar = C.chr . fromIntegral
+
+-- | This is unsafe and clamps at Word16 maxbound.
+charToWord :: Char -> CHAR
+charToWord = fromIntegral . C.ord
+
+#endif
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Posix.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Posix.hs
new file mode 100644
index 0000000000..d07171f59d
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Posix.hs
@@ -0,0 +1,7 @@
+{-# LANGUAGE CPP #-}
+
+#undef WINDOWS
+#define IS_WINDOWS False
+#define MODULE_NAME Posix
+
+#include "Internal.hs"
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Windows.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Windows.hs
new file mode 100644
index 0000000000..a53580cbaf
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/FilePath/Windows.hs
@@ -0,0 +1,8 @@
+{-# LANGUAGE CPP #-}
+
+#undef POSIX
+#define WINDOWS
+#define IS_WINDOWS True
+#define MODULE_NAME Windows
+
+#include "Internal.hs"
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath.hs
new file mode 100644
index 0000000000..ffbfd380aa
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath.hs
@@ -0,0 +1,63 @@
+{-# LANGUAGE CPP #-}
+
+#define FILEPATH_NAME OsPath
+#define OSSTRING_NAME OsString
+#define WORD_NAME OsChar
+
+-- |
+-- Module      :  System.OsPath
+-- Copyright   :  © 2021 Julian Ospald
+-- License     :  MIT
+--
+-- Maintainer  :  Julian Ospald <hasufell@posteo.de>
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- An implementation of the <https://gitlab.haskell.org/ghc/ghc/-/wikis/proposal/abstract-file-path Abstract FilePath Proposal>,
+-- which aims to supersede @type FilePath = String@ for various reasons:
+--
+-- 1. it is more efficient and avoids memory fragmentation (uses unpinned 'ShortByteString' under the hood)
+-- 2. it is more type-safe (newtype over 'ShortByteString')
+-- 3. avoids round-tripping issues by not converting to String (which is not total and loses the encoding)
+-- 4. abstracts over unix and windows while keeping the original bytes
+--
+-- It is important to know that filenames\/filepaths have different representations across platforms:
+--
+-- - On /Windows/, filepaths are expected to be encoded as UTF16-LE <https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-dtyp/76f10dd8-699d-45e6-a53c-5aefc586da20 as per the documentation>, but
+--   may also include invalid surrogate pairs, in which case UCS-2 can be used. They are passed as @wchar_t*@ to syscalls.
+--   'OsPath' only maintains the wide character invariant.
+-- - On /Unix/, filepaths don't have a predefined encoding (although they
+--   are often interpreted as UTF8) as per the
+--   <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_170 POSIX specification>
+--   and are passed as @char[]@ to syscalls. 'OsPath' maintains no invariant
+--   here.
+--
+-- Apart from encoding, filepaths have additional restrictions per platform:
+--
+-- - On /Windows/ the <https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions naming convention> may apply
+-- - On /Unix/, only @NUL@ bytes are disallowed as per the <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_170 POSIX specification>
+--
+-- Use 'isValid' to check for these restrictions ('OsPath' doesn't
+-- maintain this invariant).
+--
+-- Also note that these restrictions are
+-- not exhaustive and further filesystem specific restrictions may apply on
+-- all platforms. This library makes no attempt at satisfying these.
+-- Library users may need to account for that, depending
+-- on what filesystems they want to support.
+--
+-- It is advised to follow these principles when dealing with filepaths\/filenames:
+--
+-- 1. Avoid interpreting filenames that the OS returns, unless absolutely necessary.
+--    For example, the filepath separator is usually a predefined 'Word8'/'Word16', regardless of encoding.
+--    So even if we need to split filepaths, it might still not be necessary to understand the encoding
+--    of the filename.
+-- 2. When interpreting OS returned filenames consider that these might not be UTF8 on /unix/
+--    or at worst don't have an ASCII compatible encoding. The are 3 available strategies fer decoding/encoding:
+--    a) pick the best UTF (UTF-8 on unix, UTF-16LE on windows), b) decode with an explicitly defined 'TextEncoding',
+--    c) mimic the behavior of the @base@ library (permissive UTF16 on windows, current filesystem encoding on unix).
+-- 3. Avoid comparing @String@ based filepaths, because filenames of different encodings
+--    may have the same @String@ representation, although they're not the same byte-wise.
+
+
+#include "OsPath/Common.hs"
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath.hs-boot b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath.hs-boot
new file mode 100644
index 0000000000..85a7c8c3c0
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath.hs-boot
@@ -0,0 +1,6 @@
+module System.OsPath where
+
+import System.OsPath.Types
+    ( OsPath )
+
+isValid :: OsPath -> Bool
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Common.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Common.hs
new file mode 100644
index 0000000000..5058b0e195
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Common.hs
@@ -0,0 +1,1469 @@
+{-# LANGUAGE TypeApplications #-}
+-- This template expects CPP definitions for:
+--
+--     WINDOWS defined? = no            | yes              | no
+--     POSIX   defined? = yes           | no               | no
+--
+--     FILEPATH_NAME    = PosixPath     | WindowsPath  | OsPath
+--     OSSTRING_NAME    = PosixString   | WindowsString    | OsString
+--     WORD_NAME        = PosixChar     | WindowsChar      | OsChar
+
+-- For (native) abstract file paths we document both platforms, so people can
+-- understand how their code is compiled no matter what. But for the
+-- platform-specific types we only want to document the behavior on that
+-- platform.
+#if defined(WINDOWS)
+#define WINDOWS_DOC
+#elif defined(POSIX)
+#define POSIX_DOC
+#endif
+
+#ifdef WINDOWS
+module System.OsPath.Windows
+#elif defined(POSIX)
+module System.OsPath.Posix
+#else
+module System.OsPath
+#endif
+  (
+  -- * Types
+#ifdef WINDOWS
+    WindowsString
+  , WindowsChar
+  , WindowsPath
+#elif defined(POSIX)
+    PosixString
+  , PosixChar
+  , PosixPath
+#else
+    OsPath
+  , OsString
+  , OsChar
+#endif
+  -- * Filepath construction
+  , PS.encodeUtf
+  , PS.unsafeEncodeUtf
+  , PS.encodeWith
+  , encodeFS
+#if defined(WINDOWS) || defined(POSIX)
+  , pstr
+#else
+  , osp
+#endif
+  , PS.pack
+
+  -- * Filepath deconstruction
+  , PS.decodeUtf
+  , PS.decodeWith
+  , decodeFS
+  , PS.unpack
+
+  -- * Word construction
+  , unsafeFromChar
+
+  -- * Word deconstruction
+  , toChar
+
+  -- * Separator predicates
+  , pathSeparator
+  , pathSeparators
+  , isPathSeparator
+  , searchPathSeparator
+  , isSearchPathSeparator
+  , extSeparator
+  , isExtSeparator
+
+  -- * $PATH methods
+  , splitSearchPath,
+
+  -- * Extension functions
+    splitExtension,
+    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
+    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
+    stripExtension,
+
+    -- * Filename\/directory functions
+    splitFileName,
+    takeFileName, replaceFileName, dropFileName,
+    takeBaseName, replaceBaseName,
+    takeDirectory, replaceDirectory,
+    combine, (</>),
+    splitPath, joinPath, splitDirectories,
+
+    -- * Drive functions
+    splitDrive, joinDrive,
+    takeDrive, hasDrive, dropDrive, isDrive,
+
+    -- * Trailing slash functions
+    hasTrailingPathSeparator,
+    addTrailingPathSeparator,
+    dropTrailingPathSeparator,
+
+    -- * File name manipulations
+    normalise, equalFilePath,
+    makeRelative,
+    isRelative, isAbsolute,
+    isValid, makeValid
+  )
+where
+
+
+#ifdef WINDOWS
+import System.OsPath.Types
+import System.OsString.Windows as PS
+    ( unsafeFromChar
+    , toChar
+    , decodeUtf
+    , decodeWith
+    , pack
+    , encodeUtf
+    , unsafeEncodeUtf
+    , encodeWith
+    , unpack
+    )
+import Data.Bifunctor ( bimap )
+import qualified System.OsPath.Windows.Internal as C
+import GHC.IO.Encoding.UTF16 ( mkUTF16le )
+import Language.Haskell.TH.Quote
+    ( QuasiQuoter (..) )
+import Language.Haskell.TH.Syntax
+    ( Lift (..), lift )
+import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
+import Control.Monad ( when )
+
+#elif defined(POSIX)
+import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
+import Control.Monad ( when )
+import Language.Haskell.TH.Quote
+    ( QuasiQuoter (..) )
+import Language.Haskell.TH.Syntax
+    ( Lift (..), lift )
+
+import GHC.IO.Encoding.UTF8 ( mkUTF8 )
+import System.OsPath.Types
+import System.OsString.Posix as PS
+    ( unsafeFromChar
+    , toChar
+    , decodeUtf
+    , decodeWith
+    , pack
+    , encodeUtf
+    , unsafeEncodeUtf
+    , encodeWith
+    , unpack
+    )
+import Data.Bifunctor ( bimap )
+import qualified System.OsPath.Posix.Internal as C
+
+#else
+
+import System.OsPath.Internal as PS
+    ( osp
+    , decodeUtf
+    , decodeWith
+    , pack
+    , encodeUtf
+    , unsafeEncodeUtf
+    , encodeWith
+    , unpack
+    )
+import System.OsPath.Types
+    ( OsPath )
+import System.OsString ( unsafeFromChar, toChar )
+
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+import qualified System.OsPath.Windows as C
+#else
+import qualified System.OsPath.Posix as C
+#endif
+
+import Data.Bifunctor
+    ( bimap )
+#endif
+import System.OsString.Internal.Types
+import System.OsString.Encoding.Internal
+
+
+------------------------
+-- Separator predicates
+
+
+#ifdef WINDOWS_DOC
+-- | The character that separates directories. In the case where more than
+--   one character is possible, 'pathSeparator' is the \'ideal\' one.
+--
+-- > pathSeparator == '\\'S
+#elif defined(POSIX_DOC)
+-- | The character that separates directories. In the case where more than
+--   one character is possible, 'pathSeparator' is the \'ideal\' one.
+--
+-- > pathSeparator ==  '/'
+#else
+-- | The character that separates directories. In the case where more than
+--   one character is possible, 'pathSeparator' is the \'ideal\' one.
+--
+-- > Windows: pathSeparator == '\\'S
+-- > Posix:   pathSeparator ==  '/'
+#endif
+pathSeparator :: WORD_NAME
+pathSeparator = WORD_NAME C.pathSeparator
+
+#ifdef WINDOWS_DOC
+-- | The list of all possible separators.
+--
+-- > pathSeparators == ['\\', '/']
+-- > pathSeparator `elem` pathSeparators
+#elif defined(POSIX_DOC)
+-- | The list of all possible separators.
+--
+-- > pathSeparators == ['/']
+-- > pathSeparator `elem` pathSeparators
+#else
+-- | The list of all possible separators.
+--
+-- > Windows: pathSeparators == ['\\', '/']
+-- > Posix:   pathSeparators == ['/']
+-- > pathSeparator `elem` pathSeparators
+#endif
+pathSeparators :: [WORD_NAME]
+pathSeparators = WORD_NAME <$> C.pathSeparators
+
+-- | Rather than using @(== 'pathSeparator')@, use this. Test if something
+--   is a path separator.
+--
+-- > isPathSeparator a == (a `elem` pathSeparators)
+isPathSeparator :: WORD_NAME -> Bool
+isPathSeparator (WORD_NAME w) = C.isPathSeparator w
+
+#ifdef WINDOWS_DOC
+-- | The character that is used to separate the entries in the $PATH environment variable.
+--
+-- > searchPathSeparator == ';'
+#elif defined(POSIX_DOC)
+-- | The character that is used to separate the entries in the $PATH environment variable.
+--
+-- > searchPathSeparator == ':'
+#else
+-- | The character that is used to separate the entries in the $PATH environment variable.
+--
+-- > Posix:   searchPathSeparator == ':'
+-- > Windows: searchPathSeparator == ';'
+#endif
+searchPathSeparator :: WORD_NAME
+searchPathSeparator = WORD_NAME C.searchPathSeparator
+
+-- | Is the character a file separator?
+--
+-- > isSearchPathSeparator a == (a == searchPathSeparator)
+isSearchPathSeparator :: WORD_NAME -> Bool
+isSearchPathSeparator (WORD_NAME w) = C.isSearchPathSeparator w
+
+
+-- | File extension character
+--
+-- > extSeparator == '.'
+extSeparator :: WORD_NAME
+extSeparator = WORD_NAME C.extSeparator
+
+
+-- | Is the character an extension character?
+--
+-- > isExtSeparator a == (a == extSeparator)
+isExtSeparator :: WORD_NAME -> Bool
+isExtSeparator (WORD_NAME w) = C.isExtSeparator w
+
+
+---------------------------------------------------------------------
+-- Path methods (environment $PATH)
+
+#ifdef WINDOWS_DOC
+-- | Take a string, split it on the 'searchPathSeparator' character.
+--
+--   Blank items are ignored and path elements are stripped of quotes.
+--
+-- > splitSearchPath "File1;File2;File3"  == ["File1","File2","File3"]
+-- > splitSearchPath "File1;;File2;File3" == ["File1","File2","File3"]
+-- > splitSearchPath "File1;\"File2\";File3" == ["File1","File2","File3"]
+#elif defined(POSIX_DOC)
+-- | Take a string, split it on the 'searchPathSeparator' character.
+--
+--   Blank items are converted to @.@ on , and quotes are not
+--   treated specially.
+--
+--   Follows the recommendations in
+--   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>
+--
+-- > splitSearchPath "File1:File2:File3"  == ["File1","File2","File3"]
+-- > splitSearchPath "File1::File2:File3" == ["File1",".","File2","File3"]
+#else
+-- | Take a string, split it on the 'searchPathSeparator' character.
+--
+--   On Windows, blank items are ignored on Windows, and path elements are
+--   stripped of quotes.
+--
+--   On Posix, blank items are converted to @.@ on Posix, and quotes are not
+--   treated specially.
+--
+--   Follows the recommendations in
+--   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>
+--
+-- > Windows: splitSearchPath "File1;File2;File3"  == ["File1","File2","File3"]
+-- > Windows: splitSearchPath "File1;;File2;File3" == ["File1","File2","File3"]
+-- > Windows: splitSearchPath "File1;\"File2\";File3" == ["File1","File2","File3"]
+-- > Posix:   splitSearchPath "File1:File2:File3"  == ["File1","File2","File3"]
+-- > Posix:   splitSearchPath "File1::File2:File3" == ["File1",".","File2","File3"]
+#endif
+splitSearchPath :: OSSTRING_NAME -> [FILEPATH_NAME]
+splitSearchPath (OSSTRING_NAME x) = fmap OSSTRING_NAME . C.splitSearchPath $ x
+
+
+
+------------------------
+-- Extension functions
+
+-- | Split on the extension. 'addExtension' is the inverse.
+--
+-- > splitExtension "/directory/path.ext" == ("/directory/path",".ext")
+-- > uncurry (<>) (splitExtension x) == x
+-- > Valid x => uncurry addExtension (splitExtension x) == x
+-- > splitExtension "file.txt" == ("file",".txt")
+-- > splitExtension "file" == ("file","")
+-- > splitExtension "file/file.txt" == ("file/file",".txt")
+-- > splitExtension "file.txt/boris" == ("file.txt/boris","")
+-- > splitExtension "file.txt/boris.ext" == ("file.txt/boris",".ext")
+-- > splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob",".fred")
+-- > splitExtension "file/path.txt/" == ("file/path.txt/","")
+splitExtension :: FILEPATH_NAME -> (FILEPATH_NAME, OSSTRING_NAME)
+splitExtension (OSSTRING_NAME x) = bimap OSSTRING_NAME OSSTRING_NAME $ C.splitExtension x
+
+
+-- | Get the extension of a file, returns @\"\"@ for no extension, @.ext@ otherwise.
+--
+-- > takeExtension "/directory/path.ext" == ".ext"
+-- > takeExtension x == snd (splitExtension x)
+-- > Valid x => takeExtension (addExtension x "ext") == ".ext"
+-- > Valid x => takeExtension (replaceExtension x "ext") == ".ext"
+takeExtension :: FILEPATH_NAME -> OSSTRING_NAME
+takeExtension (OSSTRING_NAME x) = OSSTRING_NAME $ C.takeExtension x
+
+
+-- | Remove the current extension and add another, equivalent to 'replaceExtension'.
+--
+-- > "/directory/path.txt" -<.> "ext" == "/directory/path.ext"
+-- > "/directory/path.txt" -<.> ".ext" == "/directory/path.ext"
+-- > "foo.o" -<.> "c" == "foo.c"
+(-<.>) :: FILEPATH_NAME -> OSSTRING_NAME -> FILEPATH_NAME
+(-<.>) = replaceExtension
+
+-- | Set the extension of a file, overwriting one if already present, equivalent to '-<.>'.
+--
+-- > replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext"
+-- > replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext"
+-- > replaceExtension "file.txt" ".bob" == "file.bob"
+-- > replaceExtension "file.txt" "bob" == "file.bob"
+-- > replaceExtension "file" ".bob" == "file.bob"
+-- > replaceExtension "file.txt" "" == "file"
+-- > replaceExtension "file.fred.bob" "txt" == "file.fred.txt"
+-- > replaceExtension x y == addExtension (dropExtension x) y
+replaceExtension :: FILEPATH_NAME -> OSSTRING_NAME -> FILEPATH_NAME
+replaceExtension (OSSTRING_NAME path) (OSSTRING_NAME ext) = OSSTRING_NAME (C.replaceExtension path ext)
+
+
+-- | Add an extension, even if there is already one there, equivalent to 'addExtension'.
+--
+-- > "/directory/path" <.> "ext" == "/directory/path.ext"
+-- > "/directory/path" <.> ".ext" == "/directory/path.ext"
+(<.>) :: FILEPATH_NAME -> OSSTRING_NAME -> FILEPATH_NAME
+(<.>) = addExtension
+
+-- | Remove last extension, and the \".\" preceding it.
+--
+-- > dropExtension "/directory/path.ext" == "/directory/path"
+-- > dropExtension x == fst (splitExtension x)
+dropExtension :: FILEPATH_NAME -> FILEPATH_NAME
+dropExtension (OSSTRING_NAME x) = OSSTRING_NAME $ C.dropExtension x
+
+
+-- | Add an extension, even if there is already one there, equivalent to '<.>'.
+--
+-- > addExtension "/directory/path" "ext" == "/directory/path.ext"
+-- > addExtension "file.txt" "bib" == "file.txt.bib"
+-- > addExtension "file." ".bib" == "file..bib"
+-- > addExtension "file" ".bib" == "file.bib"
+-- > addExtension "/" "x" == "/.x"
+-- > addExtension x "" == x
+-- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
+-- > Windows: addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
+
+#ifdef WINDOWS_DOC
+-- | Add an extension, even if there is already one there, equivalent to '<.>'.
+--
+-- > addExtension "/directory/path" "ext" == "/directory/path.ext"
+-- > addExtension "file.txt" "bib" == "file.txt.bib"
+-- > addExtension "file." ".bib" == "file..bib"
+-- > addExtension "file" ".bib" == "file.bib"
+-- > addExtension "/" "x" == "/.x"
+-- > addExtension x "" == x
+-- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
+-- > addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
+#elif defined(POSIX_DOC)
+-- | Add an extension, even if there is already one there, equivalent to '<.>'.
+--
+-- > addExtension "/directory/path" "ext" == "/directory/path.ext"
+-- > addExtension "file.txt" "bib" == "file.txt.bib"
+-- > addExtension "file." ".bib" == "file..bib"
+-- > addExtension "file" ".bib" == "file.bib"
+-- > addExtension "/" "x" == "/.x"
+-- > addExtension x "" == x
+-- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
+#else
+-- | Add an extension, even if there is already one there, equivalent to '<.>'.
+--
+-- > addExtension "/directory/path" "ext" == "/directory/path.ext"
+-- > addExtension "file.txt" "bib" == "file.txt.bib"
+-- > addExtension "file." ".bib" == "file..bib"
+-- > addExtension "file" ".bib" == "file.bib"
+-- > addExtension "/" "x" == "/.x"
+-- > addExtension x "" == x
+-- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
+-- > Windows: addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
+#endif
+addExtension :: FILEPATH_NAME -> OSSTRING_NAME -> FILEPATH_NAME
+addExtension (OSSTRING_NAME bs) (OSSTRING_NAME ext) = OSSTRING_NAME $ C.addExtension bs ext
+
+
+-- | Does the given filename have an extension?
+--
+-- > hasExtension "/directory/path.ext" == True
+-- > hasExtension "/directory/path" == False
+-- > null (takeExtension x) == not (hasExtension x)
+hasExtension :: FILEPATH_NAME -> Bool
+hasExtension (OSSTRING_NAME x) = C.hasExtension x
+
+-- | Does the given filename have the specified extension?
+--
+-- > "png" `isExtensionOf` "/directory/file.png" == True
+-- > ".png" `isExtensionOf` "/directory/file.png" == True
+-- > ".tar.gz" `isExtensionOf` "bar/foo.tar.gz" == True
+-- > "ar.gz" `isExtensionOf` "bar/foo.tar.gz" == False
+-- > "png" `isExtensionOf` "/directory/file.png.jpg" == False
+-- > "csv/table.csv" `isExtensionOf` "/data/csv/table.csv" == False
+isExtensionOf :: OSSTRING_NAME -> FILEPATH_NAME -> Bool
+isExtensionOf (OSSTRING_NAME x) (OSSTRING_NAME y) = C.isExtensionOf x y
+
+-- | Drop the given extension from a filepath, and the @\".\"@ preceding it.
+--   Returns 'Nothing' if the filepath does not have the given extension, or
+--   'Just' and the part before the extension if it does.
+--
+--   This function can be more predictable than 'dropExtensions', especially if the filename
+--   might itself contain @.@ characters.
+--
+-- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
+-- > stripExtension "hi.o" "foo.x.hs.o" == Nothing
+-- > dropExtension x == fromJust (stripExtension (takeExtension x) x)
+-- > dropExtensions x == fromJust (stripExtension (takeExtensions x) x)
+-- > stripExtension ".c.d" "a.b.c.d"  == Just "a.b"
+-- > stripExtension ".c.d" "a.b..c.d" == Just "a.b."
+-- > stripExtension "baz"  "foo.bar"  == Nothing
+-- > stripExtension "bar"  "foobar"   == Nothing
+-- > stripExtension ""     x          == Just x
+stripExtension :: OSSTRING_NAME -> FILEPATH_NAME -> Maybe FILEPATH_NAME
+stripExtension (OSSTRING_NAME bs) (OSSTRING_NAME x) = OSSTRING_NAME <$> C.stripExtension bs x
+
+-- | Split on all extensions.
+--
+-- > splitExtensions "/directory/path.ext" == ("/directory/path",".ext")
+-- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
+-- > uncurry (<>) (splitExtensions x) == x
+-- > Valid x => uncurry addExtension (splitExtensions x) == x
+-- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
+splitExtensions :: FILEPATH_NAME -> (FILEPATH_NAME, OSSTRING_NAME)
+splitExtensions (OSSTRING_NAME x) = bimap OSSTRING_NAME OSSTRING_NAME $ C.splitExtensions x
+
+
+-- | Drop all extensions.
+--
+-- > dropExtensions "/directory/path.ext" == "/directory/path"
+-- > dropExtensions "file.tar.gz" == "file"
+-- > not $ hasExtension $ dropExtensions x
+-- > not $ any isExtSeparator $ takeFileName $ dropExtensions x
+dropExtensions :: FILEPATH_NAME -> FILEPATH_NAME
+dropExtensions (OSSTRING_NAME x) = OSSTRING_NAME $ C.dropExtensions x
+
+
+-- | Get all extensions.
+--
+-- > takeExtensions "/directory/path.ext" == ".ext"
+-- > takeExtensions "file.tar.gz" == ".tar.gz"
+takeExtensions :: FILEPATH_NAME -> OSSTRING_NAME
+takeExtensions (OSSTRING_NAME x) = OSSTRING_NAME $ C.takeExtensions x
+
+-- | Replace all extensions of a file with a new extension. Note
+--   that 'replaceExtension' and 'addExtension' both work for adding
+--   multiple extensions, so only required when you need to drop
+--   all extensions first.
+--
+-- > replaceExtensions "file.fred.bob" "txt" == "file.txt"
+-- > replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz"
+replaceExtensions :: FILEPATH_NAME -> OSSTRING_NAME -> FILEPATH_NAME
+replaceExtensions (OSSTRING_NAME x) (OSSTRING_NAME y) = OSSTRING_NAME $ C.replaceExtensions x y
+
+
+------------------------
+-- Drive functions
+
+
+#ifdef WINDOWS_DOC
+-- | Split a path into a drive and a path.
+--
+-- > uncurry (<>) (splitDrive x) == x
+-- > splitDrive "file" == ("","file")
+-- > splitDrive "c:/file" == ("c:/","file")
+-- > splitDrive "c:\\file" == ("c:\\","file")
+-- > splitDrive "\\\\shared\\test" == ("\\\\shared\\","test")
+-- > splitDrive "\\\\shared" == ("\\\\shared","")
+-- > splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\","file")
+-- > splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\","UNCshared\\file")
+-- > splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\","file")
+-- > splitDrive "/d" == ("","/d")
+#elif defined(POSIX_DOC)
+-- | Split a path into a drive and a path.
+--   \/ is a Drive.
+--
+-- > uncurry (<>) (splitDrive x) == x
+-- > splitDrive "/test" == ("/","test")
+-- > splitDrive "//test" == ("//","test")
+-- > splitDrive "test/file" == ("","test/file")
+-- > splitDrive "file" == ("","file")
+#else
+-- | Split a path into a drive and a path.
+--   On Posix, \/ is a Drive.
+--
+-- > uncurry (<>) (splitDrive x) == x
+-- > Windows: splitDrive "file" == ("","file")
+-- > Windows: splitDrive "c:/file" == ("c:/","file")
+-- > Windows: splitDrive "c:\\file" == ("c:\\","file")
+-- > Windows: splitDrive "\\\\shared\\test" == ("\\\\shared\\","test")
+-- > Windows: splitDrive "\\\\shared" == ("\\\\shared","")
+-- > Windows: splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\","file")
+-- > Windows: splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\","UNCshared\\file")
+-- > Windows: splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\","file")
+-- > Windows: splitDrive "/d" == ("","/d")
+-- > Posix:   splitDrive "/test" == ("/","test")
+-- > Posix:   splitDrive "//test" == ("//","test")
+-- > Posix:   splitDrive "test/file" == ("","test/file")
+-- > Posix:   splitDrive "file" == ("","file")
+#endif
+splitDrive :: FILEPATH_NAME -> (FILEPATH_NAME, FILEPATH_NAME)
+splitDrive (OSSTRING_NAME p) = bimap OSSTRING_NAME OSSTRING_NAME $ C.splitDrive p
+
+
+-- | Join a drive and the rest of the path.
+--
+-- > Valid x => uncurry joinDrive (splitDrive x) == x
+-- > Windows: joinDrive "C:" "foo" == "C:foo"
+-- > Windows: joinDrive "C:\\" "bar" == "C:\\bar"
+-- > Windows: joinDrive "\\\\share" "foo" == "\\\\share\\foo"
+-- > Windows: joinDrive "/:" "foo" == "/:\\foo"
+
+#ifdef WINDOWS_DOC
+-- | Join a drive and the rest of the path.
+--
+-- > Valid x => uncurry joinDrive (splitDrive x) == x
+-- > joinDrive "C:" "foo" == "C:foo"
+-- > joinDrive "C:\\" "bar" == "C:\\bar"
+-- > joinDrive "\\\\share" "foo" == "\\\\share\\foo"
+-- > joinDrive "/:" "foo" == "/:\\foo"
+#elif defined(POSIX_DOC)
+-- | Join a drive and the rest of the path.
+--
+-- > Valid x => uncurry joinDrive (splitDrive x) == x
+#else
+-- | Join a drive and the rest of the path.
+--
+-- > Valid x => uncurry joinDrive (splitDrive x) == x
+-- > Windows: joinDrive "C:" "foo" == "C:foo"
+-- > Windows: joinDrive "C:\\" "bar" == "C:\\bar"
+-- > Windows: joinDrive "\\\\share" "foo" == "\\\\share\\foo"
+-- > Windows: joinDrive "/:" "foo" == "/:\\foo"
+#endif
+joinDrive :: FILEPATH_NAME -> FILEPATH_NAME -> FILEPATH_NAME
+joinDrive (OSSTRING_NAME a) (OSSTRING_NAME b) = OSSTRING_NAME $ C.joinDrive a b
+
+
+-- | Get the drive from a filepath.
+--
+-- > takeDrive x == fst (splitDrive x)
+takeDrive :: FILEPATH_NAME -> FILEPATH_NAME
+takeDrive (OSSTRING_NAME x) = OSSTRING_NAME $ C.takeDrive x
+
+
+-- | Delete the drive, if it exists.
+--
+-- > dropDrive x == snd (splitDrive x)
+dropDrive :: FILEPATH_NAME -> FILEPATH_NAME
+dropDrive (OSSTRING_NAME x) = OSSTRING_NAME $ C.dropDrive x
+
+
+#ifdef WINDOWS_DOC
+-- | Does a path have a drive.
+--
+-- > not (hasDrive x) == null (takeDrive x)
+-- > hasDrive "C:\\foo" == True
+-- > hasDrive "C:foo" == True
+-- > hasDrive "foo" == False
+-- > hasDrive "" == False
+--
+#elif defined(POSIX_DOC)
+-- | Does a path have a drive.
+--
+-- > not (hasDrive x) == null (takeDrive x)
+-- > hasDrive "/foo" == True
+-- > hasDrive "foo" == False
+-- > hasDrive "" == False
+--
+#else
+-- | Does a path have a drive.
+--
+-- > not (hasDrive x) == null (takeDrive x)
+-- > Posix:   hasDrive "/foo" == True
+-- > Windows: hasDrive "C:\\foo" == True
+-- > Windows: hasDrive "C:foo" == True
+-- >          hasDrive "foo" == False
+-- >          hasDrive "" == False
+--
+#endif
+hasDrive :: FILEPATH_NAME -> Bool
+hasDrive (OSSTRING_NAME x) = C.hasDrive x
+
+
+#ifdef WINDOWS_DOC
+-- | Is an element a drive
+--
+-- > isDrive "C:\\" == True
+-- > isDrive "C:\\foo" == False
+-- > isDrive "" == False
+#elif defined(POSIX_DOC)
+-- | Is an element a drive
+--
+-- > isDrive "/" == True
+-- > isDrive "/foo" == False
+-- > isDrive "" == False
+#else
+-- | Is an element a drive
+--
+-- > Posix:   isDrive "/" == True
+-- > Posix:   isDrive "/foo" == False
+-- > Windows: isDrive "C:\\" == True
+-- > Windows: isDrive "C:\\foo" == False
+-- >          isDrive "" == False
+#endif
+isDrive :: FILEPATH_NAME -> Bool
+isDrive (OSSTRING_NAME x) = C.isDrive x
+
+
+---------------------------------------------------------------------
+-- Operations on a filepath, as a list of directories
+
+#ifdef WINDOWS_DOC
+-- | Split a filename into directory and file. '</>' is the inverse.
+--   The first component will often end with a trailing slash.
+--
+-- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
+-- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
+-- > Valid x => isValid (fst (splitFileName x))
+-- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
+-- > splitFileName "file/" == ("file/", "")
+-- > splitFileName "bob" == ("./", "bob")
+-- > splitFileName "c:" == ("c:","")
+#elif defined(POSIX_DOC)
+-- | Split a filename into directory and file. '</>' is the inverse.
+--   The first component will often end with a trailing slash.
+--
+-- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
+-- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
+-- > Valid x => isValid (fst (splitFileName x))
+-- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
+-- > splitFileName "file/" == ("file/", "")
+-- > splitFileName "bob" == ("./", "bob")
+-- > splitFileName "/" == ("/","")
+#else
+-- | Split a filename into directory and file. '</>' is the inverse.
+--   The first component will often end with a trailing slash.
+--
+-- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
+-- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
+-- > Valid x => isValid (fst (splitFileName x))
+-- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
+-- > splitFileName "file/" == ("file/", "")
+-- > splitFileName "bob" == ("./", "bob")
+-- > Posix:   splitFileName "/" == ("/","")
+-- > Windows: splitFileName "c:" == ("c:","")
+#endif
+splitFileName :: FILEPATH_NAME -> (FILEPATH_NAME, FILEPATH_NAME)
+splitFileName (OSSTRING_NAME x) = bimap OSSTRING_NAME OSSTRING_NAME $ C.splitFileName x
+
+
+-- | Set the filename.
+--
+-- > replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext"
+-- > Valid x => replaceFileName x (takeFileName x) == x
+replaceFileName :: FILEPATH_NAME -> OSSTRING_NAME -> FILEPATH_NAME
+replaceFileName (OSSTRING_NAME x) (OSSTRING_NAME y) = OSSTRING_NAME $ C.replaceFileName x y
+
+
+-- | Drop the filename. Unlike 'takeDirectory', this function will leave
+--   a trailing path separator on the directory.
+--
+-- > dropFileName "/directory/file.ext" == "/directory/"
+-- > dropFileName x == fst (splitFileName x)
+dropFileName :: FILEPATH_NAME -> FILEPATH_NAME
+dropFileName (OSSTRING_NAME x) = OSSTRING_NAME $ C.dropFileName x
+
+
+-- | Get the file name.
+--
+-- > takeFileName "/directory/file.ext" == "file.ext"
+-- > takeFileName "test/" == ""
+-- > takeFileName x `isSuffixOf` x
+-- > takeFileName x == snd (splitFileName x)
+-- > Valid x => takeFileName (replaceFileName x "fred") == "fred"
+-- > Valid x => takeFileName (x </> "fred") == "fred"
+-- > Valid x => isRelative (takeFileName x)
+takeFileName :: FILEPATH_NAME -> FILEPATH_NAME
+takeFileName (OSSTRING_NAME x) = OSSTRING_NAME $ C.takeFileName x
+
+
+-- | Get the base name, without an extension or path.
+--
+-- > takeBaseName "/directory/file.ext" == "file"
+-- > takeBaseName "file/test.txt" == "test"
+-- > takeBaseName "dave.ext" == "dave"
+-- > takeBaseName "" == ""
+-- > takeBaseName "test" == "test"
+-- > takeBaseName (addTrailingPathSeparator x) == ""
+-- > takeBaseName "file/file.tar.gz" == "file.tar"
+takeBaseName :: FILEPATH_NAME -> FILEPATH_NAME
+takeBaseName (OSSTRING_NAME x) = OSSTRING_NAME $ C.takeBaseName x
+
+
+-- | Set the base name.
+--
+-- > replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext"
+-- > replaceBaseName "file/test.txt" "bob" == "file/bob.txt"
+-- > replaceBaseName "fred" "bill" == "bill"
+-- > replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar"
+-- > Valid x => replaceBaseName x (takeBaseName x) == x
+replaceBaseName :: FILEPATH_NAME -> OSSTRING_NAME -> FILEPATH_NAME
+replaceBaseName (OSSTRING_NAME path) (OSSTRING_NAME name) = OSSTRING_NAME $ C.replaceBaseName path name
+
+
+-- | Is an item either a directory or the last character a path separator?
+--
+-- > hasTrailingPathSeparator "test" == False
+-- > hasTrailingPathSeparator "test/" == True
+hasTrailingPathSeparator :: FILEPATH_NAME -> Bool
+hasTrailingPathSeparator (OSSTRING_NAME x) = C.hasTrailingPathSeparator x
+
+
+#ifdef WINDOWS_DOC
+-- | Add a trailing file path separator if one is not already present.
+--
+-- > hasTrailingPathSeparator (addTrailingPathSeparator x)
+-- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
+#elif defined(POSIX_DOC)
+-- | Add a trailing file path separator if one is not already present.
+--
+-- > hasTrailingPathSeparator (addTrailingPathSeparator x)
+-- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
+-- > addTrailingPathSeparator "test/rest" == "test/rest/"
+#else
+-- | Add a trailing file path separator if one is not already present.
+--
+-- > hasTrailingPathSeparator (addTrailingPathSeparator x)
+-- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
+-- > Posix:    addTrailingPathSeparator "test/rest" == "test/rest/"
+#endif
+addTrailingPathSeparator :: FILEPATH_NAME -> FILEPATH_NAME
+addTrailingPathSeparator (OSSTRING_NAME bs) = OSSTRING_NAME $ C.addTrailingPathSeparator bs
+
+
+#ifdef WINDOWS_DOC
+-- | Remove any trailing path separators
+--
+-- > dropTrailingPathSeparator "file/test/" == "file/test"
+-- > dropTrailingPathSeparator "/" == "/"
+-- > dropTrailingPathSeparator "\\" == "\\"
+#elif defined(POSIX_DOC)
+-- | Remove any trailing path separators
+--
+-- > dropTrailingPathSeparator "file/test/" == "file/test"
+-- > dropTrailingPathSeparator "/" == "/"
+-- > not (hasTrailingPathSeparator (dropTrailingPathSeparator x)) || isDrive x
+#else
+-- | Remove any trailing path separators
+--
+-- > dropTrailingPathSeparator "file/test/" == "file/test"
+-- >           dropTrailingPathSeparator "/" == "/"
+-- > Windows:  dropTrailingPathSeparator "\\" == "\\"
+-- > Posix:    not (hasTrailingPathSeparator (dropTrailingPathSeparator x)) || isDrive x
+#endif
+dropTrailingPathSeparator :: FILEPATH_NAME -> FILEPATH_NAME
+dropTrailingPathSeparator (OSSTRING_NAME x) = OSSTRING_NAME $ C.dropTrailingPathSeparator x
+
+
+#ifdef WINDOWS_DOC
+-- | Get the directory name, move up one level.
+--
+-- > takeDirectory "/directory/other.ext" == "/directory"
+-- > takeDirectory x `isPrefixOf` x || takeDirectory x == "."
+-- > takeDirectory "foo" == "."
+-- > takeDirectory "/" == "/"
+-- > takeDirectory "/foo" == "/"
+-- > takeDirectory "/foo/bar/baz" == "/foo/bar"
+-- > takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
+-- > takeDirectory "foo/bar/baz" == "foo/bar"
+-- > takeDirectory "foo\\bar" == "foo"
+-- > takeDirectory "foo\\bar\\\\" == "foo\\bar"
+-- > takeDirectory "C:\\" == "C:\\"
+#elif defined(POSIX_DOC)
+-- | Get the directory name, move up one level.
+--
+-- >           takeDirectory "/directory/other.ext" == "/directory"
+-- >           takeDirectory x `isPrefixOf` x || takeDirectory x == "."
+-- >           takeDirectory "foo" == "."
+-- >           takeDirectory "/" == "/"
+-- >           takeDirectory "/foo" == "/"
+-- >           takeDirectory "/foo/bar/baz" == "/foo/bar"
+-- >           takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
+-- >           takeDirectory "foo/bar/baz" == "foo/bar"
+#else
+-- | Get the directory name, move up one level.
+--
+-- >           takeDirectory "/directory/other.ext" == "/directory"
+-- >           takeDirectory x `isPrefixOf` x || takeDirectory x == "."
+-- >           takeDirectory "foo" == "."
+-- >           takeDirectory "/" == "/"
+-- >           takeDirectory "/foo" == "/"
+-- >           takeDirectory "/foo/bar/baz" == "/foo/bar"
+-- >           takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
+-- >           takeDirectory "foo/bar/baz" == "foo/bar"
+-- > Windows:  takeDirectory "foo\\bar" == "foo"
+-- > Windows:  takeDirectory "foo\\bar\\\\" == "foo\\bar"
+-- > Windows:  takeDirectory "C:\\" == "C:\\"
+#endif
+takeDirectory :: FILEPATH_NAME -> FILEPATH_NAME
+takeDirectory (OSSTRING_NAME x) = OSSTRING_NAME $ C.takeDirectory x
+
+
+-- | Set the directory, keeping the filename the same.
+--
+-- > replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext"
+-- > Valid x => replaceDirectory x (takeDirectory x) `equalFilePath` x
+replaceDirectory :: FILEPATH_NAME -> FILEPATH_NAME -> FILEPATH_NAME
+replaceDirectory (OSSTRING_NAME file) (OSSTRING_NAME dir) = OSSTRING_NAME $ C.replaceDirectory file dir
+
+
+-- | An alias for '</>'.
+combine :: FILEPATH_NAME -> FILEPATH_NAME -> FILEPATH_NAME
+combine (OSSTRING_NAME a) (OSSTRING_NAME b) = OSSTRING_NAME $ C.combine a b
+
+#ifdef WINDOWS_DOC
+-- | Combine two paths with a path separator.
+--   If the second path starts with a path separator or a drive letter, then it returns the second.
+--   The intention is that @readFile (dir '</>' file)@ will access the same file as
+--   @setCurrentDirectory dir; readFile file@.
+--
+-- > "/directory" </> "file.ext" == "/directory\\file.ext"
+-- > "directory" </> "/file.ext" == "/file.ext"
+-- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
+--
+--   Combined:
+--
+-- > "C:\\foo" </> "bar" == "C:\\foo\\bar"
+-- > "home" </> "bob" == "home\\bob"
+--
+--   Not combined:
+--
+-- > "home" </> "C:\\bob" == "C:\\bob"
+--
+--   Not combined (tricky):
+--
+--   If a filepath starts with a single slash, it is relative to the
+--   root of the current drive. In [1], this is (confusingly) referred to as an
+--   absolute path.
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > "home" </> "/bob" == "/bob"
+-- > "home" </> "\\bob" == "\\bob"
+-- > "C:\\home" </> "\\bob" == "\\bob"
+--
+--   From [1]: "If a file name begins with only a disk designator
+--   but not the backslash after the colon, it is interpreted as a relative path
+--   to the current directory on the drive with the specified letter."
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > "D:\\foo" </> "C:bar" == "C:bar"
+-- > "C:\\foo" </> "C:bar" == "C:bar"
+#elif defined(POSIX_DOC)
+-- | Combine two paths with a path separator.
+--   If the second path starts with a path separator or a drive letter, then it returns the second.
+--   The intention is that @readFile (dir '</>' file)@ will access the same file as
+--   @setCurrentDirectory dir; readFile file@.
+--
+-- > "/directory" </> "file.ext" == "/directory/file.ext"
+-- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
+--
+--   Combined:
+--
+-- > "/" </> "test" == "/test"
+-- > "home" </> "bob" == "home/bob"
+-- > "x:" </> "foo" == "x:/foo"
+--
+--   Not combined:
+--
+-- > "home" </> "/bob" == "/bob"
+#else
+-- | Combine two paths with a path separator.
+--   If the second path starts with a path separator or a drive letter, then it returns the second.
+--   The intention is that @readFile (dir '</>' file)@ will access the same file as
+--   @setCurrentDirectory dir; readFile file@.
+--
+-- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
+-- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
+-- >          "directory" </> "/file.ext" == "/file.ext"
+-- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
+--
+--   Combined:
+--
+-- > Posix:   "/" </> "test" == "/test"
+-- > Posix:   "home" </> "bob" == "home/bob"
+-- > Posix:   "x:" </> "foo" == "x:/foo"
+-- > Windows: "C:\\foo" </> "bar" == "C:\\foo\\bar"
+-- > Windows: "home" </> "bob" == "home\\bob"
+--
+--   Not combined:
+--
+-- > Posix:   "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "C:\\bob" == "C:\\bob"
+--
+--   Not combined (tricky):
+--
+--   On Windows, if a filepath starts with a single slash, it is relative to the
+--   root of the current drive. In [1], this is (confusingly) referred to as an
+--   absolute path.
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > Windows: "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "\\bob" == "\\bob"
+-- > Windows: "C:\\home" </> "\\bob" == "\\bob"
+--
+--   On Windows, from [1]: "If a file name begins with only a disk designator
+--   but not the backslash after the colon, it is interpreted as a relative path
+--   to the current directory on the drive with the specified letter."
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
+-- > Windows: "C:\\foo" </> "C:bar" == "C:bar"
+#endif
+(</>) :: FILEPATH_NAME -> FILEPATH_NAME -> FILEPATH_NAME
+(</>) = combine
+
+
+#ifdef WINDOWS_DOC
+-- | Split a path by the directory separator.
+--
+-- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
+-- > concat (splitPath x) == x
+-- > splitPath "test//item/" == ["test//","item/"]
+-- > splitPath "test/item/file" == ["test/","item/","file"]
+-- > splitPath "" == []
+-- > splitPath "c:\\test\\path" == ["c:\\","test\\","path"]
+#elif defined(POSIX_DOC)
+-- | Split a path by the directory separator.
+--
+-- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
+-- > concat (splitPath x) == x
+-- > splitPath "test//item/" == ["test//","item/"]
+-- > splitPath "test/item/file" == ["test/","item/","file"]
+-- > splitPath "" == []
+-- > splitPath "/file/test" == ["/","file/","test"]
+#else
+-- | Split a path by the directory separator.
+--
+-- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
+-- > concat (splitPath x) == x
+-- > splitPath "test//item/" == ["test//","item/"]
+-- > splitPath "test/item/file" == ["test/","item/","file"]
+-- > splitPath "" == []
+-- > Windows: splitPath "c:\\test\\path" == ["c:\\","test\\","path"]
+-- > Posix:   splitPath "/file/test" == ["/","file/","test"]
+#endif
+splitPath :: FILEPATH_NAME -> [FILEPATH_NAME]
+splitPath (OSSTRING_NAME bs) = OSSTRING_NAME <$> C.splitPath bs
+
+#ifdef WINDOWS_DOC
+-- | Just as 'splitPath', but don't add the trailing slashes to each element.
+--
+-- > splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
+-- > splitDirectories "test/file" == ["test","file"]
+-- > splitDirectories "/test/file" == ["/","test","file"]
+-- > splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"]
+-- > Valid x => joinPath (splitDirectories x) `equalFilePath` x
+-- > splitDirectories "" == []
+-- > splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"]
+-- > splitDirectories "/test///file" == ["/","test","file"]
+#elif defined(POSIX_DOC)
+-- | Just as 'splitPath', but don't add the trailing slashes to each element.
+--
+-- > splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
+-- > splitDirectories "test/file" == ["test","file"]
+-- > splitDirectories "/test/file" == ["/","test","file"]
+-- > Valid x => joinPath (splitDirectories x) `equalFilePath` x
+-- > splitDirectories "" == []
+-- > splitDirectories "/test///file" == ["/","test","file"]
+#else
+-- | Just as 'splitPath', but don't add the trailing slashes to each element.
+--
+-- >          splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
+-- >          splitDirectories "test/file" == ["test","file"]
+-- >          splitDirectories "/test/file" == ["/","test","file"]
+-- > Windows: splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"]
+-- >          Valid x => joinPath (splitDirectories x) `equalFilePath` x
+-- >          splitDirectories "" == []
+-- > Windows: splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"]
+-- >          splitDirectories "/test///file" == ["/","test","file"]
+#endif
+splitDirectories :: FILEPATH_NAME -> [FILEPATH_NAME]
+splitDirectories (OSSTRING_NAME x) = OSSTRING_NAME <$> C.splitDirectories x
+
+#ifdef WINDOWS_DOC
+-- | Join path elements back together.
+--
+-- > joinPath z == foldr (</>) "" z
+-- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
+-- > Valid x => joinPath (splitPath x) == x
+-- > joinPath [] == ""
+#elif defined(POSIX_DOC)
+-- | Join path elements back together.
+--
+-- > joinPath z == foldr (</>) "" z
+-- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
+-- > Valid x => joinPath (splitPath x) == x
+-- > joinPath [] == ""
+-- > joinPath ["test","file","path"] == "test/file/path"
+#else
+-- | Join path elements back together.
+--
+-- > joinPath z == foldr (</>) "" z
+-- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
+-- > Valid x => joinPath (splitPath x) == x
+-- > joinPath [] == ""
+-- > Posix: joinPath ["test","file","path"] == "test/file/path"
+#endif
+joinPath :: [FILEPATH_NAME] -> FILEPATH_NAME
+joinPath = foldr (</>) (OSSTRING_NAME mempty)
+
+
+
+
+
+
+
+
+
+------------------------
+-- File name manipulations
+
+
+#ifdef WINDOWS_DOC
+-- | Equality of two filepaths.
+--   If you call @System.Directory.canonicalizePath@
+--   first this has a much better chance of working.
+--   Note that this doesn't follow symlinks or DOSNAM~1s.
+--
+-- Similar to 'normalise', this does not expand @".."@, because of symlinks.
+--
+-- > x == y ==> equalFilePath x y
+-- > normalise x == normalise y ==> equalFilePath x y
+-- > equalFilePath "foo" "foo/"
+-- > not (equalFilePath "/a/../c" "/c")
+-- > not (equalFilePath "foo" "/foo")
+-- > equalFilePath "foo" "FOO"
+-- > not (equalFilePath "C:" "C:/")
+#elif defined(POSIX_DOC)
+-- | Equality of two filepaths.
+--   If you call @System.Directory.canonicalizePath@
+--   first this has a much better chance of working.
+--   Note that this doesn't follow symlinks or DOSNAM~1s.
+--
+-- Similar to 'normalise', this does not expand @".."@, because of symlinks.
+--
+-- > x == y ==> equalFilePath x y
+-- > normalise x == normalise y ==> equalFilePath x y
+-- > equalFilePath "foo" "foo/"
+-- > not (equalFilePath "/a/../c" "/c")
+-- > not (equalFilePath "foo" "/foo")
+-- > not (equalFilePath "foo" "FOO")
+#else
+-- | Equality of two filepaths.
+--   If you call @System.Directory.canonicalizePath@
+--   first this has a much better chance of working.
+--   Note that this doesn't follow symlinks or DOSNAM~1s.
+--
+-- Similar to 'normalise', this does not expand @".."@, because of symlinks.
+--
+-- >          x == y ==> equalFilePath x y
+-- >          normalise x == normalise y ==> equalFilePath x y
+-- >          equalFilePath "foo" "foo/"
+-- >          not (equalFilePath "/a/../c" "/c")
+-- >          not (equalFilePath "foo" "/foo")
+-- > Posix:   not (equalFilePath "foo" "FOO")
+-- > Windows: equalFilePath "foo" "FOO"
+-- > Windows: not (equalFilePath "C:" "C:/")
+#endif
+equalFilePath :: FILEPATH_NAME -> FILEPATH_NAME -> Bool
+equalFilePath (OSSTRING_NAME p1) (OSSTRING_NAME p2) = C.equalFilePath p1 p2
+
+#ifdef WINDOWS_DOC
+-- | Contract a filename, based on a relative path. Note that the resulting path
+--   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
+--   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
+--   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
+--
+--   The corresponding @makeAbsolute@ function can be found in
+--   @System.Directory@.
+--
+-- > makeRelative "/directory" "/directory/file.ext" == "file.ext"
+-- > Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
+-- > makeRelative x x == "."
+-- > Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
+-- > makeRelative "C:\\Home" "c:\\home\\bob" == "bob"
+-- > makeRelative "C:\\Home" "c:/home/bob" == "bob"
+-- > makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob"
+-- > makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob"
+-- > makeRelative "/Home" "/home/bob" == "bob"
+-- > makeRelative "/" "//" == "//"
+#elif defined(POSIX_DOC)
+-- | Contract a filename, based on a relative path. Note that the resulting path
+--   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
+--   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
+--   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
+--
+--   The corresponding @makeAbsolute@ function can be found in
+--   @System.Directory@.
+--
+-- > makeRelative "/directory" "/directory/file.ext" == "file.ext"
+-- > Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
+-- > makeRelative x x == "."
+-- > Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
+-- > makeRelative "/Home" "/home/bob" == "/home/bob"
+-- > makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar"
+-- > makeRelative "/fred" "bob" == "bob"
+-- > makeRelative "/file/test" "/file/test/fred" == "fred"
+-- > makeRelative "/file/test" "/file/test/fred/" == "fred/"
+-- > makeRelative "some/path" "some/path/a/b/c" == "a/b/c"
+#else
+-- | Contract a filename, based on a relative path. Note that the resulting path
+--   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
+--   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
+--   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
+--
+--   The corresponding @makeAbsolute@ function can be found in
+--   @System.Directory@.
+--
+-- >          makeRelative "/directory" "/directory/file.ext" == "file.ext"
+-- >          Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
+-- >          makeRelative x x == "."
+-- >          Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
+-- > Windows: makeRelative "C:\\Home" "c:\\home\\bob" == "bob"
+-- > Windows: makeRelative "C:\\Home" "c:/home/bob" == "bob"
+-- > Windows: makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob"
+-- > Windows: makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob"
+-- > Windows: makeRelative "/Home" "/home/bob" == "bob"
+-- > Windows: makeRelative "/" "//" == "//"
+-- > Posix:   makeRelative "/Home" "/home/bob" == "/home/bob"
+-- > Posix:   makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar"
+-- > Posix:   makeRelative "/fred" "bob" == "bob"
+-- > Posix:   makeRelative "/file/test" "/file/test/fred" == "fred"
+-- > Posix:   makeRelative "/file/test" "/file/test/fred/" == "fred/"
+-- > Posix:   makeRelative "some/path" "some/path/a/b/c" == "a/b/c"
+#endif
+makeRelative :: FILEPATH_NAME -> FILEPATH_NAME -> FILEPATH_NAME
+makeRelative (OSSTRING_NAME root) (OSSTRING_NAME path) = OSSTRING_NAME $ C.makeRelative root path
+
+#ifdef WINDOWS_DOC
+-- | Normalise a file
+--
+-- * \/\/ outside of the drive can be made blank
+--
+-- * \/ -> 'pathSeparator'
+--
+-- * .\/ -> \"\"
+--
+-- Does not remove @".."@, because of symlinks.
+--
+-- > normalise "c:\\file/bob\\" == "C:\\file\\bob\\"
+-- > normalise "c:\\" == "C:\\"
+-- > normalise "C:.\\" == "C:"
+-- > normalise "\\\\server\\test" == "\\\\server\\test"
+-- > normalise "//server/test" == "\\\\server\\test"
+-- > normalise "c:/file" == "C:\\file"
+-- > normalise "/file" == "\\file"
+-- > normalise "\\" == "\\"
+-- > normalise "/./" == "\\"
+-- > normalise "." == "."
+#elif defined(POSIX_DOC)
+-- | Normalise a file
+--
+-- * \/\/ outside of the drive can be made blank
+--
+-- * \/ -> 'pathSeparator'
+--
+-- * .\/ -> \"\"
+--
+-- Does not remove @".."@, because of symlinks.
+--
+-- > normalise "/file/\\test////" == "/file/\\test/"
+-- > normalise "/file/./test" == "/file/test"
+-- > normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/"
+-- > normalise "../bob/fred/" == "../bob/fred/"
+-- > normalise "/a/../c" == "/a/../c"
+-- > normalise "./bob/fred/" == "bob/fred/"
+-- > normalise "." == "."
+-- > normalise "./" == "./"
+-- > normalise "./." == "./"
+-- > normalise "/./" == "/"
+-- > normalise "/" == "/"
+-- > normalise "bob/fred/." == "bob/fred/"
+-- > normalise "//home" == "/home"
+#else
+-- | Normalise a file
+--
+-- * \/\/ outside of the drive can be made blank
+--
+-- * \/ -> 'pathSeparator'
+--
+-- * .\/ -> \"\"
+--
+-- Does not remove @".."@, because of symlinks.
+--
+-- > Posix:   normalise "/file/\\test////" == "/file/\\test/"
+-- > Posix:   normalise "/file/./test" == "/file/test"
+-- > Posix:   normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/"
+-- > Posix:   normalise "../bob/fred/" == "../bob/fred/"
+-- > Posix:   normalise "/a/../c" == "/a/../c"
+-- > Posix:   normalise "./bob/fred/" == "bob/fred/"
+-- > Windows: normalise "c:\\file/bob\\" == "C:\\file\\bob\\"
+-- > Windows: normalise "c:\\" == "C:\\"
+-- > Windows: normalise "C:.\\" == "C:"
+-- > Windows: normalise "\\\\server\\test" == "\\\\server\\test"
+-- > Windows: normalise "//server/test" == "\\\\server\\test"
+-- > Windows: normalise "c:/file" == "C:\\file"
+-- > Windows: normalise "/file" == "\\file"
+-- > Windows: normalise "\\" == "\\"
+-- > Windows: normalise "/./" == "\\"
+-- >          normalise "." == "."
+-- > Posix:   normalise "./" == "./"
+-- > Posix:   normalise "./." == "./"
+-- > Posix:   normalise "/./" == "/"
+-- > Posix:   normalise "/" == "/"
+-- > Posix:   normalise "bob/fred/." == "bob/fred/"
+-- > Posix:   normalise "//home" == "/home"
+#endif
+normalise :: FILEPATH_NAME -> FILEPATH_NAME
+normalise (OSSTRING_NAME filepath) = OSSTRING_NAME $ C.normalise filepath
+
+
+#ifdef WINDOWS_DOC
+-- | Is a filepath valid, i.e. could you create a file like it? This function checks for invalid names,
+--   and invalid characters, but does not check if length limits are exceeded, as these are typically
+--   filesystem dependent.
+--
+-- > isValid "" == False
+-- > isValid "\0" == False
+-- > isValid "c:\\test" == True
+-- > isValid "c:\\test:of_test" == False
+-- > isValid "test*" == False
+-- > isValid "c:\\test\\nul" == False
+-- > isValid "c:\\test\\prn.txt" == False
+-- > isValid "c:\\nul\\file" == False
+-- > isValid "\\\\" == False
+-- > isValid "\\\\\\foo" == False
+-- > isValid "\\\\?\\D:file" == False
+-- > isValid "foo\tbar" == False
+-- > isValid "nul .txt" == False
+-- > isValid " nul.txt" == True
+#elif defined(POSIX_DOC)
+-- | Is a filepath valid, i.e. could you create a file like it? This function checks for invalid names,
+--   and invalid characters, but does not check if length limits are exceeded, as these are typically
+--   filesystem dependent.
+--
+-- > isValid "" == False
+-- > isValid "\0" == False
+-- > isValid "/random_ path:*" == True
+-- > isValid x == not (null x)
+#else
+-- | Is a filepath valid, i.e. could you create a file like it? This function checks for invalid names,
+--   and invalid characters, but does not check if length limits are exceeded, as these are typically
+--   filesystem dependent.
+--
+-- >          isValid "" == False
+-- >          isValid "\0" == False
+-- > Posix:   isValid "/random_ path:*" == True
+-- > Posix:   isValid x == not (null x)
+-- > Windows: isValid "c:\\test" == True
+-- > Windows: isValid "c:\\test:of_test" == False
+-- > Windows: isValid "test*" == False
+-- > Windows: isValid "c:\\test\\nul" == False
+-- > Windows: isValid "c:\\test\\prn.txt" == False
+-- > Windows: isValid "c:\\nul\\file" == False
+-- > Windows: isValid "\\\\" == False
+-- > Windows: isValid "\\\\\\foo" == False
+-- > Windows: isValid "\\\\?\\D:file" == False
+-- > Windows: isValid "foo\tbar" == False
+-- > Windows: isValid "nul .txt" == False
+-- > Windows: isValid " nul.txt" == True
+#endif
+isValid :: FILEPATH_NAME -> Bool
+isValid (OSSTRING_NAME filepath) = C.isValid filepath
+
+
+#ifdef WINDOWS_DOC
+-- | Take a filepath and make it valid; does not change already valid filepaths.
+--
+-- > isValid (makeValid x)
+-- > isValid x ==> makeValid x == x
+-- > makeValid "" == "_"
+-- > makeValid "file\0name" == "file_name"
+-- > makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
+-- > makeValid "c:\\test:of_test" == "c:\\test_of_test"
+-- > makeValid "test*" == "test_"
+-- > makeValid "c:\\test\\nul" == "c:\\test\\nul_"
+-- > makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt"
+-- > makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt"
+-- > makeValid "c:\\nul\\file" == "c:\\nul_\\file"
+-- > makeValid "\\\\\\foo" == "\\\\drive"
+-- > makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
+-- > makeValid "nul .txt" == "nul _.txt"
+#elif defined(POSIX_DOC)
+-- | Take a filepath and make it valid; does not change already valid filepaths.
+--
+-- > isValid (makeValid x)
+-- > isValid x ==> makeValid x == x
+-- > makeValid "" == "_"
+-- > makeValid "file\0name" == "file_name"
+#else
+-- | Take a filepath and make it valid; does not change already valid filepaths.
+--
+-- > isValid (makeValid x)
+-- > isValid x ==> makeValid x == x
+-- > makeValid "" == "_"
+-- > makeValid "file\0name" == "file_name"
+-- > Windows: makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
+-- > Windows: makeValid "c:\\test:of_test" == "c:\\test_of_test"
+-- > Windows: makeValid "test*" == "test_"
+-- > Windows: makeValid "c:\\test\\nul" == "c:\\test\\nul_"
+-- > Windows: makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt"
+-- > Windows: makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt"
+-- > Windows: makeValid "c:\\nul\\file" == "c:\\nul_\\file"
+-- > Windows: makeValid "\\\\\\foo" == "\\\\drive"
+-- > Windows: makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
+-- > Windows: makeValid "nul .txt" == "nul _.txt"
+#endif
+makeValid :: FILEPATH_NAME -> FILEPATH_NAME
+makeValid (OSSTRING_NAME path) = OSSTRING_NAME $ C.makeValid path
+
+
+#ifdef WINDOWS_DOC
+-- | Is a path relative, or is it fixed to the root?
+--
+-- > isRelative "path\\test" == True
+-- > isRelative "c:\\test" == False
+-- > isRelative "c:test" == True
+-- > isRelative "c:\\" == False
+-- > isRelative "c:/" == False
+-- > isRelative "c:" == True
+-- > isRelative "\\\\foo" == False
+-- > isRelative "\\\\?\\foo" == False
+-- > isRelative "\\\\?\\UNC\\foo" == False
+-- > isRelative "/foo" == True
+-- > isRelative "\\foo" == True
+--
+-- According to [1]:
+--
+-- * "A UNC name of any format [is never relative]."
+--
+-- * "You cannot use the "\\?\" prefix with a relative path."
+#elif defined(POSIX_DOC)
+-- | Is a path relative, or is it fixed to the root?
+--
+-- > isRelative "test/path" == True
+-- > isRelative "/test" == False
+-- > isRelative "/" == False
+#else
+-- | Is a path relative, or is it fixed to the root?
+--
+-- > Windows: isRelative "path\\test" == True
+-- > Windows: isRelative "c:\\test" == False
+-- > Windows: isRelative "c:test" == True
+-- > Windows: isRelative "c:\\" == False
+-- > Windows: isRelative "c:/" == False
+-- > Windows: isRelative "c:" == True
+-- > Windows: isRelative "\\\\foo" == False
+-- > Windows: isRelative "\\\\?\\foo" == False
+-- > Windows: isRelative "\\\\?\\UNC\\foo" == False
+-- > Windows: isRelative "/foo" == True
+-- > Windows: isRelative "\\foo" == True
+-- > Posix:   isRelative "test/path" == True
+-- > Posix:   isRelative "/test" == False
+-- > Posix:   isRelative "/" == False
+--
+-- According to [1]:
+--
+-- * "A UNC name of any format [is never relative]."
+--
+-- * "You cannot use the "\\?\" prefix with a relative path."
+#endif
+isRelative :: FILEPATH_NAME -> Bool
+isRelative (OSSTRING_NAME x) = C.isRelative x
+
+
+-- | @not . 'isRelative'@
+--
+-- > isAbsolute x == not (isRelative x)
+isAbsolute :: FILEPATH_NAME -> Bool
+isAbsolute (OSSTRING_NAME x) = C.isAbsolute x
+
+
+-- things not defined in os-string
+
+#ifdef WINDOWS
+encodeFS :: String -> IO WindowsPath
+encodeFS = fmap WindowsString . encodeWithBaseWindows
+
+decodeFS :: WindowsPath -> IO String
+decodeFS (WindowsString x) = decodeWithBaseWindows x
+#elif defined(POSIX)
+encodeFS :: String -> IO PosixPath
+encodeFS = fmap PosixString . encodeWithBasePosix
+
+decodeFS :: PosixPath -> IO String
+decodeFS (PosixString x) = decodeWithBasePosix x
+#else
+encodeFS :: String -> IO OsPath
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+encodeFS = fmap (OsString . WindowsString) . encodeWithBaseWindows
+#else
+encodeFS = fmap (OsString . PosixString) . encodeWithBasePosix
+#endif
+
+decodeFS :: OsPath -> IO String
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+decodeFS (OsString (WindowsString x)) = decodeWithBaseWindows x
+#else
+decodeFS (OsString (PosixString x)) = decodeWithBasePosix x
+#endif
+
+#endif
+
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Encoding.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Encoding.hs
new file mode 100644
index 0000000000..6281ef38b8
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Encoding.hs
@@ -0,0 +1,31 @@
+module System.OsPath.Encoding
+  (
+  -- * Types
+    EncodingException(..)
+  , showEncodingException
+
+  -- * UCS-2
+  , ucs2le
+  , mkUcs2le
+  , ucs2le_DF
+  , ucs2le_EF
+  , ucs2le_decode
+  , ucs2le_encode
+
+  -- * UTF-16LE_b
+  , utf16le_b
+  , mkUTF16le_b
+  , utf16le_b_DF
+  , utf16le_b_EF
+  , utf16le_b_decode
+  , utf16le_b_encode
+
+  -- * base encoding
+  , encodeWithBasePosix
+  , decodeWithBasePosix
+  , encodeWithBaseWindows
+  , decodeWithBaseWindows
+  )
+  where
+
+import System.OsString.Encoding.Internal
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Internal.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Internal.hs
new file mode 100644
index 0000000000..bc1d5a9bfc
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Internal.hs
@@ -0,0 +1,176 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE UnliftedFFITypes #-}
+{-# LANGUAGE TemplateHaskellQuotes #-}
+{-# LANGUAGE ViewPatterns #-}  -- needed to quote a view pattern
+
+module System.OsPath.Internal where
+
+import {-# SOURCE #-} System.OsPath
+    ( isValid )
+import System.OsPath.Types
+import qualified System.OsString.Internal as OS
+
+import Control.Monad.Catch
+    ( MonadThrow )
+import Data.ByteString
+    ( ByteString )
+import Language.Haskell.TH.Quote
+    ( QuasiQuoter (..) )
+import Language.Haskell.TH.Syntax
+    ( Lift (..), lift )
+import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
+
+import System.OsString.Internal.Types
+import System.OsPath.Encoding
+import Control.Monad (when)
+import System.IO
+    ( TextEncoding )
+
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+import qualified System.OsPath.Windows as PF
+import GHC.IO.Encoding.UTF16 ( mkUTF16le )
+#else
+import qualified System.OsPath.Posix as PF
+import GHC.IO.Encoding.UTF8 ( mkUTF8 )
+#endif
+import GHC.Stack (HasCallStack)
+
+
+
+-- | Partial unicode friendly encoding.
+--
+-- On windows this encodes as UTF16-LE (strictly), which is a pretty good guess.
+-- On unix this encodes as UTF8 (strictly), which is a good guess.
+--
+-- Throws an 'EncodingException' if encoding fails. If the input does not
+-- contain surrogate chars, you can use 'unsafeEncodeUtf'.
+encodeUtf :: MonadThrow m => FilePath -> m OsPath
+encodeUtf = OS.encodeUtf
+
+-- | Unsafe unicode friendly encoding.
+--
+-- Like 'encodeUtf', except it crashes when the input contains
+-- surrogate chars. For sanitized input, this can be useful.
+unsafeEncodeUtf :: HasCallStack => String -> OsString
+unsafeEncodeUtf = OS.unsafeEncodeUtf
+
+-- | Encode a 'FilePath' with the specified encoding.
+--
+-- Note: on windows, we expect a "wide char" encoding (e.g. UCS-2 or UTF-16). Anything
+-- that works with @Word16@ boundaries. Picking an incompatible encoding may crash
+-- filepath operations.
+encodeWith :: TextEncoding  -- ^ unix text encoding
+           -> TextEncoding  -- ^ windows text encoding (wide char)
+           -> FilePath
+           -> Either EncodingException OsPath
+encodeWith = OS.encodeWith
+
+-- | Like 'encodeUtf', except this mimics the behavior of the base library when doing filesystem
+-- operations, which is:
+--
+-- 1. on unix, uses shady PEP 383 style encoding (based on the current locale,
+--    but PEP 383 only works properly on UTF-8 encodings, so good luck)
+-- 2. on windows does permissive UTF-16 encoding, where coding errors generate
+--    Chars in the surrogate range
+--
+-- Looking up the locale requires IO. If you're not worried about calls
+-- to 'setFileSystemEncoding', then 'unsafePerformIO' may be feasible (make sure
+-- to deeply evaluate the result to catch exceptions).
+encodeFS :: FilePath -> IO OsPath
+encodeFS = OS.encodeFS
+
+
+-- | Partial unicode friendly decoding.
+--
+-- On windows this decodes as UTF16-LE (strictly), which is a pretty good guess.
+-- On unix this decodes as UTF8 (strictly), which is a good guess.
+--
+-- Throws a 'EncodingException' if decoding fails.
+decodeUtf :: MonadThrow m => OsPath -> m FilePath
+decodeUtf = OS.decodeUtf
+
+-- | Decode an 'OsPath' with the specified encoding.
+decodeWith :: TextEncoding  -- ^ unix text encoding
+           -> TextEncoding  -- ^ windows text encoding
+           -> OsPath
+           -> Either EncodingException FilePath
+decodeWith = OS.decodeWith
+
+-- | Like 'decodeUtf', except this mimics the behavior of the base library when doing filesystem
+-- operations, which is:
+--
+-- 1. on unix, uses shady PEP 383 style encoding (based on the current locale,
+--    but PEP 383 only works properly on UTF-8 encodings, so good luck)
+-- 2. on windows does permissive UTF-16 encoding, where coding errors generate
+--    Chars in the surrogate range
+--
+-- Looking up the locale requires IO. If you're not worried about calls
+-- to 'setFileSystemEncoding', then 'unsafePerformIO' may be feasible (make sure
+-- to deeply evaluate the result to catch exceptions).
+decodeFS :: OsPath -> IO FilePath
+decodeFS = OS.decodeFS
+
+
+-- | Constructs an @OsPath@ from a ByteString.
+--
+-- On windows, this ensures valid UCS-2LE, on unix it is passed unchanged/unchecked.
+--
+-- Throws 'EncodingException' on invalid UCS-2LE on windows (although unlikely).
+fromBytes :: MonadThrow m
+          => ByteString
+          -> m OsPath
+fromBytes = OS.fromBytes
+
+
+
+-- | QuasiQuote an 'OsPath'. This accepts Unicode characters
+-- and encodes as UTF-8 on unix and UTF-16LE on windows. Runs 'isValid'
+-- on the input. If used as a pattern, requires turning on the @ViewPatterns@
+-- extension.
+osp :: QuasiQuoter
+osp = QuasiQuoter
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+  { quoteExp = \s -> do
+      osp' <- either (fail . show) (pure . OsString) . PF.encodeWith (mkUTF16le ErrorOnCodingFailure) $ s
+      when (not $ isValid osp') $ fail ("filepath not valid: " ++ show osp')
+      lift osp'
+  , quotePat = \s -> do
+      osp' <- either (fail . show) (pure . OsString) . PF.encodeWith (mkUTF16le ErrorOnCodingFailure) $ s
+      when (not $ isValid osp') $ fail ("filepath not valid: " ++ show osp')
+      [p|((==) osp' -> True)|]
+  , quoteType = \_ ->
+      fail "illegal QuasiQuote (allowed as expression or pattern only, used as a type)"
+  , quoteDec  = \_ ->
+      fail "illegal QuasiQuote (allowed as expression or pattern only, used as a declaration)"
+  }
+#else
+  { quoteExp = \s -> do
+      osp' <- either (fail . show) (pure . OsString) . PF.encodeWith (mkUTF8 ErrorOnCodingFailure) $ s
+      when (not $ isValid osp') $ fail ("filepath not valid: " ++ show osp')
+      lift osp'
+  , quotePat = \s -> do
+      osp' <- either (fail . show) (pure . OsString) . PF.encodeWith (mkUTF8 ErrorOnCodingFailure) $ s
+      when (not $ isValid osp') $ fail ("filepath not valid: " ++ show osp')
+      [p|((==) osp' -> True)|]
+  , quoteType = \_ ->
+      fail "illegal QuasiQuote (allowed as expression or pattern only, used as a type)"
+  , quoteDec  = \_ ->
+      fail "illegal QuasiQuote (allowed as expression or pattern only, used as a declaration)"
+  }
+#endif
+
+
+-- | Unpack an 'OsPath' to a list of 'OsChar'.
+unpack :: OsPath -> [OsChar]
+unpack = OS.unpack
+
+
+-- | Pack a list of 'OsChar' to an 'OsPath'.
+--
+-- Note that using this in conjunction with 'unsafeFromChar' to
+-- convert from @[Char]@ to 'OsPath' is probably not what
+-- you want, because it will truncate unicode code points.
+pack :: [OsChar] -> OsPath
+pack = OS.pack
+
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Posix.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Posix.hs
new file mode 100644
index 0000000000..fc62c86bbe
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Posix.hs
@@ -0,0 +1,31 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskellQuotes #-}
+{-# LANGUAGE ViewPatterns #-}
+
+#undef  WINDOWS
+#define POSIX
+#define IS_WINDOWS False
+#define FILEPATH_NAME PosixPath
+#define OSSTRING_NAME PosixString
+#define WORD_NAME PosixChar
+
+#include "Common.hs"
+
+-- | QuasiQuote a 'PosixPath'. This accepts Unicode characters
+-- and encodes as UTF-8. Runs 'isValid' on the input.
+pstr :: QuasiQuoter
+pstr =
+  QuasiQuoter
+  { quoteExp = \s -> do
+      ps <- either (fail . show) pure $ encodeWith (mkUTF8 ErrorOnCodingFailure) s
+      when (not $ isValid ps) $ fail ("filepath not valid: " ++ show ps)
+      lift ps
+  , quotePat = \s -> do
+      osp' <- either (fail . show) pure . encodeWith (mkUTF8 ErrorOnCodingFailure) $ s
+      when (not $ isValid osp') $ fail ("filepath not valid: " ++ show osp')
+      [p|((==) osp' -> True)|]
+  , quoteType = \_ ->
+      fail "illegal QuasiQuote (allowed as expression or pattern only, used as a type)"
+  , quoteDec  = \_ ->
+      fail "illegal QuasiQuote (allowed as expression or pattern only, used as a declaration)"
+  }
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Posix/Internal.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Posix/Internal.hs
new file mode 100644
index 0000000000..312f789b83
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Posix/Internal.hs
@@ -0,0 +1,8 @@
+{-# LANGUAGE CPP #-}
+
+#undef WINDOWS
+#define OS_PATH
+#define IS_WINDOWS False
+#define MODULE_NAME Posix
+
+#include "../../FilePath/Internal.hs"
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Types.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Types.hs
new file mode 100644
index 0000000000..6bf1b774ce
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Types.hs
@@ -0,0 +1,42 @@
+{-# LANGUAGE CPP #-}
+
+module System.OsPath.Types
+  (
+  -- * FilePath types
+    OsPath
+  , WindowsPath
+  , PosixPath
+  , PlatformPath
+
+  -- * OsString reexports
+  , WindowsString
+  , PosixString
+  , WindowsChar
+  , PosixChar
+  , OsString
+  , OsChar
+  )
+where
+
+import System.OsString.Internal.Types
+
+
+-- | Filepaths are @wchar_t*@ data on windows as passed to syscalls.
+type WindowsPath = WindowsString
+
+-- | Filepaths are @char[]@ data on unix as passed to syscalls.
+type PosixPath = PosixString
+
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+-- | Ifdef around current platform (either 'WindowsPath' or 'PosixPath').
+type PlatformPath = WindowsPath
+#else
+-- | Ifdef around current platform (either 'WindowsPath' or 'PosixPath').
+type PlatformPath = PosixPath
+#endif
+
+
+-- | Type representing filenames\/pathnames.
+--
+-- This type doesn't add any guarantees over 'OsString'.
+type OsPath = OsString
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Windows.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Windows.hs
new file mode 100644
index 0000000000..ab9efc03f5
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Windows.hs
@@ -0,0 +1,32 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskellQuotes #-}
+{-# LANGUAGE ViewPatterns #-}
+
+#undef  POSIX
+#define IS_WINDOWS True
+#define WINDOWS
+#define FILEPATH_NAME WindowsPath
+#define OSSTRING_NAME WindowsString
+#define WORD_NAME WindowsChar
+
+#include "Common.hs"
+
+
+-- | QuasiQuote a 'WindowsPath'. This accepts Unicode characters
+-- and encodes as UTF-16LE. Runs 'isValid' on the input.
+pstr :: QuasiQuoter
+pstr =
+  QuasiQuoter
+  { quoteExp = \s -> do
+      ps <- either (fail . show) pure $ encodeWith (mkUTF16le ErrorOnCodingFailure) s
+      when (not $ isValid ps) $ fail ("filepath not valid: " ++ show ps)
+      lift ps
+  , quotePat = \s -> do
+      osp' <- either (fail . show) pure . encodeWith (mkUTF16le ErrorOnCodingFailure) $ s
+      when (not $ isValid osp') $ fail ("filepath not valid: " ++ show osp')
+      [p|((==) osp' -> True)|]
+  , quoteType = \_ ->
+      fail "illegal QuasiQuote (allowed as expression or pattern only, used as a type)"
+  , quoteDec  = \_ ->
+      fail "illegal QuasiQuote (allowed as expression or pattern only, used as a declaration)"
+  }
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Windows/Internal.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Windows/Internal.hs
new file mode 100644
index 0000000000..a32d812403
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/System/OsPath/Windows/Internal.hs
@@ -0,0 +1,9 @@
+{-# LANGUAGE CPP #-}
+
+#undef  POSIX
+#define WINDOWS
+#define OS_PATH
+#define IS_WINDOWS True
+#define MODULE_NAME Windows
+
+#include "../../FilePath/Internal.hs"
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/bench/BenchFilePath.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/bench/BenchFilePath.hs
new file mode 100644
index 0000000000..5319f1c0d1
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/bench/BenchFilePath.hs
@@ -0,0 +1,245 @@
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE QuasiQuotes #-}
+
+module Main where
+
+import System.OsPath.Types
+import System.OsPath.Encoding ( ucs2le )
+import qualified System.OsString.Internal.Types as OST
+import qualified Data.ByteString.Short as SBS
+
+import Test.Tasty.Bench
+
+import qualified System.FilePath.Posix as PF
+import qualified System.FilePath.Posix as WF
+import qualified System.OsString.Posix as OSP
+import qualified System.OsString.Windows as WSP
+import qualified System.OsPath.Posix as APF
+import qualified System.OsPath.Windows as AWF
+
+main :: IO ()
+main = defaultMain
+    [ bgroup "filepath (string)" $ map (uncurry bench)
+      [("splitExtension (posix)"      , nf PF.splitExtension posixPath)
+      ,("splitExtension (windows)"    , nf WF.splitExtension windowsPath)
+      ,("takeExtension (posix)"       , nf PF.takeExtension posixPath)
+      ,("takeExtension (windows)"     , nf WF.takeExtension windowsPath)
+      ,("replaceExtension (posix)"    , nf (PF.replaceExtension ".lol") posixPath)
+      ,("replaceExtension (windows)"  , nf (WF.replaceExtension ".lol") windowsPath)
+      ,("dropExtension (posix)"       , nf PF.dropExtension posixPath)
+      ,("dropExtension (windows)"     , nf WF.dropExtension windowsPath)
+      ,("addExtension (posix)"        , nf (PF.addExtension ".lol") posixPath)
+      ,("addExtension (windows)"      , nf (WF.addExtension ".lol") windowsPath)
+      ,("hasExtension (posix)"        , nf PF.hasExtension posixPath)
+      ,("hasExtension (windows)"      , nf WF.hasExtension windowsPath)
+      ,("splitExtensions (posix)"     , nf PF.splitExtensions posixPath)
+      ,("splitExtensions (windows)"   , nf WF.splitExtensions windowsPath)
+      ,("dropExtensions (posix)"      , nf PF.dropExtensions posixPath)
+      ,("dropExtensions (windows)"    , nf WF.dropExtensions windowsPath)
+      ,("takeExtensions (posix)"      , nf PF.takeExtensions posixPath)
+      ,("takeExtensions (windows)"    , nf WF.takeExtensions windowsPath)
+      ,("replaceExtensions (posix)"   , nf (PF.replaceExtensions ".lol") posixPath)
+      ,("replaceExtensions (windows)" , nf (WF.replaceExtensions ".lol") windowsPath)
+      ,("isExtensionOf (posix)"       , nf (PF.isExtensionOf ".lol") posixPath)
+      ,("isExtensionOf (windows)"     , nf (WF.isExtensionOf ".lol") windowsPath)
+      ,("stripExtension (posix)"      , nf (PF.stripExtension ".lol") posixPath)
+      ,("stripExtension (windows)"    , nf (WF.stripExtension ".lol") windowsPath)
+
+      ,("splitFileName (posix)"       , nf PF.splitFileName posixPath)
+      ,("splitFileName (windows)"     , nf WF.splitFileName windowsPath)
+      ,("takeFileName (posix)"        , nf PF.takeFileName posixPath)
+      ,("takeFileName (windows)"      , nf WF.takeFileName windowsPath)
+      ,("replaceFileName (posix)"     , nf (PF.replaceFileName "lol") posixPath)
+      ,("replaceFileName (windows)"   , nf (WF.replaceFileName "lol") windowsPath)
+      ,("dropFileName (posix)"        , nf PF.dropFileName posixPath)
+      ,("dropFileName (windows)"      , nf WF.dropFileName windowsPath)
+      ,("takeBaseName (posix)"        , nf PF.takeBaseName posixPath)
+      ,("takeBaseName (windows)"      , nf WF.takeBaseName windowsPath)
+      ,("replaceBaseName (posix)"     , nf (PF.replaceBaseName "lol") posixPath)
+      ,("replaceBaseName (windows)"   , nf (WF.replaceBaseName "lol") windowsPath)
+      ,("takeDirectory (posix)"       , nf PF.takeDirectory posixPath)
+      ,("takeDirectory (windows)"     , nf WF.takeDirectory windowsPath)
+      ,("replaceDirectory (posix)"    , nf (PF.replaceDirectory "lol") posixPath)
+      ,("replaceDirectory (windows)"  , nf (WF.replaceDirectory "lol") windowsPath)
+      ,("combine (posix)"             , nf (PF.combine "lol") posixPath)
+      ,("combine (windows)"           , nf (WF.combine "lol") windowsPath)
+      ,("splitPath (posix)"           , nf PF.splitPath    posixPath)
+      ,("splitPath (windows)"         , nf WF.splitPath    windowsPath)
+      ,("joinPath (posix)"            , nf PF.joinPath     (PF.splitPath posixPath))
+      ,("joinPath (windows)"          , nf WF.joinPath     (WF.splitPath windowsPath))
+      ,("splitDirectories (posix)"    , nf PF.splitDirectories    posixPath)
+      ,("splitDirectories (windows)"  , nf WF.splitDirectories    windowsPath)
+
+      ,("splitDrive (posix)"          , nf PF.splitDrive    posixPath)
+      ,("splitDrive (windows)"        , nf WF.splitDrive    windowsPath)
+      ,("joinDrive (posix)"           , nf (PF.joinDrive "/")    posixPath)
+      ,("joinDrive (windows)"         , nf (WF.joinDrive "C:\\")  windowsPath)
+      ,("takeDrive (posix)"           , nf PF.takeDrive    posixPath)
+      ,("takeDrive (windows)"         , nf WF.takeDrive    windowsPath)
+      ,("hasDrive (posix)"            , nf PF.hasDrive    posixPath)
+      ,("hasDrive (windows)"          , nf WF.hasDrive    windowsPath)
+      ,("dropDrive (posix)"           , nf PF.dropDrive    posixPath)
+      ,("dropDrive (windows)"         , nf WF.dropDrive    windowsPath)
+      ,("isDrive (posix)"             , nf PF.isDrive    posixPath)
+      ,("isDrive (windows)"           , nf WF.isDrive    windowsPath)
+
+      ,("hasTrailingPathSeparator (posix)"    , nf PF.hasTrailingPathSeparator    posixPath)
+      ,("hasTrailingPathSeparator (windows)"  , nf WF.hasTrailingPathSeparator    windowsPath)
+      ,("addTrailingPathSeparator (posix)"    , nf PF.addTrailingPathSeparator    posixPath)
+      ,("addTrailingPathSeparator (windows)"  , nf WF.addTrailingPathSeparator    windowsPath)
+      ,("dropTrailingPathSeparator (posix)"   , nf PF.addTrailingPathSeparator    posixPath)
+      ,("dropTrailingPathSeparator (windows)" , nf WF.addTrailingPathSeparator    windowsPath)
+
+      ,("normalise (posix)"           , nf PF.normalise    posixPath)
+      ,("normalise (windows)"         , nf WF.normalise    windowsPath)
+      ,("equalFilePath (posix)"       , nf (PF.equalFilePath "abc/def/zs")   posixPath)
+      ,("equalFilePath (windows)"     , nf (WF.equalFilePath "abc/def/zs")   windowsPath)
+      ,("makeRelative (posix)"        , nf (PF.makeRelative "abc/def/zs")   posixPath)
+      ,("makeRelative (windows)"      , nf (WF.makeRelative "abc/def/zs")   windowsPath)
+      ,("isRelative (posix)"          , nf PF.isRelative    posixPath)
+      ,("isRelative (windows)"        , nf WF.isRelative    windowsPath)
+      ,("isAbsolute (posix)"          , nf PF.isAbsolute    posixPath)
+      ,("isAbsolute (windows)"        , nf WF.isAbsolute    windowsPath)
+      ,("isValid (posix)"             , nf PF.isValid    posixPath)
+      ,("isValid (windows)"           , nf WF.isValid    windowsPath)
+      ,("makeValid (posix)"           , nf PF.makeValid    posixPath)
+      ,("makeValid (windows)"         , nf WF.makeValid    windowsPath)
+
+      ,("splitSearchPath (posix)"    , nf PF.splitSearchPath posixSearchPath)
+      ,("splitSearchPath (windows)"  , nf WF.splitSearchPath windowsSearchPath)
+      ]
+
+    , bgroup "filepath (AFPP)" $ map (uncurry bench)
+      [ ("splitExtension (posix)"      , nf APF.splitExtension posixPathAFPP)
+      , ("splitExtension (windows)"    , nf AWF.splitExtension windowsPathAFPP)
+      , ("takeExtension (posix)"       , nf APF.takeExtension posixPathAFPP)
+      , ("takeExtension (windows)"     , nf AWF.takeExtension windowsPathAFPP)
+      , ("replaceExtension (posix)"    , nf (APF.replaceExtension [OSP.pstr|.lol|]) posixPathAFPP)
+      , ("replaceExtension (windows)"  , nf (AWF.replaceExtension [WSP.pstr|.lol|]) windowsPathAFPP)
+      , ("dropExtension (posix)"       , nf APF.dropExtension posixPathAFPP)
+      , ("dropExtension (windows)"     , nf AWF.dropExtension windowsPathAFPP)
+      , ("addExtension (posix)"        , nf (APF.addExtension [OSP.pstr|.lol|]) posixPathAFPP)
+      , ("addExtension (windows)"      , nf (AWF.addExtension [WSP.pstr|.lol|]) windowsPathAFPP)
+      , ("hasExtension (posix)"        , nf APF.hasExtension posixPathAFPP)
+      , ("hasExtension (windows)"      , nf AWF.hasExtension windowsPathAFPP)
+      , ("splitExtensions (posix)"     , nf APF.splitExtensions posixPathAFPP)
+      , ("splitExtensions (windows)"   , nf AWF.splitExtensions windowsPathAFPP)
+      , ("dropExtensions (posix)"      , nf APF.dropExtensions posixPathAFPP)
+      , ("dropExtensions (windows)"    , nf AWF.dropExtensions windowsPathAFPP)
+      , ("takeExtensions (posix)"      , nf APF.takeExtensions posixPathAFPP)
+      , ("takeExtensions (windows)"    , nf AWF.takeExtensions windowsPathAFPP)
+      , ("replaceExtensions (posix)"   , nf (APF.replaceExtensions [OSP.pstr|.lol|]) posixPathAFPP)
+      , ("replaceExtensions (windows)" , nf (AWF.replaceExtensions [WSP.pstr|.lol|]) windowsPathAFPP)
+      , ("isExtensionOf (posix)"       , nf (APF.isExtensionOf [OSP.pstr|.lol|]) posixPathAFPP)
+      , ("isExtensionOf (windows)"     , nf (AWF.isExtensionOf [WSP.pstr|.lol|]) windowsPathAFPP)
+      , ("stripExtension (posix)"      , nf (APF.stripExtension [OSP.pstr|.lol|]) posixPathAFPP)
+      , ("stripExtension (windows)"    , nf (AWF.stripExtension [WSP.pstr|.lol|]) windowsPathAFPP)
+
+      , ("splitFileName (posix)"       , nf APF.splitFileName posixPathAFPP)
+      , ("splitFileName (windows)"     , nf AWF.splitFileName windowsPathAFPP)
+      , ("takeFileName (posix)"        , nf APF.takeFileName posixPathAFPP)
+      , ("takeFileName (windows)"      , nf AWF.takeFileName windowsPathAFPP)
+      , ("replaceFileName (posix)"     , nf (APF.replaceFileName [OSP.pstr|lol|]) posixPathAFPP)
+      , ("replaceFileName (windows)"   , nf (AWF.replaceFileName [WSP.pstr|lol|]) windowsPathAFPP)
+      , ("dropFileName (posix)"        , nf APF.dropFileName posixPathAFPP)
+      , ("dropFileName (windows)"      , nf AWF.dropFileName windowsPathAFPP)
+      , ("takeBaseName (posix)"        , nf APF.takeBaseName posixPathAFPP)
+      , ("takeBaseName (windows)"      , nf AWF.takeBaseName windowsPathAFPP)
+      , ("replaceBaseName (posix)"     , nf (APF.replaceBaseName [OSP.pstr|lol|]) posixPathAFPP)
+      , ("replaceBaseName (windows)"   , nf (AWF.replaceBaseName [WSP.pstr|lol|]) windowsPathAFPP)
+      , ("takeDirectory (posix)"       , nf APF.takeDirectory posixPathAFPP)
+      , ("takeDirectory (windows)"     , nf AWF.takeDirectory windowsPathAFPP)
+      , ("replaceDirectory (posix)"    , nf (APF.replaceDirectory [OSP.pstr|lol|]) posixPathAFPP)
+      , ("replaceDirectory (windows)"  , nf (AWF.replaceDirectory [WSP.pstr|lol|]) windowsPathAFPP)
+      , ("combine (posix)"             , nf (APF.combine [OSP.pstr|lol|]) posixPathAFPP)
+      , ("combine (windows)"           , nf (AWF.combine [WSP.pstr|lol|]) windowsPathAFPP)
+      , ("splitPath (posix)"           , nf APF.splitPath    posixPathAFPP)
+      , ("splitPath (windows)"         , nf AWF.splitPath    windowsPathAFPP)
+      , ("joinPath (posix)"            , nf APF.joinPath     (APF.splitPath posixPathAFPP))
+      , ("joinPath (windows)"          , nf AWF.joinPath     (AWF.splitPath windowsPathAFPP))
+      , ("splitDirectories (posix)"    , nf APF.splitDirectories    posixPathAFPP)
+      , ("splitDirectories (windows)"  , nf AWF.splitDirectories    windowsPathAFPP)
+
+      , ("splitDrive (posix)"          , nf APF.splitDrive    posixPathAFPP)
+      , ("splitDrive (windows)"        , nf AWF.splitDrive    windowsPathAFPP)
+      , ("joinDrive (posix)"           , nf (APF.joinDrive [OSP.pstr|/|])    posixPathAFPP)
+      , ("joinDrive (windows)"         , nf (AWF.joinDrive [WSP.pstr|C:\|])    windowsPathAFPP)
+      , ("takeDrive (posix)"           , nf APF.takeDrive    posixPathAFPP)
+      , ("takeDrive (windows)"         , nf AWF.takeDrive    windowsPathAFPP)
+      , ("hasDrive (posix)"            , nf APF.hasDrive    posixPathAFPP)
+      , ("hasDrive (windows)"          , nf AWF.hasDrive    windowsPathAFPP)
+      , ("dropDrive (posix)"           , nf APF.dropDrive    posixPathAFPP)
+      , ("dropDrive (windows)"         , nf AWF.dropDrive    windowsPathAFPP)
+      , ("isDrive (posix)"             , nf APF.isDrive    posixPathAFPP)
+      , ("isDrive (windows)"           , nf AWF.isDrive    windowsPathAFPP)
+
+      , ("hasTrailingPathSeparator (posix)"    , nf APF.hasTrailingPathSeparator    posixPathAFPP)
+      , ("hasTrailingPathSeparator (windows)"  , nf AWF.hasTrailingPathSeparator    windowsPathAFPP)
+      , ("addTrailingPathSeparator (posix)"    , nf APF.addTrailingPathSeparator    posixPathAFPP)
+      , ("addTrailingPathSeparator (windows)"  , nf AWF.addTrailingPathSeparator    windowsPathAFPP)
+      , ("dropTrailingPathSeparator (posix)"   , nf APF.addTrailingPathSeparator    posixPathAFPP)
+      , ("dropTrailingPathSeparator (windows)" , nf AWF.addTrailingPathSeparator    windowsPathAFPP)
+
+      , ("normalise (posix)"           , nf APF.normalise    posixPathAFPP)
+      , ("normalise (windows)"         , nf AWF.normalise    windowsPathAFPP)
+      , ("equalFilePath (posix)"       , nf (APF.equalFilePath [OSP.pstr|abc/def/zs|])   posixPathAFPP)
+      , ("equalFilePath (windows)"     , nf (AWF.equalFilePath [WSP.pstr|abc/def/zs|])   windowsPathAFPP)
+      , ("makeRelative (posix)"        , nf (APF.makeRelative [OSP.pstr|abc/def/zs|])   posixPathAFPP)
+      , ("makeRelative (windows)"      , nf (AWF.makeRelative [WSP.pstr|abc/def/zs|])   windowsPathAFPP)
+      , ("isRelative (posix)"          , nf APF.isRelative    posixPathAFPP)
+      , ("isRelative (windows)"        , nf AWF.isRelative    windowsPathAFPP)
+      , ("isAbsolute (posix)"          , nf APF.isAbsolute    posixPathAFPP)
+      , ("isAbsolute (windows)"        , nf AWF.isAbsolute    windowsPathAFPP)
+      , ("isValid (posix)"             , nf APF.isValid    posixPathAFPP)
+      , ("isValid (windows)"           , nf AWF.isValid    windowsPathAFPP)
+      , ("makeValid (posix)"           , nf APF.makeValid    posixPathAFPP)
+      , ("makeValid (windows)"         , nf AWF.makeValid    windowsPathAFPP)
+
+      , ("splitSearchPath (posix)"     , nf APF.splitSearchPath posixSearchPathAFPP)
+      , ("splitSearchPath (windows)"   , nf AWF.splitSearchPath windowsSearchPathAFPP)
+      ]
+
+    , bgroup "encoding/decoding" $ map (uncurry bench)
+      [ ("decodeUtf (posix)"                  , nf (APF.decodeUtf @Maybe) posixPathAFPP)
+      , ("decodeUtf (windows)"                , nf (AWF.decodeUtf @Maybe) windowsPathAFPP)
+      , ("decodeWith (windows)"               , nf (AWF.decodeWith ucs2le) windowsPathAFPP)
+
+      , ("encodeUtf (posix)"                  , nf (APF.encodeUtf @Maybe) posixPath)
+      , ("encodeUtf (windows)"                , nf (AWF.encodeUtf @Maybe) windowsPath)
+      , ("encodeWith (windows)"               , nf (AWF.encodeWith ucs2le) windowsPath)
+
+      , ("unpack PlatformString (posix)"       , nf APF.unpack posixPathAFPP)
+      , ("unpack PlatformString (windows)"     , nf AWF.unpack windowsPathAFPP)
+      , ("pack PlatformString (posix)"         , nf APF.pack (APF.unpack posixPathAFPP))
+      , ("pack PlatformString (windows)"       , nf AWF.pack (AWF.unpack windowsPathAFPP))
+
+      , ("fromBytes (posix)"                  , nf (OSP.fromBytes @Maybe) (SBS.fromShort . OST.getPosixString $ posixPathAFPP))
+      , ("fromBytes (windows)"                , nf (WSP.fromBytes @Maybe) (SBS.fromShort . OST.getWindowsString $ windowsPathAFPP))
+      ]
+    ]
+
+
+posixPath :: FilePath
+posixPath = "/foo/bar/bath/baz/baz/tz/fooooooooooooooo/laaaaaaaaaaaaaaa/baaaaaaaaaaaaar/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk/kkkkkkkkkkkkkkkkkk/h/h/h/a/s/r/a/h/gt/r/r/r/s/s.txt"
+
+windowsPath :: FilePath
+windowsPath = "C:\\foo\\bar\\bath\\baz\\baz\\tz\\fooooooooooooooo\\laaaaaaaaaaaaaaa\\baaaaaaaaaaaaar\\zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz\\zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz\\kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk\\kkkkkkkkkkkkkkkkkk\\h\\h\\h\\a\\s\\r\\a\\h\\gt\\r\\r\\r\\s\\s.txt"
+
+posixPathAFPP :: PosixPath
+posixPathAFPP = [OSP.pstr|/foo/bar/bath/baz/baz/tz/fooooooooooooooo/laaaaaaaaaaaaaaa/baaaaaaaaaaaaar/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk/kkkkkkkkkkkkkkkkkk/h/h/h/a/s/r/a/h/gt/r/r/r/s/s.txt|]
+
+windowsPathAFPP :: WindowsPath
+windowsPathAFPP = [WSP.pstr|C:\\foo\\bar\\bath\\baz\\baz\\tz\\fooooooooooooooo\\laaaaaaaaaaaaaaa\\baaaaaaaaaaaaar\\zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz\\zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz\\kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk\\kkkkkkkkkkkkkkkkkk\\h\\h\\h\\a\\s\\r\\a\\h\\gt\\r\\r\\r\\s\\s.txt|]
+
+posixSearchPath :: FilePath
+posixSearchPath = ":foo:bar:bath:baz:baz:tz:fooooooooooooooo:laaaaaaaaaaaaaaa:baaaaaaaaaaaaar:zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz:zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz:kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk:kkkkkkkkkkkkkkkkkk:h:h:h:a:s:r:a:h:gt:r:r:r:s:s.txt"
+
+windowsSearchPath :: FilePath
+windowsSearchPath = "foo;bar;bath;baz;baz;tz;fooooooooooooooo;laaaaaaaaaaaaaaa;baaaaaaaaaaaaar;zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz;zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz;kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk;kkkkkkkkkkkkkkkkkk;h;h;h;a;s;r;a;h;gt;r;r;r;s;s.txt"
+
+posixSearchPathAFPP :: PosixString
+posixSearchPathAFPP = [OSP.pstr|:foo:bar:bath:baz:baz:tz:fooooooooooooooo:laaaaaaaaaaaaaaa:baaaaaaaaaaaaar:zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz:zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz:kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk:kkkkkkkkkkkkkkkkkk:h:h:h:a:s:r:a:h:gt:r:r:r:s:s.txt|]
+
+windowsSearchPathAFPP :: WindowsString
+windowsSearchPathAFPP = [WSP.pstr|foo;bar;bath;baz;baz;tz;fooooooooooooooo;laaaaaaaaaaaaaaa;baaaaaaaaaaaaar;zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz;zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz;kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk;kkkkkkkkkkkkkkkkkk;h;h;h;a;s;r;a;h;gt;r;r;r;s;s.txt|]
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/changelog.md b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/changelog.md
new file mode 100644
index 0000000000..08202f3e0f
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/changelog.md
@@ -0,0 +1,158 @@
+# Changelog for [`filepath` package](http://hackage.haskell.org/package/filepath)
+
+_Note: below all `FilePath` values are unquoted, so `\\` really means two backslashes._
+
+## 1.5.4.0 *Nov 2024*
+
+* Don't catch async exceptions in internal functions wrt https://github.com/haskell/os-string/issues/22
+
+## 1.5.3.0 *Jun 2024*
+
+* Adjust for `encodeFS`/`decodedFS` deprecation in os-string
+
+## 1.5.2.0 *Jan 2024*
+
+* Fix a bug in `[splitFileName](https://github.com/haskell/filepath/issues/219)`
+* make `osp :: QuasiQuoter` valid as a pattern wrt [#210](https://github.com/haskell/filepath/pull/210)
+* Add `unsafeEncodeUtf` from os-string
+
+## 1.5.0.0 *Nov 2023*
+
+* remove `OsString` modules
+
+## 1.4.200.0 *Nov 2023*
+
+* deprecate `OsString` modules
+
+## 1.4.100.4 *Jul 2023*
+
+* Fix isInfixOf and breakSubString in Word16, wrt [#195](https://github.com/haskell/filepath/issues/195)
+
+## 1.4.100.3 *Feb 2023*
+
+* Fix a regression in `splitFileName` wrt [#189](https://github.com/haskell/filepath/pull/189)
+
+## 1.4.100.2 *Feb 2023*
+
+* Speed up `splitFileName`, `splitExtension`, `readDriveLetter` and various other helpers (up to 20x faster) by @Bodigrim
+
+## 1.4.100.1 *Feb 2023*
+
+* Fix regression in `System.FilePath.Windows.normalise` wrt [#187](https://github.com/haskell/filepath/issues/187)
+* Fix tests on GHC 9.4.4
+* Avoid head and tail
+
+## 1.4.100.0 *July 2022*
+
+Implementation of the [Abstract FilePath Proposal](https://gitlab.haskell.org/ghc/ghc/-/wikis/proposal/abstract-file-path)
+in user-space as a separate type.
+
+Introduction to the new API is explained [in this blog post](https://hasufell.github.io/posts/2022-06-29-fixing-haskell-filepaths.html).
+
+## 1.4.2.2 *Dec 2021*
+
+This release is purely a documentation release, fixing the broken haddock links.
+
+### Affected users
+
+This release affects users who apply downstream patches to `System.FilePath.Internal`,
+since `System.FilePath.Posix` and `System.FilePath.Windows` are now generated via `make cpp`
+during development.
+
+To make your patch apply, either apply it to `System.FilePath.Posix` and `System.FilePath.Windows`
+instead or run `make cpp` after applying your patch.
+
+### Changes
+
+* Document relation between `joinPath` and `(</>)` wrt [#82](https://github.com/haskell/filepath/issues/82), [#82](https://github.com/haskell/filepath/issues/86)
+* Clarify that `normalise` does not remove `..` wrt [#86](https://github.com/haskell/filepath/issues/86)
+* Make clear that `equalFilePath` does not expand `..` wrt [#87](https://github.com/haskell/filepath/issues/87)
+* Fix haddock source links by manually cpping wrt [#81](https://github.com/haskell/filepath/issues/81)
+* Make export list in `System.FilePath` explicit to get haddocks on the landing module
+
+
+## 1.4.2.1 *Jul 2018*
+
+ * Bundled with GHC 8.6.1
+
+## 1.4.2 *Jan 2018*
+
+ * Bundled with GHC 8.4.1
+
+ * Add `isExtensionOf` function.
+
+## 1.4.1.2  *Feb 2017*
+
+ * Bundled with GHC 8.2.1
+
+## 1.4.1.1  *Nov 2016*
+
+ * Bundled with GHC 8.0.2
+
+ * Documentation improvements
+
+## 1.4.1.0  *Dec 2015*
+
+ * Bundled with GHC 8.0.1
+
+ * Add `replaceExtensions` and `stripExtension` functions.
+
+ * Make `isValid` detect more invalid Windows paths, e.g. `nul .txt` and `foo\nbar`.
+
+ * Improve the documentation.
+
+ * Bug fix: `isValid "\0"` now returns `False`, instead of `True`
+
+## 1.4.0.0  *Mar 2015*
+
+  * Bundled with GHC 7.10.1
+
+  * New function: Add `-<.>` as an alias for `replaceExtension`.
+
+  * Semantic change: `joinDrive /foo bar` now returns `/foo/bar`, instead of `/foobar`
+
+  * Semantic change: on Windows, `splitSearchPath File1;\"File 2\"` now returns `[File1,File2]` instead of `[File1,\"File2\"]`
+
+  * Bug fix: on Posix systems, `normalise //home` now returns `/home`, instead of `//home`
+
+  * Bug fix: `normalise /./` now returns `/` on Posix and `\` on Windows, instead of `//` and `\\`
+
+  * Bug fix: `isDrive ""` now returns `False`, instead of `True`
+
+  * Bug fix: on Windows, `dropTrailingPathSeparator /` now returns `/` unchanged, instead of the normalised `\`
+
+  * Bug fix: on Windows, `equalFilePath C:\ C:` now returns `False`, instead of `True`
+
+  * Bug fix: on Windows, `isValid \\\foo` now returns `False`, instead of `True`
+
+  * Bug fix: on Windows, `isValid \\?\D:file` now returns `False`, instead of `True`
+
+  * Bug fix: on Windows, `normalise \` now returns `\` unchanged, instead of `\\`
+
+  * Bug fix: on Windows, `normalise C:.\` now returns `C:`, instead of `C:\\`
+
+  * Bug fix: on Windows, `normalise //server/test` now returns `\\server\test`, instead of `//server/test` unchanged
+
+  * Bug fix: on Windows, `makeRelative / //` now returns `//`, instead of `""`
+
+## 1.3.0.2  *Mar 2014*
+
+  * Bundled with GHC 7.8.1
+
+  * Update to Cabal 1.10 format
+
+  * Minor Haddock cleanups
+
+## 1.3.0.1  *Sep 2012*
+
+  * Bundled with GHC 7.6.1
+
+  * No changes
+
+## 1.3.0.0  *Feb 2012*
+
+  * Bundled with GHC 7.4.1
+
+  * Add support for SafeHaskell
+
+  * Bug fix: `normalise /` now returns `/`, instead of `/.`
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/filepath.cabal b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/filepath.cabal
new file mode 100644
index 0000000000..82f423aba7
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/filepath.cabal
@@ -0,0 +1,184 @@
+cabal-version:      2.2
+name:               filepath
+version:            1.5.4.0
+
+-- NOTE: Don't forget to update ./changelog.md
+license:            BSD-3-Clause
+license-file:       LICENSE
+author:             Neil Mitchell <ndmitchell@gmail.com>
+maintainer:         Julian Ospald <hasufell@posteo.de>
+copyright:          Neil Mitchell 2005-2020, Julian Ospald 2021-2022
+bug-reports:        https://github.com/haskell/filepath/issues
+homepage:
+  https://github.com/haskell/filepath/blob/master/README.md
+
+category:           System
+build-type:         Simple
+synopsis:           Library for manipulating FilePaths in a cross platform way.
+tested-with:
+  GHC ==8.6.5
+   || ==8.8.4
+   || ==8.10.7
+   || ==9.0.2
+   || ==9.2.8
+   || ==9.4.8
+   || ==9.6.3
+   || ==9.8.1
+
+description:
+  This package provides functionality for manipulating @FilePath@ values, and is shipped with <https://www.haskell.org/ghc/ GHC>. It provides two variants for filepaths:
+  .
+  1. legacy filepaths: @type FilePath = String@
+  .
+  2. operating system abstracted filepaths (@OsPath@): internally unpinned @ShortByteString@ (platform-dependent encoding)
+  .
+  It is recommended to use @OsPath@ when possible, because it is more correct.
+  .
+  For each variant there are three main modules:
+  .
+  * "System.FilePath.Posix" / "System.OsPath.Posix" manipulates POSIX\/Linux style @FilePath@ values (with @\/@ as the path separator).
+  .
+  * "System.FilePath.Windows" / "System.OsPath.Windows" manipulates Windows style @FilePath@ values (with either @\\@ or @\/@ as the path separator, and deals with drives).
+  .
+  * "System.FilePath" / "System.OsPath" for dealing with current platform-specific filepaths
+  .
+  For more powerful string manipulation of @OsPath@, you can use the <https://hackage.haskell.org/package/os-string os-string package> (@OsPath@ is a type synonym for @OsString@).
+  .
+  An introduction into the new API can be found in this
+  <https://hasufell.github.io/posts/2022-06-29-fixing-haskell-filepaths.html blog post>.
+  Code examples for the new API can be found <https://github.com/hasufell/filepath-examples here>.
+
+extra-source-files:
+  Generate.hs
+  Makefile
+  System/FilePath/Internal.hs
+  System/OsPath/Common.hs
+
+extra-doc-files:
+  changelog.md
+  HACKING.md
+  README.md
+
+flag cpphs
+  description: Use cpphs (fixes haddock source links)
+  default:     False
+  manual:      True
+
+source-repository head
+  type:     git
+  location: https://github.com/haskell/filepath
+
+library
+  exposed-modules:
+    System.FilePath
+    System.FilePath.Posix
+    System.FilePath.Windows
+    System.OsPath
+    System.OsPath.Encoding
+    System.OsPath.Internal
+    System.OsPath.Posix
+    System.OsPath.Posix.Internal
+    System.OsPath.Types
+    System.OsPath.Windows
+    System.OsPath.Windows.Internal
+
+  other-extensions:
+    CPP
+    PatternGuards
+
+  if impl(ghc >=7.2)
+    other-extensions: Safe
+
+  default-language: Haskell2010
+  build-depends:
+    , base              >=4.12.0.0      && <4.22
+    , bytestring        >=0.11.3.0
+    , deepseq
+    , exceptions
+    , template-haskell
+    , os-string         >=2.0.1
+
+  ghc-options:      -Wall
+
+  if flag(cpphs)
+    ghc-options:        -pgmPcpphs -optP--cpp
+    build-tool-depends: cpphs:cpphs -any
+
+test-suite filepath-tests
+  type:             exitcode-stdio-1.0
+  main-is:          Test.hs
+  hs-source-dirs:   tests tests/filepath-tests
+  other-modules:
+    TestGen
+    TestUtil
+
+  build-depends:
+    , base
+    , bytestring  >=0.11.3.0
+    , filepath
+    , os-string   >=2.0.1
+    , tasty
+    , tasty-quickcheck
+
+  default-language: Haskell2010
+  ghc-options:      -Wall
+
+test-suite filepath-equivalent-tests
+  default-language: Haskell2010
+  ghc-options:      -Wall
+  type:             exitcode-stdio-1.0
+  main-is:          TestEquiv.hs
+  hs-source-dirs:   tests tests/filepath-equivalent-tests
+  other-modules:
+    Legacy.System.FilePath
+    Legacy.System.FilePath.Posix
+    Legacy.System.FilePath.Windows
+    TestUtil
+    Gen
+
+  build-depends:
+    , base
+    , bytestring  >=0.11.3.0
+    , filepath
+    , generic-random
+    , generic-deriving
+    , os-string   >=2.0.1
+    , tasty
+    , tasty-quickcheck
+
+test-suite abstract-filepath
+  default-language: Haskell2010
+  ghc-options:      -Wall
+  type:             exitcode-stdio-1.0
+  main-is:          Test.hs
+  hs-source-dirs:   tests tests/abstract-filepath
+  other-modules:
+    Arbitrary
+    OsPathSpec
+    TestUtil
+
+  build-depends:
+    , base
+    , bytestring  >=0.11.3.0
+    , deepseq
+    , filepath
+    , os-string   >=2.0.1
+    , quickcheck-classes-base ^>=0.6.2
+    , tasty
+    , tasty-quickcheck
+
+benchmark bench-filepath
+  default-language: Haskell2010
+  ghc-options:      -Wall
+  type:             exitcode-stdio-1.0
+  main-is:          BenchFilePath.hs
+  hs-source-dirs:   bench
+  build-depends:
+    , base
+    , bytestring  >=0.11.3.0
+    , deepseq
+    , filepath
+    , os-string   >=2.0.1
+    , tasty-bench
+
+  ghc-options: -with-rtsopts=-A32m
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/TestUtil.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/TestUtil.hs
new file mode 100644
index 0000000000..f238f10eb4
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/TestUtil.hs
@@ -0,0 +1,159 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE TypeApplications #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module TestUtil(
+    module TestUtil,
+    module Test.Tasty.QuickCheck,
+    module Data.List,
+    module Data.Maybe
+    ) where
+
+import Test.Tasty.QuickCheck hiding ((==>))
+import Data.ByteString.Short (ShortByteString)
+import Data.List
+import Data.Maybe
+import Control.Monad
+import qualified System.FilePath.Windows as W
+import qualified System.FilePath.Posix as P
+#ifdef GHC_MAKE
+import qualified System.OsPath.Windows.Internal as AFP_W
+import qualified System.OsPath.Posix.Internal as AFP_P
+#else
+import qualified System.OsPath.Windows as AFP_W
+import qualified System.OsPath.Posix as AFP_P
+import System.OsPath.Types
+#endif
+import System.OsString.Internal.Types
+import System.OsString.Encoding.Internal
+import GHC.IO.Encoding.UTF16 ( mkUTF16le )
+import GHC.IO.Encoding.UTF8 ( mkUTF8 )
+import GHC.IO.Encoding.Failure
+
+
+infixr 0 ==>
+(==>) :: Bool -> Bool -> Bool
+a ==> b = not a || b
+
+
+newtype QFilePathValidW = QFilePathValidW FilePath deriving Show
+
+instance Arbitrary QFilePathValidW where
+    arbitrary = fmap (QFilePathValidW . W.makeValid) arbitraryFilePath
+    shrink (QFilePathValidW x) = shrinkValid QFilePathValidW W.makeValid x
+
+newtype QFilePathValidP = QFilePathValidP FilePath deriving Show
+
+instance Arbitrary QFilePathValidP where
+    arbitrary = fmap (QFilePathValidP . P.makeValid) arbitraryFilePath
+    shrink (QFilePathValidP x) = shrinkValid QFilePathValidP P.makeValid x
+
+newtype QFilePath = QFilePath FilePath deriving Show
+
+instance Arbitrary QFilePath where
+    arbitrary = fmap QFilePath arbitraryFilePath
+    shrink (QFilePath x) = shrinkValid QFilePath id x
+
+
+-- | Generate an arbitrary FilePath use a few special (interesting) characters.
+arbitraryFilePath :: Gen FilePath
+arbitraryFilePath = sized $ \n -> do
+    k <- choose (0,n)
+    replicateM k $ elements "?./:\\a ;_"
+
+-- | Shrink, but also apply a validity function. Try and make shorter, or use more
+--   @a@ (since @a@ is pretty dull), but make sure you terminate even after valid.
+shrinkValid :: (FilePath -> a) -> (FilePath -> FilePath) -> FilePath -> [a]
+shrinkValid wrap valid o =
+    [ wrap y
+    | y <- map valid $ shrinkList (\x -> ['a' | x /= 'a']) o
+    , length y < length o || (length y == length o && countA y > countA o)]
+    where countA = length . filter (== 'a')
+
+encodeUtf16LE :: String -> ShortByteString
+encodeUtf16LE = either (error . show) id . encodeWithTE (mkUTF16le TransliterateCodingFailure)
+
+encodeUtf8 :: String -> ShortByteString
+encodeUtf8 = either (error . show) id . encodeWithTE (mkUTF8 TransliterateCodingFailure)
+
+decodeUtf16LE :: ShortByteString -> String
+decodeUtf16LE = either (error . show) id . decodeWithTE (mkUTF16le TransliterateCodingFailure)
+
+decodeUtf8 :: ShortByteString -> String
+decodeUtf8 = either (error . show) id . decodeWithTE (mkUTF8 TransliterateCodingFailure)
+
+#ifdef GHC_MAKE
+newtype QFilePathValidAFP_W = QFilePathValidAFP_W ShortByteString deriving Show
+
+instance Arbitrary QFilePathValidAFP_W where
+    arbitrary = fmap (QFilePathValidAFP_W . AFP_W.makeValid . encodeUtf16LE) arbitraryFilePath
+    shrink (QFilePathValidAFP_W x) = shrinkValid (QFilePathValidAFP_W . encodeUtf16LE) (decodeUtf16LE . AFP_W.makeValid . encodeUtf16LE) (decodeUtf16LE x)
+
+newtype QFilePathValidAFP_P = QFilePathValidAFP_P ShortByteString deriving Show
+
+instance Arbitrary QFilePathValidAFP_P where
+    arbitrary = fmap (QFilePathValidAFP_P . AFP_P.makeValid . encodeUtf8) arbitraryFilePath
+    shrink (QFilePathValidAFP_P x) = shrinkValid (QFilePathValidAFP_P . encodeUtf8) (decodeUtf8 . AFP_P.makeValid . encodeUtf8) (decodeUtf8 x)
+
+newtype QFilePathAFP_W = QFilePathAFP_W ShortByteString deriving Show
+newtype QFilePathAFP_P = QFilePathAFP_P ShortByteString deriving Show
+
+instance Arbitrary QFilePathAFP_W where
+    arbitrary = fmap (QFilePathAFP_W . encodeUtf16LE) arbitraryFilePath
+    shrink (QFilePathAFP_W x) = shrinkValid (QFilePathAFP_W . encodeUtf16LE) id (decodeUtf16LE x)
+
+instance Arbitrary QFilePathAFP_P where
+    arbitrary = fmap (QFilePathAFP_P . encodeUtf8) arbitraryFilePath
+    shrink (QFilePathAFP_P x) = shrinkValid (QFilePathAFP_P . encodeUtf8) id (decodeUtf8 x)
+
+newtype QFilePathsAFP_W = QFilePathsAFP_W [ShortByteString] deriving Show
+newtype QFilePathsAFP_P = QFilePathsAFP_P [ShortByteString] deriving Show
+
+instance Arbitrary QFilePathsAFP_W where
+    arbitrary = fmap (QFilePathsAFP_W . fmap encodeUtf16LE) (listOf arbitraryFilePath)
+
+instance Arbitrary QFilePathsAFP_P where
+    arbitrary = fmap (QFilePathsAFP_P . fmap encodeUtf8) (listOf arbitraryFilePath)
+
+#else
+
+
+newtype QFilePathValidAFP_W = QFilePathValidAFP_W WindowsPath deriving Show
+
+instance Arbitrary QFilePathValidAFP_W where
+    arbitrary = fmap (QFilePathValidAFP_W . AFP_W.makeValid . WS . encodeUtf16LE) arbitraryFilePath
+    shrink (QFilePathValidAFP_W x) = shrinkValid (QFilePathValidAFP_W . WS . encodeUtf16LE) (decodeUtf16LE . getWindowsString . AFP_W.makeValid . WS . encodeUtf16LE) (decodeUtf16LE . getWindowsString $ x)
+
+newtype QFilePathValidAFP_P = QFilePathValidAFP_P PosixPath deriving Show
+
+instance Arbitrary QFilePathValidAFP_P where
+    arbitrary = fmap (QFilePathValidAFP_P . AFP_P.makeValid . PS . encodeUtf8) arbitraryFilePath
+    shrink (QFilePathValidAFP_P x) = shrinkValid (QFilePathValidAFP_P . PS . encodeUtf8) (decodeUtf8 . getPosixString . AFP_P.makeValid . PS . encodeUtf8) (decodeUtf8 . getPosixString $ x)
+
+newtype QFilePathAFP_W = QFilePathAFP_W WindowsPath deriving Show
+newtype QFilePathAFP_P = QFilePathAFP_P PosixPath deriving Show
+
+instance Arbitrary QFilePathAFP_W where
+    arbitrary = fmap (QFilePathAFP_W . WS . encodeUtf16LE) arbitraryFilePath
+    shrink (QFilePathAFP_W x) = shrinkValid (QFilePathAFP_W . WS . encodeUtf16LE) id (decodeUtf16LE . getWindowsString $ x)
+
+instance Arbitrary QFilePathAFP_P where
+    arbitrary = fmap (QFilePathAFP_P . PS . encodeUtf8) arbitraryFilePath
+    shrink (QFilePathAFP_P x) = shrinkValid (QFilePathAFP_P . PS . encodeUtf8) id (decodeUtf8 . getPosixString $ x)
+
+newtype QFilePathsAFP_W = QFilePathsAFP_W [WindowsPath] deriving Show
+newtype QFilePathsAFP_P = QFilePathsAFP_P [PosixPath] deriving Show
+
+instance Arbitrary QFilePathsAFP_W where
+    arbitrary = fmap (QFilePathsAFP_W . fmap (WS . encodeUtf16LE)) (listOf arbitraryFilePath)
+
+instance Arbitrary QFilePathsAFP_P where
+    arbitrary = fmap (QFilePathsAFP_P . fmap (PS . encodeUtf8)) (listOf arbitraryFilePath)
+
+instance Arbitrary WindowsChar where
+  arbitrary = WW <$> arbitrary
+
+instance Arbitrary PosixChar where
+  arbitrary = PW <$> arbitrary
+#endif
+
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/Arbitrary.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/Arbitrary.hs
new file mode 100644
index 0000000000..5753523413
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/Arbitrary.hs
@@ -0,0 +1,69 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Arbitrary where
+
+import Data.Char
+import Data.Maybe
+import System.OsString
+import System.OsString.Internal.Types
+import qualified System.OsString.Posix as Posix
+import qualified System.OsString.Windows as Windows
+import Data.ByteString ( ByteString )
+import qualified Data.ByteString as ByteString
+import Test.Tasty.QuickCheck
+
+
+instance Arbitrary OsString where
+  arbitrary = fmap fromJust $ encodeUtf <$> listOf filepathChar
+
+instance Arbitrary PosixString where
+  arbitrary = fmap fromJust $ Posix.encodeUtf <$> listOf filepathChar
+
+instance Arbitrary WindowsString where
+  arbitrary = fmap fromJust $ Windows.encodeUtf <$> listOf filepathChar
+
+
+newtype NonNullString = NonNullString { nonNullString :: String }
+  deriving Show
+
+instance Arbitrary NonNullString where
+  arbitrary = NonNullString <$> listOf filepathChar
+
+filepathChar :: Gen Char
+filepathChar = arbitraryUnicodeChar `suchThat` (\c -> not (isNull c) && isValidUnicode c)
+ where
+  isNull = (== '\NUL')
+  isValidUnicode c = case generalCategory c of
+      Surrogate -> False
+      NotAssigned -> False
+      _ -> True
+
+
+newtype NonNullAsciiString = NonNullAsciiString { nonNullAsciiString :: String }
+  deriving Show
+
+instance Arbitrary NonNullAsciiString where
+  arbitrary = NonNullAsciiString <$> listOf filepathAsciiChar
+
+filepathAsciiChar :: Gen Char
+filepathAsciiChar = arbitraryASCIIChar `suchThat` (\c -> not (isNull c))
+ where
+  isNull = (== '\NUL')
+
+newtype NonNullSurrogateString = NonNullSurrogateString { nonNullSurrogateString :: String }
+  deriving Show
+
+instance Arbitrary NonNullSurrogateString where
+  arbitrary = NonNullSurrogateString <$> listOf filepathWithSurrogates
+
+filepathWithSurrogates :: Gen Char
+filepathWithSurrogates =
+  frequency
+    [(3, arbitraryASCIIChar),
+     (1, arbitraryUnicodeChar),
+     (1, arbitraryBoundedEnum)
+    ]
+
+
+instance Arbitrary ByteString where arbitrary = ByteString.pack <$> arbitrary
+instance CoArbitrary ByteString where coarbitrary = coarbitrary . ByteString.unpack
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/OsPathSpec.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/OsPathSpec.hs
new file mode 100644
index 0000000000..95b96423d8
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/OsPathSpec.hs
@@ -0,0 +1,261 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE QuasiQuotes #-}
+
+module OsPathSpec where
+
+import Data.Maybe
+
+import System.OsPath as OSP
+import System.OsString.Internal.Types
+import System.OsPath.Posix as Posix
+import System.OsPath.Windows as Windows
+import System.OsPath.Encoding
+import qualified System.OsString.Internal.Types as OS
+import System.OsString.Data.ByteString.Short ( toShort )
+import System.OsString.Posix as PosixS hiding (map)
+import System.OsString.Windows as WindowsS hiding (map)
+
+import Control.Exception
+import Data.ByteString ( ByteString )
+import qualified Data.ByteString as BS
+import qualified Test.QuickCheck.Classes.Base as QC
+import GHC.IO.Encoding.UTF8 ( mkUTF8 )
+import GHC.IO.Encoding.UTF16 ( mkUTF16le )
+import GHC.IO.Encoding ( setFileSystemEncoding )
+import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
+import Control.DeepSeq
+import Data.Bifunctor ( first )
+import qualified Data.ByteString.Char8 as C
+import qualified System.OsString.Data.ByteString.Short.Word16 as BS16
+import qualified System.OsString.Data.ByteString.Short as SBS
+import Data.Char ( ord )
+import Data.Proxy ( Proxy(..) )
+import Test.Tasty
+import Test.Tasty.QuickCheck
+
+import Arbitrary
+
+
+fromRight :: b -> Either a b -> b
+fromRight _ (Right b) = b
+fromRight b _         = b
+
+
+tests :: TestTree
+tests = testGroup "Abstract filepath" [
+    testGroup "filepaths"
+    [ testProperties "OSP"
+      [ ("pack . unpack == id",
+        property $ \ws@(OsString _) ->
+          OSP.pack (OSP.unpack ws) === ws
+        ),
+        ("encodeUtf . decodeUtf == id",
+          property $ \(NonNullString str) -> (OSP.decodeUtf . fromJust . OSP.encodeUtf) str == Just str)
+      ],
+      testProperties "Windows"
+        [ ("pack . unpack == id (Windows)",
+          property $ \ws@(WindowsString _) ->
+          Windows.pack (Windows.unpack ws) === ws
+          )
+        , ("decodeUtf . encodeUtf == id",
+          property $ \(NonNullString str) -> (Windows.decodeUtf . fromJust . Windows.encodeUtf) str == Just str)
+        , ("encodeWith ucs2le . decodeWith ucs2le == id",
+          property $ \(padEven -> bs) -> (Windows.encodeWith ucs2le . (\(Right r) -> r) . Windows.decodeWith ucs2le . OS.WS . toShort) bs
+                 === Right (OS.WS . toShort $ bs))
+        , ("decodeFS . encodeFS == id (Windows)",
+          property $ \(NonNullString str) -> ioProperty $ do
+            r1 <- Windows.encodeFS str
+            r2 <- try @SomeException $ Windows.decodeFS r1
+            r3 <- evaluate $ force $ first displayException r2
+            pure (r3 === Right str)
+            )
+        , ("fromPlatformString* functions are equivalent under ASCII",
+          property $ \(WindowsString . BS16.pack . map (fromIntegral . ord) . nonNullAsciiString -> str) -> ioProperty $ do
+            r1         <- Windows.decodeFS str
+            r2         <- Windows.decodeUtf str
+            (Right r3) <- pure $ Windows.decodeWith (mkUTF16le TransliterateCodingFailure) str
+            (Right r4) <- pure $ Windows.decodeWith (mkUTF16le RoundtripFailure) str
+            (Right r5) <- pure $ Windows.decodeWith (mkUTF16le ErrorOnCodingFailure) str
+            pure (    r1 === r2
+                 .&&. r1 === r3
+                 .&&. r1 === r4
+                 .&&. r1 === r5
+                 )
+          )
+        , ("toPlatformString* functions are equivalent under ASCII",
+          property $ \(NonNullAsciiString str) -> ioProperty $ do
+            r1         <- Windows.encodeFS str
+            r2         <- Windows.encodeUtf str
+            (Right r3) <- pure $ Windows.encodeWith (mkUTF16le TransliterateCodingFailure) str
+            (Right r4) <- pure $ Windows.encodeWith (mkUTF16le RoundtripFailure) str
+            (Right r5) <- pure $ Windows.encodeWith (mkUTF16le ErrorOnCodingFailure) str
+            pure (    r1 === r2
+                 .&&. r1 === r3
+                 .&&. r1 === r4
+                 .&&. r1 === r5
+                 )
+          )
+        , ("Unit test toPlatformString*",
+          property $ ioProperty $ do
+            let str = "ABcK_(ツ123_&**"
+            let expected = WindowsString $ BS16.pack [0x0041,0x0042,0x0063,0x004b,0x005f,0x0028,0x30c4,0x0031,0x0032,0x0033,0x005f,0x0026,0x002a,0x002a]
+            r1         <-        Windows.encodeFS str
+            r2         <-        Windows.encodeUtf str
+            (Right r3) <- pure $ Windows.encodeWith (mkUTF16le TransliterateCodingFailure) str
+            (Right r4) <- pure $ Windows.encodeWith (mkUTF16le RoundtripFailure) str
+            (Right r5) <- pure $ Windows.encodeWith (mkUTF16le ErrorOnCodingFailure) str
+            pure (    r1 === expected
+                 .&&. r2 === expected
+                 .&&. r3 === expected
+                 .&&. r4 === expected
+                 .&&. r5 === expected
+                 )
+          )
+        , ("Unit test fromPlatformString*",
+          property $ ioProperty $ do
+            let bs = WindowsString $ BS16.pack [0x0041,0x0042,0x0063,0x004b,0x005f,0x0028,0x30c4,0x0031,0x0032,0x0033,0x005f,0x0026,0x002a,0x002a]
+            let expected = "ABcK_(ツ123_&**"
+            r1         <-        Windows.decodeFS bs
+            r2         <-        Windows.decodeUtf bs
+            (Right r3) <- pure $ Windows.decodeWith (mkUTF16le TransliterateCodingFailure) bs
+            (Right r4) <- pure $ Windows.decodeWith (mkUTF16le RoundtripFailure) bs
+            (Right r5) <- pure $ Windows.decodeWith (mkUTF16le ErrorOnCodingFailure) bs
+            pure (    r1 === expected
+                 .&&. r2 === expected
+                 .&&. r3 === expected
+                 .&&. r4 === expected
+                 .&&. r5 === expected
+                 )
+          )
+        ]
+    , testProperties "Posix"
+      [ ("decodeUtf . encodeUtf == id",
+          property $ \(NonNullString str) -> (Posix.decodeUtf . fromJust . Posix.encodeUtf) str == Just str)
+      , ("encodeWith ucs2le . decodeWith ucs2le == id (Posix)",
+          property $ \(padEven -> bs) -> (Posix.encodeWith ucs2le . (\(Right r) -> r) . Posix.decodeWith ucs2le . OS.PS . toShort) bs === Right (OS.PS . toShort $ bs))
+      , ("decodeFS . encodeFS == id",
+          property $ \(NonNullString str) -> ioProperty $ do
+            setFileSystemEncoding (mkUTF8 TransliterateCodingFailure)
+            r1 <- Posix.encodeFS str
+            r2 <- try @SomeException $ Posix.decodeFS r1
+            r3 <- evaluate $ force $ first displayException r2
+            pure (r3 === Right str)
+            )
+      , ("fromPlatformString* functions are equivalent under ASCII",
+          property $ \(PosixString . SBS.toShort . C.pack . nonNullAsciiString -> str) -> ioProperty $ do
+            r1         <-        Posix.decodeFS str
+            r2         <-        Posix.decodeUtf str
+            (Right r3) <- pure $ Posix.decodeWith (mkUTF8 TransliterateCodingFailure) str
+            (Right r4) <- pure $ Posix.decodeWith (mkUTF8 RoundtripFailure) str
+            (Right r5) <- pure $ Posix.decodeWith (mkUTF8 ErrorOnCodingFailure) str
+            pure (    r1 === r2
+                 .&&. r1 === r3
+                 .&&. r1 === r4
+                 .&&. r1 === r5
+                 )
+          )
+      , ("toPlatformString* functions are equivalent under ASCII",
+          property $ \(NonNullAsciiString str) -> ioProperty $ do
+            r1         <-        Posix.encodeFS str
+            r2         <-        Posix.encodeUtf str
+            (Right r3) <- pure $ Posix.encodeWith (mkUTF8 TransliterateCodingFailure) str
+            (Right r4) <- pure $ Posix.encodeWith (mkUTF8 RoundtripFailure) str
+            (Right r5) <- pure $ Posix.encodeWith (mkUTF8 ErrorOnCodingFailure) str
+            pure (    r1 === r2
+                 .&&. r1 === r3
+                 .&&. r1 === r4
+                 .&&. r1 === r5
+                 )
+          )
+      , ("Unit test toPlatformString*",
+          property $ ioProperty $ do
+            let str = "ABcK_(ツ123_&**"
+            let expected = PosixString $ SBS.pack [0x41,0x42,0x63,0x4b,0x5f,0x28,0xe3,0x83,0x84,0x31,0x32,0x33,0x5f,0x26,0x2a,0x2a]
+            r1         <-        Posix.encodeFS str
+            r2         <-        Posix.encodeUtf str
+            (Right r3) <- pure $ Posix.encodeWith (mkUTF8 TransliterateCodingFailure) str
+            (Right r4) <- pure $ Posix.encodeWith (mkUTF8 RoundtripFailure) str
+            (Right r5) <- pure $ Posix.encodeWith (mkUTF8 ErrorOnCodingFailure) str
+            pure (    r1 === expected
+                 .&&. r2 === expected
+                 .&&. r3 === expected
+                 .&&. r4 === expected
+                 .&&. r5 === expected
+                 )
+          )
+      , ("Unit test fromPlatformString*",
+          property $ ioProperty $ do
+            let bs = PosixString $ SBS.pack [0x41,0x42,0x63,0x4b,0x5f,0x28,0xe3,0x83,0x84,0x31,0x32,0x33,0x5f,0x26,0x2a,0x2a]
+            let expected = "ABcK_(ツ123_&**"
+            r1         <-        Posix.decodeFS bs
+            r2         <-        Posix.decodeUtf bs
+            (Right r3) <- pure $ Posix.decodeWith (mkUTF8 TransliterateCodingFailure) bs
+            (Right r4) <- pure $ Posix.decodeWith (mkUTF8 RoundtripFailure) bs
+            (Right r5) <- pure $ Posix.decodeWith (mkUTF8 ErrorOnCodingFailure) bs
+            pure (    r1 === expected
+                 .&&. r2 === expected
+                 .&&. r3 === expected
+                 .&&. r4 === expected
+                 .&&. r5 === expected
+                 )
+          )
+      , ("pack . unpack == id (Posix)",
+          property $ \ws@(PosixString _) ->
+            Posix.pack (Posix.unpack ws) === ws
+          )
+      ]
+    ],
+  testGroup "QuasiQuoter"
+    [ testProperties "windows"
+      [ ("QuasiQuoter (WindowsPath)",
+        property $ do
+          let bs = WindowsString $ BS16.pack [0x0041,0x0042,0x0063,0x004b,0x005f]
+          let expected = [Windows.pstr|ABcK_|]
+          bs === expected
+        )
+      , ("QuasiQuoter (WindowsString)",
+        property $ do
+          let bs = WindowsString $ BS16.pack [0x0041,0x0042,0x0063,0x004b,0x005f,0x0028,0x30c4,0x0031,0x0032,0x0033,0x005f,0x0026,0x002a,0x002a]
+          let expected = [WindowsS.pstr|ABcK_(ツ123_&**|]
+          bs === expected
+        )
+       ],
+       testProperties "posix"
+       [ ("QuasiQuoter (PosixPath)",
+         property $ do
+           let bs = PosixString $ SBS.pack [0x41,0x42,0x63,0x4b,0x5f]
+           let expected = [Posix.pstr|ABcK_|]
+           bs === expected
+         )
+       , ("QuasiQuoter (PosixString)",
+          property $ do
+            let bs = PosixString $ SBS.pack [0x41,0x42,0x63,0x4b,0x5f,0x28,0xe3,0x83,0x84,0x31,0x32,0x33,0x5f,0x26,0x2a,0x2a]
+            let expected = [PosixS.pstr|ABcK_(ツ123_&**|]
+            bs === expected
+          )
+       ]
+    ],
+   testProperties "Type laws"
+     (QC.lawsProperties (QC.ordLaws (Proxy @OsPath))
+      ++ QC.lawsProperties (QC.monoidLaws (Proxy @OsPath))
+
+      ++ QC.lawsProperties (QC.ordLaws (Proxy @OsString))
+      ++ QC.lawsProperties (QC.monoidLaws (Proxy @OsString))
+
+      ++ QC.lawsProperties (QC.ordLaws (Proxy @WindowsString))
+      ++ QC.lawsProperties (QC.monoidLaws (Proxy @WindowsString))
+
+      ++ QC.lawsProperties (QC.ordLaws (Proxy @PosixString))
+      ++ QC.lawsProperties (QC.monoidLaws (Proxy @PosixString))
+
+      ++ QC.lawsProperties (QC.ordLaws (Proxy @PlatformString))
+      ++ QC.lawsProperties (QC.monoidLaws (Proxy @PlatformString)))
+  ]
+
+
+padEven :: ByteString -> ByteString
+padEven bs
+  | even (BS.length bs) = bs
+  | otherwise = bs `BS.append` BS.pack [70]
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/Test.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/Test.hs
new file mode 100644
index 0000000000..31698b6b84
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/abstract-filepath/Test.hs
@@ -0,0 +1,7 @@
+module Main (main) where
+
+import qualified OsPathSpec
+import Test.Tasty
+
+main :: IO ()
+main = defaultMain OsPathSpec.tests
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Gen.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Gen.hs
new file mode 100644
index 0000000000..97aa358ae0
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Gen.hs
@@ -0,0 +1,202 @@
+{-# LANGUAGE OverlappingInstances #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DerivingVia, TypeOperators #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DataKinds #-}
+
+module Gen where
+
+import System.FilePath
+import Data.List.NonEmpty (NonEmpty(..))
+import GHC.Generics
+import Generic.Random
+import Generics.Deriving.Show
+import Prelude as P
+import Test.Tasty.QuickCheck hiding ((==>))
+
+import qualified Data.List.NonEmpty as NE
+
+
+class AltShow a where
+  altShow :: a -> String
+
+instance {-# OVERLAPPABLE #-} Show a => AltShow a where
+  altShow = show
+
+instance {-# OVERLAPS #-} AltShow String where
+  altShow = id
+
+instance {-# OVERLAPPABLE #-} AltShow a => AltShow (Maybe a) where
+  altShow Nothing = ""
+  altShow (Just a) = altShow a
+
+
+newtype WindowsFilePaths = WindowsFilePaths { unWindowsFilePaths :: [WindowsFilePath] }
+  deriving (Show, Eq, Ord, Generic)
+
+-- filepath = namespace *"\" namespace-tail
+--          / UNC
+--          / [ disk ] *"\" relative-path
+--          / disk *"\"
+data WindowsFilePath = NS NameSpace [Separator] NSTail
+                     | UNC UNCShare
+                     | N (Maybe Char) [Separator] (Maybe RelFilePath)
+                     -- ^ This differs from the grammar, because we allow
+                     -- empty paths
+                     | PotentiallyInvalid FilePath
+                     -- ^ this branch is added purely for the tests
+  deriving (GShow, Eq, Ord, Generic)
+  deriving Arbitrary via (GenericArbitraryRec '[6, 2, 2, 1] `AndShrinking` WindowsFilePath)
+
+instance Show WindowsFilePath where
+  show wf = gshow wf ++ " (" ++ altShow wf ++ ")"
+
+instance AltShow WindowsFilePath where
+  altShow (NS ns seps nstail) = altShow ns ++ altShow seps ++ altShow nstail
+  altShow (UNC unc) = altShow unc
+  altShow (N mdisk seps mfrp) = maybe [] (:[]) mdisk ++ (altShow seps ++ altShow mfrp)
+  altShow (PotentiallyInvalid fp) = fp
+
+
+-- namespace-tail     = ( disk 1*"\" relative-path ; C:foo\bar is not valid
+--                                                 ; namespaced paths are all absolute
+--                      / disk *"\"
+--                      / relative-path
+--                      )
+data NSTail = NST1 Char (NonEmpty Separator) RelFilePath
+            | NST2 Char [Separator]
+            | NST3 RelFilePath
+  deriving (GShow, Show, Eq, Ord, Generic)
+  deriving Arbitrary via (GenericArbitraryRec '[1, 1, 1] `AndShrinking` NSTail)
+
+instance AltShow NSTail where
+  altShow (NST1 disk seps relfp) = disk:':':(altShow seps ++ altShow relfp)
+  altShow (NST2 disk seps) = disk:':':altShow seps
+  altShow (NST3 relfp) = altShow relfp
+
+
+--  UNC = "\\" 1*pchar "\" 1*pchar  [ 1*"\" [ relative-path ] ]
+data UNCShare = UNCShare Separator Separator
+                         NonEmptyString
+                         (NonEmpty Separator)
+                         NonEmptyString
+                         (Maybe (NonEmpty Separator, Maybe RelFilePath))
+  deriving (GShow, Show, Eq, Ord, Generic)
+  deriving Arbitrary via (GenericArbitraryRec '[1] `AndShrinking` UNCShare)
+
+instance AltShow UNCShare where
+  altShow (UNCShare sep1 sep2 fp1 seps fp2 mrfp) = altShow sep1 ++ altShow sep2 ++ altShow fp1 ++ altShow seps ++ altShow fp2 ++ maybe "" (\(a, b) -> altShow a ++ maybe "" altShow b) mrfp
+
+newtype NonEmptyString = NonEmptyString (NonEmpty Char)
+  deriving (GShow, Show, Eq, Ord, Generic)
+  deriving Arbitrary via (GenericArbitraryRec '[1] `AndShrinking` NonEmptyString)
+
+instance Semigroup NonEmptyString where
+  (<>) (NonEmptyString ne) (NonEmptyString ne') = NonEmptyString (ne <> ne')
+
+instance AltShow NonEmptyString where
+  altShow (NonEmptyString ns) = NE.toList ns
+
+
+-- | Windows API Namespaces
+--
+-- https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#namespaces
+-- https://support.microsoft.com/en-us/topic/70b92942-a643-2f2d-2ac6-aad8acad49fb
+-- https://superuser.com/a/1096784/854039
+-- https://reverseengineering.stackexchange.com/a/15178
+-- https://stackoverflow.com/a/25099634
+--
+-- namespace          = file-namespace / device-namespace / nt-namespace
+-- file-namespace     = "\" "\" "?" "\"
+-- device-namespace   = "\" "\" "." "\"
+-- nt-namespace       = "\" "?" "?" "\"
+data NameSpace = FileNameSpace
+               | DeviceNameSpace
+               | NTNameSpace
+  deriving (GShow, Show, Eq, Ord, Generic)
+  deriving Arbitrary via (GenericArbitraryRec '[3, 1, 1] `AndShrinking` NameSpace)
+
+instance AltShow NameSpace where
+  altShow FileNameSpace = "\\\\?\\"
+  altShow DeviceNameSpace = "\\\\.\\"
+  altShow NTNameSpace = "\\??\\"
+
+
+data Separator = UnixSep
+               | WindowsSep
+  deriving (GShow, Show, Eq, Ord, Generic)
+  deriving Arbitrary via (GenericArbitraryRec '[1, 1] `AndShrinking` Separator)
+
+instance AltShow Separator where
+  altShow UnixSep = "/"
+  altShow WindowsSep = "\\"
+
+instance {-# OVERLAPS #-} AltShow (NonEmpty Separator) where
+  altShow ne = mconcat $ NE.toList (altShow <$> ne)
+
+instance {-# OVERLAPS #-} AltShow [Separator] where
+  altShow [] = ""
+  altShow ne = altShow (NE.fromList ne)
+
+--  relative-path = 1*(path-name 1*"\") [ file-name ] / file-name
+data RelFilePath = Rel1 (NonEmpty (NonEmptyString, NonEmpty Separator)) (Maybe FileName)
+                 | Rel2 FileName
+  deriving (GShow, Show, Eq, Ord, Generic)
+  deriving Arbitrary via (GenericArbitraryRec '[2, 1] `AndShrinking` RelFilePath)
+
+instance AltShow RelFilePath where
+  altShow (Rel1 ns mf) = mconcat (NE.toList $ fmap (\(a, b) -> altShow a ++ altShow b) ns) ++ altShow mf
+  altShow (Rel2 fn) = altShow fn
+
+--  file-name = 1*pchar [ stream ]
+data FileName = FileName NonEmptyString (Maybe DataStream)
+  deriving (GShow, Show, Eq, Ord, Generic)
+
+instance Arbitrary FileName where
+  -- make sure that half of the filenames include a dot '.'
+  -- so that we can deal with extensions
+  arbitrary = do
+    ns <- arbitrary
+    ds <- arbitrary
+    i <- chooseInt (0, 100)
+    if i >= 50
+    then do
+           ns' <- arbitrary
+           pure $ FileName (ns <> NonEmptyString ('.':|[]) <> ns') ds
+    else pure $ FileName ns ds
+  shrink = genericShrink
+
+
+instance Arbitrary (Maybe DataStream) where
+  arbitrary = genericArbitraryRec (1 % 1 % ())
+  shrink = genericShrink
+
+instance AltShow FileName where
+  altShow (FileName ns ds) = altShow ns ++ altShow ds
+
+--  stream = ":" 1*schar [ ":" 1*schar ] / ":" ":" 1*schar
+data DataStream = DS1 NonEmptyString (Maybe NonEmptyString)
+                | DS2 NonEmptyString -- ::datatype
+  deriving (GShow, Show, Eq, Ord, Generic)
+  deriving Arbitrary via (GenericArbitraryRec '[1, 1] `AndShrinking` DataStream)
+
+instance AltShow DataStream where
+  altShow (DS1 ns Nothing) = ":" ++ altShow ns
+  altShow (DS1 ns (Just ns2)) = ":" ++ altShow ns ++ ":" ++ altShow ns2
+  altShow (DS2 ns) = "::" ++ altShow ns
+
+instance Arbitrary WindowsFilePaths where
+  arbitrary = WindowsFilePaths <$> listOf' arbitrary
+  shrink = genericShrink
+
+instance Arbitrary [Separator] where
+  arbitrary = listOf' arbitrary
+  shrink = genericShrink
+
+instance Arbitrary a => Arbitrary (NonEmpty a) where
+  arbitrary = NE.fromList <$> listOf1' arbitrary
+  shrink = genericShrink
+
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath.hs
new file mode 100644
index 0000000000..0297b0e72e
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath.hs
@@ -0,0 +1,147 @@
+{-# LANGUAGE CPP #-}
+#if __GLASGOW_HASKELL__ >= 704
+{-# LANGUAGE Safe #-}
+#endif
+{- |
+Module      :  System.FilePath
+Copyright   :  (c) Neil Mitchell 2005-2014
+License     :  BSD3
+
+Maintainer  :  ndmitchell@gmail.com
+Stability   :  stable
+Portability :  portable
+
+A library for 'FilePath' manipulations, using Posix or Windows filepaths
+depending on the platform.
+
+Both "System.FilePath.Posix" and "System.FilePath.Windows" provide the
+same interface.
+
+Given the example 'FilePath': @\/directory\/file.ext@
+
+We can use the following functions to extract pieces.
+
+* 'takeFileName' gives @\"file.ext\"@
+
+* 'takeDirectory' gives @\"\/directory\"@
+
+* 'takeExtension' gives @\".ext\"@
+
+* 'dropExtension' gives @\"\/directory\/file\"@
+
+* 'takeBaseName' gives @\"file\"@
+
+And we could have built an equivalent path with the following expressions:
+
+* @\"\/directory\" '</>' \"file.ext\"@.
+
+* @\"\/directory\/file" '<.>' \"ext\"@.
+
+* @\"\/directory\/file.txt" '-<.>' \"ext\"@.
+
+Each function in this module is documented with several examples,
+which are also used as tests.
+
+Here are a few examples of using the @filepath@ functions together:
+
+/Example 1:/ Find the possible locations of a Haskell module @Test@ imported from module @Main@:
+
+@['replaceFileName' path_to_main \"Test\" '<.>' ext | ext <- [\"hs\",\"lhs\"] ]@
+
+/Example 2:/ Download a file from @url@ and save it to disk:
+
+@do let file = 'makeValid' url
+  System.Directory.createDirectoryIfMissing True ('takeDirectory' file)@
+
+/Example 3:/ Compile a Haskell file, putting the @.hi@ file under @interface@:
+
+@'takeDirectory' file '</>' \"interface\" '</>' ('takeFileName' file '-<.>' \"hi\")@
+
+References:
+[1] <http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx Naming Files, Paths and Namespaces> (Microsoft MSDN)
+-}
+
+
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+module Legacy.System.FilePath(
+    -- * Separator predicates
+    FilePath,
+    pathSeparator, pathSeparators, isPathSeparator,
+    searchPathSeparator, isSearchPathSeparator,
+    extSeparator, isExtSeparator,
+
+    -- * @$PATH@ methods
+    splitSearchPath, getSearchPath,
+
+    -- * Extension functions
+    splitExtension,
+    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
+    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
+    stripExtension,
+
+    -- * Filename\/directory functions
+    splitFileName,
+    takeFileName, replaceFileName, dropFileName,
+    takeBaseName, replaceBaseName,
+    takeDirectory, replaceDirectory,
+    combine, (</>),
+    splitPath, joinPath, splitDirectories,
+
+    -- * Drive functions
+    splitDrive, joinDrive,
+    takeDrive, hasDrive, dropDrive, isDrive,
+
+    -- * Trailing slash functions
+    hasTrailingPathSeparator,
+    addTrailingPathSeparator,
+    dropTrailingPathSeparator,
+
+    -- * File name manipulations
+    normalise, equalFilePath,
+    makeRelative,
+    isRelative, isAbsolute,
+    isValid, makeValid
+) where
+import Legacy.System.FilePath.Windows
+#else
+module Legacy.System.FilePath(
+    -- * Separator predicates
+    FilePath,
+    pathSeparator, pathSeparators, isPathSeparator,
+    searchPathSeparator, isSearchPathSeparator,
+    extSeparator, isExtSeparator,
+
+    -- * @$PATH@ methods
+    splitSearchPath, getSearchPath,
+
+    -- * Extension functions
+    splitExtension,
+    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
+    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
+    stripExtension,
+
+    -- * Filename\/directory functions
+    splitFileName,
+    takeFileName, replaceFileName, dropFileName,
+    takeBaseName, replaceBaseName,
+    takeDirectory, replaceDirectory,
+    combine, (</>),
+    splitPath, joinPath, splitDirectories,
+
+    -- * Drive functions
+    splitDrive, joinDrive,
+    takeDrive, hasDrive, dropDrive, isDrive,
+
+    -- * Trailing slash functions
+    hasTrailingPathSeparator,
+    addTrailingPathSeparator,
+    dropTrailingPathSeparator,
+
+    -- * File name manipulations
+    normalise, equalFilePath,
+    makeRelative,
+    isRelative, isAbsolute,
+    isValid, makeValid
+) where
+import Legacy.System.FilePath.Posix
+#endif
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath/Posix.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath/Posix.hs
new file mode 100644
index 0000000000..cbf561b856
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath/Posix.hs
@@ -0,0 +1,1048 @@
+
+
+
+{-# LANGUAGE PatternGuards #-}
+
+-- This template expects CPP definitions for:
+--     MODULE_NAME = Posix | Windows
+--     IS_WINDOWS  = False | True
+
+-- |
+-- Module      :  System.FilePath.MODULE_NAME
+-- Copyright   :  (c) Neil Mitchell 2005-2014
+-- License     :  BSD3
+--
+-- Maintainer  :  ndmitchell@gmail.com
+-- Stability   :  stable
+-- Portability :  portable
+--
+-- A library for 'FilePath' manipulations, using MODULE_NAME style paths on
+-- all platforms. Importing "System.FilePath" is usually better.
+--
+-- Given the example 'FilePath': @\/directory\/file.ext@
+--
+-- We can use the following functions to extract pieces.
+--
+-- * 'takeFileName' gives @\"file.ext\"@
+--
+-- * 'takeDirectory' gives @\"\/directory\"@
+--
+-- * 'takeExtension' gives @\".ext\"@
+--
+-- * 'dropExtension' gives @\"\/directory\/file\"@
+--
+-- * 'takeBaseName' gives @\"file\"@
+--
+-- And we could have built an equivalent path with the following expressions:
+--
+-- * @\"\/directory\" '</>' \"file.ext\"@.
+--
+-- * @\"\/directory\/file" '<.>' \"ext\"@.
+--
+-- * @\"\/directory\/file.txt" '-<.>' \"ext\"@.
+--
+-- Each function in this module is documented with several examples,
+-- which are also used as tests.
+--
+-- Here are a few examples of using the @filepath@ functions together:
+--
+-- /Example 1:/ Find the possible locations of a Haskell module @Test@ imported from module @Main@:
+--
+-- @['replaceFileName' path_to_main \"Test\" '<.>' ext | ext <- [\"hs\",\"lhs\"] ]@
+--
+-- /Example 2:/ Download a file from @url@ and save it to disk:
+--
+-- @do let file = 'makeValid' url
+--   System.Directory.createDirectoryIfMissing True ('takeDirectory' file)@
+--
+-- /Example 3:/ Compile a Haskell file, putting the @.hi@ file under @interface@:
+--
+-- @'takeDirectory' file '</>' \"interface\" '</>' ('takeFileName' file '-<.>' \"hi\")@
+--
+-- References:
+-- [1] <http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx Naming Files, Paths and Namespaces> (Microsoft MSDN)
+module Legacy.System.FilePath.Posix
+    (
+    -- * Separator predicates
+    FilePath,
+    pathSeparator, pathSeparators, isPathSeparator,
+    searchPathSeparator, isSearchPathSeparator,
+    extSeparator, isExtSeparator,
+
+    -- * @$PATH@ methods
+    splitSearchPath, getSearchPath,
+
+    -- * Extension functions
+    splitExtension,
+    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
+    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
+    stripExtension,
+
+    -- * Filename\/directory functions
+    splitFileName,
+    takeFileName, replaceFileName, dropFileName,
+    takeBaseName, replaceBaseName,
+    takeDirectory, replaceDirectory,
+    combine, (</>),
+    splitPath, joinPath, splitDirectories,
+
+    -- * Drive functions
+    splitDrive, joinDrive,
+    takeDrive, hasDrive, dropDrive, isDrive,
+
+    -- * Trailing slash functions
+    hasTrailingPathSeparator,
+    addTrailingPathSeparator,
+    dropTrailingPathSeparator,
+
+    -- * File name manipulations
+    normalise, equalFilePath,
+    makeRelative,
+    isRelative, isAbsolute,
+    isValid, makeValid
+    )
+    where
+
+import Data.Char(toLower, toUpper, isAsciiLower, isAsciiUpper)
+import Data.Maybe(isJust)
+import Data.List(stripPrefix, isSuffixOf)
+
+import System.Environment(getEnv)
+
+
+infixr 7  <.>, -<.>
+infixr 5  </>
+
+
+
+
+
+---------------------------------------------------------------------
+-- Platform Abstraction Methods (private)
+
+-- | Is the operating system Unix or Linux like
+isPosix :: Bool
+isPosix = not isWindows
+
+-- | Is the operating system Windows like
+isWindows :: Bool
+isWindows = False
+
+
+---------------------------------------------------------------------
+-- The basic functions
+
+-- | The character that separates directories. In the case where more than
+--   one character is possible, 'pathSeparator' is the \'ideal\' one.
+--
+-- > Windows: pathSeparator == '\\'
+-- > Posix:   pathSeparator ==  '/'
+-- > isPathSeparator pathSeparator
+pathSeparator :: Char
+pathSeparator = if isWindows then '\\' else '/'
+
+-- | The list of all possible separators.
+--
+-- > Windows: pathSeparators == ['\\', '/']
+-- > Posix:   pathSeparators == ['/']
+-- > pathSeparator `elem` pathSeparators
+pathSeparators :: [Char]
+pathSeparators = if isWindows then "\\/" else "/"
+
+-- | Rather than using @(== 'pathSeparator')@, use this. Test if something
+--   is a path separator.
+--
+-- > isPathSeparator a == (a `elem` pathSeparators)
+isPathSeparator :: Char -> Bool
+isPathSeparator '/' = True
+isPathSeparator '\\' = isWindows
+isPathSeparator _ = False
+
+
+-- | The character that is used to separate the entries in the $PATH environment variable.
+--
+-- > Windows: searchPathSeparator == ';'
+-- > Posix:   searchPathSeparator == ':'
+searchPathSeparator :: Char
+searchPathSeparator = if isWindows then ';' else ':'
+
+-- | Is the character a file separator?
+--
+-- > isSearchPathSeparator a == (a == searchPathSeparator)
+isSearchPathSeparator :: Char -> Bool
+isSearchPathSeparator = (== searchPathSeparator)
+
+
+-- | File extension character
+--
+-- > extSeparator == '.'
+extSeparator :: Char
+extSeparator = '.'
+
+-- | Is the character an extension character?
+--
+-- > isExtSeparator a == (a == extSeparator)
+isExtSeparator :: Char -> Bool
+isExtSeparator = (== extSeparator)
+
+
+---------------------------------------------------------------------
+-- Path methods (environment $PATH)
+
+-- | Take a string, split it on the 'searchPathSeparator' character.
+--   Blank items are ignored on Windows, and converted to @.@ on Posix.
+--   On Windows path elements are stripped of quotes.
+--
+--   Follows the recommendations in
+--   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>
+--
+-- > Posix:   splitSearchPath "File1:File2:File3"  == ["File1","File2","File3"]
+-- > Posix:   splitSearchPath "File1::File2:File3" == ["File1",".","File2","File3"]
+-- > Windows: splitSearchPath "File1;File2;File3"  == ["File1","File2","File3"]
+-- > Windows: splitSearchPath "File1;;File2;File3" == ["File1","File2","File3"]
+-- > Windows: splitSearchPath "File1;\"File2\";File3" == ["File1","File2","File3"]
+splitSearchPath :: String -> [FilePath]
+splitSearchPath = f
+    where
+    f xs = case break isSearchPathSeparator xs of
+           (pre, []    ) -> g pre
+           (pre, _:post) -> g pre ++ f post
+
+    g "" = ["." | isPosix]
+    g ('\"':x@(_:_)) | isWindows && last x == '\"' = [init x]
+    g x = [x]
+
+
+-- | Get a list of 'FilePath's in the $PATH variable.
+getSearchPath :: IO [FilePath]
+getSearchPath = fmap splitSearchPath (getEnv "PATH")
+
+
+---------------------------------------------------------------------
+-- Extension methods
+
+-- | Split on the extension. 'addExtension' is the inverse.
+--
+-- > splitExtension "/directory/path.ext" == ("/directory/path",".ext")
+-- > uncurry (++) (splitExtension x) == x
+-- > Valid x => uncurry addExtension (splitExtension x) == x
+-- > splitExtension "file.txt" == ("file",".txt")
+-- > splitExtension "file" == ("file","")
+-- > splitExtension "file/file.txt" == ("file/file",".txt")
+-- > splitExtension "file.txt/boris" == ("file.txt/boris","")
+-- > splitExtension "file.txt/boris.ext" == ("file.txt/boris",".ext")
+-- > splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob",".fred")
+-- > splitExtension "file/path.txt/" == ("file/path.txt/","")
+splitExtension :: FilePath -> (String, String)
+splitExtension x = case nameDot of
+                       "" -> (x,"")
+                       _ -> (dir ++ init nameDot, extSeparator : ext)
+    where
+        (dir,file) = splitFileName_ x
+        (nameDot,ext) = breakEnd isExtSeparator file
+
+-- | Get the extension of a file, returns @\"\"@ for no extension, @.ext@ otherwise.
+--
+-- > takeExtension "/directory/path.ext" == ".ext"
+-- > takeExtension x == snd (splitExtension x)
+-- > Valid x => takeExtension (addExtension x "ext") == ".ext"
+-- > Valid x => takeExtension (replaceExtension x "ext") == ".ext"
+takeExtension :: FilePath -> String
+takeExtension = snd . splitExtension
+
+-- | Remove the current extension and add another, equivalent to 'replaceExtension'.
+--
+-- > "/directory/path.txt" -<.> "ext" == "/directory/path.ext"
+-- > "/directory/path.txt" -<.> ".ext" == "/directory/path.ext"
+-- > "foo.o" -<.> "c" == "foo.c"
+(-<.>) :: FilePath -> String -> FilePath
+(-<.>) = replaceExtension
+
+-- | Set the extension of a file, overwriting one if already present, equivalent to '-<.>'.
+--
+-- > replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext"
+-- > replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext"
+-- > replaceExtension "file.txt" ".bob" == "file.bob"
+-- > replaceExtension "file.txt" "bob" == "file.bob"
+-- > replaceExtension "file" ".bob" == "file.bob"
+-- > replaceExtension "file.txt" "" == "file"
+-- > replaceExtension "file.fred.bob" "txt" == "file.fred.txt"
+-- > replaceExtension x y == addExtension (dropExtension x) y
+replaceExtension :: FilePath -> String -> FilePath
+replaceExtension x y = dropExtension x <.> y
+
+-- | Add an extension, even if there is already one there, equivalent to 'addExtension'.
+--
+-- > "/directory/path" <.> "ext" == "/directory/path.ext"
+-- > "/directory/path" <.> ".ext" == "/directory/path.ext"
+(<.>) :: FilePath -> String -> FilePath
+(<.>) = addExtension
+
+-- | Remove last extension, and the \".\" preceding it.
+--
+-- > dropExtension "/directory/path.ext" == "/directory/path"
+-- > dropExtension x == fst (splitExtension x)
+dropExtension :: FilePath -> FilePath
+dropExtension = fst . splitExtension
+
+-- | Add an extension, even if there is already one there, equivalent to '<.>'.
+--
+-- > addExtension "/directory/path" "ext" == "/directory/path.ext"
+-- > addExtension "file.txt" "bib" == "file.txt.bib"
+-- > addExtension "file." ".bib" == "file..bib"
+-- > addExtension "file" ".bib" == "file.bib"
+-- > addExtension "/" "x" == "/.x"
+-- > addExtension x "" == x
+-- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
+-- > Windows: addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
+addExtension :: FilePath -> String -> FilePath
+addExtension file "" = file
+addExtension file xs@(x:_) = joinDrive a res
+    where
+        res = if isExtSeparator x then b ++ xs
+              else b ++ [extSeparator] ++ xs
+
+        (a,b) = splitDrive file
+
+-- | Does the given filename have an extension?
+--
+-- > hasExtension "/directory/path.ext" == True
+-- > hasExtension "/directory/path" == False
+-- > null (takeExtension x) == not (hasExtension x)
+hasExtension :: FilePath -> Bool
+hasExtension = any isExtSeparator . takeFileName
+
+
+-- | Does the given filename have the specified extension?
+--
+-- > "png" `isExtensionOf` "/directory/file.png" == True
+-- > ".png" `isExtensionOf` "/directory/file.png" == True
+-- > ".tar.gz" `isExtensionOf` "bar/foo.tar.gz" == True
+-- > "ar.gz" `isExtensionOf` "bar/foo.tar.gz" == False
+-- > "png" `isExtensionOf` "/directory/file.png.jpg" == False
+-- > "csv/table.csv" `isExtensionOf` "/data/csv/table.csv" == False
+isExtensionOf :: String -> FilePath -> Bool
+isExtensionOf ext@('.':_) = isSuffixOf ext . takeExtensions
+isExtensionOf ext         = isSuffixOf ('.':ext) . takeExtensions
+
+-- | Drop the given extension from a FilePath, and the @\".\"@ preceding it.
+--   Returns 'Nothing' if the FilePath does not have the given extension, or
+--   'Just' and the part before the extension if it does.
+--
+--   This function can be more predictable than 'dropExtensions', especially if the filename
+--   might itself contain @.@ characters.
+--
+-- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
+-- > stripExtension "hi.o" "foo.x.hs.o" == Nothing
+-- > dropExtension x == fromJust (stripExtension (takeExtension x) x)
+-- > dropExtensions x == fromJust (stripExtension (takeExtensions x) x)
+-- > stripExtension ".c.d" "a.b.c.d"  == Just "a.b"
+-- > stripExtension ".c.d" "a.b..c.d" == Just "a.b."
+-- > stripExtension "baz"  "foo.bar"  == Nothing
+-- > stripExtension "bar"  "foobar"   == Nothing
+-- > stripExtension ""     x          == Just x
+stripExtension :: String -> FilePath -> Maybe FilePath
+stripExtension []        path = Just path
+stripExtension ext@(x:_) path = stripSuffix dotExt path
+    where dotExt = if isExtSeparator x then ext else '.':ext
+
+
+-- | Split on all extensions.
+--
+-- > splitExtensions "/directory/path.ext" == ("/directory/path",".ext")
+-- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
+-- > uncurry (++) (splitExtensions x) == x
+-- > Valid x => uncurry addExtension (splitExtensions x) == x
+-- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
+splitExtensions :: FilePath -> (FilePath, String)
+splitExtensions x = (a ++ c, d)
+    where
+        (a,b) = splitFileName_ x
+        (c,d) = break isExtSeparator b
+
+-- | Drop all extensions.
+--
+-- > dropExtensions "/directory/path.ext" == "/directory/path"
+-- > dropExtensions "file.tar.gz" == "file"
+-- > not $ hasExtension $ dropExtensions x
+-- > not $ any isExtSeparator $ takeFileName $ dropExtensions x
+dropExtensions :: FilePath -> FilePath
+dropExtensions = fst . splitExtensions
+
+-- | Get all extensions.
+--
+-- > takeExtensions "/directory/path.ext" == ".ext"
+-- > takeExtensions "file.tar.gz" == ".tar.gz"
+takeExtensions :: FilePath -> String
+takeExtensions = snd . splitExtensions
+
+
+-- | Replace all extensions of a file with a new extension. Note
+--   that 'replaceExtension' and 'addExtension' both work for adding
+--   multiple extensions, so only required when you need to drop
+--   all extensions first.
+--
+-- > replaceExtensions "file.fred.bob" "txt" == "file.txt"
+-- > replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz"
+replaceExtensions :: FilePath -> String -> FilePath
+replaceExtensions x y = dropExtensions x <.> y
+
+
+
+---------------------------------------------------------------------
+-- Drive methods
+
+-- | Is the given character a valid drive letter?
+-- only a-z and A-Z are letters, not isAlpha which is more unicodey
+isLetter :: Char -> Bool
+isLetter x = isAsciiLower x || isAsciiUpper x
+
+
+-- | Split a path into a drive and a path.
+--   On Posix, \/ is a Drive.
+--
+-- > uncurry (++) (splitDrive x) == x
+-- > Windows: splitDrive "file" == ("","file")
+-- > Windows: splitDrive "c:/file" == ("c:/","file")
+-- > Windows: splitDrive "c:\\file" == ("c:\\","file")
+-- > Windows: splitDrive "\\\\shared\\test" == ("\\\\shared\\","test")
+-- > Windows: splitDrive "\\\\shared" == ("\\\\shared","")
+-- > Windows: splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\","file")
+-- > Windows: splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\","UNCshared\\file")
+-- > Windows: splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\","file")
+-- > Windows: splitDrive "/d" == ("","/d")
+-- > Posix:   splitDrive "/test" == ("/","test")
+-- > Posix:   splitDrive "//test" == ("//","test")
+-- > Posix:   splitDrive "test/file" == ("","test/file")
+-- > Posix:   splitDrive "file" == ("","file")
+splitDrive :: FilePath -> (FilePath, FilePath)
+splitDrive x | isPosix = span (== '/') x
+splitDrive x | Just y <- readDriveLetter x = y
+splitDrive x | Just y <- readDriveUNC x = y
+splitDrive x | Just y <- readDriveShare x = y
+splitDrive x = ("",x)
+
+addSlash :: FilePath -> FilePath -> (FilePath, FilePath)
+addSlash a xs = (a++c,d)
+    where (c,d) = span isPathSeparator xs
+
+-- See [1].
+-- "\\?\D:\<path>" or "\\?\UNC\<server>\<share>"
+readDriveUNC :: FilePath -> Maybe (FilePath, FilePath)
+readDriveUNC (s1:s2:'?':s3:xs) | all isPathSeparator [s1,s2,s3] =
+    case map toUpper xs of
+        ('U':'N':'C':s4:_) | isPathSeparator s4 ->
+            let (a,b) = readDriveShareName (drop 4 xs)
+            in Just (s1:s2:'?':s3:take 4 xs ++ a, b)
+        _ -> case readDriveLetter xs of
+                 -- Extended-length path.
+                 Just (a,b) -> Just (s1:s2:'?':s3:a,b)
+                 Nothing -> Nothing
+readDriveUNC _ = Nothing
+
+{- c:\ -}
+readDriveLetter :: String -> Maybe (FilePath, FilePath)
+readDriveLetter (x:':':y:xs) | isLetter x && isPathSeparator y = Just $ addSlash [x,':'] (y:xs)
+readDriveLetter (x:':':xs) | isLetter x = Just ([x,':'], xs)
+readDriveLetter _ = Nothing
+
+{- \\sharename\ -}
+readDriveShare :: String -> Maybe (FilePath, FilePath)
+readDriveShare (s1:s2:xs) | isPathSeparator s1 && isPathSeparator s2 =
+        Just (s1:s2:a,b)
+    where (a,b) = readDriveShareName xs
+readDriveShare _ = Nothing
+
+{- assume you have already seen \\ -}
+{- share\bob -> "share\", "bob" -}
+readDriveShareName :: String -> (FilePath, FilePath)
+readDriveShareName name = addSlash a b
+    where (a,b) = break isPathSeparator name
+
+
+
+-- | Join a drive and the rest of the path.
+--
+-- > Valid x => uncurry joinDrive (splitDrive x) == x
+-- > Windows: joinDrive "C:" "foo" == "C:foo"
+-- > Windows: joinDrive "C:\\" "bar" == "C:\\bar"
+-- > Windows: joinDrive "\\\\share" "foo" == "\\\\share\\foo"
+-- > Windows: joinDrive "/:" "foo" == "/:\\foo"
+joinDrive :: FilePath -> FilePath -> FilePath
+joinDrive = combineAlways
+
+-- | Get the drive from a filepath.
+--
+-- > takeDrive x == fst (splitDrive x)
+takeDrive :: FilePath -> FilePath
+takeDrive = fst . splitDrive
+
+-- | Delete the drive, if it exists.
+--
+-- > dropDrive x == snd (splitDrive x)
+dropDrive :: FilePath -> FilePath
+dropDrive = snd . splitDrive
+
+-- | Does a path have a drive.
+--
+-- > not (hasDrive x) == null (takeDrive x)
+-- > Posix:   hasDrive "/foo" == True
+-- > Windows: hasDrive "C:\\foo" == True
+-- > Windows: hasDrive "C:foo" == True
+-- >          hasDrive "foo" == False
+-- >          hasDrive "" == False
+hasDrive :: FilePath -> Bool
+hasDrive = not . null . takeDrive
+
+
+-- | Is an element a drive
+--
+-- > Posix:   isDrive "/" == True
+-- > Posix:   isDrive "/foo" == False
+-- > Windows: isDrive "C:\\" == True
+-- > Windows: isDrive "C:\\foo" == False
+-- >          isDrive "" == False
+isDrive :: FilePath -> Bool
+isDrive x = not (null x) && null (dropDrive x)
+
+
+---------------------------------------------------------------------
+-- Operations on a filepath, as a list of directories
+
+-- | Split a filename into directory and file. '</>' is the inverse.
+--   The first component will often end with a trailing slash.
+--
+-- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
+-- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
+-- > Valid x => isValid (fst (splitFileName x))
+-- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
+-- > splitFileName "file/" == ("file/", "")
+-- > splitFileName "bob" == ("./", "bob")
+-- > Posix:   splitFileName "/" == ("/","")
+-- > Windows: splitFileName "c:" == ("c:","")
+splitFileName :: FilePath -> (String, String)
+splitFileName x = (if null dir then "./" else dir, name)
+    where
+        (dir, name) = splitFileName_ x
+
+-- version of splitFileName where, if the FilePath has no directory
+-- component, the returned directory is "" rather than "./".  This
+-- is used in cases where we are going to combine the returned
+-- directory to make a valid FilePath, and having a "./" appear would
+-- look strange and upset simple equality properties.  See
+-- e.g. replaceFileName.
+splitFileName_ :: FilePath -> (String, String)
+splitFileName_ x = (drv ++ dir, file)
+    where
+        (drv,pth) = splitDrive x
+        (dir,file) = breakEnd isPathSeparator pth
+
+-- | Set the filename.
+--
+-- > replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext"
+-- > Valid x => replaceFileName x (takeFileName x) == x
+replaceFileName :: FilePath -> String -> FilePath
+replaceFileName x y = a </> y where (a,_) = splitFileName_ x
+
+-- | Drop the filename. Unlike 'takeDirectory', this function will leave
+--   a trailing path separator on the directory.
+--
+-- > dropFileName "/directory/file.ext" == "/directory/"
+-- > dropFileName x == fst (splitFileName x)
+dropFileName :: FilePath -> FilePath
+dropFileName = fst . splitFileName
+
+
+-- | Get the file name.
+--
+-- > takeFileName "/directory/file.ext" == "file.ext"
+-- > takeFileName "test/" == ""
+-- > takeFileName x `isSuffixOf` x
+-- > takeFileName x == snd (splitFileName x)
+-- > Valid x => takeFileName (replaceFileName x "fred") == "fred"
+-- > Valid x => takeFileName (x </> "fred") == "fred"
+-- > Valid x => isRelative (takeFileName x)
+takeFileName :: FilePath -> FilePath
+takeFileName = snd . splitFileName
+
+-- | Get the base name, without an extension or path.
+--
+-- > takeBaseName "/directory/file.ext" == "file"
+-- > takeBaseName "file/test.txt" == "test"
+-- > takeBaseName "dave.ext" == "dave"
+-- > takeBaseName "" == ""
+-- > takeBaseName "test" == "test"
+-- > takeBaseName (addTrailingPathSeparator x) == ""
+-- > takeBaseName "file/file.tar.gz" == "file.tar"
+takeBaseName :: FilePath -> String
+takeBaseName = dropExtension . takeFileName
+
+-- | Set the base name.
+--
+-- > replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext"
+-- > replaceBaseName "file/test.txt" "bob" == "file/bob.txt"
+-- > replaceBaseName "fred" "bill" == "bill"
+-- > replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar"
+-- > Valid x => replaceBaseName x (takeBaseName x) == x
+replaceBaseName :: FilePath -> String -> FilePath
+replaceBaseName pth nam = combineAlways a (nam <.> ext)
+    where
+        (a,b) = splitFileName_ pth
+        ext = takeExtension b
+
+-- | Is an item either a directory or the last character a path separator?
+--
+-- > hasTrailingPathSeparator "test" == False
+-- > hasTrailingPathSeparator "test/" == True
+hasTrailingPathSeparator :: FilePath -> Bool
+hasTrailingPathSeparator "" = False
+hasTrailingPathSeparator x = isPathSeparator (last x)
+
+
+hasLeadingPathSeparator :: FilePath -> Bool
+hasLeadingPathSeparator "" = False
+hasLeadingPathSeparator x = isPathSeparator (head x)
+
+
+-- | Add a trailing file path separator if one is not already present.
+--
+-- > hasTrailingPathSeparator (addTrailingPathSeparator x)
+-- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
+-- > Posix:    addTrailingPathSeparator "test/rest" == "test/rest/"
+addTrailingPathSeparator :: FilePath -> FilePath
+addTrailingPathSeparator x = if hasTrailingPathSeparator x then x else x ++ [pathSeparator]
+
+
+-- | Remove any trailing path separators
+--
+-- > dropTrailingPathSeparator "file/test/" == "file/test"
+-- >           dropTrailingPathSeparator "/" == "/"
+-- > Windows:  dropTrailingPathSeparator "\\" == "\\"
+-- > Posix:    not (hasTrailingPathSeparator (dropTrailingPathSeparator x)) || isDrive x
+dropTrailingPathSeparator :: FilePath -> FilePath
+dropTrailingPathSeparator x =
+    if hasTrailingPathSeparator x && not (isDrive x)
+    then let x' = dropWhileEnd isPathSeparator x
+         in if null x' then [last x] else x'
+    else x
+
+
+-- | Get the directory name, move up one level.
+--
+-- >           takeDirectory "/directory/other.ext" == "/directory"
+-- >           takeDirectory x `isPrefixOf` x || takeDirectory x == "."
+-- >           takeDirectory "foo" == "."
+-- >           takeDirectory "/" == "/"
+-- >           takeDirectory "/foo" == "/"
+-- >           takeDirectory "/foo/bar/baz" == "/foo/bar"
+-- >           takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
+-- >           takeDirectory "foo/bar/baz" == "foo/bar"
+-- > Windows:  takeDirectory "foo\\bar" == "foo"
+-- > Windows:  takeDirectory "foo\\bar\\\\" == "foo\\bar"
+-- > Windows:  takeDirectory "C:\\" == "C:\\"
+takeDirectory :: FilePath -> FilePath
+takeDirectory = dropTrailingPathSeparator . dropFileName
+
+-- | Set the directory, keeping the filename the same.
+--
+-- > replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext"
+-- > Valid x => replaceDirectory x (takeDirectory x) `equalFilePath` x
+replaceDirectory :: FilePath -> String -> FilePath
+replaceDirectory x dir = combineAlways dir (takeFileName x)
+
+
+-- | An alias for '</>'.
+combine :: FilePath -> FilePath -> FilePath
+combine a b | hasLeadingPathSeparator b || hasDrive b = b
+            | otherwise = combineAlways a b
+
+-- | Combine two paths, assuming rhs is NOT absolute.
+combineAlways :: FilePath -> FilePath -> FilePath
+combineAlways a b | null a = b
+                  | null b = a
+                  | hasTrailingPathSeparator a = a ++ b
+                  | otherwise = case a of
+                      [a1,':'] | isWindows && isLetter a1 -> a ++ b
+                      _ -> a ++ [pathSeparator] ++ b
+
+
+-- | Combine two paths with a path separator.
+--   If the second path starts with a path separator or a drive letter, then it returns the second.
+--   The intention is that @readFile (dir '</>' file)@ will access the same file as
+--   @setCurrentDirectory dir; readFile file@.
+--
+-- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
+-- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
+-- >          "directory" </> "/file.ext" == "/file.ext"
+-- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
+--
+--   Combined:
+--
+-- > Posix:   "/" </> "test" == "/test"
+-- > Posix:   "home" </> "bob" == "home/bob"
+-- > Posix:   "x:" </> "foo" == "x:/foo"
+-- > Windows: "C:\\foo" </> "bar" == "C:\\foo\\bar"
+-- > Windows: "home" </> "bob" == "home\\bob"
+--
+--   Not combined:
+--
+-- > Posix:   "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "C:\\bob" == "C:\\bob"
+--
+--   Not combined (tricky):
+--
+--   On Windows, if a filepath starts with a single slash, it is relative to the
+--   root of the current drive. In [1], this is (confusingly) referred to as an
+--   absolute path.
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > Windows: "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "\\bob" == "\\bob"
+-- > Windows: "C:\\home" </> "\\bob" == "\\bob"
+--
+--   On Windows, from [1]: "If a file name begins with only a disk designator
+--   but not the backslash after the colon, it is interpreted as a relative path
+--   to the current directory on the drive with the specified letter."
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
+-- > Windows: "C:\\foo" </> "C:bar" == "C:bar"
+(</>) :: FilePath -> FilePath -> FilePath
+(</>) = combine
+
+
+-- | Split a path by the directory separator.
+--
+-- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
+-- > concat (splitPath x) == x
+-- > splitPath "test//item/" == ["test//","item/"]
+-- > splitPath "test/item/file" == ["test/","item/","file"]
+-- > splitPath "" == []
+-- > Windows: splitPath "c:\\test\\path" == ["c:\\","test\\","path"]
+-- > Posix:   splitPath "/file/test" == ["/","file/","test"]
+splitPath :: FilePath -> [FilePath]
+splitPath x = [drive | drive /= ""] ++ f path
+    where
+        (drive,path) = splitDrive x
+
+        f "" = []
+        f y = (a++c) : f d
+            where
+                (a,b) = break isPathSeparator y
+                (c,d) = span  isPathSeparator b
+
+-- | Just as 'splitPath', but don't add the trailing slashes to each element.
+--
+-- >          splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
+-- >          splitDirectories "test/file" == ["test","file"]
+-- >          splitDirectories "/test/file" == ["/","test","file"]
+-- > Windows: splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"]
+-- >          Valid x => joinPath (splitDirectories x) `equalFilePath` x
+-- >          splitDirectories "" == []
+-- > Windows: splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"]
+-- >          splitDirectories "/test///file" == ["/","test","file"]
+splitDirectories :: FilePath -> [FilePath]
+splitDirectories = map dropTrailingPathSeparator . splitPath
+
+
+-- | Join path elements back together.
+--
+-- > joinPath a == foldr (</>) "" a
+-- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
+-- > Valid x => joinPath (splitPath x) == x
+-- > joinPath [] == ""
+-- > Posix: joinPath ["test","file","path"] == "test/file/path"
+joinPath :: [FilePath] -> FilePath
+-- Note that this definition on c:\\c:\\, join then split will give c:\\.
+joinPath = foldr combine ""
+
+
+
+
+
+
+---------------------------------------------------------------------
+-- File name manipulators
+
+-- | Equality of two 'FilePath's.
+--   If you call @System.Directory.canonicalizePath@
+--   first this has a much better chance of working.
+--   Note that this doesn't follow symlinks or DOSNAM~1s.
+--
+-- Similar to 'normalise', this does not expand @".."@, because of symlinks.
+--
+-- >          x == y ==> equalFilePath x y
+-- >          normalise x == normalise y ==> equalFilePath x y
+-- >          equalFilePath "foo" "foo/"
+-- >          not (equalFilePath "/a/../c" "/c")
+-- >          not (equalFilePath "foo" "/foo")
+-- > Posix:   not (equalFilePath "foo" "FOO")
+-- > Windows: equalFilePath "foo" "FOO"
+-- > Windows: not (equalFilePath "C:" "C:/")
+equalFilePath :: FilePath -> FilePath -> Bool
+equalFilePath a b = f a == f b
+    where
+        f x | isWindows = dropTrailingPathSeparator $ map toLower $ normalise x
+            | otherwise = dropTrailingPathSeparator $ normalise x
+
+
+-- | Contract a filename, based on a relative path. Note that the resulting path
+--   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
+--   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
+--   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
+--
+--   The corresponding @makeAbsolute@ function can be found in
+--   @System.Directory@.
+--
+-- >          makeRelative "/directory" "/directory/file.ext" == "file.ext"
+-- >          Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
+-- >          makeRelative x x == "."
+-- >          Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
+-- > Windows: makeRelative "C:\\Home" "c:\\home\\bob" == "bob"
+-- > Windows: makeRelative "C:\\Home" "c:/home/bob" == "bob"
+-- > Windows: makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob"
+-- > Windows: makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob"
+-- > Windows: makeRelative "/Home" "/home/bob" == "bob"
+-- > Windows: makeRelative "/" "//" == "//"
+-- > Posix:   makeRelative "/Home" "/home/bob" == "/home/bob"
+-- > Posix:   makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar"
+-- > Posix:   makeRelative "/fred" "bob" == "bob"
+-- > Posix:   makeRelative "/file/test" "/file/test/fred" == "fred"
+-- > Posix:   makeRelative "/file/test" "/file/test/fred/" == "fred/"
+-- > Posix:   makeRelative "some/path" "some/path/a/b/c" == "a/b/c"
+makeRelative :: FilePath -> FilePath -> FilePath
+makeRelative root path
+ | equalFilePath root path = "."
+ | takeAbs root /= takeAbs path = path
+ | otherwise = f (dropAbs root) (dropAbs path)
+    where
+        f "" y = dropWhile isPathSeparator y
+        f x y = let (x1,x2) = g x
+                    (y1,y2) = g y
+                in if equalFilePath x1 y1 then f x2 y2 else path
+
+        g x = (dropWhile isPathSeparator a, dropWhile isPathSeparator b)
+            where (a,b) = break isPathSeparator $ dropWhile isPathSeparator x
+
+        -- on windows, need to drop '/' which is kind of absolute, but not a drive
+        dropAbs x | hasLeadingPathSeparator x && not (hasDrive x) = tail x
+        dropAbs x = dropDrive x
+
+        takeAbs x | hasLeadingPathSeparator x && not (hasDrive x) = [pathSeparator]
+        takeAbs x = map (\y -> if isPathSeparator y then pathSeparator else toLower y) $ takeDrive x
+
+-- | Normalise a file
+--
+-- * \/\/ outside of the drive can be made blank
+--
+-- * \/ -> 'pathSeparator'
+--
+-- * .\/ -> \"\"
+--
+-- Does not remove @".."@, because of symlinks.
+--
+-- > Posix:   normalise "/file/\\test////" == "/file/\\test/"
+-- > Posix:   normalise "/file/./test" == "/file/test"
+-- > Posix:   normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/"
+-- > Posix:   normalise "../bob/fred/" == "../bob/fred/"
+-- > Posix:   normalise "/a/../c" == "/a/../c"
+-- > Posix:   normalise "./bob/fred/" == "bob/fred/"
+-- > Windows: normalise "c:\\file/bob\\" == "C:\\file\\bob\\"
+-- > Windows: normalise "c:\\" == "C:\\"
+-- > Windows: normalise "C:.\\" == "C:"
+-- > Windows: normalise "\\\\server\\test" == "\\\\server\\test"
+-- > Windows: normalise "//server/test" == "\\\\server\\test"
+-- > Windows: normalise "c:/file" == "C:\\file"
+-- > Windows: normalise "/file" == "\\file"
+-- > Windows: normalise "\\" == "\\"
+-- > Windows: normalise "/./" == "\\"
+-- >          normalise "." == "."
+-- > Posix:   normalise "./" == "./"
+-- > Posix:   normalise "./." == "./"
+-- > Posix:   normalise "/./" == "/"
+-- > Posix:   normalise "/" == "/"
+-- > Posix:   normalise "bob/fred/." == "bob/fred/"
+-- > Posix:   normalise "//home" == "/home"
+normalise :: FilePath -> FilePath
+normalise path = result ++ [pathSeparator | addPathSeparator]
+    where
+        (drv,pth) = splitDrive path
+        result = joinDrive' (normaliseDrive drv) (f pth)
+
+        joinDrive' "" "" = "."
+        joinDrive' d p = joinDrive d p
+
+        addPathSeparator = isDirPath pth
+            && not (hasTrailingPathSeparator result)
+            && not (isRelativeDrive drv)
+
+        isDirPath xs = hasTrailingPathSeparator xs
+            || not (null xs) && last xs == '.' && hasTrailingPathSeparator (init xs)
+
+        f = joinPath . dropDots . propSep . splitDirectories
+
+        propSep (x:xs) | all isPathSeparator x = [pathSeparator] : xs
+                       | otherwise = x : xs
+        propSep [] = []
+
+        dropDots = filter ("." /=)
+
+normaliseDrive :: FilePath -> FilePath
+normaliseDrive "" = ""
+normaliseDrive _ | isPosix = [pathSeparator]
+normaliseDrive drive = if isJust $ readDriveLetter x2
+                       then map toUpper x2
+                       else x2
+    where
+        x2 = map repSlash drive
+
+        repSlash x = if isPathSeparator x then pathSeparator else x
+
+-- Information for validity functions on Windows. See [1].
+isBadCharacter :: Char -> Bool
+isBadCharacter x = x >= '\0' && x <= '\31' || x `elem` ":*?><|\""
+
+badElements :: [FilePath]
+badElements =
+    ["CON","PRN","AUX","NUL","CLOCK$"
+    ,"COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9"
+    ,"LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"]
+
+
+-- | Is a FilePath valid, i.e. could you create a file like it? This function checks for invalid names,
+--   and invalid characters, but does not check if length limits are exceeded, as these are typically
+--   filesystem dependent.
+--
+-- >          isValid "" == False
+-- >          isValid "\0" == False
+-- > Posix:   isValid "/random_ path:*" == True
+-- > Posix:   isValid x == not (null x)
+-- > Windows: isValid "c:\\test" == True
+-- > Windows: isValid "c:\\test:of_test" == False
+-- > Windows: isValid "test*" == False
+-- > Windows: isValid "c:\\test\\nul" == False
+-- > Windows: isValid "c:\\test\\prn.txt" == False
+-- > Windows: isValid "c:\\nul\\file" == False
+-- > Windows: isValid "\\\\" == False
+-- > Windows: isValid "\\\\\\foo" == False
+-- > Windows: isValid "\\\\?\\D:file" == False
+-- > Windows: isValid "foo\tbar" == False
+-- > Windows: isValid "nul .txt" == False
+-- > Windows: isValid " nul.txt" == True
+isValid :: FilePath -> Bool
+isValid "" = False
+isValid x | '\0' `elem` x = False
+isValid _ | isPosix = True
+isValid path =
+        not (any isBadCharacter x2) &&
+        not (any f $ splitDirectories x2) &&
+        not (isJust (readDriveShare x1) && all isPathSeparator x1) &&
+        not (isJust (readDriveUNC x1) && not (hasTrailingPathSeparator x1))
+    where
+        (x1,x2) = splitDrive path
+        f x = map toUpper (dropWhileEnd (== ' ') $ dropExtensions x) `elem` badElements
+
+
+-- | Take a FilePath and make it valid; does not change already valid FilePaths.
+--
+-- > isValid (makeValid x)
+-- > isValid x ==> makeValid x == x
+-- > makeValid "" == "_"
+-- > makeValid "file\0name" == "file_name"
+-- > Windows: makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
+-- > Windows: makeValid "c:\\test:of_test" == "c:\\test_of_test"
+-- > Windows: makeValid "test*" == "test_"
+-- > Windows: makeValid "c:\\test\\nul" == "c:\\test\\nul_"
+-- > Windows: makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt"
+-- > Windows: makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt"
+-- > Windows: makeValid "c:\\nul\\file" == "c:\\nul_\\file"
+-- > Windows: makeValid "\\\\\\foo" == "\\\\drive"
+-- > Windows: makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
+-- > Windows: makeValid "nul .txt" == "nul _.txt"
+makeValid :: FilePath -> FilePath
+makeValid "" = "_"
+makeValid path
+        | isPosix = map (\x -> if x == '\0' then '_' else x) path
+        | isJust (readDriveShare drv) && all isPathSeparator drv = take 2 drv ++ "drive"
+        | isJust (readDriveUNC drv) && not (hasTrailingPathSeparator drv) =
+            makeValid (drv ++ [pathSeparator] ++ pth)
+        | otherwise = joinDrive drv $ validElements $ validChars pth
+    where
+        (drv,pth) = splitDrive path
+
+        validChars = map f
+        f x = if isBadCharacter x then '_' else x
+
+        validElements x = joinPath $ map g $ splitPath x
+        g x = h a ++ b
+            where (a,b) = break isPathSeparator x
+        h x = if map toUpper (dropWhileEnd (== ' ') a) `elem` badElements then a ++ "_" <.> b else x
+            where (a,b) = splitExtensions x
+
+
+-- | Is a path relative, or is it fixed to the root?
+--
+-- > Windows: isRelative "path\\test" == True
+-- > Windows: isRelative "c:\\test" == False
+-- > Windows: isRelative "c:test" == True
+-- > Windows: isRelative "c:\\" == False
+-- > Windows: isRelative "c:/" == False
+-- > Windows: isRelative "c:" == True
+-- > Windows: isRelative "\\\\foo" == False
+-- > Windows: isRelative "\\\\?\\foo" == False
+-- > Windows: isRelative "\\\\?\\UNC\\foo" == False
+-- > Windows: isRelative "/foo" == True
+-- > Windows: isRelative "\\foo" == True
+-- > Posix:   isRelative "test/path" == True
+-- > Posix:   isRelative "/test" == False
+-- > Posix:   isRelative "/" == False
+--
+-- According to [1]:
+--
+-- * "A UNC name of any format [is never relative]."
+--
+-- * "You cannot use the "\\?\" prefix with a relative path."
+isRelative :: FilePath -> Bool
+isRelative x = null drive || isRelativeDrive drive
+    where drive = takeDrive x
+
+
+{- c:foo -}
+-- From [1]: "If a file name begins with only a disk designator but not the
+-- backslash after the colon, it is interpreted as a relative path to the
+-- current directory on the drive with the specified letter."
+isRelativeDrive :: String -> Bool
+isRelativeDrive x =
+    maybe False (not . hasTrailingPathSeparator . fst) (readDriveLetter x)
+
+
+-- | @not . 'isRelative'@
+--
+-- > isAbsolute x == not (isRelative x)
+isAbsolute :: FilePath -> Bool
+isAbsolute = not . isRelative
+
+
+-----------------------------------------------------------------------------
+-- dropWhileEnd (>2) [1,2,3,4,1,2,3,4] == [1,2,3,4,1,2])
+-- Note that Data.List.dropWhileEnd is only available in base >= 4.5.
+dropWhileEnd :: (a -> Bool) -> [a] -> [a]
+dropWhileEnd p = reverse . dropWhile p . reverse
+
+-- takeWhileEnd (>2) [1,2,3,4,1,2,3,4] == [3,4])
+takeWhileEnd :: (a -> Bool) -> [a] -> [a]
+takeWhileEnd p = reverse . takeWhile p . reverse
+
+-- spanEnd (>2) [1,2,3,4,1,2,3,4] = ([1,2,3,4,1,2], [3,4])
+spanEnd :: (a -> Bool) -> [a] -> ([a], [a])
+spanEnd p xs = (dropWhileEnd p xs, takeWhileEnd p xs)
+
+-- breakEnd (< 2) [1,2,3,4,1,2,3,4] == ([1,2,3,4,1],[2,3,4])
+breakEnd :: (a -> Bool) -> [a] -> ([a], [a])
+breakEnd p = spanEnd (not . p)
+
+-- | The stripSuffix function drops the given suffix from a list. It returns
+-- Nothing if the list did not end with the suffix given, or Just the list
+-- before the suffix, if it does.
+stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
+stripSuffix xs ys = fmap reverse $ stripPrefix (reverse xs) (reverse ys)
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath/Windows.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath/Windows.hs
new file mode 100644
index 0000000000..0b8f3277ec
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/Legacy/System/FilePath/Windows.hs
@@ -0,0 +1,1048 @@
+
+
+
+{-# LANGUAGE PatternGuards #-}
+
+-- This template expects CPP definitions for:
+--     MODULE_NAME = Posix | Windows
+--     IS_WINDOWS  = False | True
+
+-- |
+-- Module      :  System.FilePath.MODULE_NAME
+-- Copyright   :  (c) Neil Mitchell 2005-2014
+-- License     :  BSD3
+--
+-- Maintainer  :  ndmitchell@gmail.com
+-- Stability   :  stable
+-- Portability :  portable
+--
+-- A library for 'FilePath' manipulations, using MODULE_NAME style paths on
+-- all platforms. Importing "System.FilePath" is usually better.
+--
+-- Given the example 'FilePath': @\/directory\/file.ext@
+--
+-- We can use the following functions to extract pieces.
+--
+-- * 'takeFileName' gives @\"file.ext\"@
+--
+-- * 'takeDirectory' gives @\"\/directory\"@
+--
+-- * 'takeExtension' gives @\".ext\"@
+--
+-- * 'dropExtension' gives @\"\/directory\/file\"@
+--
+-- * 'takeBaseName' gives @\"file\"@
+--
+-- And we could have built an equivalent path with the following expressions:
+--
+-- * @\"\/directory\" '</>' \"file.ext\"@.
+--
+-- * @\"\/directory\/file" '<.>' \"ext\"@.
+--
+-- * @\"\/directory\/file.txt" '-<.>' \"ext\"@.
+--
+-- Each function in this module is documented with several examples,
+-- which are also used as tests.
+--
+-- Here are a few examples of using the @filepath@ functions together:
+--
+-- /Example 1:/ Find the possible locations of a Haskell module @Test@ imported from module @Main@:
+--
+-- @['replaceFileName' path_to_main \"Test\" '<.>' ext | ext <- [\"hs\",\"lhs\"] ]@
+--
+-- /Example 2:/ Download a file from @url@ and save it to disk:
+--
+-- @do let file = 'makeValid' url
+--   System.Directory.createDirectoryIfMissing True ('takeDirectory' file)@
+--
+-- /Example 3:/ Compile a Haskell file, putting the @.hi@ file under @interface@:
+--
+-- @'takeDirectory' file '</>' \"interface\" '</>' ('takeFileName' file '-<.>' \"hi\")@
+--
+-- References:
+-- [1] <http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx Naming Files, Paths and Namespaces> (Microsoft MSDN)
+module Legacy.System.FilePath.Windows
+    (
+    -- * Separator predicates
+    FilePath,
+    pathSeparator, pathSeparators, isPathSeparator,
+    searchPathSeparator, isSearchPathSeparator,
+    extSeparator, isExtSeparator,
+
+    -- * @$PATH@ methods
+    splitSearchPath, getSearchPath,
+
+    -- * Extension functions
+    splitExtension,
+    takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
+    splitExtensions, dropExtensions, takeExtensions, replaceExtensions, isExtensionOf,
+    stripExtension,
+
+    -- * Filename\/directory functions
+    splitFileName,
+    takeFileName, replaceFileName, dropFileName,
+    takeBaseName, replaceBaseName,
+    takeDirectory, replaceDirectory,
+    combine, (</>),
+    splitPath, joinPath, splitDirectories,
+
+    -- * Drive functions
+    splitDrive, joinDrive,
+    takeDrive, hasDrive, dropDrive, isDrive,
+
+    -- * Trailing slash functions
+    hasTrailingPathSeparator,
+    addTrailingPathSeparator,
+    dropTrailingPathSeparator,
+
+    -- * File name manipulations
+    normalise, equalFilePath,
+    makeRelative,
+    isRelative, isAbsolute,
+    isValid, makeValid
+    )
+    where
+
+import Data.Char(toLower, toUpper, isAsciiLower, isAsciiUpper)
+import Data.Maybe(isJust)
+import Data.List(stripPrefix, isSuffixOf)
+
+import System.Environment(getEnv)
+
+
+infixr 7  <.>, -<.>
+infixr 5  </>
+
+
+
+
+
+---------------------------------------------------------------------
+-- Platform Abstraction Methods (private)
+
+-- | Is the operating system Unix or Linux like
+isPosix :: Bool
+isPosix = not isWindows
+
+-- | Is the operating system Windows like
+isWindows :: Bool
+isWindows = True
+
+
+---------------------------------------------------------------------
+-- The basic functions
+
+-- | The character that separates directories. In the case where more than
+--   one character is possible, 'pathSeparator' is the \'ideal\' one.
+--
+-- > Windows: pathSeparator == '\\'
+-- > Posix:   pathSeparator ==  '/'
+-- > isPathSeparator pathSeparator
+pathSeparator :: Char
+pathSeparator = if isWindows then '\\' else '/'
+
+-- | The list of all possible separators.
+--
+-- > Windows: pathSeparators == ['\\', '/']
+-- > Posix:   pathSeparators == ['/']
+-- > pathSeparator `elem` pathSeparators
+pathSeparators :: [Char]
+pathSeparators = if isWindows then "\\/" else "/"
+
+-- | Rather than using @(== 'pathSeparator')@, use this. Test if something
+--   is a path separator.
+--
+-- > isPathSeparator a == (a `elem` pathSeparators)
+isPathSeparator :: Char -> Bool
+isPathSeparator '/' = True
+isPathSeparator '\\' = isWindows
+isPathSeparator _ = False
+
+
+-- | The character that is used to separate the entries in the $PATH environment variable.
+--
+-- > Windows: searchPathSeparator == ';'
+-- > Posix:   searchPathSeparator == ':'
+searchPathSeparator :: Char
+searchPathSeparator = if isWindows then ';' else ':'
+
+-- | Is the character a file separator?
+--
+-- > isSearchPathSeparator a == (a == searchPathSeparator)
+isSearchPathSeparator :: Char -> Bool
+isSearchPathSeparator = (== searchPathSeparator)
+
+
+-- | File extension character
+--
+-- > extSeparator == '.'
+extSeparator :: Char
+extSeparator = '.'
+
+-- | Is the character an extension character?
+--
+-- > isExtSeparator a == (a == extSeparator)
+isExtSeparator :: Char -> Bool
+isExtSeparator = (== extSeparator)
+
+
+---------------------------------------------------------------------
+-- Path methods (environment $PATH)
+
+-- | Take a string, split it on the 'searchPathSeparator' character.
+--   Blank items are ignored on Windows, and converted to @.@ on Posix.
+--   On Windows path elements are stripped of quotes.
+--
+--   Follows the recommendations in
+--   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>
+--
+-- > Posix:   splitSearchPath "File1:File2:File3"  == ["File1","File2","File3"]
+-- > Posix:   splitSearchPath "File1::File2:File3" == ["File1",".","File2","File3"]
+-- > Windows: splitSearchPath "File1;File2;File3"  == ["File1","File2","File3"]
+-- > Windows: splitSearchPath "File1;;File2;File3" == ["File1","File2","File3"]
+-- > Windows: splitSearchPath "File1;\"File2\";File3" == ["File1","File2","File3"]
+splitSearchPath :: String -> [FilePath]
+splitSearchPath = f
+    where
+    f xs = case break isSearchPathSeparator xs of
+           (pre, []    ) -> g pre
+           (pre, _:post) -> g pre ++ f post
+
+    g "" = ["." | isPosix]
+    g ('\"':x@(_:_)) | isWindows && last x == '\"' = [init x]
+    g x = [x]
+
+
+-- | Get a list of 'FilePath's in the $PATH variable.
+getSearchPath :: IO [FilePath]
+getSearchPath = fmap splitSearchPath (getEnv "PATH")
+
+
+---------------------------------------------------------------------
+-- Extension methods
+
+-- | Split on the extension. 'addExtension' is the inverse.
+--
+-- > splitExtension "/directory/path.ext" == ("/directory/path",".ext")
+-- > uncurry (++) (splitExtension x) == x
+-- > Valid x => uncurry addExtension (splitExtension x) == x
+-- > splitExtension "file.txt" == ("file",".txt")
+-- > splitExtension "file" == ("file","")
+-- > splitExtension "file/file.txt" == ("file/file",".txt")
+-- > splitExtension "file.txt/boris" == ("file.txt/boris","")
+-- > splitExtension "file.txt/boris.ext" == ("file.txt/boris",".ext")
+-- > splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob",".fred")
+-- > splitExtension "file/path.txt/" == ("file/path.txt/","")
+splitExtension :: FilePath -> (String, String)
+splitExtension x = case nameDot of
+                       "" -> (x,"")
+                       _ -> (dir ++ init nameDot, extSeparator : ext)
+    where
+        (dir,file) = splitFileName_ x
+        (nameDot,ext) = breakEnd isExtSeparator file
+
+-- | Get the extension of a file, returns @\"\"@ for no extension, @.ext@ otherwise.
+--
+-- > takeExtension "/directory/path.ext" == ".ext"
+-- > takeExtension x == snd (splitExtension x)
+-- > Valid x => takeExtension (addExtension x "ext") == ".ext"
+-- > Valid x => takeExtension (replaceExtension x "ext") == ".ext"
+takeExtension :: FilePath -> String
+takeExtension = snd . splitExtension
+
+-- | Remove the current extension and add another, equivalent to 'replaceExtension'.
+--
+-- > "/directory/path.txt" -<.> "ext" == "/directory/path.ext"
+-- > "/directory/path.txt" -<.> ".ext" == "/directory/path.ext"
+-- > "foo.o" -<.> "c" == "foo.c"
+(-<.>) :: FilePath -> String -> FilePath
+(-<.>) = replaceExtension
+
+-- | Set the extension of a file, overwriting one if already present, equivalent to '-<.>'.
+--
+-- > replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext"
+-- > replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext"
+-- > replaceExtension "file.txt" ".bob" == "file.bob"
+-- > replaceExtension "file.txt" "bob" == "file.bob"
+-- > replaceExtension "file" ".bob" == "file.bob"
+-- > replaceExtension "file.txt" "" == "file"
+-- > replaceExtension "file.fred.bob" "txt" == "file.fred.txt"
+-- > replaceExtension x y == addExtension (dropExtension x) y
+replaceExtension :: FilePath -> String -> FilePath
+replaceExtension x y = dropExtension x <.> y
+
+-- | Add an extension, even if there is already one there, equivalent to 'addExtension'.
+--
+-- > "/directory/path" <.> "ext" == "/directory/path.ext"
+-- > "/directory/path" <.> ".ext" == "/directory/path.ext"
+(<.>) :: FilePath -> String -> FilePath
+(<.>) = addExtension
+
+-- | Remove last extension, and the \".\" preceding it.
+--
+-- > dropExtension "/directory/path.ext" == "/directory/path"
+-- > dropExtension x == fst (splitExtension x)
+dropExtension :: FilePath -> FilePath
+dropExtension = fst . splitExtension
+
+-- | Add an extension, even if there is already one there, equivalent to '<.>'.
+--
+-- > addExtension "/directory/path" "ext" == "/directory/path.ext"
+-- > addExtension "file.txt" "bib" == "file.txt.bib"
+-- > addExtension "file." ".bib" == "file..bib"
+-- > addExtension "file" ".bib" == "file.bib"
+-- > addExtension "/" "x" == "/.x"
+-- > addExtension x "" == x
+-- > Valid x => takeFileName (addExtension (addTrailingPathSeparator x) "ext") == ".ext"
+-- > Windows: addExtension "\\\\share" ".txt" == "\\\\share\\.txt"
+addExtension :: FilePath -> String -> FilePath
+addExtension file "" = file
+addExtension file xs@(x:_) = joinDrive a res
+    where
+        res = if isExtSeparator x then b ++ xs
+              else b ++ [extSeparator] ++ xs
+
+        (a,b) = splitDrive file
+
+-- | Does the given filename have an extension?
+--
+-- > hasExtension "/directory/path.ext" == True
+-- > hasExtension "/directory/path" == False
+-- > null (takeExtension x) == not (hasExtension x)
+hasExtension :: FilePath -> Bool
+hasExtension = any isExtSeparator . takeFileName
+
+
+-- | Does the given filename have the specified extension?
+--
+-- > "png" `isExtensionOf` "/directory/file.png" == True
+-- > ".png" `isExtensionOf` "/directory/file.png" == True
+-- > ".tar.gz" `isExtensionOf` "bar/foo.tar.gz" == True
+-- > "ar.gz" `isExtensionOf` "bar/foo.tar.gz" == False
+-- > "png" `isExtensionOf` "/directory/file.png.jpg" == False
+-- > "csv/table.csv" `isExtensionOf` "/data/csv/table.csv" == False
+isExtensionOf :: String -> FilePath -> Bool
+isExtensionOf ext@('.':_) = isSuffixOf ext . takeExtensions
+isExtensionOf ext         = isSuffixOf ('.':ext) . takeExtensions
+
+-- | Drop the given extension from a FilePath, and the @\".\"@ preceding it.
+--   Returns 'Nothing' if the FilePath does not have the given extension, or
+--   'Just' and the part before the extension if it does.
+--
+--   This function can be more predictable than 'dropExtensions', especially if the filename
+--   might itself contain @.@ characters.
+--
+-- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
+-- > stripExtension "hi.o" "foo.x.hs.o" == Nothing
+-- > dropExtension x == fromJust (stripExtension (takeExtension x) x)
+-- > dropExtensions x == fromJust (stripExtension (takeExtensions x) x)
+-- > stripExtension ".c.d" "a.b.c.d"  == Just "a.b"
+-- > stripExtension ".c.d" "a.b..c.d" == Just "a.b."
+-- > stripExtension "baz"  "foo.bar"  == Nothing
+-- > stripExtension "bar"  "foobar"   == Nothing
+-- > stripExtension ""     x          == Just x
+stripExtension :: String -> FilePath -> Maybe FilePath
+stripExtension []        path = Just path
+stripExtension ext@(x:_) path = stripSuffix dotExt path
+    where dotExt = if isExtSeparator x then ext else '.':ext
+
+
+-- | Split on all extensions.
+--
+-- > splitExtensions "/directory/path.ext" == ("/directory/path",".ext")
+-- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
+-- > uncurry (++) (splitExtensions x) == x
+-- > Valid x => uncurry addExtension (splitExtensions x) == x
+-- > splitExtensions "file.tar.gz" == ("file",".tar.gz")
+splitExtensions :: FilePath -> (FilePath, String)
+splitExtensions x = (a ++ c, d)
+    where
+        (a,b) = splitFileName_ x
+        (c,d) = break isExtSeparator b
+
+-- | Drop all extensions.
+--
+-- > dropExtensions "/directory/path.ext" == "/directory/path"
+-- > dropExtensions "file.tar.gz" == "file"
+-- > not $ hasExtension $ dropExtensions x
+-- > not $ any isExtSeparator $ takeFileName $ dropExtensions x
+dropExtensions :: FilePath -> FilePath
+dropExtensions = fst . splitExtensions
+
+-- | Get all extensions.
+--
+-- > takeExtensions "/directory/path.ext" == ".ext"
+-- > takeExtensions "file.tar.gz" == ".tar.gz"
+takeExtensions :: FilePath -> String
+takeExtensions = snd . splitExtensions
+
+
+-- | Replace all extensions of a file with a new extension. Note
+--   that 'replaceExtension' and 'addExtension' both work for adding
+--   multiple extensions, so only required when you need to drop
+--   all extensions first.
+--
+-- > replaceExtensions "file.fred.bob" "txt" == "file.txt"
+-- > replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz"
+replaceExtensions :: FilePath -> String -> FilePath
+replaceExtensions x y = dropExtensions x <.> y
+
+
+
+---------------------------------------------------------------------
+-- Drive methods
+
+-- | Is the given character a valid drive letter?
+-- only a-z and A-Z are letters, not isAlpha which is more unicodey
+isLetter :: Char -> Bool
+isLetter x = isAsciiLower x || isAsciiUpper x
+
+
+-- | Split a path into a drive and a path.
+--   On Posix, \/ is a Drive.
+--
+-- > uncurry (++) (splitDrive x) == x
+-- > Windows: splitDrive "file" == ("","file")
+-- > Windows: splitDrive "c:/file" == ("c:/","file")
+-- > Windows: splitDrive "c:\\file" == ("c:\\","file")
+-- > Windows: splitDrive "\\\\shared\\test" == ("\\\\shared\\","test")
+-- > Windows: splitDrive "\\\\shared" == ("\\\\shared","")
+-- > Windows: splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\","file")
+-- > Windows: splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\","UNCshared\\file")
+-- > Windows: splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\","file")
+-- > Windows: splitDrive "/d" == ("","/d")
+-- > Posix:   splitDrive "/test" == ("/","test")
+-- > Posix:   splitDrive "//test" == ("//","test")
+-- > Posix:   splitDrive "test/file" == ("","test/file")
+-- > Posix:   splitDrive "file" == ("","file")
+splitDrive :: FilePath -> (FilePath, FilePath)
+splitDrive x | isPosix = span (== '/') x
+splitDrive x | Just y <- readDriveLetter x = y
+splitDrive x | Just y <- readDriveUNC x = y
+splitDrive x | Just y <- readDriveShare x = y
+splitDrive x = ("",x)
+
+addSlash :: FilePath -> FilePath -> (FilePath, FilePath)
+addSlash a xs = (a++c,d)
+    where (c,d) = span isPathSeparator xs
+
+-- See [1].
+-- "\\?\D:\<path>" or "\\?\UNC\<server>\<share>"
+readDriveUNC :: FilePath -> Maybe (FilePath, FilePath)
+readDriveUNC (s1:s2:'?':s3:xs) | all isPathSeparator [s1,s2,s3] =
+    case map toUpper xs of
+        ('U':'N':'C':s4:_) | isPathSeparator s4 ->
+            let (a,b) = readDriveShareName (drop 4 xs)
+            in Just (s1:s2:'?':s3:take 4 xs ++ a, b)
+        _ -> case readDriveLetter xs of
+                 -- Extended-length path.
+                 Just (a,b) -> Just (s1:s2:'?':s3:a,b)
+                 Nothing -> Nothing
+readDriveUNC _ = Nothing
+
+{- c:\ -}
+readDriveLetter :: String -> Maybe (FilePath, FilePath)
+readDriveLetter (x:':':y:xs) | isLetter x && isPathSeparator y = Just $ addSlash [x,':'] (y:xs)
+readDriveLetter (x:':':xs) | isLetter x = Just ([x,':'], xs)
+readDriveLetter _ = Nothing
+
+{- \\sharename\ -}
+readDriveShare :: String -> Maybe (FilePath, FilePath)
+readDriveShare (s1:s2:xs) | isPathSeparator s1 && isPathSeparator s2 =
+        Just (s1:s2:a,b)
+    where (a,b) = readDriveShareName xs
+readDriveShare _ = Nothing
+
+{- assume you have already seen \\ -}
+{- share\bob -> "share\", "bob" -}
+readDriveShareName :: String -> (FilePath, FilePath)
+readDriveShareName name = addSlash a b
+    where (a,b) = break isPathSeparator name
+
+
+
+-- | Join a drive and the rest of the path.
+--
+-- > Valid x => uncurry joinDrive (splitDrive x) == x
+-- > Windows: joinDrive "C:" "foo" == "C:foo"
+-- > Windows: joinDrive "C:\\" "bar" == "C:\\bar"
+-- > Windows: joinDrive "\\\\share" "foo" == "\\\\share\\foo"
+-- > Windows: joinDrive "/:" "foo" == "/:\\foo"
+joinDrive :: FilePath -> FilePath -> FilePath
+joinDrive = combineAlways
+
+-- | Get the drive from a filepath.
+--
+-- > takeDrive x == fst (splitDrive x)
+takeDrive :: FilePath -> FilePath
+takeDrive = fst . splitDrive
+
+-- | Delete the drive, if it exists.
+--
+-- > dropDrive x == snd (splitDrive x)
+dropDrive :: FilePath -> FilePath
+dropDrive = snd . splitDrive
+
+-- | Does a path have a drive.
+--
+-- > not (hasDrive x) == null (takeDrive x)
+-- > Posix:   hasDrive "/foo" == True
+-- > Windows: hasDrive "C:\\foo" == True
+-- > Windows: hasDrive "C:foo" == True
+-- >          hasDrive "foo" == False
+-- >          hasDrive "" == False
+hasDrive :: FilePath -> Bool
+hasDrive = not . null . takeDrive
+
+
+-- | Is an element a drive
+--
+-- > Posix:   isDrive "/" == True
+-- > Posix:   isDrive "/foo" == False
+-- > Windows: isDrive "C:\\" == True
+-- > Windows: isDrive "C:\\foo" == False
+-- >          isDrive "" == False
+isDrive :: FilePath -> Bool
+isDrive x = not (null x) && null (dropDrive x)
+
+
+---------------------------------------------------------------------
+-- Operations on a filepath, as a list of directories
+
+-- | Split a filename into directory and file. '</>' is the inverse.
+--   The first component will often end with a trailing slash.
+--
+-- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
+-- > Valid x => uncurry (</>) (splitFileName x) == x || fst (splitFileName x) == "./"
+-- > Valid x => isValid (fst (splitFileName x))
+-- > splitFileName "file/bob.txt" == ("file/", "bob.txt")
+-- > splitFileName "file/" == ("file/", "")
+-- > splitFileName "bob" == ("./", "bob")
+-- > Posix:   splitFileName "/" == ("/","")
+-- > Windows: splitFileName "c:" == ("c:","")
+splitFileName :: FilePath -> (String, String)
+splitFileName x = (if null dir then "./" else dir, name)
+    where
+        (dir, name) = splitFileName_ x
+
+-- version of splitFileName where, if the FilePath has no directory
+-- component, the returned directory is "" rather than "./".  This
+-- is used in cases where we are going to combine the returned
+-- directory to make a valid FilePath, and having a "./" appear would
+-- look strange and upset simple equality properties.  See
+-- e.g. replaceFileName.
+splitFileName_ :: FilePath -> (String, String)
+splitFileName_ x = (drv ++ dir, file)
+    where
+        (drv,pth) = splitDrive x
+        (dir,file) = breakEnd isPathSeparator pth
+
+-- | Set the filename.
+--
+-- > replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext"
+-- > Valid x => replaceFileName x (takeFileName x) == x
+replaceFileName :: FilePath -> String -> FilePath
+replaceFileName x y = a </> y where (a,_) = splitFileName_ x
+
+-- | Drop the filename. Unlike 'takeDirectory', this function will leave
+--   a trailing path separator on the directory.
+--
+-- > dropFileName "/directory/file.ext" == "/directory/"
+-- > dropFileName x == fst (splitFileName x)
+dropFileName :: FilePath -> FilePath
+dropFileName = fst . splitFileName
+
+
+-- | Get the file name.
+--
+-- > takeFileName "/directory/file.ext" == "file.ext"
+-- > takeFileName "test/" == ""
+-- > takeFileName x `isSuffixOf` x
+-- > takeFileName x == snd (splitFileName x)
+-- > Valid x => takeFileName (replaceFileName x "fred") == "fred"
+-- > Valid x => takeFileName (x </> "fred") == "fred"
+-- > Valid x => isRelative (takeFileName x)
+takeFileName :: FilePath -> FilePath
+takeFileName = snd . splitFileName
+
+-- | Get the base name, without an extension or path.
+--
+-- > takeBaseName "/directory/file.ext" == "file"
+-- > takeBaseName "file/test.txt" == "test"
+-- > takeBaseName "dave.ext" == "dave"
+-- > takeBaseName "" == ""
+-- > takeBaseName "test" == "test"
+-- > takeBaseName (addTrailingPathSeparator x) == ""
+-- > takeBaseName "file/file.tar.gz" == "file.tar"
+takeBaseName :: FilePath -> String
+takeBaseName = dropExtension . takeFileName
+
+-- | Set the base name.
+--
+-- > replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext"
+-- > replaceBaseName "file/test.txt" "bob" == "file/bob.txt"
+-- > replaceBaseName "fred" "bill" == "bill"
+-- > replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar"
+-- > Valid x => replaceBaseName x (takeBaseName x) == x
+replaceBaseName :: FilePath -> String -> FilePath
+replaceBaseName pth nam = combineAlways a (nam <.> ext)
+    where
+        (a,b) = splitFileName_ pth
+        ext = takeExtension b
+
+-- | Is an item either a directory or the last character a path separator?
+--
+-- > hasTrailingPathSeparator "test" == False
+-- > hasTrailingPathSeparator "test/" == True
+hasTrailingPathSeparator :: FilePath -> Bool
+hasTrailingPathSeparator "" = False
+hasTrailingPathSeparator x = isPathSeparator (last x)
+
+
+hasLeadingPathSeparator :: FilePath -> Bool
+hasLeadingPathSeparator "" = False
+hasLeadingPathSeparator x = isPathSeparator (head x)
+
+
+-- | Add a trailing file path separator if one is not already present.
+--
+-- > hasTrailingPathSeparator (addTrailingPathSeparator x)
+-- > hasTrailingPathSeparator x ==> addTrailingPathSeparator x == x
+-- > Posix:    addTrailingPathSeparator "test/rest" == "test/rest/"
+addTrailingPathSeparator :: FilePath -> FilePath
+addTrailingPathSeparator x = if hasTrailingPathSeparator x then x else x ++ [pathSeparator]
+
+
+-- | Remove any trailing path separators
+--
+-- > dropTrailingPathSeparator "file/test/" == "file/test"
+-- >           dropTrailingPathSeparator "/" == "/"
+-- > Windows:  dropTrailingPathSeparator "\\" == "\\"
+-- > Posix:    not (hasTrailingPathSeparator (dropTrailingPathSeparator x)) || isDrive x
+dropTrailingPathSeparator :: FilePath -> FilePath
+dropTrailingPathSeparator x =
+    if hasTrailingPathSeparator x && not (isDrive x)
+    then let x' = dropWhileEnd isPathSeparator x
+         in if null x' then [last x] else x'
+    else x
+
+
+-- | Get the directory name, move up one level.
+--
+-- >           takeDirectory "/directory/other.ext" == "/directory"
+-- >           takeDirectory x `isPrefixOf` x || takeDirectory x == "."
+-- >           takeDirectory "foo" == "."
+-- >           takeDirectory "/" == "/"
+-- >           takeDirectory "/foo" == "/"
+-- >           takeDirectory "/foo/bar/baz" == "/foo/bar"
+-- >           takeDirectory "/foo/bar/baz/" == "/foo/bar/baz"
+-- >           takeDirectory "foo/bar/baz" == "foo/bar"
+-- > Windows:  takeDirectory "foo\\bar" == "foo"
+-- > Windows:  takeDirectory "foo\\bar\\\\" == "foo\\bar"
+-- > Windows:  takeDirectory "C:\\" == "C:\\"
+takeDirectory :: FilePath -> FilePath
+takeDirectory = dropTrailingPathSeparator . dropFileName
+
+-- | Set the directory, keeping the filename the same.
+--
+-- > replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext"
+-- > Valid x => replaceDirectory x (takeDirectory x) `equalFilePath` x
+replaceDirectory :: FilePath -> String -> FilePath
+replaceDirectory x dir = combineAlways dir (takeFileName x)
+
+
+-- | An alias for '</>'.
+combine :: FilePath -> FilePath -> FilePath
+combine a b | hasLeadingPathSeparator b || hasDrive b = b
+            | otherwise = combineAlways a b
+
+-- | Combine two paths, assuming rhs is NOT absolute.
+combineAlways :: FilePath -> FilePath -> FilePath
+combineAlways a b | null a = b
+                  | null b = a
+                  | hasTrailingPathSeparator a = a ++ b
+                  | otherwise = case a of
+                      [a1,':'] | isWindows && isLetter a1 -> a ++ b
+                      _ -> a ++ [pathSeparator] ++ b
+
+
+-- | Combine two paths with a path separator.
+--   If the second path starts with a path separator or a drive letter, then it returns the second.
+--   The intention is that @readFile (dir '</>' file)@ will access the same file as
+--   @setCurrentDirectory dir; readFile file@.
+--
+-- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
+-- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
+-- >          "directory" </> "/file.ext" == "/file.ext"
+-- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
+--
+--   Combined:
+--
+-- > Posix:   "/" </> "test" == "/test"
+-- > Posix:   "home" </> "bob" == "home/bob"
+-- > Posix:   "x:" </> "foo" == "x:/foo"
+-- > Windows: "C:\\foo" </> "bar" == "C:\\foo\\bar"
+-- > Windows: "home" </> "bob" == "home\\bob"
+--
+--   Not combined:
+--
+-- > Posix:   "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "C:\\bob" == "C:\\bob"
+--
+--   Not combined (tricky):
+--
+--   On Windows, if a filepath starts with a single slash, it is relative to the
+--   root of the current drive. In [1], this is (confusingly) referred to as an
+--   absolute path.
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > Windows: "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "\\bob" == "\\bob"
+-- > Windows: "C:\\home" </> "\\bob" == "\\bob"
+--
+--   On Windows, from [1]: "If a file name begins with only a disk designator
+--   but not the backslash after the colon, it is interpreted as a relative path
+--   to the current directory on the drive with the specified letter."
+--   The current behavior of '</>' is to never combine these forms.
+--
+-- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
+-- > Windows: "C:\\foo" </> "C:bar" == "C:bar"
+(</>) :: FilePath -> FilePath -> FilePath
+(</>) = combine
+
+
+-- | Split a path by the directory separator.
+--
+-- > splitPath "/directory/file.ext" == ["/","directory/","file.ext"]
+-- > concat (splitPath x) == x
+-- > splitPath "test//item/" == ["test//","item/"]
+-- > splitPath "test/item/file" == ["test/","item/","file"]
+-- > splitPath "" == []
+-- > Windows: splitPath "c:\\test\\path" == ["c:\\","test\\","path"]
+-- > Posix:   splitPath "/file/test" == ["/","file/","test"]
+splitPath :: FilePath -> [FilePath]
+splitPath x = [drive | drive /= ""] ++ f path
+    where
+        (drive,path) = splitDrive x
+
+        f "" = []
+        f y = (a++c) : f d
+            where
+                (a,b) = break isPathSeparator y
+                (c,d) = span  isPathSeparator b
+
+-- | Just as 'splitPath', but don't add the trailing slashes to each element.
+--
+-- >          splitDirectories "/directory/file.ext" == ["/","directory","file.ext"]
+-- >          splitDirectories "test/file" == ["test","file"]
+-- >          splitDirectories "/test/file" == ["/","test","file"]
+-- > Windows: splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"]
+-- >          Valid x => joinPath (splitDirectories x) `equalFilePath` x
+-- >          splitDirectories "" == []
+-- > Windows: splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"]
+-- >          splitDirectories "/test///file" == ["/","test","file"]
+splitDirectories :: FilePath -> [FilePath]
+splitDirectories = map dropTrailingPathSeparator . splitPath
+
+
+-- | Join path elements back together.
+--
+-- > joinPath a == foldr (</>) "" a
+-- > joinPath ["/","directory/","file.ext"] == "/directory/file.ext"
+-- > Valid x => joinPath (splitPath x) == x
+-- > joinPath [] == ""
+-- > Posix: joinPath ["test","file","path"] == "test/file/path"
+joinPath :: [FilePath] -> FilePath
+-- Note that this definition on c:\\c:\\, join then split will give c:\\.
+joinPath = foldr combine ""
+
+
+
+
+
+
+---------------------------------------------------------------------
+-- File name manipulators
+
+-- | Equality of two 'FilePath's.
+--   If you call @System.Directory.canonicalizePath@
+--   first this has a much better chance of working.
+--   Note that this doesn't follow symlinks or DOSNAM~1s.
+--
+-- Similar to 'normalise', this does not expand @".."@, because of symlinks.
+--
+-- >          x == y ==> equalFilePath x y
+-- >          normalise x == normalise y ==> equalFilePath x y
+-- >          equalFilePath "foo" "foo/"
+-- >          not (equalFilePath "/a/../c" "/c")
+-- >          not (equalFilePath "foo" "/foo")
+-- > Posix:   not (equalFilePath "foo" "FOO")
+-- > Windows: equalFilePath "foo" "FOO"
+-- > Windows: not (equalFilePath "C:" "C:/")
+equalFilePath :: FilePath -> FilePath -> Bool
+equalFilePath a b = f a == f b
+    where
+        f x | isWindows = dropTrailingPathSeparator $ map toLower $ normalise x
+            | otherwise = dropTrailingPathSeparator $ normalise x
+
+
+-- | Contract a filename, based on a relative path. Note that the resulting path
+--   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
+--   may not reach @a\/b@ if it starts from @a\/c@. For a worked example see
+--   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
+--
+--   The corresponding @makeAbsolute@ function can be found in
+--   @System.Directory@.
+--
+-- >          makeRelative "/directory" "/directory/file.ext" == "file.ext"
+-- >          Valid x => makeRelative (takeDirectory x) x `equalFilePath` takeFileName x
+-- >          makeRelative x x == "."
+-- >          Valid x y => equalFilePath x y || (isRelative x && makeRelative y x == x) || equalFilePath (y </> makeRelative y x) x
+-- > Windows: makeRelative "C:\\Home" "c:\\home\\bob" == "bob"
+-- > Windows: makeRelative "C:\\Home" "c:/home/bob" == "bob"
+-- > Windows: makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob"
+-- > Windows: makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob"
+-- > Windows: makeRelative "/Home" "/home/bob" == "bob"
+-- > Windows: makeRelative "/" "//" == "//"
+-- > Posix:   makeRelative "/Home" "/home/bob" == "/home/bob"
+-- > Posix:   makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar"
+-- > Posix:   makeRelative "/fred" "bob" == "bob"
+-- > Posix:   makeRelative "/file/test" "/file/test/fred" == "fred"
+-- > Posix:   makeRelative "/file/test" "/file/test/fred/" == "fred/"
+-- > Posix:   makeRelative "some/path" "some/path/a/b/c" == "a/b/c"
+makeRelative :: FilePath -> FilePath -> FilePath
+makeRelative root path
+ | equalFilePath root path = "."
+ | takeAbs root /= takeAbs path = path
+ | otherwise = f (dropAbs root) (dropAbs path)
+    where
+        f "" y = dropWhile isPathSeparator y
+        f x y = let (x1,x2) = g x
+                    (y1,y2) = g y
+                in if equalFilePath x1 y1 then f x2 y2 else path
+
+        g x = (dropWhile isPathSeparator a, dropWhile isPathSeparator b)
+            where (a,b) = break isPathSeparator $ dropWhile isPathSeparator x
+
+        -- on windows, need to drop '/' which is kind of absolute, but not a drive
+        dropAbs x | hasLeadingPathSeparator x && not (hasDrive x) = tail x
+        dropAbs x = dropDrive x
+
+        takeAbs x | hasLeadingPathSeparator x && not (hasDrive x) = [pathSeparator]
+        takeAbs x = map (\y -> if isPathSeparator y then pathSeparator else toLower y) $ takeDrive x
+
+-- | Normalise a file
+--
+-- * \/\/ outside of the drive can be made blank
+--
+-- * \/ -> 'pathSeparator'
+--
+-- * .\/ -> \"\"
+--
+-- Does not remove @".."@, because of symlinks.
+--
+-- > Posix:   normalise "/file/\\test////" == "/file/\\test/"
+-- > Posix:   normalise "/file/./test" == "/file/test"
+-- > Posix:   normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/"
+-- > Posix:   normalise "../bob/fred/" == "../bob/fred/"
+-- > Posix:   normalise "/a/../c" == "/a/../c"
+-- > Posix:   normalise "./bob/fred/" == "bob/fred/"
+-- > Windows: normalise "c:\\file/bob\\" == "C:\\file\\bob\\"
+-- > Windows: normalise "c:\\" == "C:\\"
+-- > Windows: normalise "C:.\\" == "C:"
+-- > Windows: normalise "\\\\server\\test" == "\\\\server\\test"
+-- > Windows: normalise "//server/test" == "\\\\server\\test"
+-- > Windows: normalise "c:/file" == "C:\\file"
+-- > Windows: normalise "/file" == "\\file"
+-- > Windows: normalise "\\" == "\\"
+-- > Windows: normalise "/./" == "\\"
+-- >          normalise "." == "."
+-- > Posix:   normalise "./" == "./"
+-- > Posix:   normalise "./." == "./"
+-- > Posix:   normalise "/./" == "/"
+-- > Posix:   normalise "/" == "/"
+-- > Posix:   normalise "bob/fred/." == "bob/fred/"
+-- > Posix:   normalise "//home" == "/home"
+normalise :: FilePath -> FilePath
+normalise path = result ++ [pathSeparator | addPathSeparator]
+    where
+        (drv,pth) = splitDrive path
+        result = joinDrive' (normaliseDrive drv) (f pth)
+
+        joinDrive' "" "" = "."
+        joinDrive' d p = joinDrive d p
+
+        addPathSeparator = isDirPath pth
+            && not (hasTrailingPathSeparator result)
+            && not (isRelativeDrive drv)
+
+        isDirPath xs = hasTrailingPathSeparator xs
+            || not (null xs) && last xs == '.' && hasTrailingPathSeparator (init xs)
+
+        f = joinPath . dropDots . propSep . splitDirectories
+
+        propSep (x:xs) | all isPathSeparator x = [pathSeparator] : xs
+                       | otherwise = x : xs
+        propSep [] = []
+
+        dropDots = filter ("." /=)
+
+normaliseDrive :: FilePath -> FilePath
+normaliseDrive "" = ""
+normaliseDrive _ | isPosix = [pathSeparator]
+normaliseDrive drive = if isJust $ readDriveLetter x2
+                       then map toUpper x2
+                       else x2
+    where
+        x2 = map repSlash drive
+
+        repSlash x = if isPathSeparator x then pathSeparator else x
+
+-- Information for validity functions on Windows. See [1].
+isBadCharacter :: Char -> Bool
+isBadCharacter x = x >= '\0' && x <= '\31' || x `elem` ":*?><|\""
+
+badElements :: [FilePath]
+badElements =
+    ["CON","PRN","AUX","NUL","CLOCK$"
+    ,"COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9"
+    ,"LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"]
+
+
+-- | Is a FilePath valid, i.e. could you create a file like it? This function checks for invalid names,
+--   and invalid characters, but does not check if length limits are exceeded, as these are typically
+--   filesystem dependent.
+--
+-- >          isValid "" == False
+-- >          isValid "\0" == False
+-- > Posix:   isValid "/random_ path:*" == True
+-- > Posix:   isValid x == not (null x)
+-- > Windows: isValid "c:\\test" == True
+-- > Windows: isValid "c:\\test:of_test" == False
+-- > Windows: isValid "test*" == False
+-- > Windows: isValid "c:\\test\\nul" == False
+-- > Windows: isValid "c:\\test\\prn.txt" == False
+-- > Windows: isValid "c:\\nul\\file" == False
+-- > Windows: isValid "\\\\" == False
+-- > Windows: isValid "\\\\\\foo" == False
+-- > Windows: isValid "\\\\?\\D:file" == False
+-- > Windows: isValid "foo\tbar" == False
+-- > Windows: isValid "nul .txt" == False
+-- > Windows: isValid " nul.txt" == True
+isValid :: FilePath -> Bool
+isValid "" = False
+isValid x | '\0' `elem` x = False
+isValid _ | isPosix = True
+isValid path =
+        not (any isBadCharacter x2) &&
+        not (any f $ splitDirectories x2) &&
+        not (isJust (readDriveShare x1) && all isPathSeparator x1) &&
+        not (isJust (readDriveUNC x1) && not (hasTrailingPathSeparator x1))
+    where
+        (x1,x2) = splitDrive path
+        f x = map toUpper (dropWhileEnd (== ' ') $ dropExtensions x) `elem` badElements
+
+
+-- | Take a FilePath and make it valid; does not change already valid FilePaths.
+--
+-- > isValid (makeValid x)
+-- > isValid x ==> makeValid x == x
+-- > makeValid "" == "_"
+-- > makeValid "file\0name" == "file_name"
+-- > Windows: makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
+-- > Windows: makeValid "c:\\test:of_test" == "c:\\test_of_test"
+-- > Windows: makeValid "test*" == "test_"
+-- > Windows: makeValid "c:\\test\\nul" == "c:\\test\\nul_"
+-- > Windows: makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt"
+-- > Windows: makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt"
+-- > Windows: makeValid "c:\\nul\\file" == "c:\\nul_\\file"
+-- > Windows: makeValid "\\\\\\foo" == "\\\\drive"
+-- > Windows: makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
+-- > Windows: makeValid "nul .txt" == "nul _.txt"
+makeValid :: FilePath -> FilePath
+makeValid "" = "_"
+makeValid path
+        | isPosix = map (\x -> if x == '\0' then '_' else x) path
+        | isJust (readDriveShare drv) && all isPathSeparator drv = take 2 drv ++ "drive"
+        | isJust (readDriveUNC drv) && not (hasTrailingPathSeparator drv) =
+            makeValid (drv ++ [pathSeparator] ++ pth)
+        | otherwise = joinDrive drv $ validElements $ validChars pth
+    where
+        (drv,pth) = splitDrive path
+
+        validChars = map f
+        f x = if isBadCharacter x then '_' else x
+
+        validElements x = joinPath $ map g $ splitPath x
+        g x = h a ++ b
+            where (a,b) = break isPathSeparator x
+        h x = if map toUpper (dropWhileEnd (== ' ') a) `elem` badElements then a ++ "_" <.> b else x
+            where (a,b) = splitExtensions x
+
+
+-- | Is a path relative, or is it fixed to the root?
+--
+-- > Windows: isRelative "path\\test" == True
+-- > Windows: isRelative "c:\\test" == False
+-- > Windows: isRelative "c:test" == True
+-- > Windows: isRelative "c:\\" == False
+-- > Windows: isRelative "c:/" == False
+-- > Windows: isRelative "c:" == True
+-- > Windows: isRelative "\\\\foo" == False
+-- > Windows: isRelative "\\\\?\\foo" == False
+-- > Windows: isRelative "\\\\?\\UNC\\foo" == False
+-- > Windows: isRelative "/foo" == True
+-- > Windows: isRelative "\\foo" == True
+-- > Posix:   isRelative "test/path" == True
+-- > Posix:   isRelative "/test" == False
+-- > Posix:   isRelative "/" == False
+--
+-- According to [1]:
+--
+-- * "A UNC name of any format [is never relative]."
+--
+-- * "You cannot use the "\\?\" prefix with a relative path."
+isRelative :: FilePath -> Bool
+isRelative x = null drive || isRelativeDrive drive
+    where drive = takeDrive x
+
+
+{- c:foo -}
+-- From [1]: "If a file name begins with only a disk designator but not the
+-- backslash after the colon, it is interpreted as a relative path to the
+-- current directory on the drive with the specified letter."
+isRelativeDrive :: String -> Bool
+isRelativeDrive x =
+    maybe False (not . hasTrailingPathSeparator . fst) (readDriveLetter x)
+
+
+-- | @not . 'isRelative'@
+--
+-- > isAbsolute x == not (isRelative x)
+isAbsolute :: FilePath -> Bool
+isAbsolute = not . isRelative
+
+
+-----------------------------------------------------------------------------
+-- dropWhileEnd (>2) [1,2,3,4,1,2,3,4] == [1,2,3,4,1,2])
+-- Note that Data.List.dropWhileEnd is only available in base >= 4.5.
+dropWhileEnd :: (a -> Bool) -> [a] -> [a]
+dropWhileEnd p = reverse . dropWhile p . reverse
+
+-- takeWhileEnd (>2) [1,2,3,4,1,2,3,4] == [3,4])
+takeWhileEnd :: (a -> Bool) -> [a] -> [a]
+takeWhileEnd p = reverse . takeWhile p . reverse
+
+-- spanEnd (>2) [1,2,3,4,1,2,3,4] = ([1,2,3,4,1,2], [3,4])
+spanEnd :: (a -> Bool) -> [a] -> ([a], [a])
+spanEnd p xs = (dropWhileEnd p xs, takeWhileEnd p xs)
+
+-- breakEnd (< 2) [1,2,3,4,1,2,3,4] == ([1,2,3,4,1],[2,3,4])
+breakEnd :: (a -> Bool) -> [a] -> ([a], [a])
+breakEnd p = spanEnd (not . p)
+
+-- | The stripSuffix function drops the given suffix from a list. It returns
+-- Nothing if the list did not end with the suffix given, or Just the list
+-- before the suffix, if it does.
+stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
+stripSuffix xs ys = fmap reverse $ stripPrefix (reverse xs) (reverse ys)
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/TestEquiv.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/TestEquiv.hs
new file mode 100644
index 0000000000..339ce1ace6
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-equivalent-tests/TestEquiv.hs
@@ -0,0 +1,433 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE OverlappingInstances #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeApplications #-}
+
+module Main where
+
+import Test.Tasty
+import Test.Tasty.QuickCheck hiding ((==>))
+import TestUtil
+import Prelude as P
+import Data.Char (isAsciiLower, isAsciiUpper)
+import Gen
+
+import qualified System.FilePath.Windows as W
+import qualified System.FilePath.Posix as P
+import qualified Legacy.System.FilePath.Windows as LW
+import qualified Legacy.System.FilePath.Posix as LP
+
+
+main :: IO ()
+main = defaultMain equivalentTests
+
+
+equivalentTests :: TestTree
+equivalentTests = testGroup "equivalence"
+  [ testProperties "windows"
+    [
+      ( "pathSeparator"
+      , property $ W.pathSeparator == LW.pathSeparator
+      )
+      ,
+      ( "pathSeparators"
+      , property $ W.pathSeparators == LW.pathSeparators
+      )
+      ,
+      ( "isPathSeparator"
+      , property $ \p -> W.isPathSeparator p == LW.isPathSeparator p
+      )
+      ,
+      ( "searchPathSeparator"
+      , property $ W.searchPathSeparator == LW.searchPathSeparator
+      )
+      ,
+      ( "isSearchPathSeparator"
+      , property $ \p -> W.isSearchPathSeparator p == LW.isSearchPathSeparator p
+      )
+      ,
+      ( "extSeparator"
+      , property $ W.extSeparator == LW.extSeparator
+      )
+      ,
+      ( "isExtSeparator"
+      , property $ \p -> W.isExtSeparator p == LW.isExtSeparator p
+      )
+      ,
+      ( "splitSearchPath"
+      , property $ \(xs :: WindowsFilePaths)
+        -> let p = (intercalate ";" (altShow <$> unWindowsFilePaths xs))
+           in W.splitSearchPath p == LW.splitSearchPath p
+      )
+      ,
+      ( "splitExtension"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.splitExtension p == LW.splitExtension p
+      )
+      ,
+      ( "takeExtension"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.takeExtension p == LW.takeExtension p
+      )
+      ,
+      ( "replaceExtension"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.replaceExtension p s == LW.replaceExtension p s
+      )
+      ,
+      ( "dropExtension"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.dropExtension p == LW.dropExtension p
+      )
+      ,
+      ( "addExtension"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.addExtension p s == LW.addExtension p s
+      )
+      ,
+      ( "hasExtension"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.hasExtension p == LW.hasExtension p
+      )
+      ,
+      ( "splitExtensions"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.splitExtensions p == LW.splitExtensions p
+      )
+      ,
+      ( "dropExtensions"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.dropExtensions p == LW.dropExtensions p
+      )
+      ,
+      ( "takeExtensions"
+      , property $ \p -> W.takeExtensions p == LW.takeExtensions p
+      )
+      ,
+      ( "replaceExtensions"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.replaceExtensions p s == LW.replaceExtensions p s
+      )
+      ,
+      ( "isExtensionOf"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.isExtensionOf p s == LW.isExtensionOf p s
+      )
+      ,
+      ( "stripExtension"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.stripExtension p s == LW.stripExtension p s
+      )
+      ,
+      ( "splitFileName"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.splitFileName p == LW.splitFileName p
+      )
+      ,
+      ( "takeFileName"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.takeFileName p == LW.takeFileName p
+      )
+      ,
+      ( "replaceFileName"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.replaceFileName p s == LW.replaceFileName p s
+      )
+      ,
+      ( "dropFileName"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.dropFileName p == LW.dropFileName p
+      )
+      ,
+      ( "takeBaseName"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.takeBaseName p == LW.takeBaseName p
+      )
+      ,
+      ( "replaceBaseName"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.replaceBaseName p s == LW.replaceBaseName p s
+      )
+      ,
+      ( "takeDirectory"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.takeDirectory p == LW.takeDirectory p
+      )
+      ,
+      ( "replaceDirectory"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.replaceDirectory p s == LW.replaceDirectory p s
+      )
+      ,
+      ( "combine"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.combine p s == LW.combine p s
+      )
+      ,
+      ( "splitPath"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.splitPath p == LW.splitPath p
+      )
+      ,
+      ( "joinPath"
+      , property $ \(xs :: WindowsFilePaths) ->
+         let p = altShow <$> unWindowsFilePaths xs
+         in W.joinPath p == LW.joinPath p
+      )
+      ,
+      ( "splitDirectories"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.splitDirectories p == LW.splitDirectories p
+      )
+      ,
+      ( "splitDrive"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.splitDrive p == LW.splitDrive p
+      )
+      ,
+      ( "joinDrive"
+      , property $ \(altShow @WindowsFilePath -> p) s -> W.joinDrive p s == LW.joinDrive p s
+      )
+      ,
+      ( "takeDrive"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.takeDrive p == LW.takeDrive p
+      )
+      ,
+      ( "hasDrive"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.hasDrive p == LW.hasDrive p
+      )
+      ,
+      ( "dropDrive"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.dropDrive p == LW.dropDrive p
+      )
+      ,
+      ( "isDrive"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.isDrive p == LW.isDrive p
+      )
+      ,
+      ( "hasTrailingPathSeparator"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.hasTrailingPathSeparator p == LW.hasTrailingPathSeparator p
+      )
+      ,
+      ( "addTrailingPathSeparator"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.addTrailingPathSeparator p == LW.addTrailingPathSeparator p
+      )
+      ,
+      ( "dropTrailingPathSeparator"
+      , property $ \(altShow @WindowsFilePath -> p) -> W.dropTrailingPathSeparator p == LW.dropTrailingPathSeparator p
+      )
+      ,
+      ( "normalise"
+      , property $ \(altShow @WindowsFilePath -> p) -> case p of
+                           (l:':':rs)
+                             -- new filepath normalises "a:////////" to "A:\\"
+                             -- see https://github.com/haskell/filepath/commit/cb4890aa03a5ee61f16f7a08dd2d964fffffb385
+                             | isAsciiLower l || isAsciiUpper l
+                             , let (seps, path) = span LW.isPathSeparator rs
+                             , length seps > 1 -> let np = l : ':' : LW.pathSeparator : path in W.normalise np == LW.normalise np
+                           _ -> W.normalise p == LW.normalise p
+      )
+      ,
+      ( "equalFilePath"
+      , property $ \p s -> W.equalFilePath p s == LW.equalFilePath p s
+      )
+      ,
+      ( "makeRelative"
+      , property $ \p s -> W.makeRelative p s == LW.makeRelative p s
+      )
+      ,
+      ( "isRelative"
+      , property $ \p -> W.isRelative p == LW.isRelative p
+      )
+      ,
+      ( "isAbsolute"
+      , property $ \p -> W.isAbsolute p == LW.isAbsolute p
+      )
+      ,
+      ( "isValid"
+      , property $ \p -> W.isValid p == LW.isValid p
+      )
+      ,
+      ( "makeValid"
+      , property $ \p -> W.makeValid p == LW.makeValid p
+      )
+    ],
+    testProperties "posix" $ [
+      ( "pathSeparator"
+      , property $ P.pathSeparator == LP.pathSeparator
+      )
+      ,
+      ( "pathSeparators"
+      , property $ P.pathSeparators == LP.pathSeparators
+      )
+      ,
+      ( "isPathSeparator"
+      , property $ \p -> P.isPathSeparator p == LP.isPathSeparator p
+      )
+      ,
+      ( "searchPathSeparator"
+      , property $ P.searchPathSeparator == LP.searchPathSeparator
+      )
+      ,
+      ( "isSearchPathSeparator"
+      , property $ \p -> P.isSearchPathSeparator p == LP.isSearchPathSeparator p
+      )
+      ,
+      ( "extSeparator"
+      , property $ P.extSeparator == LP.extSeparator
+      )
+      ,
+      ( "isExtSeparator"
+      , property $ \p -> P.isExtSeparator p == LP.isExtSeparator p
+      )
+      ,
+      ( "splitSearchPath"
+      , property $ \p -> P.splitSearchPath p == LP.splitSearchPath p
+      )
+      ,
+      ( "splitExtension"
+      , property $ \p -> P.splitExtension p == LP.splitExtension p
+      )
+      ,
+      ( "takeExtension"
+      , property $ \p -> P.takeExtension p == LP.takeExtension p
+      )
+      ,
+      ( "replaceExtension"
+      , property $ \p s -> P.replaceExtension p s == LP.replaceExtension p s
+      )
+      ,
+      ( "dropExtension"
+      , property $ \p -> P.dropExtension p == LP.dropExtension p
+      )
+      ,
+      ( "addExtension"
+      , property $ \p s -> P.addExtension p s == LP.addExtension p s
+      )
+      ,
+      ( "hasExtension"
+      , property $ \p -> P.hasExtension p == LP.hasExtension p
+      )
+      ,
+      ( "splitExtensions"
+      , property $ \p -> P.splitExtensions p == LP.splitExtensions p
+      )
+      ,
+      ( "dropExtensions"
+      , property $ \p -> P.dropExtensions p == LP.dropExtensions p
+      )
+      ,
+      ( "takeExtensions"
+      , property $ \p -> P.takeExtensions p == LP.takeExtensions p
+      )
+      ,
+      ( "replaceExtensions"
+      , property $ \p s -> P.replaceExtensions p s == LP.replaceExtensions p s
+      )
+      ,
+      ( "isExtensionOf"
+      , property $ \p s -> P.isExtensionOf p s == LP.isExtensionOf p s
+      )
+      ,
+      ( "stripExtension"
+      , property $ \p s -> P.stripExtension p s == LP.stripExtension p s
+      )
+      ,
+      ( "splitFileName"
+      , property $ \p -> P.splitFileName p == LP.splitFileName p
+      )
+      ,
+      ( "takeFileName"
+      , property $ \p -> P.takeFileName p == LP.takeFileName p
+      )
+      ,
+      ( "replaceFileName"
+      , property $ \p s -> P.replaceFileName p s == LP.replaceFileName p s
+      )
+      ,
+      ( "dropFileName"
+      , property $ \p -> P.dropFileName p == LP.dropFileName p
+      )
+      ,
+      ( "takeBaseName"
+      , property $ \p -> P.takeBaseName p == LP.takeBaseName p
+      )
+      ,
+      ( "replaceBaseName"
+      , property $ \p s -> P.replaceBaseName p s == LP.replaceBaseName p s
+      )
+      ,
+      ( "takeDirectory"
+      , property $ \p -> P.takeDirectory p == LP.takeDirectory p
+      )
+      ,
+      ( "replaceDirectory"
+      , property $ \p s -> P.replaceDirectory p s == LP.replaceDirectory p s
+      )
+      ,
+      ( "combine"
+      , property $ \p s -> P.combine p s == LP.combine p s
+      )
+      ,
+      ( "splitPath"
+      , property $ \p -> P.splitPath p == LP.splitPath p
+      )
+      ,
+      ( "joinPath"
+      , property $ \p -> P.joinPath p == LP.joinPath p
+      )
+      ,
+      ( "splitDirectories"
+      , property $ \p -> P.splitDirectories p == LP.splitDirectories p
+      )
+      ,
+      ( "splitDirectories"
+      , property $ \p -> P.splitDirectories p == LP.splitDirectories p
+      )
+      ,
+      ( "splitDrive"
+      , property $ \p -> P.splitDrive p == LP.splitDrive p
+      )
+      ,
+      ( "joinDrive"
+      , property $ \p s -> P.joinDrive p s == LP.joinDrive p s
+      )
+      ,
+      ( "takeDrive"
+      , property $ \p -> P.takeDrive p == LP.takeDrive p
+      )
+      ,
+      ( "hasDrive"
+      , property $ \p -> P.hasDrive p == LP.hasDrive p
+      )
+      ,
+      ( "dropDrive"
+      , property $ \p -> P.dropDrive p == LP.dropDrive p
+      )
+      ,
+      ( "isDrive"
+      , property $ \p -> P.isDrive p == LP.isDrive p
+      )
+      ,
+      ( "hasTrailingPathSeparator"
+      , property $ \p -> P.hasTrailingPathSeparator p == LP.hasTrailingPathSeparator p
+      )
+      ,
+      ( "addTrailingPathSeparator"
+      , property $ \p -> P.addTrailingPathSeparator p == LP.addTrailingPathSeparator p
+      )
+      ,
+      ( "dropTrailingPathSeparator"
+      , property $ \p -> P.dropTrailingPathSeparator p == LP.dropTrailingPathSeparator p
+      )
+      ,
+      ( "normalise"
+      , property $ \p -> P.normalise p == LP.normalise p
+      )
+      ,
+      ( "equalFilePath"
+      , property $ \p s -> P.equalFilePath p s == LP.equalFilePath p s
+      )
+      ,
+      ( "makeRelative"
+      , property $ \p s -> P.makeRelative p s == LP.makeRelative p s
+      )
+      ,
+      ( "isRelative"
+      , property $ \p -> P.isRelative p == LP.isRelative p
+      )
+      ,
+      ( "isAbsolute"
+      , property $ \p -> P.isAbsolute p == LP.isAbsolute p
+      )
+      ,
+      ( "isValid"
+      , property $ \p -> P.isValid p == LP.isValid p
+      )
+      ,
+      ( "makeValid"
+      , property $ \p -> P.makeValid p == LP.makeValid p
+      )
+    ]
+  ]
+
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-tests/Test.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-tests/Test.hs
new file mode 100644
index 0000000000..cdcffd27bb
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-tests/Test.hs
@@ -0,0 +1,9 @@
+module Main where
+
+import TestGen (tests)
+import Test.Tasty
+import Test.Tasty.QuickCheck
+
+main :: IO ()
+main = defaultMain $ testProperties "doctests" tests
+
diff --git a/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-tests/TestGen.hs b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-tests/TestGen.hs
new file mode 100644
index 0000000000..9d5c822c77
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/filepath-1.5.4.0/tests/filepath-tests/TestGen.hs
@@ -0,0 +1,955 @@
+-- GENERATED CODE: See ../Generate.hs
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE CPP #-}
+{-# OPTIONS_GHC -Wno-name-shadowing #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
+module TestGen(tests) where
+import TestUtil
+#if !MIN_VERSION_base(4,11,0)
+import Data.Semigroup
+#endif
+import Prelude as P
+import Data.String
+import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
+import GHC.IO.Encoding.UTF16 ( mkUTF16le )
+import GHC.IO.Encoding.UTF8 ( mkUTF8 )
+import System.OsString.Internal.Types
+import System.OsString.Encoding.Internal
+import qualified Data.Char as C
+import qualified System.OsString.Data.ByteString.Short as SBS
+import qualified System.OsString.Data.ByteString.Short.Word16 as SBS16
+import qualified System.FilePath.Windows as W
+import qualified System.FilePath.Posix as P
+import qualified System.OsPath.Windows as AFP_W
+import qualified System.OsPath.Posix as AFP_P
+instance IsString WindowsString where fromString = WS . either (error . show) id . encodeWithTE (mkUTF16le TransliterateCodingFailure)
+instance IsString PosixString where fromString = PS . either (error . show) id . encodeWithTE (mkUTF8 TransliterateCodingFailure)
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+instance IsString OsString where fromString = OsString . WS . either (error . show) id . encodeWithTE (mkUTF16le TransliterateCodingFailure)
+#else
+instance IsString OsString where fromString = OsString . PS . either (error . show) id . encodeWithTE (mkUTF8 TransliterateCodingFailure)
+#endif
+tests :: [(String, Property)]
+tests =
+    [("W.pathSeparator == '\\\\'", property $ W.pathSeparator == '\\')
+    ,("AFP_W.pathSeparator == (WW . fromIntegral . C.ord $ '\\\\')", property $ AFP_W.pathSeparator == (WW . fromIntegral . C.ord $ '\\'))
+    ,("P.pathSeparator == '/'", property $ P.pathSeparator == '/')
+    ,("AFP_P.pathSeparator == (PW . fromIntegral . C.ord $ '/')", property $ AFP_P.pathSeparator == (PW . fromIntegral . C.ord $ '/'))
+    ,("P.isPathSeparator P.pathSeparator", property $ P.isPathSeparator P.pathSeparator)
+    ,("W.isPathSeparator W.pathSeparator", property $ W.isPathSeparator W.pathSeparator)
+    ,("AFP_P.isPathSeparator AFP_P.pathSeparator", property $ AFP_P.isPathSeparator AFP_P.pathSeparator)
+    ,("AFP_W.isPathSeparator AFP_W.pathSeparator", property $ AFP_W.isPathSeparator AFP_W.pathSeparator)
+    ,("W.pathSeparators == ['\\\\', '/']", property $ W.pathSeparators == ['\\', '/'])
+    ,("AFP_W.pathSeparators == [(WW . fromIntegral . C.ord $ '\\\\'), (WW . fromIntegral . C.ord $ '/')]", property $ AFP_W.pathSeparators == [(WW . fromIntegral . C.ord $ '\\'), (WW . fromIntegral . C.ord $ '/')])
+    ,("P.pathSeparators == ['/']", property $ P.pathSeparators == ['/'])
+    ,("AFP_P.pathSeparators == [(PW . fromIntegral . C.ord $ '/')]", property $ AFP_P.pathSeparators == [(PW . fromIntegral . C.ord $ '/')])
+    ,("P.pathSeparator `elem` P.pathSeparators", property $ P.pathSeparator `elem` P.pathSeparators)
+    ,("W.pathSeparator `elem` W.pathSeparators", property $ W.pathSeparator `elem` W.pathSeparators)
+    ,("AFP_P.pathSeparator `elem` AFP_P.pathSeparators", property $ AFP_P.pathSeparator `elem` AFP_P.pathSeparators)
+    ,("AFP_W.pathSeparator `elem` AFP_W.pathSeparators", property $ AFP_W.pathSeparator `elem` AFP_W.pathSeparators)
+    ,("P.isPathSeparator a == (a `elem` P.pathSeparators)", property $ \a -> P.isPathSeparator a == (a `elem` P.pathSeparators))
+    ,("W.isPathSeparator a == (a `elem` W.pathSeparators)", property $ \a -> W.isPathSeparator a == (a `elem` W.pathSeparators))
+    ,("AFP_P.isPathSeparator a == (a `elem` AFP_P.pathSeparators)", property $ \a -> AFP_P.isPathSeparator a == (a `elem` AFP_P.pathSeparators))
+    ,("AFP_W.isPathSeparator a == (a `elem` AFP_W.pathSeparators)", property $ \a -> AFP_W.isPathSeparator a == (a `elem` AFP_W.pathSeparators))
+    ,("W.searchPathSeparator == ';'", property $ W.searchPathSeparator == ';')
+    ,("AFP_W.searchPathSeparator == (WW . fromIntegral . C.ord $ ';')", property $ AFP_W.searchPathSeparator == (WW . fromIntegral . C.ord $ ';'))
+    ,("P.searchPathSeparator == ':'", property $ P.searchPathSeparator == ':')
+    ,("AFP_P.searchPathSeparator == (PW . fromIntegral . C.ord $ ':')", property $ AFP_P.searchPathSeparator == (PW . fromIntegral . C.ord $ ':'))
+    ,("P.isSearchPathSeparator a == (a == P.searchPathSeparator)", property $ \a -> P.isSearchPathSeparator a == (a == P.searchPathSeparator))
+    ,("W.isSearchPathSeparator a == (a == W.searchPathSeparator)", property $ \a -> W.isSearchPathSeparator a == (a == W.searchPathSeparator))
+    ,("AFP_P.isSearchPathSeparator a == (a == AFP_P.searchPathSeparator)", property $ \a -> AFP_P.isSearchPathSeparator a == (a == AFP_P.searchPathSeparator))
+    ,("AFP_W.isSearchPathSeparator a == (a == AFP_W.searchPathSeparator)", property $ \a -> AFP_W.isSearchPathSeparator a == (a == AFP_W.searchPathSeparator))
+    ,("P.extSeparator == '.'", property $ P.extSeparator == '.')
+    ,("W.extSeparator == '.'", property $ W.extSeparator == '.')
+    ,("AFP_P.extSeparator == (PW . fromIntegral . C.ord $ '.')", property $ AFP_P.extSeparator == (PW . fromIntegral . C.ord $ '.'))
+    ,("AFP_W.extSeparator == (WW . fromIntegral . C.ord $ '.')", property $ AFP_W.extSeparator == (WW . fromIntegral . C.ord $ '.'))
+    ,("P.isExtSeparator a == (a == P.extSeparator)", property $ \a -> P.isExtSeparator a == (a == P.extSeparator))
+    ,("W.isExtSeparator a == (a == W.extSeparator)", property $ \a -> W.isExtSeparator a == (a == W.extSeparator))
+    ,("AFP_P.isExtSeparator a == (a == AFP_P.extSeparator)", property $ \a -> AFP_P.isExtSeparator a == (a == AFP_P.extSeparator))
+    ,("AFP_W.isExtSeparator a == (a == AFP_W.extSeparator)", property $ \a -> AFP_W.isExtSeparator a == (a == AFP_W.extSeparator))
+    ,("P.splitSearchPath \"File1:File2:File3\" == [\"File1\", \"File2\", \"File3\"]", property $ P.splitSearchPath "File1:File2:File3" == ["File1", "File2", "File3"])
+    ,("AFP_P.splitSearchPath (\"File1:File2:File3\") == [(\"File1\"), (\"File2\"), (\"File3\")]", property $ AFP_P.splitSearchPath ("File1:File2:File3") == [("File1"), ("File2"), ("File3")])
+    ,("P.splitSearchPath \"File1::File2:File3\" == [\"File1\", \".\", \"File2\", \"File3\"]", property $ P.splitSearchPath "File1::File2:File3" == ["File1", ".", "File2", "File3"])
+    ,("AFP_P.splitSearchPath (\"File1::File2:File3\") == [(\"File1\"), (\".\"), (\"File2\"), (\"File3\")]", property $ AFP_P.splitSearchPath ("File1::File2:File3") == [("File1"), ("."), ("File2"), ("File3")])
+    ,("W.splitSearchPath \"File1;File2;File3\" == [\"File1\", \"File2\", \"File3\"]", property $ W.splitSearchPath "File1;File2;File3" == ["File1", "File2", "File3"])
+    ,("AFP_W.splitSearchPath (\"File1;File2;File3\") == [(\"File1\"), (\"File2\"), (\"File3\")]", property $ AFP_W.splitSearchPath ("File1;File2;File3") == [("File1"), ("File2"), ("File3")])
+    ,("W.splitSearchPath \"File1;;File2;File3\" == [\"File1\", \"File2\", \"File3\"]", property $ W.splitSearchPath "File1;;File2;File3" == ["File1", "File2", "File3"])
+    ,("AFP_W.splitSearchPath (\"File1;;File2;File3\") == [(\"File1\"), (\"File2\"), (\"File3\")]", property $ AFP_W.splitSearchPath ("File1;;File2;File3") == [("File1"), ("File2"), ("File3")])
+    ,("W.splitSearchPath \"File1;\\\"File2\\\";File3\" == [\"File1\", \"File2\", \"File3\"]", property $ W.splitSearchPath "File1;\"File2\";File3" == ["File1", "File2", "File3"])
+    ,("AFP_W.splitSearchPath (\"File1;\\\"File2\\\";File3\") == [(\"File1\"), (\"File2\"), (\"File3\")]", property $ AFP_W.splitSearchPath ("File1;\"File2\";File3") == [("File1"), ("File2"), ("File3")])
+    ,("P.splitExtension \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", property $ P.splitExtension "/directory/path.ext" == ("/directory/path", ".ext"))
+    ,("W.splitExtension \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", property $ W.splitExtension "/directory/path.ext" == ("/directory/path", ".ext"))
+    ,("AFP_P.splitExtension (\"/directory/path.ext\") == ((\"/directory/path\"), (\".ext\"))", property $ AFP_P.splitExtension ("/directory/path.ext") == (("/directory/path"), (".ext")))
+    ,("AFP_W.splitExtension (\"/directory/path.ext\") == ((\"/directory/path\"), (\".ext\"))", property $ AFP_W.splitExtension ("/directory/path.ext") == (("/directory/path"), (".ext")))
+    ,("uncurry (<>) (P.splitExtension x) == x", property $ \(QFilePath x) -> uncurry (<>) (P.splitExtension x) == x)
+    ,("uncurry (<>) (W.splitExtension x) == x", property $ \(QFilePath x) -> uncurry (<>) (W.splitExtension x) == x)
+    ,("uncurry (<>) (AFP_P.splitExtension x) == x", property $ \(QFilePathAFP_P x) -> uncurry (<>) (AFP_P.splitExtension x) == x)
+    ,("uncurry (<>) (AFP_W.splitExtension x) == x", property $ \(QFilePathAFP_W x) -> uncurry (<>) (AFP_W.splitExtension x) == x)
+    ,("uncurry P.addExtension (P.splitExtension x) == x", property $ \(QFilePathValidP x) -> uncurry P.addExtension (P.splitExtension x) == x)
+    ,("uncurry W.addExtension (W.splitExtension x) == x", property $ \(QFilePathValidW x) -> uncurry W.addExtension (W.splitExtension x) == x)
+    ,("uncurry AFP_P.addExtension (AFP_P.splitExtension x) == x", property $ \(QFilePathValidAFP_P x) -> uncurry AFP_P.addExtension (AFP_P.splitExtension x) == x)
+    ,("uncurry AFP_W.addExtension (AFP_W.splitExtension x) == x", property $ \(QFilePathValidAFP_W x) -> uncurry AFP_W.addExtension (AFP_W.splitExtension x) == x)
+    ,("P.splitExtension \"file.txt\" == (\"file\", \".txt\")", property $ P.splitExtension "file.txt" == ("file", ".txt"))
+    ,("W.splitExtension \"file.txt\" == (\"file\", \".txt\")", property $ W.splitExtension "file.txt" == ("file", ".txt"))
+    ,("AFP_P.splitExtension (\"file.txt\") == ((\"file\"), (\".txt\"))", property $ AFP_P.splitExtension ("file.txt") == (("file"), (".txt")))
+    ,("AFP_W.splitExtension (\"file.txt\") == ((\"file\"), (\".txt\"))", property $ AFP_W.splitExtension ("file.txt") == (("file"), (".txt")))
+    ,("P.splitExtension \"file\" == (\"file\", \"\")", property $ P.splitExtension "file" == ("file", ""))
+    ,("W.splitExtension \"file\" == (\"file\", \"\")", property $ W.splitExtension "file" == ("file", ""))
+    ,("AFP_P.splitExtension (\"file\") == ((\"file\"), (\"\"))", property $ AFP_P.splitExtension ("file") == (("file"), ("")))
+    ,("AFP_W.splitExtension (\"file\") == ((\"file\"), (\"\"))", property $ AFP_W.splitExtension ("file") == (("file"), ("")))
+    ,("P.splitExtension \"file/file.txt\" == (\"file/file\", \".txt\")", property $ P.splitExtension "file/file.txt" == ("file/file", ".txt"))
+    ,("W.splitExtension \"file/file.txt\" == (\"file/file\", \".txt\")", property $ W.splitExtension "file/file.txt" == ("file/file", ".txt"))
+    ,("AFP_P.splitExtension (\"file/file.txt\") == ((\"file/file\"), (\".txt\"))", property $ AFP_P.splitExtension ("file/file.txt") == (("file/file"), (".txt")))
+    ,("AFP_W.splitExtension (\"file/file.txt\") == ((\"file/file\"), (\".txt\"))", property $ AFP_W.splitExtension ("file/file.txt") == (("file/file"), (".txt")))
+    ,("P.splitExtension \"file.txt/boris\" == (\"file.txt/boris\", \"\")", property $ P.splitExtension "file.txt/boris" == ("file.txt/boris", ""))
+    ,("W.splitExtension \"file.txt/boris\" == (\"file.txt/boris\", \"\")", property $ W.splitExtension "file.txt/boris" == ("file.txt/boris", ""))
+    ,("AFP_P.splitExtension (\"file.txt/boris\") == ((\"file.txt/boris\"), (\"\"))", property $ AFP_P.splitExtension ("file.txt/boris") == (("file.txt/boris"), ("")))
+    ,("AFP_W.splitExtension (\"file.txt/boris\") == ((\"file.txt/boris\"), (\"\"))", property $ AFP_W.splitExtension ("file.txt/boris") == (("file.txt/boris"), ("")))
+    ,("P.splitExtension \"file.txt/boris.ext\" == (\"file.txt/boris\", \".ext\")", property $ P.splitExtension "file.txt/boris.ext" == ("file.txt/boris", ".ext"))
+    ,("W.splitExtension \"file.txt/boris.ext\" == (\"file.txt/boris\", \".ext\")", property $ W.splitExtension "file.txt/boris.ext" == ("file.txt/boris", ".ext"))
+    ,("AFP_P.splitExtension (\"file.txt/boris.ext\") == ((\"file.txt/boris\"), (\".ext\"))", property $ AFP_P.splitExtension ("file.txt/boris.ext") == (("file.txt/boris"), (".ext")))
+    ,("AFP_W.splitExtension (\"file.txt/boris.ext\") == ((\"file.txt/boris\"), (\".ext\"))", property $ AFP_W.splitExtension ("file.txt/boris.ext") == (("file.txt/boris"), (".ext")))
+    ,("P.splitExtension \"file/path.txt.bob.fred\" == (\"file/path.txt.bob\", \".fred\")", property $ P.splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob", ".fred"))
+    ,("W.splitExtension \"file/path.txt.bob.fred\" == (\"file/path.txt.bob\", \".fred\")", property $ W.splitExtension "file/path.txt.bob.fred" == ("file/path.txt.bob", ".fred"))
+    ,("AFP_P.splitExtension (\"file/path.txt.bob.fred\") == ((\"file/path.txt.bob\"), (\".fred\"))", property $ AFP_P.splitExtension ("file/path.txt.bob.fred") == (("file/path.txt.bob"), (".fred")))
+    ,("AFP_W.splitExtension (\"file/path.txt.bob.fred\") == ((\"file/path.txt.bob\"), (\".fred\"))", property $ AFP_W.splitExtension ("file/path.txt.bob.fred") == (("file/path.txt.bob"), (".fred")))
+    ,("P.splitExtension \"file/path.txt/\" == (\"file/path.txt/\", \"\")", property $ P.splitExtension "file/path.txt/" == ("file/path.txt/", ""))
+    ,("W.splitExtension \"file/path.txt/\" == (\"file/path.txt/\", \"\")", property $ W.splitExtension "file/path.txt/" == ("file/path.txt/", ""))
+    ,("AFP_P.splitExtension (\"file/path.txt/\") == ((\"file/path.txt/\"), (\"\"))", property $ AFP_P.splitExtension ("file/path.txt/") == (("file/path.txt/"), ("")))
+    ,("AFP_W.splitExtension (\"file/path.txt/\") == ((\"file/path.txt/\"), (\"\"))", property $ AFP_W.splitExtension ("file/path.txt/") == (("file/path.txt/"), ("")))
+    ,("P.takeExtension \"/directory/path.ext\" == \".ext\"", property $ P.takeExtension "/directory/path.ext" == ".ext")
+    ,("W.takeExtension \"/directory/path.ext\" == \".ext\"", property $ W.takeExtension "/directory/path.ext" == ".ext")
+    ,("AFP_P.takeExtension (\"/directory/path.ext\") == (\".ext\")", property $ AFP_P.takeExtension ("/directory/path.ext") == (".ext"))
+    ,("AFP_W.takeExtension (\"/directory/path.ext\") == (\".ext\")", property $ AFP_W.takeExtension ("/directory/path.ext") == (".ext"))
+    ,("P.takeExtension x == snd (P.splitExtension x)", property $ \(QFilePath x) -> P.takeExtension x == snd (P.splitExtension x))
+    ,("W.takeExtension x == snd (W.splitExtension x)", property $ \(QFilePath x) -> W.takeExtension x == snd (W.splitExtension x))
+    ,("AFP_P.takeExtension x == snd (AFP_P.splitExtension x)", property $ \(QFilePathAFP_P x) -> AFP_P.takeExtension x == snd (AFP_P.splitExtension x))
+    ,("AFP_W.takeExtension x == snd (AFP_W.splitExtension x)", property $ \(QFilePathAFP_W x) -> AFP_W.takeExtension x == snd (AFP_W.splitExtension x))
+    ,("P.takeExtension (P.addExtension x \"ext\") == \".ext\"", property $ \(QFilePathValidP x) -> P.takeExtension (P.addExtension x "ext") == ".ext")
+    ,("W.takeExtension (W.addExtension x \"ext\") == \".ext\"", property $ \(QFilePathValidW x) -> W.takeExtension (W.addExtension x "ext") == ".ext")
+    ,("AFP_P.takeExtension (AFP_P.addExtension x (\"ext\")) == (\".ext\")", property $ \(QFilePathValidAFP_P x) -> AFP_P.takeExtension (AFP_P.addExtension x ("ext")) == (".ext"))
+    ,("AFP_W.takeExtension (AFP_W.addExtension x (\"ext\")) == (\".ext\")", property $ \(QFilePathValidAFP_W x) -> AFP_W.takeExtension (AFP_W.addExtension x ("ext")) == (".ext"))
+    ,("P.takeExtension (P.replaceExtension x \"ext\") == \".ext\"", property $ \(QFilePathValidP x) -> P.takeExtension (P.replaceExtension x "ext") == ".ext")
+    ,("W.takeExtension (W.replaceExtension x \"ext\") == \".ext\"", property $ \(QFilePathValidW x) -> W.takeExtension (W.replaceExtension x "ext") == ".ext")
+    ,("AFP_P.takeExtension (AFP_P.replaceExtension x (\"ext\")) == (\".ext\")", property $ \(QFilePathValidAFP_P x) -> AFP_P.takeExtension (AFP_P.replaceExtension x ("ext")) == (".ext"))
+    ,("AFP_W.takeExtension (AFP_W.replaceExtension x (\"ext\")) == (\".ext\")", property $ \(QFilePathValidAFP_W x) -> AFP_W.takeExtension (AFP_W.replaceExtension x ("ext")) == (".ext"))
+    ,("\"/directory/path.txt\" P.-<.> \"ext\" == \"/directory/path.ext\"", property $ "/directory/path.txt" P.-<.> "ext" == "/directory/path.ext")
+    ,("\"/directory/path.txt\" W.-<.> \"ext\" == \"/directory/path.ext\"", property $ "/directory/path.txt" W.-<.> "ext" == "/directory/path.ext")
+    ,("(\"/directory/path.txt\") AFP_P.-<.> (\"ext\") == (\"/directory/path.ext\")", property $ ("/directory/path.txt") AFP_P.-<.> ("ext") == ("/directory/path.ext"))
+    ,("(\"/directory/path.txt\") AFP_W.-<.> (\"ext\") == (\"/directory/path.ext\")", property $ ("/directory/path.txt") AFP_W.-<.> ("ext") == ("/directory/path.ext"))
+    ,("\"/directory/path.txt\" P.-<.> \".ext\" == \"/directory/path.ext\"", property $ "/directory/path.txt" P.-<.> ".ext" == "/directory/path.ext")
+    ,("\"/directory/path.txt\" W.-<.> \".ext\" == \"/directory/path.ext\"", property $ "/directory/path.txt" W.-<.> ".ext" == "/directory/path.ext")
+    ,("(\"/directory/path.txt\") AFP_P.-<.> (\".ext\") == (\"/directory/path.ext\")", property $ ("/directory/path.txt") AFP_P.-<.> (".ext") == ("/directory/path.ext"))
+    ,("(\"/directory/path.txt\") AFP_W.-<.> (\".ext\") == (\"/directory/path.ext\")", property $ ("/directory/path.txt") AFP_W.-<.> (".ext") == ("/directory/path.ext"))
+    ,("\"foo.o\" P.-<.> \"c\" == \"foo.c\"", property $ "foo.o" P.-<.> "c" == "foo.c")
+    ,("\"foo.o\" W.-<.> \"c\" == \"foo.c\"", property $ "foo.o" W.-<.> "c" == "foo.c")
+    ,("(\"foo.o\") AFP_P.-<.> (\"c\") == (\"foo.c\")", property $ ("foo.o") AFP_P.-<.> ("c") == ("foo.c"))
+    ,("(\"foo.o\") AFP_W.-<.> (\"c\") == (\"foo.c\")", property $ ("foo.o") AFP_W.-<.> ("c") == ("foo.c"))
+    ,("P.replaceExtension \"/directory/path.txt\" \"ext\" == \"/directory/path.ext\"", property $ P.replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext")
+    ,("W.replaceExtension \"/directory/path.txt\" \"ext\" == \"/directory/path.ext\"", property $ W.replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext")
+    ,("AFP_P.replaceExtension (\"/directory/path.txt\") (\"ext\") == (\"/directory/path.ext\")", property $ AFP_P.replaceExtension ("/directory/path.txt") ("ext") == ("/directory/path.ext"))
+    ,("AFP_W.replaceExtension (\"/directory/path.txt\") (\"ext\") == (\"/directory/path.ext\")", property $ AFP_W.replaceExtension ("/directory/path.txt") ("ext") == ("/directory/path.ext"))
+    ,("P.replaceExtension \"/directory/path.txt\" \".ext\" == \"/directory/path.ext\"", property $ P.replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext")
+    ,("W.replaceExtension \"/directory/path.txt\" \".ext\" == \"/directory/path.ext\"", property $ W.replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext")
+    ,("AFP_P.replaceExtension (\"/directory/path.txt\") (\".ext\") == (\"/directory/path.ext\")", property $ AFP_P.replaceExtension ("/directory/path.txt") (".ext") == ("/directory/path.ext"))
+    ,("AFP_W.replaceExtension (\"/directory/path.txt\") (\".ext\") == (\"/directory/path.ext\")", property $ AFP_W.replaceExtension ("/directory/path.txt") (".ext") == ("/directory/path.ext"))
+    ,("P.replaceExtension \"file.txt\" \".bob\" == \"file.bob\"", property $ P.replaceExtension "file.txt" ".bob" == "file.bob")
+    ,("W.replaceExtension \"file.txt\" \".bob\" == \"file.bob\"", property $ W.replaceExtension "file.txt" ".bob" == "file.bob")
+    ,("AFP_P.replaceExtension (\"file.txt\") (\".bob\") == (\"file.bob\")", property $ AFP_P.replaceExtension ("file.txt") (".bob") == ("file.bob"))
+    ,("AFP_W.replaceExtension (\"file.txt\") (\".bob\") == (\"file.bob\")", property $ AFP_W.replaceExtension ("file.txt") (".bob") == ("file.bob"))
+    ,("P.replaceExtension \"file.txt\" \"bob\" == \"file.bob\"", property $ P.replaceExtension "file.txt" "bob" == "file.bob")
+    ,("W.replaceExtension \"file.txt\" \"bob\" == \"file.bob\"", property $ W.replaceExtension "file.txt" "bob" == "file.bob")
+    ,("AFP_P.replaceExtension (\"file.txt\") (\"bob\") == (\"file.bob\")", property $ AFP_P.replaceExtension ("file.txt") ("bob") == ("file.bob"))
+    ,("AFP_W.replaceExtension (\"file.txt\") (\"bob\") == (\"file.bob\")", property $ AFP_W.replaceExtension ("file.txt") ("bob") == ("file.bob"))
+    ,("P.replaceExtension \"file\" \".bob\" == \"file.bob\"", property $ P.replaceExtension "file" ".bob" == "file.bob")
+    ,("W.replaceExtension \"file\" \".bob\" == \"file.bob\"", property $ W.replaceExtension "file" ".bob" == "file.bob")
+    ,("AFP_P.replaceExtension (\"file\") (\".bob\") == (\"file.bob\")", property $ AFP_P.replaceExtension ("file") (".bob") == ("file.bob"))
+    ,("AFP_W.replaceExtension (\"file\") (\".bob\") == (\"file.bob\")", property $ AFP_W.replaceExtension ("file") (".bob") == ("file.bob"))
+    ,("P.replaceExtension \"file.txt\" \"\" == \"file\"", property $ P.replaceExtension "file.txt" "" == "file")
+    ,("W.replaceExtension \"file.txt\" \"\" == \"file\"", property $ W.replaceExtension "file.txt" "" == "file")
+    ,("AFP_P.replaceExtension (\"file.txt\") (\"\") == (\"file\")", property $ AFP_P.replaceExtension ("file.txt") ("") == ("file"))
+    ,("AFP_W.replaceExtension (\"file.txt\") (\"\") == (\"file\")", property $ AFP_W.replaceExtension ("file.txt") ("") == ("file"))
+    ,("P.replaceExtension \"file.fred.bob\" \"txt\" == \"file.fred.txt\"", property $ P.replaceExtension "file.fred.bob" "txt" == "file.fred.txt")
+    ,("W.replaceExtension \"file.fred.bob\" \"txt\" == \"file.fred.txt\"", property $ W.replaceExtension "file.fred.bob" "txt" == "file.fred.txt")
+    ,("AFP_P.replaceExtension (\"file.fred.bob\") (\"txt\") == (\"file.fred.txt\")", property $ AFP_P.replaceExtension ("file.fred.bob") ("txt") == ("file.fred.txt"))
+    ,("AFP_W.replaceExtension (\"file.fred.bob\") (\"txt\") == (\"file.fred.txt\")", property $ AFP_W.replaceExtension ("file.fred.bob") ("txt") == ("file.fred.txt"))
+    ,("P.replaceExtension x y == P.addExtension (P.dropExtension x) y", property $ \(QFilePath x) (QFilePath y) -> P.replaceExtension x y == P.addExtension (P.dropExtension x) y)
+    ,("W.replaceExtension x y == W.addExtension (W.dropExtension x) y", property $ \(QFilePath x) (QFilePath y) -> W.replaceExtension x y == W.addExtension (W.dropExtension x) y)
+    ,("AFP_P.replaceExtension x y == AFP_P.addExtension (AFP_P.dropExtension x) y", property $ \(QFilePathAFP_P x) (QFilePathAFP_P y) -> AFP_P.replaceExtension x y == AFP_P.addExtension (AFP_P.dropExtension x) y)
+    ,("AFP_W.replaceExtension x y == AFP_W.addExtension (AFP_W.dropExtension x) y", property $ \(QFilePathAFP_W x) (QFilePathAFP_W y) -> AFP_W.replaceExtension x y == AFP_W.addExtension (AFP_W.dropExtension x) y)
+    ,("\"/directory/path\" P.<.> \"ext\" == \"/directory/path.ext\"", property $ "/directory/path" P.<.> "ext" == "/directory/path.ext")
+    ,("\"/directory/path\" W.<.> \"ext\" == \"/directory/path.ext\"", property $ "/directory/path" W.<.> "ext" == "/directory/path.ext")
+    ,("(\"/directory/path\") AFP_P.<.> (\"ext\") == (\"/directory/path.ext\")", property $ ("/directory/path") AFP_P.<.> ("ext") == ("/directory/path.ext"))
+    ,("(\"/directory/path\") AFP_W.<.> (\"ext\") == (\"/directory/path.ext\")", property $ ("/directory/path") AFP_W.<.> ("ext") == ("/directory/path.ext"))
+    ,("\"/directory/path\" P.<.> \".ext\" == \"/directory/path.ext\"", property $ "/directory/path" P.<.> ".ext" == "/directory/path.ext")
+    ,("\"/directory/path\" W.<.> \".ext\" == \"/directory/path.ext\"", property $ "/directory/path" W.<.> ".ext" == "/directory/path.ext")
+    ,("(\"/directory/path\") AFP_P.<.> (\".ext\") == (\"/directory/path.ext\")", property $ ("/directory/path") AFP_P.<.> (".ext") == ("/directory/path.ext"))
+    ,("(\"/directory/path\") AFP_W.<.> (\".ext\") == (\"/directory/path.ext\")", property $ ("/directory/path") AFP_W.<.> (".ext") == ("/directory/path.ext"))
+    ,("P.dropExtension \"/directory/path.ext\" == \"/directory/path\"", property $ P.dropExtension "/directory/path.ext" == "/directory/path")
+    ,("W.dropExtension \"/directory/path.ext\" == \"/directory/path\"", property $ W.dropExtension "/directory/path.ext" == "/directory/path")
+    ,("AFP_P.dropExtension (\"/directory/path.ext\") == (\"/directory/path\")", property $ AFP_P.dropExtension ("/directory/path.ext") == ("/directory/path"))
+    ,("AFP_W.dropExtension (\"/directory/path.ext\") == (\"/directory/path\")", property $ AFP_W.dropExtension ("/directory/path.ext") == ("/directory/path"))
+    ,("P.dropExtension x == fst (P.splitExtension x)", property $ \(QFilePath x) -> P.dropExtension x == fst (P.splitExtension x))
+    ,("W.dropExtension x == fst (W.splitExtension x)", property $ \(QFilePath x) -> W.dropExtension x == fst (W.splitExtension x))
+    ,("AFP_P.dropExtension x == fst (AFP_P.splitExtension x)", property $ \(QFilePathAFP_P x) -> AFP_P.dropExtension x == fst (AFP_P.splitExtension x))
+    ,("AFP_W.dropExtension x == fst (AFP_W.splitExtension x)", property $ \(QFilePathAFP_W x) -> AFP_W.dropExtension x == fst (AFP_W.splitExtension x))
+    ,("P.addExtension \"/directory/path\" \"ext\" == \"/directory/path.ext\"", property $ P.addExtension "/directory/path" "ext" == "/directory/path.ext")
+    ,("W.addExtension \"/directory/path\" \"ext\" == \"/directory/path.ext\"", property $ W.addExtension "/directory/path" "ext" == "/directory/path.ext")
+    ,("AFP_P.addExtension (\"/directory/path\") (\"ext\") == (\"/directory/path.ext\")", property $ AFP_P.addExtension ("/directory/path") ("ext") == ("/directory/path.ext"))
+    ,("AFP_W.addExtension (\"/directory/path\") (\"ext\") == (\"/directory/path.ext\")", property $ AFP_W.addExtension ("/directory/path") ("ext") == ("/directory/path.ext"))
+    ,("P.addExtension \"file.txt\" \"bib\" == \"file.txt.bib\"", property $ P.addExtension "file.txt" "bib" == "file.txt.bib")
+    ,("W.addExtension \"file.txt\" \"bib\" == \"file.txt.bib\"", property $ W.addExtension "file.txt" "bib" == "file.txt.bib")
+    ,("AFP_P.addExtension (\"file.txt\") (\"bib\") == (\"file.txt.bib\")", property $ AFP_P.addExtension ("file.txt") ("bib") == ("file.txt.bib"))
+    ,("AFP_W.addExtension (\"file.txt\") (\"bib\") == (\"file.txt.bib\")", property $ AFP_W.addExtension ("file.txt") ("bib") == ("file.txt.bib"))
+    ,("P.addExtension \"file.\" \".bib\" == \"file..bib\"", property $ P.addExtension "file." ".bib" == "file..bib")
+    ,("W.addExtension \"file.\" \".bib\" == \"file..bib\"", property $ W.addExtension "file." ".bib" == "file..bib")
+    ,("AFP_P.addExtension (\"file.\") (\".bib\") == (\"file..bib\")", property $ AFP_P.addExtension ("file.") (".bib") == ("file..bib"))
+    ,("AFP_W.addExtension (\"file.\") (\".bib\") == (\"file..bib\")", property $ AFP_W.addExtension ("file.") (".bib") == ("file..bib"))
+    ,("P.addExtension \"file\" \".bib\" == \"file.bib\"", property $ P.addExtension "file" ".bib" == "file.bib")
+    ,("W.addExtension \"file\" \".bib\" == \"file.bib\"", property $ W.addExtension "file" ".bib" == "file.bib")
+    ,("AFP_P.addExtension (\"file\") (\".bib\") == (\"file.bib\")", property $ AFP_P.addExtension ("file") (".bib") == ("file.bib"))
+    ,("AFP_W.addExtension (\"file\") (\".bib\") == (\"file.bib\")", property $ AFP_W.addExtension ("file") (".bib") == ("file.bib"))
+    ,("P.addExtension \"/\" \"x\" == \"/.x\"", property $ P.addExtension "/" "x" == "/.x")
+    ,("W.addExtension \"/\" \"x\" == \"/.x\"", property $ W.addExtension "/" "x" == "/.x")
+    ,("AFP_P.addExtension (\"/\") (\"x\") == (\"/.x\")", property $ AFP_P.addExtension ("/") ("x") == ("/.x"))
+    ,("AFP_W.addExtension (\"/\") (\"x\") == (\"/.x\")", property $ AFP_W.addExtension ("/") ("x") == ("/.x"))
+    ,("P.addExtension x \"\" == x", property $ \(QFilePath x) -> P.addExtension x "" == x)
+    ,("W.addExtension x \"\" == x", property $ \(QFilePath x) -> W.addExtension x "" == x)
+    ,("AFP_P.addExtension x (\"\") == x", property $ \(QFilePathAFP_P x) -> AFP_P.addExtension x ("") == x)
+    ,("AFP_W.addExtension x (\"\") == x", property $ \(QFilePathAFP_W x) -> AFP_W.addExtension x ("") == x)
+    ,("P.takeFileName (P.addExtension (P.addTrailingPathSeparator x) \"ext\") == \".ext\"", property $ \(QFilePathValidP x) -> P.takeFileName (P.addExtension (P.addTrailingPathSeparator x) "ext") == ".ext")
+    ,("W.takeFileName (W.addExtension (W.addTrailingPathSeparator x) \"ext\") == \".ext\"", property $ \(QFilePathValidW x) -> W.takeFileName (W.addExtension (W.addTrailingPathSeparator x) "ext") == ".ext")
+    ,("AFP_P.takeFileName (AFP_P.addExtension (AFP_P.addTrailingPathSeparator x) (\"ext\")) == (\".ext\")", property $ \(QFilePathValidAFP_P x) -> AFP_P.takeFileName (AFP_P.addExtension (AFP_P.addTrailingPathSeparator x) ("ext")) == (".ext"))
+    ,("AFP_W.takeFileName (AFP_W.addExtension (AFP_W.addTrailingPathSeparator x) (\"ext\")) == (\".ext\")", property $ \(QFilePathValidAFP_W x) -> AFP_W.takeFileName (AFP_W.addExtension (AFP_W.addTrailingPathSeparator x) ("ext")) == (".ext"))
+    ,("W.addExtension \"\\\\\\\\share\" \".txt\" == \"\\\\\\\\share\\\\.txt\"", property $ W.addExtension "\\\\share" ".txt" == "\\\\share\\.txt")
+    ,("AFP_W.addExtension (\"\\\\\\\\share\") (\".txt\") == (\"\\\\\\\\share\\\\.txt\")", property $ AFP_W.addExtension ("\\\\share") (".txt") == ("\\\\share\\.txt"))
+    ,("P.hasExtension \"/directory/path.ext\" == True", property $ P.hasExtension "/directory/path.ext" == True)
+    ,("W.hasExtension \"/directory/path.ext\" == True", property $ W.hasExtension "/directory/path.ext" == True)
+    ,("AFP_P.hasExtension (\"/directory/path.ext\") == True", property $ AFP_P.hasExtension ("/directory/path.ext") == True)
+    ,("AFP_W.hasExtension (\"/directory/path.ext\") == True", property $ AFP_W.hasExtension ("/directory/path.ext") == True)
+    ,("P.hasExtension \"/directory/path\" == False", property $ P.hasExtension "/directory/path" == False)
+    ,("W.hasExtension \"/directory/path\" == False", property $ W.hasExtension "/directory/path" == False)
+    ,("AFP_P.hasExtension (\"/directory/path\") == False", property $ AFP_P.hasExtension ("/directory/path") == False)
+    ,("AFP_W.hasExtension (\"/directory/path\") == False", property $ AFP_W.hasExtension ("/directory/path") == False)
+    ,("null (P.takeExtension x) == not (P.hasExtension x)", property $ \(QFilePath x) -> null (P.takeExtension x) == not (P.hasExtension x))
+    ,("null (W.takeExtension x) == not (W.hasExtension x)", property $ \(QFilePath x) -> null (W.takeExtension x) == not (W.hasExtension x))
+    ,("(SBS.null . getPosixString) (AFP_P.takeExtension x) == not (AFP_P.hasExtension x)", property $ \(QFilePathAFP_P x) -> (SBS.null . getPosixString) (AFP_P.takeExtension x) == not (AFP_P.hasExtension x))
+    ,("(SBS16.null . getWindowsString) (AFP_W.takeExtension x) == not (AFP_W.hasExtension x)", property $ \(QFilePathAFP_W x) -> (SBS16.null . getWindowsString) (AFP_W.takeExtension x) == not (AFP_W.hasExtension x))
+    ,("\"png\" `P.isExtensionOf` \"/directory/file.png\" == True", property $ "png" `P.isExtensionOf` "/directory/file.png" == True)
+    ,("\"png\" `W.isExtensionOf` \"/directory/file.png\" == True", property $ "png" `W.isExtensionOf` "/directory/file.png" == True)
+    ,("(\"png\") `AFP_P.isExtensionOf` (\"/directory/file.png\") == True", property $ ("png") `AFP_P.isExtensionOf` ("/directory/file.png") == True)
+    ,("(\"png\") `AFP_W.isExtensionOf` (\"/directory/file.png\") == True", property $ ("png") `AFP_W.isExtensionOf` ("/directory/file.png") == True)
+    ,("\".png\" `P.isExtensionOf` \"/directory/file.png\" == True", property $ ".png" `P.isExtensionOf` "/directory/file.png" == True)
+    ,("\".png\" `W.isExtensionOf` \"/directory/file.png\" == True", property $ ".png" `W.isExtensionOf` "/directory/file.png" == True)
+    ,("(\".png\") `AFP_P.isExtensionOf` (\"/directory/file.png\") == True", property $ (".png") `AFP_P.isExtensionOf` ("/directory/file.png") == True)
+    ,("(\".png\") `AFP_W.isExtensionOf` (\"/directory/file.png\") == True", property $ (".png") `AFP_W.isExtensionOf` ("/directory/file.png") == True)
+    ,("\".tar.gz\" `P.isExtensionOf` \"bar/foo.tar.gz\" == True", property $ ".tar.gz" `P.isExtensionOf` "bar/foo.tar.gz" == True)
+    ,("\".tar.gz\" `W.isExtensionOf` \"bar/foo.tar.gz\" == True", property $ ".tar.gz" `W.isExtensionOf` "bar/foo.tar.gz" == True)
+    ,("(\".tar.gz\") `AFP_P.isExtensionOf` (\"bar/foo.tar.gz\") == True", property $ (".tar.gz") `AFP_P.isExtensionOf` ("bar/foo.tar.gz") == True)
+    ,("(\".tar.gz\") `AFP_W.isExtensionOf` (\"bar/foo.tar.gz\") == True", property $ (".tar.gz") `AFP_W.isExtensionOf` ("bar/foo.tar.gz") == True)
+    ,("\"ar.gz\" `P.isExtensionOf` \"bar/foo.tar.gz\" == False", property $ "ar.gz" `P.isExtensionOf` "bar/foo.tar.gz" == False)
+    ,("\"ar.gz\" `W.isExtensionOf` \"bar/foo.tar.gz\" == False", property $ "ar.gz" `W.isExtensionOf` "bar/foo.tar.gz" == False)
+    ,("(\"ar.gz\") `AFP_P.isExtensionOf` (\"bar/foo.tar.gz\") == False", property $ ("ar.gz") `AFP_P.isExtensionOf` ("bar/foo.tar.gz") == False)
+    ,("(\"ar.gz\") `AFP_W.isExtensionOf` (\"bar/foo.tar.gz\") == False", property $ ("ar.gz") `AFP_W.isExtensionOf` ("bar/foo.tar.gz") == False)
+    ,("\"png\" `P.isExtensionOf` \"/directory/file.png.jpg\" == False", property $ "png" `P.isExtensionOf` "/directory/file.png.jpg" == False)
+    ,("\"png\" `W.isExtensionOf` \"/directory/file.png.jpg\" == False", property $ "png" `W.isExtensionOf` "/directory/file.png.jpg" == False)
+    ,("(\"png\") `AFP_P.isExtensionOf` (\"/directory/file.png.jpg\") == False", property $ ("png") `AFP_P.isExtensionOf` ("/directory/file.png.jpg") == False)
+    ,("(\"png\") `AFP_W.isExtensionOf` (\"/directory/file.png.jpg\") == False", property $ ("png") `AFP_W.isExtensionOf` ("/directory/file.png.jpg") == False)
+    ,("\"csv/table.csv\" `P.isExtensionOf` \"/data/csv/table.csv\" == False", property $ "csv/table.csv" `P.isExtensionOf` "/data/csv/table.csv" == False)
+    ,("\"csv/table.csv\" `W.isExtensionOf` \"/data/csv/table.csv\" == False", property $ "csv/table.csv" `W.isExtensionOf` "/data/csv/table.csv" == False)
+    ,("(\"csv/table.csv\") `AFP_P.isExtensionOf` (\"/data/csv/table.csv\") == False", property $ ("csv/table.csv") `AFP_P.isExtensionOf` ("/data/csv/table.csv") == False)
+    ,("(\"csv/table.csv\") `AFP_W.isExtensionOf` (\"/data/csv/table.csv\") == False", property $ ("csv/table.csv") `AFP_W.isExtensionOf` ("/data/csv/table.csv") == False)
+    ,("P.stripExtension \"hs.o\" \"foo.x.hs.o\" == Just \"foo.x\"", property $ P.stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x")
+    ,("W.stripExtension \"hs.o\" \"foo.x.hs.o\" == Just \"foo.x\"", property $ W.stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x")
+    ,("AFP_P.stripExtension (\"hs.o\") (\"foo.x.hs.o\") == Just (\"foo.x\")", property $ AFP_P.stripExtension ("hs.o") ("foo.x.hs.o") == Just ("foo.x"))
+    ,("AFP_W.stripExtension (\"hs.o\") (\"foo.x.hs.o\") == Just (\"foo.x\")", property $ AFP_W.stripExtension ("hs.o") ("foo.x.hs.o") == Just ("foo.x"))
+    ,("P.stripExtension \"hi.o\" \"foo.x.hs.o\" == Nothing", property $ P.stripExtension "hi.o" "foo.x.hs.o" == Nothing)
+    ,("W.stripExtension \"hi.o\" \"foo.x.hs.o\" == Nothing", property $ W.stripExtension "hi.o" "foo.x.hs.o" == Nothing)
+    ,("AFP_P.stripExtension (\"hi.o\") (\"foo.x.hs.o\") == Nothing", property $ AFP_P.stripExtension ("hi.o") ("foo.x.hs.o") == Nothing)
+    ,("AFP_W.stripExtension (\"hi.o\") (\"foo.x.hs.o\") == Nothing", property $ AFP_W.stripExtension ("hi.o") ("foo.x.hs.o") == Nothing)
+    ,("P.dropExtension x == fromJust (P.stripExtension (P.takeExtension x) x)", property $ \(QFilePath x) -> P.dropExtension x == fromJust (P.stripExtension (P.takeExtension x) x))
+    ,("W.dropExtension x == fromJust (W.stripExtension (W.takeExtension x) x)", property $ \(QFilePath x) -> W.dropExtension x == fromJust (W.stripExtension (W.takeExtension x) x))
+    ,("AFP_P.dropExtension x == fromJust (AFP_P.stripExtension (AFP_P.takeExtension x) x)", property $ \(QFilePathAFP_P x) -> AFP_P.dropExtension x == fromJust (AFP_P.stripExtension (AFP_P.takeExtension x) x))
+    ,("AFP_W.dropExtension x == fromJust (AFP_W.stripExtension (AFP_W.takeExtension x) x)", property $ \(QFilePathAFP_W x) -> AFP_W.dropExtension x == fromJust (AFP_W.stripExtension (AFP_W.takeExtension x) x))
+    ,("P.dropExtensions x == fromJust (P.stripExtension (P.takeExtensions x) x)", property $ \(QFilePath x) -> P.dropExtensions x == fromJust (P.stripExtension (P.takeExtensions x) x))
+    ,("W.dropExtensions x == fromJust (W.stripExtension (W.takeExtensions x) x)", property $ \(QFilePath x) -> W.dropExtensions x == fromJust (W.stripExtension (W.takeExtensions x) x))
+    ,("AFP_P.dropExtensions x == fromJust (AFP_P.stripExtension (AFP_P.takeExtensions x) x)", property $ \(QFilePathAFP_P x) -> AFP_P.dropExtensions x == fromJust (AFP_P.stripExtension (AFP_P.takeExtensions x) x))
+    ,("AFP_W.dropExtensions x == fromJust (AFP_W.stripExtension (AFP_W.takeExtensions x) x)", property $ \(QFilePathAFP_W x) -> AFP_W.dropExtensions x == fromJust (AFP_W.stripExtension (AFP_W.takeExtensions x) x))
+    ,("P.stripExtension \".c.d\" \"a.b.c.d\" == Just \"a.b\"", property $ P.stripExtension ".c.d" "a.b.c.d" == Just "a.b")
+    ,("W.stripExtension \".c.d\" \"a.b.c.d\" == Just \"a.b\"", property $ W.stripExtension ".c.d" "a.b.c.d" == Just "a.b")
+    ,("AFP_P.stripExtension (\".c.d\") (\"a.b.c.d\") == Just (\"a.b\")", property $ AFP_P.stripExtension (".c.d") ("a.b.c.d") == Just ("a.b"))
+    ,("AFP_W.stripExtension (\".c.d\") (\"a.b.c.d\") == Just (\"a.b\")", property $ AFP_W.stripExtension (".c.d") ("a.b.c.d") == Just ("a.b"))
+    ,("P.stripExtension \".c.d\" \"a.b..c.d\" == Just \"a.b.\"", property $ P.stripExtension ".c.d" "a.b..c.d" == Just "a.b.")
+    ,("W.stripExtension \".c.d\" \"a.b..c.d\" == Just \"a.b.\"", property $ W.stripExtension ".c.d" "a.b..c.d" == Just "a.b.")
+    ,("AFP_P.stripExtension (\".c.d\") (\"a.b..c.d\") == Just (\"a.b.\")", property $ AFP_P.stripExtension (".c.d") ("a.b..c.d") == Just ("a.b."))
+    ,("AFP_W.stripExtension (\".c.d\") (\"a.b..c.d\") == Just (\"a.b.\")", property $ AFP_W.stripExtension (".c.d") ("a.b..c.d") == Just ("a.b."))
+    ,("P.stripExtension \"baz\" \"foo.bar\" == Nothing", property $ P.stripExtension "baz" "foo.bar" == Nothing)
+    ,("W.stripExtension \"baz\" \"foo.bar\" == Nothing", property $ W.stripExtension "baz" "foo.bar" == Nothing)
+    ,("AFP_P.stripExtension (\"baz\") (\"foo.bar\") == Nothing", property $ AFP_P.stripExtension ("baz") ("foo.bar") == Nothing)
+    ,("AFP_W.stripExtension (\"baz\") (\"foo.bar\") == Nothing", property $ AFP_W.stripExtension ("baz") ("foo.bar") == Nothing)
+    ,("P.stripExtension \"bar\" \"foobar\" == Nothing", property $ P.stripExtension "bar" "foobar" == Nothing)
+    ,("W.stripExtension \"bar\" \"foobar\" == Nothing", property $ W.stripExtension "bar" "foobar" == Nothing)
+    ,("AFP_P.stripExtension (\"bar\") (\"foobar\") == Nothing", property $ AFP_P.stripExtension ("bar") ("foobar") == Nothing)
+    ,("AFP_W.stripExtension (\"bar\") (\"foobar\") == Nothing", property $ AFP_W.stripExtension ("bar") ("foobar") == Nothing)
+    ,("P.stripExtension \"\" x == Just x", property $ \(QFilePath x) -> P.stripExtension "" x == Just x)
+    ,("W.stripExtension \"\" x == Just x", property $ \(QFilePath x) -> W.stripExtension "" x == Just x)
+    ,("AFP_P.stripExtension (\"\") x == Just x", property $ \(QFilePathAFP_P x) -> AFP_P.stripExtension ("") x == Just x)
+    ,("AFP_W.stripExtension (\"\") x == Just x", property $ \(QFilePathAFP_W x) -> AFP_W.stripExtension ("") x == Just x)
+    ,("P.splitExtensions \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", property $ P.splitExtensions "/directory/path.ext" == ("/directory/path", ".ext"))
+    ,("W.splitExtensions \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", property $ W.splitExtensions "/directory/path.ext" == ("/directory/path", ".ext"))
+    ,("AFP_P.splitExtensions (\"/directory/path.ext\") == ((\"/directory/path\"), (\".ext\"))", property $ AFP_P.splitExtensions ("/directory/path.ext") == (("/directory/path"), (".ext")))
+    ,("AFP_W.splitExtensions (\"/directory/path.ext\") == ((\"/directory/path\"), (\".ext\"))", property $ AFP_W.splitExtensions ("/directory/path.ext") == (("/directory/path"), (".ext")))
+    ,("P.splitExtensions \"file.tar.gz\" == (\"file\", \".tar.gz\")", property $ P.splitExtensions "file.tar.gz" == ("file", ".tar.gz"))
+    ,("W.splitExtensions \"file.tar.gz\" == (\"file\", \".tar.gz\")", property $ W.splitExtensions "file.tar.gz" == ("file", ".tar.gz"))
+    ,("AFP_P.splitExtensions (\"file.tar.gz\") == ((\"file\"), (\".tar.gz\"))", property $ AFP_P.splitExtensions ("file.tar.gz") == (("file"), (".tar.gz")))
+    ,("AFP_W.splitExtensions (\"file.tar.gz\") == ((\"file\"), (\".tar.gz\"))", property $ AFP_W.splitExtensions ("file.tar.gz") == (("file"), (".tar.gz")))
+    ,("uncurry (<>) (P.splitExtensions x) == x", property $ \(QFilePath x) -> uncurry (<>) (P.splitExtensions x) == x)
+    ,("uncurry (<>) (W.splitExtensions x) == x", property $ \(QFilePath x) -> uncurry (<>) (W.splitExtensions x) == x)
+    ,("uncurry (<>) (AFP_P.splitExtensions x) == x", property $ \(QFilePathAFP_P x) -> uncurry (<>) (AFP_P.splitExtensions x) == x)
+    ,("uncurry (<>) (AFP_W.splitExtensions x) == x", property $ \(QFilePathAFP_W x) -> uncurry (<>) (AFP_W.splitExtensions x) == x)
+    ,("uncurry P.addExtension (P.splitExtensions x) == x", property $ \(QFilePathValidP x) -> uncurry P.addExtension (P.splitExtensions x) == x)
+    ,("uncurry W.addExtension (W.splitExtensions x) == x", property $ \(QFilePathValidW x) -> uncurry W.addExtension (W.splitExtensions x) == x)
+    ,("uncurry AFP_P.addExtension (AFP_P.splitExtensions x) == x", property $ \(QFilePathValidAFP_P x) -> uncurry AFP_P.addExtension (AFP_P.splitExtensions x) == x)
+    ,("uncurry AFP_W.addExtension (AFP_W.splitExtensions x) == x", property $ \(QFilePathValidAFP_W x) -> uncurry AFP_W.addExtension (AFP_W.splitExtensions x) == x)
+    ,("P.dropExtensions \"/directory/path.ext\" == \"/directory/path\"", property $ P.dropExtensions "/directory/path.ext" == "/directory/path")
+    ,("W.dropExtensions \"/directory/path.ext\" == \"/directory/path\"", property $ W.dropExtensions "/directory/path.ext" == "/directory/path")
+    ,("AFP_P.dropExtensions (\"/directory/path.ext\") == (\"/directory/path\")", property $ AFP_P.dropExtensions ("/directory/path.ext") == ("/directory/path"))
+    ,("AFP_W.dropExtensions (\"/directory/path.ext\") == (\"/directory/path\")", property $ AFP_W.dropExtensions ("/directory/path.ext") == ("/directory/path"))
+    ,("P.dropExtensions \"file.tar.gz\" == \"file\"", property $ P.dropExtensions "file.tar.gz" == "file")
+    ,("W.dropExtensions \"file.tar.gz\" == \"file\"", property $ W.dropExtensions "file.tar.gz" == "file")
+    ,("AFP_P.dropExtensions (\"file.tar.gz\") == (\"file\")", property $ AFP_P.dropExtensions ("file.tar.gz") == ("file"))
+    ,("AFP_W.dropExtensions (\"file.tar.gz\") == (\"file\")", property $ AFP_W.dropExtensions ("file.tar.gz") == ("file"))
+    ,("not $ P.hasExtension $ P.dropExtensions x", property $ \(QFilePath x) -> not $ P.hasExtension $ P.dropExtensions x)
+    ,("not $ W.hasExtension $ W.dropExtensions x", property $ \(QFilePath x) -> not $ W.hasExtension $ W.dropExtensions x)
+    ,("not $ AFP_P.hasExtension $ AFP_P.dropExtensions x", property $ \(QFilePathAFP_P x) -> not $ AFP_P.hasExtension $ AFP_P.dropExtensions x)
+    ,("not $ AFP_W.hasExtension $ AFP_W.dropExtensions x", property $ \(QFilePathAFP_W x) -> not $ AFP_W.hasExtension $ AFP_W.dropExtensions x)
+    ,("not $ any P.isExtSeparator $ P.takeFileName $ P.dropExtensions x", property $ \(QFilePath x) -> not $ any P.isExtSeparator $ P.takeFileName $ P.dropExtensions x)
+    ,("not $ any W.isExtSeparator $ W.takeFileName $ W.dropExtensions x", property $ \(QFilePath x) -> not $ any W.isExtSeparator $ W.takeFileName $ W.dropExtensions x)
+    ,("not $ (\\f (getPosixString -> x) -> SBS.any (f . PW) x) AFP_P.isExtSeparator $ AFP_P.takeFileName $ AFP_P.dropExtensions x", property $ \(QFilePathAFP_P x) -> not $ (\f (getPosixString -> x) -> SBS.any (f . PW) x) AFP_P.isExtSeparator $ AFP_P.takeFileName $ AFP_P.dropExtensions x)
+    ,("not $ (\\f (getWindowsString -> x) -> SBS16.any (f . WW) x) AFP_W.isExtSeparator $ AFP_W.takeFileName $ AFP_W.dropExtensions x", property $ \(QFilePathAFP_W x) -> not $ (\f (getWindowsString -> x) -> SBS16.any (f . WW) x) AFP_W.isExtSeparator $ AFP_W.takeFileName $ AFP_W.dropExtensions x)
+    ,("P.takeExtensions \"/directory/path.ext\" == \".ext\"", property $ P.takeExtensions "/directory/path.ext" == ".ext")
+    ,("W.takeExtensions \"/directory/path.ext\" == \".ext\"", property $ W.takeExtensions "/directory/path.ext" == ".ext")
+    ,("AFP_P.takeExtensions (\"/directory/path.ext\") == (\".ext\")", property $ AFP_P.takeExtensions ("/directory/path.ext") == (".ext"))
+    ,("AFP_W.takeExtensions (\"/directory/path.ext\") == (\".ext\")", property $ AFP_W.takeExtensions ("/directory/path.ext") == (".ext"))
+    ,("P.takeExtensions \"file.tar.gz\" == \".tar.gz\"", property $ P.takeExtensions "file.tar.gz" == ".tar.gz")
+    ,("W.takeExtensions \"file.tar.gz\" == \".tar.gz\"", property $ W.takeExtensions "file.tar.gz" == ".tar.gz")
+    ,("AFP_P.takeExtensions (\"file.tar.gz\") == (\".tar.gz\")", property $ AFP_P.takeExtensions ("file.tar.gz") == (".tar.gz"))
+    ,("AFP_W.takeExtensions (\"file.tar.gz\") == (\".tar.gz\")", property $ AFP_W.takeExtensions ("file.tar.gz") == (".tar.gz"))
+    ,("P.replaceExtensions \"file.fred.bob\" \"txt\" == \"file.txt\"", property $ P.replaceExtensions "file.fred.bob" "txt" == "file.txt")
+    ,("W.replaceExtensions \"file.fred.bob\" \"txt\" == \"file.txt\"", property $ W.replaceExtensions "file.fred.bob" "txt" == "file.txt")
+    ,("AFP_P.replaceExtensions (\"file.fred.bob\") (\"txt\") == (\"file.txt\")", property $ AFP_P.replaceExtensions ("file.fred.bob") ("txt") == ("file.txt"))
+    ,("AFP_W.replaceExtensions (\"file.fred.bob\") (\"txt\") == (\"file.txt\")", property $ AFP_W.replaceExtensions ("file.fred.bob") ("txt") == ("file.txt"))
+    ,("P.replaceExtensions \"file.fred.bob\" \"tar.gz\" == \"file.tar.gz\"", property $ P.replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz")
+    ,("W.replaceExtensions \"file.fred.bob\" \"tar.gz\" == \"file.tar.gz\"", property $ W.replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz")
+    ,("AFP_P.replaceExtensions (\"file.fred.bob\") (\"tar.gz\") == (\"file.tar.gz\")", property $ AFP_P.replaceExtensions ("file.fred.bob") ("tar.gz") == ("file.tar.gz"))
+    ,("AFP_W.replaceExtensions (\"file.fred.bob\") (\"tar.gz\") == (\"file.tar.gz\")", property $ AFP_W.replaceExtensions ("file.fred.bob") ("tar.gz") == ("file.tar.gz"))
+    ,("uncurry (<>) (P.splitDrive x) == x", property $ \(QFilePath x) -> uncurry (<>) (P.splitDrive x) == x)
+    ,("uncurry (<>) (W.splitDrive x) == x", property $ \(QFilePath x) -> uncurry (<>) (W.splitDrive x) == x)
+    ,("uncurry (<>) (AFP_P.splitDrive x) == x", property $ \(QFilePathAFP_P x) -> uncurry (<>) (AFP_P.splitDrive x) == x)
+    ,("uncurry (<>) (AFP_W.splitDrive x) == x", property $ \(QFilePathAFP_W x) -> uncurry (<>) (AFP_W.splitDrive x) == x)
+    ,("W.splitDrive \"file\" == (\"\", \"file\")", property $ W.splitDrive "file" == ("", "file"))
+    ,("AFP_W.splitDrive (\"file\") == ((\"\"), (\"file\"))", property $ AFP_W.splitDrive ("file") == ((""), ("file")))
+    ,("W.splitDrive \"c:/file\" == (\"c:/\", \"file\")", property $ W.splitDrive "c:/file" == ("c:/", "file"))
+    ,("AFP_W.splitDrive (\"c:/file\") == ((\"c:/\"), (\"file\"))", property $ AFP_W.splitDrive ("c:/file") == (("c:/"), ("file")))
+    ,("W.splitDrive \"c:\\\\file\" == (\"c:\\\\\", \"file\")", property $ W.splitDrive "c:\\file" == ("c:\\", "file"))
+    ,("AFP_W.splitDrive (\"c:\\\\file\") == ((\"c:\\\\\"), (\"file\"))", property $ AFP_W.splitDrive ("c:\\file") == (("c:\\"), ("file")))
+    ,("W.splitDrive \"\\\\\\\\shared\\\\test\" == (\"\\\\\\\\shared\\\\\", \"test\")", property $ W.splitDrive "\\\\shared\\test" == ("\\\\shared\\", "test"))
+    ,("AFP_W.splitDrive (\"\\\\\\\\shared\\\\test\") == ((\"\\\\\\\\shared\\\\\"), (\"test\"))", property $ AFP_W.splitDrive ("\\\\shared\\test") == (("\\\\shared\\"), ("test")))
+    ,("W.splitDrive \"\\\\\\\\shared\" == (\"\\\\\\\\shared\", \"\")", property $ W.splitDrive "\\\\shared" == ("\\\\shared", ""))
+    ,("AFP_W.splitDrive (\"\\\\\\\\shared\") == ((\"\\\\\\\\shared\"), (\"\"))", property $ AFP_W.splitDrive ("\\\\shared") == (("\\\\shared"), ("")))
+    ,("W.splitDrive \"\\\\\\\\?\\\\UNC\\\\shared\\\\file\" == (\"\\\\\\\\?\\\\UNC\\\\shared\\\\\", \"file\")", property $ W.splitDrive "\\\\?\\UNC\\shared\\file" == ("\\\\?\\UNC\\shared\\", "file"))
+    ,("AFP_W.splitDrive (\"\\\\\\\\?\\\\UNC\\\\shared\\\\file\") == ((\"\\\\\\\\?\\\\UNC\\\\shared\\\\\"), (\"file\"))", property $ AFP_W.splitDrive ("\\\\?\\UNC\\shared\\file") == (("\\\\?\\UNC\\shared\\"), ("file")))
+    ,("W.splitDrive \"\\\\\\\\?\\\\UNCshared\\\\file\" == (\"\\\\\\\\?\\\\\", \"UNCshared\\\\file\")", property $ W.splitDrive "\\\\?\\UNCshared\\file" == ("\\\\?\\", "UNCshared\\file"))
+    ,("AFP_W.splitDrive (\"\\\\\\\\?\\\\UNCshared\\\\file\") == ((\"\\\\\\\\?\\\\\"), (\"UNCshared\\\\file\"))", property $ AFP_W.splitDrive ("\\\\?\\UNCshared\\file") == (("\\\\?\\"), ("UNCshared\\file")))
+    ,("W.splitDrive \"\\\\\\\\?\\\\d:\\\\file\" == (\"\\\\\\\\?\\\\d:\\\\\", \"file\")", property $ W.splitDrive "\\\\?\\d:\\file" == ("\\\\?\\d:\\", "file"))
+    ,("AFP_W.splitDrive (\"\\\\\\\\?\\\\d:\\\\file\") == ((\"\\\\\\\\?\\\\d:\\\\\"), (\"file\"))", property $ AFP_W.splitDrive ("\\\\?\\d:\\file") == (("\\\\?\\d:\\"), ("file")))
+    ,("W.splitDrive \"/d\" == (\"\", \"/d\")", property $ W.splitDrive "/d" == ("", "/d"))
+    ,("AFP_W.splitDrive (\"/d\") == ((\"\"), (\"/d\"))", property $ AFP_W.splitDrive ("/d") == ((""), ("/d")))
+    ,("P.splitDrive \"/test\" == (\"/\", \"test\")", property $ P.splitDrive "/test" == ("/", "test"))
+    ,("AFP_P.splitDrive (\"/test\") == ((\"/\"), (\"test\"))", property $ AFP_P.splitDrive ("/test") == (("/"), ("test")))
+    ,("P.splitDrive \"//test\" == (\"//\", \"test\")", property $ P.splitDrive "//test" == ("//", "test"))
+    ,("AFP_P.splitDrive (\"//test\") == ((\"//\"), (\"test\"))", property $ AFP_P.splitDrive ("//test") == (("//"), ("test")))
+    ,("P.splitDrive \"test/file\" == (\"\", \"test/file\")", property $ P.splitDrive "test/file" == ("", "test/file"))
+    ,("AFP_P.splitDrive (\"test/file\") == ((\"\"), (\"test/file\"))", property $ AFP_P.splitDrive ("test/file") == ((""), ("test/file")))
+    ,("P.splitDrive \"file\" == (\"\", \"file\")", property $ P.splitDrive "file" == ("", "file"))
+    ,("AFP_P.splitDrive (\"file\") == ((\"\"), (\"file\"))", property $ AFP_P.splitDrive ("file") == ((""), ("file")))
+    ,("uncurry P.joinDrive (P.splitDrive x) == x", property $ \(QFilePathValidP x) -> uncurry P.joinDrive (P.splitDrive x) == x)
+    ,("uncurry W.joinDrive (W.splitDrive x) == x", property $ \(QFilePathValidW x) -> uncurry W.joinDrive (W.splitDrive x) == x)
+    ,("uncurry AFP_P.joinDrive (AFP_P.splitDrive x) == x", property $ \(QFilePathValidAFP_P x) -> uncurry AFP_P.joinDrive (AFP_P.splitDrive x) == x)
+    ,("uncurry AFP_W.joinDrive (AFP_W.splitDrive x) == x", property $ \(QFilePathValidAFP_W x) -> uncurry AFP_W.joinDrive (AFP_W.splitDrive x) == x)
+    ,("W.joinDrive \"C:\" \"foo\" == \"C:foo\"", property $ W.joinDrive "C:" "foo" == "C:foo")
+    ,("AFP_W.joinDrive (\"C:\") (\"foo\") == (\"C:foo\")", property $ AFP_W.joinDrive ("C:") ("foo") == ("C:foo"))
+    ,("W.joinDrive \"C:\\\\\" \"bar\" == \"C:\\\\bar\"", property $ W.joinDrive "C:\\" "bar" == "C:\\bar")
+    ,("AFP_W.joinDrive (\"C:\\\\\") (\"bar\") == (\"C:\\\\bar\")", property $ AFP_W.joinDrive ("C:\\") ("bar") == ("C:\\bar"))
+    ,("W.joinDrive \"\\\\\\\\share\" \"foo\" == \"\\\\\\\\share\\\\foo\"", property $ W.joinDrive "\\\\share" "foo" == "\\\\share\\foo")
+    ,("AFP_W.joinDrive (\"\\\\\\\\share\") (\"foo\") == (\"\\\\\\\\share\\\\foo\")", property $ AFP_W.joinDrive ("\\\\share") ("foo") == ("\\\\share\\foo"))
+    ,("W.joinDrive \"/:\" \"foo\" == \"/:\\\\foo\"", property $ W.joinDrive "/:" "foo" == "/:\\foo")
+    ,("AFP_W.joinDrive (\"/:\") (\"foo\") == (\"/:\\\\foo\")", property $ AFP_W.joinDrive ("/:") ("foo") == ("/:\\foo"))
+    ,("P.takeDrive x == fst (P.splitDrive x)", property $ \(QFilePath x) -> P.takeDrive x == fst (P.splitDrive x))
+    ,("W.takeDrive x == fst (W.splitDrive x)", property $ \(QFilePath x) -> W.takeDrive x == fst (W.splitDrive x))
+    ,("AFP_P.takeDrive x == fst (AFP_P.splitDrive x)", property $ \(QFilePathAFP_P x) -> AFP_P.takeDrive x == fst (AFP_P.splitDrive x))
+    ,("AFP_W.takeDrive x == fst (AFP_W.splitDrive x)", property $ \(QFilePathAFP_W x) -> AFP_W.takeDrive x == fst (AFP_W.splitDrive x))
+    ,("P.dropDrive x == snd (P.splitDrive x)", property $ \(QFilePath x) -> P.dropDrive x == snd (P.splitDrive x))
+    ,("W.dropDrive x == snd (W.splitDrive x)", property $ \(QFilePath x) -> W.dropDrive x == snd (W.splitDrive x))
+    ,("AFP_P.dropDrive x == snd (AFP_P.splitDrive x)", property $ \(QFilePathAFP_P x) -> AFP_P.dropDrive x == snd (AFP_P.splitDrive x))
+    ,("AFP_W.dropDrive x == snd (AFP_W.splitDrive x)", property $ \(QFilePathAFP_W x) -> AFP_W.dropDrive x == snd (AFP_W.splitDrive x))
+    ,("not (P.hasDrive x) == null (P.takeDrive x)", property $ \(QFilePath x) -> not (P.hasDrive x) == null (P.takeDrive x))
+    ,("not (W.hasDrive x) == null (W.takeDrive x)", property $ \(QFilePath x) -> not (W.hasDrive x) == null (W.takeDrive x))
+    ,("not (AFP_P.hasDrive x) == (SBS.null . getPosixString) (AFP_P.takeDrive x)", property $ \(QFilePathAFP_P x) -> not (AFP_P.hasDrive x) == (SBS.null . getPosixString) (AFP_P.takeDrive x))
+    ,("not (AFP_W.hasDrive x) == (SBS16.null . getWindowsString) (AFP_W.takeDrive x)", property $ \(QFilePathAFP_W x) -> not (AFP_W.hasDrive x) == (SBS16.null . getWindowsString) (AFP_W.takeDrive x))
+    ,("P.hasDrive \"/foo\" == True", property $ P.hasDrive "/foo" == True)
+    ,("AFP_P.hasDrive (\"/foo\") == True", property $ AFP_P.hasDrive ("/foo") == True)
+    ,("W.hasDrive \"C:\\\\foo\" == True", property $ W.hasDrive "C:\\foo" == True)
+    ,("AFP_W.hasDrive (\"C:\\\\foo\") == True", property $ AFP_W.hasDrive ("C:\\foo") == True)
+    ,("W.hasDrive \"C:foo\" == True", property $ W.hasDrive "C:foo" == True)
+    ,("AFP_W.hasDrive (\"C:foo\") == True", property $ AFP_W.hasDrive ("C:foo") == True)
+    ,("P.hasDrive \"foo\" == False", property $ P.hasDrive "foo" == False)
+    ,("W.hasDrive \"foo\" == False", property $ W.hasDrive "foo" == False)
+    ,("AFP_P.hasDrive (\"foo\") == False", property $ AFP_P.hasDrive ("foo") == False)
+    ,("AFP_W.hasDrive (\"foo\") == False", property $ AFP_W.hasDrive ("foo") == False)
+    ,("P.hasDrive \"\" == False", property $ P.hasDrive "" == False)
+    ,("W.hasDrive \"\" == False", property $ W.hasDrive "" == False)
+    ,("AFP_P.hasDrive (\"\") == False", property $ AFP_P.hasDrive ("") == False)
+    ,("AFP_W.hasDrive (\"\") == False", property $ AFP_W.hasDrive ("") == False)
+    ,("P.isDrive \"/\" == True", property $ P.isDrive "/" == True)
+    ,("AFP_P.isDrive (\"/\") == True", property $ AFP_P.isDrive ("/") == True)
+    ,("P.isDrive \"/foo\" == False", property $ P.isDrive "/foo" == False)
+    ,("AFP_P.isDrive (\"/foo\") == False", property $ AFP_P.isDrive ("/foo") == False)
+    ,("W.isDrive \"C:\\\\\" == True", property $ W.isDrive "C:\\" == True)
+    ,("AFP_W.isDrive (\"C:\\\\\") == True", property $ AFP_W.isDrive ("C:\\") == True)
+    ,("W.isDrive \"C:\\\\foo\" == False", property $ W.isDrive "C:\\foo" == False)
+    ,("AFP_W.isDrive (\"C:\\\\foo\") == False", property $ AFP_W.isDrive ("C:\\foo") == False)
+    ,("P.isDrive \"\" == False", property $ P.isDrive "" == False)
+    ,("W.isDrive \"\" == False", property $ W.isDrive "" == False)
+    ,("AFP_P.isDrive (\"\") == False", property $ AFP_P.isDrive ("") == False)
+    ,("AFP_W.isDrive (\"\") == False", property $ AFP_W.isDrive ("") == False)
+    ,("P.splitFileName \"/directory/file.ext\" == (\"/directory/\", \"file.ext\")", property $ P.splitFileName "/directory/file.ext" == ("/directory/", "file.ext"))
+    ,("W.splitFileName \"/directory/file.ext\" == (\"/directory/\", \"file.ext\")", property $ W.splitFileName "/directory/file.ext" == ("/directory/", "file.ext"))
+    ,("AFP_P.splitFileName (\"/directory/file.ext\") == ((\"/directory/\"), (\"file.ext\"))", property $ AFP_P.splitFileName ("/directory/file.ext") == (("/directory/"), ("file.ext")))
+    ,("AFP_W.splitFileName (\"/directory/file.ext\") == ((\"/directory/\"), (\"file.ext\"))", property $ AFP_W.splitFileName ("/directory/file.ext") == (("/directory/"), ("file.ext")))
+    ,("uncurry (P.</>) (P.splitFileName x) == x || fst (P.splitFileName x) == \"./\"", property $ \(QFilePathValidP x) -> uncurry (P.</>) (P.splitFileName x) == x || fst (P.splitFileName x) == "./")
+    ,("uncurry (W.</>) (W.splitFileName x) == x || fst (W.splitFileName x) == \"./\"", property $ \(QFilePathValidW x) -> uncurry (W.</>) (W.splitFileName x) == x || fst (W.splitFileName x) == "./")
+    ,("uncurry (AFP_P.</>) (AFP_P.splitFileName x) == x || fst (AFP_P.splitFileName x) == (\"./\")", property $ \(QFilePathValidAFP_P x) -> uncurry (AFP_P.</>) (AFP_P.splitFileName x) == x || fst (AFP_P.splitFileName x) == ("./"))
+    ,("uncurry (AFP_W.</>) (AFP_W.splitFileName x) == x || fst (AFP_W.splitFileName x) == (\"./\")", property $ \(QFilePathValidAFP_W x) -> uncurry (AFP_W.</>) (AFP_W.splitFileName x) == x || fst (AFP_W.splitFileName x) == ("./"))
+    ,("P.isValid (fst (P.splitFileName x))", property $ \(QFilePathValidP x) -> P.isValid (fst (P.splitFileName x)))
+    ,("W.isValid (fst (W.splitFileName x))", property $ \(QFilePathValidW x) -> W.isValid (fst (W.splitFileName x)))
+    ,("AFP_P.isValid (fst (AFP_P.splitFileName x))", property $ \(QFilePathValidAFP_P x) -> AFP_P.isValid (fst (AFP_P.splitFileName x)))
+    ,("AFP_W.isValid (fst (AFP_W.splitFileName x))", property $ \(QFilePathValidAFP_W x) -> AFP_W.isValid (fst (AFP_W.splitFileName x)))
+    ,("P.splitFileName \"file/bob.txt\" == (\"file/\", \"bob.txt\")", property $ P.splitFileName "file/bob.txt" == ("file/", "bob.txt"))
+    ,("W.splitFileName \"file/bob.txt\" == (\"file/\", \"bob.txt\")", property $ W.splitFileName "file/bob.txt" == ("file/", "bob.txt"))
+    ,("AFP_P.splitFileName (\"file/bob.txt\") == ((\"file/\"), (\"bob.txt\"))", property $ AFP_P.splitFileName ("file/bob.txt") == (("file/"), ("bob.txt")))
+    ,("AFP_W.splitFileName (\"file/bob.txt\") == ((\"file/\"), (\"bob.txt\"))", property $ AFP_W.splitFileName ("file/bob.txt") == (("file/"), ("bob.txt")))
+    ,("P.splitFileName \"file/\" == (\"file/\", \"\")", property $ P.splitFileName "file/" == ("file/", ""))
+    ,("W.splitFileName \"file/\" == (\"file/\", \"\")", property $ W.splitFileName "file/" == ("file/", ""))
+    ,("AFP_P.splitFileName (\"file/\") == ((\"file/\"), (\"\"))", property $ AFP_P.splitFileName ("file/") == (("file/"), ("")))
+    ,("AFP_W.splitFileName (\"file/\") == ((\"file/\"), (\"\"))", property $ AFP_W.splitFileName ("file/") == (("file/"), ("")))
+    ,("P.splitFileName \"bob\" == (\"./\", \"bob\")", property $ P.splitFileName "bob" == ("./", "bob"))
+    ,("W.splitFileName \"bob\" == (\"./\", \"bob\")", property $ W.splitFileName "bob" == ("./", "bob"))
+    ,("AFP_P.splitFileName (\"bob\") == ((\"./\"), (\"bob\"))", property $ AFP_P.splitFileName ("bob") == (("./"), ("bob")))
+    ,("AFP_W.splitFileName (\"bob\") == ((\"./\"), (\"bob\"))", property $ AFP_W.splitFileName ("bob") == (("./"), ("bob")))
+    ,("P.splitFileName \"/\" == (\"/\", \"\")", property $ P.splitFileName "/" == ("/", ""))
+    ,("AFP_P.splitFileName (\"/\") == ((\"/\"), (\"\"))", property $ AFP_P.splitFileName ("/") == (("/"), ("")))
+    ,("W.splitFileName \"c:\" == (\"c:\", \"\")", property $ W.splitFileName "c:" == ("c:", ""))
+    ,("AFP_W.splitFileName (\"c:\") == ((\"c:\"), (\"\"))", property $ AFP_W.splitFileName ("c:") == (("c:"), ("")))
+    ,("W.splitFileName \"\\\\\\\\?\\\\A:\\\\fred\" == (\"\\\\\\\\?\\\\A:\\\\\", \"fred\")", property $ W.splitFileName "\\\\?\\A:\\fred" == ("\\\\?\\A:\\", "fred"))
+    ,("AFP_W.splitFileName (\"\\\\\\\\?\\\\A:\\\\fred\") == ((\"\\\\\\\\?\\\\A:\\\\\"), (\"fred\"))", property $ AFP_W.splitFileName ("\\\\?\\A:\\fred") == (("\\\\?\\A:\\"), ("fred")))
+    ,("W.splitFileName \"\\\\\\\\?\\\\A:\" == (\"\\\\\\\\?\\\\A:\", \"\")", property $ W.splitFileName "\\\\?\\A:" == ("\\\\?\\A:", ""))
+    ,("AFP_W.splitFileName (\"\\\\\\\\?\\\\A:\") == ((\"\\\\\\\\?\\\\A:\"), (\"\"))", property $ AFP_W.splitFileName ("\\\\?\\A:") == (("\\\\?\\A:"), ("")))
+    ,("P.replaceFileName \"/directory/other.txt\" \"file.ext\" == \"/directory/file.ext\"", property $ P.replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext")
+    ,("W.replaceFileName \"/directory/other.txt\" \"file.ext\" == \"/directory/file.ext\"", property $ W.replaceFileName "/directory/other.txt" "file.ext" == "/directory/file.ext")
+    ,("AFP_P.replaceFileName (\"/directory/other.txt\") (\"file.ext\") == (\"/directory/file.ext\")", property $ AFP_P.replaceFileName ("/directory/other.txt") ("file.ext") == ("/directory/file.ext"))
+    ,("AFP_W.replaceFileName (\"/directory/other.txt\") (\"file.ext\") == (\"/directory/file.ext\")", property $ AFP_W.replaceFileName ("/directory/other.txt") ("file.ext") == ("/directory/file.ext"))
+    ,("P.replaceFileName x (P.takeFileName x) == x", property $ \(QFilePathValidP x) -> P.replaceFileName x (P.takeFileName x) == x)
+    ,("W.replaceFileName x (W.takeFileName x) == x", property $ \(QFilePathValidW x) -> W.replaceFileName x (W.takeFileName x) == x)
+    ,("AFP_P.replaceFileName x (AFP_P.takeFileName x) == x", property $ \(QFilePathValidAFP_P x) -> AFP_P.replaceFileName x (AFP_P.takeFileName x) == x)
+    ,("AFP_W.replaceFileName x (AFP_W.takeFileName x) == x", property $ \(QFilePathValidAFP_W x) -> AFP_W.replaceFileName x (AFP_W.takeFileName x) == x)
+    ,("P.dropFileName \"/directory/file.ext\" == \"/directory/\"", property $ P.dropFileName "/directory/file.ext" == "/directory/")
+    ,("W.dropFileName \"/directory/file.ext\" == \"/directory/\"", property $ W.dropFileName "/directory/file.ext" == "/directory/")
+    ,("AFP_P.dropFileName (\"/directory/file.ext\") == (\"/directory/\")", property $ AFP_P.dropFileName ("/directory/file.ext") == ("/directory/"))
+    ,("AFP_W.dropFileName (\"/directory/file.ext\") == (\"/directory/\")", property $ AFP_W.dropFileName ("/directory/file.ext") == ("/directory/"))
+    ,("P.dropFileName x == fst (P.splitFileName x)", property $ \(QFilePath x) -> P.dropFileName x == fst (P.splitFileName x))
+    ,("W.dropFileName x == fst (W.splitFileName x)", property $ \(QFilePath x) -> W.dropFileName x == fst (W.splitFileName x))
+    ,("AFP_P.dropFileName x == fst (AFP_P.splitFileName x)", property $ \(QFilePathAFP_P x) -> AFP_P.dropFileName x == fst (AFP_P.splitFileName x))
+    ,("AFP_W.dropFileName x == fst (AFP_W.splitFileName x)", property $ \(QFilePathAFP_W x) -> AFP_W.dropFileName x == fst (AFP_W.splitFileName x))
+    ,("isPrefixOf (P.takeDrive x) (P.dropFileName x)", property $ \(QFilePath x) -> isPrefixOf (P.takeDrive x) (P.dropFileName x))
+    ,("isPrefixOf (W.takeDrive x) (W.dropFileName x)", property $ \(QFilePath x) -> isPrefixOf (W.takeDrive x) (W.dropFileName x))
+    ,("(\\(getPosixString -> x) (getPosixString -> y) -> SBS.isPrefixOf x y) (AFP_P.takeDrive x) (AFP_P.dropFileName x)", property $ \(QFilePathAFP_P x) -> (\(getPosixString -> x) (getPosixString -> y) -> SBS.isPrefixOf x y) (AFP_P.takeDrive x) (AFP_P.dropFileName x))
+    ,("(\\(getWindowsString -> x) (getWindowsString -> y) -> SBS16.isPrefixOf x y) (AFP_W.takeDrive x) (AFP_W.dropFileName x)", property $ \(QFilePathAFP_W x) -> (\(getWindowsString -> x) (getWindowsString -> y) -> SBS16.isPrefixOf x y) (AFP_W.takeDrive x) (AFP_W.dropFileName x))
+    ,("P.takeFileName \"/directory/file.ext\" == \"file.ext\"", property $ P.takeFileName "/directory/file.ext" == "file.ext")
+    ,("W.takeFileName \"/directory/file.ext\" == \"file.ext\"", property $ W.takeFileName "/directory/file.ext" == "file.ext")
+    ,("AFP_P.takeFileName (\"/directory/file.ext\") == (\"file.ext\")", property $ AFP_P.takeFileName ("/directory/file.ext") == ("file.ext"))
+    ,("AFP_W.takeFileName (\"/directory/file.ext\") == (\"file.ext\")", property $ AFP_W.takeFileName ("/directory/file.ext") == ("file.ext"))
+    ,("P.takeFileName \"test/\" == \"\"", property $ P.takeFileName "test/" == "")
+    ,("W.takeFileName \"test/\" == \"\"", property $ W.takeFileName "test/" == "")
+    ,("AFP_P.takeFileName (\"test/\") == (\"\")", property $ AFP_P.takeFileName ("test/") == (""))
+    ,("AFP_W.takeFileName (\"test/\") == (\"\")", property $ AFP_W.takeFileName ("test/") == (""))
+    ,("isSuffixOf (P.takeFileName x) x", property $ \(QFilePath x) -> isSuffixOf (P.takeFileName x) x)
+    ,("isSuffixOf (W.takeFileName x) x", property $ \(QFilePath x) -> isSuffixOf (W.takeFileName x) x)
+    ,("(\\(getPosixString -> x) (getPosixString -> y) -> SBS.isSuffixOf x y) (AFP_P.takeFileName x) x", property $ \(QFilePathAFP_P x) -> (\(getPosixString -> x) (getPosixString -> y) -> SBS.isSuffixOf x y) (AFP_P.takeFileName x) x)
+    ,("(\\(getWindowsString -> x) (getWindowsString -> y) -> SBS16.isSuffixOf x y) (AFP_W.takeFileName x) x", property $ \(QFilePathAFP_W x) -> (\(getWindowsString -> x) (getWindowsString -> y) -> SBS16.isSuffixOf x y) (AFP_W.takeFileName x) x)
+    ,("P.takeFileName x == snd (P.splitFileName x)", property $ \(QFilePath x) -> P.takeFileName x == snd (P.splitFileName x))
+    ,("W.takeFileName x == snd (W.splitFileName x)", property $ \(QFilePath x) -> W.takeFileName x == snd (W.splitFileName x))
+    ,("AFP_P.takeFileName x == snd (AFP_P.splitFileName x)", property $ \(QFilePathAFP_P x) -> AFP_P.takeFileName x == snd (AFP_P.splitFileName x))
+    ,("AFP_W.takeFileName x == snd (AFP_W.splitFileName x)", property $ \(QFilePathAFP_W x) -> AFP_W.takeFileName x == snd (AFP_W.splitFileName x))
+    ,("P.takeFileName (P.replaceFileName x \"fred\") == \"fred\"", property $ \(QFilePathValidP x) -> P.takeFileName (P.replaceFileName x "fred") == "fred")
+    ,("W.takeFileName (W.replaceFileName x \"fred\") == \"fred\"", property $ \(QFilePathValidW x) -> W.takeFileName (W.replaceFileName x "fred") == "fred")
+    ,("AFP_P.takeFileName (AFP_P.replaceFileName x (\"fred\")) == (\"fred\")", property $ \(QFilePathValidAFP_P x) -> AFP_P.takeFileName (AFP_P.replaceFileName x ("fred")) == ("fred"))
+    ,("AFP_W.takeFileName (AFP_W.replaceFileName x (\"fred\")) == (\"fred\")", property $ \(QFilePathValidAFP_W x) -> AFP_W.takeFileName (AFP_W.replaceFileName x ("fred")) == ("fred"))
+    ,("P.takeFileName (x P.</> \"fred\") == \"fred\"", property $ \(QFilePathValidP x) -> P.takeFileName (x P.</> "fred") == "fred")
+    ,("W.takeFileName (x W.</> \"fred\") == \"fred\"", property $ \(QFilePathValidW x) -> W.takeFileName (x W.</> "fred") == "fred")
+    ,("AFP_P.takeFileName (x AFP_P.</> (\"fred\")) == (\"fred\")", property $ \(QFilePathValidAFP_P x) -> AFP_P.takeFileName (x AFP_P.</> ("fred")) == ("fred"))
+    ,("AFP_W.takeFileName (x AFP_W.</> (\"fred\")) == (\"fred\")", property $ \(QFilePathValidAFP_W x) -> AFP_W.takeFileName (x AFP_W.</> ("fred")) == ("fred"))
+    ,("P.isRelative (P.takeFileName x)", property $ \(QFilePathValidP x) -> P.isRelative (P.takeFileName x))
+    ,("W.isRelative (W.takeFileName x)", property $ \(QFilePathValidW x) -> W.isRelative (W.takeFileName x))
+    ,("AFP_P.isRelative (AFP_P.takeFileName x)", property $ \(QFilePathValidAFP_P x) -> AFP_P.isRelative (AFP_P.takeFileName x))
+    ,("AFP_W.isRelative (AFP_W.takeFileName x)", property $ \(QFilePathValidAFP_W x) -> AFP_W.isRelative (AFP_W.takeFileName x))
+    ,("P.takeBaseName \"/directory/file.ext\" == \"file\"", property $ P.takeBaseName "/directory/file.ext" == "file")
+    ,("W.takeBaseName \"/directory/file.ext\" == \"file\"", property $ W.takeBaseName "/directory/file.ext" == "file")
+    ,("AFP_P.takeBaseName (\"/directory/file.ext\") == (\"file\")", property $ AFP_P.takeBaseName ("/directory/file.ext") == ("file"))
+    ,("AFP_W.takeBaseName (\"/directory/file.ext\") == (\"file\")", property $ AFP_W.takeBaseName ("/directory/file.ext") == ("file"))
+    ,("P.takeBaseName \"file/test.txt\" == \"test\"", property $ P.takeBaseName "file/test.txt" == "test")
+    ,("W.takeBaseName \"file/test.txt\" == \"test\"", property $ W.takeBaseName "file/test.txt" == "test")
+    ,("AFP_P.takeBaseName (\"file/test.txt\") == (\"test\")", property $ AFP_P.takeBaseName ("file/test.txt") == ("test"))
+    ,("AFP_W.takeBaseName (\"file/test.txt\") == (\"test\")", property $ AFP_W.takeBaseName ("file/test.txt") == ("test"))
+    ,("P.takeBaseName \"dave.ext\" == \"dave\"", property $ P.takeBaseName "dave.ext" == "dave")
+    ,("W.takeBaseName \"dave.ext\" == \"dave\"", property $ W.takeBaseName "dave.ext" == "dave")
+    ,("AFP_P.takeBaseName (\"dave.ext\") == (\"dave\")", property $ AFP_P.takeBaseName ("dave.ext") == ("dave"))
+    ,("AFP_W.takeBaseName (\"dave.ext\") == (\"dave\")", property $ AFP_W.takeBaseName ("dave.ext") == ("dave"))
+    ,("P.takeBaseName \"\" == \"\"", property $ P.takeBaseName "" == "")
+    ,("W.takeBaseName \"\" == \"\"", property $ W.takeBaseName "" == "")
+    ,("AFP_P.takeBaseName (\"\") == (\"\")", property $ AFP_P.takeBaseName ("") == (""))
+    ,("AFP_W.takeBaseName (\"\") == (\"\")", property $ AFP_W.takeBaseName ("") == (""))
+    ,("P.takeBaseName \"test\" == \"test\"", property $ P.takeBaseName "test" == "test")
+    ,("W.takeBaseName \"test\" == \"test\"", property $ W.takeBaseName "test" == "test")
+    ,("AFP_P.takeBaseName (\"test\") == (\"test\")", property $ AFP_P.takeBaseName ("test") == ("test"))
+    ,("AFP_W.takeBaseName (\"test\") == (\"test\")", property $ AFP_W.takeBaseName ("test") == ("test"))
+    ,("P.takeBaseName (P.addTrailingPathSeparator x) == \"\"", property $ \(QFilePath x) -> P.takeBaseName (P.addTrailingPathSeparator x) == "")
+    ,("W.takeBaseName (W.addTrailingPathSeparator x) == \"\"", property $ \(QFilePath x) -> W.takeBaseName (W.addTrailingPathSeparator x) == "")
+    ,("AFP_P.takeBaseName (AFP_P.addTrailingPathSeparator x) == (\"\")", property $ \(QFilePathAFP_P x) -> AFP_P.takeBaseName (AFP_P.addTrailingPathSeparator x) == (""))
+    ,("AFP_W.takeBaseName (AFP_W.addTrailingPathSeparator x) == (\"\")", property $ \(QFilePathAFP_W x) -> AFP_W.takeBaseName (AFP_W.addTrailingPathSeparator x) == (""))
+    ,("P.takeBaseName \"file/file.tar.gz\" == \"file.tar\"", property $ P.takeBaseName "file/file.tar.gz" == "file.tar")
+    ,("W.takeBaseName \"file/file.tar.gz\" == \"file.tar\"", property $ W.takeBaseName "file/file.tar.gz" == "file.tar")
+    ,("AFP_P.takeBaseName (\"file/file.tar.gz\") == (\"file.tar\")", property $ AFP_P.takeBaseName ("file/file.tar.gz") == ("file.tar"))
+    ,("AFP_W.takeBaseName (\"file/file.tar.gz\") == (\"file.tar\")", property $ AFP_W.takeBaseName ("file/file.tar.gz") == ("file.tar"))
+    ,("P.replaceBaseName \"/directory/other.ext\" \"file\" == \"/directory/file.ext\"", property $ P.replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext")
+    ,("W.replaceBaseName \"/directory/other.ext\" \"file\" == \"/directory/file.ext\"", property $ W.replaceBaseName "/directory/other.ext" "file" == "/directory/file.ext")
+    ,("AFP_P.replaceBaseName (\"/directory/other.ext\") (\"file\") == (\"/directory/file.ext\")", property $ AFP_P.replaceBaseName ("/directory/other.ext") ("file") == ("/directory/file.ext"))
+    ,("AFP_W.replaceBaseName (\"/directory/other.ext\") (\"file\") == (\"/directory/file.ext\")", property $ AFP_W.replaceBaseName ("/directory/other.ext") ("file") == ("/directory/file.ext"))
+    ,("P.replaceBaseName \"file/test.txt\" \"bob\" == \"file/bob.txt\"", property $ P.replaceBaseName "file/test.txt" "bob" == "file/bob.txt")
+    ,("W.replaceBaseName \"file/test.txt\" \"bob\" == \"file/bob.txt\"", property $ W.replaceBaseName "file/test.txt" "bob" == "file/bob.txt")
+    ,("AFP_P.replaceBaseName (\"file/test.txt\") (\"bob\") == (\"file/bob.txt\")", property $ AFP_P.replaceBaseName ("file/test.txt") ("bob") == ("file/bob.txt"))
+    ,("AFP_W.replaceBaseName (\"file/test.txt\") (\"bob\") == (\"file/bob.txt\")", property $ AFP_W.replaceBaseName ("file/test.txt") ("bob") == ("file/bob.txt"))
+    ,("P.replaceBaseName \"fred\" \"bill\" == \"bill\"", property $ P.replaceBaseName "fred" "bill" == "bill")
+    ,("W.replaceBaseName \"fred\" \"bill\" == \"bill\"", property $ W.replaceBaseName "fred" "bill" == "bill")
+    ,("AFP_P.replaceBaseName (\"fred\") (\"bill\") == (\"bill\")", property $ AFP_P.replaceBaseName ("fred") ("bill") == ("bill"))
+    ,("AFP_W.replaceBaseName (\"fred\") (\"bill\") == (\"bill\")", property $ AFP_W.replaceBaseName ("fred") ("bill") == ("bill"))
+    ,("P.replaceBaseName \"/dave/fred/bob.gz.tar\" \"new\" == \"/dave/fred/new.tar\"", property $ P.replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar")
+    ,("W.replaceBaseName \"/dave/fred/bob.gz.tar\" \"new\" == \"/dave/fred/new.tar\"", property $ W.replaceBaseName "/dave/fred/bob.gz.tar" "new" == "/dave/fred/new.tar")
+    ,("AFP_P.replaceBaseName (\"/dave/fred/bob.gz.tar\") (\"new\") == (\"/dave/fred/new.tar\")", property $ AFP_P.replaceBaseName ("/dave/fred/bob.gz.tar") ("new") == ("/dave/fred/new.tar"))
+    ,("AFP_W.replaceBaseName (\"/dave/fred/bob.gz.tar\") (\"new\") == (\"/dave/fred/new.tar\")", property $ AFP_W.replaceBaseName ("/dave/fred/bob.gz.tar") ("new") == ("/dave/fred/new.tar"))
+    ,("P.replaceBaseName x (P.takeBaseName x) == x", property $ \(QFilePathValidP x) -> P.replaceBaseName x (P.takeBaseName x) == x)
+    ,("W.replaceBaseName x (W.takeBaseName x) == x", property $ \(QFilePathValidW x) -> W.replaceBaseName x (W.takeBaseName x) == x)
+    ,("AFP_P.replaceBaseName x (AFP_P.takeBaseName x) == x", property $ \(QFilePathValidAFP_P x) -> AFP_P.replaceBaseName x (AFP_P.takeBaseName x) == x)
+    ,("AFP_W.replaceBaseName x (AFP_W.takeBaseName x) == x", property $ \(QFilePathValidAFP_W x) -> AFP_W.replaceBaseName x (AFP_W.takeBaseName x) == x)
+    ,("P.hasTrailingPathSeparator \"test\" == False", property $ P.hasTrailingPathSeparator "test" == False)
+    ,("W.hasTrailingPathSeparator \"test\" == False", property $ W.hasTrailingPathSeparator "test" == False)
+    ,("AFP_P.hasTrailingPathSeparator (\"test\") == False", property $ AFP_P.hasTrailingPathSeparator ("test") == False)
+    ,("AFP_W.hasTrailingPathSeparator (\"test\") == False", property $ AFP_W.hasTrailingPathSeparator ("test") == False)
+    ,("P.hasTrailingPathSeparator \"test/\" == True", property $ P.hasTrailingPathSeparator "test/" == True)
+    ,("W.hasTrailingPathSeparator \"test/\" == True", property $ W.hasTrailingPathSeparator "test/" == True)
+    ,("AFP_P.hasTrailingPathSeparator (\"test/\") == True", property $ AFP_P.hasTrailingPathSeparator ("test/") == True)
+    ,("AFP_W.hasTrailingPathSeparator (\"test/\") == True", property $ AFP_W.hasTrailingPathSeparator ("test/") == True)
+    ,("P.hasTrailingPathSeparator (P.addTrailingPathSeparator x)", property $ \(QFilePath x) -> P.hasTrailingPathSeparator (P.addTrailingPathSeparator x))
+    ,("W.hasTrailingPathSeparator (W.addTrailingPathSeparator x)", property $ \(QFilePath x) -> W.hasTrailingPathSeparator (W.addTrailingPathSeparator x))
+    ,("AFP_P.hasTrailingPathSeparator (AFP_P.addTrailingPathSeparator x)", property $ \(QFilePathAFP_P x) -> AFP_P.hasTrailingPathSeparator (AFP_P.addTrailingPathSeparator x))
+    ,("AFP_W.hasTrailingPathSeparator (AFP_W.addTrailingPathSeparator x)", property $ \(QFilePathAFP_W x) -> AFP_W.hasTrailingPathSeparator (AFP_W.addTrailingPathSeparator x))
+    ,("P.hasTrailingPathSeparator x ==> P.addTrailingPathSeparator x == x", property $ \(QFilePath x) -> P.hasTrailingPathSeparator x ==> P.addTrailingPathSeparator x == x)
+    ,("W.hasTrailingPathSeparator x ==> W.addTrailingPathSeparator x == x", property $ \(QFilePath x) -> W.hasTrailingPathSeparator x ==> W.addTrailingPathSeparator x == x)
+    ,("AFP_P.hasTrailingPathSeparator x ==> AFP_P.addTrailingPathSeparator x == x", property $ \(QFilePathAFP_P x) -> AFP_P.hasTrailingPathSeparator x ==> AFP_P.addTrailingPathSeparator x == x)
+    ,("AFP_W.hasTrailingPathSeparator x ==> AFP_W.addTrailingPathSeparator x == x", property $ \(QFilePathAFP_W x) -> AFP_W.hasTrailingPathSeparator x ==> AFP_W.addTrailingPathSeparator x == x)
+    ,("P.addTrailingPathSeparator \"test/rest\" == \"test/rest/\"", property $ P.addTrailingPathSeparator "test/rest" == "test/rest/")
+    ,("AFP_P.addTrailingPathSeparator (\"test/rest\") == (\"test/rest/\")", property $ AFP_P.addTrailingPathSeparator ("test/rest") == ("test/rest/"))
+    ,("P.dropTrailingPathSeparator \"file/test/\" == \"file/test\"", property $ P.dropTrailingPathSeparator "file/test/" == "file/test")
+    ,("W.dropTrailingPathSeparator \"file/test/\" == \"file/test\"", property $ W.dropTrailingPathSeparator "file/test/" == "file/test")
+    ,("AFP_P.dropTrailingPathSeparator (\"file/test/\") == (\"file/test\")", property $ AFP_P.dropTrailingPathSeparator ("file/test/") == ("file/test"))
+    ,("AFP_W.dropTrailingPathSeparator (\"file/test/\") == (\"file/test\")", property $ AFP_W.dropTrailingPathSeparator ("file/test/") == ("file/test"))
+    ,("P.dropTrailingPathSeparator \"/\" == \"/\"", property $ P.dropTrailingPathSeparator "/" == "/")
+    ,("W.dropTrailingPathSeparator \"/\" == \"/\"", property $ W.dropTrailingPathSeparator "/" == "/")
+    ,("AFP_P.dropTrailingPathSeparator (\"/\") == (\"/\")", property $ AFP_P.dropTrailingPathSeparator ("/") == ("/"))
+    ,("AFP_W.dropTrailingPathSeparator (\"/\") == (\"/\")", property $ AFP_W.dropTrailingPathSeparator ("/") == ("/"))
+    ,("W.dropTrailingPathSeparator \"\\\\\" == \"\\\\\"", property $ W.dropTrailingPathSeparator "\\" == "\\")
+    ,("AFP_W.dropTrailingPathSeparator (\"\\\\\") == (\"\\\\\")", property $ AFP_W.dropTrailingPathSeparator ("\\") == ("\\"))
+    ,("not (P.hasTrailingPathSeparator (P.dropTrailingPathSeparator x)) || P.isDrive x", property $ \(QFilePath x) -> not (P.hasTrailingPathSeparator (P.dropTrailingPathSeparator x)) || P.isDrive x)
+    ,("not (AFP_P.hasTrailingPathSeparator (AFP_P.dropTrailingPathSeparator x)) || AFP_P.isDrive x", property $ \(QFilePathAFP_P x) -> not (AFP_P.hasTrailingPathSeparator (AFP_P.dropTrailingPathSeparator x)) || AFP_P.isDrive x)
+    ,("P.takeDirectory \"/directory/other.ext\" == \"/directory\"", property $ P.takeDirectory "/directory/other.ext" == "/directory")
+    ,("W.takeDirectory \"/directory/other.ext\" == \"/directory\"", property $ W.takeDirectory "/directory/other.ext" == "/directory")
+    ,("AFP_P.takeDirectory (\"/directory/other.ext\") == (\"/directory\")", property $ AFP_P.takeDirectory ("/directory/other.ext") == ("/directory"))
+    ,("AFP_W.takeDirectory (\"/directory/other.ext\") == (\"/directory\")", property $ AFP_W.takeDirectory ("/directory/other.ext") == ("/directory"))
+    ,("isPrefixOf (P.takeDirectory x) x || P.takeDirectory x == \".\"", property $ \(QFilePath x) -> isPrefixOf (P.takeDirectory x) x || P.takeDirectory x == ".")
+    ,("isPrefixOf (W.takeDirectory x) x || W.takeDirectory x == \".\"", property $ \(QFilePath x) -> isPrefixOf (W.takeDirectory x) x || W.takeDirectory x == ".")
+    ,("(\\(getPosixString -> x) (getPosixString -> y) -> SBS.isPrefixOf x y) (AFP_P.takeDirectory x) x || AFP_P.takeDirectory x == (\".\")", property $ \(QFilePathAFP_P x) -> (\(getPosixString -> x) (getPosixString -> y) -> SBS.isPrefixOf x y) (AFP_P.takeDirectory x) x || AFP_P.takeDirectory x == ("."))
+    ,("(\\(getWindowsString -> x) (getWindowsString -> y) -> SBS16.isPrefixOf x y) (AFP_W.takeDirectory x) x || AFP_W.takeDirectory x == (\".\")", property $ \(QFilePathAFP_W x) -> (\(getWindowsString -> x) (getWindowsString -> y) -> SBS16.isPrefixOf x y) (AFP_W.takeDirectory x) x || AFP_W.takeDirectory x == ("."))
+    ,("P.takeDirectory \"foo\" == \".\"", property $ P.takeDirectory "foo" == ".")
+    ,("W.takeDirectory \"foo\" == \".\"", property $ W.takeDirectory "foo" == ".")
+    ,("AFP_P.takeDirectory (\"foo\") == (\".\")", property $ AFP_P.takeDirectory ("foo") == ("."))
+    ,("AFP_W.takeDirectory (\"foo\") == (\".\")", property $ AFP_W.takeDirectory ("foo") == ("."))
+    ,("P.takeDirectory \"/\" == \"/\"", property $ P.takeDirectory "/" == "/")
+    ,("W.takeDirectory \"/\" == \"/\"", property $ W.takeDirectory "/" == "/")
+    ,("AFP_P.takeDirectory (\"/\") == (\"/\")", property $ AFP_P.takeDirectory ("/") == ("/"))
+    ,("AFP_W.takeDirectory (\"/\") == (\"/\")", property $ AFP_W.takeDirectory ("/") == ("/"))
+    ,("P.takeDirectory \"/foo\" == \"/\"", property $ P.takeDirectory "/foo" == "/")
+    ,("W.takeDirectory \"/foo\" == \"/\"", property $ W.takeDirectory "/foo" == "/")
+    ,("AFP_P.takeDirectory (\"/foo\") == (\"/\")", property $ AFP_P.takeDirectory ("/foo") == ("/"))
+    ,("AFP_W.takeDirectory (\"/foo\") == (\"/\")", property $ AFP_W.takeDirectory ("/foo") == ("/"))
+    ,("P.takeDirectory \"/foo/bar/baz\" == \"/foo/bar\"", property $ P.takeDirectory "/foo/bar/baz" == "/foo/bar")
+    ,("W.takeDirectory \"/foo/bar/baz\" == \"/foo/bar\"", property $ W.takeDirectory "/foo/bar/baz" == "/foo/bar")
+    ,("AFP_P.takeDirectory (\"/foo/bar/baz\") == (\"/foo/bar\")", property $ AFP_P.takeDirectory ("/foo/bar/baz") == ("/foo/bar"))
+    ,("AFP_W.takeDirectory (\"/foo/bar/baz\") == (\"/foo/bar\")", property $ AFP_W.takeDirectory ("/foo/bar/baz") == ("/foo/bar"))
+    ,("P.takeDirectory \"/foo/bar/baz/\" == \"/foo/bar/baz\"", property $ P.takeDirectory "/foo/bar/baz/" == "/foo/bar/baz")
+    ,("W.takeDirectory \"/foo/bar/baz/\" == \"/foo/bar/baz\"", property $ W.takeDirectory "/foo/bar/baz/" == "/foo/bar/baz")
+    ,("AFP_P.takeDirectory (\"/foo/bar/baz/\") == (\"/foo/bar/baz\")", property $ AFP_P.takeDirectory ("/foo/bar/baz/") == ("/foo/bar/baz"))
+    ,("AFP_W.takeDirectory (\"/foo/bar/baz/\") == (\"/foo/bar/baz\")", property $ AFP_W.takeDirectory ("/foo/bar/baz/") == ("/foo/bar/baz"))
+    ,("P.takeDirectory \"foo/bar/baz\" == \"foo/bar\"", property $ P.takeDirectory "foo/bar/baz" == "foo/bar")
+    ,("W.takeDirectory \"foo/bar/baz\" == \"foo/bar\"", property $ W.takeDirectory "foo/bar/baz" == "foo/bar")
+    ,("AFP_P.takeDirectory (\"foo/bar/baz\") == (\"foo/bar\")", property $ AFP_P.takeDirectory ("foo/bar/baz") == ("foo/bar"))
+    ,("AFP_W.takeDirectory (\"foo/bar/baz\") == (\"foo/bar\")", property $ AFP_W.takeDirectory ("foo/bar/baz") == ("foo/bar"))
+    ,("W.takeDirectory \"foo\\\\bar\" == \"foo\"", property $ W.takeDirectory "foo\\bar" == "foo")
+    ,("AFP_W.takeDirectory (\"foo\\\\bar\") == (\"foo\")", property $ AFP_W.takeDirectory ("foo\\bar") == ("foo"))
+    ,("W.takeDirectory \"foo\\\\bar\\\\\\\\\" == \"foo\\\\bar\"", property $ W.takeDirectory "foo\\bar\\\\" == "foo\\bar")
+    ,("AFP_W.takeDirectory (\"foo\\\\bar\\\\\\\\\") == (\"foo\\\\bar\")", property $ AFP_W.takeDirectory ("foo\\bar\\\\") == ("foo\\bar"))
+    ,("W.takeDirectory \"C:\\\\\" == \"C:\\\\\"", property $ W.takeDirectory "C:\\" == "C:\\")
+    ,("AFP_W.takeDirectory (\"C:\\\\\") == (\"C:\\\\\")", property $ AFP_W.takeDirectory ("C:\\") == ("C:\\"))
+    ,("P.replaceDirectory \"root/file.ext\" \"/directory/\" == \"/directory/file.ext\"", property $ P.replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext")
+    ,("W.replaceDirectory \"root/file.ext\" \"/directory/\" == \"/directory/file.ext\"", property $ W.replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext")
+    ,("AFP_P.replaceDirectory (\"root/file.ext\") (\"/directory/\") == (\"/directory/file.ext\")", property $ AFP_P.replaceDirectory ("root/file.ext") ("/directory/") == ("/directory/file.ext"))
+    ,("AFP_W.replaceDirectory (\"root/file.ext\") (\"/directory/\") == (\"/directory/file.ext\")", property $ AFP_W.replaceDirectory ("root/file.ext") ("/directory/") == ("/directory/file.ext"))
+    ,("P.replaceDirectory x (P.takeDirectory x) `P.equalFilePath` x", property $ \(QFilePathValidP x) -> P.replaceDirectory x (P.takeDirectory x) `P.equalFilePath` x)
+    ,("W.replaceDirectory x (W.takeDirectory x) `W.equalFilePath` x", property $ \(QFilePathValidW x) -> W.replaceDirectory x (W.takeDirectory x) `W.equalFilePath` x)
+    ,("AFP_P.replaceDirectory x (AFP_P.takeDirectory x) `AFP_P.equalFilePath` x", property $ \(QFilePathValidAFP_P x) -> AFP_P.replaceDirectory x (AFP_P.takeDirectory x) `AFP_P.equalFilePath` x)
+    ,("AFP_W.replaceDirectory x (AFP_W.takeDirectory x) `AFP_W.equalFilePath` x", property $ \(QFilePathValidAFP_W x) -> AFP_W.replaceDirectory x (AFP_W.takeDirectory x) `AFP_W.equalFilePath` x)
+    ,("\"/directory\" P.</> \"file.ext\" == \"/directory/file.ext\"", property $ "/directory" P.</> "file.ext" == "/directory/file.ext")
+    ,("(\"/directory\") AFP_P.</> (\"file.ext\") == (\"/directory/file.ext\")", property $ ("/directory") AFP_P.</> ("file.ext") == ("/directory/file.ext"))
+    ,("\"/directory\" W.</> \"file.ext\" == \"/directory\\\\file.ext\"", property $ "/directory" W.</> "file.ext" == "/directory\\file.ext")
+    ,("(\"/directory\") AFP_W.</> (\"file.ext\") == (\"/directory\\\\file.ext\")", property $ ("/directory") AFP_W.</> ("file.ext") == ("/directory\\file.ext"))
+    ,("\"directory\" P.</> \"/file.ext\" == \"/file.ext\"", property $ "directory" P.</> "/file.ext" == "/file.ext")
+    ,("\"directory\" W.</> \"/file.ext\" == \"/file.ext\"", property $ "directory" W.</> "/file.ext" == "/file.ext")
+    ,("(\"directory\") AFP_P.</> (\"/file.ext\") == (\"/file.ext\")", property $ ("directory") AFP_P.</> ("/file.ext") == ("/file.ext"))
+    ,("(\"directory\") AFP_W.</> (\"/file.ext\") == (\"/file.ext\")", property $ ("directory") AFP_W.</> ("/file.ext") == ("/file.ext"))
+    ,("(P.takeDirectory x P.</> P.takeFileName x) `P.equalFilePath` x", property $ \(QFilePathValidP x) -> (P.takeDirectory x P.</> P.takeFileName x) `P.equalFilePath` x)
+    ,("(W.takeDirectory x W.</> W.takeFileName x) `W.equalFilePath` x", property $ \(QFilePathValidW x) -> (W.takeDirectory x W.</> W.takeFileName x) `W.equalFilePath` x)
+    ,("(AFP_P.takeDirectory x AFP_P.</> AFP_P.takeFileName x) `AFP_P.equalFilePath` x", property $ \(QFilePathValidAFP_P x) -> (AFP_P.takeDirectory x AFP_P.</> AFP_P.takeFileName x) `AFP_P.equalFilePath` x)
+    ,("(AFP_W.takeDirectory x AFP_W.</> AFP_W.takeFileName x) `AFP_W.equalFilePath` x", property $ \(QFilePathValidAFP_W x) -> (AFP_W.takeDirectory x AFP_W.</> AFP_W.takeFileName x) `AFP_W.equalFilePath` x)
+    ,("\"/\" P.</> \"test\" == \"/test\"", property $ "/" P.</> "test" == "/test")
+    ,("(\"/\") AFP_P.</> (\"test\") == (\"/test\")", property $ ("/") AFP_P.</> ("test") == ("/test"))
+    ,("\"home\" P.</> \"bob\" == \"home/bob\"", property $ "home" P.</> "bob" == "home/bob")
+    ,("(\"home\") AFP_P.</> (\"bob\") == (\"home/bob\")", property $ ("home") AFP_P.</> ("bob") == ("home/bob"))
+    ,("\"x:\" P.</> \"foo\" == \"x:/foo\"", property $ "x:" P.</> "foo" == "x:/foo")
+    ,("(\"x:\") AFP_P.</> (\"foo\") == (\"x:/foo\")", property $ ("x:") AFP_P.</> ("foo") == ("x:/foo"))
+    ,("\"C:\\\\foo\" W.</> \"bar\" == \"C:\\\\foo\\\\bar\"", property $ "C:\\foo" W.</> "bar" == "C:\\foo\\bar")
+    ,("(\"C:\\\\foo\") AFP_W.</> (\"bar\") == (\"C:\\\\foo\\\\bar\")", property $ ("C:\\foo") AFP_W.</> ("bar") == ("C:\\foo\\bar"))
+    ,("\"home\" W.</> \"bob\" == \"home\\\\bob\"", property $ "home" W.</> "bob" == "home\\bob")
+    ,("(\"home\") AFP_W.</> (\"bob\") == (\"home\\\\bob\")", property $ ("home") AFP_W.</> ("bob") == ("home\\bob"))
+    ,("\"home\" P.</> \"/bob\" == \"/bob\"", property $ "home" P.</> "/bob" == "/bob")
+    ,("(\"home\") AFP_P.</> (\"/bob\") == (\"/bob\")", property $ ("home") AFP_P.</> ("/bob") == ("/bob"))
+    ,("\"home\" W.</> \"C:\\\\bob\" == \"C:\\\\bob\"", property $ "home" W.</> "C:\\bob" == "C:\\bob")
+    ,("(\"home\") AFP_W.</> (\"C:\\\\bob\") == (\"C:\\\\bob\")", property $ ("home") AFP_W.</> ("C:\\bob") == ("C:\\bob"))
+    ,("\"home\" W.</> \"/bob\" == \"/bob\"", property $ "home" W.</> "/bob" == "/bob")
+    ,("(\"home\") AFP_W.</> (\"/bob\") == (\"/bob\")", property $ ("home") AFP_W.</> ("/bob") == ("/bob"))
+    ,("\"home\" W.</> \"\\\\bob\" == \"\\\\bob\"", property $ "home" W.</> "\\bob" == "\\bob")
+    ,("(\"home\") AFP_W.</> (\"\\\\bob\") == (\"\\\\bob\")", property $ ("home") AFP_W.</> ("\\bob") == ("\\bob"))
+    ,("\"C:\\\\home\" W.</> \"\\\\bob\" == \"\\\\bob\"", property $ "C:\\home" W.</> "\\bob" == "\\bob")
+    ,("(\"C:\\\\home\") AFP_W.</> (\"\\\\bob\") == (\"\\\\bob\")", property $ ("C:\\home") AFP_W.</> ("\\bob") == ("\\bob"))
+    ,("\"D:\\\\foo\" W.</> \"C:bar\" == \"C:bar\"", property $ "D:\\foo" W.</> "C:bar" == "C:bar")
+    ,("(\"D:\\\\foo\") AFP_W.</> (\"C:bar\") == (\"C:bar\")", property $ ("D:\\foo") AFP_W.</> ("C:bar") == ("C:bar"))
+    ,("\"C:\\\\foo\" W.</> \"C:bar\" == \"C:bar\"", property $ "C:\\foo" W.</> "C:bar" == "C:bar")
+    ,("(\"C:\\\\foo\") AFP_W.</> (\"C:bar\") == (\"C:bar\")", property $ ("C:\\foo") AFP_W.</> ("C:bar") == ("C:bar"))
+    ,("P.splitPath \"/directory/file.ext\" == [\"/\", \"directory/\", \"file.ext\"]", property $ P.splitPath "/directory/file.ext" == ["/", "directory/", "file.ext"])
+    ,("W.splitPath \"/directory/file.ext\" == [\"/\", \"directory/\", \"file.ext\"]", property $ W.splitPath "/directory/file.ext" == ["/", "directory/", "file.ext"])
+    ,("AFP_P.splitPath (\"/directory/file.ext\") == [(\"/\"), (\"directory/\"), (\"file.ext\")]", property $ AFP_P.splitPath ("/directory/file.ext") == [("/"), ("directory/"), ("file.ext")])
+    ,("AFP_W.splitPath (\"/directory/file.ext\") == [(\"/\"), (\"directory/\"), (\"file.ext\")]", property $ AFP_W.splitPath ("/directory/file.ext") == [("/"), ("directory/"), ("file.ext")])
+    ,("concat (P.splitPath x) == x", property $ \(QFilePath x) -> concat (P.splitPath x) == x)
+    ,("concat (W.splitPath x) == x", property $ \(QFilePath x) -> concat (W.splitPath x) == x)
+    ,("(PS . SBS.concat . fmap getPosixString) (AFP_P.splitPath x) == x", property $ \(QFilePathAFP_P x) -> (PS . SBS.concat . fmap getPosixString) (AFP_P.splitPath x) == x)
+    ,("(WS . SBS16.concat . fmap getWindowsString) (AFP_W.splitPath x) == x", property $ \(QFilePathAFP_W x) -> (WS . SBS16.concat . fmap getWindowsString) (AFP_W.splitPath x) == x)
+    ,("P.splitPath \"test//item/\" == [\"test//\", \"item/\"]", property $ P.splitPath "test//item/" == ["test//", "item/"])
+    ,("W.splitPath \"test//item/\" == [\"test//\", \"item/\"]", property $ W.splitPath "test//item/" == ["test//", "item/"])
+    ,("AFP_P.splitPath (\"test//item/\") == [(\"test//\"), (\"item/\")]", property $ AFP_P.splitPath ("test//item/") == [("test//"), ("item/")])
+    ,("AFP_W.splitPath (\"test//item/\") == [(\"test//\"), (\"item/\")]", property $ AFP_W.splitPath ("test//item/") == [("test//"), ("item/")])
+    ,("P.splitPath \"test/item/file\" == [\"test/\", \"item/\", \"file\"]", property $ P.splitPath "test/item/file" == ["test/", "item/", "file"])
+    ,("W.splitPath \"test/item/file\" == [\"test/\", \"item/\", \"file\"]", property $ W.splitPath "test/item/file" == ["test/", "item/", "file"])
+    ,("AFP_P.splitPath (\"test/item/file\") == [(\"test/\"), (\"item/\"), (\"file\")]", property $ AFP_P.splitPath ("test/item/file") == [("test/"), ("item/"), ("file")])
+    ,("AFP_W.splitPath (\"test/item/file\") == [(\"test/\"), (\"item/\"), (\"file\")]", property $ AFP_W.splitPath ("test/item/file") == [("test/"), ("item/"), ("file")])
+    ,("P.splitPath \"\" == []", property $ P.splitPath "" == [])
+    ,("W.splitPath \"\" == []", property $ W.splitPath "" == [])
+    ,("AFP_P.splitPath (\"\") == []", property $ AFP_P.splitPath ("") == [])
+    ,("AFP_W.splitPath (\"\") == []", property $ AFP_W.splitPath ("") == [])
+    ,("W.splitPath \"c:\\\\test\\\\path\" == [\"c:\\\\\", \"test\\\\\", \"path\"]", property $ W.splitPath "c:\\test\\path" == ["c:\\", "test\\", "path"])
+    ,("AFP_W.splitPath (\"c:\\\\test\\\\path\") == [(\"c:\\\\\"), (\"test\\\\\"), (\"path\")]", property $ AFP_W.splitPath ("c:\\test\\path") == [("c:\\"), ("test\\"), ("path")])
+    ,("P.splitPath \"/file/test\" == [\"/\", \"file/\", \"test\"]", property $ P.splitPath "/file/test" == ["/", "file/", "test"])
+    ,("AFP_P.splitPath (\"/file/test\") == [(\"/\"), (\"file/\"), (\"test\")]", property $ AFP_P.splitPath ("/file/test") == [("/"), ("file/"), ("test")])
+    ,("P.splitDirectories \"/directory/file.ext\" == [\"/\", \"directory\", \"file.ext\"]", property $ P.splitDirectories "/directory/file.ext" == ["/", "directory", "file.ext"])
+    ,("W.splitDirectories \"/directory/file.ext\" == [\"/\", \"directory\", \"file.ext\"]", property $ W.splitDirectories "/directory/file.ext" == ["/", "directory", "file.ext"])
+    ,("AFP_P.splitDirectories (\"/directory/file.ext\") == [(\"/\"), (\"directory\"), (\"file.ext\")]", property $ AFP_P.splitDirectories ("/directory/file.ext") == [("/"), ("directory"), ("file.ext")])
+    ,("AFP_W.splitDirectories (\"/directory/file.ext\") == [(\"/\"), (\"directory\"), (\"file.ext\")]", property $ AFP_W.splitDirectories ("/directory/file.ext") == [("/"), ("directory"), ("file.ext")])
+    ,("P.splitDirectories \"test/file\" == [\"test\", \"file\"]", property $ P.splitDirectories "test/file" == ["test", "file"])
+    ,("W.splitDirectories \"test/file\" == [\"test\", \"file\"]", property $ W.splitDirectories "test/file" == ["test", "file"])
+    ,("AFP_P.splitDirectories (\"test/file\") == [(\"test\"), (\"file\")]", property $ AFP_P.splitDirectories ("test/file") == [("test"), ("file")])
+    ,("AFP_W.splitDirectories (\"test/file\") == [(\"test\"), (\"file\")]", property $ AFP_W.splitDirectories ("test/file") == [("test"), ("file")])
+    ,("P.splitDirectories \"/test/file\" == [\"/\", \"test\", \"file\"]", property $ P.splitDirectories "/test/file" == ["/", "test", "file"])
+    ,("W.splitDirectories \"/test/file\" == [\"/\", \"test\", \"file\"]", property $ W.splitDirectories "/test/file" == ["/", "test", "file"])
+    ,("AFP_P.splitDirectories (\"/test/file\") == [(\"/\"), (\"test\"), (\"file\")]", property $ AFP_P.splitDirectories ("/test/file") == [("/"), ("test"), ("file")])
+    ,("AFP_W.splitDirectories (\"/test/file\") == [(\"/\"), (\"test\"), (\"file\")]", property $ AFP_W.splitDirectories ("/test/file") == [("/"), ("test"), ("file")])
+    ,("W.splitDirectories \"C:\\\\test\\\\file\" == [\"C:\\\\\", \"test\", \"file\"]", property $ W.splitDirectories "C:\\test\\file" == ["C:\\", "test", "file"])
+    ,("AFP_W.splitDirectories (\"C:\\\\test\\\\file\") == [(\"C:\\\\\"), (\"test\"), (\"file\")]", property $ AFP_W.splitDirectories ("C:\\test\\file") == [("C:\\"), ("test"), ("file")])
+    ,("P.joinPath (P.splitDirectories x) `P.equalFilePath` x", property $ \(QFilePathValidP x) -> P.joinPath (P.splitDirectories x) `P.equalFilePath` x)
+    ,("W.joinPath (W.splitDirectories x) `W.equalFilePath` x", property $ \(QFilePathValidW x) -> W.joinPath (W.splitDirectories x) `W.equalFilePath` x)
+    ,("AFP_P.joinPath (AFP_P.splitDirectories x) `AFP_P.equalFilePath` x", property $ \(QFilePathValidAFP_P x) -> AFP_P.joinPath (AFP_P.splitDirectories x) `AFP_P.equalFilePath` x)
+    ,("AFP_W.joinPath (AFP_W.splitDirectories x) `AFP_W.equalFilePath` x", property $ \(QFilePathValidAFP_W x) -> AFP_W.joinPath (AFP_W.splitDirectories x) `AFP_W.equalFilePath` x)
+    ,("P.splitDirectories \"\" == []", property $ P.splitDirectories "" == [])
+    ,("W.splitDirectories \"\" == []", property $ W.splitDirectories "" == [])
+    ,("AFP_P.splitDirectories (\"\") == []", property $ AFP_P.splitDirectories ("") == [])
+    ,("AFP_W.splitDirectories (\"\") == []", property $ AFP_W.splitDirectories ("") == [])
+    ,("W.splitDirectories \"C:\\\\test\\\\\\\\\\\\file\" == [\"C:\\\\\", \"test\", \"file\"]", property $ W.splitDirectories "C:\\test\\\\\\file" == ["C:\\", "test", "file"])
+    ,("AFP_W.splitDirectories (\"C:\\\\test\\\\\\\\\\\\file\") == [(\"C:\\\\\"), (\"test\"), (\"file\")]", property $ AFP_W.splitDirectories ("C:\\test\\\\\\file") == [("C:\\"), ("test"), ("file")])
+    ,("P.splitDirectories \"/test///file\" == [\"/\", \"test\", \"file\"]", property $ P.splitDirectories "/test///file" == ["/", "test", "file"])
+    ,("W.splitDirectories \"/test///file\" == [\"/\", \"test\", \"file\"]", property $ W.splitDirectories "/test///file" == ["/", "test", "file"])
+    ,("AFP_P.splitDirectories (\"/test///file\") == [(\"/\"), (\"test\"), (\"file\")]", property $ AFP_P.splitDirectories ("/test///file") == [("/"), ("test"), ("file")])
+    ,("AFP_W.splitDirectories (\"/test///file\") == [(\"/\"), (\"test\"), (\"file\")]", property $ AFP_W.splitDirectories ("/test///file") == [("/"), ("test"), ("file")])
+    ,("P.joinPath z == foldr (P.</>) \"\" z", property $ \z -> P.joinPath z == foldr (P.</>) "" z)
+    ,("W.joinPath z == foldr (W.</>) \"\" z", property $ \z -> W.joinPath z == foldr (W.</>) "" z)
+    ,("AFP_P.joinPath z == foldr (AFP_P.</>) (\"\") z", property $ \(QFilePathsAFP_P z) -> AFP_P.joinPath z == foldr (AFP_P.</>) ("") z)
+    ,("AFP_W.joinPath z == foldr (AFP_W.</>) (\"\") z", property $ \(QFilePathsAFP_W z) -> AFP_W.joinPath z == foldr (AFP_W.</>) ("") z)
+    ,("P.joinPath [\"/\", \"directory/\", \"file.ext\"] == \"/directory/file.ext\"", property $ P.joinPath ["/", "directory/", "file.ext"] == "/directory/file.ext")
+    ,("W.joinPath [\"/\", \"directory/\", \"file.ext\"] == \"/directory/file.ext\"", property $ W.joinPath ["/", "directory/", "file.ext"] == "/directory/file.ext")
+    ,("AFP_P.joinPath [(\"/\"), (\"directory/\"), (\"file.ext\")] == (\"/directory/file.ext\")", property $ AFP_P.joinPath [("/"), ("directory/"), ("file.ext")] == ("/directory/file.ext"))
+    ,("AFP_W.joinPath [(\"/\"), (\"directory/\"), (\"file.ext\")] == (\"/directory/file.ext\")", property $ AFP_W.joinPath [("/"), ("directory/"), ("file.ext")] == ("/directory/file.ext"))
+    ,("P.joinPath (P.splitPath x) == x", property $ \(QFilePathValidP x) -> P.joinPath (P.splitPath x) == x)
+    ,("W.joinPath (W.splitPath x) == x", property $ \(QFilePathValidW x) -> W.joinPath (W.splitPath x) == x)
+    ,("AFP_P.joinPath (AFP_P.splitPath x) == x", property $ \(QFilePathValidAFP_P x) -> AFP_P.joinPath (AFP_P.splitPath x) == x)
+    ,("AFP_W.joinPath (AFP_W.splitPath x) == x", property $ \(QFilePathValidAFP_W x) -> AFP_W.joinPath (AFP_W.splitPath x) == x)
+    ,("P.joinPath [] == \"\"", property $ P.joinPath [] == "")
+    ,("W.joinPath [] == \"\"", property $ W.joinPath [] == "")
+    ,("AFP_P.joinPath [] == (\"\")", property $ AFP_P.joinPath [] == (""))
+    ,("AFP_W.joinPath [] == (\"\")", property $ AFP_W.joinPath [] == (""))
+    ,("P.joinPath [\"test\", \"file\", \"path\"] == \"test/file/path\"", property $ P.joinPath ["test", "file", "path"] == "test/file/path")
+    ,("AFP_P.joinPath [(\"test\"), (\"file\"), (\"path\")] == (\"test/file/path\")", property $ AFP_P.joinPath [("test"), ("file"), ("path")] == ("test/file/path"))
+    ,("x == y ==> P.equalFilePath x y", property $ \(QFilePath x) (QFilePath y) -> x == y ==> P.equalFilePath x y)
+    ,("x == y ==> W.equalFilePath x y", property $ \(QFilePath x) (QFilePath y) -> x == y ==> W.equalFilePath x y)
+    ,("x == y ==> AFP_P.equalFilePath x y", property $ \(QFilePathAFP_P x) (QFilePathAFP_P y) -> x == y ==> AFP_P.equalFilePath x y)
+    ,("x == y ==> AFP_W.equalFilePath x y", property $ \(QFilePathAFP_W x) (QFilePathAFP_W y) -> x == y ==> AFP_W.equalFilePath x y)
+    ,("P.normalise x == P.normalise y ==> P.equalFilePath x y", property $ \(QFilePath x) (QFilePath y) -> P.normalise x == P.normalise y ==> P.equalFilePath x y)
+    ,("W.normalise x == W.normalise y ==> W.equalFilePath x y", property $ \(QFilePath x) (QFilePath y) -> W.normalise x == W.normalise y ==> W.equalFilePath x y)
+    ,("AFP_P.normalise x == AFP_P.normalise y ==> AFP_P.equalFilePath x y", property $ \(QFilePathAFP_P x) (QFilePathAFP_P y) -> AFP_P.normalise x == AFP_P.normalise y ==> AFP_P.equalFilePath x y)
+    ,("AFP_W.normalise x == AFP_W.normalise y ==> AFP_W.equalFilePath x y", property $ \(QFilePathAFP_W x) (QFilePathAFP_W y) -> AFP_W.normalise x == AFP_W.normalise y ==> AFP_W.equalFilePath x y)
+    ,("P.equalFilePath \"foo\" \"foo/\"", property $ P.equalFilePath "foo" "foo/")
+    ,("W.equalFilePath \"foo\" \"foo/\"", property $ W.equalFilePath "foo" "foo/")
+    ,("AFP_P.equalFilePath (\"foo\") (\"foo/\")", property $ AFP_P.equalFilePath ("foo") ("foo/"))
+    ,("AFP_W.equalFilePath (\"foo\") (\"foo/\")", property $ AFP_W.equalFilePath ("foo") ("foo/"))
+    ,("not (P.equalFilePath \"/a/../c\" \"/c\")", property $ not (P.equalFilePath "/a/../c" "/c"))
+    ,("not (W.equalFilePath \"/a/../c\" \"/c\")", property $ not (W.equalFilePath "/a/../c" "/c"))
+    ,("not (AFP_P.equalFilePath (\"/a/../c\") (\"/c\"))", property $ not (AFP_P.equalFilePath ("/a/../c") ("/c")))
+    ,("not (AFP_W.equalFilePath (\"/a/../c\") (\"/c\"))", property $ not (AFP_W.equalFilePath ("/a/../c") ("/c")))
+    ,("not (P.equalFilePath \"foo\" \"/foo\")", property $ not (P.equalFilePath "foo" "/foo"))
+    ,("not (W.equalFilePath \"foo\" \"/foo\")", property $ not (W.equalFilePath "foo" "/foo"))
+    ,("not (AFP_P.equalFilePath (\"foo\") (\"/foo\"))", property $ not (AFP_P.equalFilePath ("foo") ("/foo")))
+    ,("not (AFP_W.equalFilePath (\"foo\") (\"/foo\"))", property $ not (AFP_W.equalFilePath ("foo") ("/foo")))
+    ,("not (P.equalFilePath \"foo\" \"FOO\")", property $ not (P.equalFilePath "foo" "FOO"))
+    ,("not (AFP_P.equalFilePath (\"foo\") (\"FOO\"))", property $ not (AFP_P.equalFilePath ("foo") ("FOO")))
+    ,("W.equalFilePath \"foo\" \"FOO\"", property $ W.equalFilePath "foo" "FOO")
+    ,("AFP_W.equalFilePath (\"foo\") (\"FOO\")", property $ AFP_W.equalFilePath ("foo") ("FOO"))
+    ,("not (W.equalFilePath \"C:\" \"C:/\")", property $ not (W.equalFilePath "C:" "C:/"))
+    ,("not (AFP_W.equalFilePath (\"C:\") (\"C:/\"))", property $ not (AFP_W.equalFilePath ("C:") ("C:/")))
+    ,("P.makeRelative \"/directory\" \"/directory/file.ext\" == \"file.ext\"", property $ P.makeRelative "/directory" "/directory/file.ext" == "file.ext")
+    ,("W.makeRelative \"/directory\" \"/directory/file.ext\" == \"file.ext\"", property $ W.makeRelative "/directory" "/directory/file.ext" == "file.ext")
+    ,("AFP_P.makeRelative (\"/directory\") (\"/directory/file.ext\") == (\"file.ext\")", property $ AFP_P.makeRelative ("/directory") ("/directory/file.ext") == ("file.ext"))
+    ,("AFP_W.makeRelative (\"/directory\") (\"/directory/file.ext\") == (\"file.ext\")", property $ AFP_W.makeRelative ("/directory") ("/directory/file.ext") == ("file.ext"))
+    ,("P.makeRelative (P.takeDirectory x) x `P.equalFilePath` P.takeFileName x", property $ \(QFilePathValidP x) -> P.makeRelative (P.takeDirectory x) x `P.equalFilePath` P.takeFileName x)
+    ,("W.makeRelative (W.takeDirectory x) x `W.equalFilePath` W.takeFileName x", property $ \(QFilePathValidW x) -> W.makeRelative (W.takeDirectory x) x `W.equalFilePath` W.takeFileName x)
+    ,("AFP_P.makeRelative (AFP_P.takeDirectory x) x `AFP_P.equalFilePath` AFP_P.takeFileName x", property $ \(QFilePathValidAFP_P x) -> AFP_P.makeRelative (AFP_P.takeDirectory x) x `AFP_P.equalFilePath` AFP_P.takeFileName x)
+    ,("AFP_W.makeRelative (AFP_W.takeDirectory x) x `AFP_W.equalFilePath` AFP_W.takeFileName x", property $ \(QFilePathValidAFP_W x) -> AFP_W.makeRelative (AFP_W.takeDirectory x) x `AFP_W.equalFilePath` AFP_W.takeFileName x)
+    ,("P.makeRelative x x == \".\"", property $ \(QFilePath x) -> P.makeRelative x x == ".")
+    ,("W.makeRelative x x == \".\"", property $ \(QFilePath x) -> W.makeRelative x x == ".")
+    ,("AFP_P.makeRelative x x == (\".\")", property $ \(QFilePathAFP_P x) -> AFP_P.makeRelative x x == ("."))
+    ,("AFP_W.makeRelative x x == (\".\")", property $ \(QFilePathAFP_W x) -> AFP_W.makeRelative x x == ("."))
+    ,("P.equalFilePath x y || (P.isRelative x && P.makeRelative y x == x) || P.equalFilePath (y P.</> P.makeRelative y x) x", property $ \(QFilePathValidP x) (QFilePathValidP y) -> P.equalFilePath x y || (P.isRelative x && P.makeRelative y x == x) || P.equalFilePath (y P.</> P.makeRelative y x) x)
+    ,("W.equalFilePath x y || (W.isRelative x && W.makeRelative y x == x) || W.equalFilePath (y W.</> W.makeRelative y x) x", property $ \(QFilePathValidW x) (QFilePathValidW y) -> W.equalFilePath x y || (W.isRelative x && W.makeRelative y x == x) || W.equalFilePath (y W.</> W.makeRelative y x) x)
+    ,("AFP_P.equalFilePath x y || (AFP_P.isRelative x && AFP_P.makeRelative y x == x) || AFP_P.equalFilePath (y AFP_P.</> AFP_P.makeRelative y x) x", property $ \(QFilePathValidAFP_P x) (QFilePathValidAFP_P y) -> AFP_P.equalFilePath x y || (AFP_P.isRelative x && AFP_P.makeRelative y x == x) || AFP_P.equalFilePath (y AFP_P.</> AFP_P.makeRelative y x) x)
+    ,("AFP_W.equalFilePath x y || (AFP_W.isRelative x && AFP_W.makeRelative y x == x) || AFP_W.equalFilePath (y AFP_W.</> AFP_W.makeRelative y x) x", property $ \(QFilePathValidAFP_W x) (QFilePathValidAFP_W y) -> AFP_W.equalFilePath x y || (AFP_W.isRelative x && AFP_W.makeRelative y x == x) || AFP_W.equalFilePath (y AFP_W.</> AFP_W.makeRelative y x) x)
+    ,("W.makeRelative \"C:\\\\Home\" \"c:\\\\home\\\\bob\" == \"bob\"", property $ W.makeRelative "C:\\Home" "c:\\home\\bob" == "bob")
+    ,("AFP_W.makeRelative (\"C:\\\\Home\") (\"c:\\\\home\\\\bob\") == (\"bob\")", property $ AFP_W.makeRelative ("C:\\Home") ("c:\\home\\bob") == ("bob"))
+    ,("W.makeRelative \"C:\\\\Home\" \"c:/home/bob\" == \"bob\"", property $ W.makeRelative "C:\\Home" "c:/home/bob" == "bob")
+    ,("AFP_W.makeRelative (\"C:\\\\Home\") (\"c:/home/bob\") == (\"bob\")", property $ AFP_W.makeRelative ("C:\\Home") ("c:/home/bob") == ("bob"))
+    ,("W.makeRelative \"C:\\\\Home\" \"D:\\\\Home\\\\Bob\" == \"D:\\\\Home\\\\Bob\"", property $ W.makeRelative "C:\\Home" "D:\\Home\\Bob" == "D:\\Home\\Bob")
+    ,("AFP_W.makeRelative (\"C:\\\\Home\") (\"D:\\\\Home\\\\Bob\") == (\"D:\\\\Home\\\\Bob\")", property $ AFP_W.makeRelative ("C:\\Home") ("D:\\Home\\Bob") == ("D:\\Home\\Bob"))
+    ,("W.makeRelative \"C:\\\\Home\" \"C:Home\\\\Bob\" == \"C:Home\\\\Bob\"", property $ W.makeRelative "C:\\Home" "C:Home\\Bob" == "C:Home\\Bob")
+    ,("AFP_W.makeRelative (\"C:\\\\Home\") (\"C:Home\\\\Bob\") == (\"C:Home\\\\Bob\")", property $ AFP_W.makeRelative ("C:\\Home") ("C:Home\\Bob") == ("C:Home\\Bob"))
+    ,("W.makeRelative \"/Home\" \"/home/bob\" == \"bob\"", property $ W.makeRelative "/Home" "/home/bob" == "bob")
+    ,("AFP_W.makeRelative (\"/Home\") (\"/home/bob\") == (\"bob\")", property $ AFP_W.makeRelative ("/Home") ("/home/bob") == ("bob"))
+    ,("W.makeRelative \"/\" \"//\" == \"//\"", property $ W.makeRelative "/" "//" == "//")
+    ,("AFP_W.makeRelative (\"/\") (\"//\") == (\"//\")", property $ AFP_W.makeRelative ("/") ("//") == ("//"))
+    ,("P.makeRelative \"/Home\" \"/home/bob\" == \"/home/bob\"", property $ P.makeRelative "/Home" "/home/bob" == "/home/bob")
+    ,("AFP_P.makeRelative (\"/Home\") (\"/home/bob\") == (\"/home/bob\")", property $ AFP_P.makeRelative ("/Home") ("/home/bob") == ("/home/bob"))
+    ,("P.makeRelative \"/home/\" \"/home/bob/foo/bar\" == \"bob/foo/bar\"", property $ P.makeRelative "/home/" "/home/bob/foo/bar" == "bob/foo/bar")
+    ,("AFP_P.makeRelative (\"/home/\") (\"/home/bob/foo/bar\") == (\"bob/foo/bar\")", property $ AFP_P.makeRelative ("/home/") ("/home/bob/foo/bar") == ("bob/foo/bar"))
+    ,("P.makeRelative \"/fred\" \"bob\" == \"bob\"", property $ P.makeRelative "/fred" "bob" == "bob")
+    ,("AFP_P.makeRelative (\"/fred\") (\"bob\") == (\"bob\")", property $ AFP_P.makeRelative ("/fred") ("bob") == ("bob"))
+    ,("P.makeRelative \"/file/test\" \"/file/test/fred\" == \"fred\"", property $ P.makeRelative "/file/test" "/file/test/fred" == "fred")
+    ,("AFP_P.makeRelative (\"/file/test\") (\"/file/test/fred\") == (\"fred\")", property $ AFP_P.makeRelative ("/file/test") ("/file/test/fred") == ("fred"))
+    ,("P.makeRelative \"/file/test\" \"/file/test/fred/\" == \"fred/\"", property $ P.makeRelative "/file/test" "/file/test/fred/" == "fred/")
+    ,("AFP_P.makeRelative (\"/file/test\") (\"/file/test/fred/\") == (\"fred/\")", property $ AFP_P.makeRelative ("/file/test") ("/file/test/fred/") == ("fred/"))
+    ,("P.makeRelative \"some/path\" \"some/path/a/b/c\" == \"a/b/c\"", property $ P.makeRelative "some/path" "some/path/a/b/c" == "a/b/c")
+    ,("AFP_P.makeRelative (\"some/path\") (\"some/path/a/b/c\") == (\"a/b/c\")", property $ AFP_P.makeRelative ("some/path") ("some/path/a/b/c") == ("a/b/c"))
+    ,("P.normalise \"/file/\\\\test////\" == \"/file/\\\\test/\"", property $ P.normalise "/file/\\test////" == "/file/\\test/")
+    ,("AFP_P.normalise (\"/file/\\\\test////\") == (\"/file/\\\\test/\")", property $ AFP_P.normalise ("/file/\\test////") == ("/file/\\test/"))
+    ,("P.normalise \"/file/./test\" == \"/file/test\"", property $ P.normalise "/file/./test" == "/file/test")
+    ,("AFP_P.normalise (\"/file/./test\") == (\"/file/test\")", property $ AFP_P.normalise ("/file/./test") == ("/file/test"))
+    ,("P.normalise \"/test/file/../bob/fred/\" == \"/test/file/../bob/fred/\"", property $ P.normalise "/test/file/../bob/fred/" == "/test/file/../bob/fred/")
+    ,("AFP_P.normalise (\"/test/file/../bob/fred/\") == (\"/test/file/../bob/fred/\")", property $ AFP_P.normalise ("/test/file/../bob/fred/") == ("/test/file/../bob/fred/"))
+    ,("P.normalise \"../bob/fred/\" == \"../bob/fred/\"", property $ P.normalise "../bob/fred/" == "../bob/fred/")
+    ,("AFP_P.normalise (\"../bob/fred/\") == (\"../bob/fred/\")", property $ AFP_P.normalise ("../bob/fred/") == ("../bob/fred/"))
+    ,("P.normalise \"/a/../c\" == \"/a/../c\"", property $ P.normalise "/a/../c" == "/a/../c")
+    ,("AFP_P.normalise (\"/a/../c\") == (\"/a/../c\")", property $ AFP_P.normalise ("/a/../c") == ("/a/../c"))
+    ,("P.normalise \"./bob/fred/\" == \"bob/fred/\"", property $ P.normalise "./bob/fred/" == "bob/fred/")
+    ,("AFP_P.normalise (\"./bob/fred/\") == (\"bob/fred/\")", property $ AFP_P.normalise ("./bob/fred/") == ("bob/fred/"))
+    ,("W.normalise \"c:\\\\file/bob\\\\\" == \"C:\\\\file\\\\bob\\\\\"", property $ W.normalise "c:\\file/bob\\" == "C:\\file\\bob\\")
+    ,("AFP_W.normalise (\"c:\\\\file/bob\\\\\") == (\"C:\\\\file\\\\bob\\\\\")", property $ AFP_W.normalise ("c:\\file/bob\\") == ("C:\\file\\bob\\"))
+    ,("W.normalise \"c:\\\\\" == \"C:\\\\\"", property $ W.normalise "c:\\" == "C:\\")
+    ,("AFP_W.normalise (\"c:\\\\\") == (\"C:\\\\\")", property $ AFP_W.normalise ("c:\\") == ("C:\\"))
+    ,("W.normalise \"c:\\\\\\\\\\\\\\\\\" == \"C:\\\\\"", property $ W.normalise "c:\\\\\\\\" == "C:\\")
+    ,("AFP_W.normalise (\"c:\\\\\\\\\\\\\\\\\") == (\"C:\\\\\")", property $ AFP_W.normalise ("c:\\\\\\\\") == ("C:\\"))
+    ,("W.normalise \"C:.\\\\\" == \"C:\"", property $ W.normalise "C:.\\" == "C:")
+    ,("AFP_W.normalise (\"C:.\\\\\") == (\"C:\")", property $ AFP_W.normalise ("C:.\\") == ("C:"))
+    ,("W.normalise \"\\\\\\\\server\\\\test\" == \"\\\\\\\\server\\\\test\"", property $ W.normalise "\\\\server\\test" == "\\\\server\\test")
+    ,("AFP_W.normalise (\"\\\\\\\\server\\\\test\") == (\"\\\\\\\\server\\\\test\")", property $ AFP_W.normalise ("\\\\server\\test") == ("\\\\server\\test"))
+    ,("W.normalise \"//server/test\" == \"\\\\\\\\server\\\\test\"", property $ W.normalise "//server/test" == "\\\\server\\test")
+    ,("AFP_W.normalise (\"//server/test\") == (\"\\\\\\\\server\\\\test\")", property $ AFP_W.normalise ("//server/test") == ("\\\\server\\test"))
+    ,("W.normalise \"c:/file\" == \"C:\\\\file\"", property $ W.normalise "c:/file" == "C:\\file")
+    ,("AFP_W.normalise (\"c:/file\") == (\"C:\\\\file\")", property $ AFP_W.normalise ("c:/file") == ("C:\\file"))
+    ,("W.normalise \"/file\" == \"\\\\file\"", property $ W.normalise "/file" == "\\file")
+    ,("AFP_W.normalise (\"/file\") == (\"\\\\file\")", property $ AFP_W.normalise ("/file") == ("\\file"))
+    ,("W.normalise \"\\\\\" == \"\\\\\"", property $ W.normalise "\\" == "\\")
+    ,("AFP_W.normalise (\"\\\\\") == (\"\\\\\")", property $ AFP_W.normalise ("\\") == ("\\"))
+    ,("W.normalise \"/./\" == \"\\\\\"", property $ W.normalise "/./" == "\\")
+    ,("AFP_W.normalise (\"/./\") == (\"\\\\\")", property $ AFP_W.normalise ("/./") == ("\\"))
+    ,("P.normalise \".\" == \".\"", property $ P.normalise "." == ".")
+    ,("W.normalise \".\" == \".\"", property $ W.normalise "." == ".")
+    ,("AFP_P.normalise (\".\") == (\".\")", property $ AFP_P.normalise (".") == ("."))
+    ,("AFP_W.normalise (\".\") == (\".\")", property $ AFP_W.normalise (".") == ("."))
+    ,("P.normalise \"./\" == \"./\"", property $ P.normalise "./" == "./")
+    ,("AFP_P.normalise (\"./\") == (\"./\")", property $ AFP_P.normalise ("./") == ("./"))
+    ,("P.normalise \"./.\" == \"./\"", property $ P.normalise "./." == "./")
+    ,("AFP_P.normalise (\"./.\") == (\"./\")", property $ AFP_P.normalise ("./.") == ("./"))
+    ,("P.normalise \"/./\" == \"/\"", property $ P.normalise "/./" == "/")
+    ,("AFP_P.normalise (\"/./\") == (\"/\")", property $ AFP_P.normalise ("/./") == ("/"))
+    ,("P.normalise \"/\" == \"/\"", property $ P.normalise "/" == "/")
+    ,("AFP_P.normalise (\"/\") == (\"/\")", property $ AFP_P.normalise ("/") == ("/"))
+    ,("P.normalise \"bob/fred/.\" == \"bob/fred/\"", property $ P.normalise "bob/fred/." == "bob/fred/")
+    ,("AFP_P.normalise (\"bob/fred/.\") == (\"bob/fred/\")", property $ AFP_P.normalise ("bob/fred/.") == ("bob/fred/"))
+    ,("P.normalise \"//home\" == \"/home\"", property $ P.normalise "//home" == "/home")
+    ,("AFP_P.normalise (\"//home\") == (\"/home\")", property $ AFP_P.normalise ("//home") == ("/home"))
+    ,("P.isValid \"\" == False", property $ P.isValid "" == False)
+    ,("W.isValid \"\" == False", property $ W.isValid "" == False)
+    ,("AFP_P.isValid (\"\") == False", property $ AFP_P.isValid ("") == False)
+    ,("AFP_W.isValid (\"\") == False", property $ AFP_W.isValid ("") == False)
+    ,("P.isValid \"\\0\" == False", property $ P.isValid "\0" == False)
+    ,("W.isValid \"\\0\" == False", property $ W.isValid "\0" == False)
+    ,("AFP_P.isValid (\"\\0\") == False", property $ AFP_P.isValid ("\0") == False)
+    ,("AFP_W.isValid (\"\\0\") == False", property $ AFP_W.isValid ("\0") == False)
+    ,("P.isValid \"/random_ path:*\" == True", property $ P.isValid "/random_ path:*" == True)
+    ,("AFP_P.isValid (\"/random_ path:*\") == True", property $ AFP_P.isValid ("/random_ path:*") == True)
+    ,("P.isValid x == not (null x)", property $ \(QFilePath x) -> P.isValid x == not (null x))
+    ,("AFP_P.isValid x == not ((SBS.null . getPosixString) x)", property $ \(QFilePathAFP_P x) -> AFP_P.isValid x == not ((SBS.null . getPosixString) x))
+    ,("W.isValid \"c:\\\\test\" == True", property $ W.isValid "c:\\test" == True)
+    ,("AFP_W.isValid (\"c:\\\\test\") == True", property $ AFP_W.isValid ("c:\\test") == True)
+    ,("W.isValid \"c:\\\\test:of_test\" == False", property $ W.isValid "c:\\test:of_test" == False)
+    ,("AFP_W.isValid (\"c:\\\\test:of_test\") == False", property $ AFP_W.isValid ("c:\\test:of_test") == False)
+    ,("W.isValid \"test*\" == False", property $ W.isValid "test*" == False)
+    ,("AFP_W.isValid (\"test*\") == False", property $ AFP_W.isValid ("test*") == False)
+    ,("W.isValid \"c:\\\\test\\\\nul\" == False", property $ W.isValid "c:\\test\\nul" == False)
+    ,("AFP_W.isValid (\"c:\\\\test\\\\nul\") == False", property $ AFP_W.isValid ("c:\\test\\nul") == False)
+    ,("W.isValid \"c:\\\\test\\\\prn.txt\" == False", property $ W.isValid "c:\\test\\prn.txt" == False)
+    ,("AFP_W.isValid (\"c:\\\\test\\\\prn.txt\") == False", property $ AFP_W.isValid ("c:\\test\\prn.txt") == False)
+    ,("W.isValid \"c:\\\\nul\\\\file\" == False", property $ W.isValid "c:\\nul\\file" == False)
+    ,("AFP_W.isValid (\"c:\\\\nul\\\\file\") == False", property $ AFP_W.isValid ("c:\\nul\\file") == False)
+    ,("W.isValid \"\\\\\\\\\" == False", property $ W.isValid "\\\\" == False)
+    ,("AFP_W.isValid (\"\\\\\\\\\") == False", property $ AFP_W.isValid ("\\\\") == False)
+    ,("W.isValid \"\\\\\\\\\\\\foo\" == False", property $ W.isValid "\\\\\\foo" == False)
+    ,("AFP_W.isValid (\"\\\\\\\\\\\\foo\") == False", property $ AFP_W.isValid ("\\\\\\foo") == False)
+    ,("W.isValid \"\\\\\\\\?\\\\D:file\" == False", property $ W.isValid "\\\\?\\D:file" == False)
+    ,("AFP_W.isValid (\"\\\\\\\\?\\\\D:file\") == False", property $ AFP_W.isValid ("\\\\?\\D:file") == False)
+    ,("W.isValid \"foo\\tbar\" == False", property $ W.isValid "foo\tbar" == False)
+    ,("AFP_W.isValid (\"foo\\tbar\") == False", property $ AFP_W.isValid ("foo\tbar") == False)
+    ,("W.isValid \"nul .txt\" == False", property $ W.isValid "nul .txt" == False)
+    ,("AFP_W.isValid (\"nul .txt\") == False", property $ AFP_W.isValid ("nul .txt") == False)
+    ,("W.isValid \" nul.txt\" == True", property $ W.isValid " nul.txt" == True)
+    ,("AFP_W.isValid (\" nul.txt\") == True", property $ AFP_W.isValid (" nul.txt") == True)
+    ,("P.isValid (P.makeValid x)", property $ \(QFilePath x) -> P.isValid (P.makeValid x))
+    ,("W.isValid (W.makeValid x)", property $ \(QFilePath x) -> W.isValid (W.makeValid x))
+    ,("AFP_P.isValid (AFP_P.makeValid x)", property $ \(QFilePathAFP_P x) -> AFP_P.isValid (AFP_P.makeValid x))
+    ,("AFP_W.isValid (AFP_W.makeValid x)", property $ \(QFilePathAFP_W x) -> AFP_W.isValid (AFP_W.makeValid x))
+    ,("P.isValid x ==> P.makeValid x == x", property $ \(QFilePath x) -> P.isValid x ==> P.makeValid x == x)
+    ,("W.isValid x ==> W.makeValid x == x", property $ \(QFilePath x) -> W.isValid x ==> W.makeValid x == x)
+    ,("AFP_P.isValid x ==> AFP_P.makeValid x == x", property $ \(QFilePathAFP_P x) -> AFP_P.isValid x ==> AFP_P.makeValid x == x)
+    ,("AFP_W.isValid x ==> AFP_W.makeValid x == x", property $ \(QFilePathAFP_W x) -> AFP_W.isValid x ==> AFP_W.makeValid x == x)
+    ,("P.makeValid \"\" == \"_\"", property $ P.makeValid "" == "_")
+    ,("W.makeValid \"\" == \"_\"", property $ W.makeValid "" == "_")
+    ,("AFP_P.makeValid (\"\") == (\"_\")", property $ AFP_P.makeValid ("") == ("_"))
+    ,("AFP_W.makeValid (\"\") == (\"_\")", property $ AFP_W.makeValid ("") == ("_"))
+    ,("P.makeValid \"file\\0name\" == \"file_name\"", property $ P.makeValid "file\0name" == "file_name")
+    ,("W.makeValid \"file\\0name\" == \"file_name\"", property $ W.makeValid "file\0name" == "file_name")
+    ,("AFP_P.makeValid (\"file\\0name\") == (\"file_name\")", property $ AFP_P.makeValid ("file\0name") == ("file_name"))
+    ,("AFP_W.makeValid (\"file\\0name\") == (\"file_name\")", property $ AFP_W.makeValid ("file\0name") == ("file_name"))
+    ,("W.makeValid \"c:\\\\already\\\\/valid\" == \"c:\\\\already\\\\/valid\"", property $ W.makeValid "c:\\already\\/valid" == "c:\\already\\/valid")
+    ,("AFP_W.makeValid (\"c:\\\\already\\\\/valid\") == (\"c:\\\\already\\\\/valid\")", property $ AFP_W.makeValid ("c:\\already\\/valid") == ("c:\\already\\/valid"))
+    ,("W.makeValid \"c:\\\\test:of_test\" == \"c:\\\\test_of_test\"", property $ W.makeValid "c:\\test:of_test" == "c:\\test_of_test")
+    ,("AFP_W.makeValid (\"c:\\\\test:of_test\") == (\"c:\\\\test_of_test\")", property $ AFP_W.makeValid ("c:\\test:of_test") == ("c:\\test_of_test"))
+    ,("W.makeValid \"test*\" == \"test_\"", property $ W.makeValid "test*" == "test_")
+    ,("AFP_W.makeValid (\"test*\") == (\"test_\")", property $ AFP_W.makeValid ("test*") == ("test_"))
+    ,("W.makeValid \"c:\\\\test\\\\nul\" == \"c:\\\\test\\\\nul_\"", property $ W.makeValid "c:\\test\\nul" == "c:\\test\\nul_")
+    ,("AFP_W.makeValid (\"c:\\\\test\\\\nul\") == (\"c:\\\\test\\\\nul_\")", property $ AFP_W.makeValid ("c:\\test\\nul") == ("c:\\test\\nul_"))
+    ,("W.makeValid \"c:\\\\test\\\\prn.txt\" == \"c:\\\\test\\\\prn_.txt\"", property $ W.makeValid "c:\\test\\prn.txt" == "c:\\test\\prn_.txt")
+    ,("AFP_W.makeValid (\"c:\\\\test\\\\prn.txt\") == (\"c:\\\\test\\\\prn_.txt\")", property $ AFP_W.makeValid ("c:\\test\\prn.txt") == ("c:\\test\\prn_.txt"))
+    ,("W.makeValid \"c:\\\\test/prn.txt\" == \"c:\\\\test/prn_.txt\"", property $ W.makeValid "c:\\test/prn.txt" == "c:\\test/prn_.txt")
+    ,("AFP_W.makeValid (\"c:\\\\test/prn.txt\") == (\"c:\\\\test/prn_.txt\")", property $ AFP_W.makeValid ("c:\\test/prn.txt") == ("c:\\test/prn_.txt"))
+    ,("W.makeValid \"c:\\\\nul\\\\file\" == \"c:\\\\nul_\\\\file\"", property $ W.makeValid "c:\\nul\\file" == "c:\\nul_\\file")
+    ,("AFP_W.makeValid (\"c:\\\\nul\\\\file\") == (\"c:\\\\nul_\\\\file\")", property $ AFP_W.makeValid ("c:\\nul\\file") == ("c:\\nul_\\file"))
+    ,("W.makeValid \"\\\\\\\\\\\\foo\" == \"\\\\\\\\drive\"", property $ W.makeValid "\\\\\\foo" == "\\\\drive")
+    ,("AFP_W.makeValid (\"\\\\\\\\\\\\foo\") == (\"\\\\\\\\drive\")", property $ AFP_W.makeValid ("\\\\\\foo") == ("\\\\drive"))
+    ,("W.makeValid \"\\\\\\\\?\\\\D:file\" == \"\\\\\\\\?\\\\D:\\\\file\"", property $ W.makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file")
+    ,("AFP_W.makeValid (\"\\\\\\\\?\\\\D:file\") == (\"\\\\\\\\?\\\\D:\\\\file\")", property $ AFP_W.makeValid ("\\\\?\\D:file") == ("\\\\?\\D:\\file"))
+    ,("W.makeValid \"nul .txt\" == \"nul _.txt\"", property $ W.makeValid "nul .txt" == "nul _.txt")
+    ,("AFP_W.makeValid (\"nul .txt\") == (\"nul _.txt\")", property $ AFP_W.makeValid ("nul .txt") == ("nul _.txt"))
+    ,("W.isRelative \"path\\\\test\" == True", property $ W.isRelative "path\\test" == True)
+    ,("AFP_W.isRelative (\"path\\\\test\") == True", property $ AFP_W.isRelative ("path\\test") == True)
+    ,("W.isRelative \"c:\\\\test\" == False", property $ W.isRelative "c:\\test" == False)
+    ,("AFP_W.isRelative (\"c:\\\\test\") == False", property $ AFP_W.isRelative ("c:\\test") == False)
+    ,("W.isRelative \"c:test\" == True", property $ W.isRelative "c:test" == True)
+    ,("AFP_W.isRelative (\"c:test\") == True", property $ AFP_W.isRelative ("c:test") == True)
+    ,("W.isRelative \"c:\\\\\" == False", property $ W.isRelative "c:\\" == False)
+    ,("AFP_W.isRelative (\"c:\\\\\") == False", property $ AFP_W.isRelative ("c:\\") == False)
+    ,("W.isRelative \"c:/\" == False", property $ W.isRelative "c:/" == False)
+    ,("AFP_W.isRelative (\"c:/\") == False", property $ AFP_W.isRelative ("c:/") == False)
+    ,("W.isRelative \"c:\" == True", property $ W.isRelative "c:" == True)
+    ,("AFP_W.isRelative (\"c:\") == True", property $ AFP_W.isRelative ("c:") == True)
+    ,("W.isRelative \"\\\\\\\\foo\" == False", property $ W.isRelative "\\\\foo" == False)
+    ,("AFP_W.isRelative (\"\\\\\\\\foo\") == False", property $ AFP_W.isRelative ("\\\\foo") == False)
+    ,("W.isRelative \"\\\\\\\\?\\\\foo\" == False", property $ W.isRelative "\\\\?\\foo" == False)
+    ,("AFP_W.isRelative (\"\\\\\\\\?\\\\foo\") == False", property $ AFP_W.isRelative ("\\\\?\\foo") == False)
+    ,("W.isRelative \"\\\\\\\\?\\\\UNC\\\\foo\" == False", property $ W.isRelative "\\\\?\\UNC\\foo" == False)
+    ,("AFP_W.isRelative (\"\\\\\\\\?\\\\UNC\\\\foo\") == False", property $ AFP_W.isRelative ("\\\\?\\UNC\\foo") == False)
+    ,("W.isRelative \"/foo\" == True", property $ W.isRelative "/foo" == True)
+    ,("AFP_W.isRelative (\"/foo\") == True", property $ AFP_W.isRelative ("/foo") == True)
+    ,("W.isRelative \"\\\\foo\" == True", property $ W.isRelative "\\foo" == True)
+    ,("AFP_W.isRelative (\"\\\\foo\") == True", property $ AFP_W.isRelative ("\\foo") == True)
+    ,("P.isRelative \"test/path\" == True", property $ P.isRelative "test/path" == True)
+    ,("AFP_P.isRelative (\"test/path\") == True", property $ AFP_P.isRelative ("test/path") == True)
+    ,("P.isRelative \"/test\" == False", property $ P.isRelative "/test" == False)
+    ,("AFP_P.isRelative (\"/test\") == False", property $ AFP_P.isRelative ("/test") == False)
+    ,("P.isRelative \"/\" == False", property $ P.isRelative "/" == False)
+    ,("AFP_P.isRelative (\"/\") == False", property $ AFP_P.isRelative ("/") == False)
+    ,("P.isAbsolute x == not (P.isRelative x)", property $ \(QFilePath x) -> P.isAbsolute x == not (P.isRelative x))
+    ,("W.isAbsolute x == not (W.isRelative x)", property $ \(QFilePath x) -> W.isAbsolute x == not (W.isRelative x))
+    ,("AFP_P.isAbsolute x == not (AFP_P.isRelative x)", property $ \(QFilePathAFP_P x) -> AFP_P.isAbsolute x == not (AFP_P.isRelative x))
+    ,("AFP_W.isAbsolute x == not (AFP_W.isRelative x)", property $ \(QFilePathAFP_W x) -> AFP_W.isAbsolute x == not (AFP_W.isRelative x))
+    ]
diff --git a/tests/integration/tests/mutable-deps/files/package.yaml b/tests/integration/tests/mutable-deps/files/package.yaml
new file mode 100644
index 0000000000..79d39d13fa
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/package.yaml
@@ -0,0 +1,18 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+  dependencies:
+  - filemanip
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/tests/integration/tests/mutable-deps/files/src/Lib.hs b/tests/integration/tests/mutable-deps/files/src/Lib.hs
new file mode 100644
index 0000000000..77d29f1945
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/src/Lib.hs
@@ -0,0 +1,6 @@
+module Lib where
+
+import System.FilePath.Glob
+
+allCFiles :: IO [FilePath]
+allCFiles = namesMatching "*.c"
diff --git a/tests/integration/tests/mutable-deps/files/stack.yaml b/tests/integration/tests/mutable-deps/files/stack.yaml
new file mode 100644
index 0000000000..d2f16944af
--- /dev/null
+++ b/tests/integration/tests/mutable-deps/files/stack.yaml
@@ -0,0 +1,18 @@
+snapshot: lts-24.55
+
+extra-deps:
+- ./filepath-1.5.4.0
+# Required, otherwise Stack reports that GHC boot library has been pruned.
+- Win32-2.14.1.0
+- directory-1.3.8.5
+- os-string-2.0.4
+- time-1.12.2
+- unix-2.8.6.0
+
+flags:
+  Win32:
+    os-string: true
+  directory:
+    os-string: true
+  unix:
+    os-string: true
diff --git a/tests/integration/tests/nice-resolver-names/Main.hs b/tests/integration/tests/nice-resolver-names/Main.hs
new file mode 100644
index 0000000000..9c0e813553
--- /dev/null
+++ b/tests/integration/tests/nice-resolver-names/Main.hs
@@ -0,0 +1,23 @@
+-- | Stack's init command uses a convenience synonym for the snapshot in the
+-- project-level configuration file, if that is what was specified at the
+-- command line.
+
+{-# LANGUAGE OverloadedStrings #-}
+
+import           Control.Exception ( throwIO )
+import           Data.Maybe ( mapMaybe )
+import           Data.Foldable ( for_ )
+import           Data.List ( stripPrefix )
+import           StackTest
+
+main :: IO ()
+main = do
+  for_ ["lts-20.26", "lts-24.55"] $ \snapshot -> do
+    stack ["init", "--force", "--snapshot", snapshot]
+    str <- readFile "stack.yaml"
+    case mapMaybe (stripPrefix "snapshot: ") $ lines str of
+      [x] ->
+        if filter (/= '\r') x == snapshot
+          then pure ()
+          else error $ "Mismatch: " ++ show (snapshot, x)
+      _ -> error $ "Wrong number of snapshots: " ++ show str
diff --git a/tests/integration/tests/nice-resolver-names/files/.gitignore b/tests/integration/tests/nice-resolver-names/files/.gitignore
new file mode 100644
index 0000000000..82bb5452c4
--- /dev/null
+++ b/tests/integration/tests/nice-resolver-names/files/.gitignore
@@ -0,0 +1,2 @@
+myPackage.cabal
+stack.yaml
diff --git a/tests/integration/tests/nice-resolver-names/files/package.yaml b/tests/integration/tests/nice-resolver-names/files/package.yaml
new file mode 100644
index 0000000000..7e155848c9
--- /dev/null
+++ b/tests/integration/tests/nice-resolver-names/files/package.yaml
@@ -0,0 +1,5 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+library: {}
diff --git a/tests/integration/tests/override-compiler/Main.hs b/tests/integration/tests/override-compiler/Main.hs
new file mode 100644
index 0000000000..d7196f4e9c
--- /dev/null
+++ b/tests/integration/tests/override-compiler/Main.hs
@@ -0,0 +1,10 @@
+-- | Stack can override the compiler specified in a snapshot.
+
+import           Control.Monad ( unless )
+import           StackTest
+
+main :: IO ()
+main = stackCheckStdout ["exec", "--", "ghc", "--numeric-version"] $ \ver ->
+  -- get rid of the newline character
+  unless (concat (lines ver) == "9.10.3") $
+    error $ "Invalid version: " ++ show ver
diff --git a/tests/integration/tests/override-compiler/files/stack.yaml b/tests/integration/tests/override-compiler/files/stack.yaml
new file mode 100644
index 0000000000..0b41c84c37
--- /dev/null
+++ b/tests/integration/tests/override-compiler/files/stack.yaml
@@ -0,0 +1,3 @@
+snapshot: lts-22.43
+compiler: ghc-9.10.3
+packages: []
diff --git a/tests/integration/tests/per-component-build/Main.hs b/tests/integration/tests/per-component-build/Main.hs
new file mode 100644
index 0000000000..dcd8faf09f
--- /dev/null
+++ b/tests/integration/tests/per-component-build/Main.hs
@@ -0,0 +1,26 @@
+import Control.Monad (unless)
+import Data.List (isInfixOf)
+import StackTest
+
+main :: IO ()
+main = do
+  stack ["clean"]
+
+  stackCheckStderr ["build"] $ \err -> do
+    let expect tag =
+          unless (tag `isInfixOf` err) $
+            error $ "Expected " ++ show tag ++ " in build output:\n" ++ err
+    expect "Building executable 'app1'"
+    expect "Building executable 'app2'"
+
+  stackCheckStdout ["exec", "app1"] $ \out ->
+    unless ("app1: Hello from Lib" `isInfixOf` out) $
+      error $ "Unexpected app1 output: " ++ out
+
+  stackCheckStdout ["exec", "app2"] $ \out ->
+    unless ("app2: Hello from Lib" `isInfixOf` out) $
+      error $ "Unexpected app2 output: " ++ out
+
+  stackCheckStderr ["test"] $ \err ->
+    unless ("per-component-build" `isInfixOf` err) $
+      error $ "Expected package name in test output:\n" ++ err
diff --git a/tests/integration/tests/per-component-build/files/app1/Main.hs b/tests/integration/tests/per-component-build/files/app1/Main.hs
new file mode 100644
index 0000000000..c4ed68390c
--- /dev/null
+++ b/tests/integration/tests/per-component-build/files/app1/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib (greeting)
+
+main :: IO ()
+main = putStrLn ("app1: " ++ greeting)
diff --git a/tests/integration/tests/per-component-build/files/app2/Main.hs b/tests/integration/tests/per-component-build/files/app2/Main.hs
new file mode 100644
index 0000000000..2dfa058723
--- /dev/null
+++ b/tests/integration/tests/per-component-build/files/app2/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib (greeting)
+
+main :: IO ()
+main = putStrLn ("app2: " ++ greeting)
diff --git a/tests/integration/tests/per-component-build/files/per-component-build.cabal b/tests/integration/tests/per-component-build/files/per-component-build.cabal
new file mode 100644
index 0000000000..5146198749
--- /dev/null
+++ b/tests/integration/tests/per-component-build/files/per-component-build.cabal
@@ -0,0 +1,30 @@
+cabal-version: 2.0
+name:          per-component-build
+version:       0.1.0.0
+build-type:    Simple
+license:       BSD3
+
+library
+  exposed-modules: Lib
+  hs-source-dirs:  src
+  build-depends:   base
+  default-language: Haskell2010
+
+executable app1
+  main-is:       Main.hs
+  hs-source-dirs: app1
+  build-depends:  base, per-component-build
+  default-language: Haskell2010
+
+executable app2
+  main-is:       Main.hs
+  hs-source-dirs: app2
+  build-depends:  base, per-component-build
+  default-language: Haskell2010
+
+test-suite tests
+  type:          exitcode-stdio-1.0
+  main-is:       Main.hs
+  hs-source-dirs: test
+  build-depends:  base, per-component-build
+  default-language: Haskell2010
diff --git a/tests/integration/tests/per-component-build/files/src/Lib.hs b/tests/integration/tests/per-component-build/files/src/Lib.hs
new file mode 100644
index 0000000000..579eefd84f
--- /dev/null
+++ b/tests/integration/tests/per-component-build/files/src/Lib.hs
@@ -0,0 +1,4 @@
+module Lib (greeting) where
+
+greeting :: String
+greeting = "Hello from Lib"
diff --git a/tests/integration/tests/per-component-build/files/stack.yaml b/tests/integration/tests/per-component-build/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/per-component-build/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/per-component-build/files/test/Main.hs b/tests/integration/tests/per-component-build/files/test/Main.hs
new file mode 100644
index 0000000000..5935fd731b
--- /dev/null
+++ b/tests/integration/tests/per-component-build/files/test/Main.hs
@@ -0,0 +1,9 @@
+module Main where
+
+import Lib (greeting)
+import System.Exit (exitSuccess)
+
+main :: IO ()
+main = do
+  putStrLn ("test: " ++ greeting)
+  exitSuccess
diff --git a/tests/integration/tests/proper-rebuilds/Main.hs b/tests/integration/tests/proper-rebuilds/Main.hs
new file mode 100644
index 0000000000..4a12aac853
--- /dev/null
+++ b/tests/integration/tests/proper-rebuilds/Main.hs
@@ -0,0 +1,24 @@
+-- | Stack rebuilds an executable if profiling is enabled or disabled or if the
+-- library on which it depends changes.
+
+import          Control.Monad ( unless, when )
+import          Data.List ( isInfixOf )
+import          StackTest
+import          System.Directory ( copyFile )
+
+main :: IO ()
+main = do
+  let expectRecompilation stderr =
+        unless ("> build" `isInfixOf` stderr) $
+          error "package recompilation was expected"
+      expectNoRecompilation stderr =
+        when ("> build" `isInfixOf` stderr) $
+          error "package recompilation was not expected"
+  copyFile "src/Lib.v1" "src/Lib.hs"
+  stackCheckStderr ["build"] expectRecompilation
+  stackCheckStderr ["build" , "--profile"] expectRecompilation
+  stackCheckStderr ["build" , "--profile"] expectNoRecompilation
+  -- changing source file to trigger recompilation
+  copyFile "src/Lib.v2" "src/Lib.hs"
+  stackCheckStderr ["build" , "--profile"] expectRecompilation
+  stackCheckStderr ["build"] expectRecompilation
diff --git a/tests/integration/tests/proper-rebuilds/files/.gitignore b/tests/integration/tests/proper-rebuilds/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/proper-rebuilds/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/proper-rebuilds/files/app/Main.hs b/tests/integration/tests/proper-rebuilds/files/app/Main.hs
new file mode 100644
index 0000000000..c081d93bae
--- /dev/null
+++ b/tests/integration/tests/proper-rebuilds/files/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib ( func )
+
+main :: IO ()
+main = func
diff --git a/tests/integration/tests/proper-rebuilds/files/package.yaml b/tests/integration/tests/proper-rebuilds/files/package.yaml
new file mode 100644
index 0000000000..bea19d444e
--- /dev/null
+++ b/tests/integration/tests/proper-rebuilds/files/package.yaml
@@ -0,0 +1,16 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library:
+  source-dirs: src
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
+    dependencies:
+    - myPackage
diff --git a/tests/integration/tests/proper-rebuilds/files/src/Lib.hs b/tests/integration/tests/proper-rebuilds/files/src/Lib.hs
new file mode 100644
index 0000000000..412990b09b
--- /dev/null
+++ b/tests/integration/tests/proper-rebuilds/files/src/Lib.hs
@@ -0,0 +1,6 @@
+module Lib
+ ( func
+ ) where
+
+func :: IO ()
+func = putStrLn "Version 1"
diff --git a/tests/integration/tests/proper-rebuilds/files/src/Lib.v1 b/tests/integration/tests/proper-rebuilds/files/src/Lib.v1
new file mode 100644
index 0000000000..412990b09b
--- /dev/null
+++ b/tests/integration/tests/proper-rebuilds/files/src/Lib.v1
@@ -0,0 +1,6 @@
+module Lib
+ ( func
+ ) where
+
+func :: IO ()
+func = putStrLn "Version 1"
diff --git a/tests/integration/tests/proper-rebuilds/files/src/Lib.v2 b/tests/integration/tests/proper-rebuilds/files/src/Lib.v2
new file mode 100644
index 0000000000..98438cc36e
--- /dev/null
+++ b/tests/integration/tests/proper-rebuilds/files/src/Lib.v2
@@ -0,0 +1,6 @@
+module Lib
+ ( func
+ ) where
+
+func :: IO ()
+func = putStrLn "Version 2"
diff --git a/tests/integration/tests/proper-rebuilds/files/stack.yaml b/tests/integration/tests/proper-rebuilds/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/proper-rebuilds/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/relative-script-snapshots/Main.hs b/tests/integration/tests/relative-script-snapshots/Main.hs
new file mode 100644
index 0000000000..483add4c7d
--- /dev/null
+++ b/tests/integration/tests/relative-script-snapshots/Main.hs
@@ -0,0 +1,7 @@
+-- Stack's script interpreter supports snapshot locations that are relative
+-- local file paths.
+
+import           StackTest
+
+main :: IO ()
+main = stack ["subdir/script.hs"]
diff --git a/tests/integration/tests/relative-script-snapshots/files/subdir/mySnapshot.yaml b/tests/integration/tests/relative-script-snapshots/files/subdir/mySnapshot.yaml
new file mode 100644
index 0000000000..3ab8bcbe35
--- /dev/null
+++ b/tests/integration/tests/relative-script-snapshots/files/subdir/mySnapshot.yaml
@@ -0,0 +1,7 @@
+name: mySnapshot
+
+snapshot: ghc-9.10.3
+
+packages:
+- acme-missiles-0.3@rev:0
+- stm-2.5.0.0@rev:0
diff --git a/tests/integration/tests/relative-script-snapshots/files/subdir/script.hs b/tests/integration/tests/relative-script-snapshots/files/subdir/script.hs
new file mode 100644
index 0000000000..582c1d7b5a
--- /dev/null
+++ b/tests/integration/tests/relative-script-snapshots/files/subdir/script.hs
@@ -0,0 +1,7 @@
+#!/usr/bin/env stack
+-- stack --snapshot mySnapshot.yaml script
+
+import           Acme.Missiles ( launchMissiles )
+
+main :: IO ()
+main = launchMissiles
diff --git a/tests/integration/tests/sanity/Main.hs b/tests/integration/tests/sanity/Main.hs
new file mode 100644
index 0000000000..cb6f3f44bc
--- /dev/null
+++ b/tests/integration/tests/sanity/Main.hs
@@ -0,0 +1,26 @@
+-- | Various tests of Stack's sanity.
+
+import           Control.Monad ( unless )
+import           StackTest
+import           System.Directory ( doesFileExist )
+
+main :: IO ()
+main = do
+  stack ["--version"]
+  stack ["--help"]
+  removeDirIgnore "acme-missiles-0.2"
+  removeDirIgnore "acme-missiles-0.3"
+  stack ["unpack", "acme-missiles-0.2"]
+  stack ["unpack", "acme-missiles"]
+  stackErr ["command-does-not-exist"]
+  stackErr ["unpack", "invalid-package-name-"]
+
+  -- When running outside of IntegrationSpec.hs, this will use the
+  -- stack.yaml from Stack itself
+  exists <- doesFileExist "../../../../../stack.yaml"
+  unless exists $ stackErr ["build"]
+
+  doesNotExist "stack.yaml"
+
+  let scriptFile = if isWindows then "./script.bat" else "./script.sh"
+  stack [defaultSnapshotArg, "exec", scriptFile]
diff --git a/test/integration/tests/sanity/files/.gitignore b/tests/integration/tests/sanity/files/.gitignore
similarity index 100%
rename from test/integration/tests/sanity/files/.gitignore
rename to tests/integration/tests/sanity/files/.gitignore
diff --git a/test/integration/tests/sanity/files/foo.bat b/tests/integration/tests/sanity/files/script.bat
old mode 100755
new mode 100644
similarity index 100%
rename from test/integration/tests/sanity/files/foo.bat
rename to tests/integration/tests/sanity/files/script.bat
diff --git a/test/integration/tests/sanity/files/foo.sh b/tests/integration/tests/sanity/files/script.sh
similarity index 100%
rename from test/integration/tests/sanity/files/foo.sh
rename to tests/integration/tests/sanity/files/script.sh
diff --git a/tests/integration/tests/script-extra-dep/Main.hs b/tests/integration/tests/script-extra-dep/Main.hs
new file mode 100644
index 0000000000..b575ce035d
--- /dev/null
+++ b/tests/integration/tests/script-extra-dep/Main.hs
@@ -0,0 +1,6 @@
+-- Stack's script interpreter supports extra-deps.
+
+import           StackTest
+
+main :: IO ()
+main = stack ["script.hs"]
diff --git a/tests/integration/tests/script-extra-dep/files/script.hs b/tests/integration/tests/script-extra-dep/files/script.hs
new file mode 100644
index 0000000000..cbb5e52b49
--- /dev/null
+++ b/tests/integration/tests/script-extra-dep/files/script.hs
@@ -0,0 +1,7 @@
+#!/usr/bin/env stack
+-- stack --snapshot ghc-9.10.3 script --extra-dep acme-missiles-0.3@rev:0
+
+import Acme.Missiles ( launchMissiles )
+
+main :: IO ()
+main = launchMissiles
diff --git a/tests/integration/tests/skip-unreachable-dirs/Main.hs b/tests/integration/tests/skip-unreachable-dirs/Main.hs
new file mode 100644
index 0000000000..25983649fa
--- /dev/null
+++ b/tests/integration/tests/skip-unreachable-dirs/Main.hs
@@ -0,0 +1,12 @@
+-- | Stack's init command skips unreachable directories.
+
+import           Control.Exception ( IOException, catch)
+import           StackTest
+import           System.Directory
+
+main :: IO ()
+main = do
+  removeFileIgnore "stack.yaml"
+  createDirectory "unreachabledir" `catch` \(e :: IOException) -> pure ()
+  setPermissions  "unreachabledir" emptyPermissions
+  stack ["init"]
diff --git a/tests/integration/tests/skip-unreachable-dirs/files/.gitignore b/tests/integration/tests/skip-unreachable-dirs/files/.gitignore
new file mode 100644
index 0000000000..20fdd32928
--- /dev/null
+++ b/tests/integration/tests/skip-unreachable-dirs/files/.gitignore
@@ -0,0 +1,3 @@
+myPackage.cabal
+stack.yaml
+unreachabledir/
diff --git a/tests/integration/tests/skip-unreachable-dirs/files/package.yaml b/tests/integration/tests/skip-unreachable-dirs/files/package.yaml
new file mode 100644
index 0000000000..4b373ba746
--- /dev/null
+++ b/tests/integration/tests/skip-unreachable-dirs/files/package.yaml
@@ -0,0 +1,8 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+
+library: {}
diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs
new file mode 100644
index 0000000000..60cd2526ad
--- /dev/null
+++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs
@@ -0,0 +1,25 @@
+-- | The test case here is weird enough to warrant an explanation. What we
+-- _really_ want to test is whether building the lts-3.12 snapshot's
+-- semigroupoids package with rev-1 works. See
+-- https://github.com/commercialhaskell/stackage/issues/3185. However, that test
+-- requires that we use an older GHC, and as Manny commented:
+--
+--     > Having integration tests with old resolvers will cause them to fail
+--     > on Linux distributions with GCC with PIE enabled by default (which
+--     > is the latest versions of most distributions now), since older GHC
+--     > versions do not support it. I'm not sure what we should do about
+--     > this, since it obviously does make sense to be able to test against
+--     > old snapshots sometimes.
+--
+-- So I am instead testing a totally different case here which repros the
+-- same issue. If we use a custom snapshot with incompatible `stm` and
+-- `async` versions, we want Stack to trust the build plan and allow a
+-- `--dry-run` to succeed. But if we do this via `extra-deps`, we want it
+-- to fail.
+
+import           StackTest
+
+main :: IO ()
+main = do
+  stackErr ["build", "--stack-yaml", "stack1.yaml", "--dry-run"]
+  stack ["build", "--stack-yaml", "stack2.yaml", "--dry-run"]
diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/mySnapshot.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/mySnapshot.yaml
new file mode 100644
index 0000000000..0c602a1e79
--- /dev/null
+++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/mySnapshot.yaml
@@ -0,0 +1,8 @@
+name: mySnapshot
+
+snapshot: ghc-9.10.3
+
+packages:
+# The Cabal file for async-2.1.1.1 specifies stm >= 2.2
+- async-2.1.1.1
+- stm-2.1.2.2
diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml
new file mode 100644
index 0000000000..d04e500bd6
--- /dev/null
+++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml
@@ -0,0 +1,9 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- async
+
+library: {}
diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/stack1.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/stack1.yaml
new file mode 100644
index 0000000000..4813fc689c
--- /dev/null
+++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/stack1.yaml
@@ -0,0 +1,6 @@
+snapshot: ghc-9.10.3
+
+extra-deps:
+# The Cabal file for async-2.1.1.1 specifies stm >= 2.2
+- async-2.1.1.1
+- stm-2.1.2.2
diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/stack2.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/stack2.yaml
new file mode 100644
index 0000000000..5d99800320
--- /dev/null
+++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/stack2.yaml
@@ -0,0 +1 @@
+snapshot: mySnapshot.yaml
diff --git a/tests/integration/tests/upload/Main.hs b/tests/integration/tests/upload/Main.hs
new file mode 100644
index 0000000000..792d75e3e4
--- /dev/null
+++ b/tests/integration/tests/upload/Main.hs
@@ -0,0 +1,32 @@
+import           Control.Concurrent ( threadDelay )
+import           StackTest
+import           System.Directory
+                   ( createDirectoryIfMissing, getCurrentDirectory )
+import           System.Environment ( getEnv, setEnv )
+import           System.FilePath ( (</>) )
+import           System.Process ( proc, withCreateProcess )
+
+main :: IO ()
+main =
+  withFakeHackage $ do
+    stackRoot <- getEnv "STACK_ROOT"
+    -- Ensure there are credentials available for uploading
+    createDirectoryIfMissing True (stackRoot </> "upload")
+    writeFile
+      (stackRoot </> "upload" </> "credentials.json")
+      "{\"username\":\"fake\",\"password\":\"fake\"}"
+    stack ["upload", "."]
+
+-- | Start a fake Hackage server to test the upload
+withFakeHackage :: IO a -> IO a
+withFakeHackage act = do
+  stackEnv <- stackExe
+  -- Build the dependencies for the fake server
+  stack $ withNetworkArgs ++ ["FakeHackageStart.hs"]
+  -- Start the fake server
+  withCreateProcess (proc stackEnv $ withNetworkArgs ++ ["FakeHackage.hs"]) $ \_ _ _ _ -> do
+    -- Wait for the fake server to start accepting requests
+    threadDelay 3000000
+    act
+ where
+  withNetworkArgs = ["runghc", "--package", "network"]
diff --git a/tests/integration/tests/upload/files/.gitignore b/tests/integration/tests/upload/files/.gitignore
new file mode 100644
index 0000000000..b0a5a052a1
--- /dev/null
+++ b/tests/integration/tests/upload/files/.gitignore
@@ -0,0 +1 @@
+myPackage.cabal
diff --git a/tests/integration/tests/upload/files/FakeHackage.hs b/tests/integration/tests/upload/files/FakeHackage.hs
new file mode 100644
index 0000000000..3d39c7a445
--- /dev/null
+++ b/tests/integration/tests/upload/files/FakeHackage.hs
@@ -0,0 +1,32 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+import           Control.Concurrent ( forkIO, threadDelay )
+import           Control.Monad ( forever )
+import           Network.Socket hiding ( recv )
+import           Network.Socket.ByteString ( recv, sendAll )
+import           System.Exit ( exitSuccess )
+import           System.IO ()
+
+-- | Fake server that always responds with HTTP OK
+main =
+  withSocketsDo $ do
+    _ <- forkIO serve
+    -- Exit after a delay to ensure the process doesn't linger around
+    threadDelay 10000000
+    exitSuccess
+
+serve :: IO ()
+serve = do
+  let hints = defaultHints {addrFlags = [AI_PASSIVE], addrSocketType = Stream}
+  (addr:_) <- getAddrInfo (Just hints) Nothing (Just "12415")
+  sock <- socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr)
+  setSocketOption sock ReuseAddr 1
+  bind sock (addrAddress addr)
+  listen sock 10
+  forever $ do
+    (conn, _) <- accept sock
+    _ <- recv conn 1024
+    sendAll
+      conn
+      "HTTP/1.1 200 OK\r\nContent-Length: 1\r\nContent-Type: text/plain\r\n\r\na"
+    shutdown conn ShutdownSend
diff --git a/test/integration/tests/upload/files/FakeHackageStart.hs b/tests/integration/tests/upload/files/FakeHackageStart.hs
similarity index 100%
rename from test/integration/tests/upload/files/FakeHackageStart.hs
rename to tests/integration/tests/upload/files/FakeHackageStart.hs
diff --git a/test/integration/tests/upload/files/gpg-disabled/gpg b/tests/integration/tests/upload/files/gpg-disabled/gpg
old mode 100755
new mode 100644
similarity index 100%
rename from test/integration/tests/upload/files/gpg-disabled/gpg
rename to tests/integration/tests/upload/files/gpg-disabled/gpg
diff --git a/test/integration/tests/upload/files/gpg-disabled/gpg.bat b/tests/integration/tests/upload/files/gpg-disabled/gpg.bat
similarity index 100%
rename from test/integration/tests/upload/files/gpg-disabled/gpg.bat
rename to tests/integration/tests/upload/files/gpg-disabled/gpg.bat
diff --git a/test/integration/tests/upload/files/gpg-disabled/gpg2 b/tests/integration/tests/upload/files/gpg-disabled/gpg2
similarity index 100%
rename from test/integration/tests/upload/files/gpg-disabled/gpg2
rename to tests/integration/tests/upload/files/gpg-disabled/gpg2
diff --git a/test/integration/tests/upload/files/gpg-disabled/gpg2.bat b/tests/integration/tests/upload/files/gpg-disabled/gpg2.bat
similarity index 100%
rename from test/integration/tests/upload/files/gpg-disabled/gpg2.bat
rename to tests/integration/tests/upload/files/gpg-disabled/gpg2.bat
diff --git a/tests/integration/tests/upload/files/package.yaml b/tests/integration/tests/upload/files/package.yaml
new file mode 100644
index 0000000000..75c0d254af
--- /dev/null
+++ b/tests/integration/tests/upload/files/package.yaml
@@ -0,0 +1,11 @@
+spec-version: 0.36.0
+
+name: myPackage
+description: Upload test description
+license: BSD-3-Clause
+
+dependencies:
+- base < 5
+
+library:
+  source-dirs: src
diff --git a/tests/integration/tests/upload/files/src/Lib.hs b/tests/integration/tests/upload/files/src/Lib.hs
new file mode 100644
index 0000000000..6d85a26fe1
--- /dev/null
+++ b/tests/integration/tests/upload/files/src/Lib.hs
@@ -0,0 +1 @@
+module Lib where
diff --git a/tests/integration/tests/upload/files/stack.yaml b/tests/integration/tests/upload/files/stack.yaml
new file mode 100644
index 0000000000..87a5b85164
--- /dev/null
+++ b/tests/integration/tests/upload/files/stack.yaml
@@ -0,0 +1,3 @@
+snapshot: lts-24.55
+
+hackage-base-url: http://localhost:12415/
diff --git a/tests/integration/tests/variables-in-template-file-names/Main.hs b/tests/integration/tests/variables-in-template-file-names/Main.hs
new file mode 100644
index 0000000000..598874ea80
--- /dev/null
+++ b/tests/integration/tests/variables-in-template-file-names/Main.hs
@@ -0,0 +1,13 @@
+-- | A Stack project template can be populated with the name of the Stack
+-- project.
+
+import           Control.Monad ( unless )
+import           StackTest
+import           System.Directory ( doesFileExist )
+
+main :: IO ()
+main = do
+  removeDirIgnore "myPackage"
+  stack ["new", "myPackage", "./template.hsfiles"]
+  exists <- doesFileExist "myPackage/myPackage.cabal"
+  unless exists $ error "does not exist"
diff --git a/tests/integration/tests/variables-in-template-file-names/files/.gitignore b/tests/integration/tests/variables-in-template-file-names/files/.gitignore
new file mode 100644
index 0000000000..761adaef96
--- /dev/null
+++ b/tests/integration/tests/variables-in-template-file-names/files/.gitignore
@@ -0,0 +1 @@
+myPackage/
diff --git a/test/integration/tests/variables-in-template-file-names/files/template.hsfiles b/tests/integration/tests/variables-in-template-file-names/files/template.hsfiles
similarity index 100%
rename from test/integration/tests/variables-in-template-file-names/files/template.hsfiles
rename to tests/integration/tests/variables-in-template-file-names/files/template.hsfiles
diff --git a/tests/integration/tests/watched-files/Main.hs b/tests/integration/tests/watched-files/Main.hs
new file mode 100644
index 0000000000..3cd9840459
--- /dev/null
+++ b/tests/integration/tests/watched-files/Main.hs
@@ -0,0 +1,16 @@
+-- | Stack recompiles when a file required for compilation is dirty.
+
+import           Control.Monad ( unless )
+import           Data.Foldable ( for_ )
+import           StackTest
+
+main :: IO ()
+main = for_ (words "foo bar baz bin") $ \x -> do
+  writeFile "some-text-file.txt" x
+  stackCheckStdout ["run"] $ \y ->
+    unless (x == y) $ error $ concat
+      [ "Expected: "
+      , show x
+      , "\nActual:  "
+      , show y
+      ]
diff --git a/tests/integration/tests/watched-files/files/.gitignore b/tests/integration/tests/watched-files/files/.gitignore
new file mode 100644
index 0000000000..c93a3fc3e5
--- /dev/null
+++ b/tests/integration/tests/watched-files/files/.gitignore
@@ -0,0 +1,2 @@
+some-text-file.txt
+myPackage.cabal
diff --git a/tests/integration/tests/watched-files/files/app/Main.hs b/tests/integration/tests/watched-files/files/app/Main.hs
new file mode 100644
index 0000000000..34d36111aa
--- /dev/null
+++ b/tests/integration/tests/watched-files/files/app/Main.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE TemplateHaskell #-}
+
+module Main where
+
+import qualified Data.ByteString as B
+import           Data.FileEmbed ( embedFile )
+import           System.IO ( stdout )
+
+main :: IO ()
+main = B.hPut stdout $(embedFile "some-text-file.txt")
diff --git a/tests/integration/tests/watched-files/files/package.yaml b/tests/integration/tests/watched-files/files/package.yaml
new file mode 100644
index 0000000000..2132e12b97
--- /dev/null
+++ b/tests/integration/tests/watched-files/files/package.yaml
@@ -0,0 +1,13 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+dependencies:
+- base
+- bytestring
+- file-embed
+
+executables:
+  myExe:
+    source-dirs: app
+    main: Main.hs
diff --git a/tests/integration/tests/watched-files/files/stack.yaml b/tests/integration/tests/watched-files/files/stack.yaml
new file mode 100644
index 0000000000..a57c6e7a52
--- /dev/null
+++ b/tests/integration/tests/watched-files/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: lts-24.55
diff --git a/tests/unit/Spec.hs b/tests/unit/Spec.hs
new file mode 100644
index 0000000000..6dbd45d747
--- /dev/null
+++ b/tests/unit/Spec.hs
@@ -0,0 +1,2 @@
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
+{-# OPTIONS_GHC -F -pgmF hspec-discover   #-}
diff --git a/tests/unit/Stack/ArgsSpec.hs b/tests/unit/Stack/ArgsSpec.hs
new file mode 100644
index 0000000000..5732e344a1
--- /dev/null
+++ b/tests/unit/Stack/ArgsSpec.hs
@@ -0,0 +1,197 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedLists   #-}
+
+-- | Args parser test suite.
+
+module Stack.ArgsSpec
+  ( spec
+  , argsSpec
+  , argsInputOutput
+  , interpreterArgsSpec
+  ) where
+
+import           Data.Attoparsec.Args ( EscapingMode (..), parseArgsFromString )
+import           Data.Attoparsec.Interpreter ( interpreterArgsParser )
+import qualified Data.Attoparsec.Text as P
+import qualified Data.List.NonEmpty as NE
+import           Data.Text ( pack )
+import           Stack.Constants ( stackProgName )
+import           Stack.Prelude
+import           Test.Hspec ( Spec, describe, it )
+
+-- | Test spec.
+spec :: Spec
+spec = do
+    argsSpec
+    interpreterArgsSpec
+
+argsSpec :: Spec
+argsSpec = forM_ argsInputOutput
+    (\(input,output) -> it input (parseArgsFromString Escaping input == output))
+
+-- | Fairly comprehensive checks.
+argsInputOutput :: [(String, Either String [String])]
+argsInputOutput =
+    [ ("x", Right ["x"])
+    , ("x y z", Right ["x", "y", "z"])
+    , ("aaa bbb ccc", Right ["aaa", "bbb", "ccc"])
+    , ("    aaa    bbb    ccc   ", Right ["aaa", "bbb", "ccc"])
+    , ("aaa\"", Left "unterminated string: endOfInput")
+    , ("\"", Left "unterminated string: endOfInput")
+    , ("\"\"", Right [""])
+    , ("\"aaa", Left "unterminated string: endOfInput")
+    , ("\"aaa\" bbb ccc \"ddd\"", Right ["aaa", "bbb", "ccc", "ddd"])
+    , ("\"aa\\\"a\" bbb ccc \"ddd\"", Right ["aa\"a", "bbb", "ccc", "ddd"])
+    , ("\"aa\\\"a\" bb\\b ccc \"ddd\"", Right ["aa\"a", "bb\\b", "ccc", "ddd"])
+    , ("\"\" \"\" c", Right ["","","c"])]
+
+interpreterArgsSpec :: Spec
+interpreterArgsSpec =
+    describe "Script interpreter parser" $ do
+      describe "Success cases" $ do
+        describe "Line comments" $ do
+          checkLines ""
+          checkLines " --x"
+          checkLines " --x --y"
+        describe "Literate line comments" $ do
+          checkLiterateLines ""
+          checkLiterateLines " --x"
+          checkLiterateLines " --x --y"
+        describe "Block comments" $ do
+          checkBlocks ""
+          checkBlocks "\n"
+          checkBlocks " --x"
+          checkBlocks "\n--x"
+          checkBlocks " --x --y"
+          checkBlocks "\n--x\n--y"
+          checkBlocks "\n\t--x\n\t--y"
+        describe "Literate block comments" $ do
+          checkLiterateBlocks "" ""
+          checkLiterateBlocks "\n>" ""
+          checkLiterateBlocks " --x" " --x"
+          checkLiterateBlocks "\n>--x" "--x"
+          checkLiterateBlocks " --x --y " "--x --y"
+          checkLiterateBlocks "\n>--x\n>--y" "--x --y"
+          checkLiterateBlocks "\n>\t--x\n>\t--y" "--x --y"
+      describe "Failure cases" $ do
+        checkFailures
+        describe "Bare directives in literate files" $ do
+          forM_ (interpreterGenValid lineComment "") $
+            testAndCheck (acceptFailure True) ""
+          forM_ (interpreterGenValid blockComment "") $
+            testAndCheck (acceptFailure True) ""
+    where
+      parse isLiterate s =
+        P.parseOnly (interpreterArgsParser isLiterate stackProgName) (pack s)
+
+      acceptSuccess :: Bool -> String -> String -> Bool
+      acceptSuccess isLiterate args s = case parse isLiterate s of
+                               Right x | words x == words args -> True
+                               _ -> False
+
+      acceptFailure isLiterate _ s =  case parse isLiterate s of
+                           Left _ -> True
+                           Right _ -> False
+
+      testAndCheck checker out inp = it (show inp) $ checker out inp
+
+      checkLines args = forM_
+        (interpreterGenValid lineComment args)
+        (testAndCheck (acceptSuccess False) args)
+
+      checkLiterateLines args = forM_
+        (interpreterGenValid literateLineComment args)
+        (testAndCheck (acceptSuccess True) args)
+
+      checkBlocks args = forM_
+        (interpreterGenValid blockComment args)
+        (testAndCheck (acceptSuccess False) args)
+
+      checkLiterateBlocks inp args = forM_
+        (interpreterGenValid literateBlockComment inp)
+        (testAndCheck (acceptSuccess True) args)
+
+      checkFailures = forM_
+        interpreterGenInvalid
+        (testAndCheck (acceptFailure False) "unused")
+
+      -- Generate a set of acceptable inputs for given format and args
+      interpreterGenValid ::
+           (String -> NonEmpty String)
+        -> String
+        -> NonEmpty String
+      interpreterGenValid fmt args = shebang <++> newLine <++> fmt args
+
+      interpreterGenInvalid :: NonEmpty String
+      -- Generate a set of Invalid inputs
+      interpreterGenInvalid =
+        ["-stack\n"] -- random input
+        -- just the shebang
+        <> shebang <++> ["\n"]
+        -- invalid shebang
+        <> blockSpace <++> [NE.head (interpreterGenValid lineComment args)]
+        -- something between shebang and Stack comment
+        <> shebang
+            <++> newLine
+            <++> blockSpace
+            <++> ([NE.head (lineComment args)] <> [NE.head (blockComment args)])
+        -- unterminated block comment
+        -- just chop the closing chars from a valid block comment
+        <> shebang
+            <++> ["\n"]
+            <++> let c = NE.head (blockComment args)
+                     l = length c - 2
+                 in  [assert (drop l c == "-}") (take l c)]
+        -- nested block comment
+        <> shebang
+            <++> ["\n"]
+            <++> [NE.head (blockComment "--x {- nested -} --y")]
+       where
+        args = " --x --y"
+      (<++>) = liftA2 (<>)
+
+      -- Generative grammar for the interpreter comments
+      shebang :: NonEmpty String
+      shebang = ["#!/usr/bin/env stack"]
+
+      newLine :: NonEmpty String
+      newLine = ["\n"] <> ["\r\n"]
+
+      -- A comment may be the last line or followed by something else
+      postComment :: NonEmpty String
+      postComment = [""] <> newLine
+
+      -- A command starts with zero or more whitespace followed by "stack"
+      makeComment ::
+           (String -> String)
+        -> NonEmpty String
+        -> String
+        -> NonEmpty String
+      makeComment maker space args =
+        let makePrefix :: NonEmpty String -> NonEmpty String
+            makePrefix s = (s <> [""]) <++> [stackProgName]
+        in  (maker <$> (makePrefix space <&> (++ args))) <++> postComment
+
+      lineSpace :: NonEmpty String
+      lineSpace = [" "] <> ["\t"]
+
+      lineComment :: String -> NonEmpty String
+      lineComment = makeComment makeLine lineSpace
+       where
+        makeLine s = "--" ++ s
+
+      literateLineComment :: String -> NonEmpty String
+      literateLineComment = makeComment ("> --" ++) lineSpace
+
+      blockSpace :: NonEmpty String
+      blockSpace = lineSpace <> newLine
+
+      blockComment :: String -> NonEmpty String
+      blockComment = makeComment makeBlock blockSpace
+       where
+        makeBlock s = "{-" ++ s ++ "-}"
+
+      literateBlockComment :: String -> NonEmpty String
+      literateBlockComment = makeComment
+        (\s -> "> {-" ++ s ++ "-}")
+        (lineSpace <> NE.map (++ ">") newLine)
diff --git a/tests/unit/Stack/Build/ConstructPlanSpec.hs b/tests/unit/Stack/Build/ConstructPlanSpec.hs
new file mode 100644
index 0000000000..aac7d64fe8
--- /dev/null
+++ b/tests/unit/Stack/Build/ConstructPlanSpec.hs
@@ -0,0 +1,2866 @@
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
+
+module Stack.Build.ConstructPlanSpec
+  ( main
+  , spec
+  ) where
+
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import           Database.Persist ( PersistField (..), PersistValue (..) )
+import           Distribution.CabalSpecVersion ( CabalSpecVersion (..) )
+import           Distribution.Compiler ( PerCompilerFlavor (..) )
+import           Distribution.License ( License (BSD3) )
+import           Distribution.ModuleName ( ModuleName )
+import qualified Distribution.ModuleName as Cabal
+import           Distribution.PackageDescription
+                   ( BenchmarkInterface (..), BenchmarkType (..)
+                   , TestSuiteInterface (..), TestType (..)
+                   )
+import           Distribution.Types.BuildType
+                   ( BuildType (Configure, Custom, Simple) )
+import           Distribution.Types.IncludeRenaming
+                   ( IncludeRenaming (..), defaultIncludeRenaming )
+import           Distribution.Types.Mixin ( Mixin (..) )
+import           Distribution.Types.ModuleRenaming
+                   ( ModuleRenaming (..) )
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Types.Version ( mkVersion )
+import           Distribution.Types.VersionRange ( anyVersion )
+import qualified Stack.Build.Backpack as Backpack
+import           Stack.Build.ConstructPlan ( shouldSplitComponents )
+import           Stack.Build.ExecutePackage
+                   ( findGhcPkgId, mkInstantiateWithOpts )
+import           Stack.Package
+                   ( hasIntraPackageDeps, packageIsIndefinite
+                   , packageUsesBackpack
+                   )
+import           Stack.Prelude
+import           Stack.Types.Build.ConstructPlan ( AddDepRes (..) )
+import           Stack.Types.Cache ( CachePkgSrc (..), ConfigCacheType (..) )
+import           Stack.Types.CompCollection
+                   ( foldAndMakeCollection, getBuildableSet )
+import           Stack.Types.Component
+                   ( StackBenchmark (..), StackBuildInfo (..)
+                   , StackExecutable (..), StackForeignLibrary (..)
+                   , StackLibrary (..), StackTestSuite (..)
+                   )
+import           Stack.Types.ComponentUtils
+                   ( emptyCompName, unqualCompFromString )
+import           Stack.Types.Dependency
+                   ( DepLibrary (..), DepType (..), DepValue (..) )
+import           Stack.Types.Installed
+                   ( InstallLocation (..), Installed (..)
+                   , installedLibraryInfoFromGhcPkgId
+                   )
+import           Stack.Types.GhcPkgId ( GhcPkgId, parseGhcPkgId )
+import           Stack.Types.IsMutable ( IsMutable (..) )
+import           Stack.Types.NamedComponent
+                   ( NamedComponent (..), exeComponents )
+import           Stack.Types.Package
+                   ( Package (..), packageIdentifier, toCabalMungedPackageId )
+import           Stack.Types.PackageFile ( StackPackageFile (..) )
+import           Stack.Types.Plan
+                   ( ComponentKey (..), Task (..), TaskConfigOpts (..)
+                   , TaskType (..)
+                   )
+import           Test.Hspec
+                   ( Spec, describe, expectationFailure, hspec, it
+                   , shouldBe, shouldSatisfy
+                   )
+
+addInstantiationTasks ::
+     Map PackageName (Set ModuleName)
+  -> [(PackageName, AddDepRes)]
+  -> [(ComponentKey, AddDepRes)]
+  -> ([(ComponentKey, AddDepRes)], [StyleDoc])
+addInstantiationTasks installedModules =
+  Backpack.addInstantiationTasks installedModules Map.empty
+
+main :: IO ()
+main = hspec spec
+
+-- | A minimal StackBuildInfo suitable for testing. All lazy fields are empty
+-- lists/sets; buildable defaults to True, no dependencies.
+testBuildInfo :: StackBuildInfo
+testBuildInfo = StackBuildInfo
+  { buildable = True
+  , dependency = Map.empty
+  , unknownTools = Set.empty
+  , otherModules = []
+  , jsSources = []
+  , hsSourceDirs = []
+  , cSources = []
+  , cppOptions = []
+  , targetBuildDepends = []
+  , options = PerCompilerFlavor [] []
+  , allLanguages = []
+  , usedExtensions = []
+  , includeDirs = []
+  , extraLibs = []
+  , extraLibDirs = []
+  , frameworks = []
+  , mixins = []
+  }
+
+-- | A build info that declares a dependency on the package itself (Backpack).
+selfDepBuildInfo :: PackageName -> StackBuildInfo
+selfDepBuildInfo pn = testBuildInfo
+  { dependency = Map.singleton pn depVal }
+ where
+  depVal = DepValue
+    { versionRange = anyVersion
+    , depType = AsLibrary DepLibrary { main = True, subLib = Set.empty }
+    }
+
+-- | Create a minimal test Package.
+testPackage :: PackageName -> BuildType -> Package
+testPackage pn bt = Package
+  { name = pn
+  , version = mkVersion [1, 0, 0]
+  , license = Right BSD3
+  , ghcOptions = []
+  , cabalConfigOpts = []
+  , flags = Map.empty
+  , defaultFlags = Map.empty
+  , library = Nothing
+  , subLibraries = mempty
+  , foreignLibraries = mempty
+  , testSuites = mempty
+  , benchmarks = mempty
+  , executables = mempty
+  , buildType = bt
+  , setupDeps = Nothing
+  , cabalSpec = CabalSpecV2_0
+  , file = StackPackageFile
+      { extraSrcFiles = [], dataDir = "", dataFiles = [] }
+  , testEnabled = False
+  , benchmarkEnabled = False
+  }
+
+-- | Add a buildable main library to a package.
+withLibrary :: Package -> Package
+withLibrary pkg = pkg
+  { library = Just StackLibrary
+      { name = emptyCompName
+      , buildInfo = testBuildInfo
+      , exposedModules = []
+      , signatures = []
+      }
+  }
+
+-- | Add a buildable main library that depends on itself (Backpack pattern:
+-- main lib using internal sub-libs).
+withSelfDepLibrary :: Package -> Package
+withSelfDepLibrary pkg = pkg
+  { library = Just StackLibrary
+      { name = emptyCompName
+      , buildInfo = selfDepBuildInfo pkg.name
+      , exposedModules = []
+      , signatures = []
+      }
+  }
+
+-- | Add a buildable sub-library that depends on the same package (Backpack
+-- pattern: sub-library chains).
+withSelfDepSubLib :: Package -> Package
+withSelfDepSubLib pkg = pkg
+  { subLibraries = foldAndMakeCollection id
+      [ StackLibrary
+          { name = unqualCompFromString "internal"
+          , buildInfo = selfDepBuildInfo pkg.name
+          , exposedModules = []
+          , signatures = []
+          }
+      ]
+  }
+
+-- | Add a buildable main library with Backpack signatures (makes it indefinite).
+withIndefiniteLibrary :: [ModuleName] -> Package -> Package
+withIndefiniteLibrary sigs pkg = pkg
+  { library = Just StackLibrary
+      { name = emptyCompName
+      , buildInfo = testBuildInfo
+      , exposedModules = []
+      , signatures = sigs
+      }
+  }
+
+-- | Add buildable executables to a package.
+withExes :: [String] -> Package -> Package
+withExes names pkg = pkg
+  { executables = foldAndMakeCollection id
+      [ StackExecutable
+          { name = unqualCompFromString n
+          , buildInfo = testBuildInfo
+          , modulePath = "Main.hs"
+          }
+      | n <- names
+      ]
+  }
+
+-- | Add buildable executables that depend on the package's own library.
+-- This is the common Cabal pattern: @build-depends: my-package@.
+withSelfDepExes :: [String] -> Package -> Package
+withSelfDepExes names pkg = pkg
+  { executables = foldAndMakeCollection id
+      [ StackExecutable
+          { name = unqualCompFromString n
+          , buildInfo = selfDepBuildInfo pkg.name
+          , modulePath = "Main.hs"
+          }
+      | n <- names
+      ]
+  }
+
+-- | Add buildable test suites that depend on the package's own library.
+-- This is the common Cabal pattern: @build-depends: my-package@.
+withSelfDepTests :: [String] -> Package -> Package
+withSelfDepTests names pkg = pkg
+  { testSuites = foldAndMakeCollection id
+      [ StackTestSuite
+          { name = unqualCompFromString n
+          , buildInfo = selfDepBuildInfo pkg.name
+          , interface = TestSuiteUnsupported (TestTypeUnknown "" (mkVersion [0]))
+          }
+      | n <- names
+      ]
+  }
+
+-- | Add buildable sub-libraries to a package.
+withSubLibs :: [String] -> Package -> Package
+withSubLibs names pkg = pkg
+  { subLibraries = foldAndMakeCollection id
+      [ StackLibrary
+          { name = unqualCompFromString n
+          , buildInfo = testBuildInfo
+          , exposedModules = []
+          , signatures = []
+          }
+      | n <- names
+      ]
+  }
+
+-- | Add buildable foreign libraries to a package.
+withForeignLibs :: [String] -> Package -> Package
+withForeignLibs names pkg = pkg
+  { foreignLibraries = foldAndMakeCollection id
+      [ StackForeignLibrary
+          { name = unqualCompFromString n
+          , buildInfo = testBuildInfo
+          }
+      | n <- names
+      ]
+  }
+
+-- | Add buildable test suites to a package.
+withTests :: [String] -> Package -> Package
+withTests names pkg = pkg
+  { testSuites = foldAndMakeCollection id
+      [ StackTestSuite
+          { name = unqualCompFromString n
+          , buildInfo = testBuildInfo
+          , interface = TestSuiteUnsupported (TestTypeUnknown "" (mkVersion [0]))
+          }
+      | n <- names
+      ]
+  }
+
+-- | Add buildable benchmarks to a package.
+withBenchmarks :: [String] -> Package -> Package
+withBenchmarks names pkg = pkg
+  { benchmarks = foldAndMakeCollection id
+      [ StackBenchmark
+          { name = unqualCompFromString n
+          , buildInfo = testBuildInfo
+          , interface = BenchmarkUnsupported (BenchmarkTypeUnknown "" (mkVersion [0]))
+          }
+      | n <- names
+      ]
+  }
+
+spec :: Spec
+spec = do
+  describe "shouldSplitComponents" $ do
+    it "returns False for non-Backpack Simple package (no library)" $ do
+      let pkg = testPackage (mkPackageName "pkg") Simple
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns False for non-Backpack Simple package with library" $ do
+      let pkg = withLibrary $ testPackage (mkPackageName "pkg") Simple
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns False for non-Backpack Simple package with lib + exes" $ do
+      let pkg = withExes ["exe1", "exe2"]
+              $ withLibrary
+              $ testPackage (mkPackageName "pkg") Simple
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns False for Custom build type" $ do
+      let pkg = testPackage (mkPackageName "pkg") Custom
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns False for Configure build type" $ do
+      let pkg = testPackage (mkPackageName "pkg") Configure
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns False for indefinite (sig) package: hasIntraPackageDeps wins" $ do
+      let pkg = withIndefiniteLibrary ["Str"]
+              $ testPackage (mkPackageName "sig-pkg") Simple
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns False when main lib has Backpack self-dep" $ do
+      let pkg = withSelfDepLibrary $ testPackage (mkPackageName "pkg") Simple
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns False when sub-lib has Backpack self-dep" $ do
+      let pkg = withSelfDepSubLib $ testPackage (mkPackageName "pkg") Simple
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns True for Backpack consumer (lib with mixin)" $ do
+      let pkg = withMixins [defaultMixin (mkPackageName "sig-pkg")]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      shouldSplitComponents pkg `shouldBe` True
+
+    it "returns True for Backpack consumer with lib + exe + mixin" $ do
+      let pkg = withMixins [defaultMixin (mkPackageName "sig-pkg")]
+              $ withExes ["consumer-demo"]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      shouldSplitComponents pkg `shouldBe` True
+
+    it "returns False for multi-library Backpack consumer (B's clause)" $ do
+      let pkg = withMixins [defaultMixin (mkPackageName "sig-pkg")]
+              $ withSubLibs ["internal"]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      shouldSplitComponents pkg `shouldBe` False
+
+    it "returns False for non-Backpack Simple package with sublibs" $ do
+      let pkg = withSubLibs ["internal"]
+              $ withLibrary
+              $ testPackage (mkPackageName "pkg") Simple
+      shouldSplitComponents pkg `shouldBe` False
+
+  describe "packageUsesBackpack" $ do
+    it "returns False for empty package" $ do
+      let pkg = testPackage (mkPackageName "pkg") Simple
+      packageUsesBackpack pkg `shouldBe` False
+
+    it "returns False for plain library, no mixins, no signatures" $ do
+      let pkg = withLibrary $ testPackage (mkPackageName "pkg") Simple
+      packageUsesBackpack pkg `shouldBe` False
+
+    it "returns True when main library has signatures" $ do
+      let pkg = withIndefiniteLibrary ["Str"]
+              $ testPackage (mkPackageName "sig-pkg") Simple
+      packageUsesBackpack pkg `shouldBe` True
+
+    it "returns True when main library has a mixin" $ do
+      let pkg = withMixins [defaultMixin (mkPackageName "sig-pkg")]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      packageUsesBackpack pkg `shouldBe` True
+
+    it "returns True when sub-library has a mixin" $ do
+      let pkg = withSubLibMixins "internal" [defaultMixin (mkPackageName "sig-pkg")]
+              $ withSubLibs ["internal"]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      packageUsesBackpack pkg `shouldBe` True
+
+    it "returns True when foreign library has a mixin" $ do
+      let pkg = withForeignLibMixins "flib1" [defaultMixin (mkPackageName "sig-pkg")]
+              $ withForeignLibs ["flib1"]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      packageUsesBackpack pkg `shouldBe` True
+
+    it "returns True when executable has a mixin" $ do
+      let pkg = withExeMixins "app" [defaultMixin (mkPackageName "sig-pkg")]
+              $ withExes ["app"]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      packageUsesBackpack pkg `shouldBe` True
+
+    it "returns True when test suite has a mixin" $ do
+      let pkg = withTestMixins "spec" [defaultMixin (mkPackageName "sig-pkg")]
+              $ withTests ["spec"]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      packageUsesBackpack pkg `shouldBe` True
+
+    it "returns True when benchmark has a mixin" $ do
+      let pkg = withBenchMixins "bench" [defaultMixin (mkPackageName "sig-pkg")]
+              $ withBenchmarks ["bench"]
+              $ withLibrary
+              $ testPackage (mkPackageName "consumer") Simple
+      packageUsesBackpack pkg `shouldBe` True
+
+    it "returns False when package has components but none use Backpack" $ do
+      let pkg = withBenchmarks ["bench"]
+              $ withTests ["spec"]
+              $ withExes ["app"]
+              $ withForeignLibs ["flib1"]
+              $ withSubLibs ["internal"]
+              $ withLibrary
+              $ testPackage (mkPackageName "pkg") Simple
+      packageUsesBackpack pkg `shouldBe` False
+
+  describe "packageIsIndefinite" $ do
+    it "returns False for package without signatures" $ do
+      let pkg = withLibrary $ testPackage (mkPackageName "pkg") Simple
+      packageIsIndefinite pkg `shouldBe` False
+
+    it "returns True for package with signatures" $ do
+      let pkg = withIndefiniteLibrary ["Str"]
+              $ testPackage (mkPackageName "sig-pkg") Simple
+      packageIsIndefinite pkg `shouldBe` True
+
+    it "returns True for package with multiple signatures" $ do
+      let pkg = withIndefiniteLibrary ["Str", "Num"]
+              $ testPackage (mkPackageName "sig-pkg") Simple
+      packageIsIndefinite pkg `shouldBe` True
+
+    it "returns True for sub-library with signatures" $ do
+      let pkg = (withLibrary $ testPackage (mkPackageName "pkg") Simple)
+            { subLibraries = foldAndMakeCollection id
+                [ StackLibrary
+                    { name = unqualCompFromString "indef-sub"
+                    , buildInfo = testBuildInfo
+                    , exposedModules = []
+                    , signatures = ["Str"]
+                    }
+                ]
+            }
+      packageIsIndefinite pkg `shouldBe` True
+
+    it "returns False for package with no library" $ do
+      let pkg = withExes ["app"] $ testPackage (mkPackageName "pkg") Simple
+      packageIsIndefinite pkg `shouldBe` False
+
+  describe "hasIntraPackageDeps" $ do
+    it "returns False for plain library" $ do
+      let pkg = withLibrary $ testPackage (mkPackageName "pkg") Simple
+      hasIntraPackageDeps pkg `shouldBe` False
+
+    it "returns True when main lib depends on own sub-libs" $ do
+      let pkg = withSelfDepLibrary $ testPackage (mkPackageName "pkg") Simple
+      hasIntraPackageDeps pkg `shouldBe` True
+
+    it "returns True when sub-lib has self-dep" $ do
+      let pkg = withSelfDepSubLib $ testPackage (mkPackageName "pkg") Simple
+      hasIntraPackageDeps pkg `shouldBe` True
+
+    it "returns True for indefinite package (has signatures)" $ do
+      let pkg = withIndefiniteLibrary ["Str"]
+              $ testPackage (mkPackageName "sig-pkg") Simple
+      hasIntraPackageDeps pkg `shouldBe` True
+
+    it "returns False when only exes have self-dep" $ do
+      let pkg = withSelfDepExes ["app"]
+              $ withLibrary
+              $ testPackage (mkPackageName "pkg") Simple
+      hasIntraPackageDeps pkg `shouldBe` False
+
+    it "returns False when only tests have self-dep" $ do
+      let pkg = withSelfDepTests ["tests"]
+              $ withLibrary
+              $ testPackage (mkPackageName "pkg") Simple
+      hasIntraPackageDeps pkg `shouldBe` False
+
+  describe "per-component task expansion" $ do
+    describe "component enumeration" $ do
+      it "lib-only package produces [CLib]" $ do
+        let pkg = withLibrary $ testPackage (mkPackageName "pkg") Simple
+            comps = packageBuildableComponents pkg
+        comps `shouldBe` [CLib]
+
+      it "lib+exe package produces [CLib, CExe]" $ do
+        let pkg = withExes ["my-exe"]
+                $ withLibrary
+                $ testPackage (mkPackageName "pkg") Simple
+            comps = packageBuildableComponents pkg
+        comps `shouldSatisfy` (CLib `elem`)
+        comps `shouldSatisfy`
+          (CExe (unqualCompFromString "my-exe") `elem`)
+        length comps `shouldBe` 2
+
+      it "exe-only package (no lib) produces [CExe]" $ do
+        let pkg = withExes ["app"]
+                $ testPackage (mkPackageName "pkg") Simple
+            comps = packageBuildableComponents pkg
+        comps `shouldBe` [CExe (unqualCompFromString "app")]
+
+      it "package with sub-libraries produces CLib + CSubLib entries" $ do
+        let pkg = withSubLibs ["internal"]
+                $ withLibrary
+                $ testPackage (mkPackageName "pkg") Simple
+            comps = packageBuildableComponents pkg
+        length comps `shouldBe` 2
+        comps `shouldSatisfy` (CLib `elem`)
+        comps `shouldSatisfy`
+          (CSubLib (unqualCompFromString "internal") `elem`)
+
+      it "package with foreign libraries produces CFlib entries" $ do
+        let pkg = withForeignLibs ["cbits"]
+                $ withLibrary
+                $ testPackage (mkPackageName "pkg") Simple
+            comps = packageBuildableComponents pkg
+        length comps `shouldBe` 2
+        comps `shouldSatisfy` (CFlib (unqualCompFromString "cbits") `elem`)
+
+      it "package with multiple exes produces one CExe per exe" $ do
+        let pkg = withExes ["exe-a", "exe-b", "exe-c"]
+                $ testPackage (mkPackageName "pkg") Simple
+            comps = packageBuildableComponents pkg
+        length comps `shouldBe` 3
+
+      it "full package produces CLib + CSubLib + CFlib + CExe" $ do
+        let pkg = withExes ["app"]
+                $ withSubLibs ["sub"]
+                $ withForeignLibs ["ffi"]
+                $ withLibrary
+                $ testPackage (mkPackageName "pkg") Simple
+            comps = packageBuildableComponents pkg
+        length comps `shouldBe` 4
+
+      it "empty package (no components) produces empty list" $ do
+        let pkg = testPackage (mkPackageName "pkg") Simple
+            comps = packageBuildableComponents pkg
+        -- No library, no exes, no sub-libs, no foreign libs
+        -- expandToComponentKeys would fall back to CLib for this case
+        comps `shouldBe` []
+
+    describe "ComponentKey expansion" $ do
+      it "lib+exe package produces distinct ComponentKeys" $ do
+        let pn = mkPackageName "pkg"
+            pkg = withExes ["my-exe"]
+                $ withLibrary
+                $ testPackage pn Simple
+            keys = packageToComponentKeys pn False Set.empty pkg
+        Set.size (Set.fromList keys) `shouldBe` 2
+        keys `shouldSatisfy` (ComponentKey pn CLib `elem`)
+        keys `shouldSatisfy`
+          (ComponentKey pn (CExe (unqualCompFromString "my-exe")) `elem`)
+
+      it "empty splittable package returns no keys" $ do
+        let pn = mkPackageName "pkg"
+            pkg = testPackage pn Simple
+            keys = packageToComponentKeys pn False Set.empty pkg
+        keys `shouldBe` []
+
+      it "tests and benchmarks are NOT in build component keys" $ do
+        let pn = mkPackageName "pkg"
+            pkg = withTests ["test-suite"]
+                $ withBenchmarks ["bench"]
+                $ withLibrary
+                $ testPackage pn Simple
+            comps = packageBuildableComponents pkg
+        -- Tests and benchmarks go into finals, not build tasks
+        comps `shouldBe` [CLib]
+
+    describe "expandToComponentKeys exe filtering" $ do
+      let alpha = unqualCompFromString "alpha"
+          beta = unqualCompFromString "beta"
+
+      it "wanted=True, components={CExe alpha}: only alpha in keys" $ do
+        let pn = mkPackageName "foo"
+            pkg = withExes ["alpha", "beta"]
+                $ withLibrary
+                $ testPackage pn Simple
+            components = Set.singleton (CExe alpha)
+            keys = packageToComponentKeys pn True components pkg
+        Set.fromList keys `shouldBe` Set.fromList
+          [ ComponentKey pn CLib
+          , ComponentKey pn (CExe alpha)
+          ]
+
+      it "wanted=True, components has both exes: both keys present" $ do
+        let pn = mkPackageName "foo"
+            pkg = withExes ["alpha", "beta"]
+                $ withLibrary
+                $ testPackage pn Simple
+            components = Set.fromList [CExe alpha, CExe beta]
+            keys = packageToComponentKeys pn True components pkg
+        Set.fromList keys `shouldBe` Set.fromList
+          [ ComponentKey pn CLib
+          , ComponentKey pn (CExe alpha)
+          , ComponentKey pn (CExe beta)
+          ]
+
+      it "wanted=False: all buildable exes enumerated (legacy behavior)" $ do
+        let pn = mkPackageName "foo"
+            pkg = withExes ["alpha", "beta"]
+                $ withLibrary
+                $ testPackage pn Simple
+            keys = packageToComponentKeys pn False Set.empty pkg
+        Set.fromList keys `shouldBe` Set.fromList
+          [ ComponentKey pn CLib
+          , ComponentKey pn (CExe alpha)
+          , ComponentKey pn (CExe beta)
+          ]
+
+      it "wanted=True, empty components (stack build foo:lib): only CLib" $ do
+        let pn = mkPackageName "foo"
+            pkg = withExes ["alpha", "beta"]
+                $ withLibrary
+                $ testPackage pn Simple
+            keys = packageToComponentKeys pn True Set.empty pkg
+        keys `shouldBe` [ComponentKey pn CLib]
+
+      it "wanted=True, components={CTest}: no exes leak in" $ do
+        let pn = mkPackageName "foo"
+            tst = unqualCompFromString "tst"
+            pkg = withTests ["tst"]
+                $ withExes ["alpha", "beta"]
+                $ withLibrary
+                $ testPackage pn Simple
+            components = Set.singleton (CTest tst)
+            keys = packageToComponentKeys pn True components pkg
+        keys `shouldBe` [ComponentKey pn CLib]
+
+      it "wanted=True, components={CExe exe}: sublib still enumerated" $ do
+        -- Sublibs are not in lp.components and must not be filtered out.
+        let pn = mkPackageName "files"
+            exe = unqualCompFromString "exe"
+            sublib = unqualCompFromString "sublib"
+            pkg = withExes ["exe"]
+                $ withSubLibs ["sublib"]
+                $ testPackage pn Simple
+            components = Set.singleton (CExe exe)
+            keys = packageToComponentKeys pn True components pkg
+        Set.fromList keys `shouldBe` Set.fromList
+          [ ComponentKey pn (CSubLib sublib)
+          , ComponentKey pn (CExe exe)
+          ]
+
+      it "wanted=True, 3 exes, components targets 2: only those 2 emit" $ do
+        let pn = mkPackageName "foo"
+            gamma = unqualCompFromString "gamma"
+            pkg = withExes ["alpha", "beta", "gamma"]
+                $ withLibrary
+                $ testPackage pn Simple
+            components = Set.fromList [CExe alpha, CExe gamma]
+            keys = packageToComponentKeys pn True components pkg
+        Set.fromList keys `shouldBe` Set.fromList
+          [ ComponentKey pn CLib
+          , ComponentKey pn (CExe alpha)
+          , ComponentKey pn (CExe gamma)
+          ]
+
+      it "wanted=True, components={CBench}: no exes leak in" $ do
+        let pn = mkPackageName "foo"
+            b1 = unqualCompFromString "b1"
+            pkg = withBenchmarks ["b1"]
+                $ withExes ["alpha", "beta"]
+                $ withLibrary
+                $ testPackage pn Simple
+            components = Set.singleton (CBench b1)
+            keys = packageToComponentKeys pn True components pkg
+        keys `shouldBe` [ComponentKey pn CLib]
+
+    describe "expandToComponentKeys empty-allComps no fallback" $ do
+      it "test-only package, wanted=True: no keys" $ do
+        let pn = mkPackageName "pkg"
+            tst = unqualCompFromString "test"
+            pkg = withTests ["test"]
+                $ testPackage pn Simple
+            components = Set.singleton (CTest tst)
+            keys = packageToComponentKeys pn True components pkg
+        keys `shouldBe` []
+
+      it "bench-only package, wanted=True: no keys" $ do
+        let pn = mkPackageName "pkg"
+            b1 = unqualCompFromString "b1"
+            pkg = withBenchmarks ["b1"]
+                $ testPackage pn Simple
+            components = Set.singleton (CBench b1)
+            keys = packageToComponentKeys pn True components pkg
+        keys `shouldBe` []
+
+      it "tests + benches, no lib, wanted=True: no keys" $ do
+        let pn = mkPackageName "pkg"
+            tst = unqualCompFromString "test"
+            b1 = unqualCompFromString "b1"
+            pkg = withBenchmarks ["b1"]
+                $ withTests ["test"]
+                $ testPackage pn Simple
+            components = Set.fromList [CTest tst, CBench b1]
+            keys = packageToComponentKeys pn True components pkg
+        keys `shouldBe` []
+
+      it "test-only package, wanted=False: no keys" $ do
+        let pn = mkPackageName "pkg"
+            pkg = withTests ["test"]
+                $ testPackage pn Simple
+            keys = packageToComponentKeys pn False Set.empty pkg
+        keys `shouldBe` []
+
+      it "bench-only package, wanted=False: no keys" $ do
+        let pn = mkPackageName "pkg"
+            pkg = withBenchmarks ["b1"]
+                $ testPackage pn Simple
+            keys = packageToComponentKeys pn False Set.empty pkg
+        keys `shouldBe` []
+
+  describe "finals splitting" $ do
+    it "test components produce CTest keys" $ do
+      let pn = mkPackageName "pkg"
+          pkg = withTests ["suite-a", "suite-b"]
+              $ withLibrary
+              $ testPackage pn Simple
+          finalKeys = packageToFinalKeys pn pkg (Set.fromList
+            [ CTest (unqualCompFromString "suite-a")
+            , CTest (unqualCompFromString "suite-b")
+            ])
+      length finalKeys `shouldBe` 2
+      finalKeys `shouldSatisfy`
+        (ComponentKey pn (CTest (unqualCompFromString "suite-a")) `elem`)
+      finalKeys `shouldSatisfy`
+        (ComponentKey pn (CTest (unqualCompFromString "suite-b")) `elem`)
+
+    it "bench components produce CBench keys" $ do
+      let pn = mkPackageName "pkg"
+          pkg = withBenchmarks ["bench-a"]
+              $ withLibrary
+              $ testPackage pn Simple
+          finalKeys = packageToFinalKeys pn pkg (Set.fromList
+            [ CBench (unqualCompFromString "bench-a")
+            ])
+      finalKeys `shouldBe`
+        [ComponentKey pn (CBench (unqualCompFromString "bench-a"))]
+
+    it "mixed test+bench components produce both keys" $ do
+      let pn = mkPackageName "pkg"
+          pkg = withTests ["tests"]
+              $ withBenchmarks ["bench"]
+              $ withLibrary
+              $ testPackage pn Simple
+          finalKeys = packageToFinalKeys pn pkg (Set.fromList
+            [ CTest (unqualCompFromString "tests")
+            , CBench (unqualCompFromString "bench")
+            ])
+      length finalKeys `shouldBe` 2
+
+    it "empty components for splittable package falls back to CLib" $ do
+      let pn = mkPackageName "pkg"
+          pkg = withLibrary $ testPackage pn Simple
+          finalKeys = packageToFinalKeys pn pkg Set.empty
+      finalKeys `shouldBe` [ComponentKey pn CLib]
+
+  describe "addInstantiationTasks" $ do
+    it "no mixins → no instantiation tasks added" $ do
+      let consumerPn = mkPackageName "consumer"
+          consumerPkg = withLibrary $ testPackage consumerPn Simple
+          consumerTask = mockTask consumerPkg
+          origAdrs = [(consumerPn, ADRToInstall consumerTask)]
+          expanded = [(ComponentKey consumerPn CLib, ADRToInstall consumerTask)]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+      -- No CInst tasks should be created.
+      let instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+
+    it "mixin referencing indefinite dep creates CInst task" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instEntries = [ (ck, t)
+                        | (ck@(ComponentKey pn (CInst _)), ADRToInstall t)
+                            <- result
+                        , pn == sigPn
+                        ]
+      -- Exactly one CInst task for sig-pkg.
+      length instEntries `shouldBe` 1
+
+    it "CInst task has correct backpackInstEntries" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instTasks = [ t
+                      | (ComponentKey pn (CInst _), ADRToInstall t) <- result
+                      , pn == sigPn
+                      ]
+      case instTasks of
+        [t] -> do
+          let entries = t.backpackInstEntries
+          length entries `shouldBe` 1
+          case entries of
+            [(sig, ipn, imod)] -> do
+              sig `shouldBe` mn "Str"
+              ipn `shouldBe` implPn
+              imod `shouldBe` mn "Str"
+            _ -> error "unexpected entries length"
+        _ -> error "expected exactly one CInst task"
+
+    it "CInst task's missing includes impl-pkg dep" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instTasks = [ t
+                      | (ComponentKey pn (CInst _), ADRToInstall t) <- result
+                      , pn == sigPn
+                      ]
+      case instTasks of
+        [t] ->
+          -- The CInst task's missing should include impl-pkg's identifier.
+          Set.member (packageIdentifier implPkg) t.configOpts.missing
+            `shouldBe` True
+        _ -> error "expected exactly one CInst task"
+
+    it "consumer's instantiationDeps includes the CInst key" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          consumerTasks = [ t
+                          | (ComponentKey pn CLib, ADRToInstall t) <- result
+                          , pn == consumerPn
+                          ]
+      case consumerTasks of
+        [t] -> do
+          let deps = t.configOpts.instantiationDeps
+          length deps `shouldBe` 1
+          case deps of
+            [ComponentKey pn (CInst _)] -> pn `shouldBe` sigPn
+            _ -> error "expected CInst dep on sig-pkg"
+        _ -> error "expected exactly one consumer task"
+
+    it "mixin referencing non-indefinite dep creates no CInst task" $ do
+      let depPn = mkPackageName "dep-pkg"
+          consumerPn = mkPackageName "consumer"
+          -- dep-pkg has a library but NO signatures (not indefinite).
+          depPkg = withExposingLibrary [mn "Foo"]
+                 $ testPackage depPn Simple
+          consumerPkg = withDeps [depPn]
+                      $ withMixins [defaultMixin depPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          depTask = mockTask depPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (depPn, ADRToInstall depTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey depPn CLib, ADRToInstall depTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+
+    it "multiple signatures produce single CInst with multiple entries" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str", mn "Num"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str", mn "Num"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instTasks = [ t
+                      | (ComponentKey pn (CInst _), ADRToInstall t) <- result
+                      , pn == sigPn
+                      ]
+      case instTasks of
+        [t] -> length t.backpackInstEntries `shouldBe` 2
+        _ -> error "expected exactly one CInst task"
+
+    it "DefaultRenaming maps signatures to identity" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instTasks = [ t
+                      | (ComponentKey pn (CInst _), ADRToInstall t) <- result
+                      , pn == sigPn
+                      ]
+      case instTasks of
+        [t] -> case t.backpackInstEntries of
+          [(sig, _, implMod)] -> do
+            -- With DefaultRenaming, sig name == impl module name.
+            sig `shouldBe` mn "Str"
+            implMod `shouldBe` mn "Str"
+          _ -> error "expected one entry"
+        _ -> error "expected one CInst task"
+
+    it "CInst task's missing preserves sig-pkg's original missing" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          extraDepPn = mkPackageName "extra-dep"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          -- Give sigTask a pre-existing missing dep.
+          extraDepPid = PackageIdentifier extraDepPn (mkVersion [2, 0])
+          sigTask = (mockTask sigPkg)
+            { configOpts = (mockTask sigPkg).configOpts
+                { missing = Set.singleton extraDepPid }
+            }
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instTasks = [ t
+                      | (ComponentKey pn (CInst _), ADRToInstall t) <- result
+                      , pn == sigPn
+                      ]
+      case instTasks of
+        [t] -> do
+          -- Should contain both the original extra-dep AND impl-pkg.
+          Set.member extraDepPid t.configOpts.missing `shouldBe` True
+          Set.member (packageIdentifier implPkg) t.configOpts.missing
+            `shouldBe` True
+        _ -> error "expected exactly one CInst task"
+
+    it "explicit ModuleRenaming maps sig to renamed module" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          -- sig-pkg has signature "Str"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- impl-pkg exposes "Data.Text.Impl" (not "Str")
+          implPkg = withExposingLibrary [mn "Data.Text.Impl"]
+                  $ testPackage implPn Simple
+          -- consumer uses explicit renaming: Str = Data.Text.Impl
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins
+                      [explicitRequiresMixin sigPn [(mn "Str", mn "Data.Text.Impl")]]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instTasks = [ t
+                      | (ComponentKey pn (CInst _), ADRToInstall t) <- result
+                      , pn == sigPn
+                      ]
+      case instTasks of
+        [t] -> case t.backpackInstEntries of
+          [(sig, ipn, implMod)] -> do
+            sig `shouldBe` mn "Str"
+            ipn `shouldBe` implPn
+            implMod `shouldBe` mn "Data.Text.Impl"
+          _ -> error "expected one entry"
+        _ -> error "expected one CInst task"
+
+    it "HidingRenaming hiding nothing instantiates all sigs" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          hidingMixin = Mixin
+            { mixinPackageName = sigPn
+            , mixinLibraryName = LMainLibName
+            , mixinIncludeRenaming = IncludeRenaming
+                { includeProvidesRn = DefaultRenaming
+                , includeRequiresRn = HidingRenaming []
+                }
+            }
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [hidingMixin]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      length instKeys `shouldBe` 1
+      length warnings `shouldBe` 0
+
+    it "HidingRenaming with actual hidden sigs produces no CInst" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str", mn "Num"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str", mn "Num"]
+                  $ testPackage implPn Simple
+          -- Hide "Str" — can't fully instantiate, so no CInst.
+          hidingMixin = Mixin
+            { mixinPackageName = sigPn
+            , mixinLibraryName = LMainLibName
+            , mixinIncludeRenaming = IncludeRenaming
+                { includeProvidesRn = DefaultRenaming
+                , includeRequiresRn = HidingRenaming [mn "Str"]
+                }
+            }
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [hidingMixin]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      -- Partial instantiation not possible — no CInst, no warning.
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 0
+
+    it "HidingRenaming hiding all sigs produces no CInst" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          hidingMixin = Mixin
+            { mixinPackageName = sigPn
+            , mixinLibraryName = LMainLibName
+            , mixinIncludeRenaming = IncludeRenaming
+                { includeProvidesRn = DefaultRenaming
+                , includeRequiresRn = HidingRenaming [mn "Str"]
+                }
+            }
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [hidingMixin]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 0
+
+    it "no CInst when no dep exposes the required module, with warning" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- impl-pkg exposes "Foo" not "Str"
+          implPkg = withExposingLibrary [mn "Foo"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "ADRFound dep for sig-pkg is skipped with warning" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          consumerPn = mkPackageName "consumer"
+          consumerPkg = withDeps [sigPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          consumerTask = mockTask consumerPkg
+          sigPid = PackageIdentifier sigPn (mkVersion [1, 0])
+          sigFound = ADRFound Snap (Library sigPid
+                       (installedLibraryInfoFromGhcPkgId
+                         (error "ghcPkgId not needed")))
+          origAdrs =
+            [ (sigPn, sigFound)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, sigFound)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "successful resolution produces no warnings" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      length instKeys `shouldBe` 1
+      warnings `shouldSatisfy` null
+
+    it "CInst hash is deterministic for same entries" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result1, _) = addInstantiationTasks Map.empty origAdrs expanded
+          (result2, _) = addInstantiationTasks Map.empty origAdrs expanded
+          getHash rs =
+            [ h | (ComponentKey _ (CInst h), _) <- rs ]
+      getHash result1 `shouldBe` getHash result2
+      getHash result1 `shouldSatisfy` (not . null)
+
+    it "deduplicates CInst tasks from multiple consumer components" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          -- Consumer has both a library and an exe, both with the same mixin
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withExes ["demo"]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          -- Two consumer components in expanded: CLib and CExe
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            , ( ComponentKey consumerPn
+                  (CExe (unqualCompFromString "demo"))
+              , ADRToInstall consumerTask
+              )
+            ]
+          (result, _warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      -- Should produce exactly one CInst entry, not two
+      length instKeys `shouldBe` 1
+
+    it "multiple deps exposing same module produces warning and no CInst" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn1 = mkPackageName "impl-a"
+          implPn2 = mkPackageName "impl-b"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- Both impl packages expose the same module "Str"
+          implPkg1 = withExposingLibrary [mn "Str"]
+                   $ testPackage implPn1 Simple
+          implPkg2 = withExposingLibrary [mn "Str"]
+                   $ testPackage implPn2 Simple
+          consumerPkg = withDeps [sigPn, implPn1, implPn2]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask1 = mockTask implPkg1
+          implTask2 = mockTask implPkg2
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn1, ADRToInstall implTask1)
+            , (implPn2, ADRToInstall implTask2)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn1 CLib, ADRToInstall implTask1)
+            , (ComponentKey implPn2 CLib, ADRToInstall implTask2)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "partial resolution: one sig resolves, one warns" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          -- sig-pkg has two signatures: Str and Map
+          sigPkg = withIndefiniteLibrary [mn "Str", mn "Map"]
+                 $ testPackage sigPn Simple
+          -- impl-pkg only exposes Str, not Map
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instTasks = [ t
+                      | (ComponentKey _ (CInst _), ADRToInstall t) <- result
+                      ]
+      -- Str resolves so CInst is created, but Map warns
+      length instTasks `shouldBe` 1
+      length (concatMap (.backpackInstEntries) instTasks) `shouldBe` 1
+      length warnings `shouldBe` 1
+
+    it "ModuleRenaming with unresolvable module produces warning" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- impl-pkg exposes Foo, not RenamedStr
+          implPkg = withExposingLibrary [mn "Foo"]
+                  $ testPackage implPn Simple
+          renameMixin = Mixin
+            { mixinPackageName = sigPn
+            , mixinLibraryName = LMainLibName
+            , mixinIncludeRenaming = IncludeRenaming
+                { includeProvidesRn = DefaultRenaming
+                , includeRequiresRn =
+                    ModuleRenaming [(mn "Str", mn "RenamedStr")]
+                }
+            }
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [renameMixin]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "non-indefinite mixin dep produces no warning" $ do
+      let regularPn = mkPackageName "regular-pkg"
+          consumerPn = mkPackageName "consumer"
+          -- regular-pkg is NOT indefinite (no signatures)
+          regularPkg = withExposingLibrary [mn "Foo"]
+                     $ testPackage regularPn Simple
+          consumerPkg = withDeps [regularPn]
+                      $ withMixins [defaultMixin regularPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          regularTask = mockTask regularPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (regularPn, ADRToInstall regularTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey regularPn CLib, ADRToInstall regularTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      warnings `shouldSatisfy` null
+
+    it "sub-library mixin creates CInst task" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          -- Consumer has the mixin on a sub-library, not the main library
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withSubLibMixins "internal" [defaultMixin sigPn]
+                      $ withSubLibs ["internal"]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      length instKeys `shouldBe` 1
+      warnings `shouldSatisfy` null
+
+    it "impl module in sub-library is found" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- impl-pkg exposes Str only via a sub-library, not the main library
+          implPkg = withExposingSubLib "internal" [mn "Str"]
+                  $ withLibrary
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      length instKeys `shouldBe` 1
+      warnings `shouldSatisfy` null
+
+    it "sub-library mixin + sub-library impl module resolves" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- impl-pkg exposes Str only via sub-library
+          implPkg = withExposingSubLib "str-impl" [mn "Str"]
+                  $ withLibrary
+                  $ testPackage implPn Simple
+          -- consumer has mixin on its sub-library
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withSubLibMixins "uses-sig" [defaultMixin sigPn]
+                      $ withSubLibs ["uses-sig"]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      length instKeys `shouldBe` 1
+      warnings `shouldSatisfy` null
+
+    it "main lib and sub-lib both with same mixin deduplicates CInst" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          -- Both main library and sub-library reference the same mixin
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withSubLibMixins "internal" [defaultMixin sigPn]
+                      $ withSubLibs ["internal"]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      -- Same mixin → same hash → deduplicated to one CInst
+      length instKeys `shouldBe` 1
+      warnings `shouldSatisfy` null
+
+    it "impl module exposed by both main lib and sub-lib is not ambiguous" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- impl-pkg exposes Str in both main library and sub-library
+          implPkg = withExposingSubLib "extra" [mn "Str"]
+                  $ withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      -- Same package exposes it — should resolve (not count as two candidates)
+      length instKeys `shouldBe` 1
+      warnings `shouldSatisfy` null
+
+    it "sub-lib with no mixins produces no CInst" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          -- Sub-library exists but has no mixins; only main lib matters
+          consumerPkg = withSubLibs ["internal"]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      warnings `shouldSatisfy` null
+
+    it "transitive chain: inherited sigs filled in CInst" $ do
+      -- str-sig (indefinite, sig: Str)
+      -- logger-sig (indefinite, sig: Logger, depends on str-sig)
+      -- impl-pkg (concrete, exposes: Str, Logger)
+      -- consumer (mixins: logger-sig requires (Logger as Logger))
+      -- logger-sig CInst must fill BOTH Logger (own) and Str (inherited)
+      let strSigPn = mkPackageName "str-sig"
+          loggerSigPn = mkPackageName "logger-sig"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          strSigPkg = withIndefiniteLibrary [mn "Str"]
+                    $ testPackage strSigPn Simple
+          loggerSigPkg = withIndefiniteLibraryDeps [mn "Logger"] [strSigPn]
+                       $ testPackage loggerSigPn Simple
+          implPkg = withExposingLibrary [mn "Str", mn "Logger"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [strSigPn, loggerSigPn, implPn]
+                      $ withMixins [defaultMixin loggerSigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          strSigTask = mockTask strSigPkg
+          loggerSigTask = mockTask loggerSigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (strSigPn, ADRToInstall strSigTask)
+            , (loggerSigPn, ADRToInstall loggerSigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey strSigPn CLib, ADRToInstall strSigTask)
+            , (ComponentKey loggerSigPn CLib, ADRToInstall loggerSigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instEntries = [ (ck, t.backpackInstEntries)
+                        | (ck@(ComponentKey pn (CInst _)), ADRToInstall t)
+                            <- result
+                        , pn == loggerSigPn
+                        ]
+      -- Exactly one CInst for logger-sig
+      length instEntries `shouldBe` 1
+      -- The CInst must have entries for BOTH Logger and Str
+      case instEntries of
+        [(_, entries)] -> do
+          let sigNames = map (\(s, _, _) -> s) entries
+          sigNames `shouldSatisfy` (mn "Logger" `elem`)
+          sigNames `shouldSatisfy` (mn "Str" `elem`)
+        _ -> error "expected exactly one CInst"
+      warnings `shouldSatisfy` null
+
+    it "transitive chain: no inherited sigs from concrete dep" $ do
+      -- sig-pkg (indefinite, sig: Str)
+      -- concrete-dep (concrete lib, depends on sig-pkg in build-depends)
+      -- consumer (mixins: sig-pkg)
+      -- sig-pkg CInst should only fill Str (no inherited sigs from concrete)
+      let sigPn = mkPackageName "sig-pkg"
+          concretePn = mkPackageName "concrete-dep"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- concrete-dep is NOT indefinite — just a regular package
+          concretePkg = withLibrary $ testPackage concretePn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          concreteTask = mockTask concretePkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (concretePn, ADRToInstall concreteTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey concretePn CLib, ADRToInstall concreteTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instEntries = [ (ck, t.backpackInstEntries)
+                        | (ck@(ComponentKey pn (CInst _)), ADRToInstall t)
+                            <- result
+                        , pn == sigPn
+                        ]
+      length instEntries `shouldBe` 1
+      case instEntries of
+        [(_, entries)] -> do
+          let sigNames = map (\(s, _, _) -> s) entries
+          sigNames `shouldBe` [mn "Str"]
+        _ -> error "expected exactly one CInst"
+      warnings `shouldSatisfy` null
+
+    it "three-level transitive chain fills all inherited sigs" $ do
+      -- base-sig (indefinite, sig: Base)
+      -- mid-sig (indefinite, sig: Mid, depends on base-sig)
+      -- top-sig (indefinite, sig: Top, depends on mid-sig)
+      -- impl (concrete, exposes: Base, Mid, Top)
+      -- consumer (mixins: top-sig)
+      -- top-sig CInst must fill Top (own) + Mid (from mid-sig) + Base (from
+      -- base-sig, transitively)
+      let baseSigPn = mkPackageName "base-sig"
+          midSigPn = mkPackageName "mid-sig"
+          topSigPn = mkPackageName "top-sig"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          baseSigPkg = withIndefiniteLibrary [mn "Base"]
+                     $ testPackage baseSigPn Simple
+          midSigPkg = withIndefiniteLibraryDeps [mn "Mid"] [baseSigPn]
+                    $ testPackage midSigPn Simple
+          topSigPkg = withIndefiniteLibraryDeps [mn "Top"] [midSigPn]
+                    $ testPackage topSigPn Simple
+          implPkg = withExposingLibrary [mn "Base", mn "Mid", mn "Top"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [baseSigPn, midSigPn, topSigPn, implPn]
+                      $ withMixins [defaultMixin topSigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          baseSigTask = mockTask baseSigPkg
+          midSigTask = mockTask midSigPkg
+          topSigTask = mockTask topSigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (baseSigPn, ADRToInstall baseSigTask)
+            , (midSigPn, ADRToInstall midSigTask)
+            , (topSigPn, ADRToInstall topSigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey baseSigPn CLib, ADRToInstall baseSigTask)
+            , (ComponentKey midSigPn CLib, ADRToInstall midSigTask)
+            , (ComponentKey topSigPn CLib, ADRToInstall topSigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          topInstEntries = [ t.backpackInstEntries
+                           | (ComponentKey pn (CInst _), ADRToInstall t)
+                               <- result
+                           , pn == topSigPn
+                           ]
+      length topInstEntries `shouldBe` 1
+      case topInstEntries of
+        [entries] -> do
+          let sigNames = map (\(s, _, _) -> s) entries
+          length sigNames `shouldBe` 3
+          sigNames `shouldSatisfy` (mn "Top" `elem`)
+          sigNames `shouldSatisfy` (mn "Mid" `elem`)
+          sigNames `shouldSatisfy` (mn "Base" `elem`)
+        _ -> error "expected exactly one CInst for top-sig"
+      warnings `shouldSatisfy` null
+
+    it "diamond deps: shared indefinite dep's sigs not duplicated" $ do
+      -- common-sig (indefinite, sig: Common)
+      -- a-sig (indefinite, sig: SigA, depends on common-sig)
+      -- b-sig (indefinite, sig: SigB, depends on common-sig)
+      -- top-sig (indefinite, sig: Top, depends on a-sig AND b-sig)
+      -- impl (concrete, exposes: Common, SigA, SigB, Top)
+      -- consumer (mixins: top-sig)
+      -- top-sig CInst must fill Top + SigA + SigB + Common (no duplicates)
+      let commonSigPn = mkPackageName "common-sig"
+          aSigPn = mkPackageName "a-sig"
+          bSigPn = mkPackageName "b-sig"
+          topSigPn = mkPackageName "top-sig"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          commonSigPkg = withIndefiniteLibrary [mn "Common"]
+                       $ testPackage commonSigPn Simple
+          aSigPkg = withIndefiniteLibraryDeps [mn "SigA"] [commonSigPn]
+                  $ testPackage aSigPn Simple
+          bSigPkg = withIndefiniteLibraryDeps [mn "SigB"] [commonSigPn]
+                  $ testPackage bSigPn Simple
+          topSigPkg = withIndefiniteLibraryDeps [mn "Top"] [aSigPn, bSigPn]
+                    $ testPackage topSigPn Simple
+          implPkg = withExposingLibrary [mn "Common", mn "SigA", mn "SigB", mn "Top"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [commonSigPn, aSigPn, bSigPn, topSigPn, implPn]
+                      $ withMixins [defaultMixin topSigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          commonSigTask = mockTask commonSigPkg
+          aSigTask = mockTask aSigPkg
+          bSigTask = mockTask bSigPkg
+          topSigTask = mockTask topSigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (commonSigPn, ADRToInstall commonSigTask)
+            , (aSigPn, ADRToInstall aSigTask)
+            , (bSigPn, ADRToInstall bSigTask)
+            , (topSigPn, ADRToInstall topSigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey commonSigPn CLib, ADRToInstall commonSigTask)
+            , (ComponentKey aSigPn CLib, ADRToInstall aSigTask)
+            , (ComponentKey bSigPn CLib, ADRToInstall bSigTask)
+            , (ComponentKey topSigPn CLib, ADRToInstall topSigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          topInstEntries = [ t.backpackInstEntries
+                           | (ComponentKey pn (CInst _), ADRToInstall t)
+                               <- result
+                           , pn == topSigPn
+                           ]
+      length topInstEntries `shouldBe` 1
+      case topInstEntries of
+        [entries] -> do
+          let sigNames = map (\(s, _, _) -> s) entries
+          -- Exactly 4 unique sigs: Top (own) + SigA + SigB + Common (inherited)
+          -- Common should NOT appear twice despite diamond.
+          length sigNames `shouldBe` 4
+          sigNames `shouldSatisfy` (mn "Top" `elem`)
+          sigNames `shouldSatisfy` (mn "SigA" `elem`)
+          sigNames `shouldSatisfy` (mn "SigB" `elem`)
+          sigNames `shouldSatisfy` (mn "Common" `elem`)
+        _ -> error "expected exactly one CInst for top-sig"
+      warnings `shouldSatisfy` null
+
+    it "inherited sig not resolvable produces warning" $ do
+      -- str-sig (indefinite, sig: Str)
+      -- logger-sig (indefinite, sig: Logger, depends on str-sig)
+      -- impl-pkg only exposes Logger, NOT Str
+      -- consumer (mixins: logger-sig)
+      -- The inherited Str cannot be resolved → warning
+      let strSigPn = mkPackageName "str-sig"
+          loggerSigPn = mkPackageName "logger-sig"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          strSigPkg = withIndefiniteLibrary [mn "Str"]
+                    $ testPackage strSigPn Simple
+          loggerSigPkg = withIndefiniteLibraryDeps [mn "Logger"] [strSigPn]
+                       $ testPackage loggerSigPn Simple
+          -- impl-pkg only has Logger, NOT Str
+          implPkg = withExposingLibrary [mn "Logger"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [strSigPn, loggerSigPn, implPn]
+                      $ withMixins [defaultMixin loggerSigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          strSigTask = mockTask strSigPkg
+          loggerSigTask = mockTask loggerSigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (strSigPn, ADRToInstall strSigTask)
+            , (loggerSigPn, ADRToInstall loggerSigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey strSigPn CLib, ADRToInstall strSigTask)
+            , (ComponentKey loggerSigPn CLib, ADRToInstall loggerSigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instEntries = [ t.backpackInstEntries
+                        | (ComponentKey pn (CInst _), ADRToInstall t)
+                            <- result
+                        , pn == loggerSigPn
+                        ]
+      -- CInst still created (for the Logger sig that resolves)
+      length instEntries `shouldBe` 1
+      case instEntries of
+        [entries] -> do
+          let sigNames = map (\(s, _, _) -> s) entries
+          -- Only Logger resolved; Str could not be found
+          sigNames `shouldBe` [mn "Logger"]
+        _ -> error "expected exactly one CInst"
+      -- Warning for unresolvable inherited sig
+      length warnings `shouldBe` 1
+
+    it "two consumers with different impls produce two CInst tasks" $ do
+      -- sig-pkg (indefinite, sig: Str)
+      -- impl-a (concrete, exposes: Str)
+      -- impl-b (concrete, exposes: Str)
+      -- consumer-a (mixins: sig-pkg, depends on impl-a)
+      -- consumer-b (mixins: sig-pkg, depends on impl-b)
+      -- Should produce TWO CInst tasks for sig-pkg with different hashes.
+      let sigPn = mkPackageName "sig-pkg"
+          implAPn = mkPackageName "impl-a"
+          implBPn = mkPackageName "impl-b"
+          consumerAPn = mkPackageName "consumer-a"
+          consumerBPn = mkPackageName "consumer-b"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implAPkg = withExposingLibrary [mn "Str"]
+                   $ testPackage implAPn Simple
+          implBPkg = withExposingLibrary [mn "Str"]
+                   $ testPackage implBPn Simple
+          consumerAPkg = withDeps [sigPn, implAPn]
+                       $ withMixins [defaultMixin sigPn]
+                       $ withLibrary
+                       $ testPackage consumerAPn Simple
+          consumerBPkg = withDeps [sigPn, implBPn]
+                       $ withMixins [defaultMixin sigPn]
+                       $ withLibrary
+                       $ testPackage consumerBPn Simple
+          sigTask = mockTask sigPkg
+          implATask = mockTask implAPkg
+          implBTask = mockTask implBPkg
+          consumerATask = mockTask consumerAPkg
+          consumerBTask = mockTask consumerBPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implAPn, ADRToInstall implATask)
+            , (implBPn, ADRToInstall implBTask)
+            , (consumerAPn, ADRToInstall consumerATask)
+            , (consumerBPn, ADRToInstall consumerBTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implAPn CLib, ADRToInstall implATask)
+            , (ComponentKey implBPn CLib, ADRToInstall implBTask)
+            , (ComponentKey consumerAPn CLib, ADRToInstall consumerATask)
+            , (ComponentKey consumerBPn CLib, ADRToInstall consumerBTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey pn (CInst _)), _) <- result
+                          , pn == sigPn
+                     ]
+      -- Two different CInst tasks for sig-pkg (different impl hashes)
+      length instKeys `shouldBe` 2
+      warnings `shouldSatisfy` null
+
+    it "two consumers with same impl produce one CInst task (dedup)" $ do
+      -- sig-pkg (indefinite, sig: Str)
+      -- impl-pkg (concrete, exposes: Str)
+      -- consumer-a (mixins: sig-pkg, depends on impl-pkg)
+      -- consumer-b (mixins: sig-pkg, depends on impl-pkg)
+      -- Both consumers use the same impl → same hash → ONE CInst task.
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerAPn = mkPackageName "consumer-a"
+          consumerBPn = mkPackageName "consumer-b"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerAPkg = withDeps [sigPn, implPn]
+                       $ withMixins [defaultMixin sigPn]
+                       $ withLibrary
+                       $ testPackage consumerAPn Simple
+          consumerBPkg = withDeps [sigPn, implPn]
+                       $ withMixins [defaultMixin sigPn]
+                       $ withLibrary
+                       $ testPackage consumerBPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerATask = mockTask consumerAPkg
+          consumerBTask = mockTask consumerBPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerAPn, ADRToInstall consumerATask)
+            , (consumerBPn, ADRToInstall consumerBTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerAPn CLib, ADRToInstall consumerATask)
+            , (ComponentKey consumerBPn CLib, ADRToInstall consumerBTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey pn (CInst _)), _) <- result
+                          , pn == sigPn
+                     ]
+      -- Same impl → same hash → deduplicated to one CInst task
+      length instKeys `shouldBe` 1
+      warnings `shouldSatisfy` null
+
+    it "impl out of consumer scope is not used for resolution" $ do
+      -- sig-pkg (indefinite, sig: Str)
+      -- impl-pkg (concrete, exposes: Str)  — exists in plan
+      -- consumer (mixins: sig-pkg, depends on sig-pkg only, NOT impl-pkg)
+      -- impl-pkg is out of consumer's build-depends scope → no resolution → warning
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey pn (CInst _)), _) <- result
+                          , pn == sigPn
+                     ]
+      -- impl-pkg not in consumer's build-depends → can't resolve → no CInst
+      length instKeys `shouldBe` 0
+      length warnings `shouldBe` 1
+
+    it "three consumers: two same impl, one different → two CInsts" $ do
+      -- sig-pkg (indefinite, sig: Str)
+      -- impl-a, impl-b (concrete, expose: Str)
+      -- consumer-1 depends on impl-a, consumer-2 depends on impl-a,
+      -- consumer-3 depends on impl-b
+      -- → two CInst tasks (impl-a deduped, impl-b separate)
+      let sigPn = mkPackageName "sig-pkg"
+          implAPn = mkPackageName "impl-a"
+          implBPn = mkPackageName "impl-b"
+          c1Pn = mkPackageName "consumer-1"
+          c2Pn = mkPackageName "consumer-2"
+          c3Pn = mkPackageName "consumer-3"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implAPkg = withExposingLibrary [mn "Str"]
+                   $ testPackage implAPn Simple
+          implBPkg = withExposingLibrary [mn "Str"]
+                   $ testPackage implBPn Simple
+          c1Pkg = withDeps [sigPn, implAPn]
+                $ withMixins [defaultMixin sigPn]
+                $ withLibrary
+                $ testPackage c1Pn Simple
+          c2Pkg = withDeps [sigPn, implAPn]
+                $ withMixins [defaultMixin sigPn]
+                $ withLibrary
+                $ testPackage c2Pn Simple
+          c3Pkg = withDeps [sigPn, implBPn]
+                $ withMixins [defaultMixin sigPn]
+                $ withLibrary
+                $ testPackage c3Pn Simple
+          sigTask = mockTask sigPkg
+          implATask = mockTask implAPkg
+          implBTask = mockTask implBPkg
+          c1Task = mockTask c1Pkg
+          c2Task = mockTask c2Pkg
+          c3Task = mockTask c3Pkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implAPn, ADRToInstall implATask)
+            , (implBPn, ADRToInstall implBTask)
+            , (c1Pn, ADRToInstall c1Task)
+            , (c2Pn, ADRToInstall c2Task)
+            , (c3Pn, ADRToInstall c3Task)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implAPn CLib, ADRToInstall implATask)
+            , (ComponentKey implBPn CLib, ADRToInstall implBTask)
+            , (ComponentKey c1Pn CLib, ADRToInstall c1Task)
+            , (ComponentKey c2Pn CLib, ADRToInstall c2Task)
+            , (ComponentKey c3Pn CLib, ADRToInstall c3Task)
+            ]
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey pn (CInst _)), _) <- result
+                          , pn == sigPn
+                     ]
+      -- impl-a used twice (deduped) + impl-b once = 2 CInst tasks
+      length instKeys `shouldBe` 2
+      warnings `shouldSatisfy` null
+
+    it "ADRFound impl resolved via installedModules map" $ do
+      -- sig-pkg is ADRToInstall (indefinite), impl-pkg is ADRFound
+      -- (already installed). The installed modules map should allow
+      -- module resolution for the ADRFound impl.
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          consumerTask = mockTask consumerPkg
+          implPid = PackageIdentifier implPn (mkVersion [1, 0])
+          implGid = unsafeParseGhcPkgId "impl-pkg-1.0-abc"
+          implFound = ADRFound Snap (Library implPid
+                        (installedLibraryInfoFromGhcPkgId implGid))
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, implFound)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, implFound)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          -- Provide the impl's modules via the installed modules map
+          instMods = Map.singleton implPn (Set.singleton (mn "Str"))
+          (result, warnings) = addInstantiationTasks instMods origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey pn (CInst _)), _) <- result
+                          , pn == sigPn
+                     ]
+      -- CInst task should be created using the installed modules map
+      length instKeys `shouldBe` 1
+      warnings `shouldSatisfy` null
+      -- Verify the impl's GhcPkgId is in the CInst task's present map
+      let instPresent = [ t.present
+                         | (ComponentKey pn (CInst _), ADRToInstall t) <- result
+                         , pn == sigPn
+                         ]
+      case instPresent of
+        [pm] ->
+          Map.lookup (toCabalMungedPackageId implPid Nothing) pm
+            `shouldBe` Just implGid
+        _    -> expectationFailure "Expected exactly one CInst task"
+
+    it "ADRFound impl not in installedModules produces warning" $ do
+      -- impl-pkg is ADRFound but the installedModules map is empty,
+      -- so module resolution fails and a warning is produced.
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          consumerTask = mockTask consumerPkg
+          implPid = PackageIdentifier implPn (mkVersion [1, 0])
+          implGid = unsafeParseGhcPkgId "impl-pkg-1.0-abc"
+          implFound = ADRFound Snap (Library implPid
+                        (installedLibraryInfoFromGhcPkgId implGid))
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, implFound)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, implFound)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          -- Empty installed modules map — impl can't be resolved
+          (result, warnings) = addInstantiationTasks Map.empty origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "ADRFound impl not in consumer scope is ignored" $ do
+      -- impl-pkg is ADRFound and in installedModules, but the consumer
+      -- doesn't list it in build-depends, so it's out of scope.
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          -- Consumer depends on sig-pkg only, NOT impl-pkg
+          consumerPkg = withDeps [sigPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          consumerTask = mockTask consumerPkg
+          implPid = PackageIdentifier implPn (mkVersion [1, 0])
+          implGid = unsafeParseGhcPkgId "impl-pkg-1.0-abc"
+          implFound = ADRFound Snap (Library implPid
+                        (installedLibraryInfoFromGhcPkgId implGid))
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, implFound)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, implFound)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          instMods = Map.singleton implPn (Set.singleton (mn "Str"))
+          (result, warnings) = addInstantiationTasks instMods origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "ADRFound + ADRToInstall both exposing module is ambiguous" $ do
+      -- Two packages expose the same module: one ADRToInstall, one ADRFound.
+      -- This should produce an ambiguity warning.
+      let sigPn = mkPackageName "sig-pkg"
+          impl1Pn = mkPackageName "impl1"
+          impl2Pn = mkPackageName "impl2"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          impl1Pkg = withExposingLibrary [mn "Str"]
+                   $ testPackage impl1Pn Simple
+          consumerPkg = withDeps [sigPn, impl1Pn, impl2Pn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          impl1Task = mockTask impl1Pkg
+          consumerTask = mockTask consumerPkg
+          impl2Pid = PackageIdentifier impl2Pn (mkVersion [1, 0])
+          impl2Gid = unsafeParseGhcPkgId "impl2-1.0-abc"
+          impl2Found = ADRFound Snap (Library impl2Pid
+                         (installedLibraryInfoFromGhcPkgId impl2Gid))
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (impl1Pn, ADRToInstall impl1Task)
+            , (impl2Pn, impl2Found)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey impl1Pn CLib, ADRToInstall impl1Task)
+            , (ComponentKey impl2Pn CLib, impl2Found)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          -- impl2 also exposes Str via installedModules
+          instMods = Map.singleton impl2Pn (Set.singleton (mn "Str"))
+          (result, warnings) = addInstantiationTasks instMods origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      -- Ambiguous → no CInst, warning produced
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "two ADRFound impls exposing same module is ambiguous" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          impl1Pn = mkPackageName "impl1"
+          impl2Pn = mkPackageName "impl2"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          consumerPkg = withDeps [sigPn, impl1Pn, impl2Pn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          consumerTask = mockTask consumerPkg
+          impl1Pid = PackageIdentifier impl1Pn (mkVersion [1, 0])
+          impl1Gid = unsafeParseGhcPkgId "impl1-1.0-aaa"
+          impl1Found = ADRFound Snap (Library impl1Pid
+                         (installedLibraryInfoFromGhcPkgId impl1Gid))
+          impl2Pid = PackageIdentifier impl2Pn (mkVersion [1, 0])
+          impl2Gid = unsafeParseGhcPkgId "impl2-1.0-bbb"
+          impl2Found = ADRFound Snap (Library impl2Pid
+                         (installedLibraryInfoFromGhcPkgId impl2Gid))
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (impl1Pn, impl1Found)
+            , (impl2Pn, impl2Found)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey impl1Pn CLib, impl1Found)
+            , (ComponentKey impl2Pn CLib, impl2Found)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          instMods = Map.fromList
+            [ (impl1Pn, Set.singleton (mn "Str"))
+            , (impl2Pn, Set.singleton (mn "Str"))
+            ]
+          (result, warnings) = addInstantiationTasks instMods origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "ADRFound impl with wrong module in installedModules not matched" $ do
+      -- impl-pkg is ADRFound and in installedModules, but exposes "Other"
+      -- not "Str", so resolution fails.
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = mockTask sigPkg
+          consumerTask = mockTask consumerPkg
+          implPid = PackageIdentifier implPn (mkVersion [1, 0])
+          implGid = unsafeParseGhcPkgId "impl-pkg-1.0-abc"
+          implFound = ADRFound Snap (Library implPid
+                        (installedLibraryInfoFromGhcPkgId implGid))
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, implFound)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, implFound)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          -- impl exposes "Other", not "Str"
+          instMods = Map.singleton implPn (Set.singleton (mn "Other"))
+          (result, warnings) = addInstantiationTasks instMods origAdrs expanded
+          instKeys = [ ck | (ck@(ComponentKey _ (CInst _)), _) <- result ]
+      instKeys `shouldBe` []
+      length warnings `shouldBe` 1
+
+    it "CInst inherits buildHaddocks = True from sig task" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = (mockTask sigPkg) { buildHaddocks = True }
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _) = addInstantiationTasks Map.empty origAdrs expanded
+          instHaddocks = [ t.buildHaddocks
+                         | (ComponentKey pn (CInst _), ADRToInstall t)
+                             <- result
+                         , pn == sigPn
+                         ]
+      instHaddocks `shouldBe` [True]
+
+    it "CInst inherits buildHaddocks = False from sig task" $ do
+      let sigPn = mkPackageName "sig-pkg"
+          implPn = mkPackageName "impl-pkg"
+          consumerPn = mkPackageName "consumer"
+          sigPkg = withIndefiniteLibrary [mn "Str"]
+                 $ testPackage sigPn Simple
+          implPkg = withExposingLibrary [mn "Str"]
+                  $ testPackage implPn Simple
+          consumerPkg = withDeps [sigPn, implPn]
+                      $ withMixins [defaultMixin sigPn]
+                      $ withLibrary
+                      $ testPackage consumerPn Simple
+          sigTask = (mockTask sigPkg) { buildHaddocks = False }
+          implTask = mockTask implPkg
+          consumerTask = mockTask consumerPkg
+          origAdrs =
+            [ (sigPn, ADRToInstall sigTask)
+            , (implPn, ADRToInstall implTask)
+            , (consumerPn, ADRToInstall consumerTask)
+            ]
+          expanded =
+            [ (ComponentKey sigPn CLib, ADRToInstall sigTask)
+            , (ComponentKey implPn CLib, ADRToInstall implTask)
+            , (ComponentKey consumerPn CLib, ADRToInstall consumerTask)
+            ]
+          (result, _) = addInstantiationTasks Map.empty origAdrs expanded
+          instHaddocks = [ t.buildHaddocks
+                         | (ComponentKey pn (CInst _), ADRToInstall t)
+                             <- result
+                         , pn == sigPn
+                         ]
+      instHaddocks `shouldBe` [False]
+
+  describe "findGhcPkgId" $ do
+    let mainLib name version =
+          toCabalMungedPackageId
+            (PackageIdentifier (mkPackageName name) (mkVersion version))
+            Nothing
+    it "finds matching GhcPkgId by package name" $ do
+      let implGid = unsafeParseGhcPkgId "impl-pkg-0.1.0.0-abc123"
+          depsMap = Map.fromList
+            [ (mainLib "impl-pkg" [0,1,0,0], implGid)
+            ]
+      findGhcPkgId depsMap (mkPackageName "impl-pkg") `shouldBe` Just implGid
+
+    it "returns Nothing for missing package" $ do
+      let depsMap = Map.fromList
+            [ (mainLib "other" [1,0]
+              , unsafeParseGhcPkgId "other-1.0-xyz")
+            ]
+      findGhcPkgId depsMap (mkPackageName "impl-pkg") `shouldBe` Nothing
+
+    it "returns first match when multiple versions exist" $ do
+      let gid1 = unsafeParseGhcPkgId "pkg-1.0-aaa"
+          gid2 = unsafeParseGhcPkgId "pkg-2.0-bbb"
+          depsMap = Map.fromList
+            [ (mainLib "pkg" [1,0], gid1)
+            , (mainLib "pkg" [2,0], gid2)
+            ]
+      -- Map.toList iterates in key order; (pkg-1.0) < (pkg-2.0)
+      findGhcPkgId depsMap (mkPackageName "pkg") `shouldBe` Just gid1
+
+    it "returns Nothing for empty deps map" $ do
+      findGhcPkgId Map.empty (mkPackageName "anything") `shouldBe` Nothing
+
+  describe "mkInstantiateWithOpts" $ do
+    let mainLib name version =
+          toCabalMungedPackageId
+            (PackageIdentifier (mkPackageName name) (mkVersion version))
+            Nothing
+    it "produces correct --instantiate-with flag" $ do
+      let implGid = unsafeParseGhcPkgId "impl-pkg-0.1.0.0-abc123"
+          depsMap = Map.fromList
+            [ (mainLib "impl-pkg" [0,1,0,0], implGid)
+            ]
+          entries = [(mn "Str", mkPackageName "impl-pkg", mn "Str")]
+          result = mkInstantiateWithOpts entries depsMap
+      result `shouldBe`
+        ["--instantiate-with=Str=impl-pkg-0.1.0.0-abc123:Str"]
+
+    it "produces empty list when no entries" $ do
+      mkInstantiateWithOpts [] Map.empty `shouldBe` []
+
+    it "skips entry when implementing package not in deps map" $ do
+      let entries = [(mn "Str", mkPackageName "missing-pkg", mn "Str")]
+          depsMap = Map.fromList
+            [ (mainLib "other" [1,0]
+              , unsafeParseGhcPkgId "other-1.0-xyz")
+            ]
+      mkInstantiateWithOpts entries depsMap `shouldBe` []
+
+    it "handles multiple instantiation entries" $ do
+      let gid1 = unsafeParseGhcPkgId "impl-a-1.0-aaa"
+          gid2 = unsafeParseGhcPkgId "impl-b-1.0-bbb"
+          depsMap = Map.fromList
+            [ (mainLib "impl-a" [1,0], gid1)
+            , (mainLib "impl-b" [1,0], gid2)
+            ]
+          entries =
+            [ (mn "SigA", mkPackageName "impl-a", mn "ModA")
+            , (mn "SigB", mkPackageName "impl-b", mn "ModB")
+            ]
+          result = mkInstantiateWithOpts entries depsMap
+      length result `shouldBe` 2
+      result `shouldBe`
+        [ "--instantiate-with=SigA=impl-a-1.0-aaa:ModA"
+        , "--instantiate-with=SigB=impl-b-1.0-bbb:ModB"
+        ]
+
+    it "handles renamed module (sigName /= implModuleName)" $ do
+      let implGid = unsafeParseGhcPkgId "impl-pkg-1.0-abc"
+          depsMap = Map.fromList
+            [ (mainLib "impl-pkg" [1,0], implGid)
+            ]
+          entries = [(mn "Signature", mkPackageName "impl-pkg", mn "ConcreteImpl")]
+          result = mkInstantiateWithOpts entries depsMap
+      result `shouldBe`
+        ["--instantiate-with=Signature=impl-pkg-1.0-abc:ConcreteImpl"]
+
+    it "handles hierarchical module names" $ do
+      let implGid = unsafeParseGhcPkgId "impl-pkg-1.0-abc"
+          depsMap = Map.fromList
+            [ (mainLib "impl-pkg" [1,0], implGid)
+            ]
+          entries =
+            [(mn "Data.Map.Sig", mkPackageName "impl-pkg", mn "Data.Map.Strict")]
+          result = mkInstantiateWithOpts entries depsMap
+      result `shouldBe`
+        ["--instantiate-with=Data.Map.Sig=impl-pkg-1.0-abc:Data.Map.Strict"]
+
+  describe "ConfigCacheType persistence" $ do
+    it "round-trips ConfigCacheTypeConfig" $ do
+      let v = ConfigCacheTypeConfig
+      fromPersistValue (toPersistValue v) `shouldBe` Right v
+
+    it "round-trips ConfigCacheTypeFlagLibrary" $ do
+      let pid = PackageIdentifier (mkPackageName "foo") (mkVersion [1,0])
+          v = ConfigCacheTypeFlagLibrary pid
+      fromPersistValue (toPersistValue v) `shouldBe` Right v
+
+    it "round-trips ConfigCacheTypeFlagExecutable" $ do
+      let pid = PackageIdentifier (mkPackageName "bar") (mkVersion [2,0])
+          v = ConfigCacheTypeFlagExecutable pid
+      fromPersistValue (toPersistValue v) `shouldBe` Right v
+
+    it "round-trips ConfigCacheTypeInstantiation" $ do
+      let v = ConfigCacheTypeInstantiation "941095d7fd7eb1e4"
+      fromPersistValue (toPersistValue v) `shouldBe` Right v
+
+    it "round-trips ConfigCacheTypeInstantiation with empty suffix" $ do
+      let v = ConfigCacheTypeInstantiation ""
+      fromPersistValue (toPersistValue v) `shouldBe` Right v
+
+    it "rejects unknown cache type" $ do
+      fromPersistValue (PersistText "unknown:foo")
+        `shouldSatisfy` \case
+          Left _ -> True
+          Right (_ :: ConfigCacheType) -> False
+
+-- | Parse a GhcPkgId from text, throwing an error on failure.
+unsafeParseGhcPkgId :: Text -> GhcPkgId
+unsafeParseGhcPkgId t = case parseGhcPkgId t of
+  Just gid -> gid
+  Nothing -> error $ "unsafeParseGhcPkgId: invalid GhcPkgId: " ++ show t
+
+-- | Helper: compute the list of buildable components for a package (same
+-- logic as expandToComponentKeys).
+packageBuildableComponents :: Package -> [NamedComponent]
+packageBuildableComponents pkg =
+  let libComps = [CLib | isJust pkg.library && buildableLib]
+      subLibComps =
+        map CSubLib $ Set.toList $ getBuildableSet pkg.subLibraries
+      flibComps =
+        map CFlib $ Set.toList $ getBuildableSet pkg.foreignLibraries
+      exeComps =
+        map CExe $ Set.toList $ getBuildableSet pkg.executables
+  in  libComps ++ subLibComps ++ flibComps ++ exeComps
+ where
+  buildableLib = case pkg.library of
+    Just lib -> lib.buildInfo.buildable
+    Nothing -> False
+
+-- | Helper: simulate the split-path component expansion. Always applies
+-- the split logic; the routing decision (whether a given package goes
+-- through the split path at all) is tested separately by the
+-- 'shouldSplitComponents' describe block.
+packageToComponentKeys ::
+     PackageName -> Bool -> Set NamedComponent -> Package -> [ComponentKey]
+packageToComponentKeys pn wanted components pkg =
+  let libComps = [CLib | isJust pkg.library && buildableLib]
+      subLibComps =
+        map CSubLib $ Set.toList $ getBuildableSet pkg.subLibraries
+      flibComps =
+        map CFlib $ Set.toList $ getBuildableSet pkg.foreignLibraries
+      exeComps = map CExe $ Set.toList $
+        if wanted
+          then exeComponents components
+          else getBuildableSet pkg.executables
+      allComps = libComps ++ subLibComps ++ flibComps ++ exeComps
+  in  map (ComponentKey pn) allComps
+ where
+  buildableLib = case pkg.library of
+    Just lib -> lib.buildInfo.buildable
+    Nothing -> False
+
+-- | Helper: simulate final key expansion (mirrors the addFinal split-path
+-- branch). The routing decision is tested separately by the
+-- 'shouldSplitComponents' describe block; this helper exercises only the
+-- split-path expansion.
+packageToFinalKeys ::
+     PackageName -> Package -> Set NamedComponent -> [ComponentKey]
+packageToFinalKeys pn _pkg components =
+  let testComps = filter isCTest $ Set.toList components
+      benchComps = filter isCBench $ Set.toList components
+  in  case testComps ++ benchComps of
+        [] -> [ComponentKey pn CLib]
+        comps -> map (ComponentKey pn) comps
+ where
+  isCTest (CTest _) = True
+  isCTest _ = False
+  isCBench (CBench _) = True
+  isCBench _ = False
+
+-- | Build a mock Task wrapping a Package. Uses 'error' for TaskConfigOpts
+-- fields that addInstantiationTasks never accesses (envConfig, baseConfigOpts,
+-- pkgConfigOpts).
+mockTask :: Package -> Task
+mockTask pkg = Task
+  { taskType = TTRemotePackage Immutable pkg
+      (error "mockTask: PackageLocationImmutable not needed")
+  , configOpts = TaskConfigOpts
+      { missing = Set.empty
+      , envConfig = error "mockTask: envConfig not needed"
+      , baseConfigOpts = error "mockTask: baseConfigOpts not needed"
+      , isLocalNonExtraDep = False
+      , isMutable = Immutable
+      , pkgConfigOpts = error "mockTask: pkgConfigOpts not needed"
+      , instantiationDeps = []
+      }
+  , buildHaddocks = False
+  , allInOne = True
+  , present = Map.empty
+  , cachePkgSrc = CacheSrcUpstream
+  , buildTypeConfig = False
+  , backpackInstEntries = []
+  }
+
+-- | Add a library with exposed modules (for testing module resolution).
+withExposingLibrary :: [ModuleName] -> Package -> Package
+withExposingLibrary mods pkg = pkg
+  { library = Just StackLibrary
+      { name = emptyCompName
+      , buildInfo = testBuildInfo
+      , exposedModules = mods
+      , signatures = []
+      }
+  }
+
+-- | Add mixins to a package's main library buildInfo.
+withMixins :: [Mixin] -> Package -> Package
+withMixins ms pkg = case pkg.library of
+  Just (StackLibrary n bi em sigs) -> pkg
+    { library = Just (StackLibrary n bi { mixins = ms } em sigs)
+    }
+  Nothing -> pkg
+
+-- | Helper: create a simple mixin with default renaming.
+defaultMixin :: PackageName -> Mixin
+defaultMixin pn = Mixin
+  { mixinPackageName = pn
+  , mixinLibraryName = LMainLibName
+  , mixinIncludeRenaming = defaultIncludeRenaming
+  }
+
+-- | Helper: create a mixin with explicit requires renaming.
+explicitRequiresMixin ::
+     PackageName
+  -> [(ModuleName, ModuleName)]
+  -> Mixin
+explicitRequiresMixin pn reqs = Mixin
+  { mixinPackageName = pn
+  , mixinLibraryName = LMainLibName
+  , mixinIncludeRenaming = IncludeRenaming
+      { includeProvidesRn = DefaultRenaming
+      , includeRequiresRn = ModuleRenaming reqs
+      }
+  }
+
+-- | Add a sub-library with specific exposed modules.
+withExposingSubLib :: String -> [ModuleName] -> Package -> Package
+withExposingSubLib name mods pkg = pkg
+  { subLibraries = foldAndMakeCollection id $
+      StackLibrary
+        { name = unqualCompFromString name
+        , buildInfo = testBuildInfo
+        , exposedModules = mods
+        , signatures = []
+        }
+      : toList pkg.subLibraries
+  }
+
+-- | Add mixins to a specific sub-library's buildInfo.
+withSubLibMixins :: String -> [Mixin] -> Package -> Package
+withSubLibMixins subLibName ms pkg = pkg
+  { subLibraries = foldAndMakeCollection id
+      [ if lib.name == unqualCompFromString subLibName
+          then let bi = lib.buildInfo :: StackBuildInfo
+               in  StackLibrary lib.name (bi { mixins = ms })
+                                lib.exposedModules lib.signatures
+          else lib
+      | lib <- toList pkg.subLibraries
+      ]
+  }
+
+-- | Add mixins to a specific foreign library's buildInfo.
+withForeignLibMixins :: String -> [Mixin] -> Package -> Package
+withForeignLibMixins flibName ms pkg = pkg
+  { foreignLibraries = foldAndMakeCollection id
+      [ if flib.name == unqualCompFromString flibName
+          then let bi = flib.buildInfo :: StackBuildInfo
+               in  StackForeignLibrary flib.name (bi { mixins = ms })
+          else flib
+      | flib <- toList pkg.foreignLibraries
+      ]
+  }
+
+-- | Add mixins to a specific executable's buildInfo.
+withExeMixins :: String -> [Mixin] -> Package -> Package
+withExeMixins exeName ms pkg = pkg
+  { executables = foldAndMakeCollection id
+      [ if exe.name == unqualCompFromString exeName
+          then let bi = exe.buildInfo :: StackBuildInfo
+               in  StackExecutable exe.name (bi { mixins = ms })
+                                   exe.modulePath
+          else exe
+      | exe <- toList pkg.executables
+      ]
+  }
+
+-- | Add mixins to a specific test suite's buildInfo.
+withTestMixins :: String -> [Mixin] -> Package -> Package
+withTestMixins testName ms pkg = pkg
+  { testSuites = foldAndMakeCollection id
+      [ if test.name == unqualCompFromString testName
+          then let bi = test.buildInfo :: StackBuildInfo
+               in  StackTestSuite test.name (bi { mixins = ms })
+                                  test.interface
+          else test
+      | test <- toList pkg.testSuites
+      ]
+  }
+
+-- | Add mixins to a specific benchmark's buildInfo.
+withBenchMixins :: String -> [Mixin] -> Package -> Package
+withBenchMixins benchName ms pkg = pkg
+  { benchmarks = foldAndMakeCollection id
+      [ if bench.name == unqualCompFromString benchName
+          then let bi = bench.buildInfo :: StackBuildInfo
+               in  StackBenchmark bench.name (bi { mixins = ms })
+                                  bench.interface
+          else bench
+      | bench <- toList pkg.benchmarks
+      ]
+  }
+
+-- | Create an indefinite library package that depends on other packages.
+-- Used to test transitive Backpack chains where one indefinite package
+-- depends on another.
+withIndefiniteLibraryDeps :: [ModuleName] -> [PackageName] -> Package -> Package
+withIndefiniteLibraryDeps sigs depPkgs pkg = pkg
+  { library = Just StackLibrary
+      { name = emptyCompName
+      , buildInfo = testBuildInfo
+          { dependency = Map.fromList
+              [ (pn, DepValue
+                  { versionRange = anyVersion
+                  , depType = AsLibrary DepLibrary
+                      { main = True, subLib = Set.empty }
+                  })
+              | pn <- depPkgs
+              ]
+          }
+      , exposedModules = []
+      , signatures = sigs
+      }
+  }
+
+-- | Add build-depends on the given packages to a package's main library.
+-- This is needed so that module resolution is scoped to the consumer's deps.
+withDeps :: [PackageName] -> Package -> Package
+withDeps depPkgs pkg = case pkg.library of
+  Just (StackLibrary n bi em sigs) ->
+    let newDeps = Map.fromList
+          [ (pn, DepValue
+              { versionRange = anyVersion
+              , depType = AsLibrary DepLibrary
+                  { main = True, subLib = Set.empty }
+              })
+          | pn <- depPkgs
+          ]
+        bi' = bi { dependency = Map.union bi.dependency newDeps }
+    in  pkg { library = Just (StackLibrary n bi' em sigs) }
+  Nothing -> pkg
+
+-- | Convenience: make a ModuleName from a String.
+mn :: String -> ModuleName
+mn = Cabal.fromString
diff --git a/tests/unit/Stack/Build/ExecuteSpec.hs b/tests/unit/Stack/Build/ExecuteSpec.hs
new file mode 100644
index 0000000000..4342810141
--- /dev/null
+++ b/tests/unit/Stack/Build/ExecuteSpec.hs
@@ -0,0 +1,643 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Stack.Build.ExecuteSpec
+  ( main
+  , spec
+  ) where
+
+import           Control.Concurrent.Execute ( ActionId (..), ActionType (..) )
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Types.Version ( mkVersion )
+import           Stack.Build.Execute
+                   ( finalTestsAndBenches, intraPackageDeps, missingToDeps )
+import           Stack.Build.ExecutePackage
+                   ( componentEnableBenchmarks, componentEnableTests
+                   , componentTarget, dispatchBuildOpts
+                   )
+import           Stack.Prelude
+import           Stack.Types.ComponentUtils ( unqualCompFromString )
+import           Stack.Types.NamedComponent ( NamedComponent (..) )
+import           Stack.Types.Plan ( ComponentKey (..), componentKeyPkgName )
+import           Test.Hspec ( Spec, describe, hspec, it, shouldBe, shouldSatisfy )
+
+main :: IO ()
+main = hspec spec
+
+spec :: Spec
+spec = do
+  describe "ActionId" $ do
+    it "uses ComponentKey instead of PackageIdentifier" $ do
+      let ck = ComponentKey (mkPackageName "my-pkg") CLib
+          aid = ActionId ck ATBuild
+      aid `shouldBe` ActionId ck ATBuild
+
+    it "ActionIds with different ComponentKeys are not equal" $ do
+      let ck1 = ComponentKey (mkPackageName "pkg") CLib
+          ck2 = ComponentKey (mkPackageName "pkg")
+                  (CTest (unqualCompFromString "test-suite"))
+          aid1 = ActionId ck1 ATBuild
+          aid2 = ActionId ck2 ATBuild
+      (aid1 == aid2) `shouldBe` False
+
+    it "ActionIds with different ActionTypes are not equal" $ do
+      let ck = ComponentKey (mkPackageName "pkg") CLib
+          aid1 = ActionId ck ATBuild
+          aid2 = ActionId ck ATRunTests
+      (aid1 == aid2) `shouldBe` False
+
+    it "can be used in Sets (dependency tracking)" $ do
+      let ckLib = ComponentKey (mkPackageName "dep") CLib
+          ckTest = ComponentKey (mkPackageName "pkg")
+                     (CTest (unqualCompFromString "tests"))
+          deps = Set.fromList
+            [ ActionId ckLib ATBuild
+            , ActionId ckTest ATBuild
+            , ActionId ckTest ATRunTests
+            ]
+      Set.size deps `shouldBe` 3
+
+    it "dependency from test ATRunTests to test ATBuild works" $ do
+      let ck = ComponentKey (mkPackageName "pkg")
+                 (CTest (unqualCompFromString "tests"))
+          buildAction = ActionId ck ATBuild
+          runAction = ActionId ck ATRunTests
+          deps = Set.singleton buildAction
+      Set.member buildAction deps `shouldBe` True
+      Set.member runAction deps `shouldBe` False
+
+    it "dependency from component to CLib ATBuild maps correctly" $ do
+      let pkgName = mkPackageName "base-dep"
+          depKey = ComponentKey pkgName CLib
+          depAction = ActionId depKey ATBuild
+          testKey = ComponentKey (mkPackageName "my-pkg")
+                      (CTest (unqualCompFromString "tests"))
+          testBuild = ActionId testKey ATBuild
+          deps = Set.fromList [depAction, testBuild]
+      Set.member depAction deps `shouldBe` True
+
+  describe "ActionType" $ do
+    it "has four constructors including ATBuildFinal" $ do
+      -- ATBuildFinal is used for test/bench builds that are NOT folded into
+      -- the primary ATBuild: curator builds that expect test failures, the
+      -- cyclic-plan fallback, and per-component CTest/CBench keys.
+      let types = [ATBuild, ATBuildFinal, ATRunTests, ATRunBenchmarks]
+      length types `shouldBe` 4
+
+    it "orders ATBuild < ATBuildFinal < ATRunTests < ATRunBenchmarks (Ord)" $ do
+      (ATBuild < ATBuildFinal) `shouldBe` True
+      (ATBuildFinal < ATRunTests) `shouldBe` True
+      (ATRunTests < ATRunBenchmarks) `shouldBe` True
+
+  describe "missingToDeps" $ do
+    it "maps empty set to empty set" $ do
+      missingToDeps Set.empty `shouldBe` Set.empty
+
+    it "maps a single PackageIdentifier to ComponentKey CLib ATBuild" $ do
+      let pid = PackageIdentifier (mkPackageName "base") (mkVersion [4,20,0,0])
+          result = missingToDeps (Set.singleton pid)
+          expected = Set.singleton $
+            ActionId (ComponentKey (mkPackageName "base") CLib) ATBuild
+      result `shouldBe` expected
+
+    it "maps multiple dependencies preserving each package name" $ do
+      let pid1 = PackageIdentifier (mkPackageName "text") (mkVersion [2,0])
+          pid2 = PackageIdentifier (mkPackageName "bytestring") (mkVersion [0,12])
+          pid3 = PackageIdentifier (mkPackageName "containers") (mkVersion [0,7])
+          result = missingToDeps (Set.fromList [pid1, pid2, pid3])
+      Set.size result `shouldBe` 3
+      -- All mapped to CLib
+      result `shouldSatisfy` all
+        (\(ActionId (ComponentKey _ comp) at) -> comp == CLib && at == ATBuild)
+
+    it "discards version info — only package name matters" $ do
+      -- Two different versions of the same package should map to the same
+      -- ActionId (since ComponentKey uses PackageName, not PackageIdentifier)
+      let pid1 = PackageIdentifier (mkPackageName "aeson") (mkVersion [2,1])
+          pid2 = PackageIdentifier (mkPackageName "aeson") (mkVersion [2,2])
+          result = missingToDeps (Set.fromList [pid1, pid2])
+      -- Set deduplicates: both map to the same ActionId
+      Set.size result `shouldBe` 1
+
+    it "preserves the invariant that external deps are always CLib" $ do
+      let pids = Set.fromList
+            [ PackageIdentifier (mkPackageName "foo") (mkVersion [1,0])
+            , PackageIdentifier (mkPackageName "bar") (mkVersion [2,0])
+            ]
+          result = missingToDeps pids
+      -- Every resulting ActionId should have CLib component and ATBuild type
+      forM_ (Set.toList result) $ \(ActionId (ComponentKey _ comp) at) -> do
+        comp `shouldBe` CLib
+        at `shouldBe` ATBuild
+
+  describe "action graph invariants" $ do
+    it "build-only key produces exactly one ATBuild" $ do
+      -- Simulating toActions (Just build, Nothing): should produce [ATBuild]
+      let ck = ComponentKey (mkPackageName "pkg") CLib
+          buildId = ActionId ck ATBuild
+          -- In toActions, abuild produces one Action with this id
+          actionIds = [buildId]
+      length actionIds `shouldBe` 1
+      actionIds `shouldBe` [ActionId ck ATBuild]
+
+    it "non-all-in-one final-only key produces ATBuildFinal + run actions" $ do
+      -- Simulating toActions (Nothing, Just final) for a non-all-in-one final
+      -- (a per-component CTest key, or the cyclic-plan fallback): afinal
+      -- produces its own ATBuildFinal, and the run action depends on it.
+      let ck = ComponentKey (mkPackageName "pkg")
+                 (CTest (unqualCompFromString "tests"))
+          buildId = ActionId ck ATBuildFinal
+          runId = ActionId ck ATRunTests
+          actionIds = [buildId, runId]
+          runDeps = Set.singleton buildId
+      length actionIds `shouldBe` 2
+      Set.member buildId runDeps `shouldBe` True
+
+    it "all-in-one clean final-only key produces only run actions" $ do
+      -- Simulating toActions (Nothing, Just final) for an all-in-one final
+      -- whose package is up-to-date (mbuild = Nothing): no build action is
+      -- created, and the run action has no build dependency. This is the
+      -- 3770-no-rerun-tests fix: no spurious build fires on a clean rebuild,
+      -- so the test-success flag is not clobbered before --no-rerun-tests
+      -- reads it.
+      let ck = ComponentKey (mkPackageName "pkg") CLib
+          runId = ActionId ck ATRunTests
+          actionIds = [runId]
+          runDeps = Set.empty :: Set ActionId
+      length actionIds `shouldBe` 1
+      runDeps `shouldBe` Set.empty
+
+    it "all-in-one build+final key produces one ATBuild (no duplicate)" $ do
+      -- Simulating toActions (Just build, Just final) for an all-in-one
+      -- final: abuild produces ATBuild (merged mode), afinal.finalBuild is []
+      -- because task.allInOne is True.
+      let ck = ComponentKey (mkPackageName "pkg") CLib
+          abuildIds = [ActionId ck ATBuild]
+          afinalBuildIds = [] :: [ActionId]
+          afinalRunIds = [ActionId ck ATRunTests]
+          allIds = abuildIds ++ afinalBuildIds ++ afinalRunIds
+      let buildCount = length $ filter
+            (\(ActionId _ at) -> at == ATBuild) allIds
+      buildCount `shouldBe` 1
+      length allIds `shouldBe` 2
+
+    it "non-all-in-one build+final key produces ATBuild and ATBuildFinal" $ do
+      -- Simulating toActions (Just build, Just final) for a non-all-in-one
+      -- final (the cyclic-plan fallback): abuild produces a plain ATBuild for
+      -- the library, afinal.finalBuild produces a separate ATBuildFinal for
+      -- the test/bench build. This is the 6905 fix: the test build is its
+      -- own Setup invocation, configured from the final task's deps (which
+      -- the lib-only primary task does not carry).
+      let ck = ComponentKey (mkPackageName "pkg") CLib
+          abuildIds = [ActionId ck ATBuild]
+          afinalBuildIds = [ActionId ck ATBuildFinal]
+          afinalRunIds = [ActionId ck ATRunTests]
+          allIds = abuildIds ++ afinalBuildIds ++ afinalRunIds
+      length (filter (\(ActionId _ at) -> at == ATBuild) allIds)
+        `shouldBe` 1
+      length (filter (\(ActionId _ at) -> at == ATBuildFinal) allIds)
+        `shouldBe` 1
+      -- distinct ActionIds: ATBuild and ATBuildFinal do not collide
+      Set.size (Set.fromList allIds) `shouldBe` 3
+
+    it "run actions depend on ATBuildFinal for a non-all-in-one final" $ do
+      -- For a non-all-in-one final the run actions depend on the separate
+      -- ATBuildFinal action, not on ATBuild.
+      let ck = ComponentKey (mkPackageName "pkg")
+                 (CTest (unqualCompFromString "tests"))
+          buildDep = Set.singleton (ActionId ck ATBuildFinal)
+          runTestsDeps = buildDep
+          runBenchDeps = buildDep
+      Set.member (ActionId ck ATBuildFinal) runTestsDeps `shouldBe` True
+      Set.member (ActionId ck ATBuildFinal) runBenchDeps `shouldBe` True
+
+  describe "per-package derivation from ComponentKey map" $ do
+    it "single CLib key maps to one package entry" $ do
+      let ck = ComponentKey (mkPackageName "pkg") CLib
+          componentMap = Map.singleton ck ("task-value" :: String)
+          pkgMap = Map.fromList
+            [ (componentKeyPkgName k, v) | (k, v) <- Map.toList componentMap ]
+      Map.size pkgMap `shouldBe` 1
+      Map.lookup (mkPackageName "pkg") pkgMap `shouldBe` Just "task-value"
+
+    it "multiple components for same package collapse to one entry" $ do
+      let pn = mkPackageName "pkg"
+          ck1 = ComponentKey pn CLib
+          ck2 = ComponentKey pn (CExe (unqualCompFromString "exe"))
+          ck3 = ComponentKey pn (CTest (unqualCompFromString "test"))
+          componentMap :: Map ComponentKey String
+          componentMap = Map.fromList
+            [(ck1, "lib-task"), (ck2, "exe-task"), (ck3, "test-task")]
+          -- Map.fromList with last-wins gives us the last component
+          pkgMap = Map.fromList
+            [ (componentKeyPkgName k, v)
+            | (k, v) <- Map.toList componentMap
+            ]
+      -- All three map to the same PackageName, so only one entry
+      Map.size pkgMap `shouldBe` 1
+      -- Map.toList on componentMap is ascending by key;
+      -- CLib < CExe < CTest, so CTest's value wins
+      Map.lookup pn pkgMap `shouldBe` Just "test-task"
+
+    it "different packages stay separate after derivation" $ do
+      let ck1 = ComponentKey (mkPackageName "pkg-a") CLib
+          ck2 = ComponentKey (mkPackageName "pkg-a")
+                  (CExe (unqualCompFromString "exe"))
+          ck3 = ComponentKey (mkPackageName "pkg-b") CLib
+          componentMap :: Map ComponentKey String
+          componentMap = Map.fromList
+            [(ck1, "a-lib"), (ck2, "a-exe"), (ck3, "b-lib")]
+          pkgMap = Map.fromList
+            [ (componentKeyPkgName k, v)
+            | (k, v) <- Map.toList componentMap
+            ]
+      Map.size pkgMap `shouldBe` 2
+      Map.member (mkPackageName "pkg-a") pkgMap `shouldBe` True
+      Map.member (mkPackageName "pkg-b") pkgMap `shouldBe` True
+
+    it "preserves all package names when components are distinct packages" $ do
+      let keys =
+            [ ComponentKey (mkPackageName "aeson") CLib
+            , ComponentKey (mkPackageName "text") CLib
+            , ComponentKey (mkPackageName "bytestring") CLib
+            ]
+          componentMap :: Map ComponentKey Int
+          componentMap = Map.fromList $ zip keys [1..]
+          pkgNames = Set.fromList $ map componentKeyPkgName $ Map.keys componentMap
+      Set.size pkgNames `shouldBe` 3
+
+  describe "consumer dedup patterns" $ do
+    -- These test the deduplication patterns used by justLocals,
+    -- errorOnSnapshot, and warnIfExecutablesWithSameNameCouldBeOverwritten
+    -- when operating on component-keyed maps.
+
+    it "justLocals pattern: Set deduplicates split-package identifiers" $ do
+      -- Simulates justLocals: multiple component tasks for the same package
+      -- produce the same PackageIdentifier; Set.fromList removes duplicates.
+      let pid = PackageIdentifier (mkPackageName "pkg") (mkVersion [1,0])
+          taskPids = [pid, pid, pid]
+          result = Set.toList $ Set.fromList taskPids
+      result `shouldBe` [pid]
+
+    it "justLocals pattern: different packages remain distinct" $ do
+      let pid1 = PackageIdentifier (mkPackageName "pkg-a") (mkVersion [1,0])
+          pid2 = PackageIdentifier (mkPackageName "pkg-b") (mkVersion [2,0])
+          taskPids = [pid1, pid1, pid2, pid2]
+          result = Set.toList $ Set.fromList taskPids
+      length result `shouldBe` 2
+      result `shouldSatisfy` (pid1 `elem`)
+      result `shouldSatisfy` (pid2 `elem`)
+
+    it "errorOnSnapshot pattern: PackageNames are deduplicated" $ do
+      -- Simulates errorOnSnapshot: extracting PackageNames from ComponentKeys
+      -- and deduplicating.
+      let pn = mkPackageName "pkg"
+          keys =
+            [ ComponentKey pn CLib
+            , ComponentKey pn (CExe (unqualCompFromString "exe"))
+            , ComponentKey pn (CSubLib (unqualCompFromString "sub"))
+            ]
+          result = Set.toList $ Set.fromList $ map componentKeyPkgName keys
+      result `shouldBe` [pn]
+
+    it "errorOnSnapshot pattern: distinct packages stay separate" $ do
+      let keys =
+            [ ComponentKey (mkPackageName "a") CLib
+            , ComponentKey (mkPackageName "a")
+                (CExe (unqualCompFromString "exe"))
+            , ComponentKey (mkPackageName "b") CLib
+            ]
+          result = Set.toList $ Set.fromList $ map componentKeyPkgName keys
+      length result `shouldBe` 2
+
+    it "perPkgTasks pattern: split components yield one entry per package" $ do
+      -- Simulates perPkgTasks in warnIfExecutablesWithSameNameCouldBeOverwritten
+      let pn = mkPackageName "pkg"
+          componentMap :: Map ComponentKey String
+          componentMap = Map.fromList
+            [ (ComponentKey pn CLib, "task")
+            , (ComponentKey pn (CExe (unqualCompFromString "exe1")), "task")
+            , (ComponentKey pn (CExe (unqualCompFromString "exe2")), "task")
+            ]
+          perPkg = Map.fromList
+            [ (componentKeyPkgName ck, v)
+            | (ck, v) <- Map.toList componentMap
+            ]
+      Map.size perPkg `shouldBe` 1
+
+    it "perPkgTasks pattern: mixed packages yield correct count" $ do
+      let componentMap :: Map ComponentKey String
+          componentMap = Map.fromList
+            [ (ComponentKey (mkPackageName "a") CLib, "a-task")
+            , (ComponentKey (mkPackageName "a")
+                (CExe (unqualCompFromString "exe")), "a-task")
+            , (ComponentKey (mkPackageName "b") CLib, "b-task")
+            , (ComponentKey (mkPackageName "b")
+                (CExe (unqualCompFromString "app")), "b-task")
+            ]
+          perPkg = Map.fromList
+            [ (componentKeyPkgName ck, v)
+            | (ck, v) <- Map.toList componentMap
+            ]
+      Map.size perPkg `shouldBe` 2
+      Map.member (mkPackageName "a") perPkg `shouldBe` True
+      Map.member (mkPackageName "b") perPkg `shouldBe` True
+
+  describe "intraPackageDeps" $ do
+    it "CLib has no intra-package deps" $ do
+      let ck = ComponentKey (mkPackageName "pkg") CLib
+          taskKeys = Set.singleton ck
+      intraPackageDeps taskKeys ck `shouldBe` Set.empty
+
+    it "CExe depends on CLib ATBuild when CLib is in taskKeys" $ do
+      let pn = mkPackageName "pkg"
+          libKey = ComponentKey pn CLib
+          exeKey = ComponentKey pn (CExe (unqualCompFromString "my-exe"))
+          taskKeys = Set.fromList [libKey, exeKey]
+          result = intraPackageDeps taskKeys exeKey
+      result `shouldBe`
+        Set.singleton (ActionId libKey ATBuild)
+
+    it "CExe has no intra-package dep when CLib is not in taskKeys" $ do
+      let pn = mkPackageName "pkg"
+          exeKey = ComponentKey pn (CExe (unqualCompFromString "my-exe"))
+          taskKeys = Set.singleton exeKey
+      intraPackageDeps taskKeys exeKey `shouldBe` Set.empty
+
+    it "CTest depends on CLib ATBuild when CLib is in taskKeys" $ do
+      let pn = mkPackageName "pkg"
+          libKey = ComponentKey pn CLib
+          testKey = ComponentKey pn (CTest (unqualCompFromString "tests"))
+          taskKeys = Set.singleton libKey
+          result = intraPackageDeps taskKeys testKey
+      result `shouldBe`
+        Set.singleton (ActionId libKey ATBuild)
+
+    it "CBench depends on CLib ATBuild when CLib is in taskKeys" $ do
+      let pn = mkPackageName "pkg"
+          libKey = ComponentKey pn CLib
+          benchKey = ComponentKey pn (CBench (unqualCompFromString "bench"))
+          taskKeys = Set.singleton libKey
+      intraPackageDeps taskKeys benchKey `shouldBe`
+        Set.singleton (ActionId libKey ATBuild)
+
+    it "CSubLib depends on CLib ATBuild when CLib is in taskKeys" $ do
+      let pn = mkPackageName "pkg"
+          libKey = ComponentKey pn CLib
+          subKey = ComponentKey pn (CSubLib (unqualCompFromString "internal"))
+          taskKeys = Set.singleton libKey
+      intraPackageDeps taskKeys subKey `shouldBe`
+        Set.singleton (ActionId libKey ATBuild)
+
+    it "does not depend on CLib of a different package" $ do
+      let pn1 = mkPackageName "pkg-a"
+          pn2 = mkPackageName "pkg-b"
+          libKeyA = ComponentKey pn1 CLib
+          exeKeyB = ComponentKey pn2 (CExe (unqualCompFromString "exe"))
+          taskKeys = Set.fromList [libKeyA, exeKeyB]
+      -- exeKeyB should NOT depend on libKeyA (different package)
+      intraPackageDeps taskKeys exeKeyB `shouldBe` Set.empty
+
+    it "CLib never has intra-package deps even when other libs exist" $ do
+      let pn = mkPackageName "pkg"
+          libKey = ComponentKey pn CLib
+          subKey = ComponentKey pn (CSubLib (unqualCompFromString "sub"))
+          taskKeys = Set.fromList [libKey, subKey]
+      intraPackageDeps taskKeys libKey `shouldBe` Set.empty
+
+  describe "componentTarget" $ do
+    it "CLib renders as lib:<package-name>" $ do
+      componentTarget (mkPackageName "my-pkg") CLib
+        `shouldBe` "lib:my-pkg"
+
+    it "CSubLib renders as lib:<sublib-name>" $ do
+      componentTarget (mkPackageName "pkg") (CSubLib (unqualCompFromString "internal"))
+        `shouldBe` "lib:internal"
+
+    it "CFlib renders as flib:<flib-name>" $ do
+      componentTarget (mkPackageName "pkg") (CFlib (unqualCompFromString "cbits"))
+        `shouldBe` "flib:cbits"
+
+    it "CExe renders as exe:<exe-name>" $ do
+      componentTarget (mkPackageName "pkg") (CExe (unqualCompFromString "my-exe"))
+        `shouldBe` "exe:my-exe"
+
+    it "CTest renders as test:<test-name>" $ do
+      componentTarget (mkPackageName "pkg") (CTest (unqualCompFromString "my-test"))
+        `shouldBe` "test:my-test"
+
+    it "CBench renders as bench:<bench-name>" $ do
+      componentTarget (mkPackageName "pkg") (CBench (unqualCompFromString "my-bench"))
+        `shouldBe` "bench:my-bench"
+
+    it "package name is only used for CLib" $ do
+      -- For non-CLib components, the package name is ignored
+      let pn1 = mkPackageName "pkg-a"
+          pn2 = mkPackageName "pkg-b"
+          comp = CExe (unqualCompFromString "exe")
+      componentTarget pn1 comp `shouldBe` componentTarget pn2 comp
+
+  describe "componentEnableTests" $ do
+    let pn = mkPackageName "pkg"
+        testName = unqualCompFromString "my-test"
+        benchName = unqualCompFromString "my-bench"
+        mixedComps = Set.fromList
+          [CLib, CTest testName, CBench benchName]
+
+    it "CTest key enables tests regardless of component set" $ do
+      componentEnableTests (ComponentKey pn (CTest testName)) Set.empty
+        `shouldBe` True
+      componentEnableTests (ComponentKey pn (CTest testName)) mixedComps
+        `shouldBe` True
+
+    it "CBench key does not enable tests" $ do
+      componentEnableTests (ComponentKey pn (CBench benchName)) mixedComps
+        `shouldBe` False
+
+    it "CExe key does not enable tests" $ do
+      componentEnableTests
+        (ComponentKey pn (CExe (unqualCompFromString "exe")))
+        mixedComps
+        `shouldBe` False
+
+    it "CSubLib key does not enable tests" $ do
+      componentEnableTests
+        (ComponentKey pn (CSubLib (unqualCompFromString "sub")))
+        mixedComps
+        `shouldBe` False
+
+    it "CLib key enables tests when component set has tests" $ do
+      componentEnableTests (ComponentKey pn CLib) mixedComps
+        `shouldBe` True
+
+    it "CLib key does not enable tests when no tests in component set" $ do
+      componentEnableTests (ComponentKey pn CLib) (Set.singleton CLib)
+        `shouldBe` False
+
+    it "CLib key does not enable tests with only benchmarks" $ do
+      componentEnableTests
+        (ComponentKey pn CLib)
+        (Set.singleton (CBench benchName))
+        `shouldBe` False
+
+  describe "componentEnableBenchmarks" $ do
+    let pn = mkPackageName "pkg"
+        testName = unqualCompFromString "my-test"
+        benchName = unqualCompFromString "my-bench"
+        mixedComps = Set.fromList
+          [CLib, CTest testName, CBench benchName]
+
+    it "CBench key always enables benchmarks" $ do
+      componentEnableBenchmarks (ComponentKey pn (CBench benchName)) Set.empty
+        `shouldBe` True
+
+    it "CTest key does not enable benchmarks" $ do
+      componentEnableBenchmarks (ComponentKey pn (CTest testName)) mixedComps
+        `shouldBe` False
+
+    it "CExe key does not enable benchmarks" $ do
+      componentEnableBenchmarks
+        (ComponentKey pn (CExe (unqualCompFromString "exe")))
+        mixedComps
+        `shouldBe` False
+
+    it "CLib key enables benchmarks when component set has benchmarks" $ do
+      componentEnableBenchmarks (ComponentKey pn CLib) mixedComps
+        `shouldBe` True
+
+    it "CLib key does not enable benchmarks when no benchmarks" $ do
+      componentEnableBenchmarks (ComponentKey pn CLib) (Set.singleton CLib)
+        `shouldBe` False
+
+    it "CLib key does not enable benchmarks with only tests" $ do
+      componentEnableBenchmarks
+        (ComponentKey pn CLib)
+        (Set.singleton (CTest testName))
+        `shouldBe` False
+
+  describe "finalTestsAndBenches" $ do
+    let pn = mkPackageName "pkg"
+        testA = unqualCompFromString "test-a"
+        testB = unqualCompFromString "test-b"
+        benchA = unqualCompFromString "bench-a"
+
+    it "CTest key returns exactly that one test, no benches" $ do
+      let (tests, benches) =
+            finalTestsAndBenches
+              (ComponentKey pn (CTest testA))
+              (Set.fromList [CTest testA, CTest testB, CBench benchA])
+      tests `shouldBe` Set.singleton testA
+      benches `shouldBe` Set.empty
+
+    it "CBench key returns exactly that one bench, no tests" $ do
+      let (tests, benches) =
+            finalTestsAndBenches
+              (ComponentKey pn (CBench benchA))
+              (Set.fromList [CTest testA, CBench benchA])
+      tests `shouldBe` Set.empty
+      benches `shouldBe` Set.singleton benchA
+
+    it "CLib key returns all tests and benches from component set" $ do
+      let comps = Set.fromList [CTest testA, CTest testB, CBench benchA]
+          (tests, benches) =
+            finalTestsAndBenches (ComponentKey pn CLib) comps
+      tests `shouldBe` Set.fromList [testA, testB]
+      benches `shouldBe` Set.singleton benchA
+
+    it "CLib key with empty set returns empty tests and benches" $ do
+      let (tests, benches) =
+            finalTestsAndBenches (ComponentKey pn CLib) Set.empty
+      tests `shouldBe` Set.empty
+      benches `shouldBe` Set.empty
+
+    it "CLib key with only CLib returns empty tests and benches" $ do
+      let (tests, benches) =
+            finalTestsAndBenches (ComponentKey pn CLib) (Set.singleton CLib)
+      tests `shouldBe` Set.empty
+      benches `shouldBe` Set.empty
+
+    it "CExe key falls through to all tests/benches" $ do
+      let comps = Set.fromList [CTest testA, CBench benchA]
+          (tests, benches) =
+            finalTestsAndBenches
+              (ComponentKey pn (CExe (unqualCompFromString "exe")))
+              comps
+      tests `shouldBe` Set.singleton testA
+      benches `shouldBe` Set.singleton benchA
+
+    it "CTest key ignores component set entirely" $ do
+      -- Even though comp set has multiple tests, only the CTest key's test
+      -- is returned
+      let (tests, _) =
+            finalTestsAndBenches
+              (ComponentKey pn (CTest testA))
+              (Set.fromList [CTest testA, CTest testB])
+      Set.size tests `shouldBe` 1
+      tests `shouldBe` Set.singleton testA
+
+  describe "dispatchBuildOpts" $ do
+    let primary = ["lib:pkg", "exe:app"]
+        finals  = ["test:spec", "bench:bench"]
+
+    describe "split path (Just target)" $ do
+      it "primary build: target is both build and copy" $
+        dispatchBuildOpts (Just "lib:pkg") False False [] []
+          `shouldBe` (["lib:pkg"], ["lib:pkg"])
+
+      it "final build: target is build, copy is empty" $
+        dispatchBuildOpts (Just "test:spec") True False [] []
+          `shouldBe` (["test:spec"], [])
+
+      it "isMergedBuild is ignored on the split path" $
+        dispatchBuildOpts (Just "lib:pkg") False True [] []
+          `shouldBe` dispatchBuildOpts (Just "lib:pkg") False False [] []
+
+      it "primary/final option lists are ignored on the split path" $
+        dispatchBuildOpts (Just "lib:pkg") False False primary finals
+          `shouldBe` (["lib:pkg"], ["lib:pkg"])
+
+    describe "non-split path (Nothing)" $ do
+      it "primary-only: build and copy primary" $
+        dispatchBuildOpts Nothing False False primary finals
+          `shouldBe` (primary, primary)
+
+      it "merged primary+final: build primary++finals, copy primary" $
+        dispatchBuildOpts Nothing True True primary finals
+          `shouldBe` (primary ++ finals, primary)
+
+      it "finals-only: build finals, skip copy" $
+        dispatchBuildOpts Nothing True False primary finals
+          `shouldBe` (finals, [])
+
+      it "isMergedBuild is ignored when isFinalBuild is False" $
+        dispatchBuildOpts Nothing False True primary finals
+          `shouldBe` dispatchBuildOpts Nothing False False primary finals
+
+    describe "non-split edge cases" $ do
+      it "merged with empty primary: build finals, copy empty" $
+        dispatchBuildOpts Nothing True True [] finals
+          `shouldBe` (finals, [])
+
+      it "finals-only with empty finals: build empty, copy empty" $
+        dispatchBuildOpts Nothing True False primary []
+          `shouldBe` ([], [])
+
+      it "primary-only with empty primary: build empty, copy empty" $
+        dispatchBuildOpts Nothing False False [] finals
+          `shouldBe` ([], [])
+
+    describe "componentTarget round-trip (split wiring)" $ do
+      it "split CTest final build renders test:<name>" $ do
+        let pn' = mkPackageName "pkg"
+            comp = CTest (unqualCompFromString "spec")
+        dispatchBuildOpts
+          (Just (componentTarget pn' comp)) True False [] []
+          `shouldBe` (["test:spec"], [])
+
+      it "split CLib primary build renders lib:<pkg>" $ do
+        let pn' = mkPackageName "pkg"
+        dispatchBuildOpts
+          (Just (componentTarget pn' CLib)) False False [] []
+          `shouldBe` (["lib:pkg"], ["lib:pkg"])
diff --git a/src/test/Stack/Build/TargetSpec.hs b/tests/unit/Stack/Build/TargetSpec.hs
similarity index 95%
rename from src/test/Stack/Build/TargetSpec.hs
rename to tests/unit/Stack/Build/TargetSpec.hs
index dcd21efb43..e199a72a02 100644
--- a/src/test/Stack/Build/TargetSpec.hs
+++ b/tests/unit/Stack/Build/TargetSpec.hs
@@ -1,7 +1,10 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Stack.Build.TargetSpec (main, spec) where
+module Stack.Build.TargetSpec
+  ( main
+  , spec
+  ) where
 
 import qualified Data.Text           as T
 import           Distribution.Types.PackageName (mkPackageName)
diff --git a/tests/unit/Stack/Config/DockerSpec.hs b/tests/unit/Stack/Config/DockerSpec.hs
new file mode 100644
index 0000000000..25b8d26c18
--- /dev/null
+++ b/tests/unit/Stack/Config/DockerSpec.hs
@@ -0,0 +1,29 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Stack.Config.DockerSpec
+  ( spec
+  ) where
+
+import           RIO.Time ( fromGregorian )
+import           Stack.Config.Docker ( addDefaultTag )
+import           Stack.Prelude
+import           Stack.Types.Snapshot ( AbstractSnapshot (..) )
+import           Test.Hspec ( Spec, describe, it, shouldBe )
+
+spec :: Spec
+spec = do
+  describe "addDefaultTag" $ do
+    it "succeeds fails no snapshot" $ addDefaultTag "foo/bar" Nothing Nothing `shouldBe` Nothing
+    it "succeeds on LTS" $
+      addDefaultTag
+        "foo/bar"
+        Nothing
+        (Just $ ASSnapshot $ RSLSynonym $ LTS 1 2)
+      `shouldBe` Just "foo/bar:lts-1.2"
+    it "fails on nightly" $
+      addDefaultTag
+        "foo/bar"
+        Nothing
+        (Just $ ASSnapshot $ RSLSynonym $ Nightly $ fromGregorian 2018 1 1)
+      `shouldBe` Nothing
diff --git a/tests/unit/Stack/ConfigSpec.hs b/tests/unit/Stack/ConfigSpec.hs
new file mode 100644
index 0000000000..1cfd740091
--- /dev/null
+++ b/tests/unit/Stack/ConfigSpec.hs
@@ -0,0 +1,336 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+module Stack.ConfigSpec
+  ( sampleConfig
+  , buildOptsConfig
+  , hpackConfig
+  , resolverConfig
+  , snapshotConfig
+  , resolverSnapshotConfig
+  , stackDotYaml
+  , setup
+  , noException
+  , spec
+  ) where
+
+import           Control.Arrow ( left )
+import           Data.Aeson.WarningParser ( WithJSONWarnings )
+import           Data.Yaml ( decodeEither', parseEither )
+import           Distribution.Verbosity ( verbose )
+import           Pantry.Internal.Stackage ( pcHpackExecutable )
+import           Path ( (</>), parent, parseAbsDir, parseRelDir, parseRelFile )
+import           Path.IO ( getCurrentDir )
+import           Stack.Config (defaultConfigYaml, loadConfig, loadConfigYaml )
+import           Stack.Options.GlobalParser ( globalOptsFromMonoid )
+import           Stack.Prelude
+import           Stack.Runners ( withBuildConfig, withRunnerGlobal )
+import           Stack.Types.BuildConfig ( BuildConfig (..), configFileRootL )
+import           Stack.Types.BuildOpts
+                   ( BenchmarkOpts (..), BuildOpts (..), HaddockOpts (..)
+                   , TestOpts (..)
+                   )
+import           Stack.Types.BuildOptsMonoid ( CabalVerbosity (..), ProgressBarFormat (NoBar) )
+import           Stack.Types.Config ( Config (..) )
+import           Stack.Types.ConfigMonoid
+                   ( ConfigMonoid (..), parseConfigMonoid )
+import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Project ( Project (..) )
+import           Stack.Types.ProjectAndConfigMonoid
+                   ( ProjectAndConfigMonoid (..), parseProjectAndConfigMonoid )
+import           System.Directory
+                   ( createDirectory, createDirectoryIfMissing
+                   , getCurrentDirectory, setCurrentDirectory
+                   )
+import           System.Environment ( lookupEnv, setEnv, unsetEnv )
+import           System.IO ( writeFile )
+import           Test.Hspec
+                   ( Selector, Spec, anyException, beforeAll, describe, example
+                   , it, shouldBe, shouldThrow
+                   )
+
+sampleConfig :: String
+sampleConfig =
+  "snapshot: lts-24.55\n" ++
+  "packages: ['.']\n"
+
+buildOptsConfig :: String
+buildOptsConfig =
+  "snapshot: lts-24.55\n" ++
+  "packages: ['.']\n" ++
+  "build:\n" ++
+  "  semaphore: true\n" ++
+  "  library-profiling: true\n" ++
+  "  executable-profiling: true\n" ++
+  "  library-stripping: false\n" ++
+  "  executable-stripping: false\n" ++
+  "  haddock: true\n" ++
+  "  haddock-arguments:\n" ++
+  "    haddock-args:\n" ++
+  "    - \"--css=/home/user/my-css\"\n" ++
+  "  open-haddocks: true\n" ++
+  "  haddock-deps: true\n" ++
+  "  haddock-executables: true\n" ++
+  "  haddock-tests: true\n" ++
+  "  haddock-benchmarks: true\n" ++
+  "  haddock-internal: true\n" ++
+  "  haddock-hyperlink-source: false\n" ++
+  "  haddock-for-hackage: false\n" ++
+  "  copy-bins: true\n" ++
+  "  copy-compiler-tool: true\n" ++
+  "  prefetch: true\n" ++
+  "  keep-going: true\n" ++
+  "  keep-tmp-files: true\n" ++
+  "  force-dirty: true\n" ++
+  "  test: true\n" ++
+  "  test-arguments:\n" ++
+  "    rerun-tests: true\n" ++
+  "    additional-args: ['-fprof']\n" ++
+  "    coverage: true\n" ++
+  "    no-run-tests: true\n" ++
+  "    test-suite-timeout-grace: 30\n" ++
+  "  bench: true\n" ++
+  "  benchmark-opts:\n" ++
+  "    benchmark-arguments: -O2\n" ++
+  "    no-run-benchmarks: true\n" ++
+  "  reconfigure: true\n" ++
+  "  cabal-verbosity: verbose\n" ++
+  "  cabal-verbose: true\n" ++
+  "  split-objs: true\n" ++
+  "  skip-components: ['my-test']\n" ++
+  "  interleaved-output: false\n" ++
+  "  progress-bar: none\n" ++
+  "  ddump-dir: my-ddump-dir\n"
+
+buildOptsHaddockForHackageConfig :: String
+buildOptsHaddockForHackageConfig =
+  "snapshot: lts-24.55\n" ++
+  "packages: ['.']\n" ++
+  "build:\n" ++
+  "  haddock: true\n" ++
+  "  open-haddocks: true\n" ++
+  "  haddock-deps: true\n" ++
+  "  haddock-executables: true\n" ++
+  "  haddock-tests: true\n" ++
+  "  haddock-benchmarks: true\n" ++
+  "  haddock-internal: true\n" ++
+  "  haddock-hyperlink-source: false\n" ++
+  "  haddock-for-hackage: true\n" ++
+  "  force-dirty: false\n"
+
+hpackConfig :: String
+hpackConfig =
+  "snapshot: lts-24.55\n" ++
+  "with-hpack: /usr/local/bin/hpack\n" ++
+  "packages: ['.']\n"
+
+resolverConfig :: String
+resolverConfig =
+  "resolver: lts-24.55\n" ++
+  "packages: ['.']\n"
+
+snapshotConfig :: String
+snapshotConfig =
+  "snapshot: lts-24.55\n" ++
+  "packages: ['.']\n"
+
+resolverSnapshotConfig :: String
+resolverSnapshotConfig =
+  "resolver: lts-24.55\n" ++
+  "snapshot: lts-24.55\n" ++
+  "packages: ['.']\n"
+
+stackDotYaml :: Path Rel File
+stackDotYaml = either impureThrow id (parseRelFile "stack.yaml")
+
+setup :: IO ()
+setup = unsetEnv "STACK_YAML"
+
+noException :: Selector SomeException
+noException = const False
+
+spec :: Spec
+spec = beforeAll setup $ do
+  let logLevel = LevelOther "silent"
+  -- TODO(danburton): not use inTempDir
+  let inTempDir action = do
+        currentDirectory <- getCurrentDirectory
+        withSystemTempDirectory "Stack_ConfigSpec" $ \tempDir -> do
+          let enterDir = setCurrentDirectory tempDir
+          let exitDir = setCurrentDirectory currentDirectory
+          bracket_ enterDir exitDir action
+  -- TODO(danburton): a safer version of this?
+  let withEnvVar name newValue action = do
+        originalValue <- fromMaybe "" <$> lookupEnv name
+        let setVar = setEnv name newValue
+        let resetVar = setEnv name originalValue
+        bracket_ setVar resetVar action
+
+  describe "parseProjectAndConfigMonoid" $ do
+    let loadProject' fp inner = do
+          globalOpts <- globalOptsFromMonoid "" Nothing False mempty
+          withRunnerGlobal globalOpts { logLevel = logLevel } $ do
+              iopc <- loadConfigYaml (
+                parseProjectAndConfigMonoid (parent fp)
+                ) fp
+              ProjectAndConfigMonoid project _ <- liftIO iopc
+              liftIO $ inner project
+
+        toAbsPath path = do
+          parentDir <- getCurrentDirectory >>= parseAbsDir
+          pure (parentDir </> path)
+
+        loadProject config inner = do
+          yamlAbs <- toAbsPath stackDotYaml
+          writeFile (toFilePath yamlAbs) config
+          loadProject' yamlAbs inner
+
+    it "parses snapshot using 'resolver'" $ inTempDir $ do
+      loadProject resolverConfig $ \project ->
+        project.snapshot `shouldBe` RSLSynonym (LTS 24 55)
+
+    it "parses snapshot using 'snapshot'" $ inTempDir $ do
+      loadProject snapshotConfig $ \project ->
+        project.snapshot `shouldBe` RSLSynonym (LTS 24 55)
+
+    it "throws if both 'resolver' and 'snapshot' are present" $ inTempDir $ do
+      loadProject resolverSnapshotConfig (const (pure ()))
+        `shouldThrow` anyException
+
+  describe "loadConfig" $ do
+    let loadConfig' inner = do
+          globalOpts <- globalOptsFromMonoid "" Nothing False mempty
+          withRunnerGlobal globalOpts { logLevel = logLevel } $
+            loadConfig inner
+    -- TODO(danburton): make sure parent dirs also don't have config file
+    it "works even if no config file exists" $ example $
+      loadConfig' $ const $ pure ()
+
+    it "works with a blank config file" $ inTempDir $ do
+      writeFile (toFilePath stackDotYaml) ""
+      -- TODO(danburton): more specific test for exception
+      loadConfig' (const (pure ())) `shouldThrow` anyException
+
+    let configOverrideHpack = pcHpackExecutable . view pantryConfigL
+
+    it "parses config option with-hpack" $ inTempDir $ do
+      writeFile (toFilePath stackDotYaml) hpackConfig
+      loadConfig' $ \config ->
+        liftIO $ configOverrideHpack config `shouldBe`
+        HpackCommand "/usr/local/bin/hpack"
+
+    it "parses config bundled Hpack" $ inTempDir $ do
+      writeFile (toFilePath stackDotYaml) sampleConfig
+      loadConfig' $ \config ->
+        liftIO $ configOverrideHpack config `shouldBe` HpackBundled
+
+    it "parses build config options" $ inTempDir $ do
+      writeFile (toFilePath stackDotYaml) buildOptsConfig
+      loadConfig' $ \config -> liftIO $ do
+        let bopts = config.build
+        bopts.semaphore `shouldBe` True
+        bopts.libProfile `shouldBe` True
+        bopts.exeProfile `shouldBe` True
+        bopts.libStrip `shouldBe` False
+        bopts.exeStrip `shouldBe` False
+        bopts.buildHaddocks `shouldBe` True
+        bopts.haddockOpts `shouldBe` HaddockOpts
+          { additionalArgs = ["--css=/home/user/my-css"]
+          }
+        bopts.openHaddocks `shouldBe` True
+        bopts.haddockDeps `shouldBe` Just True
+        bopts.haddockExecutables `shouldBe` True
+        bopts.haddockTests `shouldBe` True
+        bopts.haddockBenchmarks `shouldBe` True
+        bopts.haddockInternal `shouldBe` True
+        bopts.haddockHyperlinkSource `shouldBe` False
+        bopts.haddockForHackage `shouldBe` False
+        bopts.installExes `shouldBe` True
+        bopts.installCompilerTool `shouldBe` True
+        bopts.preFetch `shouldBe` True
+        bopts.keepGoing `shouldBe` Just True
+        bopts.keepTmpFiles `shouldBe` True
+        bopts.forceDirty `shouldBe` True
+        bopts.tests `shouldBe` True
+        bopts.testOpts `shouldBe` TestOpts
+          { rerunTests = True
+          , additionalArgs = ["-fprof"]
+          , coverage = True
+          , runTests = False
+          , maximumTimeSeconds = Nothing
+          , timeoutGraceSeconds = Just 30
+          , allowStdin = True
+          }
+        bopts.benchmarks `shouldBe` True
+        bopts.benchmarkOpts `shouldBe` BenchmarkOpts
+           { additionalArgs = Just "-O2"
+           , runBenchmarks = False
+           }
+        bopts.reconfigure `shouldBe` True
+        bopts.cabalVerbose `shouldBe` CabalVerbosity verbose
+        bopts.splitObjs `shouldBe` True
+        bopts.skipComponents `shouldBe` ["my-test"]
+        bopts.interleavedOutput `shouldBe` False
+        bopts.progressBar `shouldBe` NoBar
+        bopts.ddumpDir `shouldBe` Just "my-ddump-dir"
+
+    it "parses build config options with haddock-for-hackage" $ inTempDir $ do
+      writeFile (toFilePath stackDotYaml) buildOptsHaddockForHackageConfig
+      loadConfig' $ \config -> liftIO $ do
+        let bopts = config.build
+        bopts.buildHaddocks `shouldBe` True
+        bopts.openHaddocks `shouldBe` False
+        bopts.haddockDeps `shouldBe` Nothing
+        bopts.haddockInternal `shouldBe` False
+        bopts.haddockHyperlinkSource `shouldBe` True
+        bopts.haddockForHackage `shouldBe` True
+        bopts.forceDirty `shouldBe` True
+
+    it "finds the config file in a parent directory" $ inTempDir $ do
+      writeFile "package.yaml" "name: foo"
+      writeFile (toFilePath stackDotYaml) sampleConfig
+      parentDir <- getCurrentDirectory >>= parseAbsDir
+      let childDir = "child"
+      createDirectory childDir
+      setCurrentDirectory childDir
+      loadConfig' $ \config -> liftIO $ do
+        bc <- runRIO config $ withBuildConfig ask
+        view configFileRootL bc `shouldBe` parentDir
+
+    it "respects the STACK_YAML env variable" $ inTempDir $ do
+      withSystemTempDir "config-is-here" $ \dir -> do
+        let stackYamlFp = toFilePath (dir </> stackDotYaml)
+        writeFile stackYamlFp sampleConfig
+        writeFile (toFilePath dir ++ "/package.yaml") "name: foo"
+        withEnvVar "STACK_YAML" stackYamlFp $
+          loadConfig' $ \config -> liftIO $ do
+            bc <- runRIO config $ withBuildConfig ask
+            bc.configFile `shouldBe` Right (dir </> stackDotYaml)
+
+    it "STACK_YAML can be relative" $ inTempDir $ do
+        parentDir <- getCurrentDirectory >>= parseAbsDir
+        let childRel = either impureThrow id (parseRelDir "child")
+            yamlRel =
+              childRel </> either impureThrow id (parseRelFile "some-other-name.config")
+            yamlAbs = parentDir </> yamlRel
+            packageYaml =
+              childRel </> either impureThrow id (parseRelFile "package.yaml")
+        createDirectoryIfMissing True $ toFilePath $ parent yamlAbs
+        writeFile (toFilePath yamlAbs) "snapshot: ghc-9.10.3"
+        writeFile (toFilePath packageYaml) "name: foo"
+        withEnvVar "STACK_YAML" (toFilePath yamlRel) $
+          loadConfig' $ \config -> liftIO $ do
+            bc <- runRIO config $ withBuildConfig ask
+            bc.configFile `shouldBe` Right yamlAbs
+
+  describe "defaultConfigYaml" $
+    it "is parseable" $ \_ -> do
+      curDir <- getCurrentDir
+      let parsed :: Either String (Either String (WithJSONWarnings ConfigMonoid))
+          parsed = parseEither
+            (parseConfigMonoid curDir) <$> left show (decodeEither' defaultConfigYaml)
+      case parsed of
+        Right (Right _) -> pure () :: IO ()
+        _ -> fail "Failed to parse default config yaml"
diff --git a/tests/unit/Stack/DotSpec.hs b/tests/unit/Stack/DotSpec.hs
new file mode 100644
index 0000000000..ceefbf9d02
--- /dev/null
+++ b/tests/unit/Stack/DotSpec.hs
@@ -0,0 +1,135 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+-- | Test suite for Stack.Dot
+module Stack.DotSpec
+  ( dummyPayload
+  , spec
+  , sublistOf
+  , pkgName
+  , stubLoader
+  ) where
+
+import           Data.List ((\\))
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import           Distribution.License ( License (BSD3) )
+import qualified RIO.Text as T
+import           Stack.DependencyGraph ( pruneGraph, resolveDependencies )
+import           Stack.Prelude hiding ( pkgName )
+import           Stack.Types.DependencyTree ( DotPayload (..) )
+import           Test.Hspec ( Spec, describe, it, shouldBe )
+import           Test.Hspec.QuickCheck ( prop )
+import           Test.QuickCheck ( Gen, choose, forAll )
+
+dummyPayload :: DotPayload
+dummyPayload = DotPayload (parseVersion "0.0.0.0") (Just (Right BSD3)) Nothing
+
+spec :: Spec
+spec = do
+  let graph =
+         Map.mapKeys pkgName
+       . fmap (\p -> (Set.map pkgName p, dummyPayload))
+       . Map.fromList $ [("one",Set.fromList ["base","free"])
+                        ,("two",Set.fromList ["base","free","mtl","transformers","one"])
+                        ]
+  describe "Stack.Dot" $ do
+    it "does nothing if depth is 0" $
+      resolveDependencies (Just 0) graph stubLoader `shouldBe` pure graph
+
+    it "with depth 1, more dependencies are resolved" $ do
+      let graph' = Map.insert (pkgName "cycle")
+                              (Set.singleton (pkgName "cycle"), dummyPayload)
+                              graph
+          resultGraph = runIdentity (resolveDependencies (Just 0) graph stubLoader)
+          resultGraph' = runIdentity (resolveDependencies (Just 1) graph' stubLoader)
+      Map.size resultGraph < Map.size resultGraph' `shouldBe` True
+
+    it "cycles are ignored" $ do
+       let graph' = Map.insert (pkgName "cycle")
+                               (Set.singleton (pkgName "cycle"), dummyPayload)
+                                graph
+           resultGraph = resolveDependencies Nothing graph stubLoader
+           resultGraph' = resolveDependencies Nothing graph' stubLoader
+       fmap Map.size resultGraph' `shouldBe` fmap ((+1) . Map.size) resultGraph
+
+    let graphElem e = Set.member e . Set.unions . Map.elems
+
+    prop "requested packages are pruned" $ do
+      let resolvedGraph = runIdentity (resolveDependencies Nothing graph stubLoader)
+          allPackages g = Map.keysSet g `Set.union` foldMap fst g
+      forAll (sublistOf (Set.toList (allPackages resolvedGraph))) $ \toPrune ->
+        let pruned = pruneGraph [pkgName "one", pkgName "two"] toPrune resolvedGraph
+        in  Set.null (allPackages pruned `Set.intersection` Set.fromList toPrune)
+
+    prop "pruning removes orphans" $ do
+      let resolvedGraph = runIdentity (resolveDependencies Nothing graph stubLoader)
+          allPackages g = Map.keysSet g `Set.union` foldMap fst g
+          orphans g = Map.filterWithKey (\k _ -> not (graphElem k g)) g
+      forAll (sublistOf (Set.toList (allPackages resolvedGraph))) $ \toPrune ->
+        let pruned = pruneGraph [pkgName "one", pkgName "two"] toPrune resolvedGraph
+        in  null (Map.keys (orphans (fmap fst pruned)) \\ [pkgName "one", pkgName "two"])
+
+{- Helper functions below -}
+-- Backport from QuickCheck 2.8 to 2.7.6
+sublistOf :: [a] -> Gen [a]
+sublistOf = filterM (\_ -> choose (False, True))
+
+-- Unsafe internal helper to create a package name
+pkgName :: Text -> PackageName
+pkgName = fromMaybe failure . parsePackageName . T.unpack
+  where
+   failure = error "Internal error during package name creation in DotSpec.pkgName"
+
+-- Stub, simulates the function to load package dependencies
+stubLoader :: PackageName -> Identity (Set PackageName, DotPayload)
+stubLoader name = pure $ (, dummyPayload) . Set.fromList . map pkgName $
+  case show name of
+    "StateVar" -> ["stm", "transformers"]
+    "array" -> []
+    "bifunctors" -> ["semigroupoids", "semigroups", "tagged"]
+    "binary" -> ["array", "bytestring", "containers"]
+    "bytestring" -> ["deepseq", "ghc-prim", "integer-gmp"]
+    "comonad" -> [ "containers", "contravariant", "distributive", "semigroups"
+                 , "tagged","transformers","transformers-compat"
+                 ]
+    "cont" -> [ "StateVar", "semigroups", "transformers", "transformers-compat"
+              , "void"
+              ]
+    "containers" -> ["array", "deepseq", "ghc-prim"]
+    "deepseq" -> ["array"]
+    "distributive" -> [ "ghc-prim", "tagged", "transformers"
+                      , "transformers-compat"
+                      ]
+    "free" -> [ "bifunctors", "comonad", "distributive", "mtl", "prelude-extras"
+              , "profunctors", "semigroupoids", "semigroups", "template-haskell"
+              , "transformers"
+              ]
+    "ghc" -> []
+    "hashable" -> ["bytestring", "ghc-prim", "integer-gmp", "text"]
+    "integer" -> []
+    "mtl" -> ["transformers"]
+    "nats" -> []
+    "one" -> ["free"]
+    "prelude" -> []
+    "profunctors" -> [ "comonad", "distributive", "semigroupoids", "tagged"
+                     , "transformers"
+                     ]
+    "semigroupoids" -> [ "comonad", "containers", "contravariant"
+                       , "distributive", "semigroups", "transformers"
+                       , "transformers-compat"
+                       ]
+    "semigroups" -> [ "bytestring", "containers", "deepseq", "hashable", "nats"
+                    , "text", "unordered-containers"
+                    ]
+    "stm" -> ["array"]
+    "tagged" -> ["template-haskell"]
+    "template" -> []
+    "text" -> [ "array", "binary", "bytestring", "deepseq", "ghc-prim"
+              , "integer-gmp"
+              ]
+    "transformers" -> []
+    "two" -> ["free", "mtl", "one", "transformers"]
+    "unordered" -> ["deepseq", "hashable"]
+    "void" -> ["ghc-prim", "hashable", "semigroups"]
+    _ -> []
diff --git a/tests/unit/Stack/Ghci/ScriptSpec.hs b/tests/unit/Stack/Ghci/ScriptSpec.hs
new file mode 100644
index 0000000000..670639eb02
--- /dev/null
+++ b/tests/unit/Stack/Ghci/ScriptSpec.hs
@@ -0,0 +1,56 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedLists   #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell   #-}
+
+-- | Test suite for the GhciScript DSL
+module Stack.Ghci.ScriptSpec
+  ( spec
+  ) where
+
+import qualified Data.Set as S
+import           Distribution.ModuleName
+import           Path
+import           Path.Extra ( pathToLazyByteString )
+import           Stack.Ghci.FakePaths
+import           Stack.Ghci.Script
+import           Stack.Prelude hiding ( fromString )
+import qualified System.FilePath as FP
+import           Test.Hspec
+
+spec :: Spec
+spec = do
+  describe "GHCi" $ do
+    describe "Script DSL" $ do
+
+      describe "script" $ do
+        it "should separate commands with a newline" $ do
+          let script =    cmdAdd [Left (fromString "Lib.A")]
+                       <> cmdAdd [Left (fromString "Lib.B")]
+          scriptToLazyByteString script `shouldBe`
+            ":add Lib.A\n:add Lib.B\n"
+
+      describe ":add" $ do
+        it "should not render empty add commands" $ do
+          let script = cmdAdd S.empty
+          scriptToLazyByteString script `shouldBe` ""
+
+        it "should ensure that a space exists between each module in an add command" $ do
+          let script = cmdAdd (S.fromList [Left (fromString "Lib.A"), Left (fromString "Lib.B")])
+          scriptToLazyByteString script `shouldBe` ":add Lib.A Lib.B\n"
+
+      describe ":add (by file)" $ do
+        it "should render a full file path" $ do
+          let file = $(mkAbsFile $ defaultDrive FP.</> "Users" FP.</> "someone" FP.</> "src" FP.</> "project" FP.</> "package-a" FP.</> "src" FP.</> "Main.hs")
+              script = cmdAdd (S.fromList [Right file])
+          scriptToLazyByteString script `shouldBe`
+            ":add " <> pathToLazyByteString file <> "\n"
+
+      describe ":module" $ do
+        it "should render empty module as ':module +'" $ do
+          let script = cmdModule []
+          scriptToLazyByteString script `shouldBe` ":module +\n"
+
+        it "should ensure that a space exists between each module in a module command" $ do
+          let script = cmdModule [fromString "Lib.A", fromString "Lib.B"]
+          scriptToLazyByteString script `shouldBe` ":module + Lib.A Lib.B\n"
diff --git a/src/test/Stack/GhciSpec.hs b/tests/unit/Stack/GhciSpec.hs
similarity index 98%
rename from src/test/Stack/GhciSpec.hs
rename to tests/unit/Stack/GhciSpec.hs
index 5559cb740b..021740dc97 100644
--- a/src/test/Stack/GhciSpec.hs
+++ b/tests/unit/Stack/GhciSpec.hs
@@ -2,10 +2,12 @@
 -- {-# LANGUAGE QuasiQuotes #-}
 -- {-# LANGUAGE TemplateHaskell #-}
 
--- | Test suite for GHCi like applications including both GHCi and Intero.
-module Stack.GhciSpec where
+-- | Test suite for GHCi-like applications including GHCi.
+module Stack.GhciSpec
+  ( spec
+  ) where
 
-import Test.Hspec
+import           Test.Hspec ( Spec )
 
 spec :: Spec
 spec = pure ()
diff --git a/src/test/Stack/LockSpec.hs b/tests/unit/Stack/LockSpec.hs
similarity index 79%
rename from src/test/Stack/LockSpec.hs
rename to tests/unit/Stack/LockSpec.hs
index def99bfa1c..af08e43ada 100644
--- a/src/test/Stack/LockSpec.hs
+++ b/tests/unit/Stack/LockSpec.hs
@@ -1,19 +1,30 @@
 {-# LANGUAGE QuasiQuotes         #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
-module Stack.LockSpec where
+module Stack.LockSpec
+  ( toBlobKey
+  , decodeSHA
+  , decodeLocked
+  , spec
+  ) where
 
-import Pantry.Internal.AesonExtended (WithJSONWarnings(..))
+import           Data.Aeson.WarningParser ( WithJSONWarnings (..) )
 import qualified Data.Yaml as Yaml
-import Distribution.Types.PackageName (mkPackageName)
-import Distribution.Types.Version (mkVersion)
-import Pantry
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Types.Version ( mkVersion )
+import           Pantry
+                   ( BlobKey (..), FileSize (..), PackageIdentifier (..)
+                   , PackageLocationImmutable (..), PackageMetadata (..)
+                   , RawPackageLocationImmutable (..), RawPackageMetadata (..)
+                   , Repo (..), RepoType (..), SHA256, TreeKey (..)
+                   , resolvePaths
+                   )
 import qualified Pantry.SHA256 as SHA256
-import RIO
-import Stack.Lock
-import Test.Hspec
-import Text.RawString.QQ
+import           RIO ( ByteString, displayException, throwIO, unless )
+import           Stack.Lock ( Locked (..), LockedLocation (..) )
+import           Test.Hspec ( Spec, it, shouldBe )
+import           Text.RawString.QQ ( r )
 
 toBlobKey :: ByteString -> Word -> BlobKey
 toBlobKey string size = BlobKey (decodeSHA string) (FileSize size)
@@ -22,7 +33,7 @@ decodeSHA :: ByteString -> SHA256
 decodeSHA string =
     case SHA256.fromHexBytes string of
         Right csha -> csha
-        Left err -> error $ "Failed decoding. Error:  " <> show err
+        Left err -> error $ "Failed decoding. Error:  " <> displayException err
 
 decodeLocked :: ByteString -> IO Locked
 decodeLocked bs = do
@@ -37,7 +48,7 @@ decodeLocked bs = do
 
 spec :: Spec
 spec = do
-    it "parses lock file (empty with GHC resolver)" $ do
+    it "parses lock file (empty with GHC snapshot)" $ do
         let lockFile :: ByteString
             lockFile =
                 [r|#some
@@ -48,9 +59,9 @@ snapshots:
     compiler: ghc-8.6.5
 packages: []
 |]
-        pkgImm <- lckPkgImmutableLocations <$> decodeLocked lockFile
+        pkgImm <- (.pkgImmutableLocations) <$> decodeLocked lockFile
         pkgImm `shouldBe` []
-    it "parses lock file (empty with LTS resolver)" $ do
+    it "parses lock file (empty with LTS snapshot)" $ do
         let lockFile :: ByteString
             lockFile =
                 [r|#some
@@ -66,7 +77,7 @@ snapshots:
     compiler: ghc-8.6.5
 packages: []
 |]
-        pkgImm <- lckPkgImmutableLocations <$> decodeLocked lockFile
+        pkgImm <- (.pkgImmutableLocations) <$> decodeLocked lockFile
         pkgImm `shouldBe` []
     it "parses lock file (LTS, wai + warp)" $ do
         let lockFile :: ByteString
@@ -110,7 +121,7 @@ packages:
       sha256: f808e075811b002563d24c393ce115be826bb66a317d38da22c513ee42b7443a
     commit: d11d63f1a6a92db8c637a8d33e7953ce6194a3e0
 |]
-        pkgImm <- lckPkgImmutableLocations <$> decodeLocked lockFile
+        pkgImm <- (.pkgImmutableLocations) <$> decodeLocked lockFile
         let waiSubdirRepo subdir =
               Repo { repoType = RepoGit
                    , repoUrl = "https://github.com/yesodweb/wai.git"
diff --git a/tests/unit/Stack/NixSpec.hs b/tests/unit/Stack/NixSpec.hs
new file mode 100644
index 0000000000..f1783bc708
--- /dev/null
+++ b/tests/unit/Stack/NixSpec.hs
@@ -0,0 +1,116 @@
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+
+module Stack.NixSpec
+  ( sampleConfigNixEnabled
+  , sampleConfigNixDisabled
+  , setup
+  , spec
+  ) where
+
+import           Data.Maybe ( fromJust )
+import           Options.Applicative
+                   ( defaultPrefs, execParserPure, getParseResult, info )
+import           Prelude ( writeFile )
+import           Stack.Config ( loadConfig )
+import           Stack.Config.Nix ( nixCompiler )
+import           Stack.Constants ( osIsWindows, stackDotYaml )
+import           Stack.Options.GlobalParser ( globalOptsFromMonoid )
+import           Stack.Options.NixParser ( nixOptsParser )
+import           Stack.Prelude
+import           Stack.Runners ( withRunnerGlobal )
+import           Stack.Types.Config ( Config (..) )
+import           Stack.Types.ConfigMonoid ( ConfigMonoid (..) )
+import qualified Stack.Types.GlobalOpts as GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.GlobalOptsMonoid ( GlobalOptsMonoid (..) )
+import           Stack.Types.Nix ( NixOpts (..) )
+import           System.Directory ( getCurrentDirectory, setCurrentDirectory )
+import           System.Environment ( unsetEnv )
+import           Test.Hspec ( Spec, around_, beforeAll, describe, it, shouldBe )
+
+sampleConfigNixEnabled :: String
+sampleConfigNixEnabled =
+  "snapshot: lts-24.49\n" ++
+  "packages: ['.']\n" ++
+  "system-ghc: true\n" ++
+  "nix:\n" ++
+  "   enable: True\n" ++
+  "   packages: [glpk]"
+
+sampleConfigNixDisabled :: String
+sampleConfigNixDisabled =
+  "snapshot: lts-24.49\n" ++
+  "packages: ['.']\n" ++
+  "nix:\n" ++
+  "   enable: False"
+
+setup :: IO ()
+setup = unsetEnv "STACK_YAML"
+
+spec :: Spec
+spec = beforeAll setup $ do
+  let loadConfig' :: ConfigMonoid -> (Config -> IO ()) -> IO ()
+      loadConfig' cmdLineArgs inner = do
+        globalOpts <-
+          globalOptsFromMonoid "" Nothing False mempty { configMonoid = cmdLineArgs }
+        withRunnerGlobal globalOpts { GlobalOpts.logLevel = LevelOther "silent" } $
+          loadConfig (liftIO . inner)
+      inTempDir test = do
+        currentDirectory <- getCurrentDirectory
+        withSystemTempDirectory "Stack_ConfigSpec" $ \tempDir -> do
+          let enterDir = setCurrentDirectory tempDir
+              exitDir = setCurrentDirectory currentDirectory
+          bracket_ enterDir exitDir test
+      withStackDotYaml config test = inTempDir $ do
+        writeFile (toFilePath stackDotYaml) config
+        test
+      parseNixOpts cmdLineOpts = fromJust $ getParseResult $ execParserPure
+        defaultPrefs
+        (info (nixOptsParser False) mempty)
+        cmdLineOpts
+      parseOpts cmdLineOpts = mempty { nixOpts = parseNixOpts cmdLineOpts }
+  let trueOnNonWindows = not osIsWindows
+  describe "nix disabled in config file" $
+    around_ (withStackDotYaml sampleConfigNixDisabled) $ do
+      it "sees that the nix shell is not enabled" $ loadConfig' mempty $ \config ->
+         config.nix.enable `shouldBe` False
+      describe "--nix given on command line" $
+        it "sees that the nix shell is enabled" $
+          loadConfig' (parseOpts ["--nix"]) $ \config ->
+          config.nix.enable `shouldBe` trueOnNonWindows
+      describe "--nix-pure given on command line" $
+        it "sees that the nix shell is enabled" $
+          loadConfig' (parseOpts ["--nix-pure"]) $ \config ->
+          config.nix.enable `shouldBe` trueOnNonWindows
+      describe "--no-nix given on command line" $
+        it "sees that the nix shell is not enabled" $
+          loadConfig' (parseOpts ["--no-nix"]) $ \config ->
+          config.nix.enable `shouldBe` False
+      describe "--no-nix-pure given on command line" $
+        it "sees that the nix shell is not enabled" $
+          loadConfig' (parseOpts ["--no-nix-pure"]) $ \config ->
+          config.nix.enable `shouldBe` False
+  describe "nix enabled in config file" $
+    around_ (withStackDotYaml sampleConfigNixEnabled) $ do
+      it "sees that the nix shell is enabled" $
+        loadConfig' mempty $ \config ->
+        config.nix.enable `shouldBe` trueOnNonWindows
+      describe "--no-nix given on command line" $
+        it "sees that the nix shell is not enabled" $
+          loadConfig' (parseOpts ["--no-nix"]) $ \config ->
+          config.nix.enable `shouldBe` False
+      describe "--nix-pure given on command line" $
+        it "sees that the nix shell is enabled" $
+          loadConfig' (parseOpts ["--nix-pure"]) $ \config ->
+          config.nix.enable `shouldBe` trueOnNonWindows
+      describe "--no-nix-pure given on command line" $
+        it "sees that the nix shell is enabled" $
+          loadConfig' (parseOpts ["--no-nix-pure"]) $ \config ->
+          config.nix.enable `shouldBe` trueOnNonWindows
+      it "sees that the only package asked for is glpk and asks for the correct GHC derivation" $ loadConfig' mempty $ \config -> do
+        config.nix.packages `shouldBe` ["glpk"]
+        v <- parseVersionThrowing "9.10.3"
+        ghc <- either throwIO pure $ nixCompiler (WCGhc v)
+        ghc `shouldBe` "haskell.compiler.ghc9103"
diff --git a/tests/unit/Stack/PackageDumpSpec.hs b/tests/unit/Stack/PackageDumpSpec.hs
new file mode 100644
index 0000000000..024e9e6fd1
--- /dev/null
+++ b/tests/unit/Stack/PackageDumpSpec.hs
@@ -0,0 +1,302 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Stack.PackageDumpSpec
+  ( main
+  , spec
+  , bestPrune
+  , checkDepsPresent
+  , runEnvNoLogging
+  ) where
+
+import           Conduit ( withSourceFile, yield )
+import qualified Data.Conduit.List as CL
+import           Data.Conduit.Text ( decodeUtf8 )
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import           Distribution.License ( License (..) )
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Distribution.Version ( mkVersion )
+import           Path ( parseAbsFile )
+import           RIO.PrettyPrint.Simple ( SimplePrettyApp, mkSimplePrettyApp )
+import           RIO.Process
+                   ( envVarsL, findExecutable, mkDefaultProcessContext
+                   , mkProcessContext
+                   )
+import           Stack.PackageDump
+                   ( DumpPackage (..), conduitDumpPackage, eachPair
+                   , eachSection, ghcPkgDump, pruneDeps, sinkMatching
+                   )
+import           Stack.Prelude
+import           Stack.Types.CompilerPaths ( GhcPkgExe (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId, parseGhcPkgId )
+import           Test.Hspec
+                   ( Spec, anyException, describe, hspec, it, shouldBe
+                   , shouldThrow
+                   )
+import           Test.Hspec.QuickCheck ( prop )
+
+main :: IO ()
+main = hspec spec
+
+spec :: Spec
+spec = do
+    describe "eachSection" $ do
+        let test name content expected = it name $ do
+                actual <- runConduit $ yield content .| eachSection CL.consume .| CL.consume
+                actual `shouldBe` expected
+        test
+            "unix line endings"
+            "foo\nbar\n---\nbaz---\nbin\n---\n"
+            [ ["foo", "bar"]
+            , ["baz---", "bin"]
+            ]
+        test
+            "windows line endings"
+            "foo\r\nbar\r\n---\r\nbaz---\r\nbin\r\n---\r\n"
+            [ ["foo", "bar"]
+            , ["baz---", "bin"]
+            ]
+
+    it "eachPair" $ do
+        let bss =
+                [ "key1: val1"
+                , "key2: val2a"
+                , "      val2b"
+                , "key3:"
+                , "key4:"
+                , "   val4a"
+                , "   val4b"
+                ]
+            sink k = fmap (k, ) CL.consume
+        actual <- runConduit $ mapM_ yield bss .| eachPair sink .| CL.consume
+        actual `shouldBe`
+            [ ("key1", ["val1"])
+            , ("key2", ["val2a", "val2b"])
+            , ("key3", [])
+            , ("key4", ["val4a", "val4b"])
+            ]
+
+    describe "conduitDumpPackage" $ do
+        it "ghc 7.8" $ do
+            haskell2010:_ <-
+                  withSourceFile "tests/unit/package-dump/ghc-7.8.txt" $ \src ->
+                  runConduit
+                $ src
+               .| decodeUtf8
+               .| conduitDumpPackage
+               .| CL.consume
+            ghcPkgId <- parseGhcPkgId "haskell2010-1.1.2.0-05c8dd51009e08c6371c82972d40f55a"
+            packageIdent <- maybe (fail "Not parsable package id") pure $
+              parsePackageIdentifier "haskell2010-1.1.2.0"
+            depends <- mapM parseGhcPkgId
+                [ "array-0.5.0.0-470385a50d2b78598af85cfe9d988e1b"
+                , "base-4.7.0.2-bfd89587617e381ae01b8dd7b6c7f1c1"
+                , "ghc-prim-0.3.1.0-a24f9c14c632d75b683d0f93283aea37"
+                ]
+            haskell2010 { exposedModules = mempty } `shouldBe` DumpPackage
+                { ghcPkgId = ghcPkgId
+                , packageIdent = packageIdent
+                , sublib = Nothing
+                , license = Just BSD3
+                , libDirs = ["/opt/ghc/7.8.4/lib/ghc-7.8.4/haskell2010-1.1.2.0"]
+                , depends = depends
+                , libraries = ["HShaskell2010-1.1.2.0"]
+                , hasExposedModules = True
+                , haddockInterfaces = ["/opt/ghc/7.8.4/share/doc/ghc/html/libraries/haskell2010-1.1.2.0/haskell2010.haddock"]
+                , haddockHtml = Just "/opt/ghc/7.8.4/share/doc/ghc/html/libraries/haskell2010-1.1.2.0"
+                , isExposed = False
+                , exposedModules = mempty
+                }
+
+        it "ghc 7.10" $ do
+            haskell2010:_ <-
+                  withSourceFile "tests/unit/package-dump/ghc-7.10.txt" $ \src ->
+                  runConduit
+                $ src
+               .| decodeUtf8
+               .| conduitDumpPackage
+               .| CL.consume
+            ghcPkgId <- parseGhcPkgId "ghc-7.10.1-325809317787a897b7a97d646ceaa3a3"
+            pkgIdent <- maybe (fail "Not parsable package id") pure $
+              parsePackageIdentifier "ghc-7.10.1"
+            depends <- mapM parseGhcPkgId
+                [ "array-0.5.1.0-e29cdbe82692341ebb7ce6e2798294f9"
+                , "base-4.8.0.0-1b689eb8d72c4d4cc88f445839c1f01a"
+                , "bin-package-db-0.0.0.0-708fc7d634a370b311371a5bcde40b62"
+                , "bytestring-0.10.6.0-0909f8f31271f3d75749190bf2ee35db"
+                , "containers-0.5.6.2-2114032c163425cc264e6e1169dc2f6d"
+                , "directory-1.2.2.0-b4959b472d9eee380c6b32291ade29e0"
+                , "filepath-1.4.0.0-40d643aa87258c186441a1f8f3e13ca6"
+                , "hoopl-3.10.0.2-8c8dfc4c3140e5f7c982da224c3cb1f0"
+                , "hpc-0.6.0.2-ac9064885aa8cb08a93314222939ead4"
+                , "process-1.2.3.0-3b1e9bca6ac38225806ff7bbf3f845b1"
+                , "template-haskell-2.10.0.0-e895139a0ffff267d412e3d0191ce93b"
+                , "time-1.5.0.1-e17a9220d438435579d2914e90774246"
+                , "transformers-0.4.2.0-c1a7bb855a176fe475d7b665301cd48f"
+                , "unix-2.7.1.0-e5915eb989e568b732bc7286b0d0817f"
+                ]
+            haskell2010 { exposedModules = mempty } `shouldBe` DumpPackage
+                { ghcPkgId = ghcPkgId
+                , packageIdent = pkgIdent
+                , sublib = Nothing
+                , license = Just BSD3
+                , libDirs = ["/opt/ghc/7.10.1/lib/ghc-7.10.1/ghc_EMlWrQ42XY0BNVbSrKixqY"]
+                , haddockInterfaces = ["/opt/ghc/7.10.1/share/doc/ghc/html/libraries/ghc-7.10.1/ghc.haddock"]
+                , haddockHtml = Just "/opt/ghc/7.10.1/share/doc/ghc/html/libraries/ghc-7.10.1"
+                , depends = depends
+                , libraries = ["HSghc-7.10.1-EMlWrQ42XY0BNVbSrKixqY"]
+                , hasExposedModules = True
+                , isExposed = False
+                , exposedModules = mempty
+                }
+        it "ghc 7.8.4 (osx)" $ do
+            hmatrix:_ <-
+                  withSourceFile "tests/unit/package-dump/ghc-7.8.4-osx.txt" $ \src ->
+                  runConduit
+                $ src
+               .| decodeUtf8
+               .| conduitDumpPackage
+               .| CL.consume
+            ghcPkgId <- parseGhcPkgId "hmatrix-0.16.1.5-12d5d21f26aa98774cdd8edbc343fbfe"
+            pkgId <- maybe (fail "Not parsable package id") pure $
+              parsePackageIdentifier "hmatrix-0.16.1.5"
+            depends <- mapM parseGhcPkgId
+                [ "array-0.5.0.0-470385a50d2b78598af85cfe9d988e1b"
+                , "base-4.7.0.2-918c7ac27f65a87103264a9f51652d63"
+                , "binary-0.7.1.0-108d06eea2ef05e517f9c1facf10f63c"
+                , "bytestring-0.10.4.0-78bc8f2c724c765c78c004a84acf6cc3"
+                , "deepseq-1.3.0.2-0ddc77716bd2515426e1ba39f6788a4f"
+                , "random-1.1-822c19b7507b6ac1aaa4c66731e775ae"
+                , "split-0.2.2-34cfb851cc3784e22bfae7a7bddda9c5"
+                , "storable-complex-0.2.2-e962c368d58acc1f5b41d41edc93da72"
+                , "vector-0.10.12.3-f4222db607fd5fdd7545d3e82419b307"]
+            hmatrix `shouldBe` DumpPackage
+                { ghcPkgId = ghcPkgId
+                , packageIdent = pkgId
+                , sublib = Nothing
+                , license = Just BSD3
+                , libDirs =
+                      [ "/Users/alexbiehl/.stack/snapshots/x86_64-osx/lts-2.13/7.8.4/lib/x86_64-osx-ghc-7.8.4/hmatrix-0.16.1.5"
+                      , "/opt/local/lib/"
+                      , "/usr/local/lib/"
+                      ,  "C:/Program Files/Example/"]
+                , haddockInterfaces = ["/Users/alexbiehl/.stack/snapshots/x86_64-osx/lts-2.13/7.8.4/doc/html/hmatrix.haddock"]
+                , haddockHtml = Just "/Users/alexbiehl/.stack/snapshots/x86_64-osx/lts-2.13/7.8.4/doc/html"
+                , depends = depends
+                , libraries = ["HShmatrix-0.16.1.5"]
+                , hasExposedModules = True
+                , isExposed = True
+                , exposedModules = Set.fromList ["Data.Packed","Data.Packed.Vector","Data.Packed.Matrix","Data.Packed.Foreign","Data.Packed.ST","Data.Packed.Development","Numeric.LinearAlgebra","Numeric.LinearAlgebra.LAPACK","Numeric.LinearAlgebra.Algorithms","Numeric.Container","Numeric.LinearAlgebra.Util","Numeric.LinearAlgebra.Devel","Numeric.LinearAlgebra.Data","Numeric.LinearAlgebra.HMatrix","Numeric.LinearAlgebra.Static"]
+                }
+        it "ghc HEAD" $ do
+          ghcBoot:_ <-
+                withSourceFile "tests/unit/package-dump/ghc-head.txt" $ \src ->
+                runConduit
+              $ src
+             .| decodeUtf8
+             .| conduitDumpPackage
+             .| CL.consume
+          ghcPkgId <- parseGhcPkgId "ghc-boot-0.0.0.0"
+          pkgId <- maybe (fail "Not parsable package id") pure $
+            parsePackageIdentifier "ghc-boot-0.0.0.0"
+          depends <- mapM parseGhcPkgId
+            [ "base-4.9.0.0"
+            , "binary-0.7.5.0"
+            , "bytestring-0.10.7.0"
+            , "directory-1.2.5.0"
+            , "filepath-1.4.1.0"
+            ]
+          ghcBoot `shouldBe` DumpPackage
+            { ghcPkgId = ghcPkgId
+            , packageIdent = pkgId
+            , sublib = Nothing
+            , license = Just BSD3
+            , libDirs =
+                  ["/opt/ghc/head/lib/ghc-7.11.20151213/ghc-boot-0.0.0.0"]
+            , haddockInterfaces = ["/opt/ghc/head/share/doc/ghc/html/libraries/ghc-boot-0.0.0.0/ghc-boot.haddock"]
+            , haddockHtml = Just "/opt/ghc/head/share/doc/ghc/html/libraries/ghc-boot-0.0.0.0"
+            , depends = depends
+            , libraries = ["HSghc-boot-0.0.0.0"]
+            , hasExposedModules = True
+            , isExposed = True
+            , exposedModules = Set.fromList ["GHC.Lexeme", "GHC.PackageDb"]
+            }
+
+
+    describe "parseGhcPkgId" $ do
+        it "parses traditional package ID" $ do
+            gpkgId <- parseGhcPkgId "base-4.7.0.2-bfd89587617e381ae01b8dd7b6c7f1c1"
+            show gpkgId `shouldBe` show ("base-4.7.0.2-bfd89587617e381ae01b8dd7b6c7f1c1" :: String)
+
+        it "parses Backpack instantiated unit ID with '+'" $ do
+            gpkgId <- parseGhcPkgId "private-backpack-0.1.0.0-str-sig+8GTPQYg43xPFNOuG93VVSN"
+            show gpkgId `shouldBe` show ("private-backpack-0.1.0.0-str-sig+8GTPQYg43xPFNOuG93VVSN" :: String)
+
+        it "parses unit ID with only '+'" $ do
+            gpkgId <- parseGhcPkgId "pkg+hash"
+            show gpkgId `shouldBe` show ("pkg+hash" :: String)
+
+        it "rejects empty string" $ do
+            (parseGhcPkgId "" :: IO GhcPkgId) `shouldThrow` anyException
+
+    it "sinkMatching" $ runEnvNoLogging $ \pkgexe -> do
+        m <- ghcPkgDump pkgexe []
+            $  conduitDumpPackage
+            .| sinkMatching (Map.singleton (mkPackageName "transformers") (mkVersion [0, 0, 0, 0, 0, 0, 1]))
+        case Map.lookup (mkPackageName "base") m of
+            Nothing -> error "base not present"
+            Just _ -> pure ()
+        liftIO $ do
+          Map.lookup (mkPackageName "transformers") m `shouldBe` Nothing
+          Map.lookup (mkPackageName "ghc") m `shouldBe` Nothing
+
+    describe "pruneDeps" $ do
+        it "sanity check" $ do
+            let prunes =
+                    [ ((1, 'a'), [])
+                    , ((1, 'b'), [])
+                    , ((2, 'a'), [(1, 'b')])
+                    , ((2, 'b'), [(1, 'a')])
+                    , ((3, 'a'), [(1, 'c')])
+                    , ((4, 'a'), [(2, 'a')])
+                    ]
+                actual = fst <$> pruneDeps fst fst snd bestPrune prunes
+            actual `shouldBe` Map.fromList
+                [ (1, (1, 'b'))
+                , (2, (2, 'a'))
+                , (4, (4, 'a'))
+                ]
+
+        prop "invariant holds" $ \prunes' ->
+            -- Force uniqueness
+            let prunes = Map.toList $ Map.fromList prunes'
+            in  checkDepsPresent prunes $ fst <$> pruneDeps fst fst snd bestPrune prunes
+
+type PruneCheck = ((Int, Char), [(Int, Char)])
+
+bestPrune :: PruneCheck -> PruneCheck -> PruneCheck
+bestPrune x y
+    | fst x > fst y = x
+    | otherwise = y
+
+checkDepsPresent :: [PruneCheck] -> Map Int (Int, Char) -> Bool
+checkDepsPresent prunes selected =
+    all hasDeps $ Set.toList allIds
+  where
+    depMap = Map.fromList prunes
+    allIds = Set.fromList $ Map.elems selected
+
+    hasDeps ident =
+        case Map.lookup ident depMap of
+            Nothing -> error "checkDepsPresent: missing in depMap"
+            Just deps -> Set.null $ Set.difference (Set.fromList deps) allIds
+
+runEnvNoLogging :: (GhcPkgExe -> RIO SimplePrettyApp a) -> IO a
+runEnvNoLogging inner = do
+  envVars <- view envVarsL <$> mkDefaultProcessContext
+  menv <- mkProcessContext $ Map.delete "GHC_PACKAGE_PATH" envVars
+  let find name = runRIO menv (findExecutable name) >>= either throwIO parseAbsFile
+  pkg <- GhcPkgExe <$> find "ghc-pkg"
+  app <- mkSimplePrettyApp mempty (Just menv) True 80 mempty
+  runRIO app (inner pkg)
diff --git a/tests/unit/Stack/Types/PlanSpec.hs b/tests/unit/Stack/Types/PlanSpec.hs
new file mode 100644
index 0000000000..6e9fd99acb
--- /dev/null
+++ b/tests/unit/Stack/Types/PlanSpec.hs
@@ -0,0 +1,78 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Stack.Types.PlanSpec
+  ( main
+  , spec
+  ) where
+
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import           Distribution.Types.PackageName ( mkPackageName )
+import           Stack.Prelude
+import           Stack.Types.ComponentUtils ( unqualCompFromString )
+import           Stack.Types.NamedComponent ( NamedComponent (..) )
+import           Stack.Types.Plan
+                   ( ComponentKey (..), componentKeyPkgName )
+import           Test.Hspec ( Spec, describe, hspec, it, shouldBe )
+
+main :: IO ()
+main = hspec spec
+
+spec :: Spec
+spec = do
+  describe "ComponentKey" $ do
+    it "componentKeyPkgName extracts the package name" $ do
+      let pn = mkPackageName "my-pkg"
+          ck = ComponentKey pn CLib
+      componentKeyPkgName ck `shouldBe` pn
+
+    it "componentKeyPkgName works for non-CLib components" $ do
+      let pn = mkPackageName "my-pkg"
+          cn = unqualCompFromString "test-suite"
+          ck = ComponentKey pn (CTest cn)
+      componentKeyPkgName ck `shouldBe` pn
+
+    it "two ComponentKeys with different components are not equal" $ do
+      let pn = mkPackageName "my-pkg"
+          ckLib = ComponentKey pn CLib
+          ckExe = ComponentKey pn (CExe (unqualCompFromString "my-exe"))
+      (ckLib == ckExe) `shouldBe` False
+
+    it "two ComponentKeys with different packages are not equal" $ do
+      let ck1 = ComponentKey (mkPackageName "pkg-a") CLib
+          ck2 = ComponentKey (mkPackageName "pkg-b") CLib
+      (ck1 == ck2) `shouldBe` False
+
+    it "two identical ComponentKeys are equal" $ do
+      let ck1 = ComponentKey (mkPackageName "pkg") CLib
+          ck2 = ComponentKey (mkPackageName "pkg") CLib
+      (ck1 == ck2) `shouldBe` True
+
+    it "ComponentKey has a well-defined Ord instance" $ do
+      let pn = mkPackageName "pkg"
+          ckLib = ComponentKey pn CLib
+          ckExe = ComponentKey pn (CExe (unqualCompFromString "exe"))
+          ckTest = ComponentKey pn (CTest (unqualCompFromString "test"))
+      -- CLib, CSubLib, CFlib, CExe, CTest, CBench ordering comes from
+      -- NamedComponent's derived Ord
+      (ckLib < ckExe) `shouldBe` True
+      (ckExe < ckTest) `shouldBe` True
+
+    it "can be used as Map keys" $ do
+      let ck1 = ComponentKey (mkPackageName "pkg-a") CLib
+          ck2 = ComponentKey (mkPackageName "pkg-a")
+                  (CTest (unqualCompFromString "tests"))
+          ck3 = ComponentKey (mkPackageName "pkg-b") CLib
+          m :: Map ComponentKey String
+          m = Map.fromList [(ck1, "lib"), (ck2, "test"), (ck3, "lib-b")]
+      Map.size m `shouldBe` 3
+      Map.lookup ck1 m `shouldBe` Just "lib"
+      Map.lookup ck2 m `shouldBe` Just "test"
+
+    it "can be used in Sets" $ do
+      let ck1 = ComponentKey (mkPackageName "pkg") CLib
+          ck2 = ComponentKey (mkPackageName "pkg")
+                  (CExe (unqualCompFromString "exe"))
+          s = Set.fromList [ck1, ck2, ck1] -- duplicate ck1
+      Set.size s `shouldBe` 2
diff --git a/src/test/Stack/Types/TemplateNameSpec.hs b/tests/unit/Stack/Types/TemplateNameSpec.hs
similarity index 89%
rename from src/test/Stack/Types/TemplateNameSpec.hs
rename to tests/unit/Stack/Types/TemplateNameSpec.hs
index 1fe793fdad..b5138c102a 100644
--- a/src/test/Stack/Types/TemplateNameSpec.hs
+++ b/tests/unit/Stack/Types/TemplateNameSpec.hs
@@ -1,11 +1,13 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Stack.Types.TemplateNameSpec where
+module Stack.Types.TemplateNameSpec
+  ( spec
+  ) where
 
-import Stack.Types.TemplateName
-import Path.Internal
-import System.Info (os)
-import Test.Hspec
+import           Path.Internal
+import           Stack.Types.TemplateName
+import           System.Info ( os )
+import           Test.Hspec
 
 spec :: Spec
 spec =
@@ -17,6 +19,7 @@ spec =
         pathOf "github:user/name"     `shouldBe` RepoPath (RepoTemplatePath GitHub    "user" "name.hsfiles")
         pathOf "bitbucket:user/name"  `shouldBe` RepoPath (RepoTemplatePath Bitbucket "user" "name.hsfiles")
         pathOf "gitlab:user/name"     `shouldBe` RepoPath (RepoTemplatePath GitLab    "user" "name.hsfiles")
+        pathOf "codeberg:user/name"   `shouldBe` RepoPath (RepoTemplatePath Codeberg  "user" "name.hsfiles")
 
         pathOf "http://www.com/file"  `shouldBe` UrlPath "http://www.com/file"
         pathOf "https://www.com/file" `shouldBe` UrlPath "https://www.com/file"
diff --git a/src/test/Stack/Untar/README.md b/tests/unit/Stack/Untar/README.md
similarity index 100%
rename from src/test/Stack/Untar/README.md
rename to tests/unit/Stack/Untar/README.md
diff --git a/src/test/Stack/Untar/createFiles.sh b/tests/unit/Stack/Untar/createFiles.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/test/Stack/Untar/createFiles.sh
rename to tests/unit/Stack/Untar/createFiles.sh
diff --git a/src/test/Stack/Untar/test1.tar.gz b/tests/unit/Stack/Untar/test1.tar.gz
similarity index 100%
rename from src/test/Stack/Untar/test1.tar.gz
rename to tests/unit/Stack/Untar/test1.tar.gz
diff --git a/src/test/Stack/Untar/test2.tar.gz b/tests/unit/Stack/Untar/test2.tar.gz
similarity index 100%
rename from src/test/Stack/Untar/test2.tar.gz
rename to tests/unit/Stack/Untar/test2.tar.gz
diff --git a/tests/unit/Stack/UploadSpec.hs b/tests/unit/Stack/UploadSpec.hs
new file mode 100644
index 0000000000..3d8862ffb8
--- /dev/null
+++ b/tests/unit/Stack/UploadSpec.hs
@@ -0,0 +1,51 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Stack.UploadSpec
+  ( spec
+  ) where
+
+import           Data.Bits ((.&.))
+import           RIO
+                   ( Bool (..), IO, IsString, Maybe (..), String, ($), finally
+                   , readFileBinary, replicateM_, runRIO, unless
+                   , withSystemTempDirectory
+                   )
+import           RIO.Directory
+                   ( emptyPermissions, getPermissions, setOwnerReadable
+                   , setOwnerWritable
+                   )
+import           RIO.FilePath ( (</>) )
+import           Stack.Upload
+                   ( HackageKey (..), maybeGetHackageKey, writeFilePrivate )
+import           System.Environment ( setEnv, unsetEnv )
+import           System.Permissions ( osIsWindows )
+import           System.PosixCompat.Files ( getFileStatus, fileMode )
+import           Test.Hspec ( Spec, example, it, shouldBe, shouldReturn )
+
+spec :: Spec
+spec = do
+  it "writeFilePrivate" $ example $ withSystemTempDirectory "writeFilePrivate" $ \dir -> replicateM_ 2 $ do
+    let fp = dir </> "filename"
+        contents :: IsString s => s
+        contents = "These are the contents"
+    writeFilePrivate fp contents
+    actual <- readFileBinary fp
+    actual `shouldBe` contents
+    perms <- getPermissions fp
+    perms `shouldBe` setOwnerWritable True (setOwnerReadable True emptyPermissions)
+
+    unless osIsWindows $ do
+      status <- getFileStatus fp
+      (fileMode status .&. 0o777) `shouldBe` 0o600
+
+  it "finds a HACKAGE_KEY env variable" $ do
+    runRIO () maybeGetHackageKey `shouldReturn` Nothing
+
+    withEnv "HACKAGE_KEY" "api_key"
+      $ runRIO () maybeGetHackageKey `shouldReturn` Just (HackageKey "api_key")
+
+withEnv :: String -> String -> IO a -> IO a
+withEnv k v f = do
+  setEnv k v
+  f `finally` unsetEnv k
diff --git a/test/package-dump/ghc-7.10.txt b/tests/unit/package-dump/ghc-7.10.txt
similarity index 100%
rename from test/package-dump/ghc-7.10.txt
rename to tests/unit/package-dump/ghc-7.10.txt
diff --git a/test/package-dump/ghc-7.8.4-osx.txt b/tests/unit/package-dump/ghc-7.8.4-osx.txt
similarity index 100%
rename from test/package-dump/ghc-7.8.4-osx.txt
rename to tests/unit/package-dump/ghc-7.8.4-osx.txt
diff --git a/test/package-dump/ghc-7.8.txt b/tests/unit/package-dump/ghc-7.8.txt
similarity index 100%
rename from test/package-dump/ghc-7.8.txt
rename to tests/unit/package-dump/ghc-7.8.txt
diff --git a/test/package-dump/ghc-head.txt b/tests/unit/package-dump/ghc-head.txt
similarity index 100%
rename from test/package-dump/ghc-head.txt
rename to tests/unit/package-dump/ghc-head.txt
diff --git a/tests/unit/unix/Stack/Ghci/FakePaths.hs b/tests/unit/unix/Stack/Ghci/FakePaths.hs
new file mode 100644
index 0000000000..4897c7a47f
--- /dev/null
+++ b/tests/unit/unix/Stack/Ghci/FakePaths.hs
@@ -0,0 +1,8 @@
+module Stack.Ghci.FakePaths
+  ( defaultDrive
+  ) where
+
+-- | Helpers for writing fake paths for test suite for the GhciScript DSL. This
+-- must be a separate module because it is used in Template Haskell splices.
+defaultDrive :: FilePath
+defaultDrive = "/"
diff --git a/tests/unit/windows/Stack/Ghci/FakePaths.hs b/tests/unit/windows/Stack/Ghci/FakePaths.hs
new file mode 100644
index 0000000000..c9aa4356cd
--- /dev/null
+++ b/tests/unit/windows/Stack/Ghci/FakePaths.hs
@@ -0,0 +1,8 @@
+module Stack.Ghci.FakePaths
+  ( defaultDrive
+  ) where
+
+-- | Helpers for writing fake paths for test suite for the GhciScript DSL. This
+-- must be a separate module because it is used in Template Haskell splices.
+defaultDrive :: FilePath
+defaultDrive = "C:\\"